Re: [ECOS] minor bug in flash_28fxxx.inl

[Jesper Skov <jskov at cambridge dot redhat dot com>]

>>>>> "Jesper" == Jesper Skov <jskov@cambridge.redhat.com> writes:

Jesper> The latter should be CYGNUM_FLASH_SERIES, I think.

Nonsense! This is what I've committed:

Index: ChangeLog
===================================================================
RCS file:
/home/cvs/ecc/ecc/devs/flash/intel/28fxxx/current/ChangeLog,v
retrieving revision 1.4
diff -p -u -5 -r1.4 ChangeLog
--- ChangeLog   2001/05/23 11:56:44     1.4
+++ ChangeLog   2001/06/20 09:47:31
@@ -1,5 +1,10 @@
+2001-06-20  Jesper Skov  <jskov@redhat.com>
+
+       * include/flash_28fxxx.inl (flash_hwr_init): Fix bad size
+       calculations.
+
 2001-05-23  Jesper Skov  <jskov@redhat.com>
 
        * cdl/flash_intel_28fxxx.cdl: Links flash functions to RAM. IO
        driver should not copy them there.
 
Index: include/flash_28fxxx.inl
===================================================================
RCS file:
/home/cvs/ecc/ecc/devs/flash/intel/28fxxx/current/include/flash_28fxxx.inl,v
retrieving revision 1.3
diff -p -u -5 -r1.3 flash_28fxxx.inl
--- include/flash_28fxxx.inl    2001/03/23 15:09:15     1.3
+++ include/flash_28fxxx.inl    2001/06/20 09:46:27
@@ -137,14 +137,14 @@ flash_hwr_init(void)
     if (id[0] != CYGNUM_FLASH_ID_MANUFACTURER
         || id[1] != CYGNUM_FLASH_ID_DEVICE)
         return FLASH_ERR_DRV_WRONG_PART;
 
     // Hard wired for now
-    flash_info.block_size = FLASH_BLOCK_SIZE *
CYGNUM_FLASH_INTERLEAVE;
+    flash_info.block_size = FLASH_BLOCK_SIZE;
     flash_info.blocks = FLASH_NUM_REGIONS;
     flash_info.start = (void *)CYGNUM_FLASH_BASE;
-    flash_info.end = (void *)(CYGNUM_FLASH_BASE+ (FLASH_NUM_REGIONS *
FLASH_BLOCK_SIZE * CYGNUM_FLASH_INTERLEAVE * CYGNUM_FLASH_SERIES));
+    flash_info.end = (void *)(CYGNUM_FLASH_BASE+ (FLASH_NUM_REGIONS *
FLASH_BLOCK_SIZE * CYGNUM_FLASH_SERIES));
     flash_info.buffer_size = FLASH_BUFFER_SIZE;
 
     return FLASH_ERR_OK;
 }
 


Still needs a rewrite though...

Jesper