r3813 - developers/sameo/patches/ar6k-atheros-2.0

sameo at sita.openmoko.org sameo at sita.openmoko.org
Thu Jan 10 17:07:43 CET 2008


Author: sameo
Date: 2008-01-10 17:07:39 +0100 (Thu, 10 Jan 2008)
New Revision: 3813

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: First gigabytes xfered on a 2.0 ar6k driver.
IRQs were turned off for too long.


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-10 15:12:12 UTC (rev 3812)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_function.patch	2008-01-10 16:07:39 UTC (rev 3813)
@@ -2,7 +2,8 @@
  drivers/sdio/function/Kconfig                                |   11 
  drivers/sdio/function/Makefile                               |    1 
  drivers/sdio/function/wlan/Makefile                          |    4 
- drivers/sdio/function/wlan/ar6000/Makefile                   |   38 
+ drivers/sdio/function/wlan/ar6000/Makefile                   |   36 
+ drivers/sdio/function/wlan/ar6000/ar6000/Makefile            |  103 
  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 +
@@ -13,10 +14,12 @@
  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/netbuf.c            |  225 
- drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h       |  319 
- drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c      | 1855 ++++
+ 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/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 ++
@@ -36,7 +39,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          |   28 
+ drivers/sdio/function/wlan/ar6000/include/a_osapi.h          |   31 
  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 
@@ -77,18 +80,19 @@
  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                  | 3918 +++++++++
+ drivers/sdio/function/wlan/ar6000/wmi/wmi.c                  | 3920 +++++++++
  drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h              | 4421 +++++++++++
  drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h             |   71 
- 84 files changed, 32495 insertions(+)
+ 88 files changed, 32666 insertions(+)
 
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/Kconfig
+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-omoko/drivers/sdio/function/Kconfig	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Kconfig	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,11 @@
 +#menu "SDIO function drivers"
 +
@@ -102,17 +106,17 @@
 +
 +#endmenu
 \ No newline at end of file
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/Makefile
+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-omoko/drivers/sdio/function/Makefile	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/Makefile	2008-01-09 18:10:12.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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,3070 @@
 +/*
 + *
@@ -3184,10 +3188,10 @@
 +   A_UINT32 targReplyArg)
 +{
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_drv.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,361 @@
 +/*
 + *
@@ -3550,10 +3554,10 @@
 +#endif
 +
 +#endif /* _AR6000_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6000_raw_if.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,439 @@
 +/*
 + *
@@ -3994,10 +3998,10 @@
 +    return length;
 +}
 +#endif /* HTC_RAW_INTERFACE */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ar6xapi_linux.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,128 @@
 +#ifndef _AR6XAPI_LINUX_H
 +#define _AR6XAPI_LINUX_H
@@ -4127,10 +4131,10 @@
 +#endif
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/athdrv_linux.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,993 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5125,10 +5129,10 @@
 +}
 +#endif
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/athtypes_linux.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,47 @@
 +/*
 + * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/athtypes_linux.h#1 $
@@ -5177,10 +5181,10 @@
 +
 +
 +#endif /* _ATHTYPES_LINUX_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/config_linux.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,44 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -5226,10 +5230,10 @@
 +#endif
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/debug_linux.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,86 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -5317,10 +5321,10 @@
 +#endif
 +
 +#endif /* _DEBUG_LINUX_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/ioctl.c	2008-01-10 13:45:45.000000000 +0100
++++ 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 @@
 +/*
 + *
@@ -7893,10 +7897,118 @@
 +    return ret;
 +}
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/netbuf.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,225 @@
 +
 +/*
@@ -8123,11 +8235,11 @@
 +    return A_OK;
 +}
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/osapi_linux.h	2008-01-10 13:45:45.000000000 +0100
-@@ -0,0 +1,319 @@
++++ 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 @@
 +/*
 + * $Id: //depot/sw/releases/olca2.0-GPL/host/os/linux/include/osapi_linux.h#1 $
 + *
@@ -8162,16 +8274,10 @@
 +#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))
@@ -8447,11 +8553,11 @@
 +#endif /* __KERNEL__ */
 +
 +#endif /* _OSAPI_LINUX_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c
