Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 27 May 2011 16:22:21 -0400
From:      John Baldwin <jhb@freebsd.org>
To:        Mike Tancsa <mike@sentex.net>
Cc:        Willy@offermans.rompen.nl, Marcel Moolenaar <marcel@freebsd.org>, freebsd-stable@freebsd.org, freebsd-hardware@freebsd.org
Subject:   Re: modem support MT9234ZPX-PCIE-NV
Message-ID:  <201105271622.21355.jhb@freebsd.org>
In-Reply-To: <4DDFFD9C.2000503@sentex.net>
References:  <20110521092037.GB3271@vpn.offrom.nl> <201105271533.03445.jhb@freebsd.org> <4DDFFD9C.2000503@sentex.net>
next in thread | previous in thread | raw e-mail | index | archive | help 
On Friday, May 27, 2011 3:38:04 pm Mike Tancsa wrote:
> On 5/27/2011 3:33 PM, John Baldwin wrote:
> > 
> > Actually, can you just try this:
> > 
> > Index: pucdata.c
> 
> Hi,
> 	Patch applies, but it doesnt compile on RELENG_8

Ugh, looks like the offset can't handle 0x200, try this instead:

Index: pucdata.c
===================================================================
--- pucdata.c	(revision 222364)
+++ pucdata.c	(working copy)
@@ -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, enum puc_cfg_
 }
 
 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);

-- 
John Baldwin

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