? netbsd-patch-1.diff
? test/test
? test/test.c
Index: configure.in
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/configure.in,v
retrieving revision 1.237
diff -u -r1.237 configure.in
--- configure.in	19 Mar 2006 19:03:40 -0000	1.237
+++ configure.in	21 Mar 2006 05:12:03 -0000
@@ -1967,7 +1967,7 @@
                 have_audio=yes
             ;;
             openbsd)
-                AC_DEFINE(SDL_AUDIO_DRIVER_OPENBSD)
+                AC_DEFINE(SDL_AUDIO_DRIVER_BSD)
                 SOURCES="$SOURCES $srcdir/src/audio/openbsd/*.c"
                 have_audio=yes
             ;;
Index: include/SDL_config.h.in
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/include/SDL_config.h.in,v
retrieving revision 1.15
diff -u -r1.15 SDL_config.h.in
--- include/SDL_config.h.in	14 Mar 2006 08:53:33 -0000	1.15
+++ include/SDL_config.h.in	21 Mar 2006 05:12:03 -0000
@@ -167,7 +167,7 @@
 #undef SDL_AUDIO_DRIVER_MINT
 #undef SDL_AUDIO_DRIVER_MMEAUDIO
 #undef SDL_AUDIO_DRIVER_NAS
-#undef SDL_AUDIO_DRIVER_OPENBSD
+#undef SDL_AUDIO_DRIVER_BSD
 #undef SDL_AUDIO_DRIVER_OSS
 #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
 #undef SDL_AUDIO_DRIVER_PAUD
Index: src/audio/SDL_audio.c
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/audio/SDL_audio.c,v
retrieving revision 1.42
diff -u -r1.42 SDL_audio.c
--- src/audio/SDL_audio.c	21 Mar 2006 00:56:10 -0000	1.42
+++ src/audio/SDL_audio.c	21 Mar 2006 05:12:04 -0000
@@ -36,8 +36,8 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
-#if SDL_AUDIO_DRIVER_OPENBSD
-	&OPENBSD_AUDIO_bootstrap,
+#if SDL_AUDIO_DRIVER_BSD
+	&BSD_AUDIO_bootstrap,
 #endif
 #if SDL_AUDIO_DRIVER_OSS
 	&DSP_bootstrap,
Index: src/audio/SDL_audiodev.c
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/audio/SDL_audiodev.c,v
retrieving revision 1.15
diff -u -r1.15 SDL_audiodev.c
--- src/audio/SDL_audiodev.c	21 Feb 2006 08:46:35 -0000	1.15
+++ src/audio/SDL_audiodev.c	21 Mar 2006 05:12:04 -0000
@@ -23,7 +23,7 @@
 
 /* Get the name of the audio device we use for output */
 
-#if SDL_AUDIO_DRIVER_OPENBSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO
+#if SDL_AUDIO_DRIVER_BSD || SDL_AUDIO_DRIVER_OSS || SDL_AUDIO_DRIVER_SUNAUDIO
 
 #include <fcntl.h>
 #include <sys/types.h>
Index: src/audio/SDL_sysaudio.h
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/audio/SDL_sysaudio.h,v
retrieving revision 1.27
diff -u -r1.27 SDL_sysaudio.h
--- src/audio/SDL_sysaudio.h	14 Mar 2006 08:53:33 -0000	1.27
+++ src/audio/SDL_sysaudio.h	21 Mar 2006 05:12:04 -0000
@@ -100,8 +100,8 @@
 	SDL_AudioDevice *(*create)(int devindex);
 } AudioBootStrap;
 
-#if SDL_AUDIO_DRIVER_OPENBSD
-extern AudioBootStrap OPENBSD_AUDIO_bootstrap;
+#if SDL_AUDIO_DRIVER_BSD
+extern AudioBootStrap BSD_AUDIO_bootstrap;
 #endif
 #if SDL_AUDIO_DRIVER_OSS
 extern AudioBootStrap DSP_bootstrap;
Index: src/audio/openbsd/SDL_openbsdaudio.c
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/audio/openbsd/SDL_openbsdaudio.c,v
retrieving revision 1.14
diff -u -r1.14 SDL_openbsdaudio.c
--- src/audio/openbsd/SDL_openbsdaudio.c	21 Feb 2006 08:46:37 -0000	1.14
+++ src/audio/openbsd/SDL_openbsdaudio.c	21 Mar 2006 05:12:04 -0000
@@ -34,6 +34,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/audioio.h>
+#include <pthread.h>
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
@@ -42,8 +43,14 @@
 #include "../SDL_audiodev_c.h"
 #include "SDL_openbsdaudio.h"
 
-/* The tag name used by OpenBSD audio */
-#define OBSD_DRIVER_NAME         "openbsd"
+/* The tag name used by NetBSD/OpenBSD audio */
+#ifdef __NetBSD__
+#define BSD_AUDIO_DRIVER_NAME         "netbsd"
+#define BSD_AUDIO_DRIVER_DESC         "Native NetBSD audio"
+#else
+#define BSD_AUDIO_DRIVER_NAME         "openbsd"
+#define BSD_AUDIO_DRIVER_DESC         "Native OpenBSD audio"
+#endif
 
 /* Open the audio device for playback, and don't block if busy */
 /* #define USE_BLOCKING_WRITES */
@@ -127,8 +134,8 @@
     return this;
 }
 
-AudioBootStrap OPENBSD_AUDIO_bootstrap = {
-	OBSD_DRIVER_NAME, "Native OpenBSD audio",
+AudioBootStrap BSD_AUDIO_bootstrap = {
+	BSD_AUDIO_DRIVER_NAME, BSD_AUDIO_DRIVER_DESC,
 	Audio_Available, Audio_CreateDevice
 };
 
@@ -136,6 +143,7 @@
 static void
 OBSD_WaitAudio(_THIS)
 {
+#ifdef __OpenBSD__
 	/* Check to see if the thread-parent process is still alive */
 	{ static int cnt = 0;
 		/* Note that this only works with thread implementations 
@@ -147,6 +155,7 @@
 			}
 		}
 	}
+#endif
 
 #ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */
 	/* See if we need to use timed audio synchronization */
Index: src/joystick/bsd/SDL_sysjoystick.c
===================================================================
RCS file: /home/sdlweb/libsdl.org/cvs/SDL12/src/joystick/bsd/SDL_sysjoystick.c,v
retrieving revision 1.29
diff -u -r1.29 SDL_sysjoystick.c
--- src/joystick/bsd/SDL_sysjoystick.c	20 Mar 2006 08:00:07 -0000	1.29
+++ src/joystick/bsd/SDL_sysjoystick.c	21 Mar 2006 05:12:05 -0000
@@ -524,9 +524,9 @@
 #endif
 #else
 # ifdef USBHID_NEW
-	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
-# else
 	len = hid_report_size(rd, repinfo[repind].kind, r->rid);
+# else
+	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
 # endif
 #endif