+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-omoko/drivers/sdio/function/wlan/ar6000/ar6000/wireless_ext.c	2008-01-10 13:45:45.000000000 +0100
-@@ -0,0 +1,1855 @@
++++ 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 @@
 +/*
 + *
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -8525,6 +8631,7 @@
 +    param = (struct ar_giwscan_param *)arg;
 +
 +    if (param->current_ev >= param->end_buf) {
++	    printk("%s(): 1\n", __FUNCTION__);
 +        return;
 +    }
 +    if ((param->firstPass == TRUE) &&
@@ -8532,6 +8639,7 @@
 +        /*
 +         * Only forward wpa bss's in first pass
 +         */
++	    printk("%s(): 2\n", __FUNCTION__);
 +        return;
 +    }
 +
@@ -8540,6 +8648,7 @@
 +        /*
 +         * Only forward non-wpa bss's in 2nd pass
 +         */
++	     printk("%s(): 3\n", __FUNCTION__);
 +        return;
 +    }
 +
@@ -8714,13 +8823,16 @@
 +        wmi_iterate_nodes(ar->arWmi, ar6000_scan_node, &param);
 +        param.firstPass = FALSE;
 +        if (param.current_ev >= param.end_buf) {
++		printk("TOO BIG\n");
 +            data->length = param.current_ev - extra;
 +            return -E2BIG;
 +        }
 +    }
 +
-+    if(!(data->length = param.current_ev - extra))
-+        return -EAGAIN;
++    if(!(data->length = param.current_ev - extra)) {
++	    printk("%s(): data length %d\n", __FUNCTION__, data->length);
++	    //return -EAGAIN;
++    }
 +    return 0;
 +}
 +
@@ -10307,10 +10419,10 @@
 +#endif /* __ATH_CENTRAL_IOCTL_DISPATCHER___ */
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/bmi/bmi.c
+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-omoko/drivers/sdio/function/wlan/ar6000/bmi/bmi.c	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/bmi/bmi.c	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,657 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -10969,10 +11081,10 @@
 +
 +    return status;
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h
+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-omoko/drivers/sdio/function/wlan/ar6000/bmi/bmi_internal.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,45 @@
 +#ifndef BMI_INTERNAL_H
 +#define BMI_INTERNAL_H
@@ -11019,10 +11131,19 @@
 +                 A_UINT32 length);
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/hif/hif.c
+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-omoko/drivers/sdio/function/wlan/ar6000/hif/hif.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,818 @@
 +/*
 + * @file: hif.c
@@ -11842,10 +11963,10 @@
 +
 +    return;
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h
+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-omoko/drivers/sdio/function/wlan/ar6000/hif/hif_internal.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,102 @@
 +/*
 + * @file: hif_internal.h
@@ -11949,10 +12070,72 @@
 +
 +void
 +delHifDevice(SDDEVICE *handle);
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k.c
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,991 @@
 +/*
 + * AR6K device layer that handles register level I/O
@@ -12945,10 +13128,10 @@
 +
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k_events.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,638 @@
 +/*
 + * AR6K Driver layer event handling (i.e. interrupts, message polling)
@@ -13588,10 +13771,10 @@
 +}
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k.h
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/ar6k.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/ar6k.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,191 @@
 +/*
 + *
@@ -13784,10 +13967,10 @@
 +#endif
 +
 +#endif /*AR6K_H_*/
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/htc.c
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/htc.c	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/htc/htc.c	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,507 @@
 +/*
 + *
@@ -14296,10 +14479,10 @@
 +    return FALSE;
 +#endif
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_debug.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,65 @@
 +#ifndef HTC_DEBUG_H_
 +#define HTC_DEBUG_H_
@@ -14366,10 +14549,10 @@
 +void DebugDumpBytes(A_UCHAR *buffer, A_UINT16 length, char *pDescription);
 +
 +#endif /*HTC_DEBUG_H_*/
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_internal.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,168 @@
 +/*
 + *
@@ -14539,10 +14722,10 @@
 +#endif
 +
 +#endif /* _HTC_INTERNAL_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_recv.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,703 @@
 +/*
 + *
@@ -15247,10 +15430,10 @@
 +}
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_send.c
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_send.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,541 @@
 +/*
 + *
@@ -15793,10 +15976,10 @@
 +    UNLOCK_HTC_TX(target);
 +
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_services.c
+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-omoko/drivers/sdio/function/wlan/ar6000/htc/htc_services.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,403 @@
 +/*
 + *
@@ -16201,10 +16384,10 @@
 +    }
 +
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/a_config.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/a_config.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,27 @@
 +#ifndef _A_CONFIG_H_
 +#define _A_CONFIG_H_
@@ -16233,10 +16416,10 @@
 +#include "../ar6000/config_linux.h"
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/a_debug.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/a_debug.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,41 @@
 +#ifndef _A_DEBUG_H_
 +#define _A_DEBUG_H_
@@ -16279,10 +16462,10 @@
 +#include "../ar6000/debug_linux.h"
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/a_drv_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,185 @@
 +#ifndef _A_DRV_API_H_
 +#define _A_DRV_API_H_
@@ -16469,10 +16652,10 @@
 +#endif
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/a_drv.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/a_drv.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,28 @@
 +#ifndef _A_DRV_H_
 +#define _A_DRV_H_
@@ -16502,11 +16685,12 @@
 +#include "../ar6000/athdrv_linux.h"
 +
 +#endif /* _ADRV_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/a_osapi.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/a_osapi.h	2008-01-10 13:45:45.000000000 +0100
-@@ -0,0 +1,28 @@
++++ 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
 +#ifndef _A_OSAPI_H_
 +#define _A_OSAPI_H_
 +/*
@@ -16534,11 +16718,13 @@
 +
 +#include "../ar6000/osapi_linux.h"
 +
++
++bla
 +#endif /* _OSAPI_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/ar6000_api.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-omoko/drivers/sdio/function/wlan/ar6000/include/ar6000_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,29 @@
 +#ifndef _AR6000_API_H_
 +#define _AR6000_API_H_
@@ -16569,10 +16755,10 @@
 +
 +#endif /* _AR6000_API_H */
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/ar6000_diag.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,38 @@
 +/*
 + *
@@ -16612,10 +16798,10 @@
 +                     A_UCHAR *data, A_UINT32 length);
 +
 +#endif /*AR6000_DIAG_H_*/
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/AR6001_regdump.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,100 @@
 +/*
 + * Copyright (c) 2006 Atheros Communications Inc.
@@ -16717,10 +16903,10 @@
 +#define RD_SIZE         (34*4) /* Space for this number of words */
 +
 +#endif /* __AR6000_REGDUMP_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/AR6Khwreg.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,147 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -16869,10 +17055,10 @@
 +#endif
 +
 +#endif /* __AR6KHWREG_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,36 @@
 +#define __VER_MAJOR_ 2
 +#define __VER_MINOR_ 0
