changeset 2951:ecbc3608d513

* src/flashiodev.c (flashiodev_lookup): Fix wrong code execution if CYGFUN_IO_FLASH_BLOCK_FROM_FIS is enabled and CYGFUN_IO_FLASH_BLOCK_FROM_DEVOFFSET is disabled.
author jlarmour
date Sat, 15 May 2010 16:43:56 +0000
parents dc8e6a281225
children 996c69429643
files packages/io/flash/current/ChangeLog packages/io/flash/current/src/flashiodev.c
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/io/flash/current/ChangeLog
+++ b/packages/io/flash/current/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-15  Christophe Coutand <ccoutand@stmi.com>
+
+	* src/flashiodev.c (flashiodev_lookup): Fix wrong code execution if
+	CYGFUN_IO_FLASH_BLOCK_FROM_FIS is enabled and
+	CYGFUN_IO_FLASH_BLOCK_FROM_DEVOFFSET is disabled.
+
 2010-03-25  Daniel Helgason  <dhelgason@shaw.ca>
 
 	* cdl/io_flash.cdl: Fix "requires" constraint on
--- a/packages/io/flash/current/src/flashiodev.c
+++ b/packages/io/flash/current/src/flashiodev.c
@@ -247,7 +247,10 @@ flashiodev_lookup(struct cyg_devtab_entr
         start = flash_base;
         end = flash_base + size - 1;
         valid = true;
-    } else
+    }
+# ifdef CYGFUN_IO_FLASH_BLOCK_FROM_DEVOFFSET
+    else
+# endif
 #endif // ifdef CYGFUN_IO_FLASH_BLOCK_FROM_FIS
 #ifdef CYGFUN_IO_FLASH_BLOCK_FROM_DEVOFFSET
     // Next, support device numbers with offsets encoded in path name