blob-cvs-commit

CVS: blob/src/blob main.c,1.36,1.37

[Tim R. <tim...@us...>]

Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv24741/src/blob

Modified Files:
	main.c 
Log Message:
define TERMINAL_SPEED or get baud_9600

Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- main.c	21 Feb 2002 14:21:35 -0000	1.36
+++ main.c	27 Feb 2002 01:44:55 -0000	1.37
@@ -86,16 +86,17 @@
 	blob_status.kernelType = fromFlash;
 	blob_status.ramdiskType = fromFlash;
 	blob_status.downloadSpeed = baud_115200;
+#ifdef TERMINAL_SPEED
+	blob_status.terminalSpeed = TERMINAL_SPEED;
+#else
 	blob_status.terminalSpeed = baud_9600;
+#endif
 	blob_status.load_ramdisk = 1;
 	blob_status.cmdline[0] = '\0';
 	blob_status.boot_delay = 10;
 
 	/* call serial_init() because the default 9k6 speed might not
            be what the user requested */
-#if defined(H3600) || defined(SHANNON) || defined(IDR) || defined(BADGE4) || defined(JORNADA720) || defined(ACCELENT_SA) || defined(PT_SYSTEM3)
-	blob_status.terminalSpeed = baud_115200; /* DEBUG */
-#endif
 	serial_init(blob_status.terminalSpeed);
 
 	/* parse the core tag, for critical things like terminal speed */

Re: CVS: blob/src/blob main.c,1.36,1.37

[Erik M. <J.A...@it...>]

On Tue, Feb 26, 2002 at 05:44:57PM -0800, Tim Riker wrote:
> Update of /cvsroot/blob/blob/src/blob
> In directory usw-pr-cvs1:/tmp/cvs-serv24741/src/blob
> 
> Modified Files:
> 	main.c 
> Log Message:
> define TERMINAL_SPEED or get baud_9600
> 
> Index: main.c
> ===================================================================
> RCS file: /cvsroot/blob/blob/src/blob/main.c,v
> retrieving revision 1.36
> retrieving revision 1.37
> diff -u -d -r1.36 -r1.37
> --- main.c	21 Feb 2002 14:21:35 -0000	1.36
> +++ main.c	27 Feb 2002 01:44:55 -0000	1.37
> @@ -86,16 +86,17 @@
>  	blob_status.kernelType = fromFlash;
>  	blob_status.ramdiskType = fromFlash;
>  	blob_status.downloadSpeed = baud_115200;
> +#ifdef TERMINAL_SPEED
> +	blob_status.terminalSpeed = TERMINAL_SPEED;
> +#else
>  	blob_status.terminalSpeed = baud_9600;
> +#endif

Better do it right: completely remove the #ifdef and define
TERMINAL_SPEED in all architecture dependent files.


Erik

-- 
J.A.K. (Erik) Mouw, Information and Communication Theory Group, Faculty
of Information Technology and Systems, Delft University of Technology,
PO BOX 5031, 2600 GA Delft, The Netherlands  Phone: +31-15-2783635
Fax: +31-15-2781843  Email: J.A...@it...
WWW: http://www-ict.its.tudelft.nl/~erik/