Menu
▾
▴
CVS: blob/src/blob assabet.c,1.5,1.6 badge4.c,1.2,1.3 brutus.c,1.4,1.5 clart.c,1.4,1.5 debug.c,1.7,1.8 flash.c,1.10,1.11 h3600.c,1.4,1.5 idr.c,1.3,1.4 initcalls.c,1.2,1.3 intel16.c,1.3,1.4 intel32.c,1.3,1.4 jornada720.c,1.2,1.3 lart.c,1.5,1.6 main.c,1.19,1.20 memory.c,1.3,1.4 nesa.c,1.4,1.5 param_block.c,1.4,1.5 partition.c,1.1,1.2 pleb.c,1.4,1.5 shannon.c,1.5,1.6 system3.c,1.8,1.9 uucodec.c,1.2,1.3
|
From: Erik M. <er...@us...> - 2002-01-03 16:07:21
|
Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv2589/src/blob
Modified Files:
assabet.c badge4.c brutus.c clart.c debug.c flash.c h3600.c
idr.c initcalls.c intel16.c intel32.c jornada720.c lart.c
main.c memory.c nesa.c param_block.c partition.c pleb.c
shannon.c system3.c uucodec.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: assabet.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/assabet.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- assabet.c 2002/01/02 01:18:57 1.5
+++ assabet.c 2002/01/03 16:07:17 1.6
@@ -55,7 +55,7 @@
flash_driver = &intel32_flash_driver;
}
-__initlist(init_assabet_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_assabet_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -75,4 +75,4 @@
}
-__initlist(assabet_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(assabet_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: badge4.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/badge4.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- badge4.c 2002/01/02 01:18:57 1.2
+++ badge4.c 2002/01/03 16:07:17 1.3
@@ -62,7 +62,7 @@
flash_driver = &intel16_flash_driver;
}
-__initlist(init_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
static void init_hardware(void)
@@ -79,4 +79,4 @@
}
-__initlist(init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: brutus.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/brutus.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- brutus.c 2002/01/02 01:18:57 1.4
+++ brutus.c 2002/01/03 16:07:17 1.5
@@ -52,7 +52,7 @@
flash_driver = &null_flash_driver;
}
-__initlist(init_brutus_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_brutus_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -63,4 +63,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(brutus_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(brutus_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: clart.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/clart.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- clart.c 2002/01/02 01:18:57 1.4
+++ clart.c 2002/01/03 16:07:17 1.5
@@ -55,7 +55,7 @@
flash_driver = &intel16_flash_driver;
}
-__initlist(init_clart_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_clart_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -66,4 +66,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(clart_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(clart_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: debug.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/debug.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- debug.c 2001/12/16 18:23:37 1.7
+++ debug.c 2002/01/03 16:07:17 1.8
@@ -99,7 +99,7 @@
SerialOutputHex((int)src);
SerialOutputString(" to 0x");
SerialOutputHex((int)dest);
- SerialOutputByte('\n');
+ serial_write('\n');
MyMemCpy( (u32 *)dest, (const u32 *)src, len);
@@ -152,8 +152,8 @@
SerialOutputString(" val=0x");
SerialOutputHex(value);
SerialOutputString(" type=");
- SerialOutputByte(type);
- SerialOutputByte('\n');
+ serial_write(type);
+ serial_write('\n');
#endif
/* check memory alignment */
@@ -244,8 +244,8 @@
SerialOutputString("adr=0x");
SerialOutputHex(address);
SerialOutputString(" type=");
- SerialOutputByte(type);
- SerialOutputByte('\n');
+ serial_write(type);
+ serial_write('\n');
#endif
/* check memory alignment */
@@ -294,8 +294,8 @@
break;
}
- SerialOutputByte(type);
- SerialOutputByte(' ');
+ serial_write(type);
+ serial_write(' ');
SerialOutputHex(value);
SerialOutputString("\n");
@@ -354,16 +354,16 @@
for (tmpaddress = address; tmpaddress < address + 0x10; tmpaddress += 4) {
value = (*((u32 *)tmpaddress));
SerialOutputHex(value);
- SerialOutputByte(' ');
+ serial_write(' ');
}
for (tmpaddress = address; tmpaddress < address + 0x10; tmpaddress++) {
value = (*((u8 *)tmpaddress)) & 0xff;
if ((value >= ' ') && (value <= '~'))
- SerialOutputByte(value);
+ serial_write(value);
else
- SerialOutputByte('.');
+ serial_write('.');
}
- SerialOutputByte('\n');
+ serial_write('\n');
}
ret = 0;
@@ -457,5 +457,5 @@
}
SerialOutputString(strerror(errno));
- SerialOutputByte('\n');
+ serial_write('\n');
}
Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flash.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- flash.c 2001/12/31 00:28:53 1.10
+++ flash.c 2002/01/03 16:07:17 1.11
@@ -181,7 +181,7 @@
SerialOutputDec(nwords);
SerialOutputString(") words at 0x");
SerialOutputHex((u32)start);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
flash_driver->enable_vpp();
@@ -190,7 +190,7 @@
if(*cur != 0xffffffff) {
SerialOutputString("erasing dirty block at 0x");
SerialOutputHex((u32)cur);
- SerialOutputByte('\n');
+ serial_write('\n');
/* dirty block */
rv = flash_driver->erase(cur);
@@ -199,7 +199,7 @@
printerrprefix();
SerialOutputString("flash erase error at 0x");
SerialOutputHex((u32)cur);
- SerialOutputByte('\n');
+ serial_write('\n');
flash_driver->disable_vpp();
return rv;
}
@@ -248,7 +248,7 @@
SerialOutputHex((u32)src);
SerialOutputString(" to 0x");
SerialOutputHex((u32)dst);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
flash_driver->enable_vpp();
@@ -298,7 +298,7 @@
SerialOutputString(" resume writing at 0x");
SerialOutputHex((u32)&dst[i]);
- SerialOutputByte('\n');
+ serial_write('\n');
}
/* there is something seriously wrong if this is true */
@@ -322,7 +322,7 @@
SerialOutputString(" erase operations\n");
SerialOutputDec(nscandown);
SerialOutputString(" words scanned down\n");
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
flash_driver->disable_vpp();
@@ -416,7 +416,7 @@
SerialOutputHex((u32)start);
SerialOutputString(", nwords = 0x");
SerialOutputHex(nwords);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
rv = address_range_to_block_range((u32) start, nwords * sizeof(u32),
@@ -452,7 +452,7 @@
printerrprefix();
SerialOutputString("can't (un)lock block at 0x");
SerialOutputHex((u32)addr);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return rv;
}
Index: h3600.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/h3600.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- h3600.c 2002/01/02 01:18:57 1.4
+++ h3600.c 2002/01/03 16:07:17 1.5
@@ -115,7 +115,7 @@
flash_driver->disable_vpp = h3600_flash_disable_vpp;
}
-__initlist(init_h3600_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_h3600_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -130,4 +130,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(h3600_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(h3600_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: idr.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/idr.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- idr.c 2002/01/02 01:18:57 1.3
+++ idr.c 2002/01/03 16:07:17 1.4
@@ -49,7 +49,7 @@
flash_driver = &intel16_flash_driver;
}
-__initlist(init_idr_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_idr_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
static void idr_init_hardware(void)
@@ -58,4 +58,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(idr_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(idr_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: initcalls.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/initcalls.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- initcalls.c 2001/10/15 21:27:05 1.2
+++ initcalls.c 2002/01/03 16:07:17 1.3
@@ -39,7 +39,7 @@
/* default serial initialisation */
static void serial_default_init(void)
{
- SerialInit(baud9k6);
+ serial_init(baud_9600);
}
Index: intel16.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/intel16.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- intel16.c 2001/12/28 01:06:12 1.3
+++ intel16.c 2002/01/03 16:07:17 1.4
@@ -86,7 +86,7 @@
SerialOutputHex(result);
SerialOutputString(", addr=0x");
SerialOutputHex((u32) addr);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return -EFLASHERASE;
}
@@ -135,7 +135,7 @@
SerialOutputHex(*dst);
SerialOutputString(", *src=0x");
SerialOutputHex(*src);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return -EFLASHPGM;
}
@@ -228,7 +228,7 @@
SerialOutputHex((u32) blockStart);
SerialOutputString(", status=0x");
SerialOutputHex((u32) result);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return -EFLASHPGM;
}
@@ -268,7 +268,7 @@
SerialOutputHex((u32) blockStart);
SerialOutputString(", status=0x");
SerialOutputHex((u32) result);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return -EFLASHPGM;
}
@@ -297,7 +297,7 @@
SerialOutputHex((u32) blockStart);
SerialOutputString(": 0x");
SerialOutputHex((u32) result);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return result & (LOCK_STATUS_LOCKED | LOCK_STATUS_LOCKEDDOWN);
Index: intel32.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/intel32.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- intel32.c 2001/12/28 01:06:12 1.3
+++ intel32.c 2002/01/03 16:07:18 1.4
@@ -87,7 +87,7 @@
SerialOutputHex(result);
SerialOutputString(", addr=0x");
SerialOutputHex((u32) addr);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return -EFLASHERASE;
}
@@ -132,7 +132,7 @@
SerialOutputHex(result);
SerialOutputString(", addr=0x");
SerialOutputHex((u32) dst);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
return -EFLASHPGM;
}
Index: jornada720.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/jornada720.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jornada720.c 2002/01/02 01:18:57 1.2
+++ jornada720.c 2002/01/03 16:07:18 1.3
@@ -30,6 +30,7 @@
#include <blob/init.h>
#include <blob/sa1100.h>
#include <blob/serial.h>
+#include <blob/time.h>
/* flash descriptor for Jornada720 flash */
@@ -74,7 +75,7 @@
flash_driver->disable_vpp = jornada720_disable_vpp;
}
-__initlist(init_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
static void init_hardware(void)
@@ -99,4 +100,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: lart.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/lart.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lart.c 2002/01/02 01:18:57 1.5
+++ lart.c 2002/01/03 16:07:18 1.6
@@ -64,7 +64,7 @@
flash_driver = &intel32_flash_driver;
}
-__initlist(init_lart_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_lart_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -75,4 +75,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(lart_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(lart_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- main.c 2001/12/27 18:27:37 1.19
+++ main.c 2002/01/03 16:07:18 1.20
@@ -58,7 +58,7 @@
static int do_reload(char *what);
-static void PrintSerialSpeed(eBauds speed);
+static void PrintSerialSpeed(serial_baud_t speed);
static void print_elf_sections(void);
@@ -87,18 +87,18 @@
blob_status.paramType = fromFlash;
blob_status.kernelType = fromFlash;
blob_status.ramdiskType = fromFlash;
- blob_status.downloadSpeed = baud115k2;
- blob_status.terminalSpeed = baud9k6;
+ blob_status.downloadSpeed = baud_115200;
+ blob_status.terminalSpeed = baud_9600;
blob_status.load_ramdisk = 1;
blob_status.cmdline[0] = '\0';
blob_status.boot_delay = 10;
- /* call SerialInit() because the default 9k6 speed might not
+ /* 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)
- blob_status.terminalSpeed = baud115k2; /* DEBUG */
+ blob_status.terminalSpeed = baud_115200; /* DEBUG */
#endif
- SerialInit(blob_status.terminalSpeed);
+ serial_init(blob_status.terminalSpeed);
/* parse the core tag, for critical things like terminal speed */
#ifdef PARAM_START
@@ -128,7 +128,7 @@
SerialOutputString("Current stack pointer: 0x");
asm("mov %0, sp": "=r" (stackptr));
SerialOutputHex(stackptr);
- SerialOutputByte('\n');
+ serial_write('\n');
}
#endif
@@ -146,7 +146,7 @@
/* wait 10 seconds before starting autoboot */
SerialOutputString("Autoboot in progress, press any key to stop ");
for(i = 0; i < blob_status.boot_delay; i++) {
- SerialOutputByte('.');
+ serial_write('.');
retval = SerialInputBlock(commandline, 1, 1);
@@ -234,7 +234,7 @@
PrintSerialSpeed(blob_status.terminalSpeed);
SerialOutputString(" baud.\n");
- SerialInit(blob_status.downloadSpeed);
+ serial_init(blob_status.downloadSpeed);
} else {
SerialOutputString("You have 60 seconds to start downloading.\n");
}
@@ -254,7 +254,7 @@
/* reload the correct memory */
do_reload(argv[1]);
- SerialInit(blob_status.terminalSpeed);
+ serial_init(blob_status.terminalSpeed);
return retval;
}
SerialOutputString("Received ");
@@ -269,7 +269,7 @@
SerialOutputString(".\n");
- SerialInit(blob_status.terminalSpeed);
+ serial_init(blob_status.terminalSpeed);
return 0;
}
@@ -339,7 +339,7 @@
SerialOutputHex(numBytes);
SerialOutputString(" > 0x");
SerialOutputHex(maxSize);
- SerialOutputByte('\n');
+ serial_write('\n');
return -ETOOLONG;
}
@@ -370,33 +370,33 @@
return -ENOPARAMS;
if(strncmp(argv[1], "1200", 5) == 0) {
- blob_status.downloadSpeed = baud1k2;
+ blob_status.downloadSpeed = baud_1200;
} else if(strncmp(argv[1], "1k2", 4) == 0) {
- blob_status.downloadSpeed = baud1k2;
+ blob_status.downloadSpeed = baud_1200;
} else if(strncmp(argv[1], "9600", 5) == 0) {
- blob_status.downloadSpeed = baud9k6;
+ blob_status.downloadSpeed = baud_9600;
} else if(strncmp(argv[1], "9k6", 4) == 0) {
- blob_status.downloadSpeed = baud9k6;
+ blob_status.downloadSpeed = baud_9600;
} else if(strncmp(argv[1], "19200", 6) == 0) {
- blob_status.downloadSpeed = baud19k2;
+ blob_status.downloadSpeed = baud_19200;
} else if(strncmp(argv[1], "19k2", 5) == 0) {
- blob_status.downloadSpeed = baud19k2;
+ blob_status.downloadSpeed = baud_19200;
} else if(strncmp(argv[1], "38400", 7) == 0) {
- blob_status.downloadSpeed = baud38k4;
+ blob_status.downloadSpeed = baud_38400;
} else if(strncmp(argv[1], "38k4", 5) == 0) {
- blob_status.downloadSpeed = baud38k4;
+ blob_status.downloadSpeed = baud_38400;
} else if(strncmp(argv[1], "57600", 6) == 0) {
- blob_status.downloadSpeed = baud57k6;
+ blob_status.downloadSpeed = baud_57600;
} else if(strncmp(argv[1], "57k6", 5) == 0) {
- blob_status.downloadSpeed = baud57k6;
+ blob_status.downloadSpeed = baud_57600;
} else if(strncmp(argv[1], "115200", 7) == 0) {
- blob_status.downloadSpeed = baud115k2;
+ blob_status.downloadSpeed = baud_115200;
} else if(strncmp(argv[1], "115k2", 6) == 0) {
- blob_status.downloadSpeed = baud115k2;
+ blob_status.downloadSpeed = baud_115200;
} else if(strncmp(argv[1], "230400", 7) == 0) {
- blob_status.downloadSpeed = baud230k4;
+ blob_status.downloadSpeed = baud_230400;
} else if(strncmp(argv[1], "230k4", 6) == 0) {
- blob_status.downloadSpeed = baud230k4;
+ blob_status.downloadSpeed = baud_230400;
} else {
return -EINVAL;
}
@@ -563,34 +563,34 @@
-static void PrintSerialSpeed(eBauds speed)
+static void PrintSerialSpeed(serial_baud_t speed)
{
switch(speed) {
- case baud1k2:
+ case baud_1200:
SerialOutputDec(1200);
break;
- case baud9k6:
+ case baud_9600:
SerialOutputDec(9600);
break;
- case baud19k2:
+ case baud_19200:
SerialOutputDec(19200);
break;
- case baud38k4:
+ case baud_38400:
SerialOutputDec(38400);
break;
- case baud57k6:
+ case baud_57600:
SerialOutputDec(57600);
break;
- case baud115k2:
+ case baud_115200:
SerialOutputDec(115200);
break;
- case baud230k4:
+ case baud_230400:
SerialOutputDec(230400);
break;
Index: memory.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/memory.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- memory.c 2001/10/14 20:24:32 1.3
+++ memory.c 2002/01/03 16:07:18 1.4
@@ -70,7 +70,7 @@
SerialOutputHex(addr);
SerialOutputString(", aliased from 0x");
SerialOutputHex(* (u32 *)addr);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
if(memory_map[i].used)
i++;
@@ -83,7 +83,7 @@
#ifdef BLOB_DEBUG
SerialOutputString("Detected memory at 0x");
SerialOutputHex(addr);
- SerialOutputByte('\n');
+ serial_write('\n');
#endif
/* does this start a new block? */
if(memory_map[i].used == 0) {
Index: nesa.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/nesa.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- nesa.c 2002/01/02 01:18:57 1.4
+++ nesa.c 2002/01/03 16:07:18 1.5
@@ -59,7 +59,7 @@
flash_driver = &amd32_flash_driver;
}
-__initlist(init_nesa_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_nesa_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -70,4 +70,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(nesa_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(nesa_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: param_block.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/param_block.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- param_block.c 2001/12/19 20:00:15 1.4
+++ param_block.c 2002/01/03 16:07:18 1.5
@@ -53,7 +53,7 @@
static int parse_ptag_core(const struct ptag *ptag)
{
blob_status.terminalSpeed = ptag->u.core.terminal;
- SerialInit(blob_status.terminalSpeed);
+ serial_init(blob_status.terminalSpeed);
return 0;
}
Index: partition.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/partition.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- partition.c 2001/12/19 22:53:45 1.1
+++ partition.c 2002/01/03 16:07:18 1.2
@@ -68,7 +68,7 @@
SerialOutputHex(flash_partition_table.partition[i].entry_point);
}
- SerialOutputByte('\n');
+ serial_write('\n');
}
return 0;
Index: pleb.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/pleb.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pleb.c 2002/01/02 01:18:57 1.4
+++ pleb.c 2002/01/03 16:07:18 1.5
@@ -69,7 +69,7 @@
flash_driver = &null_flash_driver;
}
-__initlist(init_pleb_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_pleb_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -80,4 +80,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(pleb_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(pleb_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: shannon.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/shannon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- shannon.c 2002/01/02 01:18:57 1.5
+++ shannon.c 2002/01/03 16:07:18 1.6
@@ -58,7 +58,7 @@
flash_driver = &amd32_flash_driver;
}
-__initlist(init_shannon_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_shannon_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -69,4 +69,4 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(shannon_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(shannon_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
Index: system3.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/system3.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- system3.c 2002/01/02 01:18:57 1.8
+++ system3.c 2002/01/03 16:07:18 1.9
@@ -96,7 +96,7 @@
flash_driver = &intel32_flash_driver;
}
-__initlist(init_system3_flash_driver, INIT_LEVEL_OTHER_STUFF);
+__initlist(init_system3_flash_driver, INIT_LEVEL_DRIVER_SELECTION);
@@ -107,7 +107,7 @@
serial_driver = &sa11x0_serial_driver;
}
-__initlist(system3_init_hardware, INIT_LEVEL_INITIAL_HARDWARE);
+__initlist(system3_init_hardware, INIT_LEVEL_DRIVER_SELECTION);
@@ -140,7 +140,7 @@
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);
+ serial_init(blob_status.downloadSpeed);
} else {
SerialOutputString("You have 60 seconds to start downloading.\n");
}
@@ -159,7 +159,7 @@
if (blob_status.terminalSpeed != blob_status.downloadSpeed) {
SerialOutputString("\n(Please switch your terminal emulator back to terminal speed\n");
- SerialInit(blob_status.terminalSpeed);
+ serial_init(blob_status.terminalSpeed);
}
DONE:
Index: uucodec.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/uucodec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- uucodec.c 2001/10/07 19:34:17 1.2
+++ uucodec.c 2002/01/03 16:07:18 1.3
@@ -58,9 +58,9 @@
/* #define IS_DEC(c) (1) */
#define OUT_OF_RANGE do { \
- SerialOutputByte('\n'); \
+ serial_write('\n'); \
SerialOutputString(buf); \
- SerialOutputByte('\n'); \
+ serial_write('\n'); \
return -ERANGE; \
} while(0)
@@ -98,7 +98,7 @@
}
/* Status print to show where we are at right now */
if((linesReceived++ & 0x007F) == 0) {
- SerialOutputByte('.');
+ serial_write('.');
}
/*
* `n' is used to avoid writing out all the characters
@@ -144,7 +144,7 @@
}
}
}
- SerialOutputByte('\n');
+ serial_write('\n');
if (SerialInputString(p = buf, sizeof(buf), 2) == 0 || (strncmp(buf, "end", 3))) {
/* no "end" line */
return -ETOOSHORT;
@@ -171,26 +171,26 @@
bufBase += n;
bufLen -= n;
ch = ENC(n);
- SerialOutputByte(ch);
+ serial_write(ch);
for (p = buf; n > 0; n -= 3, p += 3) {
ch = *p >> 2;
ch = ENC(ch);
- SerialOutputByte(ch);
+ serial_write(ch);
ch = ((*p << 4) & 060) | ((p[1] >> 4) & 017);
ch = ENC(ch);
- SerialOutputByte(ch);
+ serial_write(ch);
ch = ((p[1] << 2) & 074) | ((p[2] >> 6) & 03);
ch = ENC(ch);
- SerialOutputByte(ch);
+ serial_write(ch);
ch = p[2] & 077;
ch = ENC(ch);
- SerialOutputByte(ch);
+ serial_write(ch);
}
- SerialOutputByte('\n');
+ serial_write('\n');
}
ch = ENC('\0');
- SerialOutputByte(ch);
- SerialOutputByte('\n');
+ serial_write(ch);
+ serial_write('\n');
SerialOutputString("end\n");
} /* UUEncode */
|
