FreeCalypso > hg > freecalypso-tools

changeset 574:aba969153d20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
loadtools code: removed provisions for special GTA02 AP build
author Mychaela Falconia <falcon@freecalypso.org>
date Sun, 02 Feb 2020 19:37:50 +0000
parents b22cc34b6fc9
children cef70d53fc5e
files loadtools/bpmain.c loadtools/clmain.c loadtools/ltexit.c loadtools/ltmain.c loadtools/romdump.c loadtools/romload.c loadtools/sertool.c
diffstat 7 files changed, 7 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/loadtools/bpmain.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/bpmain.c	Sun Feb 02 19:37:50 2020 +0000
@@ -14,7 +14,6 @@
 extern struct srecreader iramimage;
 extern char default_buzplayer_image[];
 extern void (*default_exit)();
-extern int gta_modem_poweron;
 
 extern struct baudrate *find_baudrate_by_name();
 
@@ -28,7 +27,7 @@
 	int c;
 	char command[512];
 
-	while ((c = getopt(argc, argv, "a:b:c:C:h:H:i:nr:")) != EOF)
+	while ((c = getopt(argc, argv, "a:b:c:C:h:H:i:r:")) != EOF)
 		switch (c) {
 		case 'a':
 			iramimage.filename = optarg;
@@ -51,9 +50,6 @@
 		case 'i':
 			set_beacon_interval(optarg);
 			continue;
-		case 'n':
-			gta_modem_poweron = 0;
-			continue;
 		case 'r':
 			reattach = find_baudrate_by_name(optarg);
 			if (!reattach)
--- a/loadtools/clmain.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/clmain.c	Sun Feb 02 19:37:50 2020 +0000
@@ -19,7 +19,6 @@
 extern char hw_init_script[];
 extern struct baudrate baud_rate_table[];
 extern struct baudrate *current_baud_rate;
-extern int gta_modem_poweron;
 
 extern struct baudrate *find_baudrate_by_name();
 
@@ -38,7 +37,7 @@
 	int c;
 	struct baudrate *br;
 
-	while ((c = getopt(argc, argv, "+a:b:B:c:C:h:H:i:jnr:")) != EOF)
+	while ((c = getopt(argc, argv, "+a:b:B:c:C:h:H:i:jr:")) != EOF)
 		switch (c) {
 		case 'a':
 			iramimage.filename = optarg;
@@ -70,9 +69,6 @@
 		case 'j':
 			xram_jtag_mode = 1;
 			continue;
-		case 'n':
-			gta_modem_poweron = 0;
-			continue;
 		case 'r':
 			br = find_baudrate_by_name(optarg);
 			if (!br)
--- a/loadtools/ltexit.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/ltexit.c	Sun Feb 02 19:37:50 2020 +0000
@@ -15,15 +15,6 @@
 }
 
 static void
-exit_gta02_cutpwr(rc)
-{
-#ifdef GTA0x_AP_BUILD
-	set_gta_modem_power_ctrl(0);
-#endif
-	exit(rc);
-}
-
-static void
 exit_iotaoff(rc)
 {
 	static char *poweroff_argv[2] = {"poweroff", 0};
@@ -50,9 +41,10 @@
 	void (*func)();
 } exit_modes[] = {
 	{"bare", exit_bare},
-	{"gta02-cutpwr", exit_gta02_cutpwr},
 	{"iota-off", exit_iotaoff},
 	{"jump0", exit_jump0},
+	/* backward compat with old gta02.config */
+	{"gta02-cutpwr", exit_iotaoff},
 	{0, 0}
 };
 
--- a/loadtools/ltmain.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/ltmain.c	Sun Feb 02 19:37:50 2020 +0000
@@ -15,7 +15,6 @@
 extern char default_loadagent_image[];
 extern char hw_init_script[];
 extern void (*default_exit)();
-extern int gta_modem_poweron;
 
 extern struct baudrate *find_baudrate_by_name();
 
@@ -29,7 +28,7 @@
 	int c;
 	char command[512];
 
-	while ((c = getopt(argc, argv, "a:b:B:c:C:h:H:i:nr:")) != EOF)
+	while ((c = getopt(argc, argv, "a:b:B:c:C:h:H:i:r:")) != EOF)
 		switch (c) {
 		case 'a':
 			iramimage.filename = optarg;
@@ -57,9 +56,6 @@
 		case 'i':
 			set_beacon_interval(optarg);
 			continue;
-		case 'n':
-			gta_modem_poweron = 0;
-			continue;
 		case 'r':
 			reattach = find_baudrate_by_name(optarg);
 			if (!reattach)
--- a/loadtools/romdump.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/romdump.c	Sun Feb 02 19:37:50 2020 +0000
@@ -18,7 +18,6 @@
 extern char default_dspdump_image[];
 extern struct baudrate *current_baud_rate;
 extern void (*default_exit)();
-extern int gta_modem_poweron;
 
 extern struct baudrate *find_baudrate_by_name();
 
@@ -45,7 +44,7 @@
 	struct baudrate *br;
 	char *targv[2];
 
-	while ((c = getopt(argc, argv, "a:b:B:c:C:h:H:i:n")) != EOF)
+	while ((c = getopt(argc, argv, "a:b:B:c:C:h:H:i:")) != EOF)
 		switch (c) {
 		case 'a':
 			iramimage.filename = optarg;
@@ -74,9 +73,6 @@
 		case 'i':
 			set_beacon_interval(optarg);
 			continue;
-		case 'n':
-			gta_modem_poweron = 0;
-			continue;
 		case '?':
 		default:
 usage:			fprintf(stderr,
--- a/loadtools/romload.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/romload.c	Sun Feb 02 19:37:50 2020 +0000
@@ -26,9 +26,6 @@
 struct srecreader iramimage;
 struct baudrate *romload_baud_rate = baud_rate_table;	/* 1st entry default */
 
-/* global var always defined, but does anything only for GTA0x_AP_BUILD */
-int gta_modem_poweron = 1;
-
 static int beacon_interval = 13;	/* in milliseconds */
 
 static u_char beacon_cmd[2] = {'<', 'i'};
@@ -147,10 +144,6 @@
 send_beacons()
 {
 	printf("Sending beacons to %s\n", target_ttydev);
-#ifdef GTA0x_AP_BUILD
-	if (gta_modem_poweron)
-		fork_gta_modem_poweron();
-#endif
 	do
 		write(target_fd, beacon_cmd, sizeof beacon_cmd);
 	while (expect_response(beacon_interval) != 'i');
--- a/loadtools/sertool.c	Sun Feb 02 19:24:18 2020 +0000
+++ b/loadtools/sertool.c	Sun Feb 02 19:37:50 2020 +0000
@@ -15,7 +15,6 @@
 char *target_ttydev;
 
 extern struct srecreader iramimage;
-extern int gta_modem_poweron;
 
 char **passon_argv;
 int passon_argc;
@@ -27,7 +26,7 @@
 	extern int optind;
 	int c;
 
-	while ((c = getopt(argc, argv, "b:c:C:h:H:i:n")) != EOF)
+	while ((c = getopt(argc, argv, "b:c:C:h:H:i:")) != EOF)
 		switch (c) {
 		case 'b':
 			set_romload_baudrate(optarg);
@@ -47,9 +46,6 @@
 		case 'i':
 			set_beacon_interval(optarg);
 			continue;
-		case 'n':
-			gta_modem_poweron = 0;
-			continue;
 		case '?':
 		default:
 usage:			fprintf(stderr,