mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-10 15:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed timer_t to timer_source_t to avoid conflict with timer_t in /usr/include/time.h in Linux

Browse Source
This commit is contained in:
matthias.ringwald 2009-11-23 19:45:32 +00:00
parent 8f21eb4b58
commit 981eb02ec5
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/btstack/run_loop.h
View File

@ -56,23 +56,23 @@ typedef struct timer {
linked_item_t item; linked_item_t item;
struct timeval timeout; // <-- next timeout struct timeval timeout; // <-- next timeout
void (*process)(struct timer *ts); // <-- do processing void (*process)(struct timer *ts); // <-- do processing
} timer_t; } timer_source_t;
// init must be called before any other run_loop call // init must be called before any other run_loop call
void run_loop_init(RUN_LOOP_TYPE type); void run_loop_init(RUN_LOOP_TYPE type);
// set timer based on current time // set timer based on current time
void run_loop_set_timer(timer_t *a, int timeout_in_ms); void run_loop_set_timer(timer_source_t *a, int timeout_in_ms);
// compare timeval or timers - NULL is assumed to be before the Big Bang // compare timeval or timers - NULL is assumed to be before the Big Bang
int run_loop_timeval_compare(struct timeval *a, struct timeval *b); int run_loop_timeval_compare(struct timeval *a, struct timeval *b);
int run_loop_timer_compare(timer_t *a, timer_t *b); int run_loop_timer_compare(timer_source_t *a, timer_source_t *b);
void run_loop_add_data_source(data_source_t *dataSource); // <-- add DataSource to RunLoop void run_loop_add_data_source(data_source_t *dataSource); // <-- add DataSource to RunLoop
int run_loop_remove_data_source(data_source_t *dataSource); // <-- remove DataSource from RunLoop int run_loop_remove_data_source(data_source_t *dataSource); // <-- remove DataSource from RunLoop
void run_loop_add_timer(timer_t *timer); // <-- add Timer to RunLoop void run_loop_add_timer(timer_source_t *timer); // <-- add Timer to RunLoop
int run_loop_remove_timer(timer_t *timer); // <-- remove Timer from RunLoop int run_loop_remove_timer(timer_source_t *timer); // <-- remove Timer from RunLoop
void run_loop_execute(); // <-- execute configured RunLoop void run_loop_execute(); // <-- execute configured RunLoop
@ -84,8 +84,8 @@ typedef struct {
void (*init)(); void (*init)();
void (*add_data_source)(data_source_t *dataSource); void (*add_data_source)(data_source_t *dataSource);
int (*remove_data_source)(data_source_t *dataSource); int (*remove_data_source)(data_source_t *dataSource);
void (*add_timer)(timer_t *timer); void (*add_timer)(timer_source_t *timer);
int (*remove_timer)(timer_t *timer); int (*remove_timer)(timer_source_t *timer);
void (*execute)(); void (*execute)();
void (*dump_timer)(); void (*dump_timer)();
} run_loop_t; } run_loop_t;

2
src/daemon.c
View File

