From 04588f1e4d74839ad05f459a9ec299e7230d66fe Mon Sep 17 00:00:00 2001
From: fjoe <fjoe@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Tue, 28 Aug 2012 17:09:34 +0000
Subject: [PATCH] MFC: r238933

- 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

Approved by:	re (kib)


git-svn-id: svn://svn.freebsd.org/base/releng/9.1@239784 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/puc/puc_cfg.h |  2 +-
 sys/dev/puc/pucdata.c | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/sys/dev/puc/puc_cfg.h b/sys/dev/puc/puc_cfg.h
index f4969f64..4c2c65ee 100644
--- a/sys/dev/puc/puc_cfg.h
+++ b/sys/dev/puc/puc_cfg.h
@@ -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 */
-	int16_t		d_ofs;		/* Delta offset of next ports */
+	int8_t		d_ofs;		/* Delta offset of next ports */
 	puc_config_f 	*config_function;
 };
 
diff --git a/sys/dev/puc/pucdata.c b/sys/dev/puc/pucdata.c
index 8ee1667d..351efeb2 100644
--- a/sys/dev/puc/pucdata.c
+++ b/sys/dev/puc/pucdata.c
@@ -510,13 +510,15 @@ const struct puc_cfg puc_pci_devices[] = {
 	{   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 @@ const struct puc_cfg puc_pci_devices[] = {
 	{   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 @@ const struct puc_cfg puc_pci_devices[] = {
 	{   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 @@ puc_config_moxa(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
     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);
-- 
2.42.0