From: Hasso Tepper Date: Sun, 17 May 2009 11:54:14 +0000 (+0300) Subject: Make it possible to build ath(4) hal into the kernel. X-Git-Tag: v2.3.2~257^2 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/70966a774dadbac373bd30878099feea84c02cac Make it possible to build ath(4) hal into the kernel. Also fixes a LINT build. --- diff --git a/sys/conf/files b/sys/conf/files index 876cdf6416..e05189f0e9 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -180,8 +180,82 @@ dev/disk/aic7xxx/ahd_pci.c optional ahd pci dev/disk/aic7xxx/aic79xx.c optional ahd pci dev/disk/aic7xxx/aic79xx_osm.c optional ahd pci dev/disk/aic7xxx/aic79xx_pci.c optional ahd pci -dev/netif/ath/hal/ah_osdep.c optional ath_hal \ - compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath" +dev/netif/ath/hal/ah_osdep.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_attach.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_power.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_keycache.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_beacon.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_recv.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_misc.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_xmit.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_reset.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_phy.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5211/ar5211_interrupts.c optional ath_hal +dev/netif/ath/hal/ath_hal/ah_regdomain.c optional ath_hal +dev/netif/ath/hal/ath_hal/ah_eeprom_v1.c optional ath_hal +dev/netif/ath/hal/ath_hal/ah_eeprom_v3.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_power.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_adcgain.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_ani.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_attach.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_beacon.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_keycache.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar9160_attach.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_recv.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_gpio.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_eeprom.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_reset.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar2133.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_adcdc.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_interrupts.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_xmit.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_misc.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_phy.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5416/ar5416_cal_iq.c optional ath_hal +# XXX not yet +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_misc.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_interrupts.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_reset.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_eeprom.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_gpio.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5315_gpio.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_power.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5312/ar5312_attach.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_rfgain.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_interrupts.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_ani.c optional ath_hal +# XXX not yet +# dev/netif/ath/hal/ath_hal/ar5212/ar2316.c optional ath_hal +# dev/netif/ath/hal/ath_hal/ar5212/ar2317.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar2413.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5413.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_power.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar2425.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_recv.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_gpio.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_beacon.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_misc.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_xmit.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_eeprom.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_keycache.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_phy.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_attach.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5212_reset.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5111.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5212/ar5112.c optional ath_hal +dev/netif/ath/hal/ath_hal/ah.c optional ath_hal +dev/netif/ath/hal/ath_hal/ah_eeprom_v14.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_misc.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_xmit.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_power.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_keycache.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_beacon.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_reset.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_interrupts.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_attach.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_recv.c optional ath_hal +dev/netif/ath/hal/ath_hal/ar5210/ar5210_phy.c optional ath_hal dev/netif/ath/rate_amrr/amrr.c optional ath_rate_amrr \ compile-with "${NORMAL_C} -I$S/dev/netif/ath/ath" dev/netif/ath/rate_onoe/onoe.c optional ath_rate_onoe \ diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 675d43cf89..5d89d0dbd7 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -51,7 +51,7 @@ INCLUDES+= -I${.OBJDIR} -I"$S/${OSACPI_MI_DIR}" -I"$S/${ACPICA_DIR}/include" INCLUDES+= -I$S/contrib/ipfilter # ... and the same for Atheros HAL -INCLUDES+= -I$S/dev/netif/ath/hal +INCLUDES+= -I$S/dev/netif/ath/hal -I$S/dev/netif/ath/hal/ath_hal COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} diff --git a/sys/platform/pc32/conf/files b/sys/platform/pc32/conf/files index 4feef69586..918d7ca19c 100644 --- a/sys/platform/pc32/conf/files +++ b/sys/platform/pc32/conf/files @@ -38,16 +38,6 @@ ukbdmap.h optional ukbd_dflt_keymap \ emulation/dragonfly12/dfbsd12_getdirentries.c nonoptional compat_df12 emulation/dragonfly12/dfbsd12_stat.c nonoptional compat_df12 # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# emulation/linux/linux_file.c optional compat_linux emulation/linux/linux_getcwd.c optional compat_linux emulation/linux/linux_ioctl.c optional compat_linux diff --git a/sys/platform/pc64/conf/files b/sys/platform/pc64/conf/files index 671ad07ef6..dce96ad991 100644 --- a/sys/platform/pc64/conf/files +++ b/sys/platform/pc64/conf/files @@ -31,16 +31,6 @@ ukbdmap.h optional ukbd_dflt_keymap \ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/amd64-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/amd64-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/amd64-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/amd64-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# emulation/linux/linux_file.c optional compat_linux32 emulation/linux/linux_getcwd.c optional compat_linux32 emulation/linux/linux_ioctl.c optional compat_linux32