From 835c167141f0fab03577154101e273eb5a07feb7 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Thu, 24 Mar 2016 19:36:55 +0100 Subject: [PATCH] runloop: set ds->process via setter --- platform/daemon/src/socket_connection.c | 6 +++--- platform/posix/hci_transport_h4_posix.c | 2 +- port/ios/src/hci_transport_h4_iphone.c | 2 +- port/libusb/hci_transport_h2_libusb.c | 2 +- port/mtk/hci_transport_h4_mtk.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/platform/daemon/src/socket_connection.c b/platform/daemon/src/socket_connection.c index aaec98b84..dc2c7ff53 100644 --- a/platform/daemon/src/socket_connection.c +++ b/platform/daemon/src/socket_connection.c @@ -315,7 +315,7 @@ int socket_connection_create_tcp(int port){ btstack_data_source_t *ds = malloc( sizeof(btstack_data_source_t)); if (ds == NULL) return -1; ds->fd = 0; - ds->process = socket_connection_accept; + btstack_run_loop_set_data_source_handler(ds, &socket_connection_accept); // create tcp socket if ((ds->fd = socket (PF_INET, SOCK_STREAM, 0)) < 0) { @@ -369,7 +369,7 @@ void socket_connection_launchd_register_fd_array(launch_data_t listening_fd_arra // create btstack_data_source_t for fd btstack_data_source_t *ds = malloc( sizeof(btstack_data_source_t)); if (ds == NULL) return; - ds->process = socket_connection_accept; + btstack_run_loop_set_data_source_handler(ds, &socket_connection_accept); ds->fd = listening_fd; btstack_run_loop_add_data_source(ds); } @@ -456,7 +456,7 @@ int socket_connection_create_unix(char *path){ btstack_data_source_t *ds = malloc( sizeof(btstack_data_source_t)); if (ds == NULL) return -1; ds->fd = 0; - ds->process = socket_connection_accept; + btstack_run_loop_set_data_source_handler(ds, &socket_connection_accept); // create unix socket if ((ds->fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0) { diff --git a/platform/posix/hci_transport_h4_posix.c b/platform/posix/hci_transport_h4_posix.c index 8684ca5a1..9b7282f9b 100644 --- a/platform/posix/hci_transport_h4_posix.c +++ b/platform/posix/hci_transport_h4_posix.c @@ -213,7 +213,7 @@ static int h4_open(void){ if (!hci_transport_h4->ds) return -1; hci_transport_h4->uart_fd = fd; hci_transport_h4->ds->fd = fd; - hci_transport_h4->ds->process = h4_process; + btstack_run_loop_set_data_source_handler(hci_transport_h4, &h4_process); btstack_run_loop_add_data_source(hci_transport_h4->ds); // also set baudrate diff --git a/port/ios/src/hci_transport_h4_iphone.c b/port/ios/src/hci_transport_h4_iphone.c index cf5429747..d01c66e13 100644 --- a/port/ios/src/hci_transport_h4_iphone.c +++ b/port/ios/src/hci_transport_h4_iphone.c @@ -225,7 +225,7 @@ static int h4_open(void) hci_transport_h4->uart_fd = fd; hci_transport_h4->ds->fd = fd; - hci_transport_h4->ds->process = h4_process; + btstack_run_loop_set_data_source_handler(hci_transport_h4, &h4_process); btstack_run_loop_add_data_source(hci_transport_h4->ds); // init state machine diff --git a/port/libusb/hci_transport_h2_libusb.c b/port/libusb/hci_transport_h2_libusb.c index bd183c5cf..f86052a2b 100644 --- a/port/libusb/hci_transport_h2_libusb.c +++ b/port/libusb/hci_transport_h2_libusb.c @@ -844,7 +844,7 @@ static int usb_open(void){ for (r = 0 ; r < num_pollfds ; r++) { btstack_data_source_t *ds = &pollfd_data_sources[r]; ds->fd = pollfd[r]->fd; - ds->process = usb_process_ds; + btstack_run_loop_set_data_source_handler(ds, &usb_process_ds); btstack_run_loop_add_data_source(ds); log_info("%u: %p fd: %u, events %x", r, pollfd[r], pollfd[r]->fd, pollfd[r]->events); } diff --git a/port/mtk/hci_transport_h4_mtk.c b/port/mtk/hci_transport_h4_mtk.c index 69f6e4dbd..e2c1fb87e 100644 --- a/port/mtk/hci_transport_h4_mtk.c +++ b/port/mtk/hci_transport_h4_mtk.c @@ -85,7 +85,7 @@ static int h4_open(void){ hci_transport_h4->ds = (btstack_data_source_t*) malloc(sizeof(btstack_data_source_t)); if (!hci_transport_h4->ds) return -1; hci_transport_h4->ds->fd = fd; - hci_transport_h4->ds->process = h4_process; + btstack_run_loop_set_data_source_handler(hci_transport_h4->ds, &h4_process); btstack_run_loop_add_data_source(hci_transport_h4->ds); return 0; }