r3910 - developers/sameo/patches/ar6k-atheros-2.0
sameo at sita.openmoko.org
sameo at sita.openmoko.org
Tue Jan 22 00:47:43 CET 2008
Author: sameo
Date: 2008-01-22 00:47:39 +0100 (Tue, 22 Jan 2008)
New Revision: 3910
Modified:
developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch
developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch
developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_sdio_stack.patch
Log:
ar6k-atheros-2.0: iperf bug fix
We need to double check for SDIO IRQ bits.
Modified: developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch 2008-01-21 22:16:35 UTC (rev 3909)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch 2008-01-21 23:47:39 UTC (rev 3910)
@@ -3,18 +3,18 @@
drivers/sdio/function/Makefile | 1
drivers/sdio/function/wlan/Makefile | 4
drivers/sdio/function/wlan/ar6000/Makefile | 38
- drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c | 3070 +++++++
+ drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c | 3071 +++++++
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h | 361
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c | 439 +
drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h | 128
drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h | 993 ++
drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h | 47
drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h | 44
- drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h | 86
+ drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h | 107
drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c | 2573 ++++++
drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c | 225
drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h | 319
- drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c | 1866 ++++
+ drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c | 1875 ++++
drivers/sdio/function/wlan/ar6000/bmi/bmi.c | 657 +
drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h | 45
drivers/sdio/function/wlan/ar6000/hif/hif.c | 818 ++
@@ -75,7 +75,7 @@
drivers/sdio/function/wlan/ar6000/include/wmi.h | 1739 ++++
drivers/sdio/function/wlan/ar6000/include/wmi_api.h | 259
drivers/sdio/function/wlan/ar6000/include/wmix.h | 233
- drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c | 467 +
+ drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c | 466 +
drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c | 346
drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c | 371
drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c | 192
@@ -83,12 +83,12 @@
drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 3921 +++++++++
drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h | 4421 +++++++++++
drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h | 71
- 84 files changed, 32511 insertions(+)
+ 84 files changed, 32541 insertions(+)
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Kconfig
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Kconfig 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/Kconfig 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,11 @@
+#menu "SDIO function drivers"
+
@@ -102,18 +102,18 @@
+
+#endmenu
\ No newline at end of file
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Makefile 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/Makefile 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += wlan/
\ No newline at end of file
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2008-01-11 12:20:32.000000000 +0100
-@@ -0,0 +1,3070 @@
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2008-01-21 21:32:38.000000000 +0100
+@@ -0,0 +1,3071 @@
+/*
+ *
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -397,11 +397,15 @@
+
+ /* Fetch the address of the host_app_area_s instance in the host interest area */
+ address = HOST_INTEREST_ITEM_ADDRESS(ar, hi_app_host_interest);
++
+ if (ar6000_ReadRegDiag(ar->arHifDevice, &address, &data) != A_OK) {
+ return A_ERROR;
+ }
++
+ address = data;
++
+ host_app_area.wmi_protocol_ver = WMI_PROTOCOL_VERSION;
++
+ if (ar6000_WriteDataDiag(ar->arHifDevice, address,
+ (A_UCHAR *)&host_app_area,
+ sizeof(struct host_app_area_s)) != A_OK)
@@ -943,11 +947,7 @@
+ ar6000_ioctl_iwsetup(&ath_iw_handler_def);
+ dev->wireless_handlers = &ath_iw_handler_def;
+
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
-+ dev->get_wireless_stats = ar6000_get_iwstats; /*Displayed via proc fs */
-+#else
+ ath_iw_handler_def.get_wireless_stats = ar6000_get_iwstats; /*Displayed via proc fs */
-+#endif
+
+ /*
+ * We need the OS to provide us with more headroom in order to
@@ -1757,6 +1757,7 @@
+ /* HTC interface is asynchronous, if this fails, cleanup will happen in
+ * the ar6000_tx_complete callback */
+ HTCSendPkt(ar->arHtcTarget, &cookie->HtcPkt);
++
+ } else {
+ /* no packet to send, cleanup */
+ A_NETBUF_FREE(skb);
@@ -3184,10 +3185,10 @@
+ A_UINT32 targReplyArg)
+{
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,361 @@
+/*
+ *
@@ -3550,10 +3551,10 @@
+#endif
+
+#endif /* _AR6000_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,439 @@
+/*
+ *
@@ -3994,10 +3995,10 @@
+ return length;
+}
+#endif /* HTC_RAW_INTERFACE */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,128 @@
+#ifndef _AR6XAPI_LINUX_H
+#define _AR6XAPI_LINUX_H
@@ -4127,10 +4128,10 @@
+#endif
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,993 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5125,10 +5126,10 @@
+}
+#endif
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
@@ -5177,10 +5178,10 @@
+
+
+#endif /* _ATHTYPES_LINUX_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -5226,11 +5227,11 @@
+#endif
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h 2008-01-11 12:20:32.000000000 +0100
-@@ -0,0 +1,86 @@
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h 2008-01-21 21:33:49.000000000 +0100
+@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
+ * All rights reserved.
@@ -5280,8 +5281,10 @@
+ ATH_DEBUG_ANY = 0xFFFF,
+};
+
-+#ifdef DEBUG
++//#define FULL_DEBUG 1
+
++#if defined(DEBUG)
++
+#define A_DPRINTF(f, a) \
+ if(g_dbg_flags & (f)) \
+ { \
@@ -5308,7 +5311,26 @@
+ } \
+} while(0)
+extern int debughtc;
++
++
++#elif defined(FULL_DEBUG)
++
++#define AR_DEBUG_PRINTBUF(buffer, length, desc) do { \
++ DebugDumpBytes(buffer, length,desc); \
++} while(0)
++
++
++#define AR_DEBUG_PRINTF(flags, args) A_PRINTF(args);
++#define AR_DEBUG_ASSERT(test) do { \
++ if (!(test)) { \
++ AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Debug Assert Caught, File %s, Line: %d, Test:%s \n",__FILE__, __LINE__,#test)); \
++ } \
++} while(0)
++
++#define A_DPRINTF(f, a) A_PRINTF(a)
++
+#else
++
+#define AR_DEBUG_PRINTF(flags, args)
+#define AR_DEBUG_PRINTBUF(buffer, length)
+#define AR_DEBUG_ASSERT(test)
@@ -5317,10 +5339,10 @@
+#endif
+
+#endif /* _DEBUG_LINUX_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c 2008-01-11 12:48:19.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,2573 @@
+/*
+ *
@@ -7895,10 +7917,10 @@
+ return ret;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,225 @@
+
+/*
@@ -8125,10 +8147,10 @@
+ return A_OK;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,319 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
@@ -8449,11 +8471,11 @@
+#endif /* __KERNEL__ */
+
+#endif /* _OSAPI_LINUX_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c 2008-01-11 19:16:27.000000000 +0100
-@@ -0,0 +1,1866 @@
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c 2008-01-21 21:35:19.000000000 +0100
+@@ -0,0 +1,1875 @@
+/*
+ *
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -8686,14 +8708,16 @@
+{
+ AR_SOFTC_T *ar = (AR_SOFTC_T *)dev->priv;
+ struct ar_giwscan_param param;
-+ int i;
++ int i, ret = 0;
+
+ if (ar->arWlanState == WLAN_DISABLED) {
-+ return -EIO;
++ ret = -EIO;
++ goto out;
+ }
+
+ if (ar->arWmiReady == FALSE) {
-+ return -EIO;
++ ret = -EIO;
++ goto out;
+ }
+
+ param.current_ev = extra;
@@ -8717,15 +8741,25 @@
+ param.firstPass = FALSE;
+ if (param.current_ev >= param.end_buf) {
+ data->length = param.current_ev - extra;
-+ return -E2BIG;
++ ret = -E2BIG;
++ goto out;
+ }
+ }
+
+ if(!(data->length = param.current_ev - extra)) {
-+ printk("%s(): data length %d\n", __FUNCTION__, data->length);
-+ return -EAGAIN;
++ ret = -EAGAIN;
++ goto out;
+ }
-+ return 0;
++
++ out:
++#if 0
++ if (wmi_bssfilter_cmd(ar->arWmi, NONE_BSS_FILTER, 0) != A_OK) {
++ printk("Couldn't set filtering\n");
++ ret = -EIO;
++ }
++#endif
++
++ return ret;
+}
+
+extern int reconnect_flag;
@@ -9988,20 +10022,17 @@
+ return -EIO;
+ }
+
-+#if 1
+ /* We ask for everything from the target */
+ if (wmi_bssfilter_cmd(ar->arWmi, ALL_BSS_FILTER, 0) != A_OK) {
+ printk("Couldn't set filtering\n");
+ ret = -EIO;
+ }
-+#endif
+
+ if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, FALSE, FALSE, \
+ HOME_TXDRAIN_TIME, SCAN_INT) != A_OK) {
+ ret = -EIO;
+ }
+
-+
+ return ret;
+#undef ACT_DWELLTIME_DEFAULT
+#undef HOME_TXDRAIN_TIME
@@ -10320,10 +10351,10 @@
+#endif /* __ATH_CENTRAL_IOCTL_DISPATCHER___ */
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,657 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -10982,10 +11013,10 @@
+
+ return status;
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,45 @@
+#ifndef BMI_INTERNAL_H
+#define BMI_INTERNAL_H
@@ -11032,10 +11063,10 @@
+ A_UINT32 length);
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/hif/hif.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/hif/hif.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,818 @@
+/*
+ * @file: hif.c
@@ -11855,10 +11886,10 @@
+
+ return;
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,102 @@
+/*
+ * @file: hif_internal.h
@@ -11962,10 +11993,10 @@
+
+void
+delHifDevice(SDDEVICE *handle);
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/ar6k.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,991 @@
+/*
+ * AR6K device layer that handles register level I/O
@@ -12958,10 +12989,10 @@
+
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,638 @@
+/*
+ * AR6K Driver layer event handling (i.e. interrupts, message polling)
@@ -13601,10 +13632,10 @@
+}
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/ar6k.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,191 @@
+/*
+ *
@@ -13797,10 +13828,10 @@
+#endif
+
+#endif /*AR6K_H_*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,507 @@
+/*
+ *
@@ -14309,10 +14340,10 @@
+ return FALSE;
+#endif
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,65 @@
+#ifndef HTC_DEBUG_H_
+#define HTC_DEBUG_H_
@@ -14379,10 +14410,10 @@
+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
+
+#endif /*HTC_DEBUG_H_*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,168 @@
+/*
+ *
@@ -14552,10 +14583,10 @@
+#endif
+
+#endif /* _HTC_INTERNAL_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,703 @@
+/*
+ *
@@ -15260,10 +15291,10 @@
+}
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,541 @@
+/*
+ *
@@ -15806,10 +15837,10 @@
+ UNLOCK_HTC_TX(target);
+
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_services.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/htc/htc_services.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,403 @@
+/*
+ *
@@ -16214,10 +16245,10 @@
+ }
+
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_config.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_config.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_config.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,27 @@
+#ifndef _A_CONFIG_H_
+#define _A_CONFIG_H_
@@ -16246,10 +16277,10 @@
+#include "../ar6000/config_linux.h"
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_debug.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_debug.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_debug.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_debug.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,41 @@
+#ifndef _A_DEBUG_H_
+#define _A_DEBUG_H_
@@ -16292,10 +16323,10 @@
+#include "../ar6000/debug_linux.h"
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,185 @@
+#ifndef _A_DRV_API_H_
+#define _A_DRV_API_H_
@@ -16482,10 +16513,10 @@
+#endif
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_drv.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,28 @@
+#ifndef _A_DRV_H_
+#define _A_DRV_H_
@@ -16515,10 +16546,10 @@
+#include "../ar6000/athdrv_linux.h"
+
+#endif /* _ADRV_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_osapi.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_osapi.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,28 @@
+#ifndef _A_OSAPI_H_
+#define _A_OSAPI_H_
@@ -16548,10 +16579,10 @@
+#include "../ar6000/osapi_linux.h"
+
+#endif /* _OSAPI_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,29 @@
+#ifndef _AR6000_API_H_
+#define _AR6000_API_H_
@@ -16582,10 +16613,10 @@
+
+#endif /* _AR6000_API_H */
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ *
@@ -16625,10 +16656,10 @@
+ A_UCHAR *data, A_UINT32 length);
+
+#endif /*AR6000_DIAG_H_*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2006 Atheros Communications Inc.
@@ -16730,10 +16761,10 @@
+#define RD_SIZE (34*4) /* Space for this number of words */
+
+#endif /* __AR6000_REGDUMP_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -16882,10 +16913,10 @@
+#endif
+
+#endif /* __AR6KHWREG_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -16923,10 +16954,10 @@
+#define AR6K_SW_VERSION ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -16964,10 +16995,10 @@
+#define AR6K_SW_VERSION ( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdefs.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athdefs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,85 @@
+#ifndef __ATHDEFS_H__
+#define __ATHDEFS_H__
@@ -17054,10 +17085,10 @@
+}WLAN_CAPABILITY;
+
+#endif /* __ATHDEFS_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdrv.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athdrv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17091,10 +17122,10 @@
+#endif
+
+#endif /* _ATHDRV_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athendpack.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athendpack.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athendpack.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athendpack.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,41 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athendpack.h
@@ -17137,10 +17168,10 @@
+#include "../os/wince/include/athendpack_wince.h"
+#endif /* WINCE */
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athstartpack.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/athstartpack.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,42 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athstartpack.h
@@ -17184,10 +17215,10 @@
+#include "../os/wince/include/athstartpack_wince.h"
+#endif /* WINCE */
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_types.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_types.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_types.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/a_types.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,28 @@
+#ifndef _A_TYPES_H_
+#define _A_TYPES_H_
@@ -17217,10 +17248,10 @@
+#include "../ar6000/athtypes_linux.h"
+
+#endif /* _ATHTYPES_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/bmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/bmi.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,100 @@
+#ifndef _BMI_H_
+#define _BMI_H_
@@ -17322,10 +17353,10 @@
+#endif
+
+#endif /* _BMI_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,199 @@
+#ifndef __BMI_MSG_H__
+#define __BMI_MSG_H__
@@ -17526,10 +17557,10 @@
+
+
+#endif /* __BMI_MSG_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/common_drv.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/common_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/common_drv.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/common_drv.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ *
@@ -17592,10 +17623,10 @@
+#endif
+
+#endif /*COMMON_DRV_H_*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,46 @@
+#ifndef _DBGLOG_API_H_
+#define _DBGLOG_API_H_
@@ -17643,10 +17674,10 @@
+#endif
+
+#endif /* _DBGLOG_API_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dbglog.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dbglog.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -17755,10 +17786,10 @@
+#endif
+
+#endif /* _DBGLOG_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,307 @@
+/*
+ *
@@ -18067,10 +18098,10 @@
+#endif
+
+#endif /* _DBGLOG_ID_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dl_list.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dl_list.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dl_list.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dl_list.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,114 @@
+/*
+ *
@@ -18186,10 +18217,10 @@
+}
+
+#endif /* __DL_LIST_H___ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dset_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18254,10 +18285,10 @@
+
+
+#endif /* _DSET_API_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dsetid.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dsetid.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dsetid.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dsetid.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18369,10 +18400,10 @@
+#define DSETID_BPATCH_FLAG 0x80000000
+
+#endif /* __DSETID_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_internal.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/dset_internal.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -18413,10 +18444,10 @@
+} dset_descriptor_t;
+
+#endif /* __DSET_INTERNAL_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,57 @@
+#ifndef _GPIO_API_H_
+#define _GPIO_API_H_
@@ -18475,10 +18506,10 @@
+A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
+
+#endif /* _GPIO_API_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/gpio.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/gpio.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2005 Atheros Communications Inc.
@@ -18514,10 +18545,10 @@
+
+#define GPIO_LAST_REGISTER_ID GPIO_ID_PIN(17)
+#define GPIO_ID_NONE 0xffffffff
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/hif.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/hif.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/hif.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/hif.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18810,10 +18841,10 @@
+#endif
+
+#endif /* _HIF_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/host_version.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/host_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/host_version.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/host_version.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,49 @@
+#ifndef _HOST_VERSION_H_
+#define _HOST_VERSION_H_
@@ -18864,10 +18895,10 @@
+#endif
+
+#endif /* _HOST_VERSION_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,436 @@
+/*
+ *
@@ -19305,10 +19336,10 @@
+#endif
+
+#endif /* _HTC_API_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -19500,10 +19531,10 @@
+
+#endif /* __HTC_H__ */
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_packet.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc_packet.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,138 @@
+/*
+ *
@@ -19643,10 +19674,10 @@
+}
+
+#endif /*HTC_PACKET_H_*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_services.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc_services.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_services.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/htc_services.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -19685,10 +19716,10 @@
+#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
+
+#endif /*HTC_SERVICES_H_*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,342 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -20032,10 +20063,10 @@
+#include "athendpack.h"
+
+#endif /* _NET80211_IEEE80211_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20200,10 +20231,10 @@
+#endif
+
+#endif /* _IEEE80211_IOCTL_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,77 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -20282,10 +20313,10 @@
+#define WLAN_NODE_INACT_TIMEOUT_MSEC 10000
+
+#endif /* _IEEE80211_NODE_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ini_dset.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/ini_dset.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20327,10 +20358,10 @@
+} POSTPACK INI_DSET_REG_OVERRIDE;
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regDb.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/regDb.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regDb.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/regDb.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2005 Atheros Communications, Inc.
@@ -20351,10 +20382,10 @@
+#include "./regulatory/reg_dbvalues.h"
+
+#endif /* __REG_DB_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regdump.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/regdump.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regdump.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/regdump.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,33 @@
+#ifndef __REGDUMP_H__
+#define __REGDUMP_H__
@@ -20389,10 +20420,10 @@
+};
+#endif /* __ASSEMBLER__ */
+#endif /* __REGDUMP_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/targaddrs.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/targaddrs.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20552,10 +20583,10 @@
+#endif /* !__ASSEMBLER__ */
+
+#endif /* __TARGADDRS_H__ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/testcmd.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/testcmd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/testcmd.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/testcmd.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20701,10 +20732,10 @@
+#endif
+
+#endif /* TESTCMD_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,101 @@
+#ifndef _HOST_WLAN_API_H_
+#define _HOST_WLAN_API_H_
@@ -20807,10 +20838,10 @@
+#endif
+
+#endif /* _HOST_WLAN_API_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2007 Atheros Communications, Inc.
@@ -20832,10 +20863,10 @@
+} POSTPACK WOW_CONFIG_DSET;
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,259 @@
+#ifndef _WMI_API_H_
+#define _WMI_API_H_
@@ -21096,10 +21127,10 @@
+#endif
+
+#endif /* _WMI_API_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi.h 2008-01-11 18:46:26.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wmi.h 2008-01-17 18:51:11.000000000 +0100
@@ -0,0 +1,1739 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -22206,7 +22237,7 @@
+ A_UINT8 snr;
+ A_INT16 rssi;
+ A_UINT8 bssid[ATH_MAC_LEN];
-+// A_UINT32 ieMask;
++ A_UINT32 ieMask;
+} POSTPACK WMI_BSS_INFO_HDR;
+
+/*
@@ -22840,10 +22871,10 @@
+#endif
+
+#endif /* _WMI_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmix.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wmix.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmix.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/include/wmix.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -23078,10 +23109,10 @@
+#endif
+
+#endif /* _WMIX_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/Makefile 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/Makefile 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,38 @@
+REV ?= 2
+
@@ -23121,11 +23152,11 @@
+ wlan/wlan_utils.o
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c 2008-01-11 12:20:32.000000000 +0100
-@@ -0,0 +1,467 @@
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c 2008-01-21 21:22:00.000000000 +0100
+@@ -0,0 +1,466 @@
+
+/*
+ *
@@ -23173,7 +23204,6 @@
+ * be satisfactory even though it generates 4X the bus activity. */
+
+#ifdef USE_4BYTE_REGISTER_ACCESS
-+
+ /* set the window address register (using 4-byte register access ). */
+A_STATUS ar6000_SetAddressWindowRegister(HIF_DEVICE *hifDevice, A_UINT32 RegisterAddr, A_UINT32 Address)
+{
@@ -23593,10 +23623,10 @@
+
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,346 @@
+
+/*
@@ -23944,10 +23974,10 @@
+ return A_OK;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,371 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -24320,10 +24350,10 @@
+ wlan_node_dec_free (ni);
+ IEEE80211_NODE_UNLOCK (nt);
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2008-01-11 19:12:03.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -24517,10 +24547,10 @@
+
+ return A_OK;
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -24581,10 +24611,10 @@
+ return 15 + ((freq - 2512) / 20);
+ return (freq - 5000) / 5;
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2008-01-11 19:11:53.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,3921 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -28507,10 +28537,10 @@
+ NO_SYNC_WMIFLAG));
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,4421 @@
+/*
+ *
@@ -32933,10 +32963,10 @@
+
+=====================================================================
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,71 @@
+#ifndef _WMI_HOST_H_
+#define _WMI_HOST_H_
@@ -33009,10 +33039,10 @@
+#endif
+
+#endif /* _WMI_HOST_H_ */
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/Makefile 2008-01-11 12:20:32.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/function/wlan/Makefile 2008-01-11 19:20:42.000000000 +0100
@@ -0,0 +1,4 @@
+#
+# SDIO wlan ar600 card function driver
Modified: developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch 2008-01-21 22:16:35 UTC (rev 3909)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch 2008-01-21 23:47:39 UTC (rev 3910)
@@ -2,14 +2,14 @@
drivers/sdio/hcd/Kconfig | 14
drivers/sdio/hcd/Makefile | 1
drivers/sdio/hcd/s3c24xx/Makefile | 2
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1491 +++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 66 +
- 5 files changed, 1574 insertions(+)
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1510 +++++++++++++++++++++++++++++++++
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 67 +
+ 5 files changed, 1594 insertions(+)
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/Kconfig
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/Kconfig 2008-01-09 17:55:24.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/Kconfig 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,14 @@
+config SDIO_S3C24XX
+ tristate "Samsung s3c24xx host controller"
@@ -25,24 +25,24 @@
+ help
+ good luck.
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/Makefile 2008-01-09 17:55:24.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_PLAT_S3C24XX) += s3c24xx/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/s3c24xx/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/Makefile 2008-01-09 17:55:24.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/s3c24xx/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_PLAT_S3C24XX) += sdio_s3c24xx_hcd.o
+sdio_s3c24xx_hcd-objs := s3c24xx_hcd.o
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2008-01-10 21:22:51.000000000 +0100
-@@ -0,0 +1,1491 @@
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2008-01-21 21:12:24.000000000 +0100
+@@ -0,0 +1,1510 @@
+/*
+ * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
+ *
@@ -608,14 +608,10 @@
+ PSDREQUEST req;
+ struct s3c24xx_hcd_context * context =
+ container_of(work, struct s3c24xx_hcd_context, io_work);
-+ unsigned long flags;
+
-+// spin_lock_irqsave(&context->lock, flags);
-+
+ req = GET_CURRENT_REQUEST(&context->hcd);
+ if (req == NULL) {
+ DBG_PRINT(SDDBG_ERROR, ("%s(): No current request\n", __FUNCTION__));
-+// enable_irq(context->io_irq);
+ return;
+ }
+
@@ -660,12 +656,12 @@
+ if (context->complete == S3C24XX_HCD_DATA_READ ||
+ context->complete == S3C24XX_HCD_DATA_WRITE) {
+ if (context->dma_en) {
++ dma_sync_single(NULL, context->io_buffer_dma,
++ req->BlockCount * req->BlockLen, DMA_BIDIRECTIONAL);
+
+ s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_START);
+
-+// spin_unlock_irqrestore(&context->lock, flags);
+ wait_for_completion(&context->dma_complete);
-+// spin_lock_irqsave(&context->lock, flags);
+
+ s3c24xx_hcd_dma_complete(context);
+ } else {
@@ -675,16 +671,12 @@
+ }
+
+ out:
-+// spin_unlock_irqrestore(&context->lock, flags);
-+
+ s3c24xx_hcd_clear_sta(context);
+ s3c24xx_hcd_clear_imask(context);
+
+ writel(0, context->base + S3C2410_SDICMDARG);
+ writel(0, context->base + S3C2410_SDICMDCON);
+
-+// spin_unlock_irqrestore(&context->lock, flags);
-+
+ SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_TRANSFER_DONE);
+}
+
@@ -792,9 +784,17 @@
+ imask &= ~S3C2410_SDIIMSK_SDIOIRQ;
+ writel(imask, context->base + S3C2440_SDIIMSK);
+ SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_SDIO_IRQ_PENDING);
++
++ dsta = readl(context->base + S3C2410_SDIDSTA);
++ if (dsta & S3C2410_SDIDSTA_SDIOIRQDETECT) {
++ writel(S3C2410_SDIDSTA_SDIOIRQDETECT, context->base + S3C2410_SDIDSTA);
++ SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_SDIO_IRQ_PENDING);
++ }
++
++
++ } else {
++ context->int_pending = 1;
+ }
-+
-+ writel(S3C2410_SDIDSTA_SDIOIRQDETECT, context->base + S3C2410_SDIDSTA);
+ }
+
+ req = GET_CURRENT_REQUEST(&context->hcd);
@@ -832,8 +832,8 @@
+ }
+
+ if (cmdsta & S3C2410_SDICMDSTAT_RSPFIN ||
-+ (IS_SDREQ_WRITE_DATA(req->Flags) && (fsta & S3C2410_SDIFSTA_TFDET)) ||
-+ (!IS_SDREQ_WRITE_DATA(req->Flags) && (fsta & S3C2410_SDIFSTA_RFDET))) {
++ (IS_SDREQ_WRITE_DATA(req->Flags) && (fsta & S3C2410_SDIFSTA_TFDET)) ||
++ (!IS_SDREQ_WRITE_DATA(req->Flags) && (fsta & S3C2410_SDIFSTA_RFDET))) {
+
+ writel(S3C2410_SDICMDSTAT_RSPFIN, context->base + S3C2410_SDICMDSTAT);
+
@@ -884,6 +884,16 @@
+ writel(S3C2410_SDIDSTA_SBITERR, context->base + S3C2410_SDIDSTA);
+ }
+
++#if 0
++ dsta = readl(context->base + S3C2410_SDIDSTA);
++ if (dsta & S3C2410_SDIDSTA_SDIOIRQDETECT) {
++ printk("IRQ pending\n");
++ } else {
++ printk("No IRQ pending\n");
++ }
++
++#endif
++
+ spin_unlock_irqrestore(&context->lock, flags);
+ return IRQ_HANDLED;
+}
@@ -949,6 +959,11 @@
+ DBG_PRINT(SDDBG_TRACE, ("config SDIO_REARM_INT\n"));
+ spin_lock_irqsave(&context->lock,flags);
+
++ if (context->int_pending) {
++ context->int_pending = 0;
++ SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_SDIO_IRQ_PENDING);
++ }
++
+ context->int_sdio = 1;
+ imsk = readl(context->base + S3C2440_SDIIMSK);
+ imsk |= S3C2410_SDIIMSK_SDIOIRQ;
@@ -996,8 +1011,6 @@
+ struct s3c24xx_hcd_context * context =
+ (struct s3c24xx_hcd_context *)hcd->pContext;
+
-+// dump_request(context);
-+
+ req = GET_CURRENT_REQUEST(hcd);
+ DBG_ASSERT(req != NULL);
+
@@ -1013,7 +1026,6 @@
+
+ /* Enabling irqs */
+ imask = S3C2410_SDIIMSK_READWAIT;
-+// imask = S3C2410_SDIIMSK_READWAIT | S3C2410_SDIIMSK_SDIOIRQ;
+
+ cmdcon = readl(context->base + S3C2410_SDICMDCON);
+
@@ -1067,11 +1079,14 @@
+
+ req->DataRemaining = req->BlockCount * req->BlockLen;
+
++
++
+ /* Set data size, and start the transfer */
++ dcon |= S3C2410_SDIDCON_IRQPERIOD;
+ if (!(req->DataRemaining % 4)) {
+ context->data_size = 4;
+ dcon |= S3C2440_SDIDCON_DS_WORD;
-+ dcon |= (1 << 24);
++// dcon |= (1 << 24);
+ } else if (!(req->DataRemaining % 2)) {
+ context->data_size = 2;
+ dcon |= S3C2440_SDIDCON_DS_HALFWORD;
@@ -1081,12 +1096,15 @@
+ }
+
+#ifdef CONFIG_SDIO_S3C24XX_DMA
-+ context->dma_en = 1;
-+#else
-+ context->dma_en = 0;
-+ context->data_size = 1;
-+ dcon |= S3C2440_SDIDCON_DS_BYTE;
++ if (req->DataRemaining > 16) {
++ context->dma_en = 1;
++ } else
+#endif
++ {
++ context->dma_en = 0;
++ context->data_size = 1;
++ dcon |= S3C2440_SDIDCON_DS_BYTE;
++ }
+
+ if (context->dma_en) {
+ dcon |= S3C2410_SDIDCON_DMAEN;
@@ -1369,6 +1387,7 @@
+ hcd_context.dma_en = 0;
+
+ hcd_context.int_sdio = 0;
++ hcd_context.int_pending = 0;
+
+ spin_lock_init(&hcd_context.lock);
+
@@ -1534,11 +1553,11 @@
+
+module_init(s3c24xx_hcd_init);
+module_exit(s3c24xx_hcd_exit);
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h 2008-01-09 17:55:24.000000000 +0100
-@@ -0,0 +1,66 @@
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h 2008-01-21 14:29:43.000000000 +0100
+@@ -0,0 +1,67 @@
+#ifndef __SDIO_S3C24XX_HCD_H___
+#define __SDIO_S3C24XX_HCD_H___
+
@@ -1587,6 +1606,7 @@
+
+ UINT32 int_mask;
+ UINT32 int_sdio; /* Do we have SDIO interrupt on ? */
++ UINT32 int_pending;
+
+ UINT32 complete;
+
Modified: developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_sdio_stack.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_sdio_stack.patch 2008-01-21 22:16:35 UTC (rev 3909)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_sdio_stack.patch 2008-01-21 23:47:39 UTC (rev 3910)
@@ -28,10 +28,10 @@
include/linux/sdio/sdlist.h | 141 +
27 files changed, 13745 insertions(+)
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/Makefile
===================================================================
---- linux-2.6.22-atheros-2.0-tmp.orig/drivers/Makefile 2008-01-09 17:38:24.000000000 +0100
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/Makefile 2008-01-09 17:50:11.000000000 +0100
+--- linux-2.6.22-atheros-2.0-work.orig/drivers/Makefile 2008-01-09 17:53:13.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -70,6 +70,7 @@
obj-$(CONFIG_MCA) += mca/
obj-$(CONFIG_EISA) += eisa/
@@ -40,10 +40,10 @@
obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_NEW_LEDS) += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/Kconfig
+Index: linux-2.6.22-atheros-2.0-work/drivers/Kconfig
===================================================================
---- linux-2.6.22-atheros-2.0-tmp.orig/drivers/Kconfig 2008-01-09 17:38:38.000000000 +0100
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/Kconfig 2008-01-09 17:50:11.000000000 +0100
+--- linux-2.6.22-atheros-2.0-work.orig/drivers/Kconfig 2008-01-09 17:53:13.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/Kconfig 2008-01-09 17:55:24.000000000 +0100
@@ -68,6 +68,8 @@
source "drivers/usb/Kconfig"
@@ -53,10 +53,10 @@
source "drivers/mmc/Kconfig"
source "drivers/leds/Kconfig"
-Index: linux-2.6.22-atheros-2.0-tmp/arch/arm/Kconfig
+Index: linux-2.6.22-atheros-2.0-work/arch/arm/Kconfig
===================================================================
---- linux-2.6.22-atheros-2.0-tmp.orig/arch/arm/Kconfig 2008-01-09 17:38:52.000000000 +0100
-+++ linux-2.6.22-atheros-2.0-tmp/arch/arm/Kconfig 2008-01-09 17:50:11.000000000 +0100
+--- linux-2.6.22-atheros-2.0-work.orig/arch/arm/Kconfig 2008-01-09 17:53:13.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/arch/arm/Kconfig 2008-01-09 17:55:24.000000000 +0100
@@ -1030,6 +1030,8 @@
source "drivers/usb/Kconfig"
@@ -66,10 +66,10 @@
source "drivers/mmc/Kconfig"
source "drivers/rtc/Kconfig"
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/Kconfig
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/Kconfig 2008-01-09 17:50:11.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/Kconfig 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,17 @@
+#
+# SDIO driver and host controller support
@@ -88,19 +88,19 @@
+source "drivers/sdio/function/Kconfig"
+
+endmenu
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/Makefile 2008-01-09 17:50:11.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,4 @@
+#Makefile for SDIO stack
+obj-$(CONFIG_SDIO) += stack/
+obj-$(CONFIG_SDIO) += hcd/
+obj-$(CONFIG_SDIO) += function/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/_busdriver.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/_busdriver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/_busdriver.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/_busdriver.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,466 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _busdriver.h
@@ -568,17 +568,17 @@
+ (SDREQ_FLAGS_PSEUDO | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC)
+
+#endif /*___BUSDRIVER_H___*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/Makefile 2008-01-09 17:50:11.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO) += sdio_busdriver.o
+sdio_busdriver-objs := sdio_bus.o sdio_function.o sdio_bus_misc.o sdio_bus_events.o sdio_bus_os.o
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,2120 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus.c
@@ -2700,10 +2700,10 @@
+ @see also: SDLIB_IssueConfig
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus_events.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus_events.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus_events.c 2008-01-21 20:12:35.000000000 +0100
@@ -0,0 +1,1044 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_events.c
@@ -3419,8 +3419,8 @@
+ return status;
+ }
+ if (pHcd->IrqProcState != SDHCD_IDLE) {
-+ DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Already processing interrupts! (state = %d) \n",
-+ pHcd->IrqProcState));
++// DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Already processing interrupts! (state = %d) \n",
++// pHcd->IrqProcState));
+ status = SDIO_STATUS_ERROR;
+ status2 = _ReleaseHcdLock(pHcd);
+ } else {
@@ -3453,8 +3453,8 @@
+ }
+
+ if (pHcd->IrqProcState != SDHCD_IDLE) {
-+ DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Already processing interrupts! (state = %d) \n",
-+ pHcd->IrqProcState));
++// DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Already processing interrupts! (state = %d) \n",
++// pHcd->IrqProcState));
+ status = SDIO_STATUS_ERROR;
+ } else {
+ /* mark that we are processing */
@@ -3749,10 +3749,10 @@
+ }
+
+}
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus_misc.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus_misc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus_misc.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus_misc.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,3122 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_misc.c
@@ -6876,10 +6876,10 @@
+ return status;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus_os.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_bus_os.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_bus_os.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,832 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_os.c
@@ -7713,10 +7713,10 @@
+EXPORT_SYMBOL(SDIO_CheckResponse);
+EXPORT_SYMBOL(SDIO_RegisterFunction);
+EXPORT_SYMBOL(SDIO_UnregisterFunction);
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_function.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_function.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/busdriver/sdio_function.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/busdriver/sdio_function.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,715 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function.c
@@ -8433,17 +8433,17 @@
+ return status;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/Makefile 2008-01-09 17:50:11.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO) += sdio_lib.o
+sdio_lib-objs := sdio_lib_c.o sdio_lib_os.o
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/sdio_lib_c.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/sdio_lib_c.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/sdio_lib_c.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/sdio_lib_c.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,908 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib_c.c
@@ -9353,10 +9353,10 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/_sdio_lib.h
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/_sdio_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/_sdio_lib.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/_sdio_lib.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,50 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _sdio_lib.h
@@ -9408,10 +9408,10 @@
+#define ___SDIO_LIB_H___
+
+#endif /* ___SDIO_LIB_H___*/
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/sdio_lib_os.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/sdio_lib_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/lib/sdio_lib_os.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/lib/sdio_lib_os.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,251 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function_os.c
@@ -9664,25 +9664,25 @@
+EXPORT_SYMBOL(SDLIB_DeleteMessageQueue);
+EXPORT_SYMBOL(SDLIB_PostMessage);
+EXPORT_SYMBOL(SDLIB_GetMessage);
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/Makefile 2008-01-09 17:50:11.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO) += busdriver/ lib/
\ No newline at end of file
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/platform/Makefile
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/platform/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/platform/Makefile 2008-01-09 17:50:11.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/platform/Makefile 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO) += sdio_platform.o
+sdio_platform-objs := sdioplatformdriver.o
\ No newline at end of file
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/platform/sdioplatformdriver.c
+Index: linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/platform/sdioplatformdriver.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/stack/platform/sdioplatformdriver.c 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/drivers/sdio/stack/platform/sdioplatformdriver.c 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,300 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdioplatformdriver.c
@@ -9984,10 +9984,10 @@
+
+
+
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/ctsystem.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/ctsystem.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/ctsystem.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/ctsystem.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,115 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: cpsystem.h
@@ -10104,10 +10104,10 @@
+}
+
+#endif /* __CPSYSTEM_H___ */
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/ctsystem_linux.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/ctsystem_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/ctsystem_linux.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/ctsystem_linux.h 2008-01-18 12:34:47.000000000 +0100
@@ -0,0 +1,983 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: ctsystem_linux.h
@@ -11092,10 +11092,10 @@
+#define CT_BE32_TO_CPU_ENDIAN(x) __be32_to_cpu(x)
+#endif /* __CPSYSTEM_LINUX_H___ */
+
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/mmc_defs.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/mmc_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/mmc_defs.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/mmc_defs.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,103 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: mmc_defs.h
@@ -11200,10 +11200,10 @@
+#define MMC_EXT_BUS_WIDTH_8_BIT 0x02
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdio_busdriver.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdio_busdriver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdio_busdriver.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdio_busdriver.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,1435 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_busdriver.h
@@ -12640,10 +12640,10 @@
+
+#include "sdio_hcd_defs.h"
+#endif /* __SDIO_BUSDRIVER_H___ */
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/_sdio_defs.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/_sdio_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/_sdio_defs.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/_sdio_defs.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,638 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _sdio_defs.h
@@ -13283,10 +13283,10 @@
+}
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdio_hcd_defs.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdio_hcd_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdio_hcd_defs.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdio_hcd_defs.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,219 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_defs.h
@@ -13507,10 +13507,10 @@
+void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
+
+#endif /* __SDIO_BUSDRIVER_H___ */
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdio_lib.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdio_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdio_lib.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdio_lib.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,270 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib.h
@@ -13782,10 +13782,10 @@
+
+
+#endif /* __SDIO_LIB_H___*/
-Index: linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdlist.h
+Index: linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdlist.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/include/linux/sdio/sdlist.h 2008-01-09 17:52:59.000000000 +0100
++++ linux-2.6.22-atheros-2.0-work/include/linux/sdio/sdlist.h 2008-01-09 17:55:24.000000000 +0100
@@ -0,0 +1,141 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdlist.h
More information about the commitlog
mailing list
