summaryrefslogtreecommitdiff
path: root/audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2011-06-21 22:17:50 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2011-06-21 22:17:50 +0000
commit95e18421da482d5c62c4eb6c2d012ec23301f8d6 (patch)
tree40b390b38ba4ae81da7a7fc05258606ada2bc5b8 /audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c
parent- update to 5.0 (diff)
Fix build with clang.
Diffstat (limited to 'audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c')
-rw-r--r--audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c34
1 files changed, 34 insertions, 0 deletions
diff --git a/audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c b/audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c
new file mode 100644
index 000000000000..75c1c2c3be90
--- /dev/null
+++ b/audio/oss/files/patch-os_cmd-FreeBSD-ossdetect-ossdetect.c
@@ -0,0 +1,34 @@
+--- os_cmd/FreeBSD/ossdetect/ossdetect.c.orig 2011-01-05 16:06:39.000000000 -0500
++++ os_cmd/FreeBSD/ossdetect/ossdetect.c 2011-06-21 17:49:37.000000000 -0400
+@@ -376,17 +376,20 @@ pci_detect (void)
+ char name[32];
+
+ if (verbose > 2)
+- printf ("%s%d@pci%d:%d:%d:\tclass=0x%06x card=0x%08x "
+- "chip=0x%08x rev=0x%02x hdr=0x%02x\n",
+- (p->pd_name && *p->pd_name) ? p->pd_name :
+- "none",
+- (p->pd_name && *p->pd_name) ? (int) p->pd_unit :
+- p->pc_sel.pc_bus, p->pc_sel.pc_dev,
+- p->pc_sel.pc_func, (p->pc_class << 16) |
+- (p->pc_subclass << 8) | p->pc_progif,
+- (p->pc_subdevice << 16) | p->pc_subvendor,
+- (p->pc_device << 16) | p->pc_vendor,
+- p->pc_revid, p->pc_hdr);
++ {
++ if (p->pd_name && *p->pd_name)
++ sprintf(name, "%s%d", p->pd_name, (int) p->pd_unit);
++ else
++ strcpy(name, "none");
++ printf ("%s@pci%d:%d:%d:\tclass=0x%06x card=0x%08x "
++ "chip=0x%08x rev=0x%02x hdr=0x%02x\n", name,
++ p->pc_sel.pc_bus, p->pc_sel.pc_dev, p->pc_sel.pc_func,
++ (p->pc_class << 16) |
++ (p->pc_subclass << 8) | p->pc_progif,
++ (p->pc_subdevice << 16) | p->pc_subvendor,
++ (p->pc_device << 16) | p->pc_vendor,
++ p->pc_revid, p->pc_hdr);
++ }
+
+ sprintf (name, "pcs%x,%x", p->pc_subvendor, p->pc_subdevice);
+ if (add_drv (name, PCI_PASS))