--- uae/src/sd-uss/sound.c	2018/04/24 16:40:30	1.1.1.1
+++ uae/src/sd-uss/sound.c	2018/04/24 16:42:46	1.1.1.2
@@ -13,10 +13,8 @@
 #include "options.h"
 #include "memory.h"
 #include "custom.h"
-#include "audio.h"
 #include "gensound.h"
 #include "sounddep/sound.h"
-#include "events.h"
 
 #include <sys/ioctl.h>
 
@@ -36,7 +34,7 @@ uae_u16 sndbuffer[44100];
 uae_u16 *sndbufpt;
 int sndbufsize;
 
-static int exact_log2(int v)
+static int exact_log2 (int v)
 {
     int l = 0;
     while ((v >>= 1) != 0)
@@ -44,21 +42,21 @@ static int exact_log2(int v)
     return l;
 }
 
-void close_sound(void)
+void close_sound (void)
 {
     if (have_sound)
-	close(sound_fd);
+	close (sound_fd);
 }
 
-int setup_sound(void)
+int setup_sound (void)
 {
     sound_fd = open ("/dev/dsp", O_WRONLY);
     have_sound = !(sound_fd < 0);
-    if (!have_sound)
+    if (! have_sound)
 	return 0;
 
     if (ioctl (sound_fd, SNDCTL_DSP_GETFMTS, &formats) == -1) {
-	fprintf(stderr, "ioctl failed - can't use sound.\n");
+	fprintf (stderr, "ioctl failed - can't use sound.\n");
 	close(sound_fd);
 	have_sound = 0;
 	return 0;
@@ -75,11 +73,11 @@ int init_sound (void)
     int dspbits;
 
     if (currprefs.sound_maxbsiz < 128 || currprefs.sound_maxbsiz > 16384) {
-	fprintf(stderr, "Sound buffer size %d out of range.\n", currprefs.sound_maxbsiz);
+	fprintf (stderr, "Sound buffer size %d out of range.\n", currprefs.sound_maxbsiz);
 	currprefs.sound_maxbsiz = 8192;
     }
 
-    tmp = 0x00040000 + exact_log2(currprefs.sound_maxbsiz);
+    tmp = 0x00040000 + exact_log2 (currprefs.sound_maxbsiz);
     ioctl (sound_fd, SNDCTL_DSP_SETFRAGMENT, &tmp);
     ioctl (sound_fd, SNDCTL_DSP_GETBLKSIZE, &sndbufsize);
 
@@ -87,7 +85,7 @@ int init_sound (void)
     ioctl (sound_fd, SNDCTL_DSP_SAMPLESIZE, &dspbits);
     ioctl (sound_fd, SOUND_PCM_READ_BITS, &dspbits);
     if (dspbits != currprefs.sound_bits) {
-	fprintf(stderr, "Can't use sound with %d bits\n", currprefs.sound_bits);
+	fprintf (stderr, "Can't use sound with %d bits\n", currprefs.sound_bits);
 	return 0;
     }
 
@@ -99,7 +97,7 @@ int init_sound (void)
     ioctl (sound_fd, SOUND_PCM_READ_RATE, &rate);
     /* Some soundcards have a bit of tolerance here. */
     if (rate < currprefs.sound_freq * 90 / 100 || rate > currprefs.sound_freq * 110 / 100) {
-	fprintf(stderr, "Can't use sound with desired frequency %d\n", currprefs.sound_freq);
+	fprintf (stderr, "Can't use sound with desired frequency %d\n", currprefs.sound_freq);
 	return 0;
     }
 
@@ -110,12 +108,12 @@ int init_sound (void)
 	if (!(formats & AFMT_S16_LE))
 	    return 0;
 	init_sound_table16 ();
-	eventtab[ev_sample].handler = currprefs.stereo ? sample16s_handler : sample16_handler;
+	sample_handler = currprefs.stereo ? sample16s_handler : sample16_handler;
     } else {
 	if (!(formats & AFMT_U8))
 	    return 0;
 	init_sound_table8 ();
-	eventtab[ev_sample].handler = currprefs.stereo ? sample8s_handler : sample8_handler;
+	sample_handler = currprefs.stereo ? sample8s_handler : sample8_handler;
     }
     sound_available = 1;
     printf ("Sound driver found and configured for %d bits at %d Hz, buffer is %d bytes\n",