changeset 1607:97461e236a47

Silence compiler warnings
author gthomas
date Fri, 23 Apr 2004 20:50:32 +0000
parents 6afeeb154176
children efb036167f32
files packages/devs/flash/amd/am29xxxxx/current/ChangeLog packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/flash/amd/am29xxxxx/current/ChangeLog
+++ b/packages/devs/flash/amd/am29xxxxx/current/ChangeLog
@@ -1,3 +1,7 @@
+2004-04-21  Sebastien Couret  <sebastien.couret@elios-informatique.com>
+
+	* include/flash_am29xxxxx.inl: Minor changes to silence warnings.
+
 2004-04-08  Bob Koninckx <bob.koninckx@o-3s.com>
 	* include/flash_am29xxxxx_parts.inl: Added support for AM29PL160 top
 	boot block devices and corrected typo.
--- a/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl
+++ b/packages/devs/flash/amd/am29xxxxx/current/include/flash_am29xxxxx.inl
@@ -192,7 +192,7 @@ int  flash_program_buf(void* addr, void*
 
 //----------------------------------------------------------------------------
 // Auxiliary functions
-static flash_data_t * find_bank(volatile flash_data_t * base, void * addr, CYG_ADDRWORD * bo)
+static volatile flash_data_t * find_bank(volatile flash_data_t * base, void * addr, CYG_ADDRWORD * bo)
     __attribute__ ((section (".2ram.find_bank")));
 static flash_data_t * find_sector(volatile flash_data_t * addr, unsigned long *remain_size)
     __attribute__ ((section (".2ram.find_sector")));
@@ -431,7 +431,7 @@ flash_program_buf(void* addr, void* data
 {
     volatile flash_data_t* ROM;
     volatile flash_data_t* BANK;
-    volatile flash_data_t* SECT;
+    volatile flash_data_t* SECT=NULL;
     volatile flash_data_t* data_ptr = (volatile flash_data_t*) data;
     volatile flash_data_t* addr_p = (flash_data_t*) addr;
     volatile flash_data_t* addr_v = FLASH_P2V(addr_p);
@@ -532,7 +532,7 @@ flash_program_buf(void* addr, void* data
     return res;
 }
 
-static flash_data_t *
+static volatile flash_data_t *
 find_bank(volatile flash_data_t * base, void * addr, CYG_ADDRWORD * bo)
 {
     volatile flash_data_t * res = base;
@@ -559,7 +559,7 @@ find_sector(volatile flash_data_t * addr
     const CYG_ADDRESS mask = flash_dev_info->block_size - 1;
     const CYG_ADDRESS a = (CYG_ADDRESS) addr;
     const CYG_ADDRESS base = a & flash_dev_info->base_mask;
-    const CYG_ADDRESS res = a & ~mask;
+    CYG_ADDRESS res = a & ~mask;
     
     *remain_size = flash_dev_info->block_size - (a & mask);