svn commit: r222660 - head/sys/dev/puc

[John Baldwin]

Author: jhb
Date: Fri Jun  3 20:59:21 2011
New Revision: 222660
URL: http://svn.freebsd.org/changeset/base/222660

Log:
  - Rename the Cronyx Omega2-PCI entry to Exar XR17C158 since that is the
    real owner of the device ID.  Also rename the associated config
    function while here.
  - Add support for the 2-port and 4-port Exar parts as well: Exar XR17C/D152
    and Exar XR17C154.
  
  Tested by:    Mike Tancsa, Willy Offermans  Willy of offermans rompen nl
  MFC after:    1 week

Modified:
  head/sys/dev/puc/pucdata.c

Modified: head/sys/dev/puc/pucdata.c
==============================================================================
--- head/sys/dev/puc/pucdata.c  Fri Jun  3 20:43:12 2011        (r222659)
+++ head/sys/dev/puc/pucdata.c  Fri Jun  3 20:59:21 2011        (r222660)
@@ -48,8 +48,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/puc/puc_bfe.h>
 
 static puc_config_f puc_config_amc;
-static puc_config_f puc_config_cronyx;
 static puc_config_f puc_config_diva;
+static puc_config_f puc_config_exar;
 static puc_config_f puc_config_icbook;
 static puc_config_f puc_config_quatech;
 static puc_config_f puc_config_syba;
@@ -548,11 +548,25 @@ const struct puc_cfg puc_pci_devices[] =
            PUC_PORT_8S, 0x18, 0, 8,
        },
 
+       {   0x13a8, 0x0152, 0xffff, 0,
+           "Exar XR17C/D152",
+           DEFAULT_RCLK * 8,
+           PUC_PORT_2S, 0x10, 0, -1,
+           .config_function = puc_config_exar
+       },
+
+       {   0x13a8, 0x0154, 0xffff, 0,
+           "Exar XR17C154",
+           DEFAULT_RCLK * 8,
+           PUC_PORT_4S, 0x10, 0, -1,
+           .config_function = puc_config_exar
+       },
+
        {   0x13a8, 0x0158, 0xffff, 0,
-           "Cronyx Omega2-PCI",
+           "Exar XR17C158",
            DEFAULT_RCLK * 8,
            PUC_PORT_8S, 0x10, 0, -1,
-           .config_function = puc_config_cronyx
+           .config_function = puc_config_exar
        },
 
        {   0x13a8, 0x0258, 0xffff, 0,
@@ -1014,28 +1028,28 @@ puc_config_amc(struct puc_softc *sc, enu
 }
 
 static int
-puc_config_cronyx(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
+puc_config_diva(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
     intptr_t *res)
 {
+       const struct puc_cfg *cfg = sc->sc_cfg;
+
        if (cmd == PUC_CFG_GET_OFS) {
-               *res = port * 0x200;
+               if (cfg->subdevice == 0x1282)           /* Everest SP */
+                       port <<= 1;
+               else if (cfg->subdevice == 0x104b)      /* Maestro SP2 */
+                       port = (port == 3) ? 4 : port;
+               *res = port * 8 + ((port > 2) ? 0x18 : 0);
                return (0);
        }
        return (ENXIO);
 }
 
 static int
-puc_config_diva(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
+puc_config_exar(struct puc_softc *sc, enum puc_cfg_cmd cmd, int port,
     intptr_t *res)
 {
-       const struct puc_cfg *cfg = sc->sc_cfg;
-
        if (cmd == PUC_CFG_GET_OFS) {
-               if (cfg->subdevice == 0x1282)           /* Everest SP */
-                       port <<= 1;
-               else if (cfg->subdevice == 0x104b)      /* Maestro SP2 */
-                       port = (port == 3) ? 4 : port;
-               *res = port * 8 + ((port > 2) ? 0x18 : 0);
+               *res = port * 0x200;
                return (0);
        }
        return (ENXIO);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"