RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2008-05-16 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* mpc83xx/include/mpc83xx.h: or is not a good name for any name in
	C/C++. See iso646.h for the reason.
This commit is contained in:
Joel Sherrill
2008-05-16 18:03:34 +00:00
parent 0a665801d0
commit c140c6f534
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libcpu/powerpc/ChangeLog
View File

@@ -1,3 +1,8 @@
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.
2008-05-15 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* mpc83xx/i2c/mpc83xx_i2cdrv.c:

6
c/src/lib/libcpu/powerpc/mpc83xx/include/mpc83xx.h
View File

@@ -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 */