Menu
▾
▴
CVS: blob/src/blob main.c,1.16,1.17
|
From: Erik M. <er...@us...> - 2001-12-19 19:29:27
|
Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv22077
Modified Files:
main.c
Log Message:
technically spoken, strncmp() should also compare the null character
(right, Russ? :)
Index: main.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- main.c 2001/12/19 19:03:45 1.16
+++ main.c 2001/12/19 19:29:24 1.17
@@ -192,27 +192,27 @@
if(argc < 2)
return -ENOPARAMS;
- if(strncmp(argv[1], "blob", 4) == 0) {
+ if(strncmp(argv[1], "blob", 5) == 0) {
/* download blob */
startAddress = BLOB_RAM_BASE;
bufLen = BLOB_FLASH_LEN;
numRead = &blob_status.blobSize;
blob_status.blobType = fromDownload;
#ifdef PARAM_START
- } else if(strncmp(argv[1], "param", 5) == 0) {
+ } else if(strncmp(argv[1], "param", 6) == 0) {
/* download param */
startAddress = PARAM_RAM_BASE;
bufLen = PARAM_FLASH_LEN;
numRead = &blob_status.paramSize;
blob_status.paramType = fromDownload;
#endif
- } else if(strncmp(argv[1], "kernel", 6) == 0) {
+ } else if(strncmp(argv[1], "kernel", 7) == 0) {
/* download kernel */
startAddress = KERNEL_RAM_BASE;
bufLen = KERNEL_FLASH_LEN;
numRead = &blob_status.kernelSize;
blob_status.kernelType = fromDownload;
- } else if(strncmp(argv[1], "ramdisk", 7) == 0) {
+ } else if(strncmp(argv[1], "ramdisk", 8) == 0) {
/* download ramdisk */
startAddress = RAMDISK_RAM_BASE;
bufLen = RAMDISK_FLASH_LEN;
@@ -290,27 +290,27 @@
if(argc < 2)
return -ENOPARAMS;
- if(strncmp(argv[1], "blob", 4) == 0) {
+ if(strncmp(argv[1], "blob", 5) == 0) {
src = (u32 *)BLOB_RAM_BASE;
dst = (u32 *)BLOB_FLASH_BASE;
maxSize = BLOB_FLASH_LEN;
numBytes = blob_status.blobSize;
type = blob_status.blobType;
#ifdef PARAM_START
- } else if(strncmp(argv[1], "param", 5) == 0) {
+ } else if(strncmp(argv[1], "param", 6) == 0) {
src = (u32 *)PARAM_RAM_BASE;
dst = (u32 *)PARAM_FLASH_BASE;
maxSize = PARAM_FLASH_LEN;
numBytes = blob_status.paramSize;
type = blob_status.paramType;
#endif
- } else if(strncmp(argv[1], "kernel", 6) == 0) {
+ } else if(strncmp(argv[1], "kernel", 7) == 0) {
src = (u32 *)KERNEL_RAM_BASE;
dst = (u32 *)KERNEL_FLASH_BASE;
numBytes = blob_status.kernelSize;
maxSize = KERNEL_FLASH_LEN;
type = blob_status.kernelType;
- } else if(strncmp(argv[1], "ramdisk", 7) == 0) {
+ } else if(strncmp(argv[1], "ramdisk", 8) == 0) {
src = (u32 *)RAMDISK_RAM_BASE;
dst = (u32 *)RAMDISK_FLASH_BASE;
numBytes = blob_status.ramdiskSize;
@@ -364,33 +364,33 @@
if(argc < 2)
return -ENOPARAMS;
- if(strncmp(argv[1], "1200", 4) == 0) {
+ if(strncmp(argv[1], "1200", 5) == 0) {
blob_status.downloadSpeed = baud1k2;
- } else if(strncmp(argv[1], "1k2", 3) == 0) {
+ } else if(strncmp(argv[1], "1k2", 4) == 0) {
blob_status.downloadSpeed = baud1k2;
- } else if(strncmp(argv[1], "9600", 4) == 0) {
+ } else if(strncmp(argv[1], "9600", 5) == 0) {
blob_status.downloadSpeed = baud9k6;
- } else if(strncmp(argv[1], "9k6", 3) == 0) {
+ } else if(strncmp(argv[1], "9k6", 4) == 0) {
blob_status.downloadSpeed = baud9k6;
- } else if(strncmp(argv[1], "19200", 5) == 0) {
+ } else if(strncmp(argv[1], "19200", 6) == 0) {
blob_status.downloadSpeed = baud19k2;
- } else if(strncmp(argv[1], "19k2", 4) == 0) {
+ } else if(strncmp(argv[1], "19k2", 5) == 0) {
blob_status.downloadSpeed = baud19k2;
- } else if(strncmp(argv[1], "38400", 5) == 0) {
+ } else if(strncmp(argv[1], "38400", 7) == 0) {
blob_status.downloadSpeed = baud38k4;
- } else if(strncmp(argv[1], "38k4",4 ) == 0) {
+ } else if(strncmp(argv[1], "38k4", 5) == 0) {
blob_status.downloadSpeed = baud38k4;
- } else if(strncmp(argv[1], "57600", 5) == 0) {
+ } else if(strncmp(argv[1], "57600", 6) == 0) {
blob_status.downloadSpeed = baud57k6;
- } else if(strncmp(argv[1], "57k6", 4) == 0) {
+ } else if(strncmp(argv[1], "57k6", 5) == 0) {
blob_status.downloadSpeed = baud57k6;
- } else if(strncmp(argv[1], "115200", 6) == 0) {
+ } else if(strncmp(argv[1], "115200", 7) == 0) {
blob_status.downloadSpeed = baud115k2;
- } else if(strncmp(argv[1], "115k2", 5) == 0) {
+ } else if(strncmp(argv[1], "115k2", 6) == 0) {
blob_status.downloadSpeed = baud115k2;
- } else if(strncmp(argv[1], "230400", 6) == 0) {
+ } else if(strncmp(argv[1], "230400", 7) == 0) {
blob_status.downloadSpeed = baud230k4;
- } else if(strncmp(argv[1], "230k4", 5) == 0) {
+ } else if(strncmp(argv[1], "230k4", 6) == 0) {
blob_status.downloadSpeed = baud230k4;
} else {
return -EINVAL;
@@ -498,7 +498,7 @@
u32 *src = 0;
int numWords;
- if(strncmp(what, "blob", 4) == 0) {
+ if(strncmp(what, "blob", 5) == 0) {
dst = (u32 *)BLOB_RAM_BASE;
src = (u32 *)BLOB_FLASH_BASE;
numWords = BLOB_FLASH_LEN / 4;
@@ -506,7 +506,7 @@
blob_status.blobType = fromFlash;
SerialOutputString("Loading blob from flash ");
#ifdef PARAM_START
- } else if(strncmp(what, "param", 5) == 0) {
+ } else if(strncmp(what, "param", 6) == 0) {
dst = (u32 *)PARAM_RAM_BASE;
src = (u32 *)PARAM_FLASH_BASE;
numWords = PARAM_FLASH_LEN / 4;
@@ -514,14 +514,14 @@
blob_status.paramType = fromFlash;
SerialOutputString("Loading paramater block from flash ");
#endif
- } else if(strncmp(what, "kernel", 6) == 0) {
+ } else if(strncmp(what, "kernel", 7) == 0) {
dst = (u32 *)KERNEL_RAM_BASE;
src = (u32 *)KERNEL_FLASH_BASE;
numWords = KERNEL_FLASH_LEN / 4;
blob_status.kernelSize = 0;
blob_status.kernelType = fromFlash;
SerialOutputString("Loading kernel from flash ");
- } else if(strncmp(what, "ramdisk", 7) == 0) {
+ } else if(strncmp(what, "ramdisk", 8) == 0) {
dst = (u32 *)RAMDISK_RAM_BASE;
src = (u32 *)RAMDISK_FLASH_BASE;
numWords = RAMDISK_FLASH_LEN / 4;
|
