diff --git a/platform/daemon/src/daemon.c b/platform/daemon/src/daemon.c index 3348ce239..acd42c1ba 100644 --- a/platform/daemon/src/daemon.c +++ b/platform/daemon/src/daemon.c @@ -1957,10 +1957,10 @@ int main (int argc, char * const * argv){ hci_transport_config_uart.baudrate_init = 0; transport = hci_transport_h4_iphone_instance(); } else { - transport = hci_transport_h4_instance(); + transport = hci_transport_h4_posix_instance(); } #else - transport = hci_transport_h4_instance(); + transport = hci_transport_h4_posix_instance(); #endif config = &hci_transport_config_uart; #endif diff --git a/platform/posix/src/hci_transport_h4_posix.c b/platform/posix/src/hci_transport_h4_posix.c index d18dc6cec..82e6bce97 100644 --- a/platform/posix/src/hci_transport_h4_posix.c +++ b/platform/posix/src/hci_transport_h4_posix.c @@ -331,7 +331,7 @@ static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size){ } // get h4 singleton -hci_transport_t * hci_transport_h4_instance() { +hci_transport_t * hci_transport_h4_posix_instance() { if (hci_transport_h4 == NULL) { hci_transport_h4 = (hci_transport_h4_t*)malloc( sizeof(hci_transport_h4_t)); hci_transport_h4->ds = NULL; diff --git a/port/daemon/src/Makefile.in b/port/daemon/src/Makefile.in index b0533f253..da1728241 100644 --- a/port/daemon/src/Makefile.in +++ b/port/daemon/src/Makefile.in @@ -38,7 +38,7 @@ libBTstack_SOURCES = \ BTdaemon_SOURCES = \ daemon.c \ - hci_transport_h4.c \ + hci_transport_h4_posix.c \ $(libBTstack_SOURCES) \ btstack_memory.c \ hci.c \ diff --git a/port/ios/src/Makefile b/port/ios/src/Makefile index a609c2b83..27d4d58fc 100644 --- a/port/ios/src/Makefile +++ b/port/ios/src/Makefile @@ -46,7 +46,7 @@ BTdaemon_FILES = \ sdp_query_rfcomm.c \ sdp_query_util.c \ daemon.c \ - hci_transport_h4.c \ + hci_transport_h4_posix.c \ bt_control_iphone.m \ hci_transport_h4_iphone.c \ platform_iphone.m \ diff --git a/port/mtk/hci_transport_h4_mtk.c b/port/mtk/hci_transport_h4_mtk.c index ca0e3b795..19ca9136a 100644 --- a/port/mtk/hci_transport_h4_mtk.c +++ b/port/mtk/hci_transport_h4_mtk.c @@ -160,7 +160,7 @@ static void dummy_handler(uint8_t packet_type, uint8_t *packet, uint16_t size){ } // get h4 singleton -hci_transport_t * hci_transport_h4_instance(void){ +hci_transport_t * hci_transport_h4_posix_instance(void){ if (hci_transport_h4 == NULL) { hci_transport_h4 = (hci_transport_h4_t*)malloc( sizeof(hci_transport_h4_t)); hci_transport_h4->ds = NULL; diff --git a/port/posix-cc2564b/Makefile b/port/posix-cc2564b/Makefile index eefbcb62e..d3152cb69 100644 --- a/port/posix-cc2564b/Makefile +++ b/port/posix-cc2564b/Makefile @@ -4,7 +4,7 @@ POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix CORE += main.c stdin_support.c bt_control_cc256x.c bluetooth_init_cc2564B_1.2_BT_Spec_4.1.c -COMMON += hci_transport_h4.c run_loop_posix.c remote_device_db_fs.c +COMMON += hci_transport_h4_posix.c run_loop_posix.c remote_device_db_fs.c include ${BTSTACK_ROOT}/example/embedded/Makefile.inc diff --git a/port/posix-cc2564b/main.c b/port/posix-cc2564b/main.c index 19382fe84..61cd14a1f 100644 --- a/port/posix-cc2564b/main.c +++ b/port/posix-cc2564b/main.c @@ -104,7 +104,7 @@ int main(int argc, const char * argv[]){ config.device_name = "/dev/tty.usbserial-AD025KU2"; // init HCI - hci_transport_t * transport = hci_transport_h4_instance(); + hci_transport_t * transport = hci_transport_h4_posix_instance(); bt_control_t * control = bt_control_cc256x_instance(); remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_fs; diff --git a/port/posix-h4/Makefile b/port/posix-h4/Makefile index be75033fe..d9ba3c932 100644 --- a/port/posix-h4/Makefile +++ b/port/posix-h4/Makefile @@ -3,7 +3,7 @@ BTSTACK_ROOT = ../.. CORE += main.c stdin_support.c -COMMON += hci_transport_h4.c run_loop_posix.c remote_device_db_fs.c +COMMON += hci_transport_h4_posix.c run_loop_posix.c remote_device_db_fs.c include ${BTSTACK_ROOT}/example/embedded/Makefile.inc diff --git a/port/posix-h4/main.c b/port/posix-h4/main.c index d09be5d57..fe6fc22de 100644 --- a/port/posix-h4/main.c +++ b/port/posix-h4/main.c @@ -100,7 +100,7 @@ int main(int argc, const char * argv[]){ config.device_name = "/dev/tty.usbmodem1413"; // init HCI - hci_transport_t * transport = hci_transport_h4_instance(); + hci_transport_t * transport = hci_transport_h4_posix_instance(); remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_fs; hci_init(transport, (void*) &config, NULL, remote_db); diff --git a/port/posix-stlc2500d/Makefile b/port/posix-stlc2500d/Makefile index b667b5fd3..d71a8f6df 100644 --- a/port/posix-stlc2500d/Makefile +++ b/port/posix-stlc2500d/Makefile @@ -4,7 +4,7 @@ POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix CORE += main.c stdin_support.c bt_control_stlc2500d.c -COMMON += hci_transport_h4.c run_loop_posix.c remote_device_db_fs.c +COMMON += hci_transport_h4_posix.c run_loop_posix.c remote_device_db_fs.c include ${BTSTACK_ROOT}/example/embedded/Makefile.inc diff --git a/port/posix-stlc2500d/main.c b/port/posix-stlc2500d/main.c index 9762be5a2..8734667b9 100644 --- a/port/posix-stlc2500d/main.c +++ b/port/posix-stlc2500d/main.c @@ -102,7 +102,7 @@ int main(int argc, const char * argv[]){ config.device_name = "/dev/tty.usbserial-AD025KU2"; // init HCI - hci_transport_t * transport = hci_transport_h4_instance(); + hci_transport_t * transport = hci_transport_h4_posix_instance(); bt_control_t * control = bt_control_stlc2500d_instance(); remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_fs; diff --git a/port/posix-wl183x/Makefile b/port/posix-wl183x/Makefile index 621aff4fe..5b9963752 100644 --- a/port/posix-wl183x/Makefile +++ b/port/posix-wl183x/Makefile @@ -4,7 +4,7 @@ POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix CORE += main.c stdin_support.c bt_control_cc256x.c TIInit_11.8.32.c -COMMON += hci_transport_h4.c run_loop_posix.c remote_device_db_fs.c +COMMON += hci_transport_h4_posix.c run_loop_posix.c remote_device_db_fs.c include ${BTSTACK_ROOT}/example/embedded/Makefile.inc diff --git a/port/posix-wl183x/main.c b/port/posix-wl183x/main.c index bbc209124..6bcde8520 100644 --- a/port/posix-wl183x/main.c +++ b/port/posix-wl183x/main.c @@ -103,7 +103,7 @@ int main(int argc, const char * argv[]){ config.device_name = "/dev/tty.usbserial-AD025KU2"; // init HCI - hci_transport_t * transport = hci_transport_h4_instance(); + hci_transport_t * transport = hci_transport_h4_posix_instance(); bt_control_t * control = bt_control_cc256x_instance(); remote_device_db_t * remote_db = (remote_device_db_t *) &remote_device_db_fs; diff --git a/src/hci_transport.h b/src/hci_transport.h index 17ecb4a63..25445e8f2 100644 --- a/src/hci_transport.h +++ b/src/hci_transport.h @@ -91,7 +91,7 @@ typedef struct { /* * @brief */ -extern hci_transport_t * hci_transport_h4_instance(void); +extern hci_transport_t * hci_transport_h4_posix_instance(void); /* * @brief @@ -106,17 +106,13 @@ extern hci_transport_t * hci_transport_h4_iphone_instance(void); /* * @brief */ -extern hci_transport_t * hci_transport_h5_instance(void); +extern hci_transport_t * hci_transport_h4_wiced_instance(); /* * @brief */ extern hci_transport_t * hci_transport_usb_instance(void); -/* - * @brief - */ -extern hci_transport_t * hci_transport_h4_wiced_instance(); /* API_END */