fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-07-01 17:10:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update px4iofirmware, px4io and drivers to uses NuttX IRQ API changes

Browse Source
This commit is contained in:
David Sidrane
2017-02-28 16:32:32 -10:00
committed by Daniel Agar
parent bc81339a68
commit 21caf63e13
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/px4iofirmware/i2c.c
+4 -4
View File
@@ -65,7 +65,7 @@
#define rTRISE REG(STM32_I2C_TRISE_OFFSET)
void i2c_reset(void);
static int i2c_interrupt(int irq, void *context);
static int i2c_interrupt(int irq, void *context, void *args);
static void i2c_rx_setup(void);
static void i2c_tx_setup(void);
static void i2c_rx_complete(void);
@@ -142,8 +142,8 @@ interface_init(void)
rOAR1 = 0x1a << 1;
/* enable event interrupts */
irq_attach(STM32_IRQ_I2C1EV, i2c_interrupt);
irq_attach(STM32_IRQ_I2C1ER, i2c_interrupt);
irq_attach(STM32_IRQ_I2C1EV, i2c_interrupt, NULL);
irq_attach(STM32_IRQ_I2C1ER, i2c_interrupt, NULL);
up_enable_irq(STM32_IRQ_I2C1EV);
up_enable_irq(STM32_IRQ_I2C1ER);
@@ -192,7 +192,7 @@ i2c_reset(void)
}
static int
i2c_interrupt(int irq, FAR void *context)
i2c_interrupt(int irq, FAR void *context, FAR void *args)
{
uint16_t sr1 = rSR1;
src/modules/px4iofirmware/serial.c
+3 -3
View File
@@ -71,7 +71,7 @@ static void rx_dma_callback(DMA_HANDLE handle, uint8_t status, void *arg);
static DMA_HANDLE tx_dma;
static DMA_HANDLE rx_dma;
static int serial_interrupt(int irq, void *context);
static int serial_interrupt(int irq, void *context, FAR void *arg);
static void dma_reset(void);
static struct IOPacket dma_packet;
@@ -123,7 +123,7 @@ interface_init(void)
rBRR = (mantissa << USART_BRR_MANT_SHIFT) | (fraction << USART_BRR_FRAC_SHIFT);
/* connect our interrupt */
irq_attach(PX4FMU_SERIAL_VECTOR, serial_interrupt);
irq_attach(PX4FMU_SERIAL_VECTOR, serial_interrupt, NULL);
up_enable_irq(PX4FMU_SERIAL_VECTOR);
/* enable UART and error/idle interrupts */
@@ -255,7 +255,7 @@ rx_dma_callback(DMA_HANDLE handle, uint8_t status, void *arg)
}
static int
serial_interrupt(int irq, void *context)
serial_interrupt(int irq, void *context, FAR void *arg)
{
static bool abort_on_idle = false;