28c28
< __FBSDID("$FreeBSD: stable/10/sys/dev/puc/pucdata.c 251715 2013-06-13 22:13:41Z marius $");
---
> __FBSDID("$FreeBSD: stable/10/sys/dev/puc/pucdata.c 264761 2014-04-22 13:02:03Z marius $");
60a61
> static puc_config_f puc_config_sunix;
989,990c990,991
< { 0x1fd4, 0x1999, 0xffff, 0,
< "Sunix SER5437A",
---
> { 0x1fd4, 0x1999, 0x1fd4, 0x0002,
> "Sunix SER5xxxx 2-port serial",
994a996,1029
> { 0x1fd4, 0x1999, 0x1fd4, 0x0004,
> "Sunix SER5xxxx 4-port serial",
> DEFAULT_RCLK * 8,
> PUC_PORT_4S, 0x10, 0, 8,
> },
>
> { 0x1fd4, 0x1999, 0x1fd4, 0x0008,
> "Sunix SER5xxxx 8-port serial",
> DEFAULT_RCLK * 8,
> PUC_PORT_8S, -1, -1, -1,
> .config_function = puc_config_sunix
> },
>
> { 0x1fd4, 0x1999, 0x1fd4, 0x0101,
> "Sunix MIO5xxxx 1-port serial and 1284 Printer port",
> DEFAULT_RCLK * 8,
> PUC_PORT_1S1P, -1, -1, -1,
> .config_function = puc_config_sunix
> },
>
> { 0x1fd4, 0x1999, 0x1fd4, 0x0102,
> "Sunix MIO5xxxx 2-port serial and 1284 Printer port",
> DEFAULT_RCLK * 8,
> PUC_PORT_2S1P, -1, -1, -1,
> .config_function = puc_config_sunix
> },
>
> { 0x1fd4, 0x1999, 0x1fd4, 0x0104,
> "Sunix MIO5xxxx 4-port serial and 1284 Printer port",
> DEFAULT_RCLK * 8,
> PUC_PORT_4S1P, -1, -1, -1,
> .config_function = puc_config_sunix
> },
>
1026,1027c1061,1062
< * This is more specific than the generic NM9835 entry that follows, and
< * is placed here to _prevent_ puc from claiming this single port card.
---
> * This is more specific than the generic NM9835 entry, and is placed
> * here to _prevent_ puc(4) from claiming this single port card.
1615a1651,1675
> puc_config_sunix(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
> intptr_t *res)
> {
> int error;
>
> switch (cmd) {
> case PUC_CFG_GET_OFS:
> error = puc_config(sc, PUC_CFG_GET_TYPE, port, res);
> if (error != 0)
> return (error);
> *res = (*res == PUC_TYPE_SERIAL) ? (port & 3) * 8 : 0;
> return (0);
> case PUC_CFG_GET_RID:
> error = puc_config(sc, PUC_CFG_GET_TYPE, port, res);
> if (error != 0)
> return (error);
> *res = (*res == PUC_TYPE_SERIAL && port <= 3) ? 0x10 : 0x14;
> return (0);
> default:
> break;
> }
> return (ENXIO);
> }
>
> static int