On Fri, Mar 11, 2011 at 12:14:43AM +0100, Mark Kettenis wrote:
> > Date: Thu, 10 Mar 2011 14:48:45 -0800
> > From: Mike Larkin <[email protected]>
> >
> > This diff adds support to puc(4) for NetMos 9922 dual serial
> > cards. It's pretty straightforward. Tested by me on i386 and
> > amd64.
> >
> > ok?
>
> Something slightly smarter might be needed. Can you mail out the
> pcidump -vxx output for that card?
>
Sure. Traveling until Sunday, will get that out to you when I get home.
-ml
> > Index: dev/pci/pcidevs
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pcidevs,v
> > retrieving revision 1.1590
> > diff -a -u -r1.1590 pcidevs
> > --- dev/pci/pcidevs 26 Jan 2011 07:09:09 -0000 1.1590
> > +++ dev/pci/pcidevs 9 Mar 2011 05:58:03 -0000
> > @@ -3696,6 +3696,7 @@
> > product NETMOS NM9845 0x9845 Nm9845
> > product NETMOS NM9865 0x9865 Nm9865
> > product NETMOS NM9901 0x9901 Nm9901
> > +product NETMOS NM9922 0x9922 Nm9922
> >
> > /* Network Security Technologies */
> > product NETSEC 7751 0x7751 7751
> > Index: dev/pci/pcidevs.h
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pcidevs.h,v
> > retrieving revision 1.1587
> > diff -a -u -r1.1587 pcidevs.h
> > --- dev/pci/pcidevs.h 26 Jan 2011 07:10:53 -0000 1.1587
> > +++ dev/pci/pcidevs.h 9 Mar 2011 05:58:09 -0000
> > @@ -3701,6 +3701,7 @@
> > #define PCI_PRODUCT_NETMOS_NM9845 0x9845 /* Nm9845 */
> > #define PCI_PRODUCT_NETMOS_NM9865 0x9865 /* Nm9865 */
> > #define PCI_PRODUCT_NETMOS_NM9901 0x9901 /* Nm9901 */
> > +#define PCI_PRODUCT_NETMOS_NM9922 0x9922 /* Nm9922 */
> >
> > /* Network Security Technologies */
> > #define PCI_PRODUCT_NETSEC_7751 0x7751 /* 7751 */
> > Index: dev/pci/pcidevs_data.h
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pcidevs_data.h,v
> > retrieving revision 1.1582
> > diff -a -u -r1.1582 pcidevs_data.h
> > --- dev/pci/pcidevs_data.h 26 Jan 2011 07:10:53 -0000 1.1582
> > +++ dev/pci/pcidevs_data.h 9 Mar 2011 05:58:09 -0000
> > @@ -12076,6 +12076,10 @@
> > "Nm9901",
> > },
> > {
> > + PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9922,
> > + "Nm9922",
> > + },
> > + {
> > PCI_VENDOR_NETSEC, PCI_PRODUCT_NETSEC_7751,
> > "7751",
> > },
> > Index: dev/pci/pucdata.c
> > ===================================================================
> > RCS file: /cvs/src/sys/dev/pci/pucdata.c,v
> > retrieving revision 1.72
> > diff -a -u -r1.72 pucdata.c
> > --- dev/pci/pucdata.c 22 Jul 2010 17:16:10 -0000 1.72
> > +++ dev/pci/pucdata.c 9 Mar 2011 06:01:23 -0000
> > @@ -1329,6 +1329,15 @@
> > },
> > },
> >
> > + /* NetMos PCIe Peripheral Controller :Dual serial port */
> > + { /* "NetMos NM9922 2xUART" */
> > + { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9922, 0x0, 0x0 },
> > + { 0xffff, 0xffff, 0x0, 0x0 },
> > + {
> > + { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
> > + },
> > + },
> > +
> > { /* Sunix 4018A : 2-port parallel */
> > { PCI_VENDOR_SUNIX, PCI_PRODUCT_SUNIX_4018A, 0, 0 },
> > { 0xffff, 0xffff, 0, 0 },
