Date: Wed, 29 Jun 2011 02:26:31 +0200 (CEST) From: Gerald Pfeifer <gerald@pfeifer.com> To: Andriy Gapon <avg@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Gerald Pfeifer <gerald@FreeBSD.org>, Pan Tsu <inyaoo@gmail.com> Subject: Re: svn commit: r222723 - head/sys/sys Message-ID: <alpine.LNX.2.00.1106290224110.15592@gerinyyl.fvgr> In-Reply-To: <4DEC748A.8000204@FreeBSD.org> References: <201106052101.p55L1feL097420@svn.freebsd.org> <86zklwezwb.fsf@gmail.com> <4DEC748A.8000204@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 6 Jun 2011, Andriy Gapon wrote: > Woops! I admit I just copied the description and the patch from the PR. > How inattentive I could be while doing that? > > Gerald, should the patch have actually introduced SNDCTL_DSP_HALT as the > description says? Yikes! You are totally right, Pan Tsu and Andriy. Below you'll find the corresponding patch I got into Wine upstream, so clearly this should have been about SNDCTL_DSP_HALT. Sorry about the snafu on this and the delay in getting back to this; in between business travel and vacation I haven't been home for more than three weeks. Gerald ==== patch ==== From: Gerald Pfeifer <gerald@pfeifer.com> To: wine-patches@winehq.org Cc: Andrew Eikum <aeikum@codeweavers.com> Date: Thu, 19 May 2011 08:24:23 -0600 (MDT) Subject: wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. This is the last patch that is necessary to make vanilla Wine build on current versions of FreeBSD. I will also send a summary in response to Andrew's question around this Gerald --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include "audiopolicy.h" #include "audioclient.h" + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -- 1.7.4.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.LNX.2.00.1106290224110.15592>