From nobody@FreeBSD.org  Mon Dec 20 11:20:28 2004
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B84B16A4CE
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Dec 2004 11:20:28 +0000 (GMT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 65A7343D58
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Dec 2004 11:20:28 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id iBKBKR6c063215
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 20 Dec 2004 11:20:27 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id iBKBKRbu063214;
	Mon, 20 Dec 2004 11:20:27 GMT
	(envelope-from nobody)
Message-Id: <200412201120.iBKBKRbu063214@www.freebsd.org>
Date: Mon, 20 Dec 2004 11:20:27 GMT
From: Gordon Bergling <gbergling@0xfce3.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] add missing device id for pccard bridge
X-Send-Pr-Version: www-2.3

>Number:         75298
>Category:       kern
>Synopsis:       [pccard] [patch] add missing device id for pccard bridge
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 20 11:30:27 GMT 2004
>Closed-Date:    Mon Mar 03 22:10:45 UTC 2008
>Last-Modified:  Mon Mar 03 22:10:45 UTC 2008
>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@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:
State-Changed-From-To: open->closed 
State-Changed-By: vwe 
State-Changed-When: Mon Mar 3 22:09:12 UTC 2008 
State-Changed-Why:  
support is already in RELENG_5 (in 5.5-R) and up 
committed to RELENG_5 1.16.2.2 and RELENG_6 1.17 

http://www.freebsd.org/cgi/query-pr.cgi?pr=75298 
>Unformatted:
