Changeset 3885

Show
Ignore:
Timestamp:
12/17/08 19:41:06 (3 years ago)
Author:
proski
Message:

Merge ath_hal into hal directory, remove references to ath_hal

We don't need to keep a separate wrapper directory anymore. Also remove
more references to TARGET.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • madwifi/branches/madwifi-free/Makefile

    r3883 r3885  
    4646include $(TOP)/Makefile.inc 
    4747 
    48 obj-y := ath/ ath_hal/ ath_rate/ net80211/ 
     48obj-y := ath/ ath_rate/ hal/ net80211/ 
    4949 
    5050ifdef CRYPTO_TESTING 

  • madwifi/branches/madwifi-free/Makefile.inc

    r3883 r3885  
    123123endif 
    124124# 
    125 # Path to HAL/OS interface code 
    126 # 
    127 ATH_HAL= $(TOP)/ath_hal 
    128 # 
    129125# Path to the 802.11 include files. 
    130126# 

  • madwifi/branches/madwifi-free/Makefile.kernel

    r3536 r3885  
    44O_TARGET := madwifi.o 
    55 
    6 subdir-$(CONFIG_ATHEROS)                += ath ath_hal net80211 
     6subdir-$(CONFIG_ATHEROS)                += ath hal net80211 
    77subdir-$(CONFIG_ATHEROS_RATE_AMRR)      += ath_rate/amrr 
    88subdir-$(CONFIG_ATHEROS_RATE_MINSTREL)  += ath_rate/minstrel 
    …… 
    2020        obj-y += ath/ath_pci.o 
    2121endif 
    22         obj-y += ath_hal/ath_hal.o 
     22        obj-y += hal/ath_hal.o 
    2323        obj-y += net80211/net80211.o 
    2424endif 
    …… 
    3333obj-$(CONFIG_ATHEROS_RATE_ONOE)         += ath_rate/onoe/ 
    3434obj-$(CONFIG_ATHEROS_RATE_SAMPLE)       += ath_rate/sample/ 
    35 obj-$(CONFIG_ATHEROS)                   += ath/ ath_hal/ net80211/ 
     35obj-$(CONFIG_ATHEROS)                   += ath/ hal/ net80211/ 
    3636 
    3737endif 

  • madwifi/branches/madwifi-free/ath/Makefile

    r3883 r3885  
    6060ath_$(BUSNAME)-objs     := if_ath.o if_ath_radar.o if_ath_hal_extensions.o if_ath_$(BUSNAME).o 
    6161 
    62 INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL) -I$(WLAN) 
     62INCS += -I$(TOP) -I$(HAL) -I$(WLAN) 
    6363 
    6464EXTRA_CFLAGS+= $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/ath/Makefile.kernel

    r3883 r3885  
    1010 
    1111include $(TOP)/BuildCaps.inc 
    12 include $(TOP)/ath_hal/ah_target.inc 
    1312 
    14 ATH_HAL=$(TOP)/ath_hal 
    1513HAL=    $(TOP)/hal 
    1614WLAN=   $(TOP)/net80211 
    …… 
    3230 
    3331INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    34 INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL) -I$(WLAN) 
     32INCS += -I$(TOP) -I$(HAL) -I$(WLAN) 
    3533 
    3634EXTRA_CFLAGS += $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/ath_rate/amrr/Makefile

    r3883 r3885  
    4949include $(TOP)/Makefile.inc 
    5050 
    51 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     51INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    5252 
    5353EXTRA_CFLAGS+= $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/ath_rate/amrr/Makefile.kernel

    r3883 r3885  
    1111 
    1212include $(TOP)/BuildCaps.inc 
    13 include $(TOP)/ath_hal/ah_target.inc 
    1413 
    1514ATH=    $(TOP)/ath 
    16 ATH_HAL=$(TOP)/ath_hal 
    1715COMPAT= $(TOP)/include 
    1816HAL=    $(TOP)/hal 
    1917 
    2018INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    21 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     19INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    2220EXTRA_CFLAGS += $(INCS) $(COPTS) 
    2321 

  • madwifi/branches/madwifi-free/ath_rate/minstrel/Makefile

    r3883 r3885  
    4747include $(TOP)/Makefile.inc 
    4848 
    49 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     49INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    5050 
    5151EXTRA_CFLAGS+= $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/ath_rate/minstrel/Makefile.kernel

    r3883 r3885  
    1111 
    1212include $(TOP)/BuildCaps.inc 
    13 include $(TOP)/ath_hal/ah_target.inc 
    1413 
    1514ATH=    $(TOP)/ath 
    16 ATH_HAL=$(TOP)/ath_hal 
    1715COMPAT= $(TOP)/include 
    1816HAL=    $(TOP)/hal 
    1917 
    2018INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    21 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     19INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    2220EXTRA_CFLAGS += $(INCS) $(COPTS) 
    2321 

  • madwifi/branches/madwifi-free/ath_rate/onoe/Makefile

    r3883 r3885  
    4949include $(TOP)/Makefile.inc 
    5050 
    51 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     51INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    5252 
    5353EXTRA_CFLAGS+= $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/ath_rate/onoe/Makefile.kernel

    r3883 r3885  
    1111 
    1212include $(TOP)/BuildCaps.inc 
    13 include $(TOP)/ath_hal/ah_target.inc 
    1413 
    1514ATH=    $(TOP)/ath 
    16 ATH_HAL=$(TOP)/ath_hal 
    1715COMPAT= $(TOP)/include 
    1816HAL=    $(TOP)/hal 
    1917 
    2018INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    21 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     19INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    2220EXTRA_CFLAGS += $(INCS) $(COPTS) 
    2321 

  • madwifi/branches/madwifi-free/ath_rate/sample/Makefile

    r3883 r3885  
    4747include $(TOP)/Makefile.inc 
    4848 
    49 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     49INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    5050 
    5151EXTRA_CFLAGS+= $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/ath_rate/sample/Makefile.kernel

    r3883 r3885  
    1111 
    1212include $(TOP)/BuildCaps.inc 
    13 include $(TOP)/ath_hal/ah_target.inc 
    1413 
    1514ATH=    $(TOP)/ath 
    16 ATH_HAL=$(TOP)/ath_hal 
    1715COMPAT= $(TOP)/include 
    1816HAL=    $(TOP)/hal 
    1917 
    2018INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    21 INCS += -I$(TOP) -I$(ATH) -I$(ATH_HAL) -I$(HAL) 
     19INCS += -I$(TOP) -I$(ATH) -I$(HAL) 
    2220EXTRA_CFLAGS += $(INCS) $(COPTS) 
    2321 

  • madwifi/branches/madwifi-free/hal/Makefile

    • Property svn:mergeinfo set
    r3883 r3885  
    5353endif 
    5454 
    55 INCS += -I$(ATH_HAL) -I$(HAL) 
     55INCS += -I$(HAL) 
    5656 
    5757EXTRA_CFLAGS+= $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/hal/Makefile.kernel

    • Property svn:mergeinfo set
    r3883 r3885  
    1111include $(TOP)/BuildCaps.inc 
    1212 
    13 ATH_HAL=$(TOP)/ath_hal 
    1413COMPAT= $(TOP)/include 
    1514HAL=    $(TOP)/hal 
    1615 
    1716INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    18 INCS += -I$(ATH_HAL) -I$(HAL) 
     17INCS += -I$(HAL) 
    1918 
    2019EXTRA_CFLAGS += $(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/hal/ah_os.c

    • Property svn:mergeinfo set

  • madwifi/branches/madwifi-free/hal/ah_os.h

    • Property svn:mergeinfo set

  • madwifi/branches/madwifi-free/hal/ah_osdep.h

    • Property svn:mergeinfo set

  • madwifi/branches/madwifi-free/hal/opt_ah.h

    • Property svn:mergeinfo set

  • madwifi/branches/madwifi-free/net80211/Makefile

    r3883 r3885  
    7777include $(TOP)/Makefile.inc 
    7878 
    79 INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL) 
     79INCS += -I$(TOP) -I$(HAL) 
    8080 
    8181EXTRA_CFLAGS+=$(INCS) $(COPTS) 

  • madwifi/branches/madwifi-free/net80211/Makefile.kernel

    r3883 r3885  
    99 
    1010include $(TOP)/BuildCaps.inc 
    11 include $(TOP)/ath_hal/ah_target.inc 
    1211 
    1312COMPAT = $(TOP)/include 
    1413 
    15 ATH_HAL = $(TOP)/ath_hal 
    1614HAL = $(TOP)/hal 
    1715 
    1816INCS = -include $(COMPAT)/compat.h -I$(COMPAT) 
    19 INCS += -I$(TOP) -I$(ATH_HAL) -I$(HAL) 
     17INCS += -I$(TOP) -I$(HAL) 
    2018EXTRA_CFLAGS += $(INCS) $(COPTS) 
    2119 

  • madwifi/branches/madwifi-free/patch-kernel/install.sh

    r3748 r3885  
    7575 
    7676echo "Copying source files" 
    77 FILES=$(cd ${SRC} && find ath ath_hal ath_rate hal include net80211 -name '*.[ch]') 
     77FILES=$(cd ${SRC} && find ath ath_rate hal include net80211 -name '*.[ch]') 
    7878for f in $FILES; do 
    7979        case $f in 
    …… 
    8989        cp -f ${SRC}/$f $(dirname ${MADWIFI}/$f)/Makefile 
    9090done 
    91 cp -f ${SRC}/ath_hal/ah_target.inc ${MADWIFI}/ath_hal 
    9291 
    9392echo "Copying Atheros HAL files" 

  • madwifi/branches/madwifi-free/tools/Makefile

    r3693 r3885  
    3838MANDIR ?= /usr/local/man 
    3939 
    40 ATH_HAL = $(TOP)/ath_hal 
    41  
    4240# 
    4341# Path to the HAL source code. 
    …… 
    5351SUBDIRS = ath_info 
    5452 
    55 INCS = -I. -I$(HAL) -I$(TOP) -I$(ATH_HAL) 
     53INCS = -I. -I$(HAL) -I$(TOP) 
    5654CFLAGS = -g -O2 -Wall 
    5755ALL_CFLAGS = $(CFLAGS) $(INCS)