diff options
| author | Till Straumann <strauman@slac.stanford.edu> | 2006-07-12 23:43:56 +0000 |
|---|---|---|
| committer | Till Straumann <strauman@slac.stanford.edu> | 2006-07-12 23:43:56 +0000 |
| commit | c8f74b474ad279fe87dac9be1c262de03068bde5 (patch) | |
| tree | 59486f0f6bff7f6d9f92489c798c30d53db84b84 /c/src/lib/libbsp | |
| parent | * shared/startup/probeMemEnd.c: added paranoia to inline (diff) | |
| download | rtems-c8f74b474ad279fe87dac9be1c262de03068bde5.tar.bz2 | |
* vmeUniverse/vmeTsi148.c: Silenced compiler warnings
(gcc-4.1.1 warns that uint32_t and unsigned int are different).
Diffstat (limited to 'c/src/lib/libbsp')
| -rw-r--r-- | c/src/lib/libbsp/shared/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/shared/ChangeLog b/c/src/lib/libbsp/shared/ChangeLog index ec8d8141d8..a633a2d4de 100644 --- a/c/src/lib/libbsp/shared/ChangeLog +++ b/c/src/lib/libbsp/shared/ChangeLog @@ -1,3 +1,8 @@ +2006-07-12 Till Straumann <strauman@slac.stanford.edu> + + * vmeUniverse/vmeTsi148.c: Silenced compiler warnings + (gcc-4.1.1 warns that uint32_t and unsigned int are different). + 2006-06-19 Till Straumann <strauman@slac.stanford.edu> * vmeUniverse/vme_amd_defs.h: Added address-modifier diff --git a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c index d0ab3df4b3..c2bc9b1f1a 100644 --- a/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c +++ b/c/src/lib/libbsp/shared/vmeUniverse/vmeTsi148.c @@ -184,10 +184,10 @@ #define TSI_INTM2_REG 0x45c -#define TSI_RD(base, reg) in_be32(((base) + (reg)/sizeof(*base))) +#define TSI_RD(base, reg) in_be32((volatile unsigned *)((base) + (reg)/sizeof(*base))) #define TSI_RD16(base, reg) in_be16((volatile unsigned short *)(base) + (reg)/sizeof(short)) #define TSI_RD8(base, reg) *((volatile unsigned char *)(base) + (reg)) -#define TSI_WR(base, reg, val) out_be32(((base) + (reg)/sizeof(*base)), val) +#define TSI_WR(base, reg, val) out_be32((volatile unsigned *)((base) + (reg)/sizeof(*base)), val) #define UNIV_SCTL_AM_MASK (UNIV_CTL_VAS | UNIV_SCTL_PGM | UNIV_SCTL_DAT | UNIV_SCTL_USER | UNIV_SCTL_SUPER) |