[Midnightbsd-cvs] src [7916] trunk/sys/dev/puc: - Change back "d_ofs" to int8_t to not pessimize padding and size of "struct puc_cfg".

[laffer1 at midnightbsd.org]

Revision: 7916
          http://svnweb.midnightbsd.org/src/?rev=7916
Author:   laffer1
Date:     2016-09-14 15:47:16 -0400 (Wed, 14 Sep 2016)
Log Message:
-----------
- Change back "d_ofs" to int8_t to not pessimize padding and size of "struct puc_cfg".
- Use "puc_config_moxa" for Moxa boards that need d_ofs greater than 0x7f

Modified Paths:
--------------
    trunk/sys/dev/puc/puc_cfg.h
    trunk/sys/dev/puc/pucdata.c

Modified: trunk/sys/dev/puc/puc_cfg.h
===================================================================
--- trunk/sys/dev/puc/puc_cfg.h	2016-09-14 19:45:51 UTC (rev 7915)
+++ trunk/sys/dev/puc/puc_cfg.h	2016-09-14 19:47:16 UTC (rev 7916)
@@ -79,7 +79,7 @@
 	int8_t		ports;
 	int8_t		rid;		/* Rid of first port */
 	int8_t		d_rid;		/* Delta rid of next ports */
-	int16_t		d_ofs;		/* Delta offset of next ports */
+	int8_t		d_ofs;		/* Delta offset of next ports */
 	puc_config_f 	*config_function;
 };
 

Modified: trunk/sys/dev/puc/pucdata.c
===================================================================
--- trunk/sys/dev/puc/pucdata.c	2016-09-14 19:45:51 UTC (rev 7915)
+++ trunk/sys/dev/puc/pucdata.c	2016-09-14 19:47:16 UTC (rev 7916)
@@ -510,13 +510,15 @@
 	{   0x1393, 0x1024, 0xffff, 0,
 	    "Moxa Technologies, Smartio CP-102E/PCIe",
 	    DEFAULT_RCLK * 8,
-	    PUC_PORT_2S, 0x14, 0, 0x200
+	    PUC_PORT_2S, 0x14, 0, -1,
+	        .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1025, 0xffff, 0,
 	    "Moxa Technologies, Smartio CP-102EL/PCIe",
 	    DEFAULT_RCLK * 8,
-	    PUC_PORT_2S, 0x14, 0, 0x200,
+	    PUC_PORT_2S, 0x14, 0, -1,
+	        .config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1040, 0xffff, 0,
@@ -572,7 +574,8 @@
 	{   0x1393, 0x1182, 0xffff, 0,
 	    "Moxa Technologies, Smartio CP-118EL-A/PCIe",
 	    DEFAULT_RCLK * 8,
-	    PUC_PORT_8S, 0x14, 0, 0x200,
+	    PUC_PORT_8S, 0x14, 0, -1,
+		.config_function = puc_config_moxa
 	},
 
 	{   0x1393, 0x1680, 0xffff, 0,
@@ -596,7 +599,8 @@
 	{   0x1393, 0x1683, 0xffff, 0,
 	    "Moxa Technologies, Smartio CP-168EL-A/PCIe",
 	    DEFAULT_RCLK * 8,
-	    PUC_PORT_8S, 0x14, 0, 0x200,
+	    PUC_PORT_8S, 0x14, 0, -1,
+		.config_function = puc_config_moxa
 	},
 
 	{   0x13a8, 0x0152, 0xffff, 0,
@@ -1153,7 +1157,12 @@
     intptr_t *res)
 {
 	if (cmd == PUC_CFG_GET_OFS) {
-		*res = ((port == 3) ? 7 : port) * 0x200;
+		const struct puc_cfg *cfg = sc->sc_cfg;
+
+		if (port == 3 && (cfg->device == 0x1045 || cfg->device == 0x1144))
+			port = 7;
+		*res = port * 0x200;
+
 		return 0;
 	}
 	return (ENXIO);