Author: fjoe
Date: Tue Jul 31 05:23:23 2012
New Revision: 238933
URL: http://svn.freebsd.org/changeset/base/238933
Log:
- 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
Prodded by: marcel@, gavin@
MFC after: 3 days
Modified:
head/sys/dev/puc/puc_cfg.h
head/sys/dev/puc/pucdata.c
Modified: head/sys/dev/puc/puc_cfg.h
==============================================================================
--- head/sys/dev/puc/puc_cfg.h Tue Jul 31 04:09:27 2012 (r238932)
+++ head/sys/dev/puc/puc_cfg.h Tue Jul 31 05:23:23 2012 (r238933)
@@ -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: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c Tue Jul 31 04:09:27 2012 (r238932)
+++ head/sys/dev/puc/pucdata.c Tue Jul 31 05:23:23 2012 (r238933)
@@ -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,
@@ -1159,7 +1163,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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
