mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-01 10:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

avrcp_controller: rename event

Browse Source
This commit is contained in:
Milanka Ringwald 2021-10-26 16:58:00 +02:00
parent 79464f8d52
commit b2e02b8d16
6 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/a2dp_sink_demo.c
View File

@ -147,7 +147,7 @@ static int volume_percentage = 0;
static avrcp_battery_status_t battery_status = AVRCP_BATTERY_STATUS_WARNING; static avrcp_battery_status_t battery_status = AVRCP_BATTERY_STATUS_WARNING;
#ifdef SUPPORT_VOLUME_CHANGE_NOTIFICATION #ifdef SUPPORT_VOLUME_CHANGE_NOTIFICATION
static uint8_t events_num = 4;
static uint8_t events[] = { static uint8_t events[] = {
AVRCP_NOTIFICATION_EVENT_PLAYBACK_STATUS_CHANGED, AVRCP_NOTIFICATION_EVENT_PLAYBACK_STATUS_CHANGED,
AVRCP_NOTIFICATION_EVENT_TRACK_CHANGED, AVRCP_NOTIFICATION_EVENT_TRACK_CHANGED,
@ -744,7 +744,7 @@ static void avrcp_target_packet_handler(uint8_t packet_type, uint16_t channel, u
case AVRCP_SUBEVENT_EVENT_IDS_QUERY: case AVRCP_SUBEVENT_EVENT_IDS_QUERY:
#ifdef SUPPORT_VOLUME_CHANGE_NOTIFICATION #ifdef SUPPORT_VOLUME_CHANGE_NOTIFICATION
avrcp_target_supported_events(avrcp_cid, events_num, events, sizeof(events)); avrcp_target_supported_events(avrcp_cid, sizeof(events)/sizeof(uint8_t), events, sizeof(events));
#else #else
avrcp_target_supported_events(avrcp_cid, 0, NULL, 0); avrcp_target_supported_events(avrcp_cid, 0, NULL, 0);
#endif #endif

12
example/a2dp_source_demo.c
View File

@ -849,14 +849,10 @@ static void avrcp_controller_packet_handler(uint8_t packet_type, uint16_t channe
// see avrcp_battery_status_t // see avrcp_battery_status_t
printf("AVRCP Controller: Notification Battery Status %d\n", avrcp_subevent_notification_event_batt_status_changed_get_battery_status(packet)); printf("AVRCP Controller: Notification Battery Status %d\n", avrcp_subevent_notification_event_batt_status_changed_get_battery_status(packet));
break; break;
case AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE: case AVRCP_SUBEVENT_NOTIFICATION_STATE:
printf("AVRCP Controller: Notification %s ", avrcp_event2str(avrcp_subevent_enable_notification_complete_get_event_id(packet))); printf("AVRCP Controller: Notification %s - %s\n",
if (avrcp_subevent_enable_notification_complete_get_status(packet) == ERROR_CODE_SUCCESS){ avrcp_event2str(avrcp_subevent_notification_state_get_event_id(packet)),
printf("enabled\n"); avrcp_subevent_notification_state_get_enabled(packet) != 0 ? "enabled" : "disabled");
} else {
printf("disabled\n");
}
break; break;
default: default:
break; break;

5
src/btstack_defines.h
View File

@ -2690,13 +2690,14 @@ typedef uint8_t sm_key_t[16];
#define AVRCP_SUBEVENT_SET_ABSOLUTE_VOLUME_RESPONSE 0x10 #define AVRCP_SUBEVENT_SET_ABSOLUTE_VOLUME_RESPONSE 0x10
/** /**
* @format 1211 * @format 12111
* @param subevent_code * @param subevent_code
* @param avrcp_cid * @param avrcp_cid
* @param status * @param status
* @param enabled // 1 enabled, 0 disabled
* @param event_id * @param event_id
*/ */
#define AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE 0x11 #define AVRCP_SUBEVENT_NOTIFICATION_STATE 0x11
/** /**
* @format 112B2 * @format 112B2

23
src/btstack_event.h
View File

@ -8180,31 +8180,40 @@ static inline uint8_t avrcp_subevent_set_absolute_volume_response_get_absolute_v
} }
/** /**
* @brief Get field avrcp_cid from event AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE * @brief Get field avrcp_cid from event AVRCP_SUBEVENT_NOTIFICATION_STATE
* @param event packet * @param event packet
* @return avrcp_cid * @return avrcp_cid
* @note: btstack_type 2 * @note: btstack_type 2
*/ */
static inline uint16_t avrcp_subevent_enable_notification_complete_get_avrcp_cid(const uint8_t * event){ static inline uint16_t avrcp_subevent_notification_state_get_avrcp_cid(const uint8_t * event){
return little_endian_read_16(event, 3); return little_endian_read_16(event, 3);
} }
/** /**
* @brief Get field status from event AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE * @brief Get field status from event AVRCP_SUBEVENT_NOTIFICATION_STATE
* @param event packet * @param event packet
* @return status * @return status
* @note: btstack_type 1 * @note: btstack_type 1
*/ */
static inline uint8_t avrcp_subevent_enable_notification_complete_get_status(const uint8_t * event){ static inline uint8_t avrcp_subevent_notification_state_get_status(const uint8_t * event){
return event[5]; return event[5];
} }
/** /**
* @brief Get field event_id from event AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE * @brief Get field enabled from event AVRCP_SUBEVENT_NOTIFICATION_STATE
* @param event packet
* @return enabled
* @note: btstack_type 1
*/
static inline uint8_t avrcp_subevent_notification_state_get_enabled(const uint8_t * event){
return event[6];
}
/**
* @brief Get field event_id from event AVRCP_SUBEVENT_NOTIFICATION_STATE
* @param event packet * @param event packet
* @return event_id * @return event_id
* @note: btstack_type 1 * @note: btstack_type 1
*/ */
static inline uint8_t avrcp_subevent_enable_notification_complete_get_event_id(const uint8_t * event){ static inline uint8_t avrcp_subevent_notification_state_get_event_id(const uint8_t * event){
return event[6]; return event[7];
} }
/** /**

18
src/classic/avrcp_controller.c
View File

@ -92,15 +92,16 @@ static int avrcp_controller_supports_browsing(uint16_t controller_supported_feat
return controller_supported_features & AVRCP_FEATURE_MASK_BROWSING; return controller_supported_features & AVRCP_FEATURE_MASK_BROWSING;
} }
static void avrcp_controller_emit_notification_complete(avrcp_connection_t * connection, uint8_t status, uint8_t event_id){ static void avrcp_controller_emit_notification_complete(avrcp_connection_t * connection, uint8_t status, uint8_t event_id, bool enabled){
uint8_t event[7]; uint8_t event[8];
uint8_t pos = 0; uint8_t pos = 0;
event[pos++] = HCI_EVENT_AVRCP_META; event[pos++] = HCI_EVENT_AVRCP_META;
event[pos++] = sizeof(event) - 2; event[pos++] = sizeof(event) - 2;
event[pos++] = AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE; event[pos++] = AVRCP_SUBEVENT_NOTIFICATION_STATE;
little_endian_store_16(event, pos, connection->avrcp_cid); little_endian_store_16(event, pos, connection->avrcp_cid);
pos += 2; pos += 2;
event[pos++] = status; event[pos++] = status;
event[pos++] = enabled ? 1 : 0;
event[pos++] = event_id; event[pos++] = event_id;
UNUSED(pos); UNUSED(pos);
(*avrcp_controller_context.avrcp_callback)(HCI_EVENT_PACKET, 0, event, sizeof(event)); (*avrcp_controller_context.avrcp_callback)(HCI_EVENT_PACKET, 0, event, sizeof(event));
@ -755,7 +756,7 @@ static void avrcp_controller_handle_notification(avrcp_connection_t *connection,
return; return;
} }
// emit event only once, initially // emit event only once, initially
avrcp_controller_emit_notification_complete(connection, ERROR_CODE_SUCCESS, event_id); avrcp_controller_emit_notification_complete(connection, ERROR_CODE_SUCCESS, event_id, true);
connection->initial_status_reported |= event_mask; connection->initial_status_reported |= event_mask;
break; break;
case AVRCP_CTYPE_RESPONSE_CHANGED_STABLE: case AVRCP_CTYPE_RESPONSE_CHANGED_STABLE:
@ -767,6 +768,9 @@ static void avrcp_controller_handle_notification(avrcp_connection_t *connection,
avrcp_controller_register_notification(connection, event_id); avrcp_controller_register_notification(connection, event_id);
} else { } else {
connection->notifications_to_deregister &= reset_event_mask; connection->notifications_to_deregister &= reset_event_mask;
connection->notifications_to_register &= reset_event_mask;
connection->initial_status_reported &= reset_event_mask;
avrcp_controller_emit_notification_complete(connection, ERROR_CODE_SUCCESS, event_id, false);
} }
break; break;
default: default:
@ -1033,7 +1037,7 @@ static void avrcp_handle_l2cap_data_packet_for_signaling_connection(avrcp_connec
for (i = (uint8_t)AVRCP_NOTIFICATION_EVENT_FIRST_INDEX; i < (uint8_t) AVRCP_NOTIFICATION_EVENT_LAST_INDEX; i++){ for (i = (uint8_t)AVRCP_NOTIFICATION_EVENT_FIRST_INDEX; i < (uint8_t) AVRCP_NOTIFICATION_EVENT_LAST_INDEX; i++){
if ((connection->notifications_to_register & (1<<i)) != 0){ if ((connection->notifications_to_register & (1<<i)) != 0){
if ((connection->remote_supported_notifications & (1<<i)) == 0){ if ((connection->remote_supported_notifications & (1<<i)) == 0){
avrcp_controller_emit_notification_complete(connection, ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE, i); avrcp_controller_emit_notification_complete(connection, ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE, i, false);
connection->notifications_to_register &= ~(1 << i); connection->notifications_to_register &= ~(1 << i);
} }
} }
@ -1382,6 +1386,10 @@ uint8_t avrcp_controller_disable_notification(uint16_t avrcp_cid, avrcp_notifica
return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE; return ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE;
} }
if (connection->notifications_enabled & (1 << event_id) == 0){
return ERROR_CODE_SUCCESS;
}
connection->notifications_to_deregister |= (1 << event_id); connection->notifications_to_deregister |= (1 << event_id);
return ERROR_CODE_SUCCESS; return ERROR_CODE_SUCCESS;
} }

4
src/classic/avrcp_controller.h
View File

@ -226,7 +226,7 @@ uint8_t avrcp_controller_press_and_hold_mute(uint16_t avrcp_cid);
uint8_t avrcp_controller_get_play_status(uint16_t avrcp_cid); uint8_t avrcp_controller_get_play_status(uint16_t avrcp_cid);
/** /**
* @brief Enable notification. Response via AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE. * @brief Enable notification. Response via AVRCP_SUBEVENT_NOTIFICATION_STATE.
* @param avrcp_cid * @param avrcp_cid
* @param event_id * @param event_id
* @returns status * @returns status
@ -234,7 +234,7 @@ uint8_t avrcp_controller_get_play_status(uint16_t avrcp_cid);
uint8_t avrcp_controller_enable_notification(uint16_t avrcp_cid, avrcp_notification_event_id_t event_id); uint8_t avrcp_controller_enable_notification(uint16_t avrcp_cid, avrcp_notification_event_id_t event_id);
/** /**
* @brief Disable notification. Response via AVRCP_SUBEVENT_ENABLE_NOTIFICATION_COMPLETE. * @brief Disable notification. Response via AVRCP_SUBEVENT_NOTIFICATION_STATE.
* @param avrcp_cid * @param avrcp_cid
* @param event_id * @param event_id
* @returns status * @returns status