diff options
Diffstat (limited to 'uisimulator/sdl')
-rw-r--r-- | uisimulator/sdl/button.c | 14 | ||||
-rw-r--r-- | uisimulator/sdl/kernel.c | 19 |
2 files changed, 17 insertions, 16 deletions
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 777c9d1b95..6931d13fe5 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -481,17 +481,17 @@ void button_event(int key, bool pressed) | |||
481 | #ifdef HAVE_REMOTE_LCD | 481 | #ifdef HAVE_REMOTE_LCD |
482 | if(diff & BUTTON_REMOTE) | 482 | if(diff & BUTTON_REMOTE) |
483 | if(!skip_remote_release) | 483 | if(!skip_remote_release) |
484 | queue_post(&button_queue, BUTTON_REL | diff, NULL); | 484 | queue_post(&button_queue, BUTTON_REL | diff, 0); |
485 | else | 485 | else |
486 | skip_remote_release = false; | 486 | skip_remote_release = false; |
487 | else | 487 | else |
488 | #endif | 488 | #endif |
489 | if(!skip_release) | 489 | if(!skip_release) |
490 | queue_post(&button_queue, BUTTON_REL | diff, NULL); | 490 | queue_post(&button_queue, BUTTON_REL | diff, 0); |
491 | else | 491 | else |
492 | skip_release = false; | 492 | skip_release = false; |
493 | #else | 493 | #else |
494 | queue_post(&button_queue, BUTTON_REL | diff, NULL); | 494 | queue_post(&button_queue, BUTTON_REL | diff, 0); |
495 | #endif | 495 | #endif |
496 | } | 496 | } |
497 | 497 | ||
@@ -543,7 +543,7 @@ void button_event(int key, bool pressed) | |||
543 | { | 543 | { |
544 | if (queue_empty(&button_queue)) | 544 | if (queue_empty(&button_queue)) |
545 | { | 545 | { |
546 | queue_post(&button_queue, BUTTON_REPEAT | btn, NULL); | 546 | queue_post(&button_queue, BUTTON_REPEAT | btn, 0); |
547 | #ifdef CONFIG_BACKLIGHT | 547 | #ifdef CONFIG_BACKLIGHT |
548 | #ifdef HAVE_REMOTE_LCD | 548 | #ifdef HAVE_REMOTE_LCD |
549 | if(btn & BUTTON_REMOTE) | 549 | if(btn & BUTTON_REMOTE) |
@@ -565,18 +565,18 @@ void button_event(int key, bool pressed) | |||
565 | #ifdef HAVE_REMOTE_LCD | 565 | #ifdef HAVE_REMOTE_LCD |
566 | if (btn & BUTTON_REMOTE) { | 566 | if (btn & BUTTON_REMOTE) { |
567 | if (!remote_filter_first_keypress || is_remote_backlight_on()) | 567 | if (!remote_filter_first_keypress || is_remote_backlight_on()) |
568 | queue_post(&button_queue, btn, NULL); | 568 | queue_post(&button_queue, btn, 0); |
569 | else | 569 | else |
570 | skip_remote_release = true; | 570 | skip_remote_release = true; |
571 | } | 571 | } |
572 | else | 572 | else |
573 | #endif | 573 | #endif |
574 | if (!filter_first_keypress || is_backlight_on()) | 574 | if (!filter_first_keypress || is_backlight_on()) |
575 | queue_post(&button_queue, btn, NULL); | 575 | queue_post(&button_queue, btn, 0); |
576 | else | 576 | else |
577 | skip_release = true; | 577 | skip_release = true; |
578 | #else /* no backlight, nothing to skip */ | 578 | #else /* no backlight, nothing to skip */ |
579 | queue_post(&button_queue, btn, NULL); | 579 | queue_post(&button_queue, btn, 0); |
580 | #endif | 580 | #endif |
581 | post = false; | 581 | post = false; |
582 | } | 582 | } |
diff --git a/uisimulator/sdl/kernel.c b/uisimulator/sdl/kernel.c index fa573a3cc9..dddfa70066 100644 --- a/uisimulator/sdl/kernel.c +++ b/uisimulator/sdl/kernel.c | |||
@@ -53,7 +53,8 @@ static void queue_fetch_sender(struct queue_sender_list *send, | |||
53 | 53 | ||
54 | /* Puts the specified return value in the waiting thread's return value | 54 | /* Puts the specified return value in the waiting thread's return value |
55 | and wakes the thread - a sender should be confirmed to exist first */ | 55 | and wakes the thread - a sender should be confirmed to exist first */ |
56 | static void queue_release_sender(struct queue_sender **sender, void *retval) | 56 | static void queue_release_sender(struct queue_sender **sender, |
57 | intptr_t retval) | ||
57 | { | 58 | { |
58 | (*sender)->retval = retval; | 59 | (*sender)->retval = retval; |
59 | *sender = NULL; | 60 | *sender = NULL; |
@@ -72,7 +73,7 @@ static void queue_release_all_senders(struct event_queue *q) | |||
72 | &q->send->senders[i & QUEUE_LENGTH_MASK]; | 73 | &q->send->senders[i & QUEUE_LENGTH_MASK]; |
73 | if(*spp) | 74 | if(*spp) |
74 | { | 75 | { |
75 | queue_release_sender(spp, NULL); | 76 | queue_release_sender(spp, 0); |
76 | } | 77 | } |
77 | } | 78 | } |
78 | } | 79 | } |
@@ -154,7 +155,7 @@ void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks) | |||
154 | } | 155 | } |
155 | } | 156 | } |
156 | 157 | ||
157 | void queue_post(struct event_queue *q, long id, void *data) | 158 | void queue_post(struct event_queue *q, long id, intptr_t data) |
158 | { | 159 | { |
159 | int oldlevel = set_irq_level(15<<4); | 160 | int oldlevel = set_irq_level(15<<4); |
160 | unsigned int wr = q->write++ & QUEUE_LENGTH_MASK; | 161 | unsigned int wr = q->write++ & QUEUE_LENGTH_MASK; |
@@ -170,7 +171,7 @@ void queue_post(struct event_queue *q, long id, void *data) | |||
170 | if(*spp) | 171 | if(*spp) |
171 | { | 172 | { |
172 | /* overflow protect - unblock any thread waiting at this index */ | 173 | /* overflow protect - unblock any thread waiting at this index */ |
173 | queue_release_sender(spp, NULL); | 174 | queue_release_sender(spp, 0); |
174 | } | 175 | } |
175 | } | 176 | } |
176 | #endif | 177 | #endif |
@@ -179,7 +180,7 @@ void queue_post(struct event_queue *q, long id, void *data) | |||
179 | } | 180 | } |
180 | 181 | ||
181 | #ifdef HAVE_EXTENDED_MESSAGING_AND_NAME | 182 | #ifdef HAVE_EXTENDED_MESSAGING_AND_NAME |
182 | void * queue_send(struct event_queue *q, long id, void *data) | 183 | intptr_t queue_send(struct event_queue *q, long id, intptr_t data) |
183 | { | 184 | { |
184 | int oldlevel = set_irq_level(15<<4); | 185 | int oldlevel = set_irq_level(15<<4); |
185 | unsigned int wr = q->write++ & QUEUE_LENGTH_MASK; | 186 | unsigned int wr = q->write++ & QUEUE_LENGTH_MASK; |
@@ -195,7 +196,7 @@ void * queue_send(struct event_queue *q, long id, void *data) | |||
195 | if(*spp) | 196 | if(*spp) |
196 | { | 197 | { |
197 | /* overflow protect - unblock any thread waiting at this index */ | 198 | /* overflow protect - unblock any thread waiting at this index */ |
198 | queue_release_sender(spp, NULL); | 199 | queue_release_sender(spp, 0); |
199 | } | 200 | } |
200 | 201 | ||
201 | *spp = &sender; | 202 | *spp = &sender; |
@@ -211,7 +212,7 @@ void * queue_send(struct event_queue *q, long id, void *data) | |||
211 | 212 | ||
212 | /* Function as queue_post if sending is not enabled */ | 213 | /* Function as queue_post if sending is not enabled */ |
213 | set_irq_level(oldlevel); | 214 | set_irq_level(oldlevel); |
214 | return NULL; | 215 | return 0; |
215 | } | 216 | } |
216 | 217 | ||
217 | #if 0 /* not used now but probably will be later */ | 218 | #if 0 /* not used now but probably will be later */ |
@@ -223,7 +224,7 @@ bool queue_in_queue_send(struct event_queue *q) | |||
223 | #endif | 224 | #endif |
224 | 225 | ||
225 | /* Replies with retval to any dequeued message sent with queue_send */ | 226 | /* Replies with retval to any dequeued message sent with queue_send */ |
226 | void queue_reply(struct event_queue *q, void *retval) | 227 | void queue_reply(struct event_queue *q, intptr_t retval) |
227 | { | 228 | { |
228 | if(q->send && q->send->curr_sender) | 229 | if(q->send && q->send->curr_sender) |
229 | { | 230 | { |
@@ -270,7 +271,7 @@ void queue_remove_from_head(struct event_queue *q, long id) | |||
270 | if(*spp) | 271 | if(*spp) |
271 | { | 272 | { |
272 | /* Release any thread waiting on this message */ | 273 | /* Release any thread waiting on this message */ |
273 | queue_release_sender(spp, NULL); | 274 | queue_release_sender(spp, 0); |
274 | } | 275 | } |
275 | } | 276 | } |
276 | #endif | 277 | #endif |