diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-02-20 20:41:26 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-02-20 20:41:26 +0000 |
| commit | c3830c644cd8789cdfaa7805dd96b34fd909812b (patch) | |
| tree | 2e79d84af59d1bfea1e8302fddaf8295a6ce1a16 /audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c | |
| parent | - does not use libungif, has its own gif functions (diff) | |
Do not ignore hardwired device unit number.
Tested by: rank1seeker at gmail dot com
Notes
Notes:
svn path=/head/; revision=291952
Diffstat (limited to 'audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c')
| -rw-r--r-- | audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c | 14 |
1 files changed, 8 insertions, 6 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 fab182a1ec73..f04747027dc7 100644 --- a/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c +++ b/audio/oss/files/patch-kernel-OS-FreeBSD-os_freebsd.c @@ -1,5 +1,5 @@ ---- kernel/OS/FreeBSD/os_freebsd.c.orig 2011-08-11 19:51:27.000000000 -0400 -+++ kernel/OS/FreeBSD/os_freebsd.c 2012-01-31 15:16:58.000000000 -0500 +--- kernel/OS/FreeBSD/os_freebsd.c 2012-02-02 17:46:03.000000000 -0500 ++++ kernel/OS/FreeBSD/os_freebsd.c 2012-02-20 12:58:46.000000000 -0500 @@ -16,6 +16,7 @@ #include "midi_core.h" #include <oss_pci.h> @@ -17,13 +17,15 @@ if (cards[cardnum]->nick != NULL) strncpy (ci->shortname, cards[cardnum]->nick, 16); -@@ -413,8 +414,17 @@ +@@ -413,8 +414,19 @@ if (!(flags & CHDEV_VIRTUAL) && (name != NULL)) { +#if __FreeBSD_version >= 900023 -+ if (make_dev_p (MAKEDEV_CHECKNAME, &bsd_cdev, &oss_cdevsw, NULL, -+ UID_ROOT, GID_WHEEL, 0666, name, 0)) ++ bsd_cdev = ++ make_dev_credf (MAKEDEV_CHECKNAME, &oss_cdevsw, num, NULL, ++ UID_ROOT, GID_WHEEL, 0666, name, 0); ++ if (bsd_cdev == NULL) + { + cmn_err (CE_WARN, "Cannot allocate device node /dev/%s\n", name); + return; @@ -35,7 +37,7 @@ cdev->info = bsd_cdev; } } -@@ -604,6 +614,12 @@ +@@ -604,6 +616,12 @@ { oss_device_t *osdev; |