diff options
| -rw-r--r-- | package/madwifi/Makefile | 2 | ||||
| -rw-r--r-- | package/madwifi/patches/102-multicall_binary.patch | 94 | ||||
| -rw-r--r-- | package/madwifi/patches/127-regaccess.patch | 312 |
3 files changed, 48 insertions, 360 deletions
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 117720fa4..3f6be3f9c 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -PKG_REV:=2996 +PKG_REV:=3053 PKG_VERSION:=r$(PKG_REV) PKG_BRANCH:=madwifi-dfs PKG_RELEASE:=1 diff --git a/package/madwifi/patches/102-multicall_binary.patch b/package/madwifi/patches/102-multicall_binary.patch index e70e24c4a..2a5600ced 100644 --- a/package/madwifi/patches/102-multicall_binary.patch +++ b/package/madwifi/patches/102-multicall_binary.patch @@ -1,7 +1,7 @@ -Index: madwifi-ng-r2834-20071106/tools/80211debug.c +Index: madwifi-dfs-r3012/tools/80211debug.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/80211debug.c 2007-11-07 14:01:59.745356362 +0100 -+++ madwifi-ng-r2834-20071106/tools/80211debug.c 2007-11-07 14:02:00.181381212 +0100 +--- madwifi-dfs-r3012.orig/tools/80211debug.c 2007-12-12 23:38:16.916125282 +0100 ++++ madwifi-dfs-r3012/tools/80211debug.c 2007-12-12 23:39:07.114985947 +0100 @@ -49,6 +49,10 @@ #include <getopt.h> #include <err.h> @@ -10,10 +10,10 @@ Index: madwifi-ng-r2834-20071106/tools/80211debug.c +#include "do_multi.h" +#endif + - #define N(a) (sizeof(a)/sizeof(a[0])) + #undef ARRAY_SIZE + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - static const char *progname; -@@ -180,9 +184,19 @@ +@@ -184,9 +188,19 @@ } #endif /* __linux__ */ @@ -33,10 +33,10 @@ Index: madwifi-ng-r2834-20071106/tools/80211debug.c const char *ifname = "ath0"; const char *cp, *tp; const char *sep; -Index: madwifi-ng-r2834-20071106/tools/80211stats.c +Index: madwifi-dfs-r3012/tools/80211stats.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/80211stats.c 2007-11-07 14:01:59.753356821 +0100 -+++ madwifi-ng-r2834-20071106/tools/80211stats.c 2007-11-07 14:02:00.181381212 +0100 +--- madwifi-dfs-r3012.orig/tools/80211stats.c 2007-12-12 23:38:16.924125726 +0100 ++++ madwifi-dfs-r3012/tools/80211stats.c 2007-12-12 23:38:32.068988792 +0100 @@ -60,6 +60,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -48,7 +48,7 @@ Index: madwifi-ng-r2834-20071106/tools/80211stats.c #ifndef SIOCG80211STATS #define SIOCG80211STATS (SIOCDEVPRIVATE + 2) #endif -@@ -241,9 +245,19 @@ +@@ -239,9 +243,19 @@ #undef STAT } @@ -68,10 +68,10 @@ Index: madwifi-ng-r2834-20071106/tools/80211stats.c int c, len; struct ieee80211req_sta_info *si; u_int8_t buf[24*1024], *cp; -Index: madwifi-ng-r2834-20071106/tools/athchans.c +Index: madwifi-dfs-r3012/tools/athchans.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/athchans.c 2007-11-07 14:01:59.757357047 +0100 -+++ madwifi-ng-r2834-20071106/tools/athchans.c 2007-11-07 14:02:00.189381667 +0100 +--- madwifi-dfs-r3012.orig/tools/athchans.c 2007-12-12 23:38:16.932126191 +0100 ++++ madwifi-dfs-r3012/tools/athchans.c 2007-12-12 23:38:32.072989019 +0100 @@ -59,6 +59,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -104,10 +104,10 @@ Index: madwifi-ng-r2834-20071106/tools/athchans.c const char *ifname = "wifi0"; struct ieee80211req_chanlist chanlist; int c; -Index: madwifi-ng-r2834-20071106/tools/athctrl.c +Index: madwifi-dfs-r3012/tools/athctrl.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/athctrl.c 2007-11-07 14:01:59.765357502 +0100 -+++ madwifi-ng-r2834-20071106/tools/athctrl.c 2007-11-07 14:02:00.193381896 +0100 +--- madwifi-dfs-r3012.orig/tools/athctrl.c 2007-12-12 23:38:16.940126655 +0100 ++++ madwifi-dfs-r3012/tools/athctrl.c 2007-12-12 23:38:32.076989248 +0100 @@ -53,6 +53,10 @@ #include <net/if.h> @@ -139,10 +139,10 @@ Index: madwifi-ng-r2834-20071106/tools/athctrl.c char device[IFNAMSIZ + 1]; int distance = -1; int c; -Index: madwifi-ng-r2834-20071106/tools/athdebug.c +Index: madwifi-dfs-r3012/tools/athdebug.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/athdebug.c 2007-11-07 14:01:59.773357960 +0100 -+++ madwifi-ng-r2834-20071106/tools/athdebug.c 2007-11-07 14:02:00.193381896 +0100 +--- madwifi-dfs-r3012.orig/tools/athdebug.c 2007-12-12 23:38:16.944126879 +0100 ++++ madwifi-dfs-r3012/tools/athdebug.c 2007-12-12 23:39:24.779992618 +0100 @@ -52,6 +52,10 @@ #include <getopt.h> #include <err.h> @@ -151,10 +151,10 @@ Index: madwifi-ng-r2834-20071106/tools/athdebug.c +#include "do_multi.h" +#endif + - #define N(a) (sizeof(a)/sizeof(a[0])) + #undef ARRAY_SIZE + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) - static const char *progname; -@@ -187,9 +191,20 @@ +@@ -193,9 +197,20 @@ } #endif /* __linux__ */ @@ -175,10 +175,10 @@ Index: madwifi-ng-r2834-20071106/tools/athdebug.c #ifdef __linux__ const char *ifname = "wifi0"; #else -Index: madwifi-ng-r2834-20071106/tools/athkey.c +Index: madwifi-dfs-r3012/tools/athkey.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/athkey.c 2007-11-07 14:01:59.777358186 +0100 -+++ madwifi-ng-r2834-20071106/tools/athkey.c 2007-11-07 14:02:00.193381896 +0100 +--- madwifi-dfs-r3012.orig/tools/athkey.c 2007-12-12 23:38:16.952127326 +0100 ++++ madwifi-dfs-r3012/tools/athkey.c 2007-12-12 23:38:32.080989474 +0100 @@ -59,6 +59,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -210,13 +210,13 @@ Index: madwifi-ng-r2834-20071106/tools/athkey.c const char *ifname = "wifi0"; struct ieee80211req_key setkey; struct ieee80211req_del_key delkey; -Index: madwifi-ng-r2834-20071106/tools/athstats.c +Index: madwifi-dfs-r3012/tools/athstats.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/athstats.c 2007-11-07 14:01:59.785358642 +0100 -+++ madwifi-ng-r2834-20071106/tools/athstats.c 2007-11-07 14:02:00.193381896 +0100 -@@ -63,6 +63,10 @@ - #include "wireless_copy.h" - #include "if_athioctl.h" +--- madwifi-dfs-r3012.orig/tools/athstats.c 2007-12-12 23:38:16.960127784 +0100 ++++ madwifi-dfs-r3012/tools/athstats.c 2007-12-12 23:38:32.080989474 +0100 +@@ -66,6 +66,10 @@ + #undef ARRAY_SIZE + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#ifdef DOMULTI +#include "do_multi.h" @@ -225,7 +225,7 @@ Index: madwifi-ng-r2834-20071106/tools/athstats.c static const struct { u_int phyerr; const char* desc; -@@ -226,9 +230,20 @@ +@@ -227,9 +231,20 @@ signalled = 1; } @@ -246,10 +246,10 @@ Index: madwifi-ng-r2834-20071106/tools/athstats.c #ifdef __linux__ const char *ifname = "wifi0"; #else -Index: madwifi-ng-r2834-20071106/tools/do_multi.c +Index: madwifi-dfs-r3012/tools/do_multi.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ madwifi-ng-r2834-20071106/tools/do_multi.c 2007-11-07 14:02:00.197382122 +0100 ++++ madwifi-dfs-r3012/tools/do_multi.c 2007-12-12 23:38:32.080989474 +0100 @@ -0,0 +1,32 @@ +#include <string.h> +#include "do_multi.h" @@ -283,10 +283,10 @@ Index: madwifi-ng-r2834-20071106/tools/do_multi.c + + return ret; +} -Index: madwifi-ng-r2834-20071106/tools/do_multi.h +Index: madwifi-dfs-r3012/tools/do_multi.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ madwifi-ng-r2834-20071106/tools/do_multi.h 2007-11-07 14:02:00.197382122 +0100 ++++ madwifi-dfs-r3012/tools/do_multi.h 2007-12-12 23:38:32.084989703 +0100 @@ -0,0 +1,10 @@ + +int a80211debug_init(int argc, char *argv[]); @@ -298,10 +298,10 @@ Index: madwifi-ng-r2834-20071106/tools/do_multi.h +int athstats_init(int argc, char *argv[]); +int wlanconfig_init(int argc, char *argv[]); +int athinfo_init(int argc, char *argv[]); -Index: madwifi-ng-r2834-20071106/tools/Makefile +Index: madwifi-dfs-r3012/tools/Makefile =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/Makefile 2007-11-07 14:01:59.801359556 +0100 -+++ madwifi-ng-r2834-20071106/tools/Makefile 2007-11-07 14:02:00.197382122 +0100 +--- madwifi-dfs-r3012.orig/tools/Makefile 2007-12-12 23:38:16.976128701 +0100 ++++ madwifi-dfs-r3012/tools/Makefile 2007-12-12 23:38:32.084989703 +0100 @@ -47,9 +47,12 @@ endif @@ -367,10 +367,10 @@ Index: madwifi-ng-r2834-20071106/tools/Makefile install: $(ALL) install -d $(DESTDIR)$(BINDIR) -Index: madwifi-ng-r2834-20071106/tools/wlanconfig.c +Index: madwifi-dfs-r3012/tools/wlanconfig.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/wlanconfig.c 2007-11-07 14:01:59.809360011 +0100 -+++ madwifi-ng-r2834-20071106/tools/wlanconfig.c 2007-11-07 14:02:00.197382122 +0100 +--- madwifi-dfs-r3012.orig/tools/wlanconfig.c 2007-12-12 23:38:16.984129146 +0100 ++++ madwifi-dfs-r3012/tools/wlanconfig.c 2007-12-12 23:38:32.084989703 +0100 @@ -62,6 +62,10 @@ #include "net80211/ieee80211_crypto.h" #include "net80211/ieee80211_ioctl.h" @@ -382,7 +382,7 @@ Index: madwifi-ng-r2834-20071106/tools/wlanconfig.c /* * These are taken from ieee80211_node.h */ -@@ -96,9 +100,19 @@ +@@ -99,9 +103,19 @@ static int verbose = 0; @@ -402,11 +402,11 @@ Index: madwifi-ng-r2834-20071106/tools/wlanconfig.c const char *ifname, *cmd; unsigned char bnounit = 0; char *if_base = NULL; -Index: madwifi-ng-r2834-20071106/tools/ath_info.c +Index: madwifi-dfs-r3012/tools/ath_info.c =================================================================== ---- madwifi-ng-r2834-20071106.orig/tools/ath_info.c 2007-11-07 14:01:59.817360466 +0100 -+++ madwifi-ng-r2834-20071106/tools/ath_info.c 2007-11-07 14:02:00.201382352 +0100 -@@ -736,7 +736,12 @@ +--- madwifi-dfs-r3012.orig/tools/ath_info.c 2007-12-12 23:38:16.992129610 +0100 ++++ madwifi-dfs-r3012/tools/ath_info.c 2007-12-12 23:38:32.084989703 +0100 +@@ -738,7 +738,12 @@ "unlawful radio transmissions!\n\n"); } diff --git a/package/madwifi/patches/127-regaccess.patch b/package/madwifi/patches/127-regaccess.patch deleted file mode 100644 index a1fd96cc6..000000000 --- a/package/madwifi/patches/127-regaccess.patch +++ /dev/null @@ -1,312 +0,0 @@ -Index: madwifi-dfs-r2996/ath_hal/ah_os.h -=================================================================== ---- madwifi-dfs-r2996.orig/ath_hal/ah_os.h 2007-12-01 19:36:04.943396719 +0100 -+++ madwifi-dfs-r2996/ath_hal/ah_os.h 2007-12-01 19:37:06.182886560 +0100 -@@ -33,7 +33,7 @@ - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGES. - * -- * $Id: ah_os.h 2727 2007-10-05 17:42:53Z mtaylor $ -+ * $Id: ah_os.h 2933 2007-11-23 09:38:18Z proski $ - */ - #ifndef _ATH_AH_OS_H_ - #define _ATH_AH_OS_H_ -@@ -42,16 +42,16 @@ - * Atheros Hardware Access Layer (HAL) OS Dependent Definitions. - */ - --/* --MadWifi safe register operations: -+/* -+ MadWifi safe register operations: - -- When hacking on registers directly we need to use the macros -- below, to avoid concurrent PCI access and abort mode errors. -+ When hacking on registers directly, we need to use the macros below to -+ avoid concurrent PCI access and abort mode errors. - - * ath_reg_read - * ATH_REG_WRITE - --HAL-ONLY register operations: -+ HAL-ONLY register operations: - - * _OS_REG_READ - * _OS_REG_WRITE -@@ -60,26 +60,27 @@ - * ath_hal_reg_read. - * ath_hal_reg_write - -- When compiled in HAL: -- * We do not require locking overhead and function call unless user is debugging. -- * All HAL operations are executed in the context of a MadWifi wrapper call which holds -- the HAL lock. -- * Normally HAL is build with the non-modified version of this file so it doesnt have our -- funny macros anyway. -- -- When compiled in MadWifi: -- * The HAL wrapper API takes the HAL lock before invoking the HAL. -- * HAL access is already protected, and MadWifi must NOT access the functions listed above. -- -+ When compiled in HAL: -+ * We don't require locking overhead and function call except for -+ debugging. -+ * All HAL operations are executed in the context of a MadWifi wrapper -+ call that holds the HAL lock. -+ * Normally HAL is built with the non-modified version of this file, so -+ it doesn't have our funny macros anyway. -+ -+ When compiled in MadWifi: -+ * The HAL wrapper API takes the HAL lock before invoking the HAL. -+ * HAL access is already protected, and MadWifi must NOT access the -+ functions listed above. - */ - - /* -- * When building the HAL proper we use no GPL-contaminated include -- * files and must define these types ourself. Beware of these being -- * mismatched against the contents of <linux/types.h> -+ * When building the HAL proper, we use no GPL-licensed include files and must -+ * define Linux types ourselves. Please note that the definitions below don't -+ * exactly match those in <linux/types.h> - */ - #ifndef _LINUX_TYPES_H --/* NB: arm defaults to unsigned so be explicit */ -+/* NB: ARM defaults to unsigned, so be explicit */ - typedef signed char int8_t; - typedef short int16_t; - typedef int int32_t; -@@ -93,36 +94,33 @@ - typedef unsigned int size_t; - typedef unsigned int u_int; - typedef void* va_list; --#endif -+#endif /* !_LINUX_TYPES_H */ - - /* - * Linux/BSD gcc compatibility shims. - */ --#define __printflike(_a,_b) \ -- __attribute__ ((__format__ (__printf__, _a, _b))) --#define __va_list va_list -+#define __va_list va_list - #define OS_INLINE __inline - - extern int ath_hal_dma_beacon_response_time; - extern int ath_hal_sw_beacon_response_time; - extern int ath_hal_additional_swba_backoff; - --void __ahdecl ath_hal_vprintf(struct ath_hal *ah, const char* fmt, -- va_list ap); --void __ahdecl ath_hal_printf(struct ath_hal *ah, const char* fmt, ...); --const char* __ahdecl ath_hal_ether_sprintf(const u_int8_t *mac); -+void __ahdecl ath_hal_vprintf(struct ath_hal *ah, const char *fmt, va_list ap); -+void __ahdecl ath_hal_printf(struct ath_hal *ah, const char *fmt, ...); -+const char *__ahdecl ath_hal_ether_sprintf(const u_int8_t *mac); - int __ahdecl ath_hal_memcmp(const void *a, const void *b, size_t n); --void * __ahdecl ath_hal_malloc(size_t size); --void __ahdecl ath_hal_free(void* p); -+void *__ahdecl ath_hal_malloc(size_t size); -+void __ahdecl ath_hal_free(void *p); - - /* Delay n microseconds. */ --extern void __ahdecl ath_hal_delay(int); -+extern void __ahdecl ath_hal_delay(int); - #define OS_DELAY(_n) ath_hal_delay(_n) - - #define OS_MEMZERO(_a, _n) ath_hal_memzero((_a), (_n)) - extern void __ahdecl ath_hal_memzero(void *, size_t); - #define OS_MEMCPY(_d, _s, _n) ath_hal_memcpy(_d,_s,_n) --extern void * __ahdecl ath_hal_memcpy(void *, const void *, size_t); -+extern void *__ahdecl ath_hal_memcpy(void *, const void *, size_t); - - #ifndef abs - #define abs(_a) __builtin_abs(_a) -@@ -133,7 +131,7 @@ - #endif - - struct ath_hal; --extern u_int32_t __ahdecl ath_hal_getuptime(struct ath_hal *); -+extern u_int32_t __ahdecl ath_hal_getuptime(struct ath_hal *); - #define OS_GETUPTIME(_ah) ath_hal_getuptime(_ah) - - /* Byte order/swapping support. */ -@@ -142,9 +140,8 @@ - - #ifndef AH_BYTE_ORDER - /* -- * When the .inc file is not available (e.g. when building -- * in a kernel source tree); look for some other way to -- * setup the host byte order. -+ * When the .inc file is not available (e.g. when building in the kernel source -+ * tree), look for some other way to determine the host byte order. - */ - #ifdef __LITTLE_ENDIAN - #define AH_BYTE_ORDER AH_LITTLE_ENDIAN -@@ -155,93 +152,98 @@ - #ifndef AH_BYTE_ORDER - #error "Do not know host byte order" - #endif --#endif /* AH_BYTE_ORDER */ -+#endif /* AH_BYTE_ORDER */ - - /* -- * Note that register accesses are done using target-specific -- * functions when debugging is enabled (AH_DEBUG) or we are -- * explicitly configured this way. -- * -- * The hardware registers are native little-endian byte order. -- * Big-endian hosts are handled by enabling hardware byte-swap -- * of register reads and writes at reset. But the PCI clock -- * domain registers are not byte swapped! Thus, on big-endian -- * platforms we have to byte-swap thoese registers specifically. -- * Most of this code is collapsed at compile time because the -- * register values are constants. -- * -- * Presumably when talking about hardware byte-swapping, the above -- * text is referring to the Atheros chipset, as the registers -- * referred to are in the PCI memory address space, and these are -- * never byte-swapped by PCI chipsets or bridges, but always -- * written directly (i.e. the format defined by the manufacturer). -+ * Some big-endian architectures don't set CONFIG_GENERIC_IOMAP, but fail to -+ * implement iowrite32be and ioread32be. Provide compatibility macros when -+ * it's needed. -+ * -+ * As of Linux 2.6.24, only MIPS, PARISC and PowerPC implement iowrite32be and -+ * ioread32be as functions. -+ * -+ * The downside or the replacement macros it that we may be byte-swapping data -+ * for the second time, so the native implementations should be preferred. - */ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)) && \ -+ !defined(CONFIG_GENERIC_IOMAP) && (AH_BYTE_ORDER == AH_BIG_ENDIAN) && \ -+ !defined(__mips__) && !defined(__hppa__) && !defined(__powerpc__) -+# ifndef iowrite32be -+# define iowrite32be(_val, _addr) iowrite32(swab32((_val)), (_addr)) -+# endif -+# ifndef ioread32be -+# define ioread32be(_addr) swab32(ioread32((_addr))) -+# endif -+#endif -+ -+/* -+ * The register accesses are done using target-specific functions when -+ * debugging is enabled (AH_DEBUG) or it's explicitly requested for the target. -+ * -+ * The hardware registers use little-endian byte order natively. Big-endian -+ * systems are configured by HAL to enable hardware byte-swap of register reads -+ * and writes at reset. This avoid the need to byte-swap the data in software. -+ * However, the registers in a certain area from 0x4000 to 0x4fff (PCI clock -+ * domain registers) are not byte swapped! -+ * -+ * Since Linux I/O primitives default to little-endian operations, we only -+ * need to suppress byte-swapping on big-endian systems outside the area used -+ * by the PCI clock domain registers. -+ */ -+#if (AH_BYTE_ORDER == AH_BIG_ENDIAN) -+#define is_reg_le(__reg) ((0x4000 <= (__reg) && (__reg) < 0x5000)) -+#else -+#define is_reg_le(__reg) 1 -+#endif -+ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) --# if (AH_BYTE_ORDER == AH_BIG_ENDIAN) - #define _OS_REG_WRITE(_ah, _reg, _val) do { \ -- (0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -+ is_reg_le(_reg) ? \ - iowrite32((_val), (_ah)->ah_sh + (_reg)) : \ - iowrite32be((_val), (_ah)->ah_sh + (_reg)); \ - } while (0) - #define _OS_REG_READ(_ah, _reg) \ -- ((0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -+ (is_reg_le(_reg) ? \ - ioread32((_ah)->ah_sh + (_reg)) : \ -- ioread32be((_ah)->ah_sh + (_reg))); --# else /* AH_LITTLE_ENDIAN */ --#define _OS_REG_WRITE(_ah, _reg, _val) do { \ -- iowrite32(_val, (_ah)->ah_sh + (_reg)); \ -- } while (0) --#define _OS_REG_READ(_ah, _reg) \ -- ioread32((_ah)->ah_sh + (_reg)) -- --# endif /* AH_BYTE_ORDER */ -+ ioread32be((_ah)->ah_sh + (_reg))) - #else --# if (AH_BYTE_ORDER == AH_BIG_ENDIAN) - #define _OS_REG_WRITE(_ah, _reg, _val) do { \ -- writel((0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -+ writel(is_reg_le(_reg) ? \ - (_val) : cpu_to_le32(_val), \ - (_ah)->ah_sh + (_reg)); \ - } while (0) - #define _OS_REG_READ(_ah, _reg) \ -- ((0x4000 <= (_reg) && (_reg) < 0x5000) ? \ -+ (is_reg_le(_reg) ? \ - readl((_ah)->ah_sh + (_reg)) : \ - cpu_to_le32(readl((_ah)->ah_sh + (_reg)))) --# else /* AH_LITTLE_ENDIAN */ --#define _OS_REG_WRITE(_ah, _reg, _val) do { \ -- writel(_val, (_ah)->ah_sh + (_reg)); \ -- } while (0) --#define _OS_REG_READ(_ah, _reg) \ -- readl((_ah)->ah_sh + (_reg)) --# endif /* AH_BYTE_ORDER */ --#endif /* KERNEL_VERSON(2,6,12) */ -- --/* --The functions in this section are not intended to be invoked by MadWifi driver --code, but by the HAL. They are NOT safe for direct invocation when the --sc->sc_hal_lock is not held. Use ath_reg_read and ATH_REG_WRITE instead! -+#endif /* KERNEL_VERSION(2,6,12) */ -+ -+/* -+ * The functions in this section are not intended to be invoked by MadWifi -+ * driver code, but by the HAL. They are NOT safe to call directly when the -+ * sc->sc_hal_lock is not held. Use ath_reg_read and ATH_REG_WRITE instead! - */ - #if defined(AH_DEBUG) || defined(AH_REGOPS_FUNC) || defined(AH_DEBUG_ALQ) - #define OS_REG_WRITE(_ah, _reg, _val) ath_hal_reg_write(_ah, _reg, _val) - #define OS_REG_READ(_ah, _reg) ath_hal_reg_read(_ah, _reg) --extern void __ahdecl ath_hal_reg_write(struct ath_hal *ah, u_int reg, u_int32_t val); --extern u_int32_t __ahdecl ath_hal_reg_read(struct ath_hal *ah, u_int reg); -+extern void __ahdecl ath_hal_reg_write(struct ath_hal *ah, u_int reg, -+ u_int32_t val); -+extern u_int32_t __ahdecl ath_hal_reg_read(struct ath_hal *ah, u_int reg); - #else - #define OS_REG_WRITE(_ah, _reg, _val) _OS_REG_WRITE(_ah, _reg, _val) - #define OS_REG_READ(_ah, _reg) _OS_REG_READ(_ah, _reg) --#endif /* AH_DEBUG || AH_REGFUNC || AH_DEBUG_ALQ */ -+#endif /* AH_DEBUG || AH_REGFUNC || AH_DEBUG_ALQ */ - - extern char *ath_hal_func; - static inline void ath_hal_set_function(const char *name) --#if defined(AH_DEBUG) - { -+#ifdef AH_DEBUG - ath_hal_func = (char *)name; --} --#else --{ } - #endif -+} - - #ifdef AH_DEBUG_ALQ --extern void __ahdecl OS_MARK(struct ath_hal *, u_int id, u_int32_t value); -+extern void __ahdecl OS_MARK(struct ath_hal *, u_int id, u_int32_t value); - #else - #define OS_MARK(_ah, _id, _v) - #endif -@@ -253,8 +255,9 @@ - * compiled with the default calling convention and are not called - * from within the HAL. - */ --extern struct ath_hal *_ath_hal_attach(u_int16_t devid, HAL_SOFTC, -- HAL_BUS_TAG, HAL_BUS_HANDLE, HAL_STATUS*); --extern void _ath_hal_detach(struct ath_hal *); -+extern struct ath_hal *_ath_hal_attach(u_int16_t devid, HAL_SOFTC, -+ HAL_BUS_TAG, HAL_BUS_HANDLE, -+ HAL_STATUS *); -+extern void _ath_hal_detach(struct ath_hal *); - --#endif /* _ATH_AH_OSDEP_H_ */ -+#endif /* _ATH_AH_OSDEP_H_ */ |