diff options
| author | trasz <trasz@FreeBSD.org> | 2007-07-13 02:40:39 +0800 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2007-07-13 02:40:39 +0800 |
| commit | 663eb859336223dcba61faa9ae401437df0af228 (patch) | |
| tree | 8a4695d973c968e471c09994ffa5ff1ff3657804 /audio/oss/files | |
| parent | 9c6830c920cbd05af2dcdd69b9c826b457aa280d (diff) | |
| download | freebsd-ports-gnome-663eb859336223dcba61faa9ae401437df0af228.tar.gz freebsd-ports-gnome-663eb859336223dcba61faa9ae401437df0af228.tar.zst freebsd-ports-gnome-663eb859336223dcba61faa9ae401437df0af228.zip | |
- Make it work on 7-CURRENT.
Submitted by: jkim
Approved by: miwi (mentor)
Diffstat (limited to 'audio/oss/files')
| -rw-r--r-- | audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c | 11 | ||||
| -rw-r--r-- | audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h | 27 | ||||
| -rw-r--r-- | audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c | 15 |
3 files changed, 53 insertions, 0 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 new file mode 100644 index 000000000000..b738f690f972 --- /dev/null +++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c @@ -0,0 +1,11 @@ +--- kernel/OS/FreeBSD/os_freebsd.c.orig 2007-06-12 17:32:57.000000000 -0400 ++++ kernel/OS/FreeBSD/os_freebsd.c 2007-07-11 20:41:43.000000000 -0400 +@@ -145,7 +145,7 @@ + return 0; + + wq->flags = 0; +- flag = msleep (wq, *mutex, PRIBIO | PCATCH, "oss", ticks); ++ flag = msleep_spin (wq, *mutex, "oss", ticks); + + if (flag == EWOULDBLOCK) /* Timeout */ + { diff --git a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h new file mode 100644 index 000000000000..b056c5e4942e --- /dev/null +++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.h @@ -0,0 +1,27 @@ +--- kernel/OS/FreeBSD/os_freebsd.h.orig 2007-06-12 17:32:57.000000000 -0400 ++++ kernel/OS/FreeBSD/os_freebsd.h 2007-07-11 20:07:40.000000000 -0400 +@@ -16,7 +16,6 @@ + * distribution. Please contact sales@opensound.com for further info. + * + */ +-#define OS_VERSION "6" + #define __inline__ inline + #define __inline inline + #define EXTERN_C extern "C" +@@ -55,6 +54,16 @@ + #include <vm/pmap.h> + #include <sys/selinfo.h> + ++#define __FreeBSD_version_major ((__FreeBSD_version) / 100000) ++ ++#if (__FreeBSD_version_major == 7) ++#define OS_VERSION "7" ++#elif (__FreeBSD_version_major == 6) ++#define OS_VERSION "6" ++#else ++#error Unsupported OS version ++#endif ++ + #undef timeout + #define timeout oss_timeout + #undef untimeout diff --git a/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c new file mode 100644 index 000000000000..3b9b6c853e66 --- /dev/null +++ b/audio/oss/files/patch-setup-FreeBSD-oss-build-osscore.c @@ -0,0 +1,15 @@ +--- setup/FreeBSD/oss/build/osscore.c.orig 2007-06-12 08:22:35.000000000 -0400 ++++ setup/FreeBSD/oss/build/osscore.c 2007-07-11 18:45:01.000000000 -0400 +@@ -164,7 +164,11 @@ + } + + intr->irq == bus_setup_intr (osdev->dip, intr->irqres, +- INTR_TYPE_AV | INTR_MPSAFE, ossintr, intr, ++ INTR_TYPE_AV | INTR_MPSAFE, ++#if __FreeBSD_version >= 700031 ++ NULL, ++#endif ++ ossintr, intr, + &(intr->cookie)); + + nintrs++; |