deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1231 from bkozak-scanimetrics/cc26xx_rf_core_fix_transmit_wake

Browse source 
CC26xx - enable correct IRQ in rf_core_cmd_done_en
This commit is contained in:
George Oikonomou 2015-09-04 17:08:50 +01:00
parent 92c1a68b94 b71353181d
commit b6dac70474
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
View file

@ -805,7 +805,7 @@ transmit(unsigned short transmit_len)
cmd.pPayload = &tx_buf[TX_BUF_HDR_LEN]; cmd.pPayload = &tx_buf[TX_BUF_HDR_LEN];
/* Enable the LAST_FG_COMMAND_DONE interrupt, which will wake us up */ /* Enable the LAST_FG_COMMAND_DONE interrupt, which will wake us up */
rf_core_cmd_done_en(); rf_core_cmd_done_en(true);
ret = rf_core_send_cmd((uint32_t)&cmd, &cmd_status); ret = rf_core_send_cmd((uint32_t)&cmd, &cmd_status);

2
cpu/cc26xx-cc13xx/rf-core/prop-mode.c
View file

@ -687,7 +687,7 @@ transmit(unsigned short transmit_len)
rx_off_prop(); rx_off_prop();
/* Enable the LAST_COMMAND_DONE interrupt to wake us up */ /* Enable the LAST_COMMAND_DONE interrupt to wake us up */
rf_core_cmd_done_en(); rf_core_cmd_done_en(false);
ret = rf_core_send_cmd((uint32_t)cmd_tx_adv, &cmd_status); ret = rf_core_send_cmd((uint32_t)cmd_tx_adv, &cmd_status);

7
cpu/cc26xx-cc13xx/rf-core/rf-core.c
View file

@ -378,11 +378,12 @@ rf_core_setup_interrupts()
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void
rf_core_cmd_done_en() rf_core_cmd_done_en(bool fg)
{ {
uint32_t irq = fg ? IRQ_LAST_FG_COMMAND_DONE : IRQ_LAST_COMMAND_DONE;
HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIFG) = ENABLED_IRQS; HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIFG) = ENABLED_IRQS;
HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = ENABLED_IRQS + HWREG(RFC_DBELL_NONBUF_BASE + RFC_DBELL_O_RFCPEIEN) = ENABLED_IRQS | irq;
IRQ_LAST_COMMAND_DONE;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void

8
cpu/cc26xx-cc13xx/rf-core/rf-core.h
View file

@ -331,17 +331,19 @@ uint8_t rf_core_boot(void);
void rf_core_setup_interrupts(void); void rf_core_setup_interrupts(void);
/** /**
* \brief Enable the LAST_CMD_DONE interrupt. * \brief Enable interrupt on command done.
* \param fg set true to enable irq on foreground command done and false for
* background commands or if not in ieee mode.
* *
* This is used within TX routines in order to be able to sleep the CM3 and * This is used within TX routines in order to be able to sleep the CM3 and
* wake up after TX has finished * wake up after TX has finished
* *
* \sa rf_core_cmd_done_dis() * \sa rf_core_cmd_done_dis()
*/ */
void rf_core_cmd_done_en(void); void rf_core_cmd_done_en(bool fg);
/** /**
* \brief Disable the LAST_CMD_DONE interrupt. * \brief Disable the LAST_CMD_DONE and LAST_FG_CMD_DONE interrupts.
* *
* This is used within TX routines after TX has completed * This is used within TX routines after TX has completed
* *