mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-09 23:54:32 +00:00
Only insert an ack packet if the ack request bit is set
This commit is contained in:
parent
5636b019b3
commit
33b32c61e9
@ -76,6 +76,10 @@
|
|||||||
#define MACA_INSERT_ACK 1
|
#define MACA_INSERT_ACK 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Bit in first byte of 802.15.4 message that indicates an */
|
||||||
|
/* acknowledgereply frame is expected */
|
||||||
|
#define MAC_ACK_REQUEST_FLAG 0x20
|
||||||
|
|
||||||
#define reg(x) (*(volatile uint32_t *)(x))
|
#define reg(x) (*(volatile uint32_t *)(x))
|
||||||
|
|
||||||
int count_packets(void);
|
int count_packets(void);
|
||||||
@ -650,7 +654,7 @@ void maca_isr(void) {
|
|||||||
dma_rx->rx_time = *MACA_TIMESTAMP;
|
dma_rx->rx_time = *MACA_TIMESTAMP;
|
||||||
|
|
||||||
/* check if received packet needs an ack */
|
/* check if received packet needs an ack */
|
||||||
if(prm_mode == AUTOACK && (dma_rx->data[1] & 0x20)) {
|
if(prm_mode == AUTOACK && (dma_rx->data[1] & MAC_ACK_REQUEST_FLAG)) {
|
||||||
/* this wait is necessary to auto-ack */
|
/* this wait is necessary to auto-ack */
|
||||||
volatile uint32_t wait_clk;
|
volatile uint32_t wait_clk;
|
||||||
wait_clk = *MACA_CLK + 200;
|
wait_clk = *MACA_CLK + 200;
|
||||||
@ -682,8 +686,18 @@ void maca_isr(void) {
|
|||||||
/* PRINTF("maca action complete %d\n\r", get_field(*MACA_CONTROL,SEQUENCE)); */
|
/* PRINTF("maca action complete %d\n\r", get_field(*MACA_CONTROL,SEQUENCE)); */
|
||||||
if(last_post == TX_POST) {
|
if(last_post == TX_POST) {
|
||||||
tx_head->status = get_field(*MACA_STATUS,CODE);
|
tx_head->status = get_field(*MACA_STATUS,CODE);
|
||||||
|
|
||||||
#if MACA_INSERT_ACK
|
#if MACA_INSERT_ACK
|
||||||
if(tx_head->status == SUCCESS) {
|
/* Having sent a message with the acknowledge request flag set the
|
||||||
|
* MACA hardware will only give a tx success indication if the message
|
||||||
|
* was acknowledged by the remote node. We need to detect this
|
||||||
|
* condition and inject an ACK packet into the internal receive stream
|
||||||
|
* as the higher layers are expecting to see an ACK packet.*/
|
||||||
|
|
||||||
|
if(tx_head->status == SUCCESS && (tx_head->data[0] & MAC_ACK_REQUEST_FLAG)) {
|
||||||
|
|
||||||
|
/* Create the dummy ack packet */
|
||||||
|
|
||||||
static volatile packet_t *ack_p;
|
static volatile packet_t *ack_p;
|
||||||
if(ack_p = get_free_packet()) {
|
if(ack_p = get_free_packet()) {
|
||||||
ack_p->length = 3;
|
ack_p->length = 3;
|
||||||
@ -694,6 +708,7 @@ void maca_isr(void) {
|
|||||||
ack_p->data[3] = *MACA_TXSEQNR;
|
ack_p->data[3] = *MACA_TXSEQNR;
|
||||||
insert_at_rx_head(ack_p);
|
insert_at_rx_head(ack_p);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user