devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9486 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2006-04-04 11:16:44 +00:00
parent 12060b7315
commit bb322695b9
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
apps/plugins/doom/i_system.c
View file

@ -16,7 +16,10 @@
// GNU General Public License for more details. // GNU General Public License for more details.
// //
// $Log$ // $Log$
// Revision 1.6 2006/04/03 17:32:46 dave // Revision 1.7 2006/04/04 11:16:44 dave
// 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
//
// Revision 1.6 2006-04-03 17:32:46 dave
// Clean up the (incorrect) #ifdef spaghetti for the timer. We now have a user timer on the ipods, so we use it. // Clean up the (incorrect) #ifdef spaghetti for the timer. We now have a user timer on the ipods, so we use it.
// //
// Revision 1.5 2006-04-03 17:11:42 kkurbjun // Revision 1.5 2006-04-03 17:11:42 kkurbjun
@ -59,6 +62,14 @@
// I_GetTime // I_GetTime
// returns time in 1/35th second tics // returns time in 1/35th second tics
// //
/* NOTE:
The user timer is used to generate a 35Hz tick for Doom. But it
is unavailable for the grayscale targets (it's used by the grayscale
lib) and is not implemented in the simulator - so we have to
approximate it using current_tick.
*/
#if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR) #if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR)
volatile unsigned int doomtimer=0; volatile unsigned int doomtimer=0;
@ -106,7 +117,7 @@ void I_Quit (void)
I_ShutdownSound(); I_ShutdownSound();
I_ShutdownMusic(); I_ShutdownMusic();
I_ShutdownGraphics(); I_ShutdownGraphics();
#if (CONFIG_CPU != PP5020) && !defined(SIMULATOR) #if defined(HAVE_LCD_COLOR) && !defined(SIMULATOR)
rb->timer_unregister(); rb->timer_unregister();
#endif #endif
doomexit=1; doomexit=1;