Mercurial > ecos

changeset 2869:b05be09f157f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix 16as8 macros
author bartv
date Tue, 21 Apr 2009 15:40:08 +0000
parents 6338fd43e9be
children e0f9e9ff3920
files packages/devs/flash/intel/stratav2/current/ChangeLog packages/devs/flash/intel/stratav2/current/src/strata.c
diffstat 2 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/flash/intel/stratav2/current/ChangeLog
+++ b/packages/devs/flash/intel/stratav2/current/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-21  Bart Veer  <bartv@ecoscentric.com>
+
+	* src/strata.c: Added set of parentheses around macro parameters
+	used in multiplications. Fixes 16as8 bug.
+
 2008-12-19  Jonathan Larmour  <jifl@eCosCentric.com>
 
 	* cdl/flash_strata_v2.cdl: Doh, fix doc link properly.
--- a/packages/devs/flash/intel/stratav2/current/src/strata.c
+++ b/packages/devs/flash/intel/stratav2/current/src/strata.c
@@ -146,10 +146,10 @@
 #define STRATA_OFFSET_CFI_WRITE_BUFFER_LSB      STRATA_OFFSET_CFI_DATA(0x002A)
 #define STRATA_OFFSET_CFI_WRITE_BUFFER_MSB      STRATA_OFFSET_CFI_DATA(0x002B)
 #define STRATA_OFFSET_CFI_BLOCK_REGIONS         STRATA_OFFSET_CFI_DATA(0x002C)
-#define STRATA_OFFSET_CFI_BLOCK_COUNT_LSB(_i_)  STRATA_OFFSET_CFI_DATA(0x002D + (4 * _i_))
-#define STRATA_OFFSET_CFI_BLOCK_COUNT_MSB(_i_)  STRATA_OFFSET_CFI_DATA(0x002E + (4 * _i_))
-#define STRATA_OFFSET_CFI_BLOCK_SIZE_LSB(_i_)   STRATA_OFFSET_CFI_DATA(0x002F + (4 * _i_))
-#define STRATA_OFFSET_CFI_BLOCK_SIZE_MSB(_i_)   STRATA_OFFSET_CFI_DATA(0x0030 + (4 * _i_))
+#define STRATA_OFFSET_CFI_BLOCK_COUNT_LSB(_i_)  STRATA_OFFSET_CFI_DATA(0x002D + (4 * (_i_)))
+#define STRATA_OFFSET_CFI_BLOCK_COUNT_MSB(_i_)  STRATA_OFFSET_CFI_DATA(0x002E + (4 * (_i_)))
+#define STRATA_OFFSET_CFI_BLOCK_SIZE_LSB(_i_)   STRATA_OFFSET_CFI_DATA(0x002F + (4 * (_i_)))
+#define STRATA_OFFSET_CFI_BLOCK_SIZE_MSB(_i_)   STRATA_OFFSET_CFI_DATA(0x0030 + (4 * (_i_)))
 
 #define STRATA_STATUS_SR7   STRATA_SWAP(STRATA_PARALLEL(0x0080))
 #define STRATA_STATUS_SR6   STRATA_SWAP(STRATA_PARALLEL(0x0040))
@@ -471,6 +471,6 @@ strata_get_block_info(struct cyg_flash_d
 #define STRATA_OFFSET_MANUFACTURER_ID   00
 #define STRATA_OFFSET_DEVICE_ID         02
 #define STRATA_OFFSET_LOCK_STATUS       04
-#define STRATA_OFFSET_CFI_DATA(_idx_)   (2 * _idx_)
+#define STRATA_OFFSET_CFI_DATA(_idx_)   (2 * (_idx_))
 
 #include "strata_aux.c"