@@ -16910,10 +17096,10 @@
 +#define AR6K_SW_VERSION 	( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW
+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-omoko/drivers/sdio/function/wlan/ar6000/include/AR6K_version.h.NEW	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,36 @@
 +#define __VER_MAJOR_ 2
 +#define __VER_MINOR_ 0
@@ -16951,10 +17137,10 @@
 +#define AR6K_SW_VERSION 	( ( __VER_MAJOR_ << VER_MAJOR_BIT_OFFSET ) + ( __VER_MINOR_ << VER_MINOR_BIT_OFFSET ) + ( __VER_PATCH_ << VER_PATCH_BIT_OFFSET ) + ( __BUILD_NUMBER_ << VER_BUILD_NUM_BIT_OFFSET ) )
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/athdefs.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/athdefs.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdefs.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,85 @@
 +#ifndef __ATHDEFS_H__
 +#define __ATHDEFS_H__
@@ -17041,10 +17227,10 @@
 +}WLAN_CAPABILITY;
 +
 +#endif /* __ATHDEFS_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/athdrv.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/athdrv.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athdrv.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,32 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -17078,10 +17264,10 @@
 +#endif
 +
 +#endif /* _ATHDRV_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/athendpack.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/athendpack.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athendpack.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,41 @@
 +/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 + * @file: athendpack.h
@@ -17124,10 +17310,10 @@
 +#include "../os/wince/include/athendpack_wince.h"
 +#endif /* WINCE */
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/athstartpack.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/athstartpack.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/athstartpack.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,42 @@
 +/*+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 + * @file: athstartpack.h
@@ -17171,10 +17357,10 @@
 +#include "../os/wince/include/athstartpack_wince.h"
 +#endif /* WINCE */
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/a_types.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/a_types.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,28 @@
 +#ifndef _A_TYPES_H_
 +#define _A_TYPES_H_
@@ -17204,10 +17390,10 @@
 +#include "../ar6000/athtypes_linux.h"
 +
 +#endif /* _ATHTYPES_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/bmi.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/bmi.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/bmi.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,100 @@
 +#ifndef _BMI_H_
 +#define _BMI_H_
@@ -17309,10 +17495,10 @@
 +#endif
 +
 +#endif /* _BMI_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/bmi_msg.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,199 @@
 +#ifndef __BMI_MSG_H__
 +#define __BMI_MSG_H__
