Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

bsp/mpc83xx: Update due to header guard change

Browse Source 
Close #2373.
This commit is contained in:
Sebastian Huber
2015-07-17 07:56:09 +02:00
parent db01d0cc61
commit e5a79e54d9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
View File

@@ -19,7 +19,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <bsp.h> #include <bsp.h>
#include <bsp/irq.h> #include <bsp/irq.h>
#if defined(__GEN83xx_BSP_h) #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
#include <mpc83xx/mpc83xx_i2cdrv.h> #include <mpc83xx/mpc83xx_i2cdrv.h>
#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
#include <bsp/mpc83xx_i2cdrv.h> #include <bsp/mpc83xx_i2cdrv.h>
@@ -31,7 +31,7 @@
#undef DEBUG #undef DEBUG
#if defined(__GEN83xx_BSP_h) #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
#define I2CCR_MEN (1 << 7) /* module enable */ #define I2CCR_MEN (1 << 7) /* module enable */
#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
#define I2CCR_MDIS (1 << 7) /* module disable */ #define I2CCR_MDIS (1 << 7) /* module disable */
@@ -78,7 +78,7 @@ static rtems_status_code mpc83xx_i2c_find_clock_divider
int divider; int divider;
int fdr_val; int fdr_val;
} dividers[] ={ } dividers[] ={
#if defined(__GEN83xx_BSP_h) #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
{ 256,0x20 }, { 288,0x21 }, { 320,0x22 }, { 352,0x23 }, { 256,0x20 }, { 288,0x21 }, { 320,0x22 }, { 352,0x23 },
{ 384,0x00 }, { 416,0x01 }, { 448,0x25 }, { 480,0x02 }, { 384,0x00 }, { 416,0x01 }, { 448,0x25 }, { 480,0x02 },
{ 512,0x26 }, { 576,0x03 }, { 640,0x04 }, { 704,0x05 }, { 512,0x26 }, { 576,0x03 }, { 640,0x04 }, { 704,0x05 },
@@ -203,7 +203,7 @@ static void mpc83xx_i2c_irq_handler
/* /*
* clear IRQ flag * clear IRQ flag
*/ */
#if defined(__GEN83xx_BSP_h) #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
softc_ptr->reg_ptr->i2csr &= ~I2CSR_MIF; softc_ptr->reg_ptr->i2csr &= ~I2CSR_MIF;
#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
softc_ptr->reg_ptr->i2csr = I2CSR_MIF; softc_ptr->reg_ptr->i2csr = I2CSR_MIF;
@@ -376,7 +376,7 @@ static rtems_status_code mpc83xx_i2c_init
/* /*
* set control register to module enable * 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; softc_ptr->reg_ptr->i2ccr = I2CCR_MEN;
#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H) #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
softc_ptr->reg_ptr->i2ccr = 0; softc_ptr->reg_ptr->i2ccr = 0;

2
c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h
View File

@@ -24,7 +24,7 @@
#include <bsp.h> #include <bsp.h>
#ifdef __GEN83xx_BSP_h #ifdef LIBBSP_POWERPC_GEN83XX_BSP_H
#include <mpc83xx/mpc83xx.h> #include <mpc83xx/mpc83xx.h>
#endif #endif