@ -75,7 +75,7 @@
static hci_transport_t * transport; static hci_transport_t * transport;
static hci_uart_config_t config; static hci_uart_config_t config;
static timer_t timeout; static timer_source_t timeout;
static void dummy_bluetooth_status_handler(BLUETOOTH_STATE state){ static void dummy_bluetooth_status_handler(BLUETOOTH_STATE state){
printf("Bluetooth status: %u\n", state); printf("Bluetooth status: %u\n", state);

2
src/hci.c
View File

@ -66,7 +66,7 @@ static hci_connection_t * connection_for_handle(hci_con_handle_t con_handle){
return NULL; return NULL;
} }
static void hci_connection_timeout_handler(timer_t *timer){ static void hci_connection_timeout_handler(timer_source_t *timer){
hci_connection_t * connection = linked_item_get_user(&timer->item); hci_connection_t * connection = linked_item_get_user(&timer->item);
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);

2
src/hci.h
View File

@ -126,7 +126,7 @@ typedef struct {
hci_connection_flags_t flags; hci_connection_flags_t flags;
// timer // timer
timer_t timeout; timer_source_t timeout;
struct timeval timestamp; struct timeval timestamp;
} hci_connection_t; } hci_connection_t;

8
src/run_loop.c
View File

@ -78,7 +78,7 @@ int run_loop_remove_data_source(data_source_t *ds){
/** /**
* Add timer to run_loop (keep list sorted) * Add timer to run_loop (keep list sorted)
*/ */
void run_loop_add_timer(timer_t *ts){ void run_loop_add_timer(timer_source_t *ts){
run_loop_assert(); run_loop_assert();
the_run_loop->add_timer(ts); the_run_loop->add_timer(ts);
} }
@ -86,7 +86,7 @@ void run_loop_add_timer(timer_t *ts){
/** /**
* Remove timer from run loop * Remove timer from run loop
*/ */
int run_loop_remove_timer(timer_t *ts){ int run_loop_remove_timer(timer_source_t *ts){
run_loop_assert(); run_loop_assert();
return the_run_loop->remove_timer(ts); return the_run_loop->remove_timer(ts);
} }
@ -128,7 +128,7 @@ void run_loop_init(RUN_LOOP_TYPE type){
} }
// set timer // set timer
void run_loop_set_timer(timer_t *a, int timeout_in_ms){ void run_loop_set_timer(timer_source_t *a, int timeout_in_ms){
gettimeofday(&a->timeout, NULL); gettimeofday(&a->timeout, NULL);
a->timeout.tv_sec += timeout_in_ms / 1000; a->timeout.tv_sec += timeout_in_ms / 1000;
a->timeout.tv_usec += (timeout_in_ms % 1000) * 1000; a->timeout.tv_usec += (timeout_in_ms % 1000) * 1000;
@ -165,7 +165,7 @@ int run_loop_timeval_compare(struct timeval *a, struct timeval *b){
// compare timers - NULL is assumed to be before the Big Bang // compare timers - NULL is assumed to be before the Big Bang
// pre: 0 <= tv_usec < 1000000 // pre: 0 <= tv_usec < 1000000
int run_loop_timer_compare(timer_t *a, timer_t *b){ int run_loop_timer_compare(timer_source_t *a, timer_source_t *b){
if (!a && !b) return 0; if (!a && !b) return 0;
if (!a) return -1; if (!a) return -1;
if (!b) return 1; if (!b) return 1;

4
src/run_loop_cocoa.m
View File

@ -87,13 +87,13 @@ int cocoa_remove_data_source(data_source_t *dataSource){
return 0; return 0;
} }
void cocoa_add_timer(timer_t * ts){ void cocoa_add_timer(timer_source_t * ts){
// not needed yet // not needed yet
fprintf(stderr, "WARNING: run_loop_add_timer not implemented yet!"); fprintf(stderr, "WARNING: run_loop_add_timer not implemented yet!");
// warning never the less // warning never the less
} }
int cocoa_remove_timer(timer_t * ts){ int cocoa_remove_timer(timer_source_t * ts){
// not needed yet // not needed yet
fprintf(stderr, "WARNING: run_loop_remove_timer not implemented yet!"); fprintf(stderr, "WARNING: run_loop_remove_timer not implemented yet!");
// warning never the less // warning never the less

14
src/run_loop_posix.c
View File

@ -63,10 +63,10 @@ int posix_remove_data_source(data_source_t *ds){
/** /**
* Add timer to run_loop (keep list sorted) * Add timer to run_loop (keep list sorted)
*/ */
void posix_add_timer(timer_t *ts){ void posix_add_timer(timer_source_t *ts){
linked_item_t *it; linked_item_t *it;
for (it = (linked_item_t *) &timers; it->next ; it = it->next){ for (it = (linked_item_t *) &timers; it->next ; it = it->next){
if (run_loop_timer_compare( (timer_t *) it->next, ts) >= 0) { if (run_loop_timer_compare( (timer_source_t *) it->next, ts) >= 0) {
break; break;
} }
} }
@ -79,7 +79,7 @@ void posix_add_timer(timer_t *ts){
/** /**
* Remove timer from run loop * Remove timer from run loop
*/ */
int posix_remove_timer(timer_t *ts){ int posix_remove_timer(timer_source_t *ts){
// printf("Removed timer %x at %u\n", (int) ts, (unsigned int) ts->timeout.tv_sec); // printf("Removed timer %x at %u\n", (int) ts, (unsigned int) ts->timeout.tv_sec);
return linked_list_remove(&timers, (linked_item_t *) ts); return linked_list_remove(&timers, (linked_item_t *) ts);
} }
@ -88,7 +88,7 @@ void posix_dump_timer(){
linked_item_t *it; linked_item_t *it;
int i = 0; int i = 0;
for (it = (linked_item_t *) timers; it ; it = it->next){ for (it = (linked_item_t *) timers; it ; it = it->next){
timer_t *ts = (timer_t*) it; timer_source_t *ts = (timer_source_t*) it;
printf("timer %u, timeout %u\n", i, (unsigned int) ts->timeout.tv_sec); printf("timer %u, timeout %u\n", i, (unsigned int) ts->timeout.tv_sec);
} }
} }
@ -99,7 +99,7 @@ void posix_dump_timer(){
void posix_execute() { void posix_execute() {
fd_set descriptors; fd_set descriptors;
data_source_t *ds; data_source_t *ds;
timer_t *ts; timer_source_t *ts;
struct timeval current_tv; struct timeval current_tv;
struct timeval next_tv; struct timeval next_tv;
struct timeval *timeout; struct timeval *timeout;
@ -122,7 +122,7 @@ void posix_execute() {
timeout = NULL; timeout = NULL;
if (timers) { if (timers) {
gettimeofday(&current_tv, NULL); gettimeofday(&current_tv, NULL);
ts = (timer_t *) timers; ts = (timer_source_t *) timers;
next_tv.tv_usec = ts->timeout.tv_usec - current_tv.tv_usec; next_tv.tv_usec = ts->timeout.tv_usec - current_tv.tv_usec;
next_tv.tv_sec = ts->timeout.tv_sec - current_tv.tv_sec; next_tv.tv_sec = ts->timeout.tv_sec - current_tv.tv_sec;
while (next_tv.tv_usec < 0){ while (next_tv.tv_usec < 0){
@ -152,7 +152,7 @@ void posix_execute() {
// pre: 0 <= tv_usec < 1000000 // pre: 0 <= tv_usec < 1000000
while (timers) { while (timers) {
gettimeofday(&current_tv, NULL); gettimeofday(&current_tv, NULL);
ts = (timer_t *) timers; ts = (timer_source_t *) timers;
if (ts->timeout.tv_sec > current_tv.tv_sec) break; if (ts->timeout.tv_sec > current_tv.tv_sec) break;
if (ts->timeout.tv_sec == current_tv.tv_sec && ts->timeout.tv_usec > current_tv.tv_usec) break; if (ts->timeout.tv_sec == current_tv.tv_sec && ts->timeout.tv_usec > current_tv.tv_usec) break;
run_loop_remove_timer(ts); run_loop_remove_timer(ts);