This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Fix parse error in flash.c
- From: Roland Caßebohm <roland dot cassebohm at visionsystems dot de>
- To: ecos-patches at sources dot redhat dot com
- Date: Wed, 8 Oct 2003 18:13:23 +0200
- Subject: Fix parse error in flash.c
Fix parse error when compiling packages/io/flash/current/src/flash.c
if CYGSEM_IO_FLASH_READ_INDIRECT is not defined.
Best regards,
Roland
--
___________________________________________________
VS Vision Systems GmbH, Industrial Image Processing
Dipl.-Ing. Roland Caßebohm
Aspelohe 27A, D-22848 Norderstedt, Germany
http://www.visionsystems.de
___________________________________________________
Index: packages/io/flash/current//ChangeLog
===================================================================
RCS file: /home/cassebohm/net/USERS/CVSROOT/VSprojects/ecos/packages/io/flash/current/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -5 -p -r1.1.1.1 ChangeLog
--- packages/io/flash/current//ChangeLog 29 Sep 2003 15:15:55 -0000 1.1.1.1
+++ packages/io/flash/current//ChangeLog 8 Oct 2003 15:54:05 -0000
@@ -1,5 +1,10 @@
+2003-10-08 Roland Cassebohm <roland.cassebohm@visionsystems.de>
+
+ * src/flash.c: Fix parse error if CYGSEM_IO_FLASH_READ_INDIRECT
+ is not defined.
+
2003-09-19 Gary Thomas <gary@mlbassoc.com>
* src/flash.c:
* include/flash.h:
* cdl/io_flash.cdl: Add support for NAND (indirectly accessed)
Index: packages/io/flash/current//src/flash.c
===================================================================
RCS file: /home/cassebohm/net/USERS/CVSROOT/VSprojects/ecos/packages/io/flash/current/src/flash.c,v
retrieving revision 1.1.1.1
diff -u -5 -p -r1.1.1.1 flash.c
--- packages/io/flash/current//src/flash.c 29 Sep 2003 15:15:55 -0000 1.1.1.1
+++ packages/io/flash/current//src/flash.c 8 Oct 2003 15:41:47 -0000
@@ -217,10 +217,11 @@ flash_erase(void *addr, int len, void **
HAL_FLASH_CACHES_OFF(d_cache, i_cache);
FLASH_Enable(block, end_addr);
while (block < end_addr) {
// Supply the blocksize for a gross check for erase success
+ unsigned short *tmp_block;
#if !defined(CYGSEM_IO_FLASH_READ_INDIRECT)
int i;
unsigned char *dp;
bool erased = true;
@@ -232,11 +233,10 @@ flash_erase(void *addr, int len, void **
}
}
#else
bool erased = false;
#endif
- unsigned short *tmp_block;
if (!erased) {
stat = (*_flash_erase_block)(block, flash_info.block_size);
stat = flash_hwr_map_error(stat);
}