MonsterCommit(tm) with typo-fixes, void-ness fixes, correct CaPs for directories, etc. No real code changes.

src/timer.c

@@ -1,16 +1,18 @@
 #include "ibm.h"
-
-/*#include "sound_opl.h"
+#if 0
+//FIXME: Kotori, do we need to keep this? --FvK
+#include "sound_opl.h"
 #include "adlibgold.h"
 #include "sound_pas16.h"
 #include "sound_sb.h"
 #include "sound_sb_dsp.h"
-#include "sound_wss.h"*/
+#include "sound_wss.h"
+#endif
 #include "timer.h"
 
+
 #define TIMERS_MAX 64
 
-int TIMER_USEC;
 
 static struct
 {
@@ -21,13 +23,16 @@ static struct
 	int *count;
 } timers[TIMERS_MAX];
 
+
+int TIMER_USEC;
 int timers_present = 0;
 int timer_one = 1;
 	
 int timer_count = 0, timer_latch = 0;
 int timer_start = 0;
 
-void timer_process()
+
+void timer_process(void)
 {
 	int c;
 	int process = 0;
@@ -80,7 +85,8 @@ void timer_process()
         }              
 }
 
-void timer_update_outstanding()
+
+void timer_update_outstanding(void)
 {
 	int c;
 	timer_latch = 0x7fffffff;
@@ -92,13 +98,15 @@ void timer_update_outstanding()
 	timer_count = timer_latch = (timer_latch + ((1 << TIMER_SHIFT) - 1)) >> TIMER_SHIFT;
 }
 
-void timer_reset()
+
+void timer_reset(void)
 {
 	pclog("timer_reset\n");
 	timers_present = 0;
 	timer_latch = timer_count = 0;
 }
 
+
 int timer_add(void (*callback)(void *priv), int *count, int *enable, void *priv)
 {
 	int i = 0;
@@ -128,6 +136,7 @@ int timer_add(void (*callback)(void *priv), int *count, int *enable, void *priv)
 	return -1;
 }
 
+
 void timer_set_callback(int timer, void (*callback)(void *priv))
 {
 	timers[timer].callback = callback;