diff options
author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-03-15 13:36:44 +0000 |
---|---|---|
committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-03-15 13:36:44 +0000 |
commit | cb582796539d35920e918bec2d0118eb3736d40e (patch) | |
tree | 0c46f343c31094c65d196c66cc821e0a6d43bf49 /src/helper/types.h | |
parent | e0c2e30660bef422744e885ab32c26c58978a8a1 (diff) |
- reworked file i/o. every fileaccess (target, flash, nand, in future configuration, too) should now go through the fileio subsystem
- added support for reading IHEX files (through fileio)
- load/dump_binary renamed to the more generic load/dump_image <file> <address> ['bin'|'ihex']
- added NAND framework (preliminary)
- added support for the LPC3180 SLC and MLC NAND controllers (preliminary)
- fix initialization for parport
- gw16012 fixes/cleanups
- added EmbeddedICE version 7 (preliminary, reported on two LPC23xx devices so far)
- added 'arm7_9 etm <target#>' configuration command to enable access to the ETM registers
git-svn-id: svn://svn.berlios.de/openocd/trunk@132 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/helper/types.h')
-rw-r--r-- | src/helper/types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/helper/types.h b/src/helper/types.h index 90f49396..69cb16a2 100644 --- a/src/helper/types.h +++ b/src/helper/types.h @@ -34,6 +34,10 @@ typedef unsigned short u16; typedef unsigned int u32; #endif +#ifndef u64 +typedef unsigned long long u64; +#endif + #ifdef WORDS_BIGENDIAN /* big endian host */ #define le_to_h_u32(x) (u32)(x[0] | x[1] << 8 | x[2] << 16 | x[3] << 24) @@ -61,8 +65,8 @@ typedef unsigned int u32; #else /* little endian host */ #define le_to_h_u32(x) (*(u32*)(x)) #define le_to_h_u16(x) (*(u16*)(x)) -#define be_to_h_u32(x) (u32)(x[3] | x[2] << 8 | x[1] << 16 | x[0] << 24) -#define be_to_h_u16(x) (u16)(x[1] | x[0] << 8) +#define be_to_h_u32(x) (u32)((x)[3] | (x)[2] << 8 | (x)[1] << 16 | (x)[0] << 24) +#define be_to_h_u16(x) (u16)((x)[1] | (x)[0] << 8) #define h_u32_to_le(buf, val) do { *(u32*)(buf) = (val); } while (0) #define h_u16_to_le(buf, val) do { *(u16*)(buf) = (val); } while (0) |