Mercurial > flash_v2
diff packages/io/flash/current/include/flash_dev.h @ 160:0d0f03f76f6a
Merge from eCos master repository on 2001-06-01-18:52:13-BST
| author | jlarmour |
|---|---|
| date | Fri, 01 Jun 2001 22:16:29 +0000 |
| parents | e2d866e32dac |
| children | feb0fcf83327 |
line wrap: on
line diff
--- a/packages/io/flash/current/include/flash_dev.h +++ b/packages/io/flash/current/include/flash_dev.h @@ -62,7 +62,7 @@ // (unsigned)(x))) #ifndef FLASH_P2V -#define FLASH_P2V( _a_ ) ((volatile flash_t *)((unsigned int)(_a_))) +#define FLASH_P2V( _a_ ) ((volatile flash_t *)((CYG_ADDRWORD)(_a_))) #endif // ------------------------------------------------------------------------ @@ -109,7 +109,7 @@ typedef cyg_uint64 flash_data_t; # if 1 == CYGNUM_FLASH_INTERLEAVE # define FLASHWORD( k ) (k) -typedef cyg_uin16 flash_data_t; +typedef cyg_uint16 flash_data_t; # elif 2 == CYGNUM_FLASH_INTERLEAVE // 2 devices to make 32-bit # define FLASHWORD( k ) ((k)+((k)<<16))
