More cleaning up and unhacking:

Don't expect all RIDs to be PCI rids.  The previous code made at
least 1 mistake, even for PCI.

Give the card definitions a chance to specify a init function.
Use this instead of the gross superio hack.
Move the win877 init function to puc_pci.c where it belongs.

RIDs can actually be zero, don't set badmuxed if so.

Set a less incorrect end for the construct SYS_RES_IOPORT entries,
I guess both sio and lpt happen to use 8 IO ports, but that shouldn't
really be hardcoded this way.

Fixup puc_pccard.c to match.

We're getting closer.

1 files changed, 76 insertions, 0 deletions

diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 2547d5a..47240e1 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 const struct puc_device_description puc_devices[] = {
 
 	{   "Comtrol RocketPort 550/4 RJ45",
+	    NULL,
 	    {	0x11fe,	0x8014,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -61,6 +62,7 @@ const struct puc_device_description puc_devices[] = {
 	},
 
 	{   "Comtrol RocketPort 550/Quad",
+	    NULL,
 	    {	0x11fe,	0x8015,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -72,6 +74,7 @@ const struct puc_device_description puc_devices[] = {
 	},
 
 	{   "Comtrol RocketPort 550/8 RJ11 part A",
+	    NULL,
 	    {	0x11fe,	0x8010,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -82,6 +85,7 @@ const struct puc_device_description puc_devices[] = {
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 RJ11 part B",
+	    NULL,
 	    {	0x11fe,	0x8011,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -93,6 +97,7 @@ const struct puc_device_description puc_devices[] = {
 	},
 
 	{   "Comtrol RocketPort 550/8 Octa part A",
+	    NULL,
 	    {	0x11fe,	0x8012,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -103,6 +108,7 @@ const struct puc_device_description puc_devices[] = {
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 Octa part B",
+	    NULL,
 	    {	0x11fe,	0x8013,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -114,6 +120,7 @@ const struct puc_device_description puc_devices[] = {
 	},
 
 	{   "Comtrol RocketPort 550/8 part A",
+	    NULL,
 	    {	0x11fe,	0x8018,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -124,6 +131,7 @@ const struct puc_device_description puc_devices[] = {
 	    },
 	},
 	{   "Comtrol RocketPort 550/8 part B",
+	    NULL,
 	    {	0x11fe,	0x8019,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -135,6 +143,7 @@ const struct puc_device_description puc_devices[] = {
 	},
 
 	{   "Comtrol RocketPort 550/16 part A",
+	    NULL,
 	    {	0x11fe,	0x8016,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -145,6 +154,7 @@ const struct puc_device_description puc_devices[] = {
 	    },
 	},
 	{   "Comtrol RocketPort 550/16 part B",
+	    NULL,
 	    {	0x11fe,	0x8017,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -175,6 +185,7 @@ const struct puc_device_description puc_devices[] = {
 	 * network/misc (0x02/0x80) device.
 	 */
 	{   "Dolphin Peripherals 4014",
+	    NULL,
 	    {	0x10b5,	0x9050,	0xd84d,	0x6810	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
 	    {
@@ -195,6 +206,7 @@ const struct puc_device_description puc_devices[] = {
 	 * network/misc (0x02/0x80) device.
 	 */
 	{   "Dolphin Peripherals 4035",
+	    NULL,
 	    {	0x10b5,	0x9050,	0xd84d,	0x6808	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
 	    {
@@ -208,6 +220,7 @@ const struct puc_device_description puc_devices[] = {
 	 * (Dolpin 4025 has the same ID but only one port)
 	 */
 	{   "Dolphin Peripherals 4036",
+	    NULL,
 	    {	0x1409,	0x7168,	0x0,	0x0	},
 	    {	0xffff,	0xffff,	0x0,	0x0	},
 	    {
@@ -238,6 +251,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial PCI 16C550 (10x family): 1S */
 	{   "SIIG Cyber Serial PCI 16C550 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1000,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -247,6 +261,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial PCI 16C650 (10x family): 1S */
 	{   "SIIG Cyber Serial PCI 16C650 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1001,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -256,6 +271,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial PCI 16C850 (10x family): 1S */
 	{   "SIIG Cyber Serial PCI 16C850 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1002,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -265,6 +281,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber I/O PCI 16C550 (10x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C550 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1010,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -275,6 +292,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber I/O PCI 16C650 (10x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C650 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1011,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -285,6 +303,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber I/O PCI 16C850 (10x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C850 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1012,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -295,6 +314,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Parallel PCI (10x family): 1P */
 	{   "SIIG Cyber Parallel PCI (10x family)",
+	    NULL,
 	    {	0x131f,	0x1020,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -304,6 +324,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Parallel Dual PCI (10x family): 2P */
 	{   "SIIG Cyber Parallel Dual PCI (10x family)",
+	    NULL,
 	    {	0x131f,	0x1021,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -314,6 +335,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial Dual PCI 16C550 (10x family): 2S */
 	{   "SIIG Cyber Serial Dual PCI 16C550 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1030,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -324,6 +346,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial Dual PCI 16C650 (10x family): 2S */
 	{   "SIIG Cyber Serial Dual PCI 16C650 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1031,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -334,6 +357,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial Dual PCI 16C850 (10x family): 2S */
 	{   "SIIG Cyber Serial Dual PCI 16C850 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1032,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -344,6 +368,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2S1P PCI 16C550 (10x family): 2S, 1P */
 	{   "SIIG Cyber 2S1P PCI 16C550 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1034,	0,	0	},	/* XXX really? */
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -355,6 +380,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2S1P PCI 16C650 (10x family): 2S, 1P */
 	{   "SIIG Cyber 2S1P PCI 16C650 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1035,	0,	0	},	/* XXX really? */
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -366,6 +392,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2S1P PCI 16C850 (10x family): 2S, 1P */
 	{   "SIIG Cyber 2S1P PCI 16C850 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1036,	0,	0	},	/* XXX really? */
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -377,6 +404,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 4S PCI 16C550 (10x family): 4S */
 	{   "SIIG Cyber 4S PCI 16C550 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1050,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -389,6 +417,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 4S PCI 16C650 (10x family): 4S */
 	{   "SIIG Cyber 4S PCI 16C650 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1051,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -401,6 +430,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 4S PCI 16C850 (10x family): 4S */
 	{   "SIIG Cyber 4S PCI 16C850 (10x family)",
+	    NULL,
 	    {	0x131f,	0x1052,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -417,6 +447,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Parallel PCI (20x family): 1P */
 	{   "SIIG Cyber Parallel PCI (20x family)",
+	    NULL,
 	    {	0x131f,	0x2020,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -426,6 +457,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Parallel Dual PCI (20x family): 2P */
 	{   "SIIG Cyber Parallel Dual PCI (20x family)",
+	    NULL,
 	    {	0x131f,	0x2021,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -436,6 +468,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2P1S PCI 16C550 (20x family): 1S, 2P */
 	{   "SIIG Cyber 2P1S PCI 16C550 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2040,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -447,6 +480,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2P1S PCI 16C650 (20x family): 1S, 2P */
 	{   "SIIG Cyber 2P1S PCI 16C650 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2041,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -458,6 +492,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2P1S PCI 16C850 (20x family): 1S, 2P */
 	{   "SIIG Cyber 2P1S PCI 16C850 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2042,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -469,6 +504,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial PCI 16C550 (20x family): 1S */
 	{   "SIIG Cyber Serial PCI 16C550 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2000,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -478,6 +514,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial PCI 16C650 (20x family): 1S */
 	{   "SIIG Cyber Serial PCI 16C650 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2001,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -487,6 +524,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial PCI 16C850 (20x family): 1S */
 	{   "SIIG Cyber Serial PCI 16C850 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2002,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -496,6 +534,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber I/O PCI 16C550 (20x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C550 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2010,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -506,6 +545,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber I/O PCI 16C650 (20x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C650 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2011,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -516,6 +556,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber I/O PCI 16C850 (20x family): 1S, 1P */
 	{   "SIIG Cyber I/O PCI 16C850 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2012,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -526,6 +567,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial Dual PCI 16C550 (20x family): 2S */
 	{   "SIIG Cyber Serial Dual PCI 16C550 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2030,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -536,6 +578,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial Dual PCI 16C650 (20x family): 2S */
 	{   "SIIG Cyber Serial Dual PCI 16C650 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2031,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -546,6 +589,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber Serial Dual PCI 16C850 (20x family): 2S */
 	{   "SIIG Cyber Serial Dual PCI 16C850 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2032,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -556,6 +600,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2S1P PCI 16C550 (20x family): 2S, 1P */
 	{   "SIIG Cyber 2S1P PCI 16C550 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2060,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -567,6 +612,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2S1P PCI 16C650 (20x family): 2S, 1P */
 	{   "SIIG Cyber 2S1P PCI 16C650 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2061,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -578,6 +624,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 2S1P PCI 16C850 (20x family): 2S, 1P */
 	{   "SIIG Cyber 2S1P PCI 16C850 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2062,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -589,6 +636,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 4S PCI 16C550 (20x family): 4S */
 	{   "SIIG Cyber 4S PCI 16C550 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2050,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -601,6 +649,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 4S PCI 16C650 (20x family): 4S */
 	{   "SIIG Cyber 4S PCI 16C650 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2051,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -613,6 +662,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SIIG Cyber 4S PCI 16C850 (20x family): 4S */
 	{   "SIIG Cyber 4S PCI 16C850 (20x family)",
+	    NULL,
 	    {	0x131f,	0x2052,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -625,6 +675,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* VScom PCI-200L: 2S */
 	{   "VScom PCI-200L",
+	    NULL,
 	    {	0x14d2, 0x8020,	0, 0	},
 	    {	0xffff, 0xffff,	0, 0	},
 	    {
@@ -635,6 +686,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* VScom PCI-400: 4S */
 	{   "VScom PCI-400",
+	    NULL,
 	    {	0x10b5,	0x1077,	0x10b5,	0x1077	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
 	    {
@@ -647,6 +699,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* VScom PCI-800: 8S */
 	{   "VScom PCI-800",
+	    NULL,
 	    {	0x10b5,	0x1076,	0x10b5,	0x1076	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
 	    {
@@ -666,6 +719,7 @@ const struct puc_device_description puc_devices[] = {
 	 * device ID 3 and PCI device 1 device ID 4.
 	 */
 	{   "Titan PCI-800H",
+	    NULL,
 	    {	0x14d2,	0xa003,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -676,6 +730,7 @@ const struct puc_device_description puc_devices[] = {
 	    },
 	},
 	{   "Titan PCI-800H",
+	    NULL,
 	    {	0x14d2,	0xa004,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -686,6 +741,7 @@ const struct puc_device_description puc_devices[] = {
 	    },
 	},
         {   "Titan PCI-200H",
+	    NULL,
             {   0x14d2, 0xa005, 0,      0       },
             {   0xffff, 0xffff, 0,      0       },
             {
@@ -697,6 +753,7 @@ const struct puc_device_description puc_devices[] = {
 	/* NEC PK-UG-X001 K56flex PCI Modem card.
 	   NEC MARTH bridge chip and Rockwell RCVDL56ACF/SP using. */
 	{   "NEC PK-UG-X001 K56flex PCI Modem",
+	    NULL,
 	    {	0x1033,	0x0074,	0x1033,	0x8014	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
 	    {
@@ -706,6 +763,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* NEC PK-UG-X008 */
 	{   "NEC PK-UG-X008",
+	    NULL,
 	    {	0x1033,	0x007d,	0x1033,	0x8012	},
 	    {	0xffff,	0xffff,	0xffff,	0xffff	},
 	    {
@@ -715,6 +773,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Lava Computers 2SP-PCI */
 	{   "Lava Computers 2SP-PCI parallel port",
+	    NULL,
 	    {	0x1407,	0x8000,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -724,6 +783,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Lava Computers 2SP-PCI and Quattro-PCI serial ports */
 	{   "Lava Computers dual serial port",
+	    NULL,
 	    {	0x1407,	0x0100,	0,	0	},
 	    {	0xffff,	0xfffc,	0,	0	},
 	    {
@@ -734,6 +794,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Lava Computers newer Quattro-PCI serial ports */
 	{   "Lava Computers Quattro-PCI serial port",
+	    NULL,
 	    {	0x1407,	0x0120,	0,	0	},
 	    {	0xffff,	0xfffc,	0,	0	},
 	    {
@@ -744,6 +805,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Lava Computers DSerial PCI serial ports */
 	{   "Lava Computers serial port",
+	    NULL,
 	    {	0x1407,	0x0110,	0,	0	},
 	    {	0xffff,	0xfffc,	0,	0	},
 	    {
@@ -753,6 +815,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Lava Computers Octopus-550 serial ports */
 	{   "Lava Computers Octopus-550 8-port serial",
+	    NULL,
 	    {	0x1407,	0x0180,	0,	0	},
 	    {	0xffff,	0xfffc,	0,	0	},
 	    {
@@ -765,6 +828,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* US Robotics (3Com) PCI Modems */
 	{   "US Robotics (3Com) 3CP5609 PCI 16550 Modem",
+	    NULL,
 	    {	0x12b9,	0x1008,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -774,6 +838,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Actiontec  56K PCI Master */
 	{   "Actiontec 56K PCI Master",
+	    NULL,
 	    {	0x11c1,	0x0480,	0x0, 	0x0	},
 	    {	0xffff,	0xffff,	0x0,	0x0	},
 	    {
@@ -793,6 +858,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Oxford Semiconductor OX16PCI954 PCI UARTs */
 	{   "Qxford Semiconductor OX16PCI954 UARTs",
+	    NULL,
 	    {	0x1415,	0x9501,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -805,6 +871,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Oxford Semiconductor OX16PCI954 PCI Parallel port */
 	{   "Qxford Semiconductor OX16PCI954 Parallel port",
+	    NULL,
 	    {	0x1415,	0x9513,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -814,6 +881,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* NetMos 2S1P PCI 16C650 : 2S, 1P */
 	{   "NetMos NM9835 Dual UART and 1284 Printer port",
+	    NULL,
 	    {	0x9710,	0x9835,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -828,6 +896,7 @@ const struct puc_device_description puc_devices[] = {
 	 * uses a PCI interface implemented in FPGA.
 	 */
 	{   "Middle Digital, Inc. Weasel serial port",
+	    NULL,
 	    {	0xdeaf,	0x9051,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -837,6 +906,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* SD-LAB PCI I/O Card 4S2P */
 	{   "Syba Tech Ltd. PCI-4S2P-550-ECP",
+	    puc_config_win877,
 	    {	0x1592, 0x0781, 0,	0	},
 	    {	0xffff, 0xffff, 0,	0	},
 	    {
@@ -851,6 +921,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232/422/485 */
 	{   "Moxa Technologies, Industio CP-114",
+	    NULL,
 	    {	0x1393,	0x1141,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0,	},
 	    {
@@ -863,6 +934,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
 	{   "Moxa Technologies, C168H/PCI",
+	    NULL,
 	    {	0x1393,	0x1680,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0,	},
 	    {
@@ -878,6 +950,7 @@ const struct puc_device_description puc_devices[] = {
 	},
 
 	{   "Avlab Technology, PCI IO 2S",
+	    NULL,
 	    {	0x14db,	0x2130,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -888,6 +961,7 @@ const struct puc_device_description puc_devices[] = {
 
 	/* Avlab Technology, Inc. Low Profile PCI 4 Serial: 4S */
 	{   "Avlab Low Profile PCI 4 Serial",
+	    NULL,
 	    {	0x14db,	0x2150,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {
@@ -900,6 +974,7 @@ const struct puc_device_description puc_devices[] = {
 
         /* Decision Computer Inc, serial ports */
         {   "Decision Computer Inc, PCCOM 4-port serial",
+	    NULL,
             {   0x6666, 0x0001, 0,      0       },
             {   0xffff, 0xffff, 0,      0       },
             {
@@ -911,6 +986,7 @@ const struct puc_device_description puc_devices[] = {
         },
 
 	{   "PCCOM dual port RS232/422/485",
+	    NULL,
 	    {	0x6666,	0x0004,	0,	0	},
 	    {	0xffff,	0xffff,	0,	0	},
 	    {