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

rfcomm: drop _internal

Browse Source
This commit is contained in:
Matthias Ringwald 2016-01-21 12:09:19 +01:00
parent ce8f182ecc
commit 28190c0b45
21 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/manual/docs/appendix/events_errors.md
View File

@ -64,7 +64,7 @@ by RFCOMM:
- RFCOMM_EVENT_INCOMING_CONNECTION - received when the connection - RFCOMM_EVENT_INCOMING_CONNECTION - received when the connection
is requested by remote. Connection accept and decline are performed is requested by remote. Connection accept and decline are performed
with *rfcomm_accept_connection_internal* and with *rfcomm_accept_connection* and
*rfcomm_decline_con-nection_internal* respectively. *rfcomm_decline_con-nection_internal* respectively.
- RFCOMM_EVENT_CHANNEL_CLOSED - emitted when channel is closed. No - RFCOMM_EVENT_CHANNEL_CLOSED - emitted when channel is closed. No

10
doc/manual/docs/protocols.md
View File

@ -384,11 +384,11 @@ device must first init the L2CAP and RFCOMM layers and then register the
service with *rfcomm_register_service_internal*. From there on, it service with *rfcomm_register_service_internal*. From there on, it
can wait for incoming RFCOMM connections. The application can accept or can wait for incoming RFCOMM connections. The application can accept or
deny an incoming connection by calling the deny an incoming connection by calling the
*rfcomm_accept_connection_internal* and *rfcomm_accept_connection* and
*rfcomm_deny_connection_internal* functions respectively. If a *rfcomm_deny_connection_internal* functions respectively. If a
connection is accepted and the incoming RFCOMM channel gets successfully connection is accepted and the incoming RFCOMM channel gets successfully
opened, the RFCOMM service can send RFCOMM data packets to the connected opened, the RFCOMM service can send RFCOMM data packets to the connected
device with *rfcomm_send_internal* and receive data packets by the device with *rfcomm_send* and receive data packets by the
packet handler provided by the *rfcomm_register_service_internal* packet handler provided by the *rfcomm_register_service_internal*
call. call.
@ -424,7 +424,7 @@ provides the RFCOMM service example code.
bt_flip_addr(event_addr, &packet[2]); bt_flip_addr(event_addr, &packet[2]);
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
// data: event(8), len(8), status (8), address (48), handle(16), server channel(8), rfcomm_cid(16), max frame size(16) // data: event(8), len(8), status (8), address (48), handle(16), server channel(8), rfcomm_cid(16), max frame size(16)
@ -475,9 +475,9 @@ Before sending data packets, check if RFCOMM can send them by calling rfcomm_can
if (!rfcomm_channel_id) return; if (!rfcomm_channel_id) return;
if (!rfcomm_can_send_packet_now(rfcomm_channel_id)) return; if (!rfcomm_can_send_packet_now(rfcomm_channel_id)) return;
int err = rfcomm_send_internal(rfcomm_channel_id, dataBuffer, dataLen); int err = rfcomm_send(rfcomm_channel_id, dataBuffer, dataLen);
if (err) { if (err) {
log_error("rfcomm_send_internal -> error 0X%02x", err); log_error("rfcomm_send -> error 0X%02x", err);
return; return;
} }
// packet is sent prepare next one // packet is sent prepare next one

6
example/embedded/spp_and_le_counter.c
View File

@ -142,7 +142,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
@ -220,9 +220,9 @@ static void heartbeat_handler(struct btstack_timer_source *ts){
if (rfcomm_channel_id){ if (rfcomm_channel_id){
if (rfcomm_can_send_packet_now(rfcomm_channel_id)){ if (rfcomm_can_send_packet_now(rfcomm_channel_id)){
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) counter_string, counter_string_len); int err = rfcomm_send(rfcomm_channel_id, (uint8_t*) counter_string, counter_string_len);
if (err) { if (err) {
log_error("rfcomm_send_internal -> error 0X%02x", err); log_error("rfcomm_send -> error 0X%02x", err);
} }
} }
} }

