scummvm random work

[patches.git] / ldr-utils-prompt.patch

Index: lfd.c
===================================================================
--- lfd.c	(revision 1684)
+++ lfd.c	(working copy)
@@ -493,6 +493,16 @@ static void ldr_send_timeout(int sig)
 	warn("received signal %i: timeout while sending; aborting", sig);
 	exit(2);
 }
+static char ldr_send_prompt(const char *msg)
+{
+	int foo;
+	char dummy;
+	alarm(0);
+	printf("%s: ", msg);
+	fflush(stdout);
+	foo = scanf("%c", &dummy);
+	return (foo == EOF ? EOF : dummy);
+}
 static bool ldr_load_uart(LFD *alfd, const void *void_opts)
 {
 	const struct ldr_load_options *opts = void_opts;
@@ -515,10 +525,9 @@ static bool ldr_load_uart(LFD *alfd, con
 
 	setbuf(stdout, NULL);
 
-	/* give ourselves like ten seconds to do autobaud */
 	old_alarm = signal(SIGALRM, ldr_send_timeout);
-	alarm(10);
 
+	alarm(10);
 	printf("Opening %s ... ", tty);
 	if (tty[0] != '#') {
 		fd = open(tty, O_RDWR);
@@ -538,6 +547,10 @@ static bool ldr_load_uart(LFD *alfd, con
 	} else
 		printf("OK!\n");
 
+	if (opts->prompt)
+		ldr_send_prompt("Press any key to send autobaud");
+
+	alarm(10);
 	printf("Trying to send autobaud ... ");
 	ret = write(fd, "@", 1);
 	if (ret != 1)
@@ -545,6 +558,10 @@ static bool ldr_load_uart(LFD *alfd, con
 	tcdrain(fd);
 	printf("OK!\n");
 
+	if (opts->prompt)
+		ldr_send_prompt("Press any key to read autobaud");
+
+	alarm(10);
 	printf("Trying to read autobaud ... ");
 	ret = read_retry(fd, autobaud, 4);
 	if (ret != 4)
@@ -567,10 +584,15 @@ static bool ldr_load_uart(LFD *alfd, con
 	       autobaud[0], autobaud[1], autobaud[2], autobaud[3]);
 
 	if (ldr->header) {
+		if (opts->prompt)
+			ldr_send_prompt("Press any key to send global LDR header");
+
+		alarm(10);
 		printf("Sending global LDR header ... ");
 		ret = write(fd, ldr->header, ldr->header_size);
 		if (ret != (ssize_t)ldr->header_size)
 			goto out;
+		tcdrain(fd);
 		printf("OK!\n");
 	}
 
@@ -580,6 +602,9 @@ static bool ldr_load_uart(LFD *alfd, con
 			BLOCK *block = &(ldr->dxes[d].blocks[b]);
 			int del;
 
+			if (opts->prompt)
+				ldr_send_prompt("Press any key to send block header");
+
 			alarm(60);
 
 			if (verbose)
@@ -591,6 +616,9 @@ static bool ldr_load_uart(LFD *alfd, con
 				goto out;
 			tcdrain(fd);
 
+			if (opts->prompt && block->data != NULL)
+				ldr_send_prompt("Press any key to send block data");
+
 			del += printf("%zi] (%2.0f%%)", ldr->dxes[d].num_blocks,
 			              ((float)(b+1) / (float)ldr->dxes[d].num_blocks) * 100);
 			if (block->data != NULL) {
Index: ldr.c
===================================================================
--- ldr.c	(revision 1684)
+++ ldr.c	(working copy)
@@ -101,13 +101,15 @@ static struct option_help const create_o
 };
 #define show_create_usage(status) show_some_usage("create", create_long_opts, create_opts_help, CREATE_PARSE_FLAGS, status)
 
-#define LOAD_PARSE_FLAGS COMMON_FLAGS "b:f"
+#define LOAD_PARSE_FLAGS COMMON_FLAGS "b:p"
 static struct option const load_long_opts[] = {
 	{"baud",      a_argument, NULL, 'b'},
+	{"prompt",   no_argument, NULL, 'p'},
 	COMMON_LONG_OPTS
 };
 static struct option_help const load_opts_help[] = {
-	{"Set baud rate (default 115200)", "<baud>"},
+	{"Set baud rate (default 115200)",           "<baud>"},
+	{"Prompt for data flow",                     NULL},
 	COMMON_HELP_OPTS
 };
 #define show_load_usage(status) show_some_usage("load", load_long_opts, load_opts_help, LOAD_PARSE_FLAGS, status)
@@ -238,11 +240,13 @@ static bool load_ldr(const int argc, cha
 	struct ldr_load_options opts = {
 		.tty = NULL,
 		.baud = 115200,
+		.prompt = false,
 	};
 
 	while ((i=getopt_long(argc, argv, LOAD_PARSE_FLAGS, load_long_opts, NULL)) != -1) {
 		switch (i) {
 			case 'b': opts.baud = atoi(optarg); break;
+			case 'p': opts.prompt = true; break;
 			case 'h': show_load_usage(0);
 			CASE_common_errors
 		}
Index: ldr.h
===================================================================
--- ldr.h	(revision 1684)
+++ ldr.h	(working copy)
@@ -46,6 +46,7 @@ struct ldr_create_options {
 struct ldr_load_options {
 	const char *tty;
 	size_t baud;
+	bool prompt;
 };
 
 struct ldr_dump_options {
Index: .depend
===================================================================
--- .depend	(revision 1684)
+++ .depend	(working copy)
@@ -11,3 +11,4 @@ lfd_bf561.o: lfd_bf561.c ldr.h headers.h
   dxe_jump.h blackfin_defines.h ldr_elf.h
 lfd.o: lfd.c ldr.h headers.h elf.h helpers.h lfd.h dxes.h dxe_jump.h \
   blackfin_defines.h ldr_elf.h
+test.o: test.c