r3816 - developers/sameo/patches/ar6k-atheros-2.0
sameo at sita.openmoko.org
sameo at sita.openmoko.org
Fri Jan 11 19:24:49 CET 2008
Author: sameo
Date: 2008-01-11 19:24:44 +0100 (Fri, 11 Jan 2008)
New Revision: 3816
Modified:
developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch
developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch
Log:
ar6k-atheros-2.0: Disable scan filtering.
We can now get the scan results without calling funky ioctls.
Modified: developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch 2008-01-11 14:25:55 UTC (rev 3815)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch 2008-01-11 18:24:44 UTC (rev 3816)
@@ -2,8 +2,7 @@
drivers/sdio/function/Kconfig | 11
drivers/sdio/function/Makefile | 1
drivers/sdio/function/wlan/Makefile | 4
- drivers/sdio/function/wlan/ar6000/Makefile | 36
- drivers/sdio/function/wlan/ar6000/ar6000/Makefile | 103
+ drivers/sdio/function/wlan/ar6000/Makefile | 38
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c | 3070 +++++++
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h | 361
drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c | 439 +
@@ -12,14 +11,12 @@
drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h | 47
drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h | 44
drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h | 86
- drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c | 2571 ++++++
+ drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c | 2573 ++++++
drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c | 225
- drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h | 313
- drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c | 1861 ++++
+ drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h | 319
+ drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c | 1866 ++++
drivers/sdio/function/wlan/ar6000/bmi/bmi.c | 657 +
drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h | 45
- drivers/sdio/function/wlan/ar6000/bmi/makefile | 4
- drivers/sdio/function/wlan/ar6000/hif/Makefile | 57
drivers/sdio/function/wlan/ar6000/hif/hif.c | 818 ++
drivers/sdio/function/wlan/ar6000/hif/hif_internal.h | 102
drivers/sdio/function/wlan/ar6000/htc/ar6k.c | 991 ++
@@ -39,7 +36,7 @@
drivers/sdio/function/wlan/ar6000/include/a_debug.h | 41
drivers/sdio/function/wlan/ar6000/include/a_drv.h | 28
drivers/sdio/function/wlan/ar6000/include/a_drv_api.h | 185
- drivers/sdio/function/wlan/ar6000/include/a_osapi.h | 31
+ drivers/sdio/function/wlan/ar6000/include/a_osapi.h | 28
drivers/sdio/function/wlan/ar6000/include/a_types.h | 28
drivers/sdio/function/wlan/ar6000/include/ar6000_api.h | 29
drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h | 38
@@ -80,19 +77,18 @@
drivers/sdio/function/wlan/ar6000/include/wmix.h | 233
drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c | 467 +
drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c | 346
- drivers/sdio/function/wlan/ar6000/miscdrv/makefile | 4
drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c | 371
drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c | 192
drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c | 59
- drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 3920 +++++++++
+ drivers/sdio/function/wlan/ar6000/wmi/wmi.c | 3921 +++++++++
drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h | 4421 +++++++++++
drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h | 71
- 88 files changed, 32666 insertions(+)
+ 84 files changed, 32511 insertions(+)
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Kconfig
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Kconfig 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Kconfig 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,11 @@
+#menu "SDIO function drivers"
+
@@ -109,14 +105,14 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Makefile 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Makefile 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1 @@
+obj-$(CONFIG_SDIO_AR6000_WLAN) += wlan/
\ No newline at end of file
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,3070 @@
+/*
+ *
@@ -3191,7 +3187,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,361 @@
+/*
+ *
@@ -3557,7 +3553,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,439 @@
+/*
+ *
@@ -4001,7 +3997,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,128 @@
+#ifndef _AR6XAPI_LINUX_H
+#define _AR6XAPI_LINUX_H
@@ -4134,7 +4130,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,993 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5132,7 +5128,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,47 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
@@ -5184,7 +5180,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -5233,7 +5229,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5324,8 +5320,8 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c 2008-01-09 18:10:12.000000000 +0100
-@@ -0,0 +1,2571 @@
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c 2008-01-11 12:48:19.000000000 +0100
+@@ -0,0 +1,2573 @@
+/*
+ *
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -6701,8 +6697,10 @@
+ if (ar->arWmiReady == FALSE) {
+ ret = -EIO;
+ } else {
++
+ get_user(param, (unsigned char *)userdata);
+ get_user(param2, (unsigned int *)(userdata + 1));
++ printk("SETBSSFILTER: filter 0x%x, mask: 0x%x\n", param, param2);
+ if (wmi_bssfilter_cmd(ar->arWmi, param, param2) != A_OK) {
+ ret = -EIO;
+ }
@@ -7897,118 +7895,10 @@
+ return ret;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/Makefile 2008-01-09 18:10:12.000000000 +0100
-@@ -0,0 +1,103 @@
-+#######################################################################################
-+# AR6K Kernel Module makefile.
-+#
-+# This makefile is invoked by the master makefile in the linux kernel, the linux kernel
-+# source must be initially compiled. The top level make will invoke the main linux kernel
-+# makefile which will subsequently pick up this makefile.
-+#
-+#######################################################################################
-+
-+
-+REV ?= 2
-+
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/include
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/../include
-+# TBDXXX....handle include/AR6002
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/../include/AR6001
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/wlan/include
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/os/linux/include
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/os/
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/bmi/include
-+
-+EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
-+ -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
-+ -DNO_SYNC_FLUSH #\
-+ -DMULTIPLE_FRAMES_PER_INTERRUPT -DAR6000REV$(REV) \
-+ -DBLOCK_TX_PATH_FLAG \
-+
-+ifneq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+# linux 2.6 and higher kernel module build settings
-+EXTRA_CFLAGS += -DKERNEL_2_6
-+obj-m += ar6000.o
-+-include $(ATH_SRC_BASE)/hif/$(ATH_HIF_TYPE)/Makefile
-+ar6000-objs += ../../htc2/AR6000/ar6k.o \
-+ ../../htc2/AR6000/ar6k_events.o \
-+ ../../htc2/htc_send.o \
-+ ../../htc2/htc_recv.o \
-+ ../../htc2/htc_services.o \
-+ ../../htc2/htc.o \
-+ ../../bmi/src/bmi.o \
-+ ar6000_drv.o \
-+ ar6000_raw_if.o \
-+ netbuf.o \
-+ wireless_ext.o \
-+ ioctl.o \
-+ ../../miscdrv/common_drv.o \
-+ ../../miscdrv/credit_dist.o \
-+ ../../wmi/wmi.o \
-+ ../../wlan/src/wlan_node.o \
-+ ../../wlan/src/wlan_recv_beacon.o \
-+ ../../wlan/src/wlan_utils.o
-+
-+endif
-+
-+ifeq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+# linux 2.4 kernel module build settings
-+EXTRA_CFLAGS += -DKERNEL_2_4
-+
-+O_TARGET := ar6000.o
-+# need export line for module export
-+export-objs := ar6000_drv.o
-+-include $(ATH_SRC_BASE)/hif/$(ATH_HIF_TYPE)/Makefile
-+obj-y += $(ATH_SRC_BASE)/htc2/htc.o \
-+ $(ATH_SRC_BASE)/htc2/htc_send.o \
-+ $(ATH_SRC_BASE)/htc2/htc_recv.o \
-+ $(ATH_SRC_BASE)/htc2/htc_services.o \
-+ $(ATH_SRC_BASE)/htc2/AR6000/ar6k.o \
-+ $(ATH_SRC_BASE)/htc2/AR6000/ar6k_events.o \
-+ $(ATH_SRC_BASE)/bmi/src/bmi.o \
-+ $(ATH_SRC_BASE)/wmi/wmi.o \
-+ $(ATH_SRC_BASE)/wlan/src/wlan_node.o \
-+ $(ATH_SRC_BASE)/wlan/src/wlan_recv_beacon.o \
-+ $(ATH_SRC_BASE)/wlan/src/wlan_utils.o \
-+ $(ATH_SRC_BASE)/os/linux/ar6000_drv.o \
-+ $(ATH_SRC_BASE)/os/linux/ar6000_raw_if.o \
-+ $(ATH_SRC_BASE)/os/linux/wireless_ext.o \
-+ $(ATH_SRC_BASE)/os/linux/ioctl.o \
-+ $(ATH_SRC_BASE)/os/linux/netbuf.o \
-+ $(ATH_SRC_BASE)/miscdrv/common_drv.o \
-+ $(ATH_SRC_BASE)/miscdrv/credit_dist.o
-+
-+obj-m += htc.o \
-+ htc_send.o \
-+ htc_recv.o \
-+ htc_services.o \
-+ ar6k_events.o \
-+ ar6k.o \
-+ hif.o \
-+ bmi.o \
-+ wmi.o \
-+ wlan_node.o \
-+ wlan_recv_beacon.o \
-+ wlan_utils.o \
-+ ar6000_drv.o \
-+ ar6000_raw_if.o \
-+ common_drv.o \
-+ credit_dist.o \
-+ netbuf.o \
-+ wireless_ext.o \
-+ ioctl.o \
-+ ar6000.o
-+
-+include $(ATH_LINUXPATH)/Rules.make
-+endif
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,225 @@
+
+/*
@@ -8238,8 +8128,8 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h 2008-01-09 23:52:20.000000000 +0100
-@@ -0,0 +1,313 @@
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h 2008-01-11 12:20:32.000000000 +0100
+@@ -0,0 +1,319 @@
+/*
+ * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
+ *
@@ -8274,10 +8164,16 @@
+#include <linux/string.h>
+#include <linux/skbuff.h>
+#include <linux/netdevice.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#include <linux/jiffies.h>
++#endif
+#include <linux/timer.h>
+#include <linux/delay.h>
+#include <linux/wait.h>
++#ifdef KERNEL_2_4
++#include <asm/arch/irq.h>
++#include <asm/irq.h>
++#endif
+
+#ifdef __GNUC__
+#define __ATTRIB_PACK __attribute__ ((packed))
@@ -8556,8 +8452,8 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c 2008-01-09 23:46:42.000000000 +0100
-@@ -0,0 +1,1861 @@
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c 2008-01-11 19:16:27.000000000 +0100
+@@ -0,0 +1,1866 @@
+/*
+ *
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -8631,7 +8527,6 @@
+ param = (struct ar_giwscan_param *)arg;
+
+ if (param->current_ev >= param->end_buf) {
-+ printk("%s(): 1\n", __FUNCTION__);
+ return;
+ }
+ if ((param->firstPass == TRUE) &&
@@ -8639,7 +8534,6 @@
+ /*
+ * Only forward wpa bss's in first pass
+ */
-+ printk("%s(): 2\n", __FUNCTION__);
+ return;
+ }
+
@@ -8648,7 +8542,6 @@
+ /*
+ * Only forward non-wpa bss's in 2nd pass
+ */
-+ printk("%s(): 3\n", __FUNCTION__);
+ return;
+ }
+
@@ -8823,7 +8716,6 @@
+ wmi_iterate_nodes(ar->arWmi, ar6000_scan_node, ¶m);
+ param.firstPass = FALSE;
+ if (param.current_ev >= param.end_buf) {
-+ printk("TOO BIG\n");
+ data->length = param.current_ev - extra;
+ return -E2BIG;
+ }
@@ -8831,7 +8723,7 @@
+
+ if(!(data->length = param.current_ev - extra)) {
+ printk("%s(): data length %d\n", __FUNCTION__, data->length);
-+ //return -EAGAIN;
++ return -EAGAIN;
+ }
+ return 0;
+}
@@ -10096,11 +9988,20 @@
+ return -EIO;
+ }
+
++#if 1
++ /* We ask for everything from the target */
++ if (wmi_bssfilter_cmd(ar->arWmi, ALL_BSS_FILTER, 0) != A_OK) {
++ printk("Couldn't set filtering\n");
++ ret = -EIO;
++ }
++#endif
++
+ if (wmi_startscan_cmd(ar->arWmi, WMI_LONG_SCAN, FALSE, FALSE, \
+ HOME_TXDRAIN_TIME, SCAN_INT) != A_OK) {
+ ret = -EIO;
+ }
+
++
+ return ret;
+#undef ACT_DWELLTIME_DEFAULT
+#undef HOME_TXDRAIN_TIME
@@ -10422,7 +10323,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,657 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -11084,7 +10985,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,45 @@
+#ifndef BMI_INTERNAL_H
+#define BMI_INTERNAL_H
@@ -11131,19 +11032,10 @@
+ A_UINT32 length);
+
+#endif
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/makefile 2008-01-09 18:10:12.000000000 +0100
-@@ -0,0 +1,4 @@
-+# Copyright (c) 2004-2006 Atheros Communications Inc.
-+# All rights reserved.
-+!INCLUDE $(_MAKEENVROOT)\makefile.def
-+
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,818 @@
+/*
+ * @file: hif.c
@@ -11966,7 +11858,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,102 @@
+/*
+ * @file: hif_internal.h
@@ -12070,72 +11962,10 @@
+
+void
+delHifDevice(SDDEVICE *handle);
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/Makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/hif/Makefile 2008-01-09 18:10:12.000000000 +0100
-@@ -0,0 +1,57 @@
-+#
-+#SDIO HIF makefile for atheros SDIO stack
-+#
-+#Copyright (c) 2004-2006 Atheros Communications Inc.
-+#
-+#$ATH_LICENSE_HOSTSDK0_MK$
-+#
-+
-+# Check for SDIO stack
-+ifdef ATH_SDIO_STACK_BASE
-+# Someone already set it on entry, the stack resides outside this tree, we will try to build it
-+_SDIO_STACK = YES
-+else
-+# Check for SDIO stack within this tree
-+_SDIO_STACK = $(shell if [ -f $(ATH_SRC_BASE)/sdiostack/src/Makefile ]; then echo "YES"; else echo "NO"; fi)
-+
-+ifeq ($(_SDIO_STACK), YES)
-+ # SDIO stack is part of the kit and will need to be compiled
-+ATH_SDIO_STACK_BASE := $(ATH_SRC_BASE)/sdiostack
-+endif
-+endif
-+
-+ifeq ($(_SDIO_STACK), YES)
-+ # Pass and translate build variables to the SDIO stack makefile
-+_SDIO_STACK_MAKE_PARAMS := CT_BUILD_TYPE=$(ATH_BUILD_TYPE) \
-+ CT_OS_TYPE=linux \
-+ CT_OS_SUB_TYPE=$(ATH_OS_SUB_TYPE) \
-+ CT_LINUXPATH=$(ATH_LINUXPATH) \
-+ CT_BUILD_TYPE=$(ATH_BUILD_TYPE) \
-+ CT_CROSS_COMPILE_TYPE=$(ATH_CROSS_COMPILE_TYPE) \
-+ CT_ARCH_CPU_TYPE=$(ATH_ARCH_CPU_TYPE) \
-+ CT_HC_DRIVERS=$(ATH_HC_DRIVERS) \
-+ CT_MAKE_INCLUDE_OVERRIDE=$(_LOCALMAKE_INCLUDE) \
-+ CT_BUILD_OUTPUT_OVERRIDE=$(COMPILED_IMAGE_OBJECTS_PATH) \
-+ BUS_BUILD=1
-+endif
-+EXTRA_CFLAGS += -I$(ATH_SRC_BASE)/hif/sdio/linux_athsdio/include
-+EXTRA_CFLAGS += -DSDIO
-+EXTRA_CFLAGS += -I$(ATH_SDIO_STACK_BASE)/src/include
-+
-+ifeq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+obj-y += ../../hif/sdio/linux_athsdio/src/hif.o
-+endif
-+
-+ifneq ($(ATH_OS_SUB_TYPE),linux_2_4)
-+ar6000-objs := ../../hif/sdio/linux_athsdio/src/hif.o
-+endif
-+
-+all:
-+ifeq ($(_SDIO_STACK),YES)
-+ $(MAKE) $(_SDIO_STACK_MAKE_PARAMS) -C $(ATH_SDIO_STACK_BASE)/src default
-+endif
-+
-+clean:
-+ifeq ($(_SDIO_STACK),YES)
-+ $(MAKE) $(_SDIO_STACK_MAKE_PARAMS) -C $(ATH_SDIO_STACK_BASE)/src clean
-+endif
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,991 @@
+/*
+ * AR6K device layer that handles register level I/O
@@ -13131,7 +12961,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,638 @@
+/*
+ * AR6K Driver layer event handling (i.e. interrupts, message polling)
@@ -13774,7 +13604,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,191 @@
+/*
+ *
@@ -13970,7 +13800,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,507 @@
+/*
+ *
@@ -14482,7 +14312,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,65 @@
+#ifndef HTC_DEBUG_H_
+#define HTC_DEBUG_H_
@@ -14552,7 +14382,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,168 @@
+/*
+ *
@@ -14725,7 +14555,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,703 @@
+/*
+ *
@@ -15433,7 +15263,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_send.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,541 @@
+/*
+ *
@@ -15979,7 +15809,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_services.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc_services.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,403 @@
+/*
+ *
@@ -16387,7 +16217,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_config.h 2008-01-10 00:05:35.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_config.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,27 @@
+#ifndef _A_CONFIG_H_
+#define _A_CONFIG_H_
@@ -16419,7 +16249,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_debug.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_debug.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_debug.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,41 @@
+#ifndef _A_DEBUG_H_
+#define _A_DEBUG_H_
@@ -16465,7 +16295,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,185 @@
+#ifndef _A_DRV_API_H_
+#define _A_DRV_API_H_
@@ -16655,7 +16485,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_drv.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,28 @@
+#ifndef _A_DRV_H_
+#define _A_DRV_H_
@@ -16688,9 +16518,8 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_osapi.h 2008-01-09 23:58:50.000000000 +0100
-@@ -0,0 +1,31 @@
-+bla
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_osapi.h 2008-01-11 12:20:32.000000000 +0100
+@@ -0,0 +1,28 @@
+#ifndef _A_OSAPI_H_
+#define _A_OSAPI_H_
+/*
@@ -16718,13 +16547,11 @@
+
+#include "../ar6000/osapi_linux.h"
+
-+
-+bla
+#endif /* _OSAPI_H_ */
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,29 @@
+#ifndef _AR6000_API_H_
+#define _AR6000_API_H_
@@ -16758,7 +16585,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,38 @@
+/*
+ *
@@ -16801,7 +16628,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2006 Atheros Communications Inc.
@@ -16906,7 +16733,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -17058,7 +16885,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -17099,7 +16926,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,36 @@
+#define __VER_MAJOR_ 2
+#define __VER_MINOR_ 0
@@ -17140,7 +16967,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdefs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdefs.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,85 @@
+#ifndef __ATHDEFS_H__
+#define __ATHDEFS_H__
@@ -17230,7 +17057,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdrv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdrv.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17267,7 +17094,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athendpack.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athendpack.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athendpack.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,41 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athendpack.h
@@ -17313,7 +17140,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athstartpack.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athstartpack.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,42 @@
+/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ * @file: athstartpack.h
@@ -17360,7 +17187,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_types.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_types.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/a_types.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,28 @@
+#ifndef _A_TYPES_H_
+#define _A_TYPES_H_
@@ -17393,7 +17220,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,100 @@
+#ifndef _BMI_H_
+#define _BMI_H_
@@ -17498,7 +17325,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,199 @@
+#ifndef __BMI_MSG_H__
+#define __BMI_MSG_H__
@@ -17702,7 +17529,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/common_drv.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/common_drv.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/common_drv.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,61 @@
+/*
+ *
@@ -17768,7 +17595,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,46 @@
+#ifndef _DBGLOG_API_H_
+#define _DBGLOG_API_H_
@@ -17819,7 +17646,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -17931,7 +17758,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,307 @@
+/*
+ *
@@ -18243,7 +18070,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dl_list.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dl_list.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dl_list.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,114 @@
+/*
+ *
@@ -18362,7 +18189,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18430,7 +18257,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dsetid.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dsetid.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dsetid.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18545,7 +18372,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_internal.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dset_internal.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -18589,7 +18416,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,57 @@
+#ifndef _GPIO_API_H_
+#define _GPIO_API_H_
@@ -18651,7 +18478,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2005 Atheros Communications Inc.
@@ -18690,7 +18517,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/hif.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/hif.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/hif.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18986,7 +18813,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/host_version.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/host_version.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/host_version.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,49 @@
+#ifndef _HOST_VERSION_H_
+#define _HOST_VERSION_H_
@@ -19040,7 +18867,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_api.h 2008-01-10 00:04:02.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,436 @@
+/*
+ *
@@ -19481,7 +19308,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -19676,7 +19503,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_packet.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_packet.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,138 @@
+/*
+ *
@@ -19819,7 +19646,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_services.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_services.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc_services.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2007 Atheros Communications Inc.
@@ -19861,7 +19688,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,342 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -20208,7 +20035,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20376,7 +20203,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,77 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -20458,7 +20285,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ini_dset.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ini_dset.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20503,7 +20330,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regDb.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regDb.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regDb.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2005 Atheros Communications, Inc.
@@ -20527,7 +20354,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regdump.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regdump.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regdump.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,33 @@
+#ifndef __REGDUMP_H__
+#define __REGDUMP_H__
@@ -20565,7 +20392,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/targaddrs.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/targaddrs.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20728,7 +20555,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/testcmd.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/testcmd.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/testcmd.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20877,7 +20704,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,101 @@
+#ifndef _HOST_WLAN_API_H_
+#define _HOST_WLAN_API_H_
@@ -20983,7 +20810,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2007 Atheros Communications, Inc.
@@ -21008,7 +20835,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi_api.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,259 @@
+#ifndef _WMI_API_H_
+#define _WMI_API_H_
@@ -21272,7 +21099,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi.h 2008-01-10 00:08:50.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi.h 2008-01-11 18:46:26.000000000 +0100
@@ -0,0 +1,1739 @@
+/*
+ * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -21330,7 +21157,7 @@
+typedef PREPACK struct {
+ A_UINT8 dstMac[ATH_MAC_LEN];
+ A_UINT8 srcMac[ATH_MAC_LEN];
-+ A_UINT16 typeOrLen;
++ A_UINT16 typeOrLen;
+} POSTPACK ATH_MAC_HDR;
+
+typedef PREPACK struct {
@@ -22379,7 +22206,7 @@
+ A_UINT8 snr;
+ A_INT16 rssi;
+ A_UINT8 bssid[ATH_MAC_LEN];
-+ A_UINT32 ieMask;
++// A_UINT32 ieMask;
+} POSTPACK WMI_BSS_INFO_HDR;
+
+/*
@@ -23016,7 +22843,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmix.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmix.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmix.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,233 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -23254,12 +23081,14 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/Makefile 2008-01-09 18:10:12.000000000 +0100
-@@ -0,0 +1,36 @@
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/Makefile 2008-01-11 12:20:32.000000000 +0100
+@@ -0,0 +1,38 @@
+REV ?= 2
+
-+EXTRA_CFLAGS += -I/home/samuel/devlp/kernel/omoko/linux-openmoko-2.6.22.5-moko11+svnr3238-r6/linux-2.6.22-atheros-2.0/drivers/sdio/function/wlan/ar6000/include
++PWD := $(shell pwd)
+
++EXTRA_CFLAGS += -I$(src)/include
++
+EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
+ -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
+ -DNO_SYNC_FLUSH #\
@@ -23295,7 +23124,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,467 @@
+
+/*
@@ -23767,7 +23596,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,346 @@
+
+/*
@@ -24115,19 +23944,10 @@
+ return A_OK;
+}
+
-Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/makefile
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/miscdrv/makefile 2008-01-09 18:10:12.000000000 +0100
-@@ -0,0 +1,4 @@
-+# Copyright (c) 2004-2006 Atheros Communications Inc.
-+# All rights reserved.
-+!INCLUDE $(_MAKEENVROOT)\makefile.def
-+
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,371 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -24503,7 +24323,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c 2008-01-11 19:12:03.000000000 +0100
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2001 Atsushi Onoe
@@ -24700,7 +24520,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -24764,8 +24584,8 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2008-01-10 00:08:04.000000000 +0100
-@@ -0,0 +1,3920 @@
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi.c 2008-01-11 19:11:53.000000000 +0100
+@@ -0,0 +1,3921 @@
+/*
+ * Copyright (c) 2004-2007 Atheros Communications Inc.
+ * All rights reserved.
@@ -24793,10 +24613,9 @@
+#include <athdefs.h>
+#include <a_types.h>
+#include <a_osapi.h>
-+#include <htc.h>
-+#include <htc_api.h>
-+//#include <wmi.h>
-+#include "../include/wmi.h"
++#include "htc.h"
++#include "htc_api.h"
++#include "wmi.h"
+#include <ieee80211.h>
+#include <ieee80211_node.h>
+#include <wlan_api.h>
@@ -24809,7 +24628,6 @@
+#include "a_debug.h"
+#include "dbglog_api.h"
+
-+
+static A_STATUS wmi_ready_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len);
+
+static A_STATUS wmi_connect_event_rx(struct wmi_t *wmip, A_UINT8 *datap,
@@ -25597,6 +25415,7 @@
+ return A_OK;
+ }
+
++
+ bih = (WMI_BSS_INFO_HDR *)datap;
+ buf = datap + sizeof(WMI_BSS_INFO_HDR);
+ len -= sizeof(WMI_BSS_INFO_HDR);
@@ -25607,8 +25426,10 @@
+ bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
+ bih->bssid[5]));
+
-+ if(wps_enable && (bih->frameType == PROBERESP_FTYPE) )
++ if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
++ printk("%s() A_OK 2\n", __FUNCTION__);
+ return A_OK;
++ }
+
+ bss = wlan_find_node(&wmip->wmi_scan_table, bih->bssid);
+ if (bss != NULL) {
@@ -28689,7 +28510,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,4421 @@
+/*
+ *
@@ -33115,7 +32936,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h 2008-01-10 00:04:51.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,71 @@
+#ifndef _WMI_HOST_H_
+#define _WMI_HOST_H_
@@ -33191,7 +33012,7 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/Makefile
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/Makefile 2008-01-09 18:10:12.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/Makefile 2008-01-11 12:20:32.000000000 +0100
@@ -0,0 +1,4 @@
+#
+# SDIO wlan ar600 card function driver
Modified: developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch
===================================================================
--- developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch 2008-01-11 14:25:55 UTC (rev 3815)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch 2008-01-11 18:24:44 UTC (rev 3816)
@@ -2,9 +2,9 @@
drivers/sdio/hcd/Kconfig | 14
drivers/sdio/hcd/Makefile | 1
drivers/sdio/hcd/s3c24xx/Makefile | 2
- drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1486 +++++++++++++++++++++++++++++++++
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1491 +++++++++++++++++++++++++++++++++
drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h | 66 +
- 5 files changed, 1569 insertions(+)
+ 5 files changed, 1574 insertions(+)
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/Kconfig
===================================================================
@@ -41,8 +41,8 @@
Index: linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2008-01-10 16:42:36.000000000 +0100
-@@ -0,0 +1,1486 @@
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c 2008-01-10 21:22:51.000000000 +0100
+@@ -0,0 +1,1491 @@
+/*
+ * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
+ *
@@ -610,12 +610,12 @@
+ container_of(work, struct s3c24xx_hcd_context, io_work);
+ unsigned long flags;
+
-+ spin_lock_irqsave(&context->lock, 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);
++// enable_irq(context->io_irq);
+ return;
+ }
+
@@ -663,9 +663,9 @@
+
+ s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_START);
+
-+ spin_unlock_irqrestore(&context->lock, flags);
++// spin_unlock_irqrestore(&context->lock, flags);
+ wait_for_completion(&context->dma_complete);
-+ spin_lock_irqsave(&context->lock, flags);
++// spin_lock_irqsave(&context->lock, flags);
+
+ s3c24xx_hcd_dma_complete(context);
+ } else {
@@ -675,13 +675,15 @@
+ }
+
+ 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);
++// spin_unlock_irqrestore(&context->lock, flags);
+
+ SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_TRANSFER_DONE);
+}
@@ -999,6 +1001,9 @@
+ req = GET_CURRENT_REQUEST(hcd);
+ DBG_ASSERT(req != NULL);
+
++ if (req->Flags & SDREQ_FLAGS_DATA_SHORT_TRANSFER)
++ printk("### SHORT TRANSFER ###\n");
++
+ spin_lock_irqsave(&context->lock, flags);
+
+ /* Clear command, data and fifo status registers */
More information about the commitlog
mailing list