6
example/embedded/spp_counter.c
View File

@ -124,9 +124,9 @@ static void heartbeat_handler(struct btstack_timer_source *ts){
sprintf(lineBuffer, "BTstack counter %04u\n", ++counter); sprintf(lineBuffer, "BTstack counter %04u\n", ++counter);
printf("%s", lineBuffer); printf("%s", lineBuffer);
if (rfcomm_can_send_packet_now(rfcomm_channel_id)) { if (rfcomm_can_send_packet_now(rfcomm_channel_id)) {
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer)); int err = rfcomm_send(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer));
if (err) { if (err) {
log_error("rfcomm_send_internal -> error 0X%02x", err); log_error("rfcomm_send -> error 0X%02x", err);
} }
} }
} }
@ -215,7 +215,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:

2
example/embedded/spp_flowcontrol.c
View File

@ -177,7 +177,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:

6
example/embedded/spp_streamer.c
View File

@ -96,14 +96,14 @@ static void create_test_data(void){
} }
static void send_packet(void){ static void send_packet(void){
int err = rfcomm_send_internal(rfcomm_cid, (uint8_t*) test_data, test_data_len); int err = rfcomm_send(rfcomm_cid, (uint8_t*) test_data, test_data_len);
if (err){ if (err){
printf("rfcomm_send_internal -> error 0X%02x", err); printf("rfcomm_send -> error 0X%02x", err);
return; return;
} }
if (data_to_send < test_data_len){ if (data_to_send < test_data_len){
rfcomm_disconnect_internal(rfcomm_cid); rfcomm_disconnect(rfcomm_cid);
rfcomm_cid = 0; rfcomm_cid = 0;
state = DONE; state = DONE;
printf("SPP Streamer: enough data send, closing DLC\n"); printf("SPP Streamer: enough data send, closing DLC\n");

10
platform/daemon/daemon.c
View File

@ -525,7 +525,7 @@ static void daemon_rfcomm_close_connection(client_state_t * daemon_client){
btstack_linked_list_iterator_init(&it, rfcomm_cids); btstack_linked_list_iterator_init(&it, rfcomm_cids);
while (btstack_linked_list_iterator_has_next(&it)){ while (btstack_linked_list_iterator_has_next(&it)){
btstack_linked_list_uint32_t * item = (btstack_linked_list_uint32_t*) btstack_linked_list_iterator_next(&it); btstack_linked_list_uint32_t * item = (btstack_linked_list_uint32_t*) btstack_linked_list_iterator_next(&it);
rfcomm_disconnect_internal(item->value); rfcomm_disconnect(item->value);
btstack_linked_list_remove(rfcomm_cids, (btstack_linked_item_t *) item); btstack_linked_list_remove(rfcomm_cids, (btstack_linked_item_t *) item);
free(item); free(item);
} }
@ -1029,7 +1029,7 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
case RFCOMM_DISCONNECT: case RFCOMM_DISCONNECT:
cid = READ_BT_16(packet, 3); cid = READ_BT_16(packet, 3);
reason = packet[5]; reason = packet[5];
rfcomm_disconnect_internal(cid); rfcomm_disconnect(cid);
break; break;
case RFCOMM_REGISTER_SERVICE: case RFCOMM_REGISTER_SERVICE:
rfcomm_channel = packet[3]; rfcomm_channel = packet[3];
@ -1051,12 +1051,12 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
break; break;
case RFCOMM_ACCEPT_CONNECTION: case RFCOMM_ACCEPT_CONNECTION:
cid = READ_BT_16(packet, 3); cid = READ_BT_16(packet, 3);
rfcomm_accept_connection_internal(cid); rfcomm_accept_connection(cid);
break; break;
case RFCOMM_DECLINE_CONNECTION: case RFCOMM_DECLINE_CONNECTION:
cid = READ_BT_16(packet, 3); cid = READ_BT_16(packet, 3);
reason = packet[7]; reason = packet[7];
rfcomm_decline_connection_internal(cid); rfcomm_decline_connection(cid);
break; break;
case RFCOMM_GRANT_CREDITS: case RFCOMM_GRANT_CREDITS:
cid = READ_BT_16(packet, 3); cid = READ_BT_16(packet, 3);
@ -1311,7 +1311,7 @@ static int daemon_client_handler(connection_t *connection, uint16_t packet_type,
break; break;
case RFCOMM_DATA_PACKET: case RFCOMM_DATA_PACKET:
// process l2cap packet... // process l2cap packet...
err = rfcomm_send_internal(channel, data, length); err = rfcomm_send(channel, data, length);
break; break;
case DAEMON_EVENT_PACKET: case DAEMON_EVENT_PACKET:
switch (data[0]) { switch (data[0]) {

6
port/ez430-rf2560/example/ant-test.c
View File

@ -127,7 +127,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
@ -201,9 +201,9 @@ static void heartbeat_handler(struct btstack_timer_source *ts){
sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter); sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter);
printf(lineBuffer); printf(lineBuffer);
if (rfcomm_can_send_packet_now(rfcomm_channel_id)){ if (rfcomm_can_send_packet_now(rfcomm_channel_id)){
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer)); int err = rfcomm_send(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer));
if (err) { if (err) {
printf("rfcomm_send_internal -> error %d", err); printf("rfcomm_send -> error %d", err);
} }
} }
} }

10
port/ez430-rf2560/example/spp_accel.c
View File

@ -107,7 +107,7 @@ static void prepare_accel_packet(void){
} }
static void send_packet(void){ static void send_packet(void){
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t *)accel_buffer, sizeof(accel_buffer)); int err = rfcomm_send(rfcomm_channel_id, (uint8_t *)accel_buffer, sizeof(accel_buffer));
switch(err){ switch(err){
case 0: case 0:
prepare_accel_packet(); prepare_accel_packet();
@ -115,7 +115,7 @@ static void send_packet(void){
case BTSTACK_ACL_BUFFERS_FULL: case BTSTACK_ACL_BUFFERS_FULL:
break; break;
default: default:
printf("rfcomm_send_internal() -> err %d\n\r", err); printf("rfcomm_send() -> err %d\n\r", err);
break; break;
} }
} }
@ -165,7 +165,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
@ -235,8 +235,8 @@ int btstack_main(int argc, const char * argv[]){
/* /*
rfcomm_send_internal gets called before we have credits rfcomm_send gets called before we have credits
rfcomm_send_internal returns undefined error codes??? rfcomm_send returns undefined error codes???
*/ */

6
port/msp-exp430f5438-cc2564b/example/ant-test.c
View File

@ -127,7 +127,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
@ -201,9 +201,9 @@ static void heartbeat_handler(struct btstack_timer_source *ts){
sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter); sprintf(lineBuffer, "BTstack counter %04u\n\r", ++counter);
printf(lineBuffer); printf(lineBuffer);
if (rfcomm_can_send_packet_now(rfcomm_channel_id)){ if (rfcomm_can_send_packet_now(rfcomm_channel_id)){
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer)); int err = rfcomm_send(rfcomm_channel_id, (uint8_t*) lineBuffer, strlen(lineBuffer));
if (err) { if (err) {
printf("rfcomm_send_internal -> error %d", err); printf("rfcomm_send -> error %d", err);
} }
} }
} }

