svn commit: r237703 - stable/9/sys/dev/puc

[Max Khon]

Author: fjoe
Date: Thu Jun 28 11:15:48 2012
New Revision: 237703
URL: http://svn.freebsd.org/changeset/base/237703

Log:
  MFC: r237350, r237357
  
  Add support for the following Moxa PCIe multiport serial boards:
  - CP102E
  - CP102EL
  - CP114EL
  - CP118EL-A
  - CP168EL-A

Modified:
  stable/9/sys/dev/puc/puc_cfg.h
  stable/9/sys/dev/puc/pucdata.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/puc/puc_cfg.h
==============================================================================
--- stable/9/sys/dev/puc/puc_cfg.h	Thu Jun 28 10:40:57 2012	(r237702)
+++ stable/9/sys/dev/puc/puc_cfg.h	Thu Jun 28 11:15:48 2012	(r237703)
@@ -79,7 +79,7 @@ struct puc_cfg {
 	int8_t		ports;
 	int8_t		rid;		/* Rid of first port */
 	int8_t		d_rid;		/* Delta rid of next ports */
-	int8_t		d_ofs;		/* Delta offset of next ports */
+	int16_t		d_ofs;		/* Delta offset of next ports */
 	puc_config_f 	*config_function;
 };
 

Modified: stable/9/sys/dev/puc/pucdata.c
==============================================================================
--- stable/9/sys/dev/puc/pucdata.c	Thu Jun 28 10:40:57 2012	(r237702)
+++ stable/9/sys/dev/puc/pucdata.c	Thu Jun 28 11:15:48 2012	(r237703)
@@ -507,6 +507,18 @@ const struct puc_cfg puc_pci_devices[] =
 	    .config_function = puc_config_quatech
 	},
 
+	{   0x1393, 0x1024, 0xffff, 0,
+	    "Moxa Technologies, Smartio CP-102E/PCIe",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_2S, 0x14, 0, 0x200
+	},
+
+	{   0x1393, 0x1025, 0xffff, 0,
+	    "Moxa Technologies, Smartio CP-102EL/PCIe",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_2S, 0x14, 0, 0x200,
+	},
+
 	{   0x1393, 0x1040, 0xffff, 0,
 	    "Moxa Technologies, Smartio C104H/PCI",
 	    DEFAULT_RCLK * 8,
@@ -550,6 +562,19 @@ const struct puc_cfg puc_pci_devices[] =
 	    PUC_PORT_4S, 0x18, 0, 8,
 	},
 
+	{   0x1393, 0x1144, 0xffff, 0,
+	    "Moxa Technologies, Smartio CP-114EL/PCIe",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_4S, 0x14, 0, -1,
+		.config_function = puc_config_moxa
+	},
+
+	{   0x1393, 0x1182, 0xffff, 0,
+	    "Moxa Technologies, Smartio CP-118EL-A/PCIe",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_8S, 0x14, 0, 0x200,
+	},
+
 	{   0x1393, 0x1680, 0xffff, 0,
 	    "Moxa Technologies, C168H/PCI",
 	    DEFAULT_RCLK * 8,
@@ -568,6 +593,12 @@ const struct puc_cfg puc_pci_devices[] =
 	    PUC_PORT_8S, 0x18, 0, 8,
 	},
 
+	{   0x1393, 0x1683, 0xffff, 0,
+	    "Moxa Technologies, Smartio CP-168EL-A/PCIe",
+	    DEFAULT_RCLK * 8,
+	    PUC_PORT_8S, 0x14, 0, 0x200,
+	},
+
 	{   0x13a8, 0x0152, 0xffff, 0,
 	    "Exar XR17C/D152",
 	    DEFAULT_RCLK * 8,
@@ -1121,9 +1152,7 @@ static int
 puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
     intptr_t *res)
 {
-	const struct puc_cfg *cfg = sc->sc_cfg;
-	
-	if (cmd == PUC_CFG_GET_OFS && cfg->device == 0x1045) {
+	if (cmd == PUC_CFG_GET_OFS) {
 		*res = ((port == 3) ? 7 : port) * 0x200;
 		return 0;
 	}