1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-26 16:18:31 +00:00

Moved the function pointer in struct puc_device_description to the end

of the struct, so that a placeholder for it (or unportable C99
initializers) are not needed for entries that don't use it.  Use a C99
initializer for the 1 entry that uses it.  Removed 91 placeholders.
This also restores API compatibility with NetBSD and RELENG_4 for most
entries.
This commit is contained in:
Bruce Evans 2004-04-18 14:37:27 +00:00
parent 1abe035580
commit 8a148d55b7
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=128404
3 changed files with 2 additions and 93 deletions

View File

@ -50,7 +50,6 @@ const struct puc_device_description rscom_devices = {
"ARGOSY SP320 Dual port serial PCMCIA",
/* http://www.argosy.com.tw/product/sp320.htm */
NULL,
{ 0, 0, 0, 0 },
{ 0, 0, 0, 0 },
{

View File

@ -52,7 +52,6 @@ int puc_config_win877(struct puc_softc *);
const struct puc_device_description puc_devices[] = {
{ "Sunix SUN1889",
NULL,
{ 0x0009, 0x7168, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -62,7 +61,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Diva Serial [GSP] Multiport UART",
NULL,
{ 0x103c, 0x1048, 0x103c, 0x1282 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -73,7 +71,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Comtrol RocketPort 550/4 RJ45",
NULL,
{ 0x11fe, 0x8014, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -85,7 +82,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Comtrol RocketPort 550/Quad",
NULL,
{ 0x11fe, 0x8015, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -97,7 +93,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Comtrol RocketPort 550/8 RJ11 part A",
NULL,
{ 0x11fe, 0x8010, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -108,7 +103,6 @@ const struct puc_device_description puc_devices[] = {
},
},
{ "Comtrol RocketPort 550/8 RJ11 part B",
NULL,
{ 0x11fe, 0x8011, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -120,7 +114,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Comtrol RocketPort 550/8 Octa part A",
NULL,
{ 0x11fe, 0x8012, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -131,7 +124,6 @@ const struct puc_device_description puc_devices[] = {
},
},
{ "Comtrol RocketPort 550/8 Octa part B",
NULL,
{ 0x11fe, 0x8013, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -143,7 +135,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Comtrol RocketPort 550/8 part A",
NULL,
{ 0x11fe, 0x8018, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -154,7 +145,6 @@ const struct puc_device_description puc_devices[] = {
},
},
{ "Comtrol RocketPort 550/8 part B",
NULL,
{ 0x11fe, 0x8019, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -166,7 +156,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Comtrol RocketPort 550/16 part A",
NULL,
{ 0x11fe, 0x8016, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -177,7 +166,6 @@ const struct puc_device_description puc_devices[] = {
},
},
{ "Comtrol RocketPort 550/16 part B",
NULL,
{ 0x11fe, 0x8017, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -208,7 +196,6 @@ const struct puc_device_description puc_devices[] = {
* network/misc (0x02/0x80) device.
*/
{ "Dolphin Peripherals 4014",
NULL,
{ 0x10b5, 0x9050, 0xd84d, 0x6810 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -229,7 +216,6 @@ const struct puc_device_description puc_devices[] = {
* network/misc (0x02/0x80) device.
*/
{ "Dolphin Peripherals 4035",
NULL,
{ 0x10b5, 0x9050, 0xd84d, 0x6808 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -243,7 +229,6 @@ const struct puc_device_description puc_devices[] = {
* (Dolpin 4025 has the same ID but only one port)
*/
{ "Dolphin Peripherals 4036",
NULL,
{ 0x1409, 0x7168, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -274,7 +259,6 @@ 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 },
{
@ -284,7 +268,6 @@ 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 },
{
@ -294,7 +277,6 @@ 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 },
{
@ -304,7 +286,6 @@ 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 },
{
@ -315,7 +296,6 @@ 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 },
{
@ -326,7 +306,6 @@ 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 },
{
@ -337,7 +316,6 @@ 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 },
{
@ -347,7 +325,6 @@ 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 },
{
@ -358,7 +335,6 @@ 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 },
{
@ -369,7 +345,6 @@ 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 },
{
@ -380,7 +355,6 @@ 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 },
{
@ -391,7 +365,6 @@ 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 },
{
@ -403,7 +376,6 @@ 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 },
{
@ -415,7 +387,6 @@ 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 },
{
@ -427,7 +398,6 @@ 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 },
{
@ -440,7 +410,6 @@ 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 },
{
@ -453,7 +422,6 @@ 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 },
{
@ -470,7 +438,6 @@ 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 },
{
@ -480,7 +447,6 @@ 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 },
{
@ -491,7 +457,6 @@ 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 },
{
@ -503,7 +468,6 @@ 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 },
{
@ -515,7 +479,6 @@ 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 },
{
@ -527,7 +490,6 @@ 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 },
{
@ -537,7 +499,6 @@ 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 },
{
@ -547,7 +508,6 @@ 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 },
{
@ -557,7 +517,6 @@ 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 },
{
@ -568,7 +527,6 @@ 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 },
{
@ -579,7 +537,6 @@ 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 },
{
@ -590,7 +547,6 @@ 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 },
{
@ -601,7 +557,6 @@ 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 },
{
@ -612,7 +567,6 @@ 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 },
{
@ -623,7 +577,6 @@ 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 },
{
@ -635,7 +588,6 @@ 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 },
{
@ -647,7 +599,6 @@ 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 },
{
@ -659,7 +610,6 @@ 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 },
{
@ -672,7 +622,6 @@ 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 },
{
@ -685,7 +634,6 @@ 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 },
{
@ -698,7 +646,6 @@ const struct puc_device_description puc_devices[] = {
/* VScom PCI-200L: 2S */
{ "VScom PCI-200L",
NULL,
{ 0x14d2, 0x8020, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -709,7 +656,6 @@ const struct puc_device_description puc_devices[] = {
/* VScom PCI-400: 4S */
{ "VScom PCI-400",
NULL,
{ 0x10b5, 0x1077, 0x10b5, 0x1077 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -722,7 +668,6 @@ const struct puc_device_description puc_devices[] = {
/* VScom PCI-800: 8S */
{ "VScom PCI-800",
NULL,
{ 0x10b5, 0x1076, 0x10b5, 0x1076 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -742,7 +687,6 @@ 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 },
{
@ -753,7 +697,6 @@ const struct puc_device_description puc_devices[] = {
},
},
{ "Titan PCI-800H",
NULL,
{ 0x14d2, 0xa004, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -764,7 +707,6 @@ const struct puc_device_description puc_devices[] = {
},
},
{ "Titan PCI-200H",
NULL,
{ 0x14d2, 0xa005, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -774,7 +716,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Titan VScom PCI-200HV2", /* 2S */
NULL,
{ 0x14d2, 0xe020, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -792,7 +733,6 @@ const struct puc_device_description puc_devices[] = {
* access the external UARTs.
*/
{ "Titan VScom PCI-800L",
NULL,
{ 0x14d2, 0x8080, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -812,7 +752,6 @@ const struct puc_device_description puc_devices[] = {
* Uses NEC MARTH bridge chip and Rockwell RCVDL56ACF/SP.
*/
{ "NEC PK-UG-X001 K56flex PCI Modem",
NULL,
{ 0x1033, 0x0074, 0x1033, 0x8014 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -822,7 +761,6 @@ const struct puc_device_description puc_devices[] = {
/* NEC PK-UG-X008 */
{ "NEC PK-UG-X008",
NULL,
{ 0x1033, 0x007d, 0x1033, 0x8012 },
{ 0xffff, 0xffff, 0xffff, 0xffff },
{
@ -832,7 +770,6 @@ 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 },
{
@ -842,7 +779,6 @@ 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 },
{
@ -853,7 +789,6 @@ 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 },
{
@ -864,7 +799,6 @@ 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 },
{
@ -874,7 +808,6 @@ 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 },
{
@ -887,7 +820,6 @@ 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 },
{
@ -897,7 +829,6 @@ const struct puc_device_description puc_devices[] = {
/* Actiontec 56K PCI Master */
{ "Actiontec 56K PCI Master",
NULL,
{ 0x11c1, 0x0480, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -917,7 +848,6 @@ const struct puc_device_description puc_devices[] = {
/* Oxford Semiconductor OX16PCI954 PCI UARTs */
{ "Oxford Semiconductor OX16PCI954 UARTs",
NULL,
{ 0x1415, 0x9501, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -930,7 +860,6 @@ const struct puc_device_description puc_devices[] = {
/* Oxford Semiconductor OX16PCI954 PCI UARTs */
{ "Oxford Semiconductor OX16PCI954 UARTs",
NULL,
{ 0x1415, 0x950a, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -943,7 +872,6 @@ const struct puc_device_description puc_devices[] = {
/* Oxford Semiconductor OX16PCI954 PCI Parallel port */
{ "Oxford Semiconductor OX16PCI954 Parallel port",
NULL,
{ 0x1415, 0x9513, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -953,7 +881,6 @@ const struct puc_device_description puc_devices[] = {
/* Oxford Semiconductor OX12PCI840 PCI Parallel port */
{ "Oxford Semiconductor OX12PCI840 Parallel port",
NULL,
{ 0x1415, 0x8403, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -966,7 +893,6 @@ const struct puc_device_description puc_devices[] = {
* Second chip on Exsys EX-41098 8x cards
*/
{ "Oxford Semiconductor OX9160/OX16PCI954 UARTs (function 1)",
NULL,
{ 0x1415, 0x9511, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -979,7 +905,6 @@ 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 },
{
@ -991,7 +916,6 @@ const struct puc_device_description puc_devices[] = {
/* NetMos 4S0P PCI: 4S, 0P */
{ "NetMos NM9845 Quad UART",
NULL,
{ 0x9710, 0x9845, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1007,7 +931,6 @@ 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 },
{
@ -1017,7 +940,6 @@ 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 },
{
@ -1028,11 +950,11 @@ const struct puc_device_description puc_devices[] = {
{ PUC_PORT_TYPE_COM, 0x10, 0x3f8, COM_FREQ },
{ PUC_PORT_TYPE_LPT, 0x10, 0x000, 0x00 },
},
.init = puc_config_win877,
},
/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232 */
{ "Moxa Technologies, Smartio C104H/PCI",
NULL,
{ 0x1393, 0x1040, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1045,7 +967,6 @@ const struct puc_device_description puc_devices[] = {
/* Moxa Technologies Co., Ltd. PCI I/O Card 4S RS232 */
{ "Moxa Technologies, Smartio CP-104UL/PCI",
NULL,
{ 0x1393, 0x1041, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1058,7 +979,6 @@ 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 },
{
@ -1071,7 +991,6 @@ 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 },
{
@ -1088,7 +1007,6 @@ const struct puc_device_description puc_devices[] = {
/* Moxa Technologies Co., Ltd. PCI I/O Card 8S RS232 */
{ "Moxa Technologies, C168U/PCI",
NULL,
{ 0x1393, 0x1681, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1104,7 +1022,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "Avlab Technology, PCI IO 2S",
NULL,
{ 0x14db, 0x2130, 0, 0 },
{ 0xffff, 0xfffc, 0, 0 },
{
@ -1115,7 +1032,6 @@ 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 },
{
@ -1128,7 +1044,6 @@ 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 },
{
@ -1140,7 +1055,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "PCCOM dual port RS232/422/485",
NULL,
{ 0x6666, 0x0004, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1150,7 +1064,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "IC Book Labs Ironclad x8 Lite",
NULL,
{ 0xb00c, 0x041c, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1167,7 +1080,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "IC Book Labs Ironclad x8 Pro",
NULL,
{ 0xb00c, 0x051c, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1184,7 +1096,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "IC Book Labs Dreadnought x16 Lite",
NULL,
{ 0xb00c, 0x091c, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{
@ -1209,7 +1120,6 @@ const struct puc_device_description puc_devices[] = {
},
{ "IC Book Labs Dreadnought x16 Pro",
NULL,
{ 0xb00c, 0x081c, 0, 0 },
{ 0xffff, 0xffff, 0, 0 },
{

View File

@ -70,7 +70,6 @@ struct puc_softc;
typedef int puc_init_t(struct puc_softc *sc);
struct puc_device_description {
const char *name;
puc_init_t *init;
uint32_t rval[4];
uint32_t rmask[4];
struct {
@ -83,6 +82,7 @@ struct puc_device_description {
} ports[PUC_MAX_PORTS];
uint32_t ilr_type;
uint32_t ilr_offset[2];
puc_init_t *init;
};
#define PUC_REG_VEND 0