revert accidental changes to hal_bsp.c
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ac59febd Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ac59febd Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ac59febd Branch: refs/heads/develop Commit: ac59febde202d6bc9c23fa967ae01b894bbb4e1a Parents: e4d0f04 Author: Vipul Rahane <vipulrah...@apache.org> Authored: Tue Feb 21 18:31:46 2017 -0800 Committer: Vipul Rahane <vipulrah...@apache.org> Committed: Tue Feb 21 18:31:46 2017 -0800 ---------------------------------------------------------------------- hw/bsp/nrf52dk/src/hal_bsp.c | 49 --------------------------------------- 1 file changed, 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ac59febd/hw/bsp/nrf52dk/src/hal_bsp.c ---------------------------------------------------------------------- diff --git a/hw/bsp/nrf52dk/src/hal_bsp.c b/hw/bsp/nrf52dk/src/hal_bsp.c index a2909c3..40ce57b 100644 --- a/hw/bsp/nrf52dk/src/hal_bsp.c +++ b/hw/bsp/nrf52dk/src/hal_bsp.c @@ -42,20 +42,6 @@ #endif #include "os/os_dev.h" #include "bsp.h" -#include <lsm303dlhc/lsm303dlhc.h> -#include <tsl2561/tsl2561.h> -#include <bno055/bno055.h> - -#if MYNEWT_VAL(LSM303DLHC_PRESENT) -static struct lsm303dlhc lsm303dlhc; -#endif -#if MYNEWT_VAL(TSL2561_PRESENT) -static struct tsl2561 tsl2561; -#endif -#if MYNEWT_VAL(BNO055_PRESENT) -static struct bno055 bno055; -#endif - #if MYNEWT_VAL(UART_0) static struct uart_dev os_bsp_uart0; @@ -165,23 +151,6 @@ hal_bsp_get_nvic_priority(int irq_num, uint32_t pri) return cfg_pri; } -#if MYNEWT_VAL(LSM303DLHC_PRESENT) || MYNEWT_VAL(BNO055_PRESENT) -static int -slinky_accel_init(struct os_dev *dev, void *arg) -{ - return (0); -} -#endif - -#if MYNEWT_VAL(TSL2561_PRESENT) -static int -slinky_light_init(struct os_dev *dev, void *arg) -{ - return (0); -} -#endif - - void hal_bsp_init(void) { @@ -245,22 +214,4 @@ hal_bsp_init(void) assert(rc == 0); #endif -#if MYNEWT_VAL(LSM303DLHC_PRESENT) - rc = os_dev_create((struct os_dev *) &lsm303dlhc, "accel0", - OS_DEV_INIT_KERNEL, OS_DEV_INIT_PRIMARY, slinky_accel_init, NULL); - assert(rc == 0); -#endif - -#if MYNEWT_VAL(BNO055_PRESENT) - rc = os_dev_create((struct os_dev *) &bno055, "accel1", - OS_DEV_INIT_KERNEL, OS_DEV_INIT_PRIMARY, slinky_accel_init, NULL); - assert(rc == 0); -#endif - -#if MYNEWT_VAL(TSL2561_PRESENT) - rc = os_dev_create((struct os_dev *) &tsl2561, "light0", - OS_DEV_INIT_KERNEL, OS_DEV_INIT_PRIMARY, slinky_light_init, NULL); - assert(rc == 0); -#endif - }