Date: Sat, 25 Jan 2020 16:07:28 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r524045 - head/audio/oss/files Message-ID: <202001251607.00PG7Sea083873@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Sat Jan 25 16:07:28 2020 New Revision: 524045 URL: https://svnweb.freebsd.org/changeset/ports/524045 Log: audio/oss: Fix build on head Turns out there were even more issues than the timeout removal! PR: ports/243586 Submitted by: Masachika ISHIZUKA Modified: head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c Modified: head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c ============================================================================== --- head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c Sat Jan 25 15:50:27 2020 (r524044) +++ head/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c Sat Jan 25 16:07:28 2020 (r524045) @@ -110,15 +110,24 @@ return 0; } -@@ -659,6 +683,11 @@ soundcard_detach (void) - +@@ -656,6 +680,11 @@ soundcard_detach (void) if (refcount > 0 || open_devices > 0) return EBUSY; -+ + + for (i = 0; i < MAX_TMOUTS; ++i) + callout_drain(&tmouts[i].timer); + + mtx_destroy(&oss_timeout_mutex); - ++ oss_unload_drivers (); + osdev_delete (core_osdev); +@@ -920,7 +949,7 @@ oss_poll (struct cdev *bsd_dev, int events, struct thr + return ev.revents; + } + +-#if defined(D_VERSION_03) && (D_VERSION == D_VERSION_03) ++#if 1 + static int + oss_mmap (struct cdev *bsd_dev, vm_ooffset_t offset, vm_paddr_t * paddr, + int nprot, vm_memattr_t *memattr)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001251607.00PG7Sea083873>