aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2015-02-08 13:08:20 +0100
committerLorenz Meier <lm@inf.ethz.ch>2015-02-08 13:08:20 +0100
commit1c6cc8a74559d353ce94a07e592dc48ef0585b39 (patch)
tree1014eb7fa228c9fc4d938edd53e3902ef3059035 /src
parent0fd11b78ebf027a7bf13c65c8e3ff9bd71754cc6 (diff)
downloadpx4-firmware-1c6cc8a74559d353ce94a07e592dc48ef0585b39.tar.gz
px4-firmware-1c6cc8a74559d353ce94a07e592dc48ef0585b39.tar.bz2
px4-firmware-1c6cc8a74559d353ce94a07e592dc48ef0585b39.zip
Remove peripheral clock changes as they interfere with current / old NuttX instance
Diffstat (limited to 'src')
-rw-r--r--src/drivers/px4io/px4io_serial.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/drivers/px4io/px4io_serial.cpp b/src/drivers/px4io/px4io_serial.cpp
index 1a848cbc0..42d87f7e5 100644
--- a/src/drivers/px4io/px4io_serial.cpp
+++ b/src/drivers/px4io/px4io_serial.cpp
@@ -217,9 +217,6 @@ PX4IO_serial::~PX4IO_serial()
stm32_unconfiggpio(PX4IO_SERIAL_TX_GPIO);
stm32_unconfiggpio(PX4IO_SERIAL_RX_GPIO);
- /* Disable APB clock for the USART peripheral */
- modifyreg32(STM32_RCC_APB2ENR, RCC_APB2ENR_USART6EN, 0);
-
/* and kill our semaphores */
sem_destroy(&_completion_semaphore);
sem_destroy(&_bus_semaphore);
@@ -246,12 +243,9 @@ PX4IO_serial::init()
/* allocate DMA */
_tx_dma = stm32_dmachannel(PX4IO_SERIAL_TX_DMAMAP);
_rx_dma = stm32_dmachannel(PX4IO_SERIAL_RX_DMAMAP);
- if ((_tx_dma == nullptr) || (_rx_dma == nullptr))
+ if ((_tx_dma == nullptr) || (_rx_dma == nullptr)) {
return -1;
-
-
- /* Enable the APB clock for the USART peripheral */
- modifyreg32(STM32_RCC_APB2ENR, 0, RCC_APB2ENR_USART6EN);
+ }
/* configure pins for serial use */
stm32_configgpio(PX4IO_SERIAL_TX_GPIO);