diff options
| author | Chris Rees <crees@FreeBSD.org> | 2020-01-25 16:07:28 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2020-01-25 16:07:28 +0000 |
| commit | 13cb259a40a37c3c53d4ac9ea4d19d24001fff9d (patch) | |
| tree | 02bd2bd6f99e145aa0bfb0ae4f5fa2938a262529 /audio | |
| parent | c8071ddc621b03555ba0ac06e41e65dc40aba303 (diff) | |
| download | ports-13cb259a40a37c3c53d4ac9ea4d19d24001fff9d.tar.gz ports-13cb259a40a37c3c53d4ac9ea4d19d24001fff9d.zip | |
audio/oss: Fix build on head
Turns out there were even more issues than the timeout removal!
PR: ports/243586
Submitted by: Masachika ISHIZUKA
Notes
Notes:
svn path=/head/; revision=524045
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c index d095d2bab9f6..20ec24e5aa8f 100644 --- a/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c +++ b/audio/oss/files/patch-kernel_OS_FreeBSD_os__freebsd.c @@ -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) |