mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-25 09:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: fix runloop compile

Browse Source
This commit is contained in:
Matthias Ringwald 2016-03-28 11:35:44 +02:00
parent 63498137b1
commit 7f7a486516
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
platform/cocoa/btstack_run_loop_cocoa.m
View File

@ -54,7 +54,7 @@ static const btstack_run_loop_t btstack_run_loop_cocoa;
typedef struct { typedef struct {
CFSocketRef socket; CFSocketRef socket;
CFRunLoopSourceRef socketRunLoop; CFRunLoopSourceRef socket_run_loop;
} btstack_cocoa_data_source_helper_t; } btstack_cocoa_data_source_helper_t;
static void theCFRunLoopTimerCallBack (CFRunLoopTimerRef timer,void *info){ static void theCFRunLoopTimerCallBack (CFRunLoopTimerRef timer,void *info){
@ -69,7 +69,7 @@ static void socketDataCallback (
const void *data, const void *data,
void *info) { void *info) {
if (!info) return; if (!info) return;
btstack_data_source_t * ds = (btstack_ds_t *) info; btstack_data_source_t * ds = (btstack_data_source_t *) info;
if ((callbackType == kCFSocketReadCallBack) && (ds->flags & DATA_SOURCE_CALLBACK_READ)){ if ((callbackType == kCFSocketReadCallBack) && (ds->flags & DATA_SOURCE_CALLBACK_READ)){
// printf("btstack_run_loop_cocoa_ds %x - fd %u, CFSocket %x, CFRunLoopSource %x\n", (int) ds, ds->fd, (int) s, (int) ds->item.next); // printf("btstack_run_loop_cocoa_ds %x - fd %u, CFSocket %x, CFRunLoopSource %x\n", (int) ds, ds->fd, (int) s, (int) ds->item.next);
@ -136,27 +136,27 @@ static void btstack_run_loop_cocoa_add_data_source(btstack_data_source_t *data_s
// add to run loop // add to run loop
CFRunLoopAddSource( CFRunLoopGetCurrent(), socket_run_loop, kCFRunLoopCommonModes); CFRunLoopAddSource( CFRunLoopGetCurrent(), socket_run_loop, kCFRunLoopCommonModes);
// printf("btstack_run_loop_cocoa_add_data_source %x - fd %u - CFSocket %x, CFRunLoopSource %x\n", (int) dataSource, dataSource->fd, (int) socket, (int) socketRunLoop); // printf("btstack_run_loop_cocoa_add_data_source %x - fd %u - CFSocket %x, CFRunLoopSource %x\n", (int) dataSource, dataSource->fd, (int) socket, (int) socket_run_loop);
} }
static void btstack_run_loop_embedded_enable_data_source_callbacks(btstack_data_source_t * ds, uint16_t callback_types){ static void btstack_run_loop_embedded_enable_data_source_callbacks(btstack_data_source_t * ds, uint16_t callback_types){
btstack_cocoa_data_source_helper_t * references = (btstack_cocoa_data_source_helper_t *) dataSource->item.next; btstack_cocoa_data_source_helper_t * references = (btstack_cocoa_data_source_helper_t *) ds->item.next;
uint16_t option_flags = btstack_run_loop_cocoa_option_flags_for_callback_types(callback_types); uint16_t option_flags = btstack_run_loop_cocoa_option_flags_for_callback_types(callback_types);
CFSocketEnableCallBacks(references->socket, option_flags); CFSocketEnableCallBacks(references->socket, option_flags);
} }
static void btstack_run_loop_embedded_disable_data_source_callbacks(btstack_data_source_t * ds, uint16_t callback_types){ static void btstack_run_loop_embedded_disable_data_source_callbacks(btstack_data_source_t * ds, uint16_t callback_types){
btstack_cocoa_data_source_helper_t * references = (btstack_cocoa_data_source_helper_t *) dataSource->item.next; btstack_cocoa_data_source_helper_t * references = (btstack_cocoa_data_source_helper_t *) ds->item.next;
uint16_t option_flags = btstack_run_loop_cocoa_option_flags_for_callback_types(callback_types); uint16_t option_flags = btstack_run_loop_cocoa_option_flags_for_callback_types(callback_types);
CFSocketDisableCallBacks(references->socket, option_flags); CFSocketDisableCallBacks(references->socket, option_flags);
} }
static int btstack_run_loop_cocoa_remove_data_source(btstack_data_source_t *dataSource){ static int btstack_run_loop_cocoa_remove_data_source(btstack_data_source_t *ds){
btstack_cocoa_data_source_helper_t * references = (btstack_cocoa_data_source_helper_t *) dataSource->item.next; btstack_cocoa_data_source_helper_t * references = (btstack_cocoa_data_source_helper_t *) ds->item.next;
// printf("btstack_run_loop_cocoa_remove_data_source %x - fd %u, CFSocket %x, CFRunLoopSource %x\n", (int) dataSource, dataSource->fd, (int) dataSource->item.next, (int) dataSource->item.user_data); // printf("btstack_run_loop_cocoa_remove_data_source %x - fd %u, CFSocket %x, CFRunLoopSource %x\n", (int) dataSource, dataSource->fd, (int) dataSource->item.next, (int) dataSource->item.user_data);
CFRunLoopRemoveSource( CFRunLoopGetCurrent(), references->socketRunLoop, kCFRunLoopCommonModes); CFRunLoopRemoveSource( CFRunLoopGetCurrent(), references->socket_run_loop, kCFRunLoopCommonModes);
CFRelease(references->socketRunLoop); CFRelease(references->socket_run_loop);
CFSocketInvalidate(references->socket); CFSocketInvalidate(references->socket);
CFRelease(references->socket); CFRelease(references->socket);
@ -235,8 +235,8 @@ static const btstack_run_loop_t btstack_run_loop_cocoa = {
&btstack_run_loop_cocoa_init, &btstack_run_loop_cocoa_init,
&btstack_run_loop_cocoa_add_data_source, &btstack_run_loop_cocoa_add_data_source,
&btstack_run_loop_cocoa_remove_data_source, &btstack_run_loop_cocoa_remove_data_source,
NULL, &btstack_run_loop_embedded_enable_data_source_callbacks,
NULL, &btstack_run_loop_embedded_disable_data_source_callbacks,
&btstack_run_loop_cocoa_set_timer, &btstack_run_loop_cocoa_set_timer,
&btstack_run_loop_cocoa_add_timer, &btstack_run_loop_cocoa_add_timer,
&btstack_run_loop_cocoa_remove_timer, &btstack_run_loop_cocoa_remove_timer,