 @@ -1,1555 +1,1564 @@
-/*	$NetBSD: pucdata.c,v 1.80 2012/08/15 01:03:16 msaitoh Exp $	*/
+/*	$NetBSD: pucdata.c,v 1.81 2012/09/25 06:31:44 gson Exp $	*/
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *      This product includes software developed by Christopher G. Demetriou
  *	for the NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI "universal" communications card driver configuration data (used to
  * match/attach the cards).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.80 2012/08/15 01:03:16 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.81 2012/09/25 06:31:44 gson Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/pci/pcidevs.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pucvar.h>
 #include <dev/ic/comreg.h>
 const struct puc_device_description puc_devices[] = {
 	/*
 	 * Advantech multi serial cards
 	 */
 	/* Advantech PCI-1604UP 2 UARTs based on OX16PCI952 */
 	{   "Advantech PCI-1604UP UARTs",
 	    {	PCI_VENDOR_ADVANTECH,	PCI_PRODUCT_ADVANTECH_PCI1604, 0, 0 },
 	    {	0xffff,	0xffff,	0x0,	0x0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8 },
 	    },
 	},
 	{   "Advantech PCI-1610 UARTs",
 	    {	PCI_VENDOR_ADVANTECH,	PCI_PRODUCT_ADVANTECH_PCI1600,
 		PCI_PRODUCT_ADVANTECH_PCI1610,	0x0 },
 	    {	0xffff,	0xffff,	0xffff,	0x0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	{   "Advantech PCI-1612 UARTs",
 	    {	PCI_VENDOR_ADVANTECH,	PCI_PRODUCT_ADVANTECH_PCI1600,
 		PCI_PRODUCT_ADVANTECH_PCI1612,	0x0 },
 	    {	0xffff,	0xffff,	0xffff,	0x0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* The use of subvendor ID is bit strange... */
 	{   "Advantech PCI-1620 (1-4) UARTs",
 	    {	PCI_VENDOR_ADVANTECH,	PCI_PRODUCT_ADVANTECH_PCI1600,
 		PCI_PRODUCT_ADVANTECH_PCI1620,	0x0 },
 	    {	0xffff,	0xffff,	0xffff,	0x0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* The use of subvendor ID is bit strange... */
 	{   "Advantech PCI-1620 (5-8) UARTs",
 	    {	PCI_VENDOR_ADVANTECH,	PCI_PRODUCT_ADVANTECH_PCI1620_1,
 		PCI_PRODUCT_ADVANTECH_PCI1620,	0x0 },
 	    {	0xffff,	0xffff,	0xffff,	0x0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 2 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 2 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 2 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 2 },
 	    },
 	},
 	/*
 	 * Addi-Data APCI-7800 8-port serial card.
 	 * Uses an AMCC chip as PCI bridge.
 	 */
 	{   "Addi-Data APCI-7800",
 	    {   PCI_VENDOR_AMCIRCUITS, PCI_PRODUCT_AMCIRCUITS_ADDI7800, 0, 0  },
 	    {   0xffff, 0xffff, 0, 0  },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x08, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x20, 0x08, COM_FREQ },
 	    },
 	},
 	/* Avlab Technology, Inc. PCI 2 Serial: 2S */
 	{   "Avlab PCI 2 Serial",
 	    {	PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_PCI2S,	0, 0  },
 	    {	0xffff,	0xffff,					0, 0  },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Avlab Technology, Inc. Low Profile PCI 4 Serial: 4S */
 	{   "Avlab Low Profile PCI 4 Serial",
 	    {	PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_LPPCI4S,	0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	    },
 	},
 	/* Avlab Technology, Inc. Low Profile PCI 4 Serial: 4S */
 	{   "Avlab Low Profile PCI 4 Serial",
 	    {	PCI_VENDOR_AVLAB, PCI_PRODUCT_AVLAB_LPPCI4S_2,	0, 0  },
 	    {	0xffff,	0xffff,					0, 0  },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	    },
 	},
 	/*
 	 * B&B Electronics MIPort Serial cards.
 	 */
 	{ "BBELEC ISOLATED_2_PORT",
 	    {	PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_2_PORT, 0, 0 },
 	    {	0xffff, 0xffff, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 	    },
 	},
 	{ "BBELEC ISOLATED_4_PORT",
 	    {	PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_4_PORT, 0, 0 },
 	    {	0xffff, 0xffff, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 	    },
 	},
 	{ "BBELEC ISOLATED_8_PORT",
 	    {	PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_8_PORT, 0, 0 },
 	    {	0xffff, 0xffff, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0800, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0a00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0c00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0e00, COM_FREQ * 8 },
 	    },
 	},
 	/*
 	 * Comtrol
 	 */
 	{   "Comtrol RocketPort 550/8 RJ11 part A",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT550811A,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 RJ11 part B",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT550811B,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 Octa part A",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT5508OA,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 Octa part B",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT5508OB,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/4 RJ45",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT5504, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/Quad",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT550Q, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/16 part A",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT55016A,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/16 part B",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT55016B,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x20, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x28, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x30, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x38, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x40, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x48, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x50, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x58, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 part A",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT5508A,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 part B",
 	    {	PCI_VENDOR_COMTROL, PCI_PRODUCT_COMTROL_ROCKETPORT5508B,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 4},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 4},
 	    },
 	},
 	/*
 	 * Decision PCCOM PCI series. PLX 9052 with 1 or 2 16554 UARTS
 	 */
 	/* Decision Computer Inc PCCOM 2 Port RS232/422/485: 2S */
 	{   "Decision Computer Inc PCCOM 2 Port RS232/422/485",
 	    {	PCI_VENDOR_DCI,	PCI_PRODUCT_DCI_APCI2,	0x0,	0x0	},
 	    {	0xffff,	0xffff,	0x0,	0x0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x08, COM_FREQ},
 	    },
 	},
 	/* Decision Computer Inc PCCOM 4 Port RS232/422/485: 4S */
 	{   "Decision Computer Inc PCCOM 4 Port RS232/422/485",
 	    {	PCI_VENDOR_DCI,	PCI_PRODUCT_DCI_APCI4,	0x0,	0x0	},
 	    {	0xffff,	0xffff,	0x0,	0x0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x08, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x10, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x18, COM_FREQ},
 	    },
 	},
 	/* Decision Computer Inc PCCOM 8 Port RS232/422/485: 8S */
 	{   "Decision Computer Inc PCCOM 8 Port RS232/422/485",
 	    {	PCI_VENDOR_DCI,	PCI_PRODUCT_DCI_APCI8,	0x0,	0x0	},
 	    {	0xffff,	0xffff,	0x0,	0x0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x08, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x10, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x18, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x20, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x28, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x30, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x38, COM_FREQ},
 	    },
 	},
 	/* Digi International Digi Neo 4 Serial */
 	{ "Digi International Digi Neo 4 Serial",
 	    {	PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO4,		0, 0  },
 	    {	0xffff, 0xffff,					0, 0  },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 	    },
 	},
 	/* Digi International Digi Neo 8 Serial */
 	{ "Digi International Digi Neo 8 Serial",
 	    {	PCI_VENDOR_DIGI, PCI_PRODUCT_DIGI_NEO8,		0, 0  },
 	    {	0xffff, 0xffff,					0, 0  },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0800, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0a00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0c00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0e00, COM_FREQ * 8 },
 	    },
 	},
 	{   "EXAR XR17D152",
 	    {   PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D152, 0,      0       },
 	    {   0xffff, 0xffff, 0,      0       },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 	    },
 	},
 	{   "EXAR XR17D154",
 	    {   PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D154, 0,      0       },
 	    {   0xffff, 0xffff, 0,      0       },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 	    },
 	},
 	/*
 	 * Multi-Tech ISI5634PCI/4 4-port modem board.
 	 * Has a 4-channel Exar XR17C154 UART, but with bogus product ID in its
 	 * config EEPROM.
 	 */
 	{   "Multi-Tech ISI5634PCI/4",
 	    {   PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D158, 0x2205,      0x2003       },
 	    {   0xffff, 0xffff, 0xffff,      0xffff       },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 	    },
 	},
 	{   "EXAR XR17D158",
 	    {   PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D158, 0,      0       },
 	    {   0xffff, 0xffff, 0,      0       },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0800, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0a00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0c00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x0e00, COM_FREQ * 8 },
 	    },
 	},
 	/* IBM SurePOS 300 Series (481033H) serial ports */
 	{   "IBM SurePOS 300 Series (481033H)",
 	    {   PCI_VENDOR_IBM, PCI_PRODUCT_IBM_4810_SCC, 0, 0 },
 	    {   0xffff, 0xffff,                           0, 0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ }, /* Port C */
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ }, /* Port D */
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ }, /* Port E */
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ }, /* Port F */
 	    },
 	},
 	/* I-O DATA RSA-PCI: 2S */
 	{   "I-O DATA RSA-PCI 2-port serial",
 	    {	PCI_VENDOR_IODATA, PCI_PRODUCT_IODATA_RSAPCI, 0, 0 },
 	    {	0xffff, 0xffff, 0, 0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers 2SP-PCI */
 	{   "Lava Computers 2SP-PCI parallel port",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_TWOSP_1P, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 	    },
 	},
 	/* Lava Computers 2SP-PCI and Quattro-PCI serial ports */
 	{   "Lava Computers dual serial port",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_TWOSP_2S, 0, 0 },
 	    {	0xffff,	0xfffc,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers 2SP-PCI and Quattro-PCI serial ports */
 	{   "Lava Computers Quattro A",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_QUATTRO_AB, 0, 0 },
 	    {	0xffff,	0xfffc,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers 2SP-PCI and Quattro-PCI serial ports */
 	{   "Lava Computers Quattro B",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_QUATTRO_CD, 0, 0 },
 	    {	0xffff,	0xfffc,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers DSerial PCI serial ports */
 	{   "Lava Computers serial port",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_IOFLEX_2S_0, 0, 0 },
 	    {	0xffff,	0xfffc,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers Quattro-PCI serial ports */
 	{   "Lava Quattro-PCI A 4-port serial",
 	    {   PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_QUATTRO_AB2, 0, 0 },
 	    {   0xffff, 0xfffc, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers Quattro-PCI serial ports */
 	{   "Lava Quattro-PCI B 4-port serial",
 	    {   PCI_VENDOR_LAVA, PCI_PRODUCT_LAVA_QUATTRO_CD2, 0, 0 },
 	    {   0xffff, 0xfffc, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers Octopus-550 serial ports */
 	{   "Lava Computers Octopus-550 8-port serial",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_OCTOPUS550_0, 0, 0 },
 	    {	0xffff,	0xfffc,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers Octopus-550 serial ports */
 	{   "Lava Computers Octopus-550 B 8-port serial",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_OCTOPUS550_1, 0, 0 },
 	    {	0xffff,	0xfffc,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	    },
 	},
 	/* Lava Computers single port serial PCI card */
 	{   "Lava Computers SSERIAL-PCI",
 	    {	PCI_VENDOR_LAVA,	PCI_PRODUCT_LAVA_SSERIAL, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Actiontec  56K PCI Master */
 	{   "Actiontec 56K PCI Master",
 	    {	PCI_VENDOR_LUCENT,	PCI_PRODUCT_LUCENT_VENUSMODEM,
 x0, 0x0 },
 	    {	0xffff,	0xffff,	0x0,	0x0	},
+	    {
 		{ PUC_PORT_TYPE_COM,	0x14,	0x00, COM_FREQ },
 	    },
 	},
 	/*
 	 * This is the Middle Digital, Inc. PCI-Weasel, which
 	 * uses a PCI interface implemented in FPGA.
 	 */
 	{   "Middle Digital, Inc. Weasel serial port",
 	    {	PCI_VENDOR_MIDDLE_DIGITAL,
 		PCI_PRODUCT_MIDDLE_DIGITAL_WEASEL_SERIAL, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 2S RS232 */
 	{   "Moxa Technologies, SmartIO CP-102/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_CP102U, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232/422/485 */
 	{   "Moxa Technologies, SmartIO C104H/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_C104H, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232 */
 	{   "Moxa Technologies, SmartIO CP-104/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_CP104, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232 */
 	{   "Moxa Technologies, SmartIO CP-104-V2/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_CP104V2, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232 */
 	{   "Moxa Technologies, SmartIO CP-104-EL/PCIe",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_CP104EL, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232/422/485 */
 	{   "Moxa Technologies, SmartIO CP-114/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_CP114, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
 	{   "Moxa Technologies, SmartIO C168H/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_C168H, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
 	{   "Moxa Technologies, SmartIO C168U/PCI",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_C168U, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI-Express I/O Card 8S RS232 */
 	{   "Moxa Technologies, SmartIO C168EL/PCIe",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_C168EL, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 8 },
 	    },
 	},
 	/* Moxa Technologies Co., Ltd. PCI-Express I/O Card 8S RS232 */
 	{   "Moxa Technologies, SmartIO CP-168EL-A/PCIe",
 	    {	PCI_VENDOR_MOXA,	PCI_PRODUCT_MOXA_C168ELA, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x14, 0x000, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x200, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x400, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x600, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x800, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0xa00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0xc00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x14, 0xe00, COM_FREQ * 8 },
 	    },
 	},
 	/* NEC PK-UG-X001 K56flex PCI Modem card.
 	   NEC MARTH bridge chip and Rockwell RCVDL56ACF/SP using. */
 	{   "NEC PK-UG-X001 K56flex PCI Modem",
 	    {	PCI_VENDOR_NEC,	PCI_PRODUCT_NEC_PKUGX001, PCI_VENDOR_NEC,
 x8014 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* NEC PK-UG-X008 */
 	{   "NEC PK-UG-X008",
 	    {	PCI_VENDOR_NEC,	PCI_PRODUCT_NEC_PKUGX008, PCI_VENDOR_NEC,
 x8012 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ},
 	    },
 	},
 	/* NetMos 1P PCI : 1P */
 	{   "NetMos NM9805 1284 Printer port",
 	    {	PCI_VENDOR_NETMOS,	PCI_PRODUCT_NETMOS_NM9805, 0, 0	},
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 	    },
 	},
 	/* NetMos 2P PCI : 2P */
 	{   "NetMos NM9815 Dual 1284 Printer port",
 	    {	PCI_VENDOR_NETMOS,	PCI_PRODUCT_NETMOS_NM9815, 0, 0	},
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 		{ PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
 	    },
 	},
 	/* NetMos 1S PCI NM9835 : 1S */
 	{   "NetMos NM9835 UART",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9835, 0x1000, 0x0001 },
 	    {	0xffff, 0xffff, 0xffff, 0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* NetMos 2S PCI NM9835 : 2S */
 	{   "NetMos NM9835 Dual UART",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9835, 0x1000, 0x0002 },
 	    {	0xffff, 0xffff, 0xffff, 0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* NetMos 2S1P PCI 16C650 : 2S, 1P */
 	{   "NetMos NM9835 Dual UART and 1284 Printer port",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9835, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
 	    },
 	},
 	/* NetMos 4S0P PCI NM9845 : 4S, 0P */
 	{   "NetMos NM9845 Quad UART",
 	   {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0x1000, 0x0004 },
 	   {   0xffff, 0xffff, 0xffff, 0xffff  },
+	   {
 	       { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	   },
        },
 	/* NetMos 4S1P PCI NM9845 : 4S, 1P */
 	{   "NetMos NM9845 Quad UART and 1284 Printer port",
 	   {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0x1000, 0x0014 },
 	   {   0xffff, 0xffff, 0xffff, 0xffff  },
+	   {
 	       { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
 	   },
        },
        /* NetMos 6S PCI 16C650 : 6S, 0P */
        {   "NetMos NM9845 6 UART",
 	   {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0x1000, 0x0006 },
 	   {   0xffff, 0xffff, 0xffff, 0xffff  },
+	   {
 	       { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
 	       { PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ },
 	   },
        },
        /* NetMos 4S1P PCI NM9845 : 4S, 1P */
        {   "NetMos NM9845 Quad UART and 1284 Printer port (unknown type)",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
 	    },
 	},
        /* NetMos 4S1P PCI NM9855 : 4S, 1P */
        {   "NetMos NM9855 Quad UART and 1284 Printer port (unknown type)",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9855, 0x1000, 0x0014 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x20, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x24, 0x00, COM_FREQ },
 	    },
 	},
        /* NetMos 6S PCI NM9865 : 1S */
        {   "NetMos NM9865 1 UART",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x1000 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
        /* NetMos 2S PCI NM9865 : 2S */
        {   "NetMos NM9865 2 UART",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3002 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
        /* NetMos 3S PCI NM9865 : 3S */
        {   "NetMos NM9865 3 UART",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3003 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 	    },
 	},
        /* NetMos 4S PCI NM9865 : 4S */
        {   "NetMos NM9865 4 UART",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3004 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	    },
 	},
        /* NetMos PCI NM9865 : 1S 1P */
        {   "NetMos NM9865 Single UART and Single LPT",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3011 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
 	    },
 	},
        /* NetMos PCI NM9865 : 2S 1P */
        {   "NetMos NM9865 Dual UART and Single LPT",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3012 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
 	    },
 	},
        /* NetMos PCI NM9865 : 2P */
        {   "NetMos NM9865 Dual LPT",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3020 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
 	    },
 	},
 	/*
 	 * Two 1-port and one 2-port found on a 4-port
 	 * card sold as Sunsway/ST Lab I-430.
 	 */
 	{   "NetMos NM9865 1S",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x1000 },
 	    {	0xffff, 0xffff, 0xffff, 0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	{   "NetMos NM9865 2S",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3002 },
 	    {	0xffff, 0xffff, 0xffff, 0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* NetMos PCIe Peripheral Controller :UART part */
 	{   "NetMos NM9901 UART",
 	    {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9901, 0xa000, 0x1000 },
 	    {	0xffff,	0xffff,				      0xffff, 0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
        /* NetMos PCIe NM9901 : 1P */
        {   "NetMos NM9901 LPT",
 	    {	PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9901, 0xa000, 0x2000 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 	    },
 	},
 	/* NetMos PCIe NM9904 (PCI multi function): 4S */
 	{   "NetMos NM9904 UART",
 	    {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9904, 0, 0 },
 	    {	0xffff,	0xffff,				      0, 0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* NetMos PCIe NM9922 (PCI multi function): 2S */
 	{   "NetMos NM9922 UART",
 	    {   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9922, 0, 0 },
 	    {	0xffff,	0xffff,				      0, 0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/*
 	 * Boards with an Oxford Semiconductor chip.
+	 *
 	 * Oxford Semiconductor provides documentation for their chip at:
 	 * <URL:http://www.plxtech.com/products/uart>
+	 *
 	 * As sold by Kouwell <URL:http://www.kouwell.com/>.
 	 * I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
 	 */
 	/* Oxford Semiconductor OXPCIe952 PCIe UARTs */
 	{   "Oxford Semiconductor OXPCIe952 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952,
 		PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE952 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Oxford Semiconductor OXmPCI952 PCI UARTs */
 	{   "Oxford Semiconductor OXmPCI952 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41092,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
 	    },
 	},
 	/* Oxford Semiconductor OX16PCI952 PCI `950 UARTs - 128 byte FIFOs */
 	{   "Oxford Semiconductor OX16PCI952 UARTs",
 	    {   PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OX16PCI952,
 , 0 },
 	    {   0xffff, 0xffff, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	/* Oxford Semiconductor OX16PCI952 PCI Parallel port */
 	{   "Oxford Semiconductor OX16PCI952 Parallel port",
 	    {   PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OX16PCI952P,
 , 0 },
 	    {   0xffff, 0xffff, 0,	0	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 	    },
 	},
 	/* InnoSys Keyspan SX Pro OX16PCI954 based 4 UARTs */
 	{   "InnoSys Keyspan SX Pro Serial Card",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_INNOSYS, 0x5850 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* I-O DATA RSA-PCI2 two UARTs based on OX16PCI954 */
 	{   "I-O DATA RSA-PCI2 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_IODATA, 0xc070 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 	    },
 	},
 	/* I-O DATA RSA-PCI2 four/eight(1-4) UARTs based on OX16PCI954 */
 	{   "I-O DATA RSA-PCI2/P4 or P8 (1-4) UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_IODATA, 0xd007 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* OEM of Oxford Semiconductor PCI UARTs? */
 	{   "SIIG Cyber 4 PCI 16550",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_SIIG, 0x2050	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 10 },
 	    },
 	},
 	/* OEM of Oxford Semiconductor PCI UARTs? */
 	{   "SIIG Cyber 4S PCI 16C650 (20x family)",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_SIIG, 0x2051	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 10 },
 	    },
 	},
 	/* OEM of Oxford Semiconductor PCI UARTs? */
 	{   "Avlab LP PCI 4S Quartet",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_AVLAB, 0x2150 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 10 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 10 },
 	    },
 	},
 	/* Oxford Semiconductor OX16PCI954 PCI UARTs */
 	{   "Oxford Semiconductor OX16PCI954 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 		PCI_VENDOR_OXFORDSEMI,	0 },
 	    {	0xffff,	0xffff,	0xffff,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
 	    },
 	},
 	/* Oxford Semiconductor OX16PCI954 PCI UARTs (default for 0x9501) */
 	{   "Oxford Semiconductor OX16PCI954 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ},
 	    },
 	},
 	/* I-O DATA RSA-PCI2 eight(5-8) UARTs base on OX16PCI954 */
 	{   "I-O DATA RSA-PCI2/P8 (5-8) UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41098,
 		PCI_VENDOR_IODATA, 0xd007 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8 },
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8 },
 	    },
 	},
 	/* Exsys EX-41098, second part of SIIG Cyber 8S PCI Card */
 	{   "Exsys EX-41098",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41098,
 		PCI_VENDOR_SIIG, 0x2082	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 10},
 	    },
 	},
 	/* Oxford Semiconductor OX16PCI954 PCI Parallel port */
 	{   "Oxford Semiconductor OX16PCI954 Parallel port",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI954P,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
 	    },
 	},
 	/* EXSYS EX-41098-2 UARTs */
 	{   "EXSYS EX-41098-2 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI958,
 		PCI_VENDOR_OXFORDSEMI, 0x0671 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ},
 	    },
 	},
 	/* Oxford Semiconductor OX16PCI958 UARTs (wildcard)*/
 	{   "Oxford Semiconductor OX16PCI958 UARTs",
 	    {	PCI_VENDOR_OXFORDSEMI,	PCI_PRODUCT_OXFORDSEMI_OX16PCI958,
 , 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x08, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x10, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x18, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x20, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x28, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x30, COM_FREQ * 10},
 		{ PUC_PORT_TYPE_COM, 0x18, 0x38, COM_FREQ * 10},
 	    },
 	},
 	{   "SUNIX 5008 1P",
 	    {	PCI_VENDOR_SUNIX2, 	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0100 },
 	    {	0xffff,	0xffff,	0xffff,	0xeff0 },
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
 	    },
 	},
 	{   "SUNIX 5016 8S",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0010 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8},
 /*
  * PUC_MAX_PORTS needs to be raised in order to reach these ports
  */
 #if PUC_MAX_PORTS >= 16
 		{ PUC_PORT_TYPE_COM, 0x14, 0x20, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x28, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x30, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x38, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x40, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x48, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x50, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x58, COM_FREQ * 8},
 #endif /* PUC_MAX_PORTS >= 16 */
 	    },
 	},
 	{   "SUNIX 5027 1S",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0001 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 	    },
 	},
 	{   "SUNIX 5037 2S",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0002 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 	    },
 	},
 	{   "SUNIX 5056 4S",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0004 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
 	    },
 	},
 	{   "SUNIX 5066 8S",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0008 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8},
 	    },
 	},
 	{   "SUNIX 5069 1S / 1P",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0101 },
 	    {	0xffff,	0xffff,	0xffff,	0xeff0 },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
 	    },
 	},
 	{   "SUNIX 5079 2S / 1P",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0102 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
 	    },
 	},
 	{   "SUNIX 5099 4S / 1P",
 	    {	PCI_VENDOR_SUNIX2,	PCI_PRODUCT_SUNIX2_SER5XXXX,
 x1fd4,	0x0104 },
 	    {	0xffff,	0xffff,	0xffff,	0xffff },
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
 		{ PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
 	    },
 	},
 	/*
 	 * XXX no entry because I have no data:
 	 * XXX Dolphin Peripherals 4006 (single parallel)
 	 */
 	/*
 	 * Dolphin Peripherals 4014 (dual parallel port) card.  PLX 9050, with
 	 * a seemingly-lame EEPROM setup that puts the Dolphin IDs
 	 * into the subsystem fields, and claims that it's a
 	 * network/misc (0x02/0x80) device.
 	 */
 	{   "Dolphin Peripherals 4014",
 	    {	PCI_VENDOR_PLX,	PCI_PRODUCT_PLX_9050,	0xd84d,	0x6810	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_LPT, 0x20, 0x00, 0x00 },
 		{ PUC_PORT_TYPE_LPT, 0x24, 0x00, 0x00 },
 	    },
 	},
 	/*
 	 * XXX Dolphin Peripherals 4025 (single serial)
 	 * (clashes with Dolphin Peripherals  4036 (2s variant)
 	 */
 	/*
 	 * Dolphin Peripherals 4035 (dual serial port) card.  PLX 9050, with
 	 * a seemingly-lame EEPROM setup that puts the Dolphin IDs
 	 * into the subsystem fields, and claims that it's a
 	 * network/misc (0x02/0x80) device.
 	 */
 	{   "Dolphin Peripherals 4035",
 	    {	PCI_VENDOR_PLX,	PCI_PRODUCT_PLX_9050,	0xd84d,	0x6808	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x18, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x1c, 0x00, COM_FREQ },
 	    },
 	},
 	/*
 	 * Nanjing QinHeng Electronics
 	 * Products based on CH353 chip which can be
 	 * configured to provide various combinations
 	 * including 2 serial ports and a parallel port
 	 * or 4 serial ports (using a CH432 parallel to
 	 * 2 serial port converter. Product codes from
 	 * documentation (and physical 2 port serial card)
 	 */
 	{   "Nanjing QinHeng Electronics 2S",
 	    {	PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH352,
 		PCI_VENDOR_QINHENG, 0x3253 },
 	    {	0xffff, 0xffff, 0xffff, 0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 	    },
 	},
 	{   "Nanjing QinHeng Electronics 2S, 1P",
 	    {	PCI_VENDOR_QINHENG, PCI_PRODUCT_QINHENG_CH353,
 		PCI_VENDOR_QINHENG, 0x7053	},
 	    {	0xffff, 0xffff, 0xffff, 0xffff	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ },
 		{ PUC_PORT_TYPE_LPT, 0x18, 0x00, 0x00 },
 	    },
 	},
 	/* Intel 82946GZ/GL KT */
 	{   "Intel 82946GZ/GL KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82946GZ_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel P965/G965 KT */
 	{   "Intel P965/G965 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82P965_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel PM965/GM965 KT */
 	{   "Intel PM965/GM965 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965PM_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel GME965/GLE965 KT */
 	{   "Intel GME965/GLE965 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82965GME_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel Q963/Q965 KT */
 	{   "Intel Q963/Q965 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q965_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel G33/G31/P35/P31 KT */
 	{   "Intel Q35 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel Q35 KT */
 	{   "Intel Q35 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q35_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel Q33 KT */
 	{   "Intel Q33 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q33_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel X38 KT */
 	{   "Intel X38 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82X38_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel 3200 KT */
 	{   "Intel 3200 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3200_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel GM45 KT */
 	{   "Intel GM45 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82GM45_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel Q45 KT */
 	{   "Intel Q45 KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82Q45_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel 5 Series and Intel 3400 Series KT */
 	{   "Intel 6 Series KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel 6 Series KT */
 	{   "Intel 6 Series KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_6SERIES_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel 7 Series KT */
 	{   "Intel 7 Series KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_7SERIES_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel C600/X79 Series KT */
 	{   "Intel 7 Series KT",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel EG20T UART */
 	{   "Intel EG20T UART #0",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_0, 0, 0 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel EG20T UART */
 	{   "Intel EG20T UART #1",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_1, 0, 1 },
 	    {	0xffff,	0xffff,	0,	0	},
+	    {
 		{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
 	    },
 	},
 	/* Intel EG20T UART */
 	{   "Intel EG20T UART #2",
 	    {	PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EG20T_UART_2, 0, 2 },
 	    {	0xffff,	0xffff,	0,	0	},