[Hackndev-commit] SF.net SVN: hackndev: [717] linux4palm/linux/trunk

[<mar...@us...>]

Revision: 717
          http://svn.sourceforge.net/hackndev/?rev=717&view=rev
Author:   marex_z71
Date:     2007-01-01 16:25:54 -0800 (Mon, 01 Jan 2007)

Log Message:
-----------
l4p: Some progress with LD wifi. I guess I can communicate with the chip 
and I can even upload firmware to it. Though, it wont init again after 
genesis mode so it?\194?\180s still no use...

Modified Paths:
--------------
    linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c
    linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_cs.c
    linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_download.c
    linux4palm/linux/trunk/drivers/pcmcia/pxa2xx_base.c

Modified: linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c
===================================================================
--- linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c	2006-12-27 09:40:10 UTC (rev 716)
+++ linux4palm/linux/trunk/arch/arm/mach-pxa/palmld/palmld_pcmcia.c	2007-01-02 00:25:54 UTC (rev 717)
@@ -100,9 +100,13 @@
 static struct pcmcia_low_level palmld_pcmcia_ops = {
 	.owner			= THIS_MODULE,
 
-	/* socket 1, since socket 0 is HDD */
-	.first			= 1,
-	.nr			= 1,
+	/* Setting it this way makes pcmcia-cs
+	   scream about memory-cs (because of
+	   HDD/CF memory in socket 0), but it's
+	   much nicer than make some weird changes
+	   in pxa pcmcia subsystem */
+	.first			= 0,
+	.nr			= 2,
 
 	.hw_init		= palmld_pcmcia_hw_init,
 	.hw_shutdown		= palmld_pcmcia_hw_shutdown,

Modified: linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_cs.c
===================================================================
--- linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_cs.c	2006-12-27 09:40:10 UTC (rev 716)
+++ linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_cs.c	2007-01-02 00:25:54 UTC (rev 717)
@@ -842,6 +842,7 @@
 	PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
 	PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
 	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
+	PCMCIA_DEVICE_MANF_CARD(0x02db, 0x8103), // SyChip WLAN6061EB
 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
 	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),

Modified: linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_download.c
===================================================================
--- linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_download.c	2006-12-27 09:40:10 UTC (rev 716)
+++ linux4palm/linux/trunk/drivers/net/wireless/hostap/hostap_download.c	2007-01-02 00:25:54 UTC (rev 717)
@@ -107,7 +107,10 @@
 		}
 	}
 #else /* PRISM2_PCI */
-	HFA384X_INSW(HFA384X_AUXDATA_OFF, buf, len / 2);
+/*	HFA384X_INSW(HFA384X_AUXDATA_OFF, buf, len / 2);*/
+	HFA384X_INSW(HFA384X_AUXDATA_OFF, buf, len);
+	/* Removing that "/ 2" lets readback test pass.
+	   That can point to bad memory/chip configuration. */
 #endif /* PRISM2_PCI */
 
 	return 0;
@@ -138,7 +141,10 @@
 		}
 	}
 #else /* PRISM2_PCI */
-	HFA384X_OUTSW(HFA384X_AUXDATA_OFF, buf, len / 2);
+/*	HFA384X_OUTSW(HFA384X_AUXDATA_OFF, buf, len / 2);*/
+	HFA384X_OUTSW(HFA384X_AUXDATA_OFF, buf, len);
+	/* Removing that "/ 2" lets readback test pass.
+	   That can point to bad memory/chip configuration. */
 #endif /* PRISM2_PCI */
 
 	return 0;

Modified: linux4palm/linux/trunk/drivers/pcmcia/pxa2xx_base.c
===================================================================
--- linux4palm/linux/trunk/drivers/pcmcia/pxa2xx_base.c	2006-12-27 09:40:10 UTC (rev 716)
+++ linux4palm/linux/trunk/drivers/pcmcia/pxa2xx_base.c	2007-01-02 00:25:54 UTC (rev 717)
@@ -197,8 +197,6 @@
 		MECR |= MECR_CIT;
 
 		/* Set MECR:NOS (Number Of Sockets) */
-		/* Use (nr > 0) on Palm LifeDrive to get WiFi
-		   chip detected */
 		if (nr > 1) 
 			MECR |= MECR_NOS;
 		else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.