[src/netbsd-2-0]: src/sys/dev/pci Pull up revision 1.8 (requested by martti i...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2af06f609120
branches:  netbsd-2-0
changeset: 560246:2af06f609120
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Apr 05 20:29:56 2004 +0000

description:
Pull up revision 1.8 (requested by martti in ticket #54):
Added another SB Live! 5.1 soundcard and joystick version

diffstat:

 sys/dev/pci/joy_pci.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 5e5f6a186dea -r 2af06f609120 sys/dev/pci/joy_pci.c
--- a/sys/dev/pci/joy_pci.c     Mon Apr 05 20:29:50 2004 +0000
+++ b/sys/dev/pci/joy_pci.c     Mon Apr 05 20:29:56 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: joy_pci.c,v 1.7 2003/12/04 13:57:31 keihan Exp $       */
+/*     $NetBSD: joy_pci.c,v 1.7.2.1 2004/04/05 20:29:56 tron Exp $     */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.7 2003/12/04 13:57:31 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: joy_pci.c,v 1.7.2.1 2004/04/05 20:29:56 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,9 +72,12 @@
            PCI_INTERFACE(pa->pa_class) == 0x10)
                return (1);
 
-       if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CREATIVELABS
-           && PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_SBJOY)
+       if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_CREATIVELABS &&
+           (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_SBJOY ||
+            PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_SBJOY2))
+       {
                return (1);
+       }
 
        return (0);
 }