mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-26 12:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

avrcp browsing pts: update files to use new API

Browse Source
This commit is contained in:
Milanka Ringwald 2020-05-26 09:57:32 +02:00 committed by Matthias Ringwald
parent a909c49865
commit 0dce2f87ce
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/pts/Makefile
View File

@ -70,6 +70,14 @@ AVDTP += \
a2dp_sink.c \
btstack_ring_buffer.c \
AVRCP += \
avrcp_media_item_iterator.c \
avrcp.c \
avrcp_target.c \
avrcp_controller.c \
avrcp_browsing_target.c \
avrcp_browsing_controller.c \
# include ${BTSTACK_ROOT}/example/Makefile.inc
HXCMOD_PLAYER = \
@ -128,6 +136,7 @@ GATT_SERVER_OBJ = $(GATT_SERVER:.c=.o)
SBC_DECODER_OBJ = $(SBC_DECODER:.c=.o)
SBC_ENCODER_OBJ = $(SBC_ENCODER:.c=.o)
AVDTP_OBJ = $(AVDTP:.c=.o)
AVRCP_OBJ = $(AVRCP:.c=.o)
HXCMOD_PLAYER_OBJ = ${HXCMOD_PLAYER:.c=.o}
SRC_BLE_GATT_SERVICE_FILES_OBJ = ${SRC_BLE_GATT_SERVICE_FILES:.c=.o}
@ -171,10 +180,10 @@ hrp_server_test: hrp_server_test.h ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_S
hrp_col_test: ${CORE_OBJ} ${COMMON_OBJ} ${ATT_OBJ} ${GATT_CLIENT_OBJ} ${SM_OBJ} hrp_col_test.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
avrcp_target_test: ${CORE_OBJ} ${COMMON_OBJ} ${SBC_ENCODER_OBJ} ${SM_OBJ} ${AVDTP_OBJ} ${HXCMOD_PLAYER_OBJ} sdp_client.o avrcp.o avrcp_media_item_iterator.o avrcp.o avrcp_target.o avrcp_browsing_target.o btstack_stdin_pts.o avrcp_target_test.c
avrcp_target_test: ${CORE_OBJ} ${COMMON_OBJ} ${SBC_ENCODER_OBJ} ${SM_OBJ} ${AVDTP_OBJ} ${AVRCP_OBJ} ${HXCMOD_PLAYER_OBJ} sdp_client.o btstack_stdin_pts.o avrcp_target_test.c
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
avrcp_controller_test: ${CORE_OBJ} ${COMMON_OBJ} ${SBC_DECODER_OBJ} ${SM_OBJ} ${SBC_ENCODER_OBJ} ${AVDTP_OBJ} sdp_client.o avrcp.o avrcp_media_item_iterator.o avrcp_controller.o avrcp_browsing_controller.o btstack_stdin_pts.o avrcp_controller_test.o
avrcp_controller_test: ${CORE_OBJ} ${COMMON_OBJ} ${SBC_DECODER_OBJ} ${SM_OBJ} ${SBC_ENCODER_OBJ} ${AVRCP_OBJ} ${AVDTP_OBJ} sdp_client.o btstack_stdin_pts.o avrcp_controller_test.o
${CC} $^ ${CFLAGS} ${LDFLAGS} -o $@
avdtp_sink_test: ${CORE_OBJ} ${COMMON_OBJ} ${SBC_DECODER_OBJ} ${SM_OBJ} ${SBC_ENCODER_OBJ} ${AVDTP_OBJ} avdtp_sink_test.o

16
test/pts/avrcp_controller_test.c
View File

