CVS: blob/utils/mkparamblock mkparamblock.c,1.6,1.7

[Erik M. <er...@us...>]

Update of /cvsroot/blob/blob/utils/mkparamblock
In directory usw-pr-cvs1:/tmp/cvs-serv2589/utils/mkparamblock

Modified Files:
	mkparamblock.c 
Log Message:
The serial port driver rewrite, part two.
This looks quite intrusive, but it's not that large:
- rewrite src/lib/serial.c to use the low level serial driver
- change semantics for SerialInputByte() and SerialOutputByte(), so rename
  them to serial_read() and serial_write(). this makes the patch huge
- add new INIT_LEVEL for driver selection (has to be done before hardware
  initialisation)
- add machine specific files for all architectures in diag
- clean up odds and ends.


Index: mkparamblock.c
===================================================================
RCS file: /cvsroot/blob/blob/utils/mkparamblock/mkparamblock.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mkparamblock.c	2001/10/07 16:29:52	1.6
+++ mkparamblock.c	2002/01/03 16:07:18	1.7
@@ -14,36 +14,36 @@
 
 int convert_baud(char *arg)
 {
-	eBauds retval;
+	serial_baud_t retval;
 	
 	if(strcmp(arg, "1200") == 0) {
-		retval = baud1k2;
+		retval = baud_1200;
 	} else if(strcmp(arg, "1k2") == 0) {
-		retval = baud1k2;
+		retval = baud_1200;
 	} else if(strcmp(arg, "9600") == 0) {
-		retval = baud9k6;
+		retval = baud_9600;
 	} else if(strcmp(arg, "9k6") == 0) {
-		retval = baud9k6;
+		retval = baud_9600;
 	} else if(strcmp(arg, "19200") == 0) {
-		retval = baud19k2;
+		retval = baud_19200;
 	} else if(strcmp(arg, "19k2") == 0) {
-		retval = baud19k2;
+		retval = baud_19200;
 	} else if(strcmp(arg, "38400") == 0) {
-		retval = baud38k4;
+		retval = baud_38400;
 	} else if(strcmp(arg, "38k4") == 0) {
-		retval = baud38k4;
+		retval = baud_38400;
 	} else if(strcmp(arg, "57600") == 0) {
-		retval = baud57k6;
+		retval = baud_57600;
 	} else if(strcmp(arg, "57k6") == 0) {
-		retval = baud57k6;
+		retval = baud_57600;
 	} else if(strcmp(arg, "115200") == 0) {
-		retval = baud115k2;
+		retval = baud_115200;
 	} else if(strcmp(arg, "115k2") == 0) {
-		retval = baud115k2;
+		retval = baud_115200;
 	} else if(strcmp(arg, "230400") == 0) {
-		retval = baud230k4;
+		retval = baud_230400;
 	} else if(strcmp(arg, "230k4") == 0) {
-		retval = baud230k4;
+		retval = baud_230400;
 	} else return -1;
 	
 	return (int) retval;
@@ -146,7 +146,7 @@
 	tag.hdr.conf_mask = 0;
 	tag.hdr.conf = 0;
 
-	tag.u.core.terminal = baud9k6;
+	tag.u.core.terminal = baud_9600;
 	
 	fwrite(&tag, ptag_size(ptag_core), 4, fp);
 }