From 0a1ec91fec49e5b65a82cdd6dac6402f1211a1a8 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Tue, 4 Mar 2014 16:32:10 +0100 Subject: [PATCH] android/handsfree: Make connection state constants name shorter --- android/hal-msg.h | 10 +++++----- android/handsfree.c | 26 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/android/hal-msg.h b/android/hal-msg.h index f7dc61346..1b2b31a59 100644 --- a/android/hal-msg.h +++ b/android/hal-msg.h @@ -976,11 +976,11 @@ struct hal_ev_a2dp_audio_state { uint8_t bdaddr[6]; } __attribute__((packed)); -#define HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTED 0x00 -#define HAL_EV_HANDSFREE_CONNECTION_STATE_CONNECTING 0x01 -#define HAL_EV_HANDSFREE_CONNECTION_STATE_CONNECTED 0x02 -#define HAL_EV_HANDSFREE_CONNECTION_STATE_SLC_CONNECTED 0x03 -#define HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTING 0x04 +#define HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED 0x00 +#define HAL_EV_HANDSFREE_CONN_STATE_CONNECTING 0x01 +#define HAL_EV_HANDSFREE_CONN_STATE_CONNECTED 0x02 +#define HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED 0x03 +#define HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING 0x04 #define HAL_EV_HANDSFREE_CONN_STATE 0x81 struct hal_ev_handsfree_conn_state { diff --git a/android/handsfree.c b/android/handsfree.c index d8842a34c..ceda380ca 100644 --- a/android/handsfree.c +++ b/android/handsfree.c @@ -125,7 +125,7 @@ static void device_init(const bdaddr_t *bdaddr) memcpy(device.inds, inds_defaults, sizeof(device.inds)); - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_CONNECTING); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_CONNECTING); } static void device_cleanup(void) @@ -135,7 +135,7 @@ static void device_cleanup(void) device.gw = NULL; } - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTED); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED); memset(&device, 0, sizeof(device)); } @@ -144,7 +144,7 @@ static void at_command_handler(const char *command, void *user_data) { hfp_gw_send_result(device.gw, HFP_RESULT_ERROR); - if (device.state != HAL_EV_HANDSFREE_CONNECTION_STATE_SLC_CONNECTED) + if (device.state != HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED) hfp_gw_disconnect(device.gw); } @@ -243,7 +243,7 @@ static void at_cmd_cmer(struct hfp_gw_result *result, enum hfp_gw_cmd_type type, /* TODO Check for 3-way calling support */ register_post_slc_at(); - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_SLC_CONNECTED); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED); hfp_gw_send_result(device.gw, HFP_RESULT_OK); @@ -364,13 +364,13 @@ static void connect_cb(GIOChannel *chan, GError *err, gpointer user_data) if (device.hsp) { register_post_slc_at(); - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_CONNECTED); - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_SLC_CONNECTED); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_CONNECTED); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_SLC_CONNECTED); return; } register_slc_at(); - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_CONNECTED); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_CONNECTED); return; @@ -397,7 +397,7 @@ static void confirm_cb(GIOChannel *chan, gpointer data) DBG("incoming connect from %s", address); - if (device.state != HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTED) { + if (device.state != HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) { info("handsfree: refusing connection from %s", address); goto drop; } @@ -599,7 +599,7 @@ static void handle_connect(const void *buf, uint16_t len) DBG(""); - if (device.state != HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTED) { + if (device.state != HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED) { status = HAL_STATUS_FAILED; goto failed; } @@ -637,22 +637,22 @@ static void handle_disconnect(const void *buf, uint16_t len) android2bdaddr(cmd->bdaddr, &bdaddr); - if (device.state == HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTED || + if (device.state == HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTED || bacmp(&device.bdaddr, &bdaddr)) { status = HAL_STATUS_FAILED; goto failed; } - if (device.state == HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTING) { + if (device.state == HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING) { status = HAL_STATUS_SUCCESS; goto failed; } - if (device.state == HAL_EV_HANDSFREE_CONNECTION_STATE_CONNECTING) { + if (device.state == HAL_EV_HANDSFREE_CONN_STATE_CONNECTING) { device_cleanup(); } else { - device_set_state(HAL_EV_HANDSFREE_CONNECTION_STATE_DISCONNECTING); + device_set_state(HAL_EV_HANDSFREE_CONN_STATE_DISCONNECTING); hfp_gw_disconnect(device.gw); } -- 2.47.3