summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-04-04 11:16:44 +0000
committerDave Chapman <dave@dchapman.com>2006-04-04 11:16:44 +0000
commitbb322695b9325ee44fb9eef3c7fd1cc714e13fa8 (patch)
tree21758c0956f281031b7bc80f1ec42b87fc2acefc /apps
parent12060b73156db4698c6d2ec7beb2aee7cf280df0 (diff)
downloadrockbox-bb322695b9325ee44fb9eef3c7fd1cc714e13fa8.tar.gz
rockbox-bb322695b9325ee44fb9eef3c7fd1cc714e13fa8.zip
Correct the #ifdef logic for timer_unregister() and add a comment describing why we need to surround the use of the user timer with #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9486 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/doom/i_system.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/apps/plugins/doom/i_system.c b/apps/plugins/doom/i_system.c
index b3c61a2d29..3de236aede 100644
--- a/apps/plugins/doom/i_system.c
+++ b/apps/plugins/doom/i_system.c
@@ -16,7 +16,10 @@
16// GNU General Public License for more details. 16// GNU General Public License for more details.
17// 17//
18// $Log$ 18// $Log$
19// Revision 1.6 2006/04/03 17:32:46 dave 19// Revision 1.7 2006/04/04 11:16:44 dave
20// Correct the #ifdef logic for timer_unregister() and add a comment describing why we need to surround the use of the user timer with #ifdefs
21//
22// Revision 1.6 2006-04-03 17:32:46 dave
20// Clean up the (incorrect) #ifdef spaghetti for the timer. We now have a user timer on the ipods, so we use it. 23// Clean up the (incorrect) #ifdef spaghetti for the timer. We now have a user timer on the ipods, so we use it.
21// 24//
22// Revision 1.5 2006-04-03 17:11:42 kkurbjun 25// Revision 1.5 2006-04-03 17:11:42 kkurbjun
@@ -59,6 +62,14 @@
59// I_GetTime 62// I_GetTime
60// returns time in 1/35th second tics 63// returns time in 1/35th second tics
61// 64//
65
66/* NOTE:
67
68 The user timer is used to generate a 35Hz tick for Doom. But it
69 is unavailable for the grayscale targets (it's used by the grayscale
70 lib) and is not implemented in the simulator - so we have to
71 approximate it using current_tick.
72*/
62#if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR) 73#if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR)
63volatile unsigned int doomtimer=0; 74volatile unsigned int doomtimer=0;
64 75
@@ -106,7 +117,7 @@ void I_Quit (void)
106 I_ShutdownSound(); 117 I_ShutdownSound();
107 I_ShutdownMusic(); 118 I_ShutdownMusic();
108 I_ShutdownGraphics(); 119 I_ShutdownGraphics();
109#if (CONFIG_CPU != PP5020) && !defined(SIMULATOR) 120#if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR)
110 rb->timer_unregister(); 121 rb->timer_unregister();
111#endif 122#endif
112 doomexit=1; 123 doomexit=1;