@@ -17513,10 +17699,10 @@
 +
 +
 +#endif /* __BMI_MSG_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/common_drv.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/common_drv.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,61 @@
 +/*
 + *
@@ -17579,10 +17765,10 @@
 +#endif
 +
 +#endif /*COMMON_DRV_H_*/
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dbglog_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,46 @@
 +#ifndef _DBGLOG_API_H_
 +#define _DBGLOG_API_H_
@@ -17630,10 +17816,10 @@
 +#endif
 +
 +#endif /* _DBGLOG_API_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dbglog.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dbglog.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dbglog.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,107 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -17742,10 +17928,10 @@
 +#endif
 +
 +#endif /* _DBGLOG_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dbglog_id.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,307 @@
 +/*
 + *
@@ -18054,10 +18240,10 @@
 +#endif
 +
 +#endif /* _DBGLOG_ID_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dl_list.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dl_list.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,114 @@
 +/*
 + *
@@ -18173,10 +18359,10 @@
 +}
 +
 +#endif /* __DL_LIST_H___ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dset_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dset_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,63 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -18241,10 +18427,10 @@
 +
 +
 +#endif /* _DSET_API_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dsetid.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dsetid.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/dsetid.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,110 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18356,10 +18542,10 @@
 +#define DSETID_BPATCH_FLAG                0x80000000
 +
 +#endif /* __DSETID_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/dset_internal.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/dset_internal.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2007 Atheros Communications Inc.
@@ -18400,10 +18586,10 @@
 +} dset_descriptor_t;
 +
 +#endif /* __DSET_INTERNAL_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/gpio_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/gpio_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,57 @@
 +#ifndef _GPIO_API_H_
 +#define _GPIO_API_H_
@@ -18462,10 +18648,10 @@
 +A_STATUS wmi_gpio_intr_ack(struct wmi_t *wmip, A_UINT32 ack_mask);
 +
 +#endif /* _GPIO_API_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/gpio.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/gpio.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/gpio.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,34 @@
 +/*
 + * Copyright (c) 2005 Atheros Communications Inc.
@@ -18501,10 +18687,10 @@
 +
 +#define GPIO_LAST_REGISTER_ID   GPIO_ID_PIN(17)
 +#define GPIO_ID_NONE            0xffffffff
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/hif.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/hif.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/hif.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,291 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -18797,10 +18983,10 @@
 +#endif
 +
 +#endif /* _HIF_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/host_version.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/host_version.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,49 @@
 +#ifndef _HOST_VERSION_H_
 +#define _HOST_VERSION_H_
@@ -18851,10 +19037,10 @@
 +#endif
 +
 +#endif /* _HOST_VERSION_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/htc_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/htc_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,436 @@
 +/*
 + *
@@ -19292,10 +19478,10 @@
 +#endif
 +
 +#endif /* _HTC_API_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/htc.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/htc.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/htc.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,190 @@
 +/*
 + * Copyright (c) 2007 Atheros Communications Inc.
@@ -19487,10 +19673,10 @@
 +
 +#endif /* __HTC_H__ */
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/htc_packet.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/htc_packet.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,138 @@
 +/*
 + *
@@ -19630,10 +19816,10 @@
 +}
 +
 +#endif /*HTC_PACKET_H_*/
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/htc_services.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/htc_services.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,37 @@
 +/*
 + * Copyright (c) 2007 Atheros Communications Inc.
@@ -19672,10 +19858,10 @@
 +#define HTC_RAW_STREAMS_SVC MAKE_SERVICE_ID(HTC_TEST_GROUP,0)
 +
 +#endif /*HTC_SERVICES_H_*/
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/ieee80211.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/ieee80211.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/ieee80211.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,342 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -20019,10 +20205,10 @@
 +#include "athendpack.h"
 +
 +#endif /* _NET80211_IEEE80211_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/ieee80211_ioctl.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,163 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20187,10 +20373,10 @@
 +#endif
 +
 +#endif /* _IEEE80211_IOCTL_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/ieee80211_node.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,77 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -20269,10 +20455,10 @@
 +#define WLAN_NODE_INACT_TIMEOUT_MSEC            10000
 +
 +#endif /* _IEEE80211_NODE_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/ini_dset.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/ini_dset.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,40 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20314,10 +20500,10 @@
 +} POSTPACK INI_DSET_REG_OVERRIDE;
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/regDb.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/regDb.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regDb.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,19 @@
 +/*
 + * Copyright (c) 2005 Atheros Communications, Inc.
@@ -20338,10 +20524,10 @@
 +#include "./regulatory/reg_dbvalues.h"
 +
 +#endif  /* __REG_DB_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/regdump.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/regdump.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/regdump.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,33 @@
 +#ifndef __REGDUMP_H__
 +#define __REGDUMP_H__
@@ -20376,10 +20562,10 @@
 +};
 +#endif /* __ASSEMBLER__ */
 +#endif /* __REGDUMP_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/targaddrs.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/targaddrs.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/targaddrs.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,158 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
