mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-19 12:02:25 +03:00
get rid of the get_system_type() dependency for atheros 2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6259 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
39133a937d
commit
b5ef4d0419
@ -1,6 +1,6 @@
|
|||||||
diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
||||||
--- madwifi.old/ath/if_ath_ahb.c 2006-12-22 03:57:28.000000000 +0100
|
--- madwifi.old/ath/if_ath_ahb.c 2007-02-04 04:07:15.810701232 +0100
|
||||||
+++ madwifi.dev/ath/if_ath_ahb.c 2006-12-22 04:09:48.000000000 +0100
|
+++ madwifi.dev/ath/if_ath_ahb.c 2007-02-04 04:14:02.699844680 +0100
|
||||||
@@ -17,6 +17,9 @@
|
@@ -17,6 +17,9 @@
|
||||||
#include <linux/if.h>
|
#include <linux/if.h>
|
||||||
#include <linux/netdevice.h>
|
#include <linux/netdevice.h>
|
||||||
@ -48,7 +48,42 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
u_int32_t *en = (u_int32_t *) AR5315_AHB_ARB_CTL;
|
u_int32_t *en = (u_int32_t *) AR5315_AHB_ARB_CTL;
|
||||||
|
|
||||||
KASSERT(wlanNum == 0, ("invalid wlan # %d", wlanNum) );
|
KASSERT(wlanNum == 0, ("invalid wlan # %d", wlanNum) );
|
||||||
@@ -295,7 +303,7 @@
|
@@ -265,12 +273,12 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
+
|
||||||
|
int
|
||||||
|
-exit_ath_wmac(u_int16_t wlanNum)
|
||||||
|
+exit_ath_wmac(u_int16_t wlanNum, struct ar531x_config *config)
|
||||||
|
{
|
||||||
|
struct ath_ahb_softc *sc = sclist[wlanNum];
|
||||||
|
struct net_device *dev;
|
||||||
|
- const char *sysType;
|
||||||
|
u_int16_t devid;
|
||||||
|
|
||||||
|
if (sc == NULL)
|
||||||
|
@@ -280,13 +288,17 @@
|
||||||
|
ath_detach(dev);
|
||||||
|
if (dev->irq)
|
||||||
|
free_irq(dev->irq, dev);
|
||||||
|
- sysType = get_system_type();
|
||||||
|
- if (!strcmp(sysType, "Atheros AR5315"))
|
||||||
|
+
|
||||||
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
|
||||||
|
+ devid = (u32) config->tag;
|
||||||
|
+#else
|
||||||
|
+ if (!strcmp(get_system_type(), "Atheros AR5315"))
|
||||||
|
devid = (u_int16_t) (sysRegRead(AR5315_SREV) &
|
||||||
|
(AR5315_REV_MAJ_M | AR5315_REV_MIN_M));
|
||||||
|
else
|
||||||
|
devid = (u_int16_t) ((sysRegRead(AR531X_REV) >> 8) &
|
||||||
|
(AR531X_REV_MAJ | AR531X_REV_MIN));
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
ahb_disable_wmac(devid, wlanNum);
|
||||||
|
free_netdev(dev);
|
||||||
|
@@ -295,7 +307,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
@ -57,7 +92,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
{
|
{
|
||||||
const char *athname;
|
const char *athname;
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
@@ -329,7 +337,8 @@
|
@@ -329,7 +341,8 @@
|
||||||
|
|
||||||
switch (wlanNum) {
|
switch (wlanNum) {
|
||||||
case AR531X_WLAN0_NUM:
|
case AR531X_WLAN0_NUM:
|
||||||
@ -67,7 +102,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
dev->irq = AR5315_IRQ_WLAN0_INTRS;
|
dev->irq = AR5315_IRQ_WLAN0_INTRS;
|
||||||
dev->mem_start = AR5315_WLAN0;
|
dev->mem_start = AR5315_WLAN0;
|
||||||
} else {
|
} else {
|
||||||
@@ -352,12 +361,7 @@
|
@@ -352,12 +365,7 @@
|
||||||
goto bad3;
|
goto bad3;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -81,7 +116,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
goto bad4;
|
goto bad4;
|
||||||
athname = ath_hal_probe(ATHEROS_VENDOR_ID, devid);
|
athname = ath_hal_probe(ATHEROS_VENDOR_ID, devid);
|
||||||
printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
|
printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
|
||||||
@@ -379,24 +383,63 @@
|
@@ -379,24 +387,63 @@
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -101,7 +136,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
+
|
+
|
||||||
+static int ahb_wmac_remove(struct platform_device *pdev)
|
+static int ahb_wmac_remove(struct platform_device *pdev)
|
||||||
+{
|
+{
|
||||||
+ exit_ath_wmac(pdev->id);
|
+ exit_ath_wmac(pdev->id, (struct ar531x_config *) pdev->dev.platform_data);
|
||||||
+
|
+
|
||||||
+ return 0;
|
+ return 0;
|
||||||
+}
|
+}
|
||||||
@ -150,7 +185,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
devid = (u_int16_t) ((sysRegRead(AR531X_REV) >>8) &
|
devid = (u_int16_t) ((sysRegRead(AR531X_REV) >>8) &
|
||||||
(AR531X_REV_MAJ | AR531X_REV_MIN));
|
(AR531X_REV_MAJ | AR531X_REV_MIN));
|
||||||
switch (devid) {
|
switch (devid) {
|
||||||
@@ -420,6 +463,7 @@
|
@@ -420,6 +467,7 @@
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -158,7 +193,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* Module glue.
|
* Module glue.
|
||||||
@@ -460,13 +504,19 @@
|
@@ -460,13 +508,19 @@
|
||||||
{
|
{
|
||||||
printk(KERN_INFO "%s: %s\n", dev_info, version);
|
printk(KERN_INFO "%s: %s\n", dev_info, version);
|
||||||
|
|
||||||
@ -178,7 +213,7 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
module_init(init_ath_ahb);
|
module_init(init_ath_ahb);
|
||||||
@@ -477,8 +527,13 @@
|
@@ -477,8 +531,13 @@
|
||||||
#ifdef CONFIG_SYSCTL
|
#ifdef CONFIG_SYSCTL
|
||||||
ath_sysctl_unregister();
|
ath_sysctl_unregister();
|
||||||
#endif
|
#endif
|
||||||
@ -193,8 +228,8 @@ diff -ur madwifi.old/ath/if_ath_ahb.c madwifi.dev/ath/if_ath_ahb.c
|
|||||||
printk(KERN_INFO "%s: driver unloaded\n", dev_info);
|
printk(KERN_INFO "%s: driver unloaded\n", dev_info);
|
||||||
}
|
}
|
||||||
diff -ur madwifi.old/ath/if_ath_ahb.h madwifi.dev/ath/if_ath_ahb.h
|
diff -ur madwifi.old/ath/if_ath_ahb.h madwifi.dev/ath/if_ath_ahb.h
|
||||||
--- madwifi.old/ath/if_ath_ahb.h 2006-12-22 03:57:28.000000000 +0100
|
--- madwifi.old/ath/if_ath_ahb.h 2007-02-04 04:07:15.810701232 +0100
|
||||||
+++ madwifi.dev/ath/if_ath_ahb.h 2006-12-22 04:07:47.000000000 +0100
|
+++ madwifi.dev/ath/if_ath_ahb.h 2007-02-04 04:06:49.070766320 +0100
|
||||||
@@ -59,6 +59,7 @@
|
@@ -59,6 +59,7 @@
|
||||||
#define AR5315_SREV 0xb1000014
|
#define AR5315_SREV 0xb1000014
|
||||||
|
|
||||||
@ -203,4 +238,3 @@ diff -ur madwifi.old/ath/if_ath_ahb.h madwifi.dev/ath/if_ath_ahb.h
|
|||||||
#define AR5315_REV_MAJ_M 0x00f0
|
#define AR5315_REV_MAJ_M 0x00f0
|
||||||
#define AR5315_REV_MAJ_S 4
|
#define AR5315_REV_MAJ_S 4
|
||||||
#define AR5315_REV_MIN_M 0x000f
|
#define AR5315_REV_MIN_M 0x000f
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user