Update of /cvsroot/blob/blob/src/blob
In directory usw-pr-cvs1:/tmp/cvs-serv21403/src/blob
Modified Files:
amd32.c flash.c intel16.c intel32.c nullflash.c
Log Message:
Just a couple of cosmetical changes
Index: amd32.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/amd32.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- amd32.c 2001/10/21 21:35:11 1.1
+++ amd32.c 2001/10/25 09:59:23 1.2
@@ -186,6 +186,6 @@
/* flash driver structure */
flash_driver_t amd32_flash_driver = {
- flash_erase: flash_erase_amd32,
- flash_write: flash_write_amd32,
+ erase: flash_erase_amd32,
+ write: flash_write_amd32,
};
Index: flash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/flash.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- flash.c 2001/10/24 12:28:25 1.6
+++ flash.c 2001/10/25 09:59:23 1.7
@@ -172,7 +172,7 @@
SerialOutputByte('\n');
/* dirty block */
- rv = flash_driver->flash_erase(cur);
+ rv = flash_driver->erase(cur);
if(rv < 0) {
printerrprefix();
@@ -215,7 +215,7 @@
u32 nscandown = 0;
u32 nskip = 0;
-#if BLOB_DEBUG
+#if defined BLOB_DEBUG
SerialOutputString(__FUNCTION__ "(): flashing 0x");
SerialOutputHex(nwords);
SerialOutputString(" (");
@@ -236,7 +236,7 @@
}
/* different, so write to this location */
- rv = flash_driver->flash_write(&dst[i], &src[i]);
+ rv = flash_driver->write(&dst[i], &src[i]);
nwrite++;
if(rv == 0) {
@@ -249,7 +249,7 @@
SerialOutputString("...");
/* erase block at current location */
- rv = flash_driver->flash_erase(&dst[i]);
+ rv = flash_driver->erase(&dst[i]);
nerase++;
if(rv < 0) {
/* something is obviously wrong */
Index: intel16.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/intel16.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- intel16.c 2001/10/21 21:35:11 1.1
+++ intel16.c 2001/10/25 09:59:23 1.2
@@ -167,6 +167,6 @@
/* flash driver structure */
flash_driver_t intel16_flash_driver = {
- flash_erase: flash_erase_intel16,
- flash_write: flash_write_intel16,
+ erase: flash_erase_intel16,
+ write: flash_write_intel16,
};
Index: intel32.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/intel32.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- intel32.c 2001/10/21 21:35:11 1.1
+++ intel32.c 2001/10/25 09:59:23 1.2
@@ -115,6 +115,6 @@
/* flash driver structure */
flash_driver_t intel32_flash_driver = {
- flash_erase: flash_erase_intel32,
- flash_write: flash_write_intel32,
+ erase: flash_erase_intel32,
+ write: flash_write_intel32,
};
Index: nullflash.c
===================================================================
RCS file: /cvsroot/blob/blob/src/blob/nullflash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nullflash.c 2001/10/21 21:42:09 1.2
+++ nullflash.c 2001/10/25 09:59:23 1.3
@@ -37,7 +37,7 @@
{
#ifdef BLOB_DEBUG
printerrprefix();
- SerialOutputString("No flash_erase() function\n");
+ SerialOutputString("No flash erase() function\n");
#endif
return -EFLASHERASE;
}
@@ -49,7 +49,7 @@
{
#ifdef BLOB_DEBUG
printerrprefix();
- SerialOutputString("No flash_write() function\n");
+ SerialOutputString("No flash write() function\n");
#endif
return -EFLASHPGM;
}
@@ -59,6 +59,6 @@
/* flash driver structure */
flash_driver_t null_flash_driver = {
- flash_erase: flash_erase_null,
- flash_write: flash_write_null,
+ erase: flash_erase_null,
+ write: flash_write_null,
};
|