@@ -20539,10 +20725,10 @@
 +#endif /* !__ASSEMBLER__ */
 +
 +#endif /* __TARGADDRS_H__ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/testcmd.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/testcmd.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/testcmd.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,144 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -20688,10 +20874,10 @@
 +#endif
 +
 +#endif /* TESTCMD_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/wlan_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/wlan_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,101 @@
 +#ifndef _HOST_WLAN_API_H_
 +#define _HOST_WLAN_API_H_
@@ -20794,10 +20980,10 @@
 +#endif
 +
 +#endif /* _HOST_WLAN_API_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/wlan_dset.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,20 @@
 +/*
 + * Copyright (c) 2007 Atheros Communications, Inc.
@@ -20819,10 +21005,10 @@
 +} POSTPACK WOW_CONFIG_DSET;
 +
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/wmi_api.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/wmi_api.h	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,259 @@
 +#ifndef _WMI_API_H_
 +#define _WMI_API_H_
@@ -21083,10 +21269,10 @@
 +#endif
 +
 +#endif /* _WMI_API_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/wmi.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/wmi.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmi.h	2008-01-10 00:08:50.000000000 +0100
 @@ -0,0 +1,1739 @@
 +/*
 + * Copyright (c) 2004-2006 Atheros Communications Inc.
@@ -21144,7 +21330,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 {
@@ -22827,10 +23013,10 @@
 +#endif
 +
 +#endif /* _WMI_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/include/wmix.h
+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-omoko/drivers/sdio/function/wlan/ar6000/include/wmix.h	2008-01-10 13:45:45.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/ar6000/include/wmix.h	2008-01-09 18:10:12.000000000 +0100
 @@ -0,0 +1,233 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -23065,17 +23251,15 @@
 +#endif
 +
 +#endif /* _WMIX_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/Makefile
+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-omoko/drivers/sdio/function/wlan/ar6000/Makefile	2008-01-10 14:58:31.000000000 +0100
-@@ -0,0 +1,38 @@
++++ 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 @@
 +REV ?= 2
 +
-+PWD := $(shell pwd)
++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
 +
-+EXTRA_CFLAGS += -I$(src)/include
-+
 +EXTRA_CFLAGS += -DLINUX -DDEBUG -D__KERNEL__ -DHTC_RAW_INTERFACE\
 +                -DTCMD -DSEND_EVENT_TO_APP -DUSER_KEYS \
 +                -DNO_SYNC_FLUSH #\
@@ -23108,10 +23292,10 @@
 +               wlan/wlan_utils.o
 +
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c
+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-omoko/drivers/sdio/function/wlan/ar6000/miscdrv/common_drv.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,467 @@
 +
 +/*
@@ -23580,10 +23764,10 @@
 +
 +}
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c
+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-omoko/drivers/sdio/function/wlan/ar6000/miscdrv/credit_dist.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,346 @@
 +
 +/*
@@ -23931,10 +24115,19 @@
 +    return A_OK;
 +}
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c
+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-omoko/drivers/sdio/function/wlan/ar6000/wlan/wlan_node.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,371 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -24307,10 +24500,10 @@
 +	wlan_node_dec_free (ni);
 +	IEEE80211_NODE_UNLOCK (nt);
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c
+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-omoko/drivers/sdio/function/wlan/ar6000/wlan/wlan_recv_beacon.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,192 @@
 +/*-
 + * Copyright (c) 2001 Atsushi Onoe
@@ -24504,10 +24697,10 @@
 +
 +    return A_OK;
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c
+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-omoko/drivers/sdio/function/wlan/ar6000/wlan/wlan_utils.c	2008-01-10 13:45:45.000000000 +0100
++++ 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
 @@ -0,0 +1,59 @@
 +/*
 + * Copyright (c) 2004-2005 Atheros Communications Inc.
@@ -24568,11 +24761,11 @@
 +        return 15 + ((freq - 2512) / 20);
 +    return (freq - 5000) / 5;
 +}
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/wmi/wmi.c
+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-omoko/drivers/sdio/function/wlan/ar6000/wmi/wmi.c	2008-01-10 13:45:45.000000000 +0100
-@@ -0,0 +1,3918 @@
++++ 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 @@
 +/*
 + * Copyright (c) 2004-2007 Atheros Communications Inc.
 + * All rights reserved.
@@ -24600,9 +24793,10 @@
 +#include <athdefs.h>
 +#include <a_types.h>
 +#include <a_osapi.h>
-+#include "htc.h"
-+#include "htc_api.h"
-+#include "wmi.h"
++#include <htc.h>
++#include <htc_api.h>
++//#include <wmi.h>
++#include "../include/wmi.h"
 +#include <ieee80211.h>
 +#include <ieee80211_node.h>
 +#include <wlan_api.h>
@@ -24615,6 +24809,7 @@
 +#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,
@@ -28491,10 +28686,10 @@
 +                         NO_SYNC_WMIFLAG));
 +}
 +
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h
+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-omoko/drivers/sdio/function/wlan/ar6000/wmi/wmi_doc.h	2008-01-10 13:45:46.000000000 +0100
++++ 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
 @@ -0,0 +1,4421 @@
 +/*
 + *
@@ -32917,10 +33112,10 @@
 +
 +=====================================================================
 +#endif
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h
+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-omoko/drivers/sdio/function/wlan/ar6000/wmi/wmi_host.h	2008-01-10 13:45:46.000000000 +0100
++++ 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
 @@ -0,0 +1,71 @@
 +#ifndef _WMI_HOST_H_
 +#define _WMI_HOST_H_
@@ -32993,10 +33188,10 @@
 +#endif
 +
 +#endif /* _WMI_HOST_H_ */
