diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-16 18:03:34 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-05-16 18:03:34 +0000 |
| commit | c140c6f534b085958724c771c2ad01805c7e7ba7 (patch) | |
| tree | 7faccff13cae7c14576d2990d174a7b40318657b /c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h | |
| parent | 2008-05-16 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-c140c6f534b085958724c771c2ad01805c7e7ba7.tar.bz2 | |
2008-05-16 Joel Sherrill <joel.sherrill@OARcorp.com>
* mpc83xx/include/mpc83xx.h: or is not a good name for any name in
C/C++. See iso646.h for the reason.
Diffstat (limited to 'c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h b/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h index 459aaee1cc..46333989c8 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h +++ b/c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h @@ -1,3 +1,7 @@ +/* + * $Id$ + */ + #ifndef _MPC83XX_MPC83XX_H #define _MPC83XX_MPC83XX_H @@ -337,7 +341,7 @@ typedef struct m83xxDUARTRegisters_ { typedef struct m83xxLBCRegisters_ { struct { volatile uint32_t br; /* 0x0_5000 Base register 0 ,R/W 0x0000_RR01 10.3.1.1/10-11 */ - volatile uint32_t or; /* 0x0_5004 Options register 0 R/W 0x0000_0FF7 10.3.1.2/10-12 */ + volatile uint32_t optionsr; /* 0x0_5004 Options register 0 R/W 0x0000_0FF7 10.3.1.2/10-12 */ } bor[8]; uint8_t reserved0_5040[0x05068-0x05040];/* 0x0_5040-5067 Reserved */ volatile uint32_t mar; /* 0x0_5068 UPM address register R/W 0x0000_0000 10.3.1.3/10-18 */ |