From nox@jelal.kn-bremen.de Tue Jan 12 23:48:04 2010
Return-Path: <nox@jelal.kn-bremen.de>
Received: from triton8.kn-bremen.de (noident@localhost [127.0.0.1])
	by triton8.kn-bremen.de (8.14.3/8.14.3) with ESMTP id o0CMm4Xg017667
	for <nox@triton8.kn-bremen.de>; Tue, 12 Jan 2010 23:48:04 +0100 (CET)
	(envelope-from nox@triton8.kn-bremen.de)
Received: (from nox@localhost)
	by triton8.kn-bremen.de (8.14.3/8.14.3/Submit) id o0CMm4fj017666
	for nox@triton8.kn-bremen.de; Tue, 12 Jan 2010 23:48:04 +0100 (CET)
	(envelope-from nox)
From: Juergen Lock <nox@jelal.kn-bremen.de>
Date: Tue, 12 Jan 2010 23:48:04 +0100
To: Juergen Lock <nox@triton8.kn-bremen.de>
Subject: Workaround for broken OSS_GETVERSION on FreeBSD, part two
Message-ID: <20100112224804.GA17636@triton8.kn-bremen.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.20 (2009-06-14)
Content-Length: 1898
Lines: 55

Turns out on those versions of FreeBSD (>= 7.x) that know OSS_GETVERSION
the ioctl doesn't actually work yet (except in the Linuxolator), so if
building on FreeBSD assume the sound drivers are new enough if the ioctl
returns the errno it does currently on FreeBSD.

(Rev 2 after private discussion with malc.)

 Signed-off-by: Juergen Lock <nox@jelal.kn-bremen.de>

--- a/audio/ossaudio.c
+++ b/audio/ossaudio.c
@@ -240,6 +240,31 @@ static void oss_dump_info (struct oss_pa
 }
 #endif
 
+#ifdef USE_DSP_POLICY
+static int oss_get_version (int fd, int *version, const char *typ)
+{
+    if (ioctl (fd, OSS_GETVERSION, &version)) {
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+        /*
+         * Looks like atm (20100109) FreeBSD knows OSS_GETVERSION
+         * since 7.x, but currently only on the mixer device (or in
+         * the Linuxolator), and in the native version that part of
+         * the code is in fact never reached so the ioctl fails anyway.
+         * Until this is fixed, just check the errno and if its what
+         * FreeBSD's sound drivers return atm assume they are new enough.
+         */
+        if (errno == EINVAL) {
+            *version = 0x040000;
+            return 0;
+        }
+#endif
+        oss_logerr2 (errno, typ, "Failed to get OSS version\n");
+        return -1;
+    }
+    return 0;
+}
+#endif
+
 static int oss_open (int in, struct oss_params *req,
                      struct oss_params *obt, int *pfd)
 {
@@ -289,10 +314,7 @@ static int oss_open (int in, struct oss_
     if (conf.policy >= 0) {
         int version;
 
-        if (ioctl (fd, OSS_GETVERSION, &version)) {
-            oss_logerr2 (errno, typ, "Failed to get OSS version\n");
-        }
-        else {
+        if (!oss_get_version (fd, &version, typ)) {
             if (conf.debug) {
                 dolog ("OSS version = %#x\n", version);
             }