r3929 - branches/src/target/kernel/2.6.24.x/patches
werner at sita.openmoko.org
werner at sita.openmoko.org
Wed Jan 23 01:36:56 CET 2008
Author: werner
Date: 2008-01-23 01:36:48 +0100 (Wed, 23 Jan 2008)
New Revision: 3929
Modified:
branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch
branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_sdio_stack.patch
Log:
We have to be more careful about pending SDIO interrupts from the host side.
This patch fixes the iperf bug Nod has been reporting.
Signed-off-by: Samuel Ortiz <sameo at openedhand.com>
[ And does some general housekeeping as well. - Werner ]
Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch 2008-01-22 21:03:36 UTC (rev 3928)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_function.patch 2008-01-23 00:36:48 UTC (rev 3929)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc7/drivers/sdio/function/Kconfig
+Index: linux-2.6.24-rc8/drivers/sdio/function/Kconfig
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/Kconfig
++++ linux-2.6.24-rc8/drivers/sdio/function/Kconfig
@@ -0,0 +1,11 @@
+#menu "SDIO function drivers"
+
@@ -15,27 +15,27 @@
+
+#endmenu
\ No newline at end of file
-Index: linux-2.6.24-rc7/drivers/sdio/function/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/function/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/function/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += wlan/
\ No newline at end of file
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/Makefile
@@ -0,0 +1,4 @@
+#
+# SDIO wlan ar600 card function driver
+#
+obj-$(CONFIG_SDIO_AR6000_WLAN) += ar6000/
\ No newline at end of file
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/Makefile
@@ -0,0 +1,38 @@
+REV ?= 2
+
@@ -75,10 +75,10 @@
+ wlan/wlan_utils.o
+
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
@@ -0,0 +1,3069 @@
+/*
+ *
@@ -3149,10 +3149,10 @@
+ A_UINT32 targReplyArg)
+{
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
@@ -0,0 +1,361 @@
+/*
+ *
@@ -3515,10 +3515,10 @@
+#endif
+
+#endif /* _AR6000_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
@@ -0,0 +1,439 @@
+/*
+ *
@@ -3959,10 +3959,10 @@
+ return length;
+}
+#endif /* HTC_RAW_INTERFACE */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
@@ -0,0 +1,128 @@
+#ifndef _AR6XAPI_LINUX_H
+#define _AR6XAPI_LINUX_H
@@ -4092,10 +4092,10 @@
+#endif
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
@@ -0,0 +1,993 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5090,10 +5090,10 @@
+}
+#endif
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
@@ -0,0 +1,47 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
@@ -5142,10 +5142,10 @@
+
+
+#endif /* _ATHTYPES_LINUX_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -5191,10 +5191,10 @@
+#endif
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5282,10 +5282,10 @@
+#endif
+
+#endif /* _DEBUG_LINUX_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
@@ -0,0 +1,2573 @@
+/*
+ *
@@ -7860,10 +7860,10 @@
+ return ret;
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
@@ -0,0 +1,225 @@
+
+/*
@@ -8090,10 +8090,10 @@
+ return A_OK;
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
@@ -0,0 +1,319 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
@@ -8414,10 +8414,10 @@
+#endif /* __KERNEL__ */
+
+#endif /* _OSAPI_LINUX_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
@@ -0,0 +1,1866 @@
+/*
+ *
@@ -10285,10 +10285,10 @@
+#endif /* __ATH_CENTRAL_IOCTL_DISPATCHER___ */
+
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
@@ -0,0 +1,657 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -10947,10 +10947,10 @@
+
+ return status;
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
@@ -0,0 +1,45 @@
+#ifndef BMI_INTERNAL_H
+#define BMI_INTERNAL_H
@@ -10997,10 +10997,10 @@
+ A_UINT32 length);
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/hif/hif.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/hif/hif.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/hif/hif.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/hif/hif.c
@@ -0,0 +1,818 @@
+/*
+ * @file: hif.c
@@ -11820,10 +11820,10 @@
+
+ return;
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
@@ -0,0 +1,102 @@
+/*
+ * @file: hif_internal.h
@@ -11927,10 +11927,10 @@
+
+void
+delHifDevice(SDDEVICE *handle);
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
@@ -0,0 +1,991 @@
+/*
+ * AR6K device layer that handles register level I/O
@@ -12923,10 +12923,10 @@
+
+
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
@@ -0,0 +1,191 @@
+/*
+ *
@@ -13119,10 +13119,10 @@
+#endif
+
+#endif /*AR6K_H_*/
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
@@ -0,0 +1,638 @@
+/*
+ * AR6K Driver layer event handling (i.e. interrupts, message polling)
@@ -13762,10 +13762,10 @@
+}
+
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc.c
@@ -0,0 +1,507 @@
+/*
+ *
@@ -14274,10 +14274,10 @@
+ return FALSE;
+#endif
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
@@ -0,0 +1,65 @@
+#ifndef HTC_DEBUG_H_
+#define HTC_DEBUG_H_
@@ -14344,10 +14344,10 @@
+void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
+
+#endif /*HTC_DEBUG_H_*/
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
@@ -0,0 +1,168 @@
+/*
+ *
@@ -14517,10 +14517,10 @@
+#endif
+
+#endif /* _HTC_INTERNAL_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
@@ -0,0 +1,703 @@
+/*
+ *
@@ -15225,10 +15225,10 @@
+}
+
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
@@ -0,0 +1,541 @@
+/*
+ *
@@ -15771,10 +15771,10 @@
+ UNLOCK_HTC_TX(target);
+
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
@@ -0,0 +1,403 @@
+/*
+ *
@@ -16179,10 +16179,10 @@
+ }
+
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2006 Atheros Communications Inc.
@@ -16284,10 +16284,10 @@
+#define RD_SIZE (34*4) /* Space for this number of words */
+
+#endif /* __AR6000_REGDUMP_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -16325,10 +16325,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.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -16366,10 +16366,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.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -16518,10 +16518,10 @@
+#endif
+
+#endif /* __AR6KHWREG_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_config.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_config.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_config.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_config.h
@@ -0,0 +1,27 @@
+#ifndef _A_CONFIG_H_
+#define _A_CONFIG_H_
@@ -16550,10 +16550,10 @@
+#include "../ar6000/config_linux.h"
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_debug.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_debug.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_debug.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_debug.h
@@ -0,0 +1,41 @@
+#ifndef _A_DEBUG_H_
+#define _A_DEBUG_H_
@@ -16596,10 +16596,10 @@
+#include "../ar6000/debug_linux.h"
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_drv.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_drv.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_drv.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_drv.h
@@ -0,0 +1,28 @@
+#ifndef _A_DRV_H_
+#define _A_DRV_H_
@@ -16629,10 +16629,10 @@
+#include "../ar6000/athdrv_linux.h"
+
+#endif /* _ADRV_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
@@ -0,0 +1,185 @@
+#ifndef _A_DRV_API_H_
+#define _A_DRV_API_H_
@@ -16819,10 +16819,10 @@
+#endif
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
@@ -0,0 +1,28 @@
+#ifndef _A_OSAPI_H_
+#define _A_OSAPI_H_
@@ -16852,10 +16852,10 @@
+#include "../ar6000/osapi_linux.h"
+
+#endif /* _OSAPI_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_types.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_types.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/a_types.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/a_types.h
@@ -0,0 +1,28 @@
+#ifndef _A_TYPES_H_
+#define _A_TYPES_H_
@@ -16885,10 +16885,10 @@
+#include "../ar6000/athtypes_linux.h"
+
+#endif /* _ATHTYPES_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
@@ -0,0 +1,29 @@
+#ifndef _AR6000_API_H_
+#define _AR6000_API_H_
@@ -16919,10 +16919,10 @@
+
+#endif /* _AR6000_API_H */
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
@@ -0,0 +1,38 @@
+/*
+ *
@@ -16962,10 +16962,10 @@
+ A_UCHAR *data, A_UINT32 length);
+
+#endif /*AR6000_DIAG_H_*/
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athdefs.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athdefs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athdefs.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athdefs.h
@@ -0,0 +1,85 @@
+#ifndef __ATHDEFS_H__
+#define __ATHDEFS_H__
@@ -17052,10 +17052,10 @@
+}WLAN_CAPABILITY;
+
+#endif /* __ATHDEFS_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athdrv.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athdrv.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athdrv.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athdrv.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17089,10 +17089,10 @@
+#endif
+
+#endif /* _ATHDRV_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athendpack.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athendpack.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athendpack.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athendpack.h
@@ -0,0 +1,41 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athendpack.h
@@ -17135,10 +17135,10 @@
+#include "../os/wince/include/athendpack_wince.h"
+#endif /* WINCE */
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
@@ -0,0 +1,42 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athstartpack.h
@@ -17182,10 +17182,10 @@
+#include "../os/wince/include/athstartpack_wince.h"
+#endif /* WINCE */
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/bmi.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/bmi.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/bmi.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/bmi.h
@@ -0,0 +1,100 @@
+#ifndef _BMI_H_
+#define _BMI_H_
@@ -17287,10 +17287,10 @@
+#endif
+
+#endif /* _BMI_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
@@ -0,0 +1,199 @@
+#ifndef __BMI_MSG_H__
+#define __BMI_MSG_H__
@@ -17491,10 +17491,10 @@
+
+
+#endif /* __BMI_MSG_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/common_drv.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/common_drv.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/common_drv.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/common_drv.h
@@ -0,0 +1,61 @@
+/*
+ *
@@ -17557,10 +17557,10 @@
+#endif
+
+#endif /*COMMON_DRV_H_*/
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dbglog.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dbglog.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dbglog.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dbglog.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -17669,10 +17669,10 @@
+#endif
+
+#endif /* _DBGLOG_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
@@ -0,0 +1,46 @@
+#ifndef _DBGLOG_API_H_
+#define _DBGLOG_API_H_
@@ -17720,10 +17720,10 @@
+#endif
+
+#endif /* _DBGLOG_API_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
@@ -0,0 +1,307 @@
+/*
+ *
@@ -18032,10 +18032,10 @@
+#endif
+
+#endif /* _DBGLOG_ID_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dl_list.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dl_list.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dl_list.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dl_list.h
@@ -0,0 +1,114 @@
+/*
+ *
@@ -18151,10 +18151,10 @@
+}
+
+#endif /* __DL_LIST_H___ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dset_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dset_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dset_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dset_api.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18219,10 +18219,10 @@
+
+
+#endif /* _DSET_API_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -18263,10 +18263,10 @@
+} dset_descriptor_t;
+
+#endif /* __DSET_INTERNAL_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dsetid.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dsetid.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/dsetid.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/dsetid.h
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18378,10 +18378,10 @@
+#define DSETID_BPATCH_FLAG 0x80000000
+
+#endif /* __DSETID_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/gpio.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/gpio.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/gpio.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/gpio.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2005 Atheros Communications Inc.
@@ -18417,10 +18417,10 @@
+
+#define GPIO_LAST_REGISTER_ID GPIO_ID_PIN(17)
+#define GPIO_ID_NONE 0xffffffff
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
@@ -0,0 +1,57 @@
+#ifndef _GPIO_API_H_
+#define _GPIO_API_H_
@@ -18479,10 +18479,10 @@
+A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
+
+#endif /* _GPIO_API_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/hif.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/hif.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/hif.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/hif.h
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18775,10 +18775,10 @@
+#endif
+
+#endif /* _HIF_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/host_version.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/host_version.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/host_version.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/host_version.h
@@ -0,0 +1,49 @@
+#ifndef _HOST_VERSION_H_
+#define _HOST_VERSION_H_
@@ -18829,10 +18829,10 @@
+#endif
+
+#endif /* _HOST_VERSION_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc.h
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -19024,10 +19024,10 @@
+
+#endif /* __HTC_H__ */
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc_api.h
@@ -0,0 +1,436 @@
+/*
+ *
@@ -19465,10 +19465,10 @@
+#endif
+
+#endif /* _HTC_API_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
@@ -0,0 +1,138 @@
+/*
+ *
@@ -19608,10 +19608,10 @@
+}
+
+#endif /*HTC_PACKET_H_*/
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc_services.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc_services.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/htc_services.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/htc_services.h
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -19650,10 +19650,10 @@
+#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
+
+#endif /*HTC_SERVICES_H_*/
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
@@ -0,0 +1,342 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -19997,10 +19997,10 @@
+#include "athendpack.h"
+
+#endif /* _NET80211_IEEE80211_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20165,10 +20165,10 @@
+#endif
+
+#endif /* _IEEE80211_IOCTL_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
@@ -0,0 +1,77 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -20247,10 +20247,10 @@
+#define WLAN_NODE_INACT_TIMEOUT_MSEC 10000
+
+#endif /* _IEEE80211_NODE_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20292,10 +20292,10 @@
+} POSTPACK INI_DSET_REG_OVERRIDE;
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/regDb.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/regDb.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/regDb.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/regDb.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2005 Atheros Communications, Inc.
@@ -20316,10 +20316,10 @@
+#include "./regulatory/reg_dbvalues.h"
+
+#endif /* __REG_DB_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/regdump.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/regdump.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/regdump.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/regdump.h
@@ -0,0 +1,33 @@
+#ifndef __REGDUMP_H__
+#define __REGDUMP_H__
@@ -20354,10 +20354,10 @@
+};
+#endif /* __ASSEMBLER__ */
+#endif /* __REGDUMP_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20517,10 +20517,10 @@
+#endif /* !__ASSEMBLER__ */
+
+#endif /* __TARGADDRS_H__ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/testcmd.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/testcmd.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/testcmd.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/testcmd.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20666,10 +20666,10 @@
+#endif
+
+#endif /* TESTCMD_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
@@ -0,0 +1,101 @@
+#ifndef _HOST_WLAN_API_H_
+#define _HOST_WLAN_API_H_
@@ -20772,10 +20772,10 @@
+#endif
+
+#endif /* _HOST_WLAN_API_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2007 Atheros Communications, Inc.
@@ -20797,10 +20797,10 @@
+} POSTPACK WOW_CONFIG_DSET;
+
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wmi.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wmi.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wmi.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wmi.h
@@ -0,0 +1,1739 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -21907,7 +21907,7 @@
+ A_UINT8 snr;
+ A_INT16 rssi;
+ A_UINT8 bssid[ATH_MAC_LEN];
-+// A_UINT32 ieMask;
++ A_UINT32 ieMask;
+} POSTPACK WMI_BSS_INFO_HDR;
+
+/*
@@ -22541,10 +22541,10 @@
+#endif
+
+#endif /* _WMI_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
@@ -0,0 +1,259 @@
+#ifndef _WMI_API_H_
+#define _WMI_API_H_
@@ -22805,10 +22805,10 @@
+#endif
+
+#endif /* _WMI_API_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wmix.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wmix.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/include/wmix.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/include/wmix.h
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -23043,10 +23043,10 @@
+#endif
+
+#endif /* _WMIX_H_ */
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
@@ -0,0 +1,467 @@
+
+/*
@@ -23515,10 +23515,10 @@
+
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
@@ -0,0 +1,346 @@
+
+/*
@@ -23866,10 +23866,10 @@
+ return A_OK;
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
@@ -0,0 +1,371 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -24242,10 +24242,10 @@
+ wlan_node_dec_free (ni);
+ IEEE80211_NODE_UNLOCK (nt);
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -24439,10 +24439,10 @@
+
+ return A_OK;
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -24503,10 +24503,10 @@
+ return 15 + ((freq - 2512) / 20);
+ return (freq - 5000) / 5;
+}
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
@@ -0,0 +1,3921 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -28429,10 +28429,10 @@
+ NO_SYNC_WMIFLAG));
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
@@ -0,0 +1,4421 @@
+/*
+ *
@@ -32855,10 +32855,10 @@
+
+=====================================================================
+#endif
-Index: linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
+Index: linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
++++ linux-2.6.24-rc8/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
@@ -0,0 +1,71 @@
+#ifndef _WMI_HOST_H_
+#define _WMI_HOST_H_
Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch 2008-01-22 21:03:36 UTC (rev 3928)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_hcd.patch 2008-01-23 00:36:48 UTC (rev 3929)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc7/drivers/sdio/hcd/Kconfig
+Index: linux-2.6.24-rc8/drivers/sdio/hcd/Kconfig
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/hcd/Kconfig
++++ linux-2.6.24-rc8/drivers/sdio/hcd/Kconfig
@@ -0,0 +1,14 @@
+config SDIO_S3C24XX
+ tristate "Samsung s3c24xx host controller"
@@ -17,24 +17,24 @@
+ help
+ good luck.
+
-Index: linux-2.6.24-rc7/drivers/sdio/hcd/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/hcd/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/hcd/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/hcd/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_PLAT_S3C24XX) += s3c24xx/
-Index: linux-2.6.24-rc7/drivers/sdio/hcd/s3c24xx/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/hcd/s3c24xx/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/hcd/s3c24xx/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/hcd/s3c24xx/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_PLAT_S3C24XX) += sdio_s3c24xx_hcd.o
+sdio_s3c24xx_hcd-objs := s3c24xx_hcd.o
-Index: linux-2.6.24-rc7/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+Index: linux-2.6.24-rc8/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
-@@ -0,0 +1,1491 @@
++++ linux-2.6.24-rc8/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+@@ -0,0 +1,1500 @@
+/*
+ * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
+ *
@@ -600,14 +600,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;
+ }
+
@@ -652,12 +648,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 {
@@ -667,16 +663,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);
+}
+
@@ -784,9 +776,19 @@
+ 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);
@@ -824,8 +826,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);
+
@@ -941,6 +943,12 @@
+ 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;
@@ -988,8 +996,6 @@
+ struct s3c24xx_hcd_context * context =
+ (struct s3c24xx_hcd_context *)hcd->pContext;
+
-+// dump_request(context);
-+
+ req = GET_CURRENT_REQUEST(hcd);
+ DBG_ASSERT(req != NULL);
+
@@ -1005,7 +1011,6 @@
+
+ /* Enabling irqs */
+ imask = S3C2410_SDIIMSK_READWAIT;
-+// imask = S3C2410_SDIIMSK_READWAIT | S3C2410_SDIIMSK_SDIOIRQ;
+
+ cmdcon = readl(context->base + S3C2410_SDICMDCON);
+
@@ -1060,10 +1065,10 @@
+ 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);
+ } else if (!(req->DataRemaining % 2)) {
+ context->data_size = 2;
+ dcon |= S3C2440_SDIDCON_DS_HALFWORD;
@@ -1073,12 +1078,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;
@@ -1361,6 +1369,7 @@
+ hcd_context.dma_en = 0;
+
+ hcd_context.int_sdio = 0;
++ hcd_context.int_pending = 0;
+
+ spin_lock_init(&hcd_context.lock);
+
@@ -1526,11 +1535,11 @@
+
+module_init(s3c24xx_hcd_init);
+module_exit(s3c24xx_hcd_exit);
-Index: linux-2.6.24-rc7/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
+Index: linux-2.6.24-rc8/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
-@@ -0,0 +1,66 @@
++++ linux-2.6.24-rc8/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
+@@ -0,0 +1,67 @@
+#ifndef __SDIO_S3C24XX_HCD_H___
+#define __SDIO_S3C24XX_HCD_H___
+
@@ -1579,6 +1588,7 @@
+
+ UINT32 int_mask;
+ UINT32 int_sdio; /* Do we have SDIO interrupt on ? */
++ UINT32 int_pending;
+
+ UINT32 complete;
+
Modified: branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_sdio_stack.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_sdio_stack.patch 2008-01-22 21:03:36 UTC (rev 3928)
+++ branches/src/target/kernel/2.6.24.x/patches/atheros_2_0_sdio_stack.patch 2008-01-23 00:36:48 UTC (rev 3929)
@@ -1,7 +1,7 @@
-Index: linux-2.6.24-rc7/arch/arm/Kconfig
+Index: linux-2.6.24-rc8/arch/arm/Kconfig
===================================================================
---- linux-2.6.24-rc7.orig/arch/arm/Kconfig
-+++ linux-2.6.24-rc7/arch/arm/Kconfig
+--- linux-2.6.24-rc8.orig/arch/arm/Kconfig
++++ linux-2.6.24-rc8/arch/arm/Kconfig
@@ -1064,6 +1064,8 @@
source "drivers/usb/Kconfig"
@@ -11,10 +11,10 @@
source "drivers/mmc/Kconfig"
source "drivers/leds/Kconfig"
-Index: linux-2.6.24-rc7/drivers/Kconfig
+Index: linux-2.6.24-rc8/drivers/Kconfig
===================================================================
---- linux-2.6.24-rc7.orig/drivers/Kconfig
-+++ linux-2.6.24-rc7/drivers/Kconfig
+--- linux-2.6.24-rc8.orig/drivers/Kconfig
++++ linux-2.6.24-rc8/drivers/Kconfig
@@ -74,6 +74,8 @@
source "drivers/usb/Kconfig"
@@ -24,10 +24,10 @@
source "drivers/mmc/Kconfig"
source "drivers/leds/Kconfig"
-Index: linux-2.6.24-rc7/drivers/Makefile
+Index: linux-2.6.24-rc8/drivers/Makefile
===================================================================
---- linux-2.6.24-rc7.orig/drivers/Makefile
-+++ linux-2.6.24-rc7/drivers/Makefile
+--- linux-2.6.24-rc8.orig/drivers/Makefile
++++ linux-2.6.24-rc8/drivers/Makefile
@@ -77,6 +77,7 @@
obj-$(CONFIG_CPU_FREQ) += cpufreq/
obj-$(CONFIG_CPU_IDLE) += cpuidle/
@@ -36,10 +36,10 @@
obj-$(CONFIG_NEW_LEDS) += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
obj-$(CONFIG_SGI_SN) += sn/
-Index: linux-2.6.24-rc7/drivers/sdio/Kconfig
+Index: linux-2.6.24-rc8/drivers/sdio/Kconfig
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/Kconfig
++++ linux-2.6.24-rc8/drivers/sdio/Kconfig
@@ -0,0 +1,17 @@
+#
+# SDIO driver and host controller support
@@ -58,33 +58,33 @@
+source "drivers/sdio/function/Kconfig"
+
+endmenu
-Index: linux-2.6.24-rc7/drivers/sdio/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/Makefile
@@ -0,0 +1,4 @@
+#Makefile for SDIO stack
+obj-$(CONFIG_SDIO) += stack/
+obj-$(CONFIG_SDIO) += hcd/
+obj-$(CONFIG_SDIO) += function/
-Index: linux-2.6.24-rc7/drivers/sdio/stack/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/stack/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/stack/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO) += busdriver/ lib/
\ No newline at end of file
-Index: linux-2.6.24-rc7/drivers/sdio/stack/busdriver/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/Makefile
@@ -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.24-rc7/drivers/sdio/stack/busdriver/_busdriver.h
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/_busdriver.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/_busdriver.h
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/_busdriver.h
@@ -0,0 +1,466 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _busdriver.h
@@ -552,10 +552,10 @@
+ (SDREQ_FLAGS_PSEUDO | SDREQ_FLAGS_BARRIER | SDREQ_FLAGS_TRANS_ASYNC)
+
+#endif /*___BUSDRIVER_H___*/
-Index: linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus.c
@@ -0,0 +1,2120 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus.c
@@ -2677,11 +2677,11 @@
+ @see also: SDLIB_IssueConfig
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
-Index: linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus_events.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus_events.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus_events.c
-@@ -0,0 +1,1044 @@
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus_events.c
+@@ -0,0 +1,1040 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_events.c
+
@@ -3396,8 +3396,6 @@
+ return status;
+ }
+ if (pHcd->IrqProcState != SDHCD_IDLE) {
-+ DBG_PRINT(SDDBG_ERROR, ("-SDIO Bus Driver: Already processing interrupts! (state = %d) \n",
-+ pHcd->IrqProcState));
+ status = SDIO_STATUS_ERROR;
+ status2 = _ReleaseHcdLock(pHcd);
+ } else {
@@ -3430,8 +3428,6 @@
+ }
+
+ if (pHcd->IrqProcState != SDHCD_IDLE) {
-+ 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 */
@@ -3726,10 +3722,10 @@
+ }
+
+}
-Index: linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus_misc.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus_misc.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus_misc.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus_misc.c
@@ -0,0 +1,3122 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_misc.c
@@ -6853,10 +6849,10 @@
+ return status;
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus_os.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus_os.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_bus_os.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_bus_os.c
@@ -0,0 +1,832 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_os.c
@@ -7690,10 +7686,10 @@
+EXPORT_SYMBOL(SDIO_CheckResponse);
+EXPORT_SYMBOL(SDIO_RegisterFunction);
+EXPORT_SYMBOL(SDIO_UnregisterFunction);
-Index: linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_function.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_function.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/busdriver/sdio_function.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/busdriver/sdio_function.c
@@ -0,0 +1,715 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function.c
@@ -8410,17 +8406,17 @@
+ return status;
+}
+
-Index: linux-2.6.24-rc7/drivers/sdio/stack/lib/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/stack/lib/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/lib/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/stack/lib/Makefile
@@ -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.24-rc7/drivers/sdio/stack/lib/_sdio_lib.h
+Index: linux-2.6.24-rc8/drivers/sdio/stack/lib/_sdio_lib.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/lib/_sdio_lib.h
++++ linux-2.6.24-rc8/drivers/sdio/stack/lib/_sdio_lib.h
@@ -0,0 +1,50 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _sdio_lib.h
@@ -8472,10 +8468,10 @@
+#define ___SDIO_LIB_H___
+
+#endif /* ___SDIO_LIB_H___*/
-Index: linux-2.6.24-rc7/drivers/sdio/stack/lib/sdio_lib_c.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/lib/sdio_lib_c.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/lib/sdio_lib_c.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/lib/sdio_lib_c.c
@@ -0,0 +1,908 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib_c.c
@@ -9385,10 +9381,10 @@
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
+
+
-Index: linux-2.6.24-rc7/drivers/sdio/stack/lib/sdio_lib_os.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/lib/sdio_lib_os.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/lib/sdio_lib_os.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/lib/sdio_lib_os.c
@@ -0,0 +1,251 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function_os.c
@@ -9641,18 +9637,18 @@
+EXPORT_SYMBOL(SDLIB_DeleteMessageQueue);
+EXPORT_SYMBOL(SDLIB_PostMessage);
+EXPORT_SYMBOL(SDLIB_GetMessage);
-Index: linux-2.6.24-rc7/drivers/sdio/stack/platform/Makefile
+Index: linux-2.6.24-rc8/drivers/sdio/stack/platform/Makefile
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/platform/Makefile
++++ linux-2.6.24-rc8/drivers/sdio/stack/platform/Makefile
@@ -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.24-rc7/drivers/sdio/stack/platform/sdioplatformdriver.c
+Index: linux-2.6.24-rc8/drivers/sdio/stack/platform/sdioplatformdriver.c
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/drivers/sdio/stack/platform/sdioplatformdriver.c
++++ linux-2.6.24-rc8/drivers/sdio/stack/platform/sdioplatformdriver.c
@@ -0,0 +1,300 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdioplatformdriver.c
@@ -9954,10 +9950,10 @@
+
+
+
-Index: linux-2.6.24-rc7/include/linux/sdio/_sdio_defs.h
+Index: linux-2.6.24-rc8/include/linux/sdio/_sdio_defs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/_sdio_defs.h
++++ linux-2.6.24-rc8/include/linux/sdio/_sdio_defs.h
@@ -0,0 +1,638 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _sdio_defs.h
@@ -10597,10 +10593,10 @@
+}
+
+#endif
-Index: linux-2.6.24-rc7/include/linux/sdio/ctsystem.h
+Index: linux-2.6.24-rc8/include/linux/sdio/ctsystem.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/ctsystem.h
++++ linux-2.6.24-rc8/include/linux/sdio/ctsystem.h
@@ -0,0 +1,115 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: cpsystem.h
@@ -10717,10 +10713,10 @@
+}
+
+#endif /* __CPSYSTEM_H___ */
-Index: linux-2.6.24-rc7/include/linux/sdio/ctsystem_linux.h
+Index: linux-2.6.24-rc8/include/linux/sdio/ctsystem_linux.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/ctsystem_linux.h
++++ linux-2.6.24-rc8/include/linux/sdio/ctsystem_linux.h
@@ -0,0 +1,983 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: ctsystem_linux.h
@@ -11705,10 +11701,10 @@
+#define CT_BE32_TO_CPU_ENDIAN(x) __be32_to_cpu(x)
+#endif /* __CPSYSTEM_LINUX_H___ */
+
-Index: linux-2.6.24-rc7/include/linux/sdio/mmc_defs.h
+Index: linux-2.6.24-rc8/include/linux/sdio/mmc_defs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/mmc_defs.h
++++ linux-2.6.24-rc8/include/linux/sdio/mmc_defs.h
@@ -0,0 +1,103 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: mmc_defs.h
@@ -11813,10 +11809,10 @@
+#define MMC_EXT_BUS_WIDTH_8_BIT 0x02
+
+#endif
-Index: linux-2.6.24-rc7/include/linux/sdio/sdio_busdriver.h
+Index: linux-2.6.24-rc8/include/linux/sdio/sdio_busdriver.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/sdio_busdriver.h
++++ linux-2.6.24-rc8/include/linux/sdio/sdio_busdriver.h
@@ -0,0 +1,1435 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_busdriver.h
@@ -13253,10 +13249,10 @@
+
+#include "sdio_hcd_defs.h"
+#endif /* __SDIO_BUSDRIVER_H___ */
-Index: linux-2.6.24-rc7/include/linux/sdio/sdio_hcd_defs.h
+Index: linux-2.6.24-rc8/include/linux/sdio/sdio_hcd_defs.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/sdio_hcd_defs.h
++++ linux-2.6.24-rc8/include/linux/sdio/sdio_hcd_defs.h
@@ -0,0 +1,219 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_defs.h
@@ -13477,10 +13473,10 @@
+void SDIO_BusRemoveOSDevice(POS_PNPDRIVER pDriver, POS_PNPDEVICE pDevice);
+
+#endif /* __SDIO_BUSDRIVER_H___ */
-Index: linux-2.6.24-rc7/include/linux/sdio/sdio_lib.h
+Index: linux-2.6.24-rc8/include/linux/sdio/sdio_lib.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/sdio_lib.h
++++ linux-2.6.24-rc8/include/linux/sdio/sdio_lib.h
@@ -0,0 +1,270 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib.h
@@ -13752,10 +13748,10 @@
+
+
+#endif /* __SDIO_LIB_H___*/
-Index: linux-2.6.24-rc7/include/linux/sdio/sdlist.h
+Index: linux-2.6.24-rc8/include/linux/sdio/sdlist.h
===================================================================
--- /dev/null
-+++ linux-2.6.24-rc7/include/linux/sdio/sdlist.h
++++ linux-2.6.24-rc8/include/linux/sdio/sdlist.h
@@ -0,0 +1,141 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdlist.h
More information about the commitlog
mailing list