Date: Mon, 23 Feb 2009 18:47:04 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 158136 for review Message-ID: <200902231847.n1NIl4Zw096951@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=158136 Change 158136 by jhb@jhb_jhbbsd on 2009/02/23 18:46:27 IFC @158130 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#39 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#88 integrate .. //depot/projects/smpng/sys/boot/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#26 integrate .. //depot/projects/smpng/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#20 integrate .. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#19 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#41 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#9 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#47 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#47 integrate .. //depot/projects/smpng/sys/conf/kern.mk#22 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#64 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#20 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#50 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#21 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#94 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#70 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#70 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#51 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/smpng/sys/dev/md/md.c#87 integrate .. //depot/projects/smpng/sys/dev/usb/FILES#7 delete .. //depot/projects/smpng/sys/dev/usb/dsbr100io.h#4 delete .. //depot/projects/smpng/sys/dev/usb/ehci.c#37 delete .. //depot/projects/smpng/sys/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/smpng/sys/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/smpng/sys/dev/usb/ehci_mbus.c#3 delete .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#30 delete .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#12 delete .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#18 delete .. //depot/projects/smpng/sys/dev/usb/hid.c#14 delete .. //depot/projects/smpng/sys/dev/usb/hid.h#5 delete .. //depot/projects/smpng/sys/dev/usb/if_aue.c#53 delete .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#15 delete .. //depot/projects/smpng/sys/dev/usb/if_axe.c#35 delete .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#11 delete .. //depot/projects/smpng/sys/dev/usb/if_cdce.c#11 delete .. //depot/projects/smpng/sys/dev/usb/if_cdcereg.h#6 delete .. //depot/projects/smpng/sys/dev/usb/if_cue.c#35 delete .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#11 delete .. //depot/projects/smpng/sys/dev/usb/if_kue.c#32 delete .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#12 delete .. //depot/projects/smpng/sys/dev/usb/if_rue.c#23 delete .. //depot/projects/smpng/sys/dev/usb/if_ruereg.h#8 delete .. //depot/projects/smpng/sys/dev/usb/if_rum.c#9 delete .. //depot/projects/smpng/sys/dev/usb/if_rumreg.h#3 delete .. //depot/projects/smpng/sys/dev/usb/if_rumvar.h#4 delete .. //depot/projects/smpng/sys/dev/usb/if_udav.c#22 delete .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#8 delete .. //depot/projects/smpng/sys/dev/usb/if_upgt.c#3 delete .. //depot/projects/smpng/sys/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_ural.c#30 delete .. //depot/projects/smpng/sys/dev/usb/if_uralreg.h#5 delete .. //depot/projects/smpng/sys/dev/usb/if_uralvar.h#10 delete .. //depot/projects/smpng/sys/dev/usb/if_urtw.c#3 delete .. //depot/projects/smpng/sys/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_zyd.c#10 delete .. //depot/projects/smpng/sys/dev/usb/if_zydfw.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_zydreg.h#5 delete .. //depot/projects/smpng/sys/dev/usb/kue_fw.h#4 delete .. //depot/projects/smpng/sys/dev/usb/ohci.c#48 delete .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#23 delete .. //depot/projects/smpng/sys/dev/usb/ohcireg.h#9 delete .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#19 delete .. //depot/projects/smpng/sys/dev/usb/rio500_usb.h#5 delete .. //depot/projects/smpng/sys/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/smpng/sys/dev/usb/sl811hs.c#7 delete .. //depot/projects/smpng/sys/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/smpng/sys/dev/usb/sl811hsvar.h#5 delete .. //depot/projects/smpng/sys/dev/usb/slhci_pccard.c#6 delete .. //depot/projects/smpng/sys/dev/usb/u3g.c#7 delete .. //depot/projects/smpng/sys/dev/usb/uark.c#5 delete .. //depot/projects/smpng/sys/dev/usb/ubsa.c#28 delete .. //depot/projects/smpng/sys/dev/usb/ubser.c#15 delete .. //depot/projects/smpng/sys/dev/usb/ubser.h#4 delete .. //depot/projects/smpng/sys/dev/usb/uchcom.c#2 delete .. //depot/projects/smpng/sys/dev/usb/ucom.c#35 delete .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#15 delete .. //depot/projects/smpng/sys/dev/usb/ucycom.c#5 delete .. //depot/projects/smpng/sys/dev/usb/udbp.c#18 delete .. //depot/projects/smpng/sys/dev/usb/udbp.h#5 delete .. //depot/projects/smpng/sys/dev/usb/ufm.c#18 delete .. //depot/projects/smpng/sys/dev/usb/ufoma.c#8 delete .. //depot/projects/smpng/sys/dev/usb/uftdi.c#25 delete .. //depot/projects/smpng/sys/dev/usb/uftdireg.h#4 delete .. //depot/projects/smpng/sys/dev/usb/ugen.c#42 delete .. //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#4 delete .. //depot/projects/smpng/sys/dev/usb/uhci.c#46 delete .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#22 delete .. //depot/projects/smpng/sys/dev/usb/uhcireg.h#7 delete .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#17 delete .. //depot/projects/smpng/sys/dev/usb/uhid.c#34 delete .. //depot/projects/smpng/sys/dev/usb/uhub.c#30 delete .. //depot/projects/smpng/sys/dev/usb/uipaq.c#7 delete .. //depot/projects/smpng/sys/dev/usb/ukbd.c#28 delete .. //depot/projects/smpng/sys/dev/usb/ulpt.c#26 delete .. //depot/projects/smpng/sys/dev/usb/umass.c#70 delete .. //depot/projects/smpng/sys/dev/usb/umct.c#13 delete .. //depot/projects/smpng/sys/dev/usb/umodem.c#29 delete .. //depot/projects/smpng/sys/dev/usb/ums.c#33 delete .. //depot/projects/smpng/sys/dev/usb/uplcom.c#33 delete .. //depot/projects/smpng/sys/dev/usb/urio.c#25 delete .. //depot/projects/smpng/sys/dev/usb/usb.c#40 delete .. //depot/projects/smpng/sys/dev/usb/usb.h#14 delete .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#17 delete .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#8 delete .. //depot/projects/smpng/sys/dev/usb/usb_if.m#3 delete .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#11 delete .. //depot/projects/smpng/sys/dev/usb/usb_mem.h#8 delete .. //depot/projects/smpng/sys/dev/usb/usb_port.h#29 delete .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#30 delete .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#10 delete .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#43 delete .. //depot/projects/smpng/sys/dev/usb/usbcdc.h#5 delete .. //depot/projects/smpng/sys/dev/usb/usbdevs#127 delete .. //depot/projects/smpng/sys/dev/usb/usbdi.c#31 delete .. //depot/projects/smpng/sys/dev/usb/usbdi.h#24 delete .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#15 delete .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#11 delete .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#20 delete .. //depot/projects/smpng/sys/dev/usb/usbhid.h#5 delete .. //depot/projects/smpng/sys/dev/usb/uscanner.c#41 delete .. //depot/projects/smpng/sys/dev/usb/uslcom.c#2 delete .. //depot/projects/smpng/sys/dev/usb/uvisor.c#22 delete .. //depot/projects/smpng/sys/dev/usb/uvscom.c#23 delete .. //depot/projects/smpng/sys/dev/usb/uxb360gp_rdesc.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.c#4 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_standard.h#4 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#11 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#61 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#129 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_osd.c#2 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/FILES#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/dsbr100io.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_pci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehcireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehcivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/hid.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/hid.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_aue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_auereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_axe.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_axereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cdce.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cuereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_kue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_kuereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_ruereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rum.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rumreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rumvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_udav.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_udavreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_upgt.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_ural.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_uralreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_uralvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtw.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_zyd.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_zydfw.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_zydreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/kue_fw.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohci_pci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohcireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohcivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/rio500_usb.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hs.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/u3g.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uark.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ubsa.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ubser.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ubser.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uchcom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ucom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ucomvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ucycom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/udbp.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/udbp.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ufm.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ufoma.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uftdi.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uftdireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ugen.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ugraphire_rdesc.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhci_pci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhcireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhcivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhid.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhub.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uipaq.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ukbd.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ulpt.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/umass.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/umct.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/umodem.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ums.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uplcom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/urio.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_ethersubr.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_ethersubr.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_if.m#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_mem.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_mem.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_port.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_quirks.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_quirks.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_subr.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbcdc.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdevs#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi_util.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi_util.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbhid.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uscanner.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uslcom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uvisor.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uvscom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/smpng/sys/modules/Makefile#155 integrate .. //depot/projects/smpng/sys/modules/aue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/axe/Makefile#4 delete .. //depot/projects/smpng/sys/modules/cdce/Makefile#3 delete .. //depot/projects/smpng/sys/modules/cue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ehci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/kue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ohci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/rue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/rum/Makefile#2 delete .. //depot/projects/smpng/sys/modules/slhci/Makefile#4 delete .. //depot/projects/smpng/sys/modules/u3g/Makefile#3 delete .. //depot/projects/smpng/sys/modules/uark/Makefile#2 delete .. //depot/projects/smpng/sys/modules/ubsa/Makefile#5 delete .. //depot/projects/smpng/sys/modules/ucom/Makefile#5 delete .. //depot/projects/smpng/sys/modules/udav/Makefile#4 delete .. //depot/projects/smpng/sys/modules/udbp/Makefile#5 delete .. //depot/projects/smpng/sys/modules/ufm/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ufoma/Makefile#2 delete .. //depot/projects/smpng/sys/modules/uftdi/Makefile#5 delete .. //depot/projects/smpng/sys/modules/ugen/Makefile#6 delete .. //depot/projects/smpng/sys/modules/uhci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/uhid/Makefile#6 delete .. //depot/projects/smpng/sys/modules/uipaq/Makefile#2 delete .. //depot/projects/smpng/sys/modules/ukbd/Makefile#10 delete .. //depot/projects/smpng/sys/modules/ulpt/Makefile#6 delete .. //depot/projects/smpng/sys/modules/umass/Makefile#5 delete .. //depot/projects/smpng/sys/modules/umct/Makefile#5 delete .. //depot/projects/smpng/sys/modules/umodem/Makefile#6 delete .. //depot/projects/smpng/sys/modules/ums/Makefile#6 delete .. //depot/projects/smpng/sys/modules/upgt/Makefile#2 delete .. //depot/projects/smpng/sys/modules/uplcom/Makefile#6 delete .. //depot/projects/smpng/sys/modules/ural/Makefile#3 delete .. //depot/projects/smpng/sys/modules/urio/Makefile#5 delete .. //depot/projects/smpng/sys/modules/urtw/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb/Makefile#12 delete .. //depot/projects/smpng/sys/modules/uscanner/Makefile#7 delete .. //depot/projects/smpng/sys/modules/uslcom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/uvisor/Makefile#5 delete .. //depot/projects/smpng/sys/modules/uvscom/Makefile#6 delete .. //depot/projects/smpng/sys/modules/zyd/Makefile#2 delete .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#42 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#31 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#6 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/aim/swtch.S#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#5 integrate .. //depot/projects/smpng/sys/powerpc/include/altivec.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/pcb.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/altivec.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#32 integrate .. //depot/projects/smpng/sys/sys/osd.h#2 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#78 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#105 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.160 2009/01/28 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -98,10 +98,8 @@ static void fpu_clean_state(void); -int hw_float = 1; -SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, - CTLFLAG_RD, &hw_float, 0, - "Floatingpoint instructions executed in hardware"); +SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, + NULL, 1, "Floating point instructions executed in hardware"); static struct savefpu fpu_cleanstate; static bool_t fpu_cleanstate_ready; ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#39 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.51 2009/01/29 09:22:56 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -900,7 +900,13 @@ KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for vector %u", vector)); +#ifdef notyet + /* + * We can not currently clear the idt entry because other cpus + * may have a valid vector at this offset. + */ setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +#endif } /* Release an APIC vector when it's no longer in use. */ @@ -924,9 +930,11 @@ if (sched_is_bound(td)) panic("apic_free_vector: Thread already bound.\n"); sched_bind(td, apic_cpuid(apic_id)); + thread_unlock(td); mtx_lock_spin(&icu_lock); lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; mtx_unlock_spin(&icu_lock); + thread_lock(td); sched_unbind(td); thread_unlock(td); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#88 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.647 2009/02/14 18:23:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.648 2009/02/23 06:00:24 alc Exp $"); /* * Manages physical address maps. @@ -1932,15 +1932,15 @@ pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || - pc->pc_map[2] != PC_FREE2) + pc->pc_map[2] != PC_FREE2) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); vm_page_unwire(m, 0); ==== //depot/projects/smpng/sys/boot/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/sys/boot/Makefile.inc,v 1.1 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/Makefile.inc,v 1.2 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= +SSP_CFLAGS= ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#26 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.88 2008/11/18 03:55:55 ache Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.89 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/smpng/sys/boot/ia64/common/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.2 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.3 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no LIB= ia64 INTERNALLIB= ==== //depot/projects/smpng/sys/boot/ia64/efi/Makefile#7 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.30 2009/02/21 15:04:31 ru Exp $ NO_MAN= -WITHOUT_SSP= .include <bsd.own.mk> +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/smpng/sys/boot/ia64/ski/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ NO_MAN= -WITHOUT_SSP= .include <bsd.own.mk> +MK_SSP= no PROG= skiload STRIP= # We must not strip skiload at install time. ==== //depot/projects/smpng/sys/boot/pc98/loader/Makefile#20 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.42 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#5 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.24 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.25 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} ==== //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#19 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include <bsd.own.mk> +MK_SSP= no PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64 ==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#41 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.100 2008/12/27 09:42:17 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.101 2009/02/23 18:16:17 thompsa Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -65,8 +65,8 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> +#include <legacy/dev/usb/usb.h> +#include <legacy/dev/usb/usbdi.h> #include <compat/ndis/pe_var.h> #include <compat/ndis/cfg_var.h> ==== //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.16 2008/12/28 13:50:58 ganbold Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.17 2009/02/23 18:16:17 thompsa Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,8 +56,8 @@ #include <machine/segments.h> #endif -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> +#include <legacy/dev/usb/usb.h> +#include <legacy/dev/usb/usbdi.h> #include <compat/ndis/pe_var.h> #include <compat/ndis/cfg_var.h> ==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#47 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.115 2008/12/27 08:03:32 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.116 2009/02/23 18:16:17 thompsa Exp $"); /* * This file implements a translation layer between the BSD networking @@ -95,8 +95,8 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> +#include <legacy/dev/usb/usb.h> +#include <legacy/dev/usb/usbdi.h> #include <compat/ndis/pe_var.h> #include <compat/ndis/cfg_var.h> ==== //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.4 2008/12/27 08:03:32 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.5 2009/02/23 18:16:17 thompsa Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -56,11 +56,11 @@ #include <net80211/ieee80211_var.h> #include <net80211/ieee80211_ioctl.h> -#include <dev/usb/usb.h> -#include <dev/usb/usbdi.h> -#include <dev/usb/usbdi_util.h> -#include <dev/usb/usbdivar.h> -#include <dev/usb/usb_quirks.h> +#include <legacy/dev/usb/usb.h> +#include <legacy/dev/usb/usbdi.h> +#include <legacy/dev/usb/usbdi_util.h> +#include <legacy/dev/usb/usbdivar.h> +#include <legacy/dev/usb/usb_quirks.h> #include "usbdevs.h" #include <compat/ndis/pe_var.h> ==== //depot/projects/smpng/sys/conf/files.powerpc#47 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.92 2009/01/25 18:20:15 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -126,6 +126,7 @@ powerpc/powermac/cuda.c optional powermac cuda powerpc/powermac/pmu.c optional powermac pmu powerpc/powermac/macgpio.c optional powermac pci +powerpc/powerpc/altivec.c optional aim powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard ==== //depot/projects/smpng/sys/conf/kern.mk#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.57 2008/07/23 06:16:34 imp Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -78,9 +78,10 @@ # # For PowerPC we tell gcc to use floating point emulation. This avoids using # floating point registers for integer operations which it has a tendency to do. +# Also explicitly disable Altivec instructions inside the kernel. # .if ${MACHINE_ARCH} == "powerpc" -CFLAGS+= -msoft-float +CFLAGS+= -msoft-float -mno-altivec INLINE_LIMIT?= 15000 .endif ==== //depot/projects/smpng/sys/dev/aac/aac.c#64 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.139 2009/02/18 01:36:20 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.141 2009/02/23 18:22:06 emaste Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -71,6 +71,7 @@ static void aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f); static void aac_get_bus_info(struct aac_softc *sc); +static void aac_daemon(void *arg); /* Command Processing */ static void aac_timeout(struct aac_softc *sc); @@ -292,6 +293,9 @@ TAILQ_INIT(&sc->aac_container_tqh); TAILQ_INIT(&sc->aac_ev_cmfree); + /* Initialize the clock daemon callout. */ + callout_init_mtx(&sc->aac_daemontime, &sc->aac_io_lock, 0); + /* * Initialize the adapter. */ @@ -349,9 +353,34 @@ aac_get_bus_info(sc); } + mtx_lock(&sc->aac_io_lock); + callout_reset(&sc->aac_daemontime, 30 * 60 * hz, aac_daemon, sc); + mtx_unlock(&sc->aac_io_lock); + return(0); } +static void +aac_daemon(void *arg) +{ + struct timeval tv; + struct aac_softc *sc; + struct aac_fib *fib; + + sc = arg; + mtx_assert(&sc->aac_io_lock, MA_OWNED); + + if (callout_pending(&sc->aac_daemontime) || + callout_active(&sc->aac_daemontime) == 0) + return; + getmicrotime(&tv); + aac_alloc_sync_fib(sc, &fib); + *(uint32_t *)fib->data = tv.tv_sec; + aac_sync_fib(sc, SendHostTime, 0, fib, sizeof(uint32_t)); + aac_release_sync_fib(sc); + callout_schedule(&sc->aac_daemontime, 30 * 60 * hz); +} + void aac_add_event(struct aac_softc *sc, struct aac_event *event) { @@ -632,9 +661,12 @@ bus_dma_tag_destroy(sc->aac_parent_dmat); /* release the register window mapping */ - if (sc->aac_regs_resource != NULL) + if (sc->aac_regs_res0 != NULL) + bus_release_resource(sc->aac_dev, SYS_RES_MEMORY, + sc->aac_regs_rid0, sc->aac_regs_res0); + if (sc->aac_hwif == AAC_HWIF_NARK && sc->aac_regs_res1 != NULL) bus_release_resource(sc->aac_dev, SYS_RES_MEMORY, - sc->aac_regs_rid, sc->aac_regs_resource); + sc->aac_regs_rid1, sc->aac_regs_res1); } /* @@ -654,6 +686,8 @@ if (sc->aac_state & AAC_STATE_OPEN) return(EBUSY); + callout_drain(&sc->aac_daemontime); + /* Remove the child containers */ while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) { error = device_delete_child(dev, co->co_disk); @@ -834,7 +868,7 @@ } index &= ~2; for (i = 0; i < sizeof(struct aac_fib)/4; ++i) - ((u_int32_t *)fib)[i] = AAC_GETREG4(sc, index + i*4); + ((u_int32_t *)fib)[i] = AAC_MEM1_GETREG4(sc, index + i*4); aac_handle_aif(sc, fib); free(fib, M_AACBUF); @@ -1754,26 +1788,33 @@ /* Remap mem. resource, if required */ if ((sc->flags & AAC_FLAGS_NEW_COMM) && - atu_size > rman_get_size(sc->aac_regs_resource)) { + atu_size > rman_get_size(sc->aac_regs_res1)) { bus_release_resource( sc->aac_dev, SYS_RES_MEMORY, - sc->aac_regs_rid, sc->aac_regs_resource); - sc->aac_regs_resource = bus_alloc_resource( - sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid, + sc->aac_regs_rid1, sc->aac_regs_res1); + sc->aac_regs_res1 = bus_alloc_resource( + sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid1, 0ul, ~0ul, atu_size, RF_ACTIVE); - if (sc->aac_regs_resource == NULL) { - sc->aac_regs_resource = bus_alloc_resource_any( + if (sc->aac_regs_res1 == NULL) { + sc->aac_regs_res1 = bus_alloc_resource_any( sc->aac_dev, SYS_RES_MEMORY, - &sc->aac_regs_rid, RF_ACTIVE); - if (sc->aac_regs_resource == NULL) { + &sc->aac_regs_rid1, RF_ACTIVE); + if (sc->aac_regs_res1 == NULL) { device_printf(sc->aac_dev, "couldn't allocate register window\n"); return (ENXIO); } sc->flags &= ~AAC_FLAGS_NEW_COMM; } - sc->aac_btag = rman_get_bustag(sc->aac_regs_resource); - sc->aac_bhandle = rman_get_bushandle(sc->aac_regs_resource); + sc->aac_btag1 = rman_get_bustag(sc->aac_regs_res1); + sc->aac_bhandle1 = rman_get_bushandle(sc->aac_regs_res1); + + if (sc->aac_hwif == AAC_HWIF_NARK) { + sc->aac_regs_res0 = sc->aac_regs_res1; + sc->aac_regs_rid0 = sc->aac_regs_rid1; + sc->aac_btag0 = sc->aac_btag1; + sc->aac_bhandle0 = sc->aac_bhandle1; + } } /* Read preferred settings */ @@ -1944,10 +1985,10 @@ */ switch (sc->aac_hwif) { case AAC_HWIF_I960RX: - AAC_SETREG4(sc, AAC_RX_ODBR, ~0); + AAC_MEM0_SETREG4(sc, AAC_RX_ODBR, ~0); break; case AAC_HWIF_RKT: - AAC_SETREG4(sc, AAC_RKT_ODBR, ~0); + AAC_MEM0_SETREG4(sc, AAC_RKT_ODBR, ~0); break; default: break; @@ -2367,7 +2408,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_SA_FWSTATUS)); + return(AAC_MEM0_GETREG4(sc, AAC_SA_FWSTATUS)); } static int @@ -2375,7 +2416,8 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RX_OMR0)); + return(AAC_MEM0_GETREG4(sc, sc->flags & AAC_FLAGS_NEW_COMM ? + AAC_RX_OMR0 : AAC_RX_FWSTATUS)); } static int @@ -2385,7 +2427,7 @@ fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - val = AAC_GETREG4(sc, AAC_FA_FWSTATUS); + val = AAC_MEM0_GETREG4(sc, AAC_FA_FWSTATUS); return (val); } @@ -2394,7 +2436,8 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RKT_OMR0)); + return(AAC_MEM0_GETREG4(sc, sc->flags & AAC_FLAGS_NEW_COMM ? + AAC_RKT_OMR0 : AAC_RKT_FWSTATUS)); } /* @@ -2406,7 +2449,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_SA_DOORBELL1_SET, qbit); + AAC_MEM0_SETREG2(sc, AAC_SA_DOORBELL1_SET, qbit); } static void @@ -2414,7 +2457,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RX_IDBR, qbit); + AAC_MEM0_SETREG4(sc, AAC_RX_IDBR, qbit); } static void @@ -2422,7 +2465,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_FA_DOORBELL1, qbit); + AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL1, qbit); AAC_FA_HACK(sc); } @@ -2431,7 +2474,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RKT_IDBR, qbit); + AAC_MEM0_SETREG4(sc, AAC_RKT_IDBR, qbit); } /* @@ -2442,7 +2485,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG2(sc, AAC_SA_DOORBELL0)); + return(AAC_MEM0_GETREG2(sc, AAC_SA_DOORBELL0)); } static int @@ -2450,7 +2493,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RX_ODBR)); + return(AAC_MEM0_GETREG4(sc, AAC_RX_ODBR)); } static int @@ -2460,7 +2503,7 @@ fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - val = AAC_GETREG2(sc, AAC_FA_DOORBELL0); + val = AAC_MEM0_GETREG2(sc, AAC_FA_DOORBELL0); return (val); } @@ -2469,7 +2512,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RKT_ODBR)); + return(AAC_MEM0_GETREG4(sc, AAC_RKT_ODBR)); } /* @@ -2480,7 +2523,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_SA_DOORBELL0_CLEAR, mask); + AAC_MEM0_SETREG2(sc, AAC_SA_DOORBELL0_CLEAR, mask); } static void @@ -2488,7 +2531,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RX_ODBR, mask); + AAC_MEM0_SETREG4(sc, AAC_RX_ODBR, mask); } static void @@ -2496,7 +2539,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask); + AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask); AAC_FA_HACK(sc); } @@ -2505,7 +2548,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RKT_ODBR, mask); + AAC_MEM0_SETREG4(sc, AAC_RKT_ODBR, mask); } /* @@ -2517,11 +2560,11 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_SA_MAILBOX, command); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 4, arg0); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 8, arg1); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 12, arg2); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 16, arg3); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX, command); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 4, arg0); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 8, arg1); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 12, arg2); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 16, arg3); } static void @@ -2530,11 +2573,11 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RX_MAILBOX, command); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 4, arg0); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 8, arg1); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 12, arg2); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 16, arg3); + AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX, command); + AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 4, arg0); + AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 8, arg1); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200902231847.n1NIl4Zw096951>