Module Name: src Committed By: msaitoh Date: Thu Oct 18 10:41:45 UTC 2012
Modified Files: src/sys/dev/pci: pucdata.c Log Message: - Indent. - Fix some product names or device names. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/dev/pci/pucdata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/pucdata.c diff -u src/sys/dev/pci/pucdata.c:1.81 src/sys/dev/pci/pucdata.c:1.82 --- src/sys/dev/pci/pucdata.c:1.81 Tue Sep 25 06:31:44 2012 +++ src/sys/dev/pci/pucdata.c Thu Oct 18 10:41:44 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pucdata.c,v 1.81 2012/09/25 06:31:44 gson Exp $ */ +/* $NetBSD: pucdata.c,v 1.82 2012/10/18 10:41:44 msaitoh Exp $ */ /* * Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.81 2012/09/25 06:31:44 gson Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.82 2012/10/18 10:41:44 msaitoh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -168,7 +168,7 @@ const struct puc_device_description puc_ /* * B&B Electronics MIPort Serial cards. */ - { "BBELEC ISOLATED_2_PORT", + { "BBELEC ISOLATED_2_PORT", { PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_2_PORT, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -176,7 +176,7 @@ const struct puc_device_description puc_ { PUC_PORT_TYPE_COM, 0x10, 0x0200, COM_FREQ * 8 }, }, }, - { "BBELEC ISOLATED_4_PORT", + { "BBELEC ISOLATED_4_PORT", { PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_4_PORT, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -186,7 +186,7 @@ const struct puc_device_description puc_ { PUC_PORT_TYPE_COM, 0x10, 0x0600, COM_FREQ * 8 }, }, }, - { "BBELEC ISOLATED_8_PORT", + { "BBELEC ISOLATED_8_PORT", { PCI_VENDOR_BBELEC, PCI_PRODUCT_BBELEC_ISOLATED_8_PORT, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -363,7 +363,7 @@ const struct puc_device_description puc_ }, /* Digi International Digi Neo 4 Serial */ - { "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 }, { @@ -375,7 +375,7 @@ const struct puc_device_description puc_ }, /* Digi International Digi Neo 8 Serial */ - { "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 }, { @@ -799,37 +799,37 @@ const struct puc_device_description puc_ { 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 }, - { + { 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 }, - { + /* 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)", + /* 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 }, { @@ -841,8 +841,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos 4S1P PCI NM9855 : 4S, 1P */ - { "NetMos NM9855 Quad UART and 1284 Printer port (unknown type)", + /* 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 }, { @@ -854,8 +854,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos 6S PCI NM9865 : 1S */ - { "NetMos NM9865 1 UART", + /* NetMos 6S PCI NM9865 : 1S */ + { "NetMos NM9865 1 UART", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x1000 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -863,8 +863,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos 2S PCI NM9865 : 2S */ - { "NetMos NM9865 2 UART", + /* NetMos 2S PCI NM9865 : 2S */ + { "NetMos NM9865 2 UART", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3002 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -873,8 +873,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos 3S PCI NM9865 : 3S */ - { "NetMos NM9865 3 UART", + /* NetMos 3S PCI NM9865 : 3S */ + { "NetMos NM9865 3 UART", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3003 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -884,8 +884,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos 4S PCI NM9865 : 4S */ - { "NetMos NM9865 4 UART", + /* NetMos 4S PCI NM9865 : 4S */ + { "NetMos NM9865 4 UART", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3004 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -896,8 +896,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos PCI NM9865 : 1S 1P */ - { "NetMos NM9865 Single UART and Single LPT", + /* 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 }, { @@ -906,8 +906,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos PCI NM9865 : 2S 1P */ - { "NetMos NM9865 Dual UART and Single LPT", + /* 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 }, { @@ -917,8 +917,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos PCI NM9865 : 2P */ - { "NetMos NM9865 Dual LPT", + /* NetMos PCI NM9865 : 2P */ + { "NetMos NM9865 Dual LPT", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3020 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -956,8 +956,8 @@ const struct puc_device_description puc_ }, }, - /* NetMos PCIe NM9901 : 1P */ - { "NetMos NM9901 LPT", + /* NetMos PCIe NM9901 : 1P */ + { "NetMos NM9901 LPT", { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9901, 0xa000, 0x2000 }, { 0xffff, 0xffff, 0xffff, 0xffff }, { @@ -1442,7 +1442,7 @@ const struct puc_device_description puc_ }, /* Intel G33/G31/P35/P31 KT */ - { "Intel Q35 KT", + { "Intel G33/G31/P35/P31 KT", { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82G33_KT, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -1505,7 +1505,7 @@ const struct puc_device_description puc_ }, /* Intel 5 Series and Intel 3400 Series KT */ - { "Intel 6 Series KT", + { "Intel 5 Series KT", { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_3400_KT, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, { @@ -1532,7 +1532,7 @@ const struct puc_device_description puc_ }, /* Intel C600/X79 Series KT */ - { "Intel 7 Series KT", + { "Intel C600/X79 Series KT", { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_KT, 0, 0 }, { 0xffff, 0xffff, 0, 0 }, {