r3533 - developers/sameo/patches/ar6k-atheros
sameo at sita.openmoko.org
sameo at sita.openmoko.org
Thu Nov 29 20:59:11 CET 2007
Author: sameo
Date: 2007-11-29 20:59:06 +0100 (Thu, 29 Nov 2007)
New Revision: 3533
Modified:
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch
developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch
developers/sameo/patches/ar6k-atheros/pnp_fixes_2.6.22.5.patch
developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch
Log:
ar6k-atheros: First usable 802.11 driver for GTA02
We can now associate, scan, and send/receive TCP/IP frames.
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch 2007-11-29 17:29:33 UTC (rev 3532)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack.patch 2007-11-29 19:59:06 UTC (rev 3533)
@@ -60,7 +60,7 @@
Index: linux-2.6.22/include/linux/sdio/_sdio_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/_sdio_defs.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/_sdio_defs.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,632 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _sdio_defs.h
@@ -697,7 +697,7 @@
Index: linux-2.6.22/include/linux/sdio/ctsystem.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/ctsystem.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/ctsystem.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,110 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: cpsystem.h
@@ -812,7 +812,7 @@
Index: linux-2.6.22/include/linux/sdio/ctsystem_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/ctsystem_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/ctsystem_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,959 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: ctsystem_linux.h
@@ -1776,7 +1776,7 @@
Index: linux-2.6.22/include/linux/sdio/mmc_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/mmc_defs.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/mmc_defs.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,99 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: mmc_defs.h
@@ -1880,7 +1880,7 @@
Index: linux-2.6.22/include/linux/sdio/sdio_busdriver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdio_busdriver.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdio_busdriver.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1431 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_busdriver.h
@@ -3315,8 +3315,8 @@
+#endif /* __SDIO_BUSDRIVER_H___ */
Index: linux-2.6.22/drivers/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/Kconfig 2007-11-27 17:13:46.000000000 +0100
-+++ linux-2.6.22/drivers/Kconfig 2007-11-27 17:16:52.000000000 +0100
+--- linux-2.6.22.orig/drivers/Kconfig 2007-11-28 16:37:55.000000000 +0100
++++ linux-2.6.22/drivers/Kconfig 2007-11-28 16:38:00.000000000 +0100
@@ -68,6 +68,8 @@
source "drivers/usb/Kconfig"
@@ -3329,7 +3329,7 @@
Index: linux-2.6.22/drivers/sdio/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/Kconfig 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/Kconfig 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,18 @@
+#
+# SDIO driver and host controller support
@@ -3352,7 +3352,7 @@
Index: linux-2.6.22/drivers/sdio/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,6 @@
+#Makefile for SDIO stack
+obj-$(CONFIG_SDIO) += lib/
@@ -3363,7 +3363,7 @@
Index: linux-2.6.22/drivers/sdio/lib/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/lib/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/lib/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,6 @@
+#
+# SDIO stack library Makefile
@@ -3374,7 +3374,7 @@
Index: linux-2.6.22/drivers/sdio/lib/sdio_lib_c.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/lib/sdio_lib_c.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/lib/sdio_lib_c.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,903 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib_c.c
@@ -4282,7 +4282,7 @@
Index: linux-2.6.22/drivers/sdio/lib/sdio_lib_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/lib/sdio_lib_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/lib/sdio_lib_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,254 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function_os.c
@@ -4541,7 +4541,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO stack bus drivers
@@ -4553,7 +4553,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/_busdriver.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/_busdriver.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/_busdriver.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,462 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: _busdriver.h
@@ -5020,7 +5020,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,2119 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus.c
@@ -7144,7 +7144,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_events.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_events.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1073 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_events.c
@@ -8222,7 +8222,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus_misc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_misc.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_misc.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,3192 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_misc.c
@@ -11419,7 +11419,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_bus_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_bus_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,807 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bus_os.c
@@ -12231,7 +12231,7 @@
Index: linux-2.6.22/drivers/sdio/busdriver/sdio_function.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/busdriver/sdio_function.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/busdriver/sdio_function.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,713 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_function.c
@@ -12949,7 +12949,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-28 16:37:29.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-29 20:54:03.000000000 +0100
@@ -0,0 +1,56 @@
+#
+#
@@ -13010,7 +13010,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-28 16:37:29.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-29 20:54:03.000000000 +0100
@@ -0,0 +1,8 @@
+# SDIO stack host controller Makefile
+obj-$(CONFIG_SDIO_STDHCD) += stdhost/
@@ -13023,7 +13023,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO pci_ellen host controller makefile
@@ -13035,7 +13035,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1238 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -14278,7 +14278,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,185 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -14468,7 +14468,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_hcd_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,781 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -15254,7 +15254,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_pciellen_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_pciellen_hcd.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_ellen/sdio_pciellen_hcd.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,253 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pciellen_hcd.h
@@ -15512,7 +15512,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO mx21 host controller makefile
@@ -15524,7 +15524,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1286 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_mx21c
@@ -16815,7 +16815,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,210 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_mx21.h
@@ -17030,7 +17030,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,105 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_mx21_linux.h
@@ -17140,7 +17140,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/mx21/sdio_mx21_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,435 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -17580,7 +17580,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,3 @@
+# SDIO omap host controller makefile
+sdio_omap_hcd-objs := sdio_hcd_os.o sdio_hcd_os_2_6.o
@@ -17588,7 +17588,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1337 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -18930,7 +18930,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,165 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -19100,7 +19100,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_os_2_6.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_os_2_6.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_hcd_os_2_6.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,574 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os_2_6.c
@@ -19679,7 +19679,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap/sdio_omap_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_omap_hcd.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap/sdio_omap_hcd.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,372 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pmap_hcd.h
@@ -20056,7 +20056,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,3 @@
+# SDIO omap host controller makefile
+obj-m += sdio_omap_hcd.o
@@ -20064,7 +20064,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1363 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -21432,7 +21432,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,147 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -21584,7 +21584,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,608 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -22197,7 +22197,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os_2_6.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os_2_6.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_hcd_os_2_6.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,731 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os_2_6.c
@@ -22933,7 +22933,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_omap_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_omap_hcd.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/omap_2420/sdio_omap_hcd.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,370 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pmap_hcd.h
@@ -23308,7 +23308,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO pxa255 host controller
@@ -23318,7 +23318,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,914 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -24237,7 +24237,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,136 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -24378,7 +24378,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_hcd_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,589 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -24972,7 +24972,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_pxa255hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_pxa255hcd.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa255/sdio_pxa255hcd.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,227 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pxa255hcd.h
@@ -25204,7 +25204,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO pxa270 host controller
@@ -25214,7 +25214,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1087 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd.c
@@ -26306,7 +26306,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,150 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_linux.h
@@ -26461,7 +26461,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_hcd_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1084 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -27550,7 +27550,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_pxa270hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_pxa270hcd.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pxa270/sdio_pxa270hcd.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,273 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_pxa270hcd.h
@@ -27827,8 +27827,8 @@
+#endif /* __SDIO_PXA255HCD_H___ */
Index: linux-2.6.22/drivers/Makefile
===================================================================
---- linux-2.6.22.orig/drivers/Makefile 2007-11-27 17:13:46.000000000 +0100
-+++ linux-2.6.22/drivers/Makefile 2007-11-27 17:16:52.000000000 +0100
+--- linux-2.6.22.orig/drivers/Makefile 2007-11-28 16:37:55.000000000 +0100
++++ linux-2.6.22/drivers/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -71,6 +71,7 @@
obj-$(CONFIG_EISA) += eisa/
obj-$(CONFIG_CPU_FREQ) += cpufreq/
@@ -27840,7 +27840,7 @@
Index: linux-2.6.22/include/linux/sdio/sdlist.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdlist.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdlist.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,137 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdlist.h
@@ -27982,7 +27982,7 @@
Index: linux-2.6.22/include/linux/sdio/sdio_hcd_defs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdio_hcd_defs.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdio_hcd_defs.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,215 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_defs.h
@@ -28202,7 +28202,7 @@
Index: linux-2.6.22/include/linux/sdio/sdio_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/include/linux/sdio/sdio_lib.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/include/linux/sdio/sdio_lib.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,262 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_lib.h
@@ -28468,8 +28468,8 @@
+#endif /* __SDIO_LIB_H___*/
Index: linux-2.6.22/arch/arm/Kconfig
===================================================================
---- linux-2.6.22.orig/arch/arm/Kconfig 2007-11-27 17:13:46.000000000 +0100
-+++ linux-2.6.22/arch/arm/Kconfig 2007-11-27 17:16:52.000000000 +0100
+--- linux-2.6.22.orig/arch/arm/Kconfig 2007-11-28 16:37:55.000000000 +0100
++++ linux-2.6.22/arch/arm/Kconfig 2007-11-28 16:38:00.000000000 +0100
@@ -971,6 +971,8 @@
source "drivers/pnp/Kconfig"
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch 2007-11-29 17:29:33 UTC (rev 3532)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_ar6000_wlan.patch 2007-11-29 19:59:06 UTC (rev 3533)
@@ -58,13 +58,13 @@
drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c | 285
drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c | 169
drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c | 56
- drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 2879 ++++
- 60 files changed, 23217 insertions(+), 7 deletions(-)
+ drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 2881 ++++
+ 60 files changed, 23219 insertions(+), 7 deletions(-)
Index: linux-2.6.22/drivers/sdio/function/wlan/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,4 @@
+#
+# SDIO wlan ar600 card function driver
@@ -73,7 +73,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,29 @@
+#
+# AR6K Kernel Module makefile.
@@ -107,7 +107,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/bmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/bmi.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/bmi.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -188,7 +188,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -326,7 +326,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -415,7 +415,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdrv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,598 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1018,7 +1018,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athtypes.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athtypes.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athtypes.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2003-2006 Atheros Communications, Inc.
@@ -1066,7 +1066,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,333 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -1404,7 +1404,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1529,7 +1529,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2001 Atsushi Onoe
@@ -1608,7 +1608,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2003-2006 Atheros Communications, Inc.
@@ -1780,7 +1780,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_host.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_host.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_host.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1860,7 +1860,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -1896,7 +1896,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,664 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -2565,7 +2565,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -3003,7 +3003,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_events.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_events.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1056 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -4064,7 +4064,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,464 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -4533,7 +4533,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,211 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -4749,7 +4749,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,395 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5149,7 +5149,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_utils.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_utils.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/htc_utils.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,375 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5529,7 +5529,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/dset_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2005-2006 Atheros Communications, Inc.
@@ -5583,7 +5583,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2005-2006 Atheros Communications, Inc.
@@ -5652,7 +5652,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hif.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hif.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hif.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5864,7 +5864,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/host_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/host_version.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/host_version.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5917,7 +5917,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/htc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/htc.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/htc.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2006 Atheros Communications, Inc.
@@ -6042,7 +6042,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/osapi.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2003-2006 Atheros Communications, Inc.
@@ -6110,7 +6110,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/queue.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/queue.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/queue.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,552 @@
+/*
+ * Copyright (c) 1991, 1993
@@ -6667,7 +6667,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -6762,7 +6762,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -6940,7 +6940,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2001 Atsushi Onoe
@@ -7230,7 +7230,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -7291,8 +7291,8 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2007-11-27 17:16:52.000000000 +0100
-@@ -0,0 +1,2879 @@
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2007-11-29 19:03:09.000000000 +0100
+@@ -0,0 +1,2881 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
+ *
@@ -8080,6 +8080,8 @@
+
+ A_MEMZERO(wmip->wmi_bssid, sizeof(wmip->wmi_bssid));
+
++ printk("%s(): Reason is %d, len is %d\n", __FUNCTION__, ev->disconnectReason, ev->assocRespLen);
++
+ ar6000_disconnect_event(wmip->wmi_devt, ev->disconnectReason, ev->bssid,
+ ev->assocRespLen, ev->assocInfo);
+
@@ -8615,8 +8617,8 @@
+ cc->networkType = netType;
+ cc->dot11AuthMode = dot11AuthMode;
+ cc->authMode = authMode;
-+// cc->pairwiseCryptoType = pairwiseCrypto;
-+// cc->pairwiseCryptoLen = pairwiseCryptoLen;
++ cc->pairwiseCryptoType = pairwiseCrypto;
++ cc->pairwiseCryptoLen = pairwiseCryptoLen;
+ cc->groupCryptoType = groupCrypto;
+ cc->groupCryptoLen = groupCryptoLen;
+ cc->channel = channel;
@@ -10175,7 +10177,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2007-11-28 16:25:23.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5850 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -16030,7 +16032,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,473 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -16508,14 +16510,14 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += hif.o
+
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,11 @@
+#
+# hif for compact flash
@@ -16531,7 +16533,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1001 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17537,7 +17539,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17652,7 +17654,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs_internal.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/ar6000_cs_internal.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17719,7 +17721,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,390 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18114,7 +18116,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif_internal.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/cf/hif_internal.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18197,13 +18199,13 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/bmi/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += bmi.o
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18293,7 +18295,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/htc/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO ar6000 wlan htc function driver
@@ -18303,14 +18305,14 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += wlan_node.o wlan_recv_beacon.o wlan_utils.o
+
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,169 @@
+/*
+ * Copyright (c) 2001 Atsushi Onoe
@@ -18484,7 +18486,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_reg.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_reg.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,550 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -19039,7 +19041,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mc_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mc_reg.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mc_reg.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1129 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -20173,7 +20175,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/rtc_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/rtc_reg.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/rtc_reg.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1204 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -21382,7 +21384,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdefs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,82 @@
+
+#ifndef __ATHDEFS_H__
@@ -21469,7 +21471,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_host_reg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_host_reg.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/hw/mbox_host_reg.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,416 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -21890,7 +21892,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_bmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_bmi.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_bmi.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -22031,7 +22033,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_version.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_version.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2006 Atheros Communications, Inc.
@@ -22082,7 +22084,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_gpio.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_gpio.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/AR6000_gpio.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2005-2006 Atheros Communications, Inc.
@@ -22126,7 +22128,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/app/dset.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/app/dset.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/app/dset.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,77 @@
+#ifndef _DSET_H_
+#define _DSET_H_
@@ -22208,7 +22210,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmi.h 2007-11-29 15:54:17.000000000 +0100
@@ -0,0 +1,1150 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -22400,8 +22402,8 @@
+ A_UINT8 networkType;
+ A_UINT8 dot11AuthMode;
+ A_UINT8 authMode;
-+ A_UINT8 pairwiseCryptoType;
-+ A_UINT8 pairwiseCryptoLen;
++ A_UINT8 pairwiseCryptoType;
++ A_UINT8 pairwiseCryptoLen;
+ A_UINT8 groupCryptoType;
+ A_UINT8 groupCryptoLen;
+ A_UINT8 ssidLength;
@@ -23363,7 +23365,7 @@
Index: linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmix.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmix.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/wlan/ar6000/include/wmix.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -23564,8 +23566,8 @@
+#endif /* _WMIX_H_ */
Index: linux-2.6.22/drivers/pnp/core.c
===================================================================
---- linux-2.6.22.orig/drivers/pnp/core.c 2007-11-27 17:12:52.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/core.c 2007-11-27 17:16:52.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/core.c 2007-11-28 16:37:41.000000000 +0100
++++ linux-2.6.22/drivers/pnp/core.c 2007-11-28 16:38:00.000000000 +0100
@@ -169,14 +169,12 @@
*
* this function will free all mem used by dev
@@ -23593,8 +23595,8 @@
-#endif /* 0 */
Index: linux-2.6.22/drivers/pnp/driver.c
===================================================================
---- linux-2.6.22.orig/drivers/pnp/driver.c 2007-11-27 17:12:52.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/driver.c 2007-11-27 17:16:52.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/driver.c 2007-11-28 16:37:41.000000000 +0100
++++ linux-2.6.22/drivers/pnp/driver.c 2007-11-28 16:38:00.000000000 +0100
@@ -243,8 +243,6 @@
EXPORT_SYMBOL(pnp_register_driver);
@@ -23606,8 +23608,8 @@
EXPORT_SYMBOL(pnp_device_detach);
Index: linux-2.6.22/drivers/pnp/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/pnp/Kconfig 2007-11-27 17:12:52.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/Kconfig 2007-11-27 17:16:52.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/Kconfig 2007-11-28 16:37:41.000000000 +0100
++++ linux-2.6.22/drivers/pnp/Kconfig 2007-11-28 16:38:00.000000000 +0100
@@ -7,7 +7,7 @@
config PNP
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch 2007-11-29 17:29:33 UTC (rev 3532)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_functions.patch 2007-11-29 19:59:06 UTC (rev 3533)
@@ -21,7 +21,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO GPS function driver
@@ -31,7 +31,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,392 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps.c
@@ -428,7 +428,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,194 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps.h
@@ -627,7 +627,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,63 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps_linux.h
@@ -695,7 +695,7 @@
Index: linux-2.6.22/drivers/sdio/function/gps/gps_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/gps/gps_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/gps/gps_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,633 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: gps_os.c
@@ -1333,7 +1333,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO bluetooth functiondriver
@@ -1343,7 +1343,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,769 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt.c
@@ -2117,7 +2117,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,176 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt.h
@@ -2298,7 +2298,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,70 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt_linux.h
@@ -2373,7 +2373,7 @@
Index: linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/bluetooth/sdio_bt_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,584 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_bt_os.c
@@ -2962,7 +2962,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,5 @@
+#
+# SDIO memory card function driver
@@ -2972,7 +2972,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,926 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_memory.c
@@ -3903,7 +3903,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,98 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: function.h
@@ -4006,7 +4006,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,80 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_memory_linux.h
@@ -4091,7 +4091,7 @@
Index: linux-2.6.22/drivers/sdio/function/memory/sdio_memory_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/memory/sdio_memory_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1036 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_memory_os.c
@@ -5132,7 +5132,7 @@
Index: linux-2.6.22/drivers/sdio/function/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/Kconfig 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/Kconfig 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,32 @@
+
+menu "SDIO function drivers"
@@ -5169,7 +5169,7 @@
Index: linux-2.6.22/drivers/sdio/function/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/function/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/function/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO function drivers Makefile
Modified: developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch 2007-11-29 17:29:33 UTC (rev 3532)
+++ developers/sameo/patches/ar6k-atheros/common_atheros_sdiostack_shcd.patch 2007-11-29 19:59:06 UTC (rev 3533)
@@ -12,7 +12,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_std/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_std/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_std/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,4 @@
+obj-m += sdio_pcistd_hcd.o
+
@@ -21,7 +21,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/pci_std/sdio_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/pci_std/sdio_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/pci_std/sdio_hcd_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,569 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_hcd_os.c
@@ -595,7 +595,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/Makefile 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/Makefile 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,7 @@
+#
+# SDIO standard host controller makefile
@@ -607,7 +607,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,1663 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd.c
@@ -2275,7 +2275,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,330 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd.h
@@ -2610,7 +2610,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,132 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd_linux.h
@@ -2747,7 +2747,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux_lib.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux_lib.h 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_linux_lib.h 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,79 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd_linux_lib.h
@@ -2831,7 +2831,7 @@
Index: linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_os.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_os.c 2007-11-27 17:16:52.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/stdhost/sdio_std_hcd_os.c 2007-11-28 16:38:00.000000000 +0100
@@ -0,0 +1,826 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ at file: sdio_std_hcd_os.c
Modified: developers/sameo/patches/ar6k-atheros/pnp_fixes_2.6.22.5.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/pnp_fixes_2.6.22.5.patch 2007-11-29 17:29:33 UTC (rev 3532)
+++ developers/sameo/patches/ar6k-atheros/pnp_fixes_2.6.22.5.patch 2007-11-29 19:59:06 UTC (rev 3533)
@@ -4,8 +4,8 @@
Index: linux-2.6.22/drivers/pnp/resource.c
===================================================================
---- linux-2.6.22.orig/drivers/pnp/resource.c 2007-11-12 13:47:29.000000000 +0100
-+++ linux-2.6.22/drivers/pnp/resource.c 2007-11-12 13:47:34.000000000 +0100
+--- linux-2.6.22.orig/drivers/pnp/resource.c 2007-11-28 16:37:31.000000000 +0100
++++ linux-2.6.22/drivers/pnp/resource.c 2007-11-28 16:38:00.000000000 +0100
@@ -447,6 +447,7 @@
}
}
Modified: developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch 2007-11-29 17:29:33 UTC (rev 3532)
+++ developers/sameo/patches/ar6k-atheros/s3c24xx_hcd_atheros.patch 2007-11-29 19:59:06 UTC (rev 3533)
@@ -2,14 +2,14 @@
drivers/sdio/hcd/Kconfig | 8
drivers/sdio/hcd/Makefile | 1
drivers/sdio/hcd/s3c24xx/Makefile | 2
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1207 +++++++++++++++++++++++++++++++++
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 61 +
- 5 files changed, 1279 insertions(+)
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1301 +++++++++++++++++++++++++++++++++
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 63 +
+ 5 files changed, 1375 insertions(+)
Index: linux-2.6.22/drivers/sdio/hcd/Kconfig
===================================================================
---- linux-2.6.22.orig/drivers/sdio/hcd/Kconfig 2007-11-28 16:38:00.000000000 +0100
-+++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-28 16:38:00.000000000 +0100
+--- linux-2.6.22.orig/drivers/sdio/hcd/Kconfig 2007-11-28 19:04:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Kconfig 2007-11-28 19:31:56.000000000 +0100
@@ -46,6 +46,14 @@
help
good luck.
@@ -27,8 +27,8 @@
depends on SPI
Index: linux-2.6.22/drivers/sdio/hcd/Makefile
===================================================================
---- linux-2.6.22.orig/drivers/sdio/hcd/Makefile 2007-11-28 16:38:00.000000000 +0100
-+++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-28 16:38:00.000000000 +0100
+--- linux-2.6.22.orig/drivers/sdio/hcd/Makefile 2007-11-28 19:04:34.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/Makefile 2007-11-28 19:31:56.000000000 +0100
@@ -6,3 +6,4 @@
obj-$(CONFIG_ARCH_OMAP24XX) += omap_2420/
obj-$(CONFIG_PXA27x) += pxa270/
@@ -37,15 +37,15 @@
Index: linux-2.6.22/drivers/sdio/hcd/s3c24xx/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/Makefile 2007-11-28 16:38:00.000000000 +0100
++++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/Makefile 2007-11-28 19:31:56.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/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2007-11-28 19:03:16.000000000 +0100
-@@ -0,0 +1,1207 @@
++++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2007-11-29 20:24:25.000000000 +0100
+@@ -0,0 +1,1301 @@
+/*
+ * s3c24xx_hcd.c - Samsung S3C MCI driver
+ *
@@ -66,6 +66,7 @@
+#include <linux/fs.h>
+#include <linux/ioport.h>
+#include <linux/workqueue.h>
++#include <linux/completion.h>
+#include <linux/delay.h>
+
+#include <linux/sdio/ctsystem.h>
@@ -334,7 +335,7 @@
+
+static void s3c24xx_hcd_pio_complete(struct s3c24xx_hcd_context * context)
+{
-+ u32 fsta, counter;
++ u32 fsta, dsta, counter;
+ u8 *ptr;
+ int fifo_count;
+ PSDREQUEST req;
@@ -348,12 +349,72 @@
+
+ ptr = req->pDataBuffer;
+
++ if (context->dma_en) {
++ /* Start DMA */
++// printk("Starting DMA\n");
++// s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_START);
++
++ printk("Waiting for DMA to complete\n");
++ wait_for_completion(&context->dma_complete);
++ printk("DMA done\n");
++
++ if (context->complete == S3C24XX_HCD_DATA_READ) {
++ /* DMA READ completion */
++ if (context->latest_xfer_size != req->DataRemaining) {
++ DBG_PRINT(SDDBG_ERROR, ("Unexpected read xfer size: %d <-> %d\n",
++ context->latest_xfer_size, req->DataRemaining));
++ status = SDIO_STATUS_BUS_WRITE_ERROR;
++ }
++ dsta = readl(context->base + S3C2410_SDIDSTA);
++ if (dsta & S3C2410_SDIDSTA_XFERFINISH) {
++ int i;
++ printk("DMA read xfer done\n");
++
++ for (i = 0; i < 4; i++)
++ printk("0x%x ", *(((char *)context->io_buffer) + i));
++ printk("\n");
++
++ writel(S3C2410_SDIDSTA_XFERFINISH, context->base + S3C2410_SDIDSTA);
++ memcpy(req->pDataBuffer, context->io_buffer,
++ req->BlockCount * req->BlockLen);
++ req->DataRemaining = 0;
++ status = SDIO_STATUS_SUCCESS;
++ } else {
++ int i;
++
++ printk("DMA read xfer unfinished\n");
++ for (i = 0; i < 4; i++)
++ printk("0x%x ", *(((char *)context->io_buffer) + i));
++ printk("\n");
++
++ status = SDIO_STATUS_BUS_READ_TIMEOUT;
++ }
++ } else if (context->complete == S3C24XX_HCD_DATA_WRITE) {
++ /* DMA WRITE completion */
++ if (context->latest_xfer_size != req->DataRemaining) {
++ DBG_PRINT(SDDBG_ERROR, ("Unexpected write xfer size: %d <-> %d\n",
++ context->latest_xfer_size, req->DataRemaining));
++ status = SDIO_STATUS_BUS_WRITE_ERROR;
++ }
++
++ dsta = readl(context->base + S3C2410_SDIDSTA);
++ if (dsta & S3C2410_SDIDSTA_XFERFINISH) {
++ printk("DMA write xfer done\n");
++ writel(S3C2410_SDIDSTA_XFERFINISH, context->base + S3C2410_SDIDSTA);
++ req->DataRemaining = 0;
++ status = SDIO_STATUS_SUCCESS;
++ } else {
++ printk("DMA write xfer unfinished\n");
++ status = SDIO_STATUS_BUS_WRITE_ERROR;
++ }
++ }
++
++ goto out;
++ }
++
+ if (context->complete == S3C24XX_HCD_DATA_READ) {
-+ if (req->BlockCount > 1)
-+ s3c24xx_dump_regs(context);
-+
+ counter = 0;
-+ printk("Data read...");
++ DBG_PRINT(SDDBG_TRACE, ("Data read..."));
+ do {
+ counter++;
+ fsta = readl(context->base + S3C2410_SDIFSTA);
@@ -366,18 +427,27 @@
+ break;
+ }
+ } while(!(fsta & S3C2410_SDIFSTA_RFDET));
-+ printk("RX detected\n");
++ DBG_PRINT(SDDBG_TRACE, ("RX detected\n"));
+
-+ while ((fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK))) {
++ while (1) {
++ counter = 0;
++ fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
++ while (!fifo_count) {
++ counter++;
++ mdelay(1);
++ if (counter > 500) {
++ s3c24xx_dump_regs(context);
++ DBG_PRINT(SDDBG_ERROR, ("No more bytes in FIFO\n"));
++ goto out;
++ }
++ fifo_count = (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK);
++ }
++
+ if (fifo_count > req->DataRemaining) {
+ DBG_PRINT(SDDBG_ERROR, ("DATA read, fifo_count %d > expected %d\n", fifo_count, req->DataRemaining));
+ fifo_count = req->DataRemaining;
+ }
+
-+ if (req->BlockCount > 1)
-+ printk("%s(): Reading %d bytes (left %d), data size: %d\n",
-+ __FUNCTION__, fifo_count, req->DataRemaining, context->data_size);
-+
+ req->DataRemaining -= fifo_count;
+ while (fifo_count > 0) {
+ if (context->data_size == 4)
@@ -405,9 +475,6 @@
+ }
+ }
+
-+ if (req->BlockCount > 1)
-+ s3c24xx_dump_regs(context);
-+
+ status = SDIO_STATUS_SUCCESS;
+ goto out;
+ }
@@ -415,7 +482,7 @@
+
+ } else if (context->complete == S3C24XX_HCD_DATA_WRITE) {
+ counter = 0;
-+ printk("Data write...");
++ DBG_PRINT(SDDBG_TRACE, ("Data write..."));
+ do {
+ counter++;
+ fsta = readl(context->base + S3C2410_SDIFSTA);
@@ -428,16 +495,31 @@
+ }
+
+ } while(!(fsta & S3C2410_SDIFSTA_TFDET));
-+ printk("TX detected\n");
++ DBG_PRINT(SDDBG_TRACE, ("TX detected\n"));
+
+
-+ while ((fifo_count = (63 -
-+ (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK)))) {
++// while ((fifo_count = (63 -
++// (readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK)))) {
+// printk("%s(): We can write %d bytes\n", __FUNCTION__, fifo_count);
+
-+ if (fifo_count > req->DataRemaining)
-+ fifo_count = req->DataRemaining;
+
++ while (1) {
++ counter = 0;
++ fifo_count = 63 - readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK;
++ while (!fifo_count) {
++ counter++;
++ mdelay(1);
++ if (counter > 500) {
++ s3c24xx_dump_regs(context);
++ DBG_PRINT(SDDBG_ERROR, ("No more space in FIFO\n"));
++ goto out;
++ }
++ fifo_count = 63 - readl(context->base + S3C2410_SDIFSTA) & S3C2410_SDIFSTA_COUNTMASK;
++ }
++
++ if (fifo_count > req->DataRemaining)
++ fifo_count = req->DataRemaining;
++
+ req->DataRemaining -= fifo_count;
+
+ while (fifo_count > 0) {
@@ -469,7 +551,7 @@
+ status = SDIO_STATUS_SUCCESS;
+ goto out;
+ }
-+ }
++ }
+
+ } else {
+ DBG_PRINT(SDDBG_ERROR, ("Wrong context: %d\n", context->complete));
@@ -560,6 +642,12 @@
+void s3c24xx_hcd_dma_done(struct s3c2410_dma_chan *dma_ch, void *buf_id,
+ int size, enum s3c2410_dma_buffresult result)
+{
++ struct s3c24xx_hcd_context * context =
++ (struct s3c24xx_hcd_context *) buf_id;
++
++ printk("DMA done\n");
++ context->latest_xfer_size = size;
++ complete(&context->dma_complete);
+}
+
+static int s3c24xx_hcd_prepare_dma(struct s3c24xx_hcd_context * context)
@@ -589,10 +677,12 @@
+ read = 1;
+ source = S3C2410_DMASRC_HW;
+ hwcfg = S3C2410_DISRCC_APB;
++ } else {
++ memcpy(context->io_buffer, req->pDataBuffer, req->DataRemaining);
+ }
+
+ s3c2410_dma_devconfig(context->dma_channel, source, hwcfg,
-+ (unsigned long)context->base + S3C2440_SDIDATA);
++ (unsigned long)context->mem->start + S3C2440_SDIDATA);
+
+ s3c2410_dma_config(context->dma_channel, 1,
+ (S3C2410_DCON_HWTRIG | S3C2410_DCON_CH0_SDI));
@@ -635,7 +725,7 @@
+ !context->int_sdio_pending) {
+ u32 imask;
+
-+ printk("Got SDIO IRQ\n");
++// printk("Got SDIO IRQ\n");
+
+ context->int_sdio = 0;
+ context->int_sdio_reported = 1;
@@ -858,7 +948,7 @@
+ /* Data read */
+ u32 dcon;
+
-+ DBG_PRINT(SDDBG_DEBUG, ("Start data read, block count=%d, block size=%d\n",
++ DBG_PRINT(SDDBG_TRACE, ("Start data read, block count=%d, block size=%d\n",
+ req->BlockCount, req->BlockLen));
+
+ /* Setting timer */
@@ -915,7 +1005,7 @@
+ /* Data write */
+ u32 dcon;
+
-+ DBG_PRINT(SDDBG_DEBUG, ("Start data write, block count=%d, block size=%d\n",
++ DBG_PRINT(SDDBG_TRACE, ("Start data write, block count=%d, block size=%d\n",
+ req->BlockCount, req->BlockLen));
+
+ /* Setting timer */
@@ -953,8 +1043,10 @@
+
+ dcon |= S3C2440_SDIDCON_DATSTART;
+
-+ if (context->dma_en)
++ if (context->dma_en) {
+ dcon |= S3C2410_SDIDCON_DMAEN;
++ s3c24xx_hcd_prepare_dma(context);
++ }
+
+ writel(dcon, context->base + S3C2410_SDIDCON);
+
@@ -1074,7 +1166,7 @@
+ s3c2410_gpio_cfgpin(S3C2410_GPE10, S3C2410_GPE10_SDDAT3);
+
+ con = readl(context->base + S3C2410_SDICON);
-+ con |= S3C2410_SDICON_RWAITEN | S3C2410_SDICON_SDIOIRQ;
++ con |= S3C2410_SDICON_SDIOIRQ;
+ writel(con, context->base + S3C2410_SDICON);
+
+ datacon = readl(context->base + S3C2410_SDIDCON);
@@ -1205,6 +1297,8 @@
+
+ spin_lock_init(&hcd_context.lock);
+
++ init_completion(&hcd_context.dma_complete);
++
+ INIT_WORK(&hcd_context.pio_work, s3c24xx_hcd_pio_work);
+
+ status = SDIO_BusAddOSDevice(&hcd_context.device.dma,
@@ -1256,8 +1350,8 @@
Index: linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h 2007-11-28 18:23:58.000000000 +0100
-@@ -0,0 +1,61 @@
++++ linux-2.6.22/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h 2007-11-29 10:53:03.000000000 +0100
+@@ -0,0 +1,63 @@
+#ifndef __SDIO_S3C24XX_HCD_H___
+#define __SDIO_S3C24XX_HCD_H___
+
@@ -1294,12 +1388,14 @@
+ BOOL irq_masked;
+ UINT32 bus_width;
+ UINT32 data_size; /* Word, half word, or byte */
++ UINT32 latest_xfer_size;
+
+ void *io_buffer; /* Kernel address */
+ dma_addr_t io_buffer_dma; /* Bus address */
+ UINT32 io_buffer_size;
+ UINT32 dma_channel;
+ UINT32 dma_en;
++ struct completion dma_complete;
+
+ UINT32 int_mask;
+ UINT32 int_sdio; /* Do we have SDIO interrupt on ? */
More information about the commitlog
mailing list
