madwifi-cvs

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 4064
Author      : proski (Pavel Roskin)
Date        : 2009-06-26 04:06:16 +0200 (Fri, 26 Jun 2009)

Log Message :
Allow compilation with BUS=AHB in 64-bit systems

Don't enable AHB support in HAL on 64-bit systems, it's not 64-bit clean
and is not meant to be.  Provide replacement definition for KSEG1ADDR
when it's not defined (that includes 64-bit mips).  Remove other
replacement definitions, they are not needed anymore.

Affected Files:
* madwifi/trunk/ath/if_ath_ahb.h                      updated             
* madwifi/trunk/ath_hal/Makefile                      updated             


Modified: madwifi/trunk/ath/if_ath_ahb.h
===================================================================
--- madwifi/trunk/ath/if_ath_ahb.h	2009-06-26 01:37:33 UTC (rev 4063)
+++ madwifi/trunk/ath/if_ath_ahb.h	2009-06-26 02:06:16 UTC (rev 4064)
@@ -104,12 +104,8 @@
 #define AR531X_BD_MAGIC 0x35333131   /* "5311", for all 531x platforms */
 
 /* Allow compiling on non-mips platforms for code verification */
-#ifndef __mips__
-#define CAC_ADDR(addr) (addr)
-#define UNCAC_ADDR(addr) (addr)
+#ifndef KSEG1ADDR
 #define KSEG1ADDR(addr) (addr)
-#define dma_cache_wback_inv(start,size)	\
-	do { (void) (start); (void) (size); } while (0)
 #endif
 
 #define bus_dma_sync_single	dma_sync_single_for_cpu

Modified: madwifi/trunk/ath_hal/Makefile
===================================================================
--- madwifi/trunk/ath_hal/Makefile	2009-06-26 01:37:33 UTC (rev 4063)
+++ madwifi/trunk/ath_hal/Makefile	2009-06-26 02:06:16 UTC (rev 4064)
@@ -115,6 +115,7 @@
 	ar5416/ar9160_attach.o
 
 ifeq ($(strip $(BUS)),AHB)
+ifeq ($(CONFIG_64BIT)),)
 ath_hal-objs += \
 	ar5312/ar5312_attach.o \
 	ar5312/ar5312_eeprom.o \
@@ -125,6 +126,7 @@
 	ar5312/ar5312_reset.o \
 	ar5312/ar5315_gpio.o
 endif
+endif
 
 ifdef LINUX24
 export-objs	:= ah_os.o