Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv12319/src/blob
Modified Files:
main.c system3.c
Log Message:
don't say change speed if not required
Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- main.c 2001/11/21 02:03:12 1.10
+++ main.c 2001/11/21 02:14:44 1.11
@@ -200,7 +200,7 @@
blob_status.blobType = fromDownload;
#ifdef PARAM_START
} else if(strncmp(argv[1], "param", 5) == 0) {
- /* download kernel */
+ /* download param */
startAddress = PARAM_RAM_BASE;
bufLen = PARAM_FLASH_LEN;
numRead = &blob_status.paramSize;
@@ -224,22 +224,28 @@
}
- SerialOutputString("Switching to ");
- PrintSerialSpeed(blob_status.downloadSpeed);
- SerialOutputString(" baud\n");
+ if (blob_status.terminalSpeed != blob_status.downloadSpeed) {
+ SerialOutputString("Switching to ");
+ PrintSerialSpeed(blob_status.downloadSpeed);
+ SerialOutputString(" baud\n");
- SerialOutputString("You have 60 seconds to switch your terminal emulator to the same speed and\n");
- SerialOutputString("start downloading. After that " PACKAGE " will switch back to ");
- PrintSerialSpeed(blob_status.terminalSpeed);
- SerialOutputString(" baud.\n");
+ SerialOutputString("You have 60 seconds to switch your terminal emulator to the same speed and\n");
+ SerialOutputString("start downloading. After that " PACKAGE " will switch back to ");
+ PrintSerialSpeed(blob_status.terminalSpeed);
+ SerialOutputString(" baud.\n");
- SerialInit(blob_status.downloadSpeed);
+ SerialInit(blob_status.downloadSpeed);
+ } else {
+ SerialOutputString("You have 60 seconds to start downloading.\n");
+ }
*numRead = UUDecode((char *)startAddress, bufLen);
- SerialOutputString("\n(Please switch your terminal emulator back to ");
- PrintSerialSpeed(blob_status.terminalSpeed);
- SerialOutputString(" baud)\n");
+ if (blob_status.terminalSpeed != blob_status.downloadSpeed) {
+ SerialOutputString("\n(Please switch your terminal emulator back to ");
+ PrintSerialSpeed(blob_status.terminalSpeed);
+ SerialOutputString(" baud)\n");
+ }
if(*numRead < 0) {
/* something went wrong */
Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- system3.c 2001/11/13 13:22:35 1.6
+++ system3.c 2001/11/21 02:14:44 1.7
@@ -122,11 +122,15 @@
ret = strtou32( argv[2], &len );
if ( ret < 0 ) ERR( -EINVAL );
- SerialOutputString("Switching to download speed\n");
- SerialOutputString("You have 60 seconds to switch your terminal emulator to the same speed and\n");
- SerialOutputString("start downloading. After that " PACKAGE " will switch back to term speed.\n");
+ if (blob_status.terminalSpeed != blob_status.downloadSpeed) {
+ SerialOutputString("Switching to download speed\n");
+ SerialOutputString("You have 60 seconds to switch your terminal emulator to the same speed and\n");
+ SerialOutputString("start downloading. After that " PACKAGE " will switch back to term speed.\n");
- SerialInit(blob_status.downloadSpeed);
+ SerialInit(blob_status.downloadSpeed);
+ } else {
+ SerialOutputString("You have 60 seconds to start downloading.\n");
+ }
ret = UUDecode((char *)dest, len);
if ( ret == len ) {
@@ -140,8 +144,10 @@
SerialOutputString("error during uudecode\n");
}
- SerialOutputString("\n(Please switch your terminal emulator back to terminal speed\n");
- SerialInit(blob_status.terminalSpeed);
+ if (blob_status.terminalSpeed != blob_status.downloadSpeed) {
+ SerialOutputString("\n(Please switch your terminal emulator back to terminal speed\n");
+ SerialInit(blob_status.terminalSpeed);
+ }
DONE:
return ret;
|
