Mercurial > flash_v2

changeset 1711:3bafac44ac03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/flashiodev.c: Fix typo in macro and configuration options
author asl
date Fri, 06 Aug 2004 11:18:33 +0000
parents d7584216347b
children 42611e3b4e77
files packages/io/flash/current/ChangeLog packages/io/flash/current/src/flashiodev.c
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/flash/current/ChangeLog
+++ b/packages/io/flash/current/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-06  Andrew Lunn  <andrew.lunn@ascom.ch>
+
+	* src/flashiodev.c: Fix typo in macro and configuration options
+	
 2004-08-05  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* src/flash.c: Major rewrite to implement a new API
--- a/packages/io/flash/current/src/flashiodev.c
+++ b/packages/io/flash/current/src/flashiodev.c
@@ -299,7 +299,7 @@ static struct flashiodev_priv_t priv1 = 
   0,       // end
   1,       // use_fis
   0,       // use_static
-  0.       // use_offset
+  0,       // use_offset
   CYGDAT_IO_FLASH_BLOCK_FIS_NAME_1,
   0        // blocksize
 };
@@ -315,7 +315,8 @@ static struct flashiodev_priv_t priv1 = 
   "",      // fis_name
   0        // blocksize
 };
-#else
+#endif
+#ifdef CYGNUM_IO_FLASH_BLOCK_CFG_STATIC_1
 static struct flashiodev_priv_t priv1 = {
   CYGNUM_IO_FLASH_BLOCK_OFFSET_1,       // start
   CYGNUM_IO_FLASH_BLOCK_LENGTH_1,       // end 
@@ -352,11 +353,10 @@ static struct flashiodev_priv_t priv2 = 
   0,       // end
   1,       // use_fis
   0,       // use_static
-  0.       // use_offset
+  0,       // use_offset
   CYGDAT_IO_FLASH_BLOCK_FIS_NAME_2,
   0        // blocksize
 };
-
 #endif
 #ifdef CYGNUM_IO_FLASH_BLOCK_CFG_STATIC_ABSOLUTE_2 
 static struct flashiodev_priv_t priv2 = {
@@ -368,7 +368,8 @@ static struct flashiodev_priv_t priv2 = 
   "",      // fis_name
   0        // blocksize
 };
-#else
+#endif
+#ifdef CYGNUM_IO_FLASH_BLOCK_CFG_STATIC_2
 static struct flashiodev_priv_t priv2 = {
   CYGNUM_IO_FLASH_BLOCK_OFFSET_2,       // start
   CYGNUM_IO_FLASH_BLOCK_LENGTH_2,       // end