mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-27 23:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

ehcill: fix bug when send packet was called between receive sleep ind and send of sleep ack

Browse Source
This commit is contained in:
Matthias Ringwald 2016-07-14 11:28:08 +02:00
parent e13e7f54cb
commit 9ecd1ba8ab
1 changed files with 63 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/hci_transport_h4.c
View File

@ -50,16 +50,17 @@
#include "hci_transport.h" #include "hci_transport.h"
#include "btstack_uart_block.h" #include "btstack_uart_block.h"
#define ENABLE_LOG_EHCILL
#ifdef ENABLE_EHCILL #ifdef ENABLE_EHCILL
// eHCILL commands // eHCILL commands
#define EHCILL_GO_TO_SLEEP_IND 0x030 static const uint8_t EHCILL_GO_TO_SLEEP_IND = 0x030;
#define EHCILL_GO_TO_SLEEP_ACK 0x031 static const uint8_t EHCILL_GO_TO_SLEEP_ACK = 0x031;
#define EHCILL_WAKE_UP_IND 0x032 static const uint8_t EHCILL_WAKE_UP_IND = 0x032;
#define EHCILL_WAKE_UP_ACK 0x033 static const uint8_t EHCILL_WAKE_UP_ACK = 0x033;
static int hci_transport_h4_ehcill_outgoing_packet_ready(void); static int hci_transport_h4_ehcill_outgoing_packet_ready(void);
static int hci_transport_h4_ehcill_sleep_mode_active(void);
static void hci_transport_h4_echill_send_wakeup_ind(void); static void hci_transport_h4_echill_send_wakeup_ind(void);
static void hci_transport_h4_ehcill_handle_command(uint8_t action); static void hci_transport_h4_ehcill_handle_command(uint8_t action);
static void hci_transport_h4_ehcill_handle_ehcill_command_sent(void); static void hci_transport_h4_ehcill_handle_ehcill_command_sent(void);
@ -71,8 +72,9 @@ static void hci_transport_h4_ehcill_sleep_ack_timer_setup(void);
static void hci_transport_h4_ehcill_trigger_wakeup(void); static void hci_transport_h4_ehcill_trigger_wakeup(void);
typedef enum { typedef enum {
EHCILL_STATE_W2_SEND_SLEEP_ACK,
EHCILL_STATE_SLEEP, EHCILL_STATE_SLEEP,
EHCILL_STATE_W4_ACK, EHCILL_STATE_W4_WAKEUP_IND_OR_ACK,
EHCILL_STATE_AWAKE EHCILL_STATE_AWAKE
} EHCILL_STATE; } EHCILL_STATE;
@ -258,9 +260,14 @@ static int hci_transport_h4_send_packet(uint8_t packet_type, uint8_t * packet, i
tx_data = packet; tx_data = packet;
#ifdef ENABLE_EHCILL #ifdef ENABLE_EHCILL
if (hci_transport_h4_ehcill_sleep_mode_active()){ switch (ehcill_state){
hci_transport_h4_ehcill_trigger_wakeup(); case EHCILL_STATE_SLEEP:
return 0; hci_transport_h4_ehcill_trigger_wakeup();
return 0;
case EHCILL_STATE_W2_SEND_SLEEP_ACK:
return 0;
default:
break;
} }
#endif #endif
@ -347,9 +354,12 @@ static void hci_transport_h4_ehcill_open(void){
} }
static void hci_transport_h4_echill_send_wakeup_ind(void){ static void hci_transport_h4_echill_send_wakeup_ind(void){
#ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: send WAKEUP_IND");
#endif
// update state // update state
tx_state = TX_W4_WAKEUP; tx_state = TX_W4_WAKEUP;
ehcill_state = EHCILL_STATE_W4_ACK; ehcill_state = EHCILL_STATE_W4_WAKEUP_IND_OR_ACK;
ehcill_command_to_send = EHCILL_WAKE_UP_IND; ehcill_command_to_send = EHCILL_WAKE_UP_IND;
btstack_uart->send_block(&ehcill_command_to_send, 1); btstack_uart->send_block(&ehcill_command_to_send, 1);
} }
@ -358,28 +368,33 @@ static int hci_transport_h4_ehcill_outgoing_packet_ready(void){
return tx_len != 0; return tx_len != 0;
} }
static int hci_transport_h4_ehcill_sleep_mode_active(void){
return ehcill_state == EHCILL_STATE_SLEEP;
}
static void hci_transport_h4_ehcill_reset_statemachine(void){ static void hci_transport_h4_ehcill_reset_statemachine(void){
ehcill_state = EHCILL_STATE_AWAKE; ehcill_state = EHCILL_STATE_AWAKE;
} }
static void hci_transport_h4_ehcill_send_ehcill_command(void){ static void hci_transport_h4_ehcill_send_ehcill_command(void){
log_debug("eHCILL: send command %02x", ehcill_command_to_send); #ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: send command %02x", ehcill_command_to_send);
#endif
tx_state = TX_W4_EHCILL_SENT; tx_state = TX_W4_EHCILL_SENT;
if (ehcill_command_to_send == EHCILL_GO_TO_SLEEP_ACK){
ehcill_state = EHCILL_STATE_SLEEP;
}
btstack_uart->send_block(&ehcill_command_to_send, 1); btstack_uart->send_block(&ehcill_command_to_send, 1);
} }
static void hci_transport_h4_ehcill_sleep_ack_timer_handler(btstack_timer_source_t * timer){ static void hci_transport_h4_ehcill_sleep_ack_timer_handler(btstack_timer_source_t * timer){
log_debug("eHCILL: timer triggered"); #ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: timer triggered");
#endif
hci_transport_h4_ehcill_send_ehcill_command(); hci_transport_h4_ehcill_send_ehcill_command();
} }
static void hci_transport_h4_ehcill_sleep_ack_timer_setup(void){ static void hci_transport_h4_ehcill_sleep_ack_timer_setup(void){
// setup timer // setup timer
log_debug("eHCILL: set timer for sending command"); #ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: set timer for sending command %02x", ehcill_command_to_send);
#endif
btstack_run_loop_set_timer_handler(&ehcill_sleep_ack_timer, &hci_transport_h4_ehcill_sleep_ack_timer_handler); btstack_run_loop_set_timer_handler(&ehcill_sleep_ack_timer, &hci_transport_h4_ehcill_sleep_ack_timer_handler);
btstack_run_loop_set_timer(&ehcill_sleep_ack_timer, 50); btstack_run_loop_set_timer(&ehcill_sleep_ack_timer, 50);
btstack_run_loop_add_timer(&ehcill_sleep_ack_timer); btstack_run_loop_add_timer(&ehcill_sleep_ack_timer);
@ -403,7 +418,10 @@ static void hci_transport_h4_ehcill_trigger_wakeup(void){
hci_transport_h4_echill_send_wakeup_ind(); hci_transport_h4_echill_send_wakeup_ind();
} }
static void hci_transport_h4_ehcill_schedule_ecill_command(uint8_t command){ static void hci_transport_h4_ehcill_schedule_ehcill_command(uint8_t command){
#ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: schedule eHCILL command %02x", command);
#endif
ehcill_command_to_send = command; ehcill_command_to_send = command;
switch (tx_state){ switch (tx_state){
case TX_IDLE: case TX_IDLE:
@ -427,9 +445,11 @@ static void hci_transport_h4_ehcill_handle_command(uint8_t action){
case EHCILL_STATE_AWAKE: case EHCILL_STATE_AWAKE:
switch(action){ switch(action){
case EHCILL_GO_TO_SLEEP_IND: case EHCILL_GO_TO_SLEEP_IND:
ehcill_state = EHCILL_STATE_SLEEP; ehcill_state = EHCILL_STATE_W2_SEND_SLEEP_ACK;
log_info("eHCILL: GO_TO_SLEEP_IND RX"); #ifdef ENABLE_LOG_EHCILL
hci_transport_h4_ehcill_schedule_ecill_command(EHCILL_GO_TO_SLEEP_ACK); log_info("eHCILL: Received GO_TO_SLEEP_IND RX");
#endif
hci_transport_h4_ehcill_schedule_ehcill_command(EHCILL_GO_TO_SLEEP_ACK);
break; break;
default: default:
break; break;
@ -437,11 +457,14 @@ static void hci_transport_h4_ehcill_handle_command(uint8_t action){
break; break;
case EHCILL_STATE_SLEEP: case EHCILL_STATE_SLEEP:
case EHCILL_STATE_W2_SEND_SLEEP_ACK:
switch(action){ switch(action){
case EHCILL_WAKE_UP_IND: case EHCILL_WAKE_UP_IND:
ehcill_state = EHCILL_STATE_AWAKE; ehcill_state = EHCILL_STATE_AWAKE;
log_info("eHCILL: WAKE_UP_IND RX"); #ifdef ENABLE_LOG_EHCILL
hci_transport_h4_ehcill_schedule_ecill_command(EHCILL_WAKE_UP_ACK); log_info("eHCILL: Received WAKE_UP_IND RX");
#endif
hci_transport_h4_ehcill_schedule_ehcill_command(EHCILL_WAKE_UP_ACK);
break; break;
default: default:
@ -449,11 +472,13 @@ static void hci_transport_h4_ehcill_handle_command(uint8_t action){
} }
break; break;
case EHCILL_STATE_W4_ACK: case EHCILL_STATE_W4_WAKEUP_IND_OR_ACK:
switch(action){ switch(action){
case EHCILL_WAKE_UP_IND: case EHCILL_WAKE_UP_IND:
case EHCILL_WAKE_UP_ACK: case EHCILL_WAKE_UP_ACK:
log_info("eHCILL: WAKE_UP_IND or ACK"); #ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: Received WAKE_UP (%02x)", action);
#endif
tx_state = TX_W4_PACKET_SENT; tx_state = TX_W4_PACKET_SENT;
ehcill_state = EHCILL_STATE_AWAKE; ehcill_state = EHCILL_STATE_AWAKE;
btstack_uart->send_block(tx_data, tx_len); btstack_uart->send_block(tx_data, tx_len);
@ -466,6 +491,9 @@ static void hci_transport_h4_ehcill_handle_command(uint8_t action){
} }
static void hci_transport_h4_ehcill_handle_packet_sent(void){ static void hci_transport_h4_ehcill_handle_packet_sent(void){
#ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: handle packet sent, command to send %02x", ehcill_command_to_send);
#endif
// now, send pending ehcill command if neccessary // now, send pending ehcill command if neccessary
switch (ehcill_command_to_send){ switch (ehcill_command_to_send){
case EHCILL_GO_TO_SLEEP_ACK: case EHCILL_GO_TO_SLEEP_ACK:
@ -483,8 +511,15 @@ static void hci_transport_h4_ehcill_handle_ehcill_command_sent(void){
tx_state = TX_IDLE; tx_state = TX_IDLE;
int command = ehcill_command_to_send; int command = ehcill_command_to_send;
ehcill_command_to_send = 0; ehcill_command_to_send = 0;
#ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: handle eHCILL sent, command was %02x", command);
#endif
if (command == EHCILL_GO_TO_SLEEP_ACK) { if (command == EHCILL_GO_TO_SLEEP_ACK) {
#ifdef ENABLE_LOG_EHCILL
log_info("eHCILL: GO_TO_SLEEP_ACK sent, enter sleep mode"); log_info("eHCILL: GO_TO_SLEEP_ACK sent, enter sleep mode");
#endif
// UART not needed after EHCILL_GO_TO_SLEEP_ACK was sent // UART not needed after EHCILL_GO_TO_SLEEP_ACK was sent
if (btstack_uart_sleep_mode != BTSTACK_UART_SLEEP_OFF){ if (btstack_uart_sleep_mode != BTSTACK_UART_SLEEP_OFF){
btstack_uart->set_sleep(btstack_uart_sleep_mode); btstack_uart->set_sleep(btstack_uart_sleep_mode);
@ -495,7 +530,9 @@ static void hci_transport_h4_ehcill_handle_ehcill_command_sent(void){
if (btstack_uart_sleep_mode){ if (btstack_uart_sleep_mode){
btstack_uart->set_sleep(BTSTACK_UART_SLEEP_OFF); btstack_uart->set_sleep(BTSTACK_UART_SLEEP_OFF);
} }
hci_transport_h4_echill_send_wakeup_ind(); if (command != EHCILL_WAKE_UP_IND){
hci_transport_h4_echill_send_wakeup_ind();
}
} }
} }