summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-10-13 12:07:59 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-10-13 12:07:59 +0000
commitc9d1ab721870b622a3698cd9b1ee9c451fabf85a (patch)
tree96d93d3b0471ce3de628867f71a7851923ef08c5
parent5fc117ea4e1aedf820a9787e33f208b489a31407 (diff)
downloadrockbox-c9d1ab721870b622a3698cd9b1ee9c451fabf85a.tar.gz
rockbox-c9d1ab721870b622a3698cd9b1ee9c451fabf85a.zip
Fixes a problem where the sim would try to start the WPS on HAVE_RTC_ALARM sims (FS#7862 with a small addition by me)
use the --alarm argument if you do want to simulate this behaviour git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15094 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--uisimulator/common/stubs.c4
-rw-r--r--uisimulator/sdl/uisdl.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 69daa515b0..840b1421c0 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -169,9 +169,11 @@ bool rtc_enable_alarm(bool enable)
169 return enable; 169 return enable;
170} 170}
171 171
172extern bool sim_alarm_wakeup;
172bool rtc_check_alarm_started(bool release_alarm) 173bool rtc_check_alarm_started(bool release_alarm)
173{ 174{
174 return release_alarm; 175 (void)release_alarm;
176 return sim_alarm_wakeup;
175} 177}
176 178
177bool rtc_check_alarm_flag(void) 179bool rtc_check_alarm_flag(void)
diff --git a/uisimulator/sdl/uisdl.c b/uisimulator/sdl/uisdl.c
index d7845c5beb..9dcdbc7e26 100644
--- a/uisimulator/sdl/uisdl.c
+++ b/uisimulator/sdl/uisdl.c
@@ -54,6 +54,7 @@ SDL_TimerID tick_timer_id;
54 54
55bool lcd_display_redraw = true; /* Used for player simulator */ 55bool lcd_display_redraw = true; /* Used for player simulator */
56char having_new_lcd = true; /* Used for player simulator */ 56char having_new_lcd = true; /* Used for player simulator */
57bool sim_alarm_wakeup = false;
57 58
58bool debug_audio = false; 59bool debug_audio = false;
59 60
@@ -206,6 +207,9 @@ int main(int argc, char *argv[])
206 else 207 else
207 display_zoom = 2; 208 display_zoom = 2;
208 printf("Window zoom is %d\n", display_zoom); 209 printf("Window zoom is %d\n", display_zoom);
210 } else if (!strcmp("--alarm", argv[x])) {
211 sim_alarm_wakeup = true;
212 printf("Simulating alarm wakeup.\n");
209 } else { 213 } else {
210 printf("rockboxui\n"); 214 printf("rockboxui\n");
211 printf("Arguments:\n"); 215 printf("Arguments:\n");
@@ -214,6 +218,7 @@ int main(int argc, char *argv[])
214 printf(" --background \t Use background image of hardware\n"); 218 printf(" --background \t Use background image of hardware\n");
215 printf(" --old_lcd \t [Player] simulate old playermodel (ROM version<4.51)\n"); 219 printf(" --old_lcd \t [Player] simulate old playermodel (ROM version<4.51)\n");
216 printf(" --zoom [VAL]\t window zoom (will disable backgrounds)\n"); 220 printf(" --zoom [VAL]\t window zoom (will disable backgrounds)\n");
221 printf(" --alarm \t Simulate a wakup-up on Alarm\n");
217 exit(0); 222 exit(0);
218 } 223 }
219 } 224 }