Date: Tue, 2 Dec 2008 22:04:01 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 153970 for review Message-ID: <200812022204.mB2M41j0028028@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=153970 Change 153970 by zec@zec_tpx32 on 2008/12/02 22:03:05 IFC @ 153966 Affected files ... .. //depot/projects/vimage/src/sys/amd64/Makefile#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#13 integrate .. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#11 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#9 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/CRB#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#9 integrate .. //depot/projects/vimage/src/sys/arm/conf/NSLU#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/SIMICS#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/SKYEYE#5 integrate .. //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i8134x/crb_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/arm/xscale/pxa/pxa_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#29 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#18 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#16 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#10 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.arm#8 integrate .. //depot/projects/vimage/src/sys/conf/files#45 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#16 integrate .. //depot/projects/vimage/src/sys/conf/files.arm#8 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#23 integrate .. //depot/projects/vimage/src/sys/conf/files.mips#5 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#15 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#15 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#14 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#13 integrate .. //depot/projects/vimage/src/sys/conf/options#37 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#8 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#13 integrate .. //depot/projects/vimage/src/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/README#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah.h#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_desc.h#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_devid.h#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.inc#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#4 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage/src/sys/contrib/dev/ath/version.h#4 delete .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#13 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#7 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#19 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#14 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#20 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_subr.c#13 integrate .. //depot/projects/vimage/src/sys/contrib/rdma/rdma_cma.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#17 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/amrr/amrr.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/onoe/onoe.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_rate/sample/sample.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#24 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_device.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#20 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#20 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#9 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#19 integrate .. //depot/projects/vimage/src/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_amd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#8 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#8 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#18 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#19 integrate .. //depot/projects/vimage/src/sys/dev/sdhci/sdhci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_upgt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#5 integrate .. //depot/projects/vimage/src/sys/geom/geom_bsd.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#12 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_mbr.c#5 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#5 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#27 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#25 integrate .. //depot/projects/vimage/src/sys/i386/conf/PAE#10 integrate .. //depot/projects/vimage/src/sys/i386/conf/XEN#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/vimage/src/sys/kern/Make.tags.inc#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#12 integrate .. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_shm.c#5 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#15 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#25 integrate .. //depot/projects/vimage/src/sys/mips/conf/IDT#5 integrate .. //depot/projects/vimage/src/sys/mips/conf/SENTRY5#5 integrate .. //depot/projects/vimage/src/sys/mips/mips/machdep.c#4 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#34 integrate .. //depot/projects/vimage/src/sys/modules/ae/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ath/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/ath_hal/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ath_rate_amrr/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/ath_rate_onoe/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/ath_rate_sample/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/bridgestp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/cxgb/iw_cxgb/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/if_ef/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/if_vlan/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/ip_mroute_mod/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/linprocfs/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/linux/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/atm/atm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/ether/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/pf/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/wlan/Makefile#6 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#17 integrate .. //depot/projects/vimage/src/sys/net/if.c#54 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#23 integrate .. //depot/projects/vimage/src/sys/net/if_ef.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#33 integrate .. //depot/projects/vimage/src/sys/net/if_faith.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_gre.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#34 integrate .. //depot/projects/vimage/src/sys/net/if_mib.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_spppsubr.c#14 integrate .. //depot/projects/vimage/src/sys/net/if_stf.c#15 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#22 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#15 integrate .. //depot/projects/vimage/src/sys/net/raw_cb.c#12 integrate .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/vimage/src/sys/net/route.c#36 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#14 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#10 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_eiface.c#20 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#18 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#12 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#44 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/ip6.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fastfwd.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#56 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/ip_id.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#43 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#23 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#47 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_offload.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#67 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#49 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#44 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#40 integrate .. //depot/projects/vimage/src/sys/netinet6/dest6.c#11 integrate .. //depot/projects/vimage/src/sys/netinet6/frag6.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#37 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#16 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#36 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_forward.c#18 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#41 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_ipsec.c#15 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#19 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#38 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#25 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#33 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#37 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#29 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#19 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#20 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#33 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#24 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#22 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#21 integrate .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#12 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#13 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#23 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/vimage/src/sys/pc98/conf/NOTES#10 integrate .. //depot/projects/vimage/src/sys/pci/if_rlreg.h#16 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#17 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#16 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#14 integrate .. //depot/projects/vimage/src/sys/sys/buf_ring.h#2 integrate .. //depot/projects/vimage/src/sys/sys/param.h#36 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#28 integrate .. //depot/projects/vimage/src/sys/sys/user.h#10 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#10 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/Makefile#2 (text+ko) ==== @@ -1,39 +1,38 @@ -# $FreeBSD: src/sys/amd64/Makefile,v 1.11 2002/06/21 06:18:02 mckusick Exp $ +# $FreeBSD: src/sys/amd64/Makefile,v 1.12 2008/12/01 14:15:10 kensmith Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 -# Makefile for i386 links, tags file +# Makefile for amd64 links, tags file # SYS is normally set in Make.tags.inc -# SYS=/sys -SYS=/nsys +SYS=/sys -TAGDIR= i386 +TAGDIR= amd64 .include "../kern/Make.tags.inc" all: @echo "make links or tags only" -# Directories in which to place i386 tags links -DI386= apm i386 ibcs2 include isa linux +# Directories in which to place amd64 tags links +DAMD64= acpica amd64 ia32 include isa linux32 pci links:: -for i in ${COMMDIR1}; do \ (cd $$i && { rm -f tags; ln -s ../${TAGDIR}/tags tags; }) done -for i in ${COMMDIR2}; do \ (cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done - -for i in ${DI386}; do \ + -for i in ${DAMD64}; do \ (cd $$i && { rm -f tags; ln -s ../tags tags; }) done -SI386= ${SYS}/i386/apm/*.[ch] \ - ${SYS}/i386/i386/*.[ch] ${SYS}/i386/ibcs2/*.[ch] \ - ${SYS}/i386/include/*.[ch] ${SYS}/i386/isa/*.[ch] \ - ${SYS}/i386/linux/*.[ch] -AI386= ${SYS}/i386/i386/*.s +SAMD64= ${SYS}/amd64/acpica/*.[ch] \ + ${SYS}/amd64/amd64/*.[ch] ${SYS}/amd64/ia32/*.[ch] \ + ${SYS}/amd64/include/*.[ch] ${SYS}/amd64/isa/*.[ch] \ + ${SYS}/amd64/linux32/*.[ch] ${SYS}/amd64/pci/*.[ch] +AAMD64= ${SYS}/amd64/amd64/*.S tags:: - -ctags -wdt ${COMM} ${SI386} - egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \ + -ctags -wdt ${COMM} ${SAMD64} + egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMD64} | \ sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> tags sort -o tags tags ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.166 2008/11/26 19:29:33 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.167 2008/11/30 00:10:55 mav Exp $"); #include "opt_cpu.h" @@ -368,7 +368,11 @@ tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: - if (amd_pminfo & AMDPM_TSC_INVARIANT) + if ((amd_pminfo & AMDPM_TSC_INVARIANT) || + (AMD64_CPU_FAMILY(cpu_id) == 0x6 && + AMD64_CPU_MODEL(cpu_id) >= 0xe) || + (AMD64_CPU_FAMILY(cpu_id) == 0xf && + AMD64_CPU_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; } ==== //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.41 2008/04/11 03:26:39 jeff Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.42 2008/12/02 14:19:53 ganbold Exp $ */ /* @@ -239,11 +239,8 @@ intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct intr_event *ie; - struct thread *td; int vector; - td = curthread; - /* * We count software interrupts when we process them. The * code here follows previous practice, but there's an ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#23 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.509 2008/11/12 09:52:06 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.511 2008/12/02 19:09:08 ed Exp $ cpu HAMMER ident GENERIC @@ -48,7 +48,7 @@ options PSEUDOFS # Pseudo-filesystem framework options GEOM_PART_GPT # GUID Partition Tables. options GEOM_LABEL # Provides labelization -options COMPAT_43TTY # BSD 4.3 TTY compat [KEEP THIS!] +options COMPAT_43TTY # BSD 4.3 TTY compat (sgtty) options COMPAT_IA32 # Compatible with i386 binaries options COMPAT_FREEBSD4 # Compatible with FreeBSD4 options COMPAT_FREEBSD5 # Compatible with FreeBSD5 @@ -249,7 +249,8 @@ device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's -device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_hal # pci/cardbus chip support +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vimage/src/sys/amd64/conf/NOTES#13 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.82 2008/08/08 16:26:53 stas Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.83 2008/12/01 16:53:01 sam Exp $ # # @@ -258,7 +258,6 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices # (requires miibus) @@ -284,12 +283,12 @@ device ural device wpi -device ath -device ath_hal # Atheros HAL (includes binary component) -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver -device ath_rate_sample # SampleRate rate control for the ath driver -#device wlan # 802.11 layer +device ath # Atheros pci/cardbus NIC's +device ath_hal # pci/cardbus chip support +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +device ath_rate_sample # SampleRate tx rate control for ath +#device ath_rate_amrr # AMRR rate control for ath driver +#device ath_rate_onoe # Onoe rate control for ath driver # #XXX this stores pointers in a 32bit field that is defined by the hardware ==== //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.39 2008/10/13 18:59:59 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.40 2008/11/30 22:58:27 stas Exp $"); /* * ARM bus dma support routines @@ -673,9 +673,8 @@ bus_addr_t paddr; if ((map->pagesneeded == 0)) { - CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, " - "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem), - dmat->boundary, dmat->alignment); + CTR3(KTR_BUSDMA, "lowaddr= %d, boundary= %d, alignment= %d", + dmat->lowaddr, dmat->boundary, dmat->alignment); CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d", map, map->pagesneeded); /* ==== //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#2 (text+ko) ==== @@ -44,10 +44,9 @@ */ #include "opt_msgbuf.h" -#include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.1 2008/11/25 18:40:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_machdep.c,v 1.3 2008/12/01 10:16:25 stas Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -342,7 +341,7 @@ * but since we are boot strapping the addresses used for the read * may have just been remapped and thus the cache could be out * of sync. A re-clean after the switch will cure this. - * After booting there are no gross reloations of the kernel thus + * After booting there are no gross relocations of the kernel thus * this problem will not occur after initarm(). */ cpu_idcache_wbinv_all(); ==== //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#7 (text) ==== @@ -26,7 +26,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.8 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.10 2008/11/30 22:40:11 stas Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,7 +54,7 @@ bus_space_handle_t sc_sh; struct resource *mem_res; /* Memory resource */ device_t dev; - int main_clock_hz; + unsigned int main_clock_hz; uint32_t pllb_init; } *pmc_softc; @@ -145,6 +145,18 @@ &ohci_clk }; +#if !defined(AT91C_MAIN_CLOCK) +static const unsigned int at91_mainf_tbl[] = { + 3000000, 3276800, 3686400, 3840000, 4000000, + 4433619, 4915200, 5000000, 5242880, 6000000, + 6144000, 6400000, 6553600, 7159090, 7372800, + 7864320, 8000000, 9830400, 10000000, 11059200, + 12000000, 12288000, 13560000, 14318180, 14745600, + 16000000, 17344700, 18432000, 20000000 +}; +#define MAINF_TBL_LEN (sizeof(at91_mainf_tbl) / sizeof(*at91_mainf_tbl)) +#endif + static inline uint32_t RD4(struct at91_pmc_softc *sc, bus_size_t off) { @@ -301,7 +313,7 @@ } static void -at91_pmc_init_clock(struct at91_pmc_softc *sc, int main_clock) +at91_pmc_init_clock(struct at91_pmc_softc *sc, unsigned int main_clock) { uint32_t mckr; int freq; @@ -384,21 +396,52 @@ return (0); } +#if !defined(AT91C_MAIN_CLOCK) +static unsigned int +at91_pmc_sense_mainf(struct at91_pmc_softc *sc) +{ + unsigned int ckgr_val; + unsigned int diff, matchdiff; + int i, match; + + ckgr_val = (RD4(sc, CKGR_MCFR) & CKGR_MCFR_MAINF_MASK) << 11; + + /* + * Try to find the standard frequency that match best. + */ + match = 0; + matchdiff = abs(ckgr_val - at91_mainf_tbl[0]); + for (i = 1; i < MAINF_TBL_LEN; i++) { + diff = abs(ckgr_val - at91_mainf_tbl[i]); + if (diff < matchdiff) { + match = i; + matchdiff = diff; + } + } + return (at91_mainf_tbl[match]); +} +#endif + static int at91_pmc_attach(device_t dev) { + unsigned int mainf; int err; pmc_softc = device_get_softc(dev); pmc_softc->dev = dev; if ((err = at91_pmc_activate(dev)) != 0) return err; -#if defined(AT91_TSC) | defined (AT91_BWCT) - at91_pmc_init_clock(pmc_softc, 16000000); + + /* + * Configure main clock frequency. + */ +#if !defined(AT91C_MAIN_CLOCK) + mainf = at91_pmc_sense_mainf(pmc_softc); #else - at91_pmc_init_clock(pmc_softc, 10000000); + mainf = AT91C_MAIN_CLOCK; #endif - + at91_pmc_init_clock(pmc_softc, mainf); return (0); } ==== //depot/projects/vimage/src/sys/arm/conf/AVILA#9 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.17 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.19 2008/12/01 16:53:01 sam Exp $ ident AVILA @@ -30,6 +30,7 @@ include "../xscale/ixp425/std.avila" #To statically compile in device wiring instead of /boot/device.hints hints "AVILA.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale @@ -127,6 +128,7 @@ device wlan_xauth device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath options ATH_DEBUG ==== //depot/projects/vimage/src/sys/arm/conf/BWCT#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.7 2008/11/25 19:05:46 imp Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.8 2008/11/30 17:53:19 sam Exp $ ident BWCT @@ -27,6 +27,7 @@ #To statically compile in device wiring instead of /boot/device.hints #hints "hints.at91rm9200" hints "BWCT.hints" +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB ==== //depot/projects/vimage/src/sys/arm/conf/CRB#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CRB,v 1.6 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/CRB,v 1.7 2008/11/30 17:53:19 sam Exp $ ident CRB @@ -28,6 +28,7 @@ include "../xscale/i8134x/std.crb" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale ==== //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#4 (text+ko) ==== @@ -1,13 +1,14 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.3 2008/11/19 11:47:23 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-78XXX,v 1.4 2008/11/30 17:53:19 sam Exp $ # ident DB-88F78XX include "../mv/discovery/std.db78xxx" options SOC_MV_DISCOVERY +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" ==== //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#4 (text+ko) ==== @@ -1,13 +1,14 @@ # # Custom kernel for Marvell DB-88F5xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.3 2008/11/19 11:47:23 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F5XXX,v 1.4 2008/11/30 17:53:19 sam Exp $ # ident DB-88F5XXX include "../mv/orion/std.db88f5xxx" options SOC_MV_ORION +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" ==== //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#4 (text+ko) ==== @@ -1,13 +1,14 @@ # # Custom kernel for Marvell DB-88F6xxx boards. # -# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.3 2008/11/19 11:47:23 raj Exp $ +# $FreeBSD: src/sys/arm/conf/DB-88F6XXX,v 1.4 2008/11/30 17:53:19 sam Exp $ # ident DB-88F6XXX include "../mv/kirkwood/std.db88f6xxx" options SOC_MV_KIRKWOOD +makeoptions MODULES_OVERRIDE="" #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" ==== //depot/projects/vimage/src/sys/arm/conf/GUMSTIX#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.2 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/GUMSTIX,v 1.3 2008/11/30 17:53:19 sam Exp $ ident GUMSTIX cpu CPU_XSCALE_PXA2X0 @@ -34,6 +34,7 @@ include "../xscale/pxa/std.pxa" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options HZ=100 ==== //depot/projects/vimage/src/sys/arm/conf/KB920X#9 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.20 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.21 2008/11/30 17:53:19 sam Exp $ ident KB920X @@ -24,6 +24,7 @@ # The AT91 platform doesn't use /boot/loader, so we have to statically wire # hints. hints "KB920X.hints" +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB ==== //depot/projects/vimage/src/sys/arm/conf/NSLU#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/NSLU,v 1.3 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/NSLU,v 1.4 2008/11/30 17:53:19 sam Exp $ ident NSLU @@ -29,6 +29,7 @@ include "../xscale/ixp425/std.avila" #To statically compile in device wiring instead of /boot/device.hints hints "NSLU.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale ==== //depot/projects/vimage/src/sys/arm/conf/SIMICS#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.17 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.18 2008/11/30 17:53:19 sam Exp $ ident SIMICS @@ -25,6 +25,7 @@ include "../sa11x0/std.sa11x0" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=strongarm ==== //depot/projects/vimage/src/sys/arm/conf/SKYEYE#5 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.11 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.12 2008/11/30 17:53:19 sam Exp $ ident KB920X @@ -26,6 +26,7 @@ include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. +makeoptions MODULES_OVERRIDE="" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=arm9 ==== //depot/projects/vimage/src/sys/arm/mv/mv_machdep.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.2 2008/11/06 16:25:12 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_machdep.c,v 1.3 2008/12/01 10:16:25 stas Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -579,7 +579,7 @@ * but since we are boot strapping the addresses used for the read * may have just been remapped and thus the cache could be out * of sync. A re-clean after the switch will cure this. - * After booting there are no gross reloations of the kernel thus >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812022204.mB2M41j0028028>