-Index: linux-2.6.22-atheros-2.0-omoko/drivers/sdio/function/wlan/Makefile
+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-omoko/drivers/sdio/function/wlan/Makefile	2008-01-10 13:45:46.000000000 +0100
++++ linux-2.6.22-atheros-2.0-tmp/drivers/sdio/function/wlan/Makefile	2008-01-09 18:10:12.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-10 15:12:12 UTC (rev 3812)
+++ developers/sameo/patches/ar6k-atheros-2.0/atheros_2_0_hcd.patch	2008-01-10 16:07:39 UTC (rev 3813)
@@ -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 | 1485 +++++++++++++++++++++++++++++++++
+ drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 1486 +++++++++++++++++++++++++++++++++
  drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.h |   66 +
- 5 files changed, 1568 insertions(+)
+ 5 files changed, 1569 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-09 18:09:52.000000000 +0100
-@@ -0,0 +1,1485 @@
++++ 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 @@
 +/*
 + * s3c24xx_hcd.c - Samsung S3C MCI driver, Atheros SDIO API compatible.
 + *
@@ -608,8 +608,9 @@
 +	PSDREQUEST req;
 +	struct s3c24xx_hcd_context * context =
 +		container_of(work, struct s3c24xx_hcd_context, io_work);
++	unsigned long flags;
 +
-+	disable_irq(context->io_irq);
++	spin_lock_irqsave(&context->lock, flags);
 +
 +	req = GET_CURRENT_REQUEST(&context->hcd);
 +	if (req == NULL) {
@@ -662,7 +663,9 @@
 +
 +				s3c2410_dma_ctrl(context->dma_channel, S3C2410_DMAOP_START);
 +
++				spin_unlock_irqrestore(&context->lock, flags);
 +				wait_for_completion(&context->dma_complete);
++				spin_lock_irqsave(&context->lock, flags);
 +
 +				s3c24xx_hcd_dma_complete(context);
 +			} else {
@@ -678,11 +681,9 @@
 +	writel(0, context->base + S3C2410_SDICMDARG);
 +	writel(0, context->base + S3C2410_SDICMDCON);
 +
-+//	enable_irq(context->io_irq);
++	spin_unlock_irqrestore(&context->lock, flags);
 +
 +	SDIO_HandleHcdEvent(&context->hcd, EVENT_HCD_TRANSFER_DONE);
-+
-+	enable_irq(context->io_irq);
 +}
 +
 +void s3c24xx_hcd_dma_done(struct s3c2410_dma_chan *dma_ch, void *buf_id,





More information about the commitlog mailing list