kern/75298: [PATCH] add missing device id for pccard bridge

[Gordon Bergling]

>Number:         75298
>Category:       kern
>Synopsis:       [PATCH] add missing device id for pccard bridge
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 20 11:30:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Gordon Bergling
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
FreeBSD spot.0xfce3.net 5.3-STABLE FreeBSD 5.3-STABLE #2: Sun Dec 19 15:35:25 CET 2004 gordon at spot.0xfce3.net:/usr/obj/usr/src/sys/SPOT i386
>Description:
The O2Micro OZ711M1 PCCard Bridge isn't defined in pccbb_pci.c
>How-To-Repeat:
      
>Fix:
The following patches addes the device id to pccbb_pci.c, pccbbdevid.h and updates the manual page.
Index: dev/pccbb/pccbb_pci.c
===================================================================
RCS file: /home/gordon/work/repo/src/sys/dev/pccbb/pccbb_pci.c,v
retrieving revision 1.2
diff -u -r1.2 pccbb_pci.c
--- dev/pccbb/pccbb_pci.c       16 Aug 2004 06:33:58 -0000      1.2
+++ dev/pccbb/pccbb_pci.c       16 Dec 2004 18:58:54 -0000
@@ -187,6 +187,7 @@
        {PCIC_ID_OZ6922, "O2Micro OZ6922 PCI-CardBus Bridge", CB_O2MICRO},
        {PCIC_ID_OZ6933, "O2Micro OZ6933 PCI-CardBus Bridge", CB_O2MICRO},
        {PCIC_ID_OZ711E1, "O2Micro OZ711E1 PCI-CardBus Bridge", CB_O2MICRO},
+       {PCIC_ID_OZ711M1, "O2Micro OZ711M1 PCI-CardBus Bridge", CB_O2MICRO},
 
        /* sentinel */
        {0 /* null id */, "unknown", CB_UNKNOWN},
Index: dev/pccbb/pccbbdevid.h
===================================================================
RCS file: /home/gordon/work/repo/src/sys/dev/pccbb/pccbbdevid.h,v
retrieving revision 1.16
diff -u -r1.16 pccbbdevid.h
--- dev/pccbb/pccbbdevid.h      22 Jul 2004 20:19:57 -0000      1.16
+++ dev/pccbb/pccbbdevid.h      16 Dec 2004 19:00:14 -0000
@@ -49,6 +49,7 @@
 #define        PCIC_ID_OZ6922          0x69251217ul
 #define        PCIC_ID_OZ6933          0x69331217ul
 #define        PCIC_ID_OZ711E1         0x71131217ul    /* O2Micro 711E1 */
+#define        PCIC_ID_OZ711M1         0x71141217ul    /* O2Micro 711M1 */
 #define        PCIC_ID_RICOH_RL5C465   0x04651180ul
 #define        PCIC_ID_RICOH_RL5C466   0x04661180ul
 #define        PCIC_ID_RICOH_RL5C475   0x04751180ul

Index: pccbb.4
===================================================================
RCS file: /home/gordon/work/repo/src/share/man/man4/pccbb.4,v
retrieving revision 1.5
diff -u -r1.5 pccbb.4
--- pccbb.4     22 Jul 2004 20:22:36 -0000      1.5
+++ pccbb.4     18 Dec 2004 14:00:46 -0000
@@ -71,6 +71,9 @@
 O2micro OZ6972
 .It
 O2Micro OZ711E1
+.lt
+O2Micro OZ711M1
 .El
 .Bl -item -compact
 .It

>Release-Note:
>Audit-Trail:
>Unformatted: