diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-07-17 07:56:09 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2015-07-17 07:59:35 +0200 |
| commit | e5a79e54d9949c8bdbab03ce800c781b5d859fea (patch) | |
| tree | c8e6178bc4508cdb447ebbea66093e2733107401 | |
| parent | sparc64/rtems/score/cpu.h: Delete dead declaration (diff) | |
| download | rtems-e5a79e54d9949c8bdbab03ce800c781b5d859fea.tar.bz2 | |
bsp/mpc83xx: Update due to header guard change
Close #2373.
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c | 10 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c index 1964ba475b..3047d8edf0 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c +++ b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c @@ -19,7 +19,7 @@ #include <stdlib.h> #include <bsp.h> #include <bsp/irq.h> -#if defined(__GEN83xx_BSP_h) +#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) #include <mpc83xx/mpc83xx_i2cdrv.h> #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) #include <bsp/mpc83xx_i2cdrv.h> @@ -31,7 +31,7 @@ #undef DEBUG -#if defined(__GEN83xx_BSP_h) +#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) #define I2CCR_MEN (1 << 7) /* module enable */ #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) #define I2CCR_MDIS (1 << 7) /* module disable */ @@ -78,7 +78,7 @@ static rtems_status_code mpc83xx_i2c_find_clock_divider int divider; int fdr_val; } dividers[] ={ -#if defined(__GEN83xx_BSP_h) +#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) { 256,0x20 }, { 288,0x21 }, { 320,0x22 }, { 352,0x23 }, { 384,0x00 }, { 416,0x01 }, { 448,0x25 }, { 480,0x02 }, { 512,0x26 }, { 576,0x03 }, { 640,0x04 }, { 704,0x05 }, @@ -203,7 +203,7 @@ static void mpc83xx_i2c_irq_handler /* * clear IRQ flag */ - #if defined(__GEN83xx_BSP_h) + #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) softc_ptr->reg_ptr->i2csr &= ~I2CSR_MIF; #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) softc_ptr->reg_ptr->i2csr = I2CSR_MIF; @@ -376,7 +376,7 @@ static rtems_status_code mpc83xx_i2c_init /* * set control register to module enable */ - #if defined(__GEN83xx_BSP_h) + #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H) softc_ptr->reg_ptr->i2ccr = I2CCR_MEN; #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) softc_ptr->reg_ptr->i2ccr = 0; diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h index 09cca4e99b..206cb87cb4 100644 --- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h +++ b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h @@ -24,7 +24,7 @@ #include <bsp.h> -#ifdef __GEN83xx_BSP_h +#ifdef LIBBSP_POWERPC_GEN83XX_BSP_H #include <mpc83xx/mpc83xx.h> #endif |