@ -60,7 +60,7 @@
// mac 2011: static const char * device_addr_string = "04:0C:CE:E4:85:D3";
// pts: static const char * device_addr_string = "00:1B:DC:07:32:EF";
// iPod 5G-C:
static const char * device_addr_string = "B0:34:95:CB:97:C4";
static const char * device_addr_string = "00:1B:DC:08:E2:5C";
// mac 2013: static const char * device_addr_string = "84:38:35:65:d1:15";
// phone 2013: static const char * device_addr_string = "D8:BB:2C:DF:F0:F2";
// minijambox: static const char * device_addr_string = "00:21:3C:AC:F7:38";
@ -354,7 +354,7 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
avrcp_cid = local_cid;
avrcp_connected = 1;
avrcp_subevent_connection_established_get_bd_addr(packet, event_addr);
printf("AVRCP Controller connected.\n");
printf("AVRCP Controller connected avrcp_cid 0x0%2x.\n", avrcp_cid);
return;
}
case AVRCP_SUBEVENT_CONNECTION_RELEASED:
@ -369,12 +369,12 @@ static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packe
local_cid = avrcp_subevent_incoming_browsing_connection_get_browsing_cid(packet);
if (browsing_cid != 0 && browsing_cid != local_cid) {
printf("AVRCP Browsing Client connection failed, expected 0x%02X l2cap cid, received 0x%02X\n", browsing_cid, local_cid);
avrcp_browsing_controller_decline_incoming_connection(browsing_cid);
avrcp_browsing_decline_incoming_connection(browsing_cid);
return;
}
browsing_cid = local_cid;
printf("AVRCP Browsing Client configure incoming connection, browsing cid 0x%02x\n", browsing_cid);
avrcp_browsing_controller_configure_incoming_connection(browsing_cid, ertm_buffer, sizeof(ertm_buffer), &ertm_config);
avrcp_browsing_configure_incoming_connection(browsing_cid, ertm_buffer, sizeof(ertm_buffer), &ertm_config);
break;
case AVRCP_SUBEVENT_BROWSING_CONNECTION_ESTABLISHED: {
@ -646,12 +646,12 @@ static void stdin_process(char * cmd, int size){
break;
}
printf(" - Create AVRCP connection for browsing to addr %s.\n", bd_addr_to_str(device_addr));
status = avrcp_browsing_controller_connect(device_addr, ertm_buffer, sizeof(ertm_buffer), &ertm_config, &browsing_cid);
status = avrcp_browsing_connect(device_addr, ertm_buffer, sizeof(ertm_buffer), &ertm_config, &browsing_cid);
break;
case 'E':
if (avrcp_browsing_connected){
printf(" - AVRCP Browsing Controller disconnect from addr %s.\n", bd_addr_to_str(device_addr));
status = avrcp_browsing_controller_disconnect(browsing_cid);
status = avrcp_browsing_disconnect(browsing_cid);
break;
}
printf("AVRCP Browsing Controller already disconnected\n");
@ -1140,6 +1140,10 @@ int btstack_main(int argc, const char * argv[]){
// Initialize AVRCP Controller
avrcp_controller_init();
avrcp_controller_register_packet_handler(&packet_handler);
avrcp_browsing_init();
avrcp_browsing_register_packet_handler(&packet_handler);
avrcp_browsing_controller_init();
avrcp_browsing_controller_register_packet_handler(&packet_handler);

10
test/pts/avrcp_target_test.c
View File

@ -154,7 +154,7 @@ static btstack_packet_callback_registration_t hci_event_callback_registration;
#ifdef HAVE_BTSTACK_STDIN
// pts:
static const char * device_addr_string = "00:1B:DC:07:32:EF";
static const char * device_addr_string = "00:1B:DC:08:E2:5C";
// mac 2013: static const char * device_addr_string = "84:38:35:65:d1:15";
// phone 2013: static const char * device_addr_string = "D8:BB:2C:DF:F0:F2";
// Minijambox:
@ -524,12 +524,12 @@ static void avrcp_target_packet_handler(uint8_t packet_type, uint16_t channel, u
local_cid = avrcp_subevent_incoming_browsing_connection_get_browsing_cid(packet);
if (browsing_cid != 0 && browsing_cid != local_cid) {
printf("AVRCP Browsing Client connection failed, expected 0x%02X l2cap cid, received 0x%02X\n", browsing_cid, local_cid);
avrcp_browsing_target_decline_incoming_connection(browsing_cid);
avrcp_browsing_decline_incoming_connection(browsing_cid);
return;
}
browsing_cid = local_cid;
printf("AVRCP Browsing Client configure incoming connection, browsing cid 0x%02x\n", browsing_cid);
avrcp_browsing_target_configure_incoming_connection(browsing_cid, ertm_buffer, sizeof(ertm_buffer), &ertm_config);
avrcp_browsing_configure_incoming_connection(browsing_cid, ertm_buffer, sizeof(ertm_buffer), &ertm_config);
break;
case AVRCP_SUBEVENT_BROWSING_CONNECTION_ESTABLISHED: {
@ -849,6 +849,10 @@ int btstack_main(int argc, const char * argv[]){
// Initialize AVRCP Target.
avrcp_target_init();
avrcp_target_register_packet_handler(&avrcp_target_packet_handler);
avrcp_browsing_init();
avrcp_browsing_register_packet_handler(&avrcp_target_packet_handler);
avrcp_browsing_target_init();
avrcp_browsing_target_register_packet_handler(&avrcp_target_packet_handler);
// Initialize SDP,