10
port/msp-exp430f5438-cc2564b/example/spp_accel.c
View File

@ -107,7 +107,7 @@ static void prepare_accel_packet(void){
} }
static void send_packet(void){ static void send_packet(void){
int err = rfcomm_send_internal(rfcomm_channel_id, (uint8_t *)accel_buffer, sizeof(accel_buffer)); int err = rfcomm_send(rfcomm_channel_id, (uint8_t *)accel_buffer, sizeof(accel_buffer));
switch(err){ switch(err){
case 0: case 0:
prepare_accel_packet(); prepare_accel_packet();
@ -115,7 +115,7 @@ static void send_packet(void){
case BTSTACK_ACL_BUFFERS_FULL: case BTSTACK_ACL_BUFFERS_FULL:
break; break;
default: default:
printf("rfcomm_send_internal() -> err %d\n\r", err); printf("rfcomm_send() -> err %d\n\r", err);
break; break;
} }
} }
@ -165,7 +165,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
@ -236,8 +236,8 @@ int btstack_main(int argc, const char * argv[]){
/* /*
rfcomm_send_internal gets called before we have credits rfcomm_send gets called before we have credits
rfcomm_send_internal returns undefined error codes??? rfcomm_send returns undefined error codes???
*/ */

6
src/classic/hfp.c
View File

@ -132,9 +132,9 @@ const char * hfp_ag_feature(int index){
int send_str_over_rfcomm(uint16_t cid, char * command){ int send_str_over_rfcomm(uint16_t cid, char * command){
if (!rfcomm_can_send_packet_now(cid)) return 1; if (!rfcomm_can_send_packet_now(cid)) return 1;
log_info("HFP_TX %s", command); log_info("HFP_TX %s", command);
int err = rfcomm_send_internal(cid, (uint8_t*) command, strlen(command)); int err = rfcomm_send(cid, (uint8_t*) command, strlen(command));
if (err){ if (err){
log_error("rfcomm_send_internal -> error 0x%02x \n", err); log_error("rfcomm_send -> error 0x%02x \n", err);
} }
return 1; return 1;
} }
@ -478,7 +478,7 @@ void hfp_handle_hci_event(hfp_callback_t callback, uint8_t packet_type, uint8_t
context->rfcomm_cid = READ_BT_16(packet, 9); context->rfcomm_cid = READ_BT_16(packet, 9);
context->state = HFP_W4_RFCOMM_CONNECTED; context->state = HFP_W4_RFCOMM_CONNECTED;
printf("RFCOMM channel %u requested for %s\n", context->rfcomm_cid, bd_addr_to_str(context->remote_addr)); printf("RFCOMM channel %u requested for %s\n", context->rfcomm_cid, bd_addr_to_str(context->remote_addr));
rfcomm_accept_connection_internal(context->rfcomm_cid); rfcomm_accept_connection(context->rfcomm_cid);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:

2
src/classic/hfp_ag.c
View File

@ -1689,7 +1689,7 @@ static void hfp_run_for_context(hfp_connection_t *context){
switch(context->state){ switch(context->state){
case HFP_W2_DISCONNECT_RFCOMM: case HFP_W2_DISCONNECT_RFCOMM:
context->state = HFP_W4_RFCOMM_DISCONNECTED; context->state = HFP_W4_RFCOMM_DISCONNECTED;
rfcomm_disconnect_internal(context->rfcomm_cid); rfcomm_disconnect(context->rfcomm_cid);
break; break;
default: default:
break; break;

2
src/classic/hfp_hf.c
View File

@ -767,7 +767,7 @@ static void hfp_run_for_context(hfp_connection_t * context){
switch (context->state){ switch (context->state){
case HFP_W2_DISCONNECT_RFCOMM: case HFP_W2_DISCONNECT_RFCOMM:
context->state = HFP_W4_RFCOMM_DISCONNECTED; context->state = HFP_W4_RFCOMM_DISCONNECTED;
rfcomm_disconnect_internal(context->rfcomm_cid); rfcomm_disconnect(context->rfcomm_cid);
break; break;
default: default:

8
src/classic/hsp_ag.c
View File

@ -208,9 +208,9 @@ void hsp_ag_create_service(uint8_t * service, uint32_t service_record_handle, in
static int hsp_ag_send_str_over_rfcomm(uint16_t cid, char * command){ static int hsp_ag_send_str_over_rfcomm(uint16_t cid, char * command){
if (!rfcomm_can_send_packet_now(cid)) return 1; if (!rfcomm_can_send_packet_now(cid)) return 1;
int err = rfcomm_send_internal(cid, (uint8_t*) command, strlen(command)); int err = rfcomm_send(cid, (uint8_t*) command, strlen(command));
if (err){ if (err){
printf("rfcomm_send_internal -> error 0X%02x", err); printf("rfcomm_send -> error 0X%02x", err);
return err; return err;
} }
printf("Send string: \"%s\"\n", command); printf("Send string: \"%s\"\n", command);
@ -398,7 +398,7 @@ static void hsp_run(void){
case HSP_W2_DISCONNECT_RFCOMM: case HSP_W2_DISCONNECT_RFCOMM:
hsp_state = HSP_W4_RFCOMM_DISCONNECTED; hsp_state = HSP_W4_RFCOMM_DISCONNECTED;
rfcomm_disconnect_internal(rfcomm_cid); rfcomm_disconnect(rfcomm_cid);
break; break;
case HSP_ACTIVE: case HSP_ACTIVE:
@ -549,7 +549,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
bt_flip_addr(event_addr, &packet[2]); bt_flip_addr(event_addr, &packet[2]);
rfcomm_cid = READ_BT_16(packet, 9); rfcomm_cid = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n", packet[8], bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n", packet[8], bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_cid); rfcomm_accept_connection(rfcomm_cid);
hsp_state = HSP_W4_RFCOMM_CONNECTED; hsp_state = HSP_W4_RFCOMM_CONNECTED;

6
src/classic/hsp_hs.c
View File

@ -136,9 +136,9 @@ static void emit_event(uint8_t event_subtype, uint8_t value){
static int hsp_hs_send_str_over_rfcomm(uint16_t cid, const char * command){ static int hsp_hs_send_str_over_rfcomm(uint16_t cid, const char * command){
if (!rfcomm_can_send_packet_now(rfcomm_cid)) return 1; if (!rfcomm_can_send_packet_now(rfcomm_cid)) return 1;
int err = rfcomm_send_internal(cid, (uint8_t*) command, strlen(command)); int err = rfcomm_send(cid, (uint8_t*) command, strlen(command));
if (err){ if (err){
printf("rfcomm_send_internal -> error 0X%02x", err); printf("rfcomm_send -> error 0X%02x", err);
} }
return err; return err;
} }
@ -490,7 +490,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
bt_flip_addr(event_addr, &packet[2]); bt_flip_addr(event_addr, &packet[2]);
rfcomm_cid = READ_BT_16(packet, 9); rfcomm_cid = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n", packet[8], bd_addr_to_str(event_addr)); printf("RFCOMM channel %u requested for %s\n", packet[8], bd_addr_to_str(event_addr));
rfcomm_accept_connection_internal(rfcomm_cid); rfcomm_accept_connection(rfcomm_cid);
hsp_state = HSP_W4_RFCOMM_CONNECTED; hsp_state = HSP_W4_RFCOMM_CONNECTED;
break; break;

20
src/classic/rfcomm.c
View File

@ -1867,7 +1867,7 @@ void rfcomm_register_packet_handler(void (*handler)(uint8_t packet_type,
int rfcomm_can_send_packet_now(uint16_t rfcomm_cid){ int rfcomm_can_send_packet_now(uint16_t rfcomm_cid){
rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid); rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid);
if (!channel){ if (!channel){
log_error("rfcomm_send_internal cid 0x%02x doesn't exist!", rfcomm_cid); log_error("rfcomm_send cid 0x%02x doesn't exist!", rfcomm_cid);
return 1; return 1;
} }
if (!channel->credits_outgoing) return 0; if (!channel->credits_outgoing) return 0;
@ -1878,17 +1878,17 @@ int rfcomm_can_send_packet_now(uint16_t rfcomm_cid){
static int rfcomm_assert_send_valid(rfcomm_channel_t * channel , uint16_t len){ static int rfcomm_assert_send_valid(rfcomm_channel_t * channel , uint16_t len){
if (len > channel->max_frame_size){ if (len > channel->max_frame_size){
log_error("rfcomm_send_internal cid 0x%02x, rfcomm data lenght exceeds MTU!", channel->rfcomm_cid); log_error("rfcomm_send cid 0x%02x, rfcomm data lenght exceeds MTU!", channel->rfcomm_cid);
return RFCOMM_DATA_LEN_EXCEEDS_MTU; return RFCOMM_DATA_LEN_EXCEEDS_MTU;
} }
if (!channel->credits_outgoing){ if (!channel->credits_outgoing){
log_info("rfcomm_send_internal cid 0x%02x, no rfcomm outgoing credits!", channel->rfcomm_cid); log_info("rfcomm_send cid 0x%02x, no rfcomm outgoing credits!", channel->rfcomm_cid);
return RFCOMM_NO_OUTGOING_CREDITS; return RFCOMM_NO_OUTGOING_CREDITS;
} }
if ((channel->multiplexer->fcon & 1) == 0){ if ((channel->multiplexer->fcon & 1) == 0){
log_info("rfcomm_send_internal cid 0x%02x, aggregate flow off!", channel->rfcomm_cid); log_info("rfcomm_send cid 0x%02x, aggregate flow off!", channel->rfcomm_cid);
return RFCOMM_AGGREGATE_FLOW_OFF; return RFCOMM_AGGREGATE_FLOW_OFF;
} }
return 0; return 0;
@ -1934,17 +1934,17 @@ int rfcomm_send_prepared(uint16_t rfcomm_cid, uint16_t len){
if (result != 0) { if (result != 0) {
channel->credits_outgoing++; channel->credits_outgoing++;
log_info("rfcomm_send_internal: error %d", result); log_info("rfcomm_send: error %d", result);
return result; return result;
} }
return result; return result;
} }
int rfcomm_send_internal(uint16_t rfcomm_cid, uint8_t *data, uint16_t len){ int rfcomm_send(uint16_t rfcomm_cid, uint8_t *data, uint16_t len){
rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid); rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid);
if (!channel){ if (!channel){
log_error("rfcomm_send_internal cid 0x%02x doesn't exist!", rfcomm_cid); log_error("rfcomm_send cid 0x%02x doesn't exist!", rfcomm_cid);
return 1; return 1;
} }
@ -2070,7 +2070,7 @@ uint8_t rfcomm_create_channel(bd_addr_t addr, uint8_t server_channel, uint16_t *
return rfcomm_create_channel_internal(addr, server_channel, 0, RFCOMM_CREDITS, out_rfcomm_cid); return rfcomm_create_channel_internal(addr, server_channel, 0, RFCOMM_CREDITS, out_rfcomm_cid);
} }
void rfcomm_disconnect_internal(uint16_t rfcomm_cid){ void rfcomm_disconnect(uint16_t rfcomm_cid){
log_info("RFCOMM_DISCONNECT cid 0x%02x", rfcomm_cid); log_info("RFCOMM_DISCONNECT cid 0x%02x", rfcomm_cid);
rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid); rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid);
if (channel) { if (channel) {
@ -2135,7 +2135,7 @@ void rfcomm_unregister_service(uint8_t service_channel){
} }
} }
void rfcomm_accept_connection_internal(uint16_t rfcomm_cid){ void rfcomm_accept_connection(uint16_t rfcomm_cid){
log_info("RFCOMM_ACCEPT_CONNECTION cid 0x%02x", rfcomm_cid); log_info("RFCOMM_ACCEPT_CONNECTION cid 0x%02x", rfcomm_cid);
rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid); rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid);
if (!channel) return; if (!channel) return;
@ -2159,7 +2159,7 @@ void rfcomm_accept_connection_internal(uint16_t rfcomm_cid){
rfcomm_run(); rfcomm_run();
} }
void rfcomm_decline_connection_internal(uint16_t rfcomm_cid){ void rfcomm_decline_connection(uint16_t rfcomm_cid){
log_info("RFCOMM_DECLINE_CONNECTION cid 0x%02x", rfcomm_cid); log_info("RFCOMM_DECLINE_CONNECTION cid 0x%02x", rfcomm_cid);
rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid); rfcomm_channel_t * channel = rfcomm_channel_for_rfcomm_cid(rfcomm_cid);
if (!channel) return; if (!channel) return;

8
src/classic/rfcomm.h
View File

@ -321,7 +321,7 @@ uint8_t rfcomm_create_channel_with_initial_credits(bd_addr_t addr, uint8_t serve
/** /**
* @brief Disconnects RFCOMM channel with given identifier. * @brief Disconnects RFCOMM channel with given identifier.
*/ */
void rfcomm_disconnect_internal(uint16_t rfcomm_cid); void rfcomm_disconnect(uint16_t rfcomm_cid);
/** /**
* @brief Registers RFCOMM service for a server channel and a maximum frame size, and assigns a packet handler. On embedded systems, use NULL for connection parameter. This channel provides automatically enough credits to the remote side. * @brief Registers RFCOMM service for a server channel and a maximum frame size, and assigns a packet handler. On embedded systems, use NULL for connection parameter. This channel provides automatically enough credits to the remote side.
@ -341,8 +341,8 @@ void rfcomm_unregister_service(uint8_t service_channel);
/** /**
* @brief Accepts/Deny incoming RFCOMM connection. * @brief Accepts/Deny incoming RFCOMM connection.
*/ */
void rfcomm_accept_connection_internal(uint16_t rfcomm_cid); void rfcomm_accept_connection(uint16_t rfcomm_cid);
void rfcomm_decline_connection_internal(uint16_t rfcomm_cid); void rfcomm_decline_connection(uint16_t rfcomm_cid);
/** /**
* @brief Grant more incoming credits to the remote side for the given RFCOMM channel identifier. * @brief Grant more incoming credits to the remote side for the given RFCOMM channel identifier.
@ -357,7 +357,7 @@ int rfcomm_can_send_packet_now(uint16_t rfcomm_cid);
/** /**
* @brief Sends RFCOMM data packet to the RFCOMM channel with given identifier. * @brief Sends RFCOMM data packet to the RFCOMM channel with given identifier.
*/ */
int rfcomm_send_internal(uint16_t rfcomm_cid, uint8_t *data, uint16_t len); int rfcomm_send(uint16_t rfcomm_cid, uint8_t *data, uint16_t len);
/** /**
* @brief Sends Local Line Status, see LINE_STATUS_.. * @brief Sends Local Line Status, see LINE_STATUS_..

10
test/hfp/mock.c
View File

@ -133,7 +133,7 @@ extern "C" void l2cap_init(void){}
extern "C" void l2cap_register_packet_handler(void (*handler)(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size)){ extern "C" void l2cap_register_packet_handler(void (*handler)(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size)){
} }
int rfcomm_send_internal(uint16_t rfcomm_cid, uint8_t *data, uint16_t len){ int rfcomm_send(uint16_t rfcomm_cid, uint8_t *data, uint16_t len){
int start_command_offset = 2; int start_command_offset = 2;
int end_command_offset = 2; int end_command_offset = 2;
@ -168,7 +168,7 @@ uint16_t rfcomm_get_max_frame_size(uint16_t rfcomm_cid){
} }
int rfcomm_send_prepared(uint16_t rfcomm_cid, uint16_t len){ int rfcomm_send_prepared(uint16_t rfcomm_cid, uint16_t len){
printf("--- rfcomm_send_prepared with len %u ---\n", len); printf("--- rfcomm_send_prepared with len %u ---\n", len);
return rfcomm_send_internal(rfcomm_cid, rfcomm_reserved_buffer, len); return rfcomm_send(rfcomm_cid, rfcomm_reserved_buffer, len);
} }
static void hci_event_sco_complete(){ static void hci_event_sco_complete(){
@ -259,7 +259,7 @@ int rfcomm_can_send_packet_now(uint16_t rfcomm_cid){
return 1; return 1;
} }
void rfcomm_disconnect_internal(uint16_t rfcomm_cid){ void rfcomm_disconnect(uint16_t rfcomm_cid){
uint8_t event[4]; uint8_t event[4];
event[0] = RFCOMM_EVENT_CHANNEL_CLOSED; event[0] = RFCOMM_EVENT_CHANNEL_CLOSED;
event[1] = sizeof(event) - 2; event[1] = sizeof(event) - 2;
@ -282,8 +282,8 @@ void sdp_query_rfcomm_channel_and_name_for_search_pattern(bd_addr_t remote, uint
} }
void rfcomm_accept_connection_internal(uint16_t rfcomm_cid){ void rfcomm_accept_connection(uint16_t rfcomm_cid){
printf("rfcomm_accept_connection_internal \n"); printf("rfcomm_accept_connection \n");
} }
void btstack_run_loop_add_timer(btstack_timer_source_t *timer){ void btstack_run_loop_add_timer(btstack_timer_source_t *timer){

6
test/pts/classic_test.c
View File

@ -348,7 +348,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack
rfcomm_channel_nr = packet[8]; rfcomm_channel_nr = packet[8];
rfcomm_channel_id = READ_BT_16(packet, 9); rfcomm_channel_id = READ_BT_16(packet, 9);
printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(remote)); printf("RFCOMM channel %u requested for %s\n\r", rfcomm_channel_nr, bd_addr_to_str(remote));
rfcomm_accept_connection_internal(rfcomm_channel_id); rfcomm_accept_connection(rfcomm_channel_id);
break; break;
case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE: case RFCOMM_EVENT_OPEN_CHANNEL_COMPLETE:
@ -637,7 +637,7 @@ static int stdin_process(struct btstack_data_source *ds){
break; break;
case 'n': case 'n':
printf("Send RFCOMM Data\n"); // mtu < 60 printf("Send RFCOMM Data\n"); // mtu < 60
rfcomm_send_internal(rfcomm_channel_id, (uint8_t *) "012345678901234567890123456789012345678901234567890123456789", mtu); rfcomm_send(rfcomm_channel_id, (uint8_t *) "012345678901234567890123456789012345678901234567890123456789", mtu);
break; break;
case 'u': case 'u':
printf("Sending RLS indicating framing error\n"); // mtu < 60 printf("Sending RLS indicating framing error\n"); // mtu < 60
@ -653,7 +653,7 @@ static int stdin_process(struct btstack_data_source *ds){
break; break;
case 'o': case 'o':
printf("RFCOMM Channel Closed\n"); printf("RFCOMM Channel Closed\n");
rfcomm_disconnect_internal(rfcomm_channel_id); rfcomm_disconnect(rfcomm_channel_id);
rfcomm_channel_id = 0; rfcomm_channel_id = 0;
break; break;

4
test/pts/hfp_test.c
View File

@ -72,9 +72,9 @@ static uint8_t hfp_service_level_connection_state = 0;
static void send_str_over_rfcomm(uint16_t cid, char * command){ static void send_str_over_rfcomm(uint16_t cid, char * command){
printf("Send %s.\n", command); printf("Send %s.\n", command);
int err = rfcomm_send_internal(cid, (uint8_t*) command, strlen(command)); int err = rfcomm_send(cid, (uint8_t*) command, strlen(command));
if (err){ if (err){
printf("rfcomm_send_internal -> error 0X%02x", err); printf("rfcomm_send -> error 0X%02x", err);
} }
} }