Changeset e5a79e54 in rtems


Ignore:
Timestamp:
07/17/15 05:56:09 (9 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
b56ddbb
Parents:
db01d0c
git-author:
Sebastian Huber <sebastian.huber@…> (07/17/15 05:56:09)
git-committer:
Sebastian Huber <sebastian.huber@…> (07/17/15 05:59:35)
Message:

bsp/mpc83xx: Update due to header guard change

Close #2373.

Location:
c/src/lib/libcpu/powerpc/mpc83xx/i2c
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c

    rdb01d0c re5a79e54  
    2020#include <bsp.h>
    2121#include <bsp/irq.h>
    22 #if defined(__GEN83xx_BSP_h)
     22#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
    2323  #include <mpc83xx/mpc83xx_i2cdrv.h>
    2424#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
     
    3232#undef DEBUG
    3333
    34 #if defined(__GEN83xx_BSP_h)
     34#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
    3535  #define I2CCR_MEN  (1 << 7)   /* module enable */
    3636#elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
     
    7979    int fdr_val;
    8080  } dividers[] ={
    81 #if defined(__GEN83xx_BSP_h)
     81#if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
    8282    {  256,0x20 }, {  288,0x21 }, {  320,0x22 }, {  352,0x23 },
    8383    {  384,0x00 }, {  416,0x01 }, {  448,0x25 }, {  480,0x02 },
     
    204204   * clear IRQ flag
    205205   */
    206   #if defined(__GEN83xx_BSP_h)
     206  #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
    207207    softc_ptr->reg_ptr->i2csr &= ~I2CSR_MIF;
    208208  #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
     
    377377   * set control register to module enable
    378378   */
    379   #if defined(__GEN83xx_BSP_h)
     379  #if defined(LIBBSP_POWERPC_GEN83XX_BSP_H)
    380380    softc_ptr->reg_ptr->i2ccr = I2CCR_MEN;
    381381  #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
  • c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.h

    rdb01d0c re5a79e54  
    2525#include <bsp.h>
    2626
    27 #ifdef __GEN83xx_BSP_h
     27#ifdef LIBBSP_POWERPC_GEN83XX_BSP_H
    2828  #include <mpc83xx/mpc83xx.h>
    2929#endif
Note: See TracChangeset for help on using the changeset viewer.