lpcmanager

Modified defines that specify code specific to a certain product (MC9, GOT, GOT131, ...)

2017-08-16, bmakuc
70d1c694fe56
Parents 35472c1ffa0b
Children 0f8680be74f7
Modified defines that specify code specific to a certain product (MC9, GOT, GOT131, ...)
8 files changed, 59 insertions(+), 30 deletions(-)
  • +3 -3
    LPCBus/GOT.h
  • +15 -0
    LPCBus/GOT131.h
  • +10 -2
    LPCBus/MC9.h
  • +10 -6
    LPCBus/MC9_OnBoard_cleanup.c
  • +6 -6
    LPCBus/MC9_OnBoard_decl.c
  • +11 -9
    LPCBus/MC9_OnBoard_init.c
  • +2 -2
    LPCBus/MC9_OnBoard_publish.c
  • +2 -2
    LPCBus/MC9_OnBoard_retrieve.c
    • --- a/LPCBus/GOT.h Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/GOT.h Wed Aug 16 12:25:37 2017 +0200
    @@ -1,3 +1,3 @@
    -#ifndef GOT
    -#define GOT
    -#endif
    +#ifndef RUN_LED_GPIO_1_31
    +#define RUN_LED_GPIO_1_31
    +#endif
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/LPCBus/GOT131.h Wed Aug 16 12:25:37 2017 +0200
    @@ -0,0 +1,15 @@
    +#ifndef RUN_LED_GPIO_1_31
    +#define RUN_LED_GPIO_1_31
    +#endif
    +
    +#ifndef CAN0_EN_GPIO_0_21
    +#define CAN0_EN_GPIO_0_21
    +#endif
    +
    +#ifndef CAN1_EN_GPIO_0_17
    +#define CAN1_EN_GPIO_0_17
    +#endif
    +
    +#ifndef ONBOARD_I2C
    +#define ONBOARD_I2C
    +#endif
    --- a/LPCBus/MC9.h Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/MC9.h Wed Aug 16 12:25:37 2017 +0200
    @@ -1,3 +1,11 @@
    -#ifndef MC9
    -#define MC9
    +#ifndef RUN_LED_GPIO_1_13
    +#define RUN_LED_GPIO_1_13
    +#define
    +
    +#ifndef CAN0_EN_GPIO_0_21
    +#define CAN0_EN_GPIO_0_21
    #endif
    +
    +#ifndef CAN1_EN_GPIO_0_17
    +#define CAN1_EN_GPIO_0_17
    +#endif
    --- a/LPCBus/MC9_OnBoard_cleanup.c Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/MC9_OnBoard_cleanup.c Wed Aug 16 12:25:37 2017 +0200
    @@ -5,17 +5,21 @@
    rt_task_join(&RTU_task);
    rt_mutex_delete(&RTU_BuffMutex);
    gpio_close(RTU_GPIO_dev);
    -#ifdef GOT
    +
    +#ifdef ONBOARD_I2C
    if(onboardbusfd!=-1)
    rt_dev_close(onboardbusfd);
    -#endif
    -#ifdef MC9
    +#endif /* ONBOARD_I2C */
    +
    +#ifdef CAN0_EN_GPIO_0_21
    gpio_set_pin_value(CAN0_EN_dev, 1);
    gpio_close(CAN0_EN_dev);
    +#endif /* CAN0_EN_GPIO_0_21 */
    +
    +#ifdef CAN1_EN_GPIO_0_17
    gpio_set_pin_value(CAN1_EN_dev, 1);
    gpio_close(CAN1_EN_dev);
    -#endif /* MC9 */
    -#if defined MC9 || defined GOT
    +#endif /* CAN1_EN_GPIO_0_17 */
    +
    gpio_set_pin_value(RUN_LED_dev, 1);
    gpio_close(RUN_LED_dev);
    -#endif /* MC9/GOT */
    --- a/LPCBus/MC9_OnBoard_decl.c Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/MC9_OnBoard_decl.c Wed Aug 16 12:25:37 2017 +0200
    @@ -22,13 +22,13 @@
    };
    struct gpio_device *RTU_GPIO_dev;
    -#if defined MC9 || defined GOT
    struct gpio_device *RUN_LED_dev;
    -#endif /* MC9/GOT */
    -#ifdef MC9
    +#ifdef CAN0_EN_GPIO_0_21
    struct gpio_device *CAN0_EN_dev;
    +#endif /* CAN0_EN_GPIO_0_21 */
    +#ifdef CAN1_EN_GPIO_0_17
    struct gpio_device *CAN1_EN_dev;
    -#endif /* MC9 */
    +#endif /* CAN1_EN_GPIO_0_17 */
    static int write_file_bool(int fd, int value)
    {
    @@ -351,7 +351,7 @@
    gpio_set_pin_value(RTU_GPIO_dev, 0);
    }
    -#ifdef GOT
    +#ifdef ONBOARD_I2C
    #define MAX_ONBOARD_DEVICES 2
    #define ONBOARD_READ_BUFSIZE 30
    #define ONBOARD_WRITE_BUFSIZE 30
    @@ -375,4 +375,4 @@
    static onBoardBusInit_t onBoardBusInit;
    static int onboardbusfd = -1;
    -#endif /* GOT */
    +#endif /* ONBOARD_I2C */
    --- a/LPCBus/MC9_OnBoard_init.c Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/MC9_OnBoard_init.c Wed Aug 16 12:25:37 2017 +0200
    @@ -8,23 +8,25 @@
    bzero(&ubRegDiscreteValue, sizeof(ubRegDiscreteValue));
    bzero(&mbRtuSlaveDev , sizeof(mbRtuSlaveDev ));
    bzero(&mbRtuDevTim , sizeof(mbRtuDevTim ));
    -#ifdef GOT
    +#ifdef ONBOARD_I2C
    bzero(&onBoardReadBuf , sizeof(onBoardReadBuf_t ));
    bzero(&onBoardWriteBuf , sizeof(onBoardWriteBuf_t ));
    bzero(&onBoardBusInit , sizeof(onBoardBusInit_t ));
    onBoardBusInit.common_ticktime__ = common_ticktime__;
    #define onBoardDev (onBoardBusInit.onBoardDev)
    -#endif /* GOT */
    +#endif /* ONBOARD_I2C */
    %(init_code)s
    -#ifdef MC9
    +#ifdef CAN0_EN_GPIO_0_21
    CAN0_EN_dev = gpio_open(21);
    gpio_set_pin_value(CAN0_EN_dev, 0);
    +#endif /* CAN0_EN_GPIO_0_21 */
    +#ifdef CAN1_EN_GPIO_0_17
    CAN1_EN_dev = gpio_open(17);
    gpio_set_pin_value(CAN1_EN_dev, 0);
    -#endif /* MC9 */
    +#endif /* CAN1_EN_GPIO_0_17 */
    RTU_GPIO_dev = gpio_open(111);
    if (!RTU_GPIO_dev) {
    @@ -45,7 +47,7 @@
    if(rt_task_start(&RTU_task, mbmrtu_BusUpdate_proc, NULL))
    return err;
    -#ifdef GOT
    +#ifdef ONBOARD_I2C
    unsigned char i;
    for(i=0; i<MAX_ONBOARD_DEVICES; i++) {
    switch(onBoardDev[i][1]) {
    @@ -68,11 +70,11 @@
    break;
    }
    }
    -#endif /* GOT */
    +#endif /* ONBOARD_I2C */
    -#if defined MC9
    +#if defined RUN_LED_GPIO_1_13
    RUN_LED_dev = gpio_open(45);
    -#elif defined GOT
    +#elif defined RUN_LED_GPIO_1_31
    RUN_LED_dev = gpio_open(63);
    -#endif /* MC9/GOT */
    +#endif /* RUN LED GPIO_1_13/GPIO_1_31 */
    gpio_set_pin_value(RUN_LED_dev, 0);
    --- a/LPCBus/MC9_OnBoard_publish.c Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/MC9_OnBoard_publish.c Wed Aug 16 12:25:37 2017 +0200
    @@ -6,7 +6,7 @@
    /* wakeup task */
    rt_task_unblock(&RTU_task);
    -#ifdef GOT
    +#ifdef ONBOARD_I2C
    if(onboardbusfd!=-1)
    rt_dev_ioctl(onboardbusfd, RTSMT_ONBOARD_RTIOC_WRITE, &onBoardWriteBuf);
    -#endif
    +#endif /* ONBOARD_I2C */
    --- a/LPCBus/MC9_OnBoard_retrieve.c Tue Aug 08 15:01:00 2017 +0200
    +++ b/LPCBus/MC9_OnBoard_retrieve.c Wed Aug 16 12:25:37 2017 +0200
    @@ -1,8 +1,8 @@
    LockMBRTUBuffer();
    -#ifdef GOT
    +#ifdef ONBOARD_I2C
    if(onboardbusfd!=-1)
    rt_dev_ioctl(onboardbusfd, RTSMT_ONBOARD_RTIOC_READ, &onBoardReadBuf);
    -#endif
    +#endif /* ONBOARD_I2C */
    %(retrieve_code)s