svn commit: r292840 - head/sys/dev/puc

Marius Strobl marius at FreeBSD.org
Mon Dec 28 20:24:09 UTC 2015


Author: marius
Date: Mon Dec 28 20:24:08 2015
New Revision: 292840
URL: https://svnweb.freebsd.org/changeset/base/292840

Log:
  - Add an entry for the SIIG Cyber 2SP1 PCIe adapter, which is based
    on an Oxford Semiconductor OX16PCI954 but uses only two ports and
    a non-default clock rate.
  - Fix style/whitespace
  
  PR:		176407
  MFC after:	3 days

Modified:
  head/sys/dev/puc/pucdata.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c	Mon Dec 28 19:29:05 2015	(r292839)
+++ head/sys/dev/puc/pucdata.c	Mon Dec 28 20:24:08 2015	(r292840)
@@ -763,6 +763,12 @@ const struct puc_cfg puc_pci_devices[] =
 	    PUC_PORT_4S, 0x10, 0, 8,
 	},
 
+	{   0x1415, 0x950a, 0x131f, 0x2061,
+	    "SIIG Cyber 2SP1 PCIe",
+	    DEFAULT_RCLK * 10,
+	    PUC_PORT_2S, 0x10, 0, 8,
+	},
+
 	{   0x1415, 0x950a, 0xffff, 0,
 	    "Oxford Semiconductor OX16PCI954 UARTs",
 	    DEFAULT_RCLK,
@@ -840,9 +846,9 @@ const struct puc_cfg puc_pci_devices[] =
 	 */
 
 	{   0x1415, 0xc11b, 0xffff, 0,
-            "Oxford Semiconductor OXPCIe952 1S1P",
-            DEFAULT_RCLK * 0x22,
-            PUC_PORT_NONSTANDARD, 0x10, 0, -1,
+	    "Oxford Semiconductor OXPCIe952 1S1P",
+	    DEFAULT_RCLK * 0x22,
+	    PUC_PORT_NONSTANDARD, 0x10, 0, -1,
 	    .config_function = puc_config_oxford_pcie
 	},
 
@@ -1275,7 +1281,8 @@ puc_config_moxa(struct puc_softc *sc, en
 	if (cmd == PUC_CFG_GET_OFS) {
 		const struct puc_cfg *cfg = sc->sc_cfg;
 
-		if (port == 3 && (cfg->device == 0x1045 || cfg->device == 0x1144))
+		if (port == 3 && (cfg->device == 0x1045 ||
+		    cfg->device == 0x1144))
 			port = 7;
 		*res = port * 0x200;
 


More information about the svn-src-head mailing list