From c140c6f534b085958724c771c2ad01805c7e7ba7 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 16 May 2008 18:03:34 +0000 Subject: 2008-05-16 Joel Sherrill * mpc83xx/include/mpc83xx.h: or is not a good name for any name in C/C++. See iso646.h for the reason. --- c/src/lib/libcpu/powerpc/ChangeLog | 5 +++++ c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'c/src') diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 226b01714e..51eb686f6b 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,8 @@ +2008-05-16 Joel Sherrill + + * mpc83xx/include/mpc83xx.h: or is not a good name for any name in + C/C++. See iso646.h for the reason. + 2008-05-15 Thomas Doerfler * mpc83xx/i2c/mpc83xx_i2cdrv.c: 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 */ -- cgit v1.2.3