From patchwork Sun Apr 11 16:17:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Juergen Lock X-Patchwork-Id: 49916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id F10CDB7D1F for ; Mon, 12 Apr 2010 02:25:57 +1000 (EST) Received: from localhost ([127.0.0.1]:60272 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0ztr-00047k-Mm for incoming@patchwork.ozlabs.org; Sun, 11 Apr 2010 12:20:43 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O0zsY-00047U-OG for qemu-devel@nongnu.org; Sun, 11 Apr 2010 12:19:22 -0400 Received: from [140.186.70.92] (port=40884 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O0zsU-00045v-AL for qemu-devel@nongnu.org; Sun, 11 Apr 2010 12:19:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O0zsR-0001Ju-My for qemu-devel@nongnu.org; Sun, 11 Apr 2010 12:19:17 -0400 Received: from gelbbaer.kn-bremen.de ([78.46.108.116]:36742 helo=smtp.kn-bremen.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O0zsR-0001JO-72 for qemu-devel@nongnu.org; Sun, 11 Apr 2010 12:19:15 -0400 Received: by smtp.kn-bremen.de (Postfix, from userid 10) id CD2121E00177; Sun, 11 Apr 2010 18:19:13 +0200 (CEST) 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 o3BGHXih002232 for ; Sun, 11 Apr 2010 18:17:33 +0200 (CEST) (envelope-from nox@triton8.kn-bremen.de) Received: (from nox@localhost) by triton8.kn-bremen.de (8.14.3/8.14.3/Submit) id o3BGHW9t002231 for qemu-devel@nongnu.org; Sun, 11 Apr 2010 18:17:32 +0200 (CEST) (envelope-from nox) From: Juergen Lock Date: Sun, 11 Apr 2010 18:17:32 +0200 To: qemu-devel@nongnu.org Message-ID: <20100411161732.GA2221@triton8.kn-bremen.de> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH, resend] [STABLE] Sync OSS_GETVERSION handling with head X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org As suggested by Andreas Färber, here is a cumulative patch that syncs OSS_GETVERSION handling with head by merging the following commits: 1. oss: issue OSS_GETVERSION ioctl only when needed 6d246526ce3c145b2831285def6983f5de6190d3 2. oss: fix fragment setting 3d709fe73a77c40e263b3af6e650fd4b519c3562 3. Workaround for broken OSS_GETVERSION on FreeBSD, part two 72ff25e4e98d6dba9286d032b9ff5432553bbad5 Signed-off-by: Juergen Lock --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -38,6 +38,10 @@ #define AUDIO_CAP "oss" #include "audio_int.h" +#if defined OSS_GETVERSION && defined SNDCTL_DSP_POLICY +#define USE_DSP_POLICY +#endif + typedef struct OSSVoiceOut { HWVoiceOut hw; void *pcm_buf; @@ -236,14 +240,39 @@ 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) { int fd; - int version; int oflags = conf.exclusive ? O_EXCL : 0; audio_buf_info abinfo; int fmt, freq, nchannels; + int setfragment = 1; const char *dspname = in ? conf.devpath_in : conf.devpath_out; const char *typ = in ? "ADC" : "DAC"; @@ -281,27 +310,30 @@ static int oss_open (int in, struct oss_ goto err; } - if (ioctl (fd, OSS_GETVERSION, &version)) { - oss_logerr2 (errno, typ, "Failed to get OSS version\n"); - version = 0; - } +#ifdef USE_DSP_POLICY + if (conf.policy >= 0) { + int version; - if (conf.debug) { - dolog ("OSS version = %#x\n", version); - } + if (!oss_get_version (fd, &version, typ)) { + if (conf.debug) { + dolog ("OSS version = %#x\n", version); + } -#ifdef SNDCTL_DSP_POLICY - if (conf.policy >= 0 && version >= 0x040000) { - int policy = conf.policy; - if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) { - oss_logerr2 (errno, typ, "Failed to set timing policy to %d\n", - conf.policy); - goto err; + if (version >= 0x040000) { + int policy = conf.policy; + if (ioctl (fd, SNDCTL_DSP_POLICY, &policy)) { + oss_logerr2 (errno, typ, + "Failed to set timing policy to %d\n", + conf.policy); + goto err; + } + setfragment = 0; + } } } - else #endif - { + + if (setfragment) { int mmmmssss = (req->nfrags << 16) | ctz32 (req->fragsize); if (ioctl (fd, SNDCTL_DSP_SETFRAGMENT, &mmmmssss)) { oss_logerr2 (errno, typ, "Failed to set buffer length (%d, %d)\n", @@ -857,7 +889,7 @@ static struct audio_option oss_options[] .valp = &conf.exclusive, .descr = "Open device in exclusive mode (vmix wont work)" }, -#ifdef SNDCTL_DSP_POLICY +#ifdef USE_DSP_POLICY { .name = "POLICY", .tag = AUD_OPT_INT,