diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/blinkm/blinkm.cpp | 3 | ||||
| -rw-r--r-- | src/drivers/boards/px4fmu-v1/px4fmu_init.c | 7 | ||||
| -rw-r--r-- | src/drivers/boards/px4fmu-v2/px4fmu2_init.c | 7 | ||||
| -rw-r--r-- | src/drivers/hmc5883/hmc5883.cpp | 5 | ||||
| -rw-r--r-- | src/drivers/px4flow/px4flow.cpp | 2 | ||||
| -rw-r--r-- | src/drivers/rgbled/rgbled.cpp | 4 |
6 files changed, 7 insertions, 21 deletions
diff --git a/src/drivers/blinkm/blinkm.cpp b/src/drivers/blinkm/blinkm.cpp index d749a0d7b..cfa59eb3a 100644 --- a/src/drivers/blinkm/blinkm.cpp +++ b/src/drivers/blinkm/blinkm.cpp @@ -316,7 +316,6 @@ BlinkM::init() ret = I2C::init(); if (ret != OK) { - warnx("I2C init failed"); return ret; } @@ -970,7 +969,7 @@ blinkm_main(int argc, char *argv[]) if (OK != g_blinkm->init()) { delete g_blinkm; g_blinkm = nullptr; - errx(1, "init failed"); + errx(1, "no BlinkM found"); } exit(0); diff --git a/src/drivers/boards/px4fmu-v1/px4fmu_init.c b/src/drivers/boards/px4fmu-v1/px4fmu_init.c index 293021f8b..c7d4f1ce4 100644 --- a/src/drivers/boards/px4fmu-v1/px4fmu_init.c +++ b/src/drivers/boards/px4fmu-v1/px4fmu_init.c @@ -216,8 +216,6 @@ __EXPORT int nsh_archinitialize(void) SPI_SELECT(spi1, PX4_SPIDEV_MPU, false); up_udelay(20); - message("[boot] Successfully initialized SPI port 1\r\n"); - /* * If SPI2 is enabled in the defconfig, we loose some ADC pins as chip selects. * Keep the SPI2 init optional and conditionally initialize the ADC pins @@ -243,7 +241,6 @@ __EXPORT int nsh_archinitialize(void) /* Get the SPI port for the microSD slot */ - message("[boot] Initializing SPI port 3\n"); spi3 = up_spiinitialize(3); if (!spi3) { @@ -252,8 +249,6 @@ __EXPORT int nsh_archinitialize(void) return -ENODEV; } - message("[boot] Successfully initialized SPI port 3\n"); - /* Now bind the SPI interface to the MMCSD driver */ result = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi3); @@ -263,7 +258,5 @@ __EXPORT int nsh_archinitialize(void) return -ENODEV; } - message("[boot] Successfully bound SPI port 3 to the MMCSD driver\n"); - return OK; } diff --git a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c index 9b25c574a..266642cbb 100644 --- a/src/drivers/boards/px4fmu-v2/px4fmu2_init.c +++ b/src/drivers/boards/px4fmu-v2/px4fmu2_init.c @@ -296,8 +296,6 @@ __EXPORT int nsh_archinitialize(void) SPI_SELECT(spi1, PX4_SPIDEV_MPU, false); up_udelay(20); - message("[boot] Initialized SPI port 1 (SENSORS)\n"); - /* Get the SPI port for the FRAM */ spi2 = up_spiinitialize(2); @@ -317,8 +315,6 @@ __EXPORT int nsh_archinitialize(void) SPI_SETMODE(spi2, SPIDEV_MODE3); SPI_SELECT(spi2, SPIDEV_FLASH, false); - message("[boot] Initialized SPI port 2 (RAMTRON FRAM)\n"); - spi4 = up_spiinitialize(4); /* Default SPI4 to 1MHz and de-assert the known chip selects. */ @@ -328,8 +324,6 @@ __EXPORT int nsh_archinitialize(void) SPI_SELECT(spi4, PX4_SPIDEV_EXT0, false); SPI_SELECT(spi4, PX4_SPIDEV_EXT1, false); - message("[boot] Initialized SPI port 4\n"); - #ifdef CONFIG_MMCSD /* First, get an instance of the SDIO interface */ @@ -350,7 +344,6 @@ __EXPORT int nsh_archinitialize(void) /* Then let's guess and say that there is a card in the slot. There is no card detect GPIO. */ sdio_mediachange(sdio, true); - message("[boot] Initialized SDIO\n"); #endif return OK; diff --git a/src/drivers/hmc5883/hmc5883.cpp b/src/drivers/hmc5883/hmc5883.cpp index 3a3848446..5bf88da3d 100644 --- a/src/drivers/hmc5883/hmc5883.cpp +++ b/src/drivers/hmc5883/hmc5883.cpp @@ -1490,8 +1490,9 @@ start(enum HMC5883_BUS busid, enum Rotation rotation) started |= start_bus(bus_options[i], rotation); } - if (!started) - errx(1, "driver start failed"); + if (!started) { + exit(1); + } } /** diff --git a/src/drivers/px4flow/px4flow.cpp b/src/drivers/px4flow/px4flow.cpp index 8ea7a6170..b343a3e30 100644 --- a/src/drivers/px4flow/px4flow.cpp +++ b/src/drivers/px4flow/px4flow.cpp @@ -674,7 +674,7 @@ fail: g_dev = nullptr; } - errx(1, "driver start failed"); + errx(1, "no PX4 FLOW connected"); } /** diff --git a/src/drivers/rgbled/rgbled.cpp b/src/drivers/rgbled/rgbled.cpp index 1e38a766e..512d6318d 100644 --- a/src/drivers/rgbled/rgbled.cpp +++ b/src/drivers/rgbled/rgbled.cpp @@ -625,7 +625,7 @@ rgbled_main(int argc, char *argv[]) if (g_rgbled == nullptr) { // fall back to default bus if (PX4_I2C_BUS_LED == PX4_I2C_BUS_EXPANSION) { - errx(1, "init failed"); + errx(1, "no RGB led on bus #%d", i2cdevice); } i2cdevice = PX4_I2C_BUS_LED; } @@ -640,7 +640,7 @@ rgbled_main(int argc, char *argv[]) if (OK != g_rgbled->init()) { delete g_rgbled; g_rgbled = nullptr; - errx(1, "init failed"); + errx(1, "no RGB led on bus #%d", i2cdevice); } } |