Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 3 Aug 2012 11:22:09 +0000 (UTC)
From:      Max Khon <fjoe@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r239006 - stable/8/sys/dev/puc
Message-ID:  <201208031122.q73BM911014113@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: fjoe
Date: Fri Aug  3 11:22:09 2012
New Revision: 239006
URL: http://svn.freebsd.org/changeset/base/239006

Log:
  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

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

Modified: stable/8/sys/dev/puc/puc_cfg.h
==============================================================================
--- stable/8/sys/dev/puc/puc_cfg.h	Fri Aug  3 09:08:20 2012	(r239005)
+++ stable/8/sys/dev/puc/puc_cfg.h	Fri Aug  3 11:22:09 2012	(r239006)
@@ -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;
 };
 

Modified: stable/8/sys/dev/puc/pucdata.c
==============================================================================
--- stable/8/sys/dev/puc/pucdata.c	Fri Aug  3 09:08:20 2012	(r239005)
+++ stable/8/sys/dev/puc/pucdata.c	Fri Aug  3 11:22:09 2012	(r239006)
@@ -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, en
     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);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208031122.q73BM911014113>