PERFORCE change 184744 for review
Hans Petter Selasky
hselasky at FreeBSD.org
Thu Oct 14 22:29:06 UTC 2010
http://p4web.freebsd.org/@@184744?ac=10
Change 184744 by hselasky at hselasky_laptop001 on 2010/10/14 22:28:03
IFC @ 184742
Affected files ...
.. //depot/projects/usb/src/lib/libusb/Makefile#9 integrate
.. //depot/projects/usb/src/lib/libusb/libusb.3#26 integrate
.. //depot/projects/usb/src/lib/libusb/libusb.h#18 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10.c#28 integrate
.. //depot/projects/usb/src/lib/libusb/libusb10_io.c#16 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20.3#13 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20.c#21 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#12 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_int.h#14 integrate
.. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#17 integrate
.. //depot/projects/usb/src/lib/libusb/usb.h#6 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#24 integrate
.. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#35 integrate
.. //depot/projects/usb/src/sys/amd64/include/specialreg.h#20 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#12 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#11 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#12 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#26 integrate
.. //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#11 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91.c#17 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_machdep.c#6 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_mci.c#12 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pio.c#11 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pio_rm9200.h#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pio_sam9.h#2 delete
.. //depot/projects/usb/src/sys/arm/at91/at91_pio_sam9g20.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_pioreg.h#4 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pit.c#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pmc.c#10 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pmcreg.h#4 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_pmcvar.h#3 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_reset.S#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_rst.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_rstreg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#11 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_twireg.h#5 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91_wdt.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91_wdtreg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91reg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91rm9200.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91rm92reg.h#6 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91sam9.c#2 delete
.. //depot/projects/usb/src/sys/arm/at91/at91sam9260.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91sam9260reg.h#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91sam9_machdep.c#2 delete
.. //depot/projects/usb/src/sys/arm/at91/at91sam9g20.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/at91sam9g20reg.h#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91var.h#4 integrate
.. //depot/projects/usb/src/sys/arm/at91/board_hl201.c#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/board_kb920x.c#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/board_qila9g20.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/board_sam9g20ek.c#1 branch
.. //depot/projects/usb/src/sys/arm/at91/files.at91#11 integrate
.. //depot/projects/usb/src/sys/arm/at91/files.at91sam9#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/if_ate.c#20 integrate
.. //depot/projects/usb/src/sys/arm/at91/if_atereg.h#5 integrate
.. //depot/projects/usb/src/sys/arm/at91/if_macb.c#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/std.at91sam9#2 integrate
.. //depot/projects/usb/src/sys/arm/at91/std.kb920x#6 integrate
.. //depot/projects/usb/src/sys/arm/at91/std.qila9g20#1 branch
.. //depot/projects/usb/src/sys/arm/at91/std.sam9g20ek#1 branch
.. //depot/projects/usb/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#7 integrate
.. //depot/projects/usb/src/sys/arm/at91/uart_dev_at91usart.c#13 integrate
.. //depot/projects/usb/src/sys/arm/conf/QILA9G20#1 branch
.. //depot/projects/usb/src/sys/arm/conf/QILA9G20.hints#1 branch
.. //depot/projects/usb/src/sys/arm/conf/SAM9G20EK#1 branch
.. //depot/projects/usb/src/sys/arm/conf/SAM9G20EK.hints#1 branch
.. //depot/projects/usb/src/sys/boot/common/loader.8#10 integrate
.. //depot/projects/usb/src/sys/boot/i386/gptboot/Makefile#4 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#2 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c#4 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#5 integrate
.. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#23 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_futex.c#14 integrate
.. //depot/projects/usb/src/sys/compat/linux/linux_util.h#6 integrate
.. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#14 integrate
.. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#9 integrate
.. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#8 integrate
.. //depot/projects/usb/src/sys/conf/NOTES#58 integrate
.. //depot/projects/usb/src/sys/conf/files#101 integrate
.. //depot/projects/usb/src/sys/conf/files.powerpc#32 integrate
.. //depot/projects/usb/src/sys/conf/options#51 integrate
.. //depot/projects/usb/src/sys/conf/options.arm#15 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/acpica_prep.sh#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#12 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adisasm.c#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#5 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#11 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#11 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asldefine.h#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#10 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmessages.h#1 branch
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslresource.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1i.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2q.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asltypes.h#11 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslutils.c#7 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompile.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dttemplate.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfregn.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acapps.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#9 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#12 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acenv.h#4 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/osunixxf.c#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utglobal.c#8 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utids.c#3 integrate
.. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utosi.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate
.. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/api/cc_conn.c#4 integrate
.. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/msg/privmsg.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/msg/uni_ie.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/sig/sig_call.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/ngatm/netnatm/sig/sig_reset.c#2 integrate
.. //depot/projects/usb/src/sys/contrib/pf/netinet/in4_cksum.c#2 integrate
.. //depot/projects/usb/src/sys/crypto/aesni/aeskeys_i386.S#2 integrate
.. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdHardware.c#9 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi.c#31 integrate
.. //depot/projects/usb/src/sys/dev/acpica/acpi_ec.c#11 integrate
.. //depot/projects/usb/src/sys/dev/age/if_age.c#15 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#4 integrate
.. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#4 integrate
.. //depot/projects/usb/src/sys/dev/alc/if_alc.c#11 integrate
.. //depot/projects/usb/src/sys/dev/ale/if_ale.c#10 integrate
.. //depot/projects/usb/src/sys/dev/bce/if_bce.c#30 integrate
.. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#19 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bge.c#34 integrate
.. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#19 integrate
.. //depot/projects/usb/src/sys/dev/bwn/if_bwn.c#7 integrate
.. //depot/projects/usb/src/sys/dev/ce/if_ce.c#11 integrate
.. //depot/projects/usb/src/sys/dev/cp/if_cp.c#11 integrate
.. //depot/projects/usb/src/sys/dev/dc/dcphy.c#7 integrate
.. //depot/projects/usb/src/sys/dev/dc/if_dc.c#14 integrate
.. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#9 integrate
.. //depot/projects/usb/src/sys/dev/dc/pnphy.c#6 integrate
.. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#19 integrate
.. //depot/projects/usb/src/sys/dev/hptrr/hptrr_osm_bsd.c#5 integrate
.. //depot/projects/usb/src/sys/dev/hwpmc/pmc_events.h#11 integrate
.. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#37 integrate
.. //depot/projects/usb/src/sys/dev/iwi/if_iwi.c#17 integrate
.. //depot/projects/usb/src/sys/dev/iwi/if_iwivar.h#9 integrate
.. //depot/projects/usb/src/sys/dev/jme/if_jme.c#12 integrate
.. //depot/projects/usb/src/sys/dev/kbd/kbd.c#8 integrate
.. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#12 integrate
.. //depot/projects/usb/src/sys/dev/mii/acphy.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mii/amphy.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mii/axphy.c#3 integrate
.. //depot/projects/usb/src/sys/dev/mii/axphyreg.h#2 delete
.. //depot/projects/usb/src/sys/dev/mii/bmtphy.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mii/brgphy.c#17 integrate
.. //depot/projects/usb/src/sys/dev/mii/gentbi.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mii/inphy.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mii/lxtphy.c#6 integrate
.. //depot/projects/usb/src/sys/dev/mii/mii.c#8 integrate
.. //depot/projects/usb/src/sys/dev/mii/mii.h#3 integrate
.. //depot/projects/usb/src/sys/dev/mii/miivar.h#4 integrate
.. //depot/projects/usb/src/sys/dev/mii/nsphy.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mii/qsphy.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mii/rlphy.c#8 integrate
.. //depot/projects/usb/src/sys/dev/mii/ruephy.c#5 integrate
.. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mii/tlphy.c#7 integrate
.. //depot/projects/usb/src/sys/dev/mii/ukphy_subr.c#4 integrate
.. //depot/projects/usb/src/sys/dev/mps/mps.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mps/mps_ioctl.h#2 integrate
.. //depot/projects/usb/src/sys/dev/mps/mps_sas.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mps/mps_user.c#2 integrate
.. //depot/projects/usb/src/sys/dev/mps/mpsvar.h#2 integrate
.. //depot/projects/usb/src/sys/dev/sge/if_sge.c#5 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#10 integrate
.. //depot/projects/usb/src/sys/dev/sound/pci/spicds.c#7 integrate
.. //depot/projects/usb/src/sys/dev/syscons/syscons.c#23 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#46 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#61 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#30 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ehcireg.h#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#35 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#40 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#45 integrate
.. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_axereg.h#6 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#30 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#8 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#14 integrate
.. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#39 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#38 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#34 integrate
.. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#21 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb.h#55 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#17 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#29 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_device.h#42 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#35 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#24 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#19 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_parse.c#11 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_request.h#15 integrate
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#20 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#142 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi.h#23 integrate
.. //depot/projects/usb/src/sys/dev/usb/usbdi_util.h#9 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#35 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#26 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_mount.h#2 integrate
.. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#12 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs.h#7 integrate
.. //depot/projects/usb/src/sys/fs/devfs/devfs_int.h#9 integrate
.. //depot/projects/usb/src/sys/fs/hpfs/hpfs_vfsops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/hpfs/hpfsmount.h#2 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#11 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#14 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate
.. //depot/projects/usb/src/sys/fs/msdosfs/msdosfsmount.h#5 integrate
.. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#15 integrate
.. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#9 integrate
.. //depot/projects/usb/src/sys/fs/ntfs/ntfsmount.h#2 integrate
.. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#18 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part.c#28 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#8 integrate
.. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#12 integrate
.. //depot/projects/usb/src/sys/geom/virstor/g_virstor.c#5 integrate
.. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_mount.h#2 integrate
.. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#10 integrate
.. //depot/projects/usb/src/sys/i386/i386/identcpu.c#21 integrate
.. //depot/projects/usb/src/sys/i386/i386/locore.s#7 integrate
.. //depot/projects/usb/src/sys/i386/i386/machdep.c#31 integrate
.. //depot/projects/usb/src/sys/i386/i386/pmap.c#38 integrate
.. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#6 integrate
.. //depot/projects/usb/src/sys/i386/include/pmap.h#19 integrate
.. //depot/projects/usb/src/sys/i386/include/specialreg.h#20 integrate
.. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#20 integrate
.. //depot/projects/usb/src/sys/kern/init_main.c#20 integrate
.. //depot/projects/usb/src/sys/kern/kern_conf.c#24 integrate
.. //depot/projects/usb/src/sys/kern/kern_exit.c#28 integrate
.. //depot/projects/usb/src/sys/kern/kern_fork.c#23 integrate
.. //depot/projects/usb/src/sys/kern/kern_kthread.c#12 integrate
.. //depot/projects/usb/src/sys/kern/kern_malloc.c#18 integrate
.. //depot/projects/usb/src/sys/kern/kern_proc.c#32 integrate
.. //depot/projects/usb/src/sys/kern/kern_resource.c#15 integrate
.. //depot/projects/usb/src/sys/kern/kern_shutdown.c#19 integrate
.. //depot/projects/usb/src/sys/kern/kern_sig.c#30 integrate
.. //depot/projects/usb/src/sys/kern/kern_thr.c#19 integrate
.. //depot/projects/usb/src/sys/kern/kern_thread.c#20 integrate
.. //depot/projects/usb/src/sys/kern/kern_time.c#11 integrate
.. //depot/projects/usb/src/sys/kern/kern_umtx.c#19 integrate
.. //depot/projects/usb/src/sys/kern/subr_smp.c#17 integrate
.. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#14 integrate
.. //depot/projects/usb/src/sys/kern/sys_process.c#22 integrate
.. //depot/projects/usb/src/sys/kern/uipc_mqueue.c#15 integrate
.. //depot/projects/usb/src/sys/kern/vfs_aio.c#15 integrate
.. //depot/projects/usb/src/sys/kern/vfs_mount.c#38 integrate
.. //depot/projects/usb/src/sys/mips/cavium/files.octeon1#5 integrate
.. //depot/projects/usb/src/sys/mips/cavium/octe/cavium-ethernet.h#3 integrate
.. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mdio.c#3 integrate
.. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mv88e61xx.c#2 integrate
.. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet.c#3 integrate
.. //depot/projects/usb/src/sys/mips/cavium/octe/mv88e61xxphy.c#1 branch
.. //depot/projects/usb/src/sys/mips/cavium/octe/mv88e61xxphyreg.h#1 branch
.. //depot/projects/usb/src/sys/mips/cavium/octe/octe.c#3 integrate
.. //depot/projects/usb/src/sys/mips/conf/OCTEON1#7 integrate
.. //depot/projects/usb/src/sys/mips/rmi/board.c#6 integrate
.. //depot/projects/usb/src/sys/mips/rmi/board.h#5 integrate
.. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.c#3 integrate
.. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.h#3 integrate
.. //depot/projects/usb/src/sys/mips/rmi/fmn.c#3 integrate
.. //depot/projects/usb/src/sys/mips/rmi/rmi_mips_exts.h#4 integrate
.. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#7 integrate
.. //depot/projects/usb/src/sys/modules/cryptodev/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/mem/Makefile#5 integrate
.. //depot/projects/usb/src/sys/modules/mii/Makefile#8 integrate
.. //depot/projects/usb/src/sys/modules/sysvipc/sysvmsg/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/sysvipc/sysvsem/Makefile#3 integrate
.. //depot/projects/usb/src/sys/modules/usb/Makefile#30 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_UI.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_async.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_frame_relay.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_gif_demux.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_iface.c#21 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_rfc1490.c#3 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_socket.c#11 integrate
.. //depot/projects/usb/src/sys/netgraph/ng_tty.c#7 integrate
.. //depot/projects/usb/src/sys/netinet/ip_options.c#19 integrate
.. //depot/projects/usb/src/sys/netinet6/in6_cksum.c#6 integrate
.. //depot/projects/usb/src/sys/netipsec/ipsec_output.c#14 integrate
.. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#21 integrate
.. //depot/projects/usb/src/sys/pci/if_rl.c#17 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#21 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#17 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#17 integrate
.. //depot/projects/usb/src/sys/powerpc/aim/trap.c#11 integrate
.. //depot/projects/usb/src/sys/powerpc/include/altivec.h#2 integrate
.. //depot/projects/usb/src/sys/powerpc/include/memdev.h#3 integrate
.. //depot/projects/usb/src/sys/powerpc/include/pcb.h#8 integrate
.. //depot/projects/usb/src/sys/powerpc/include/trap_aim.h#4 integrate
.. //depot/projects/usb/src/sys/powerpc/powerpc/mem.c#7 integrate
.. //depot/projects/usb/src/sys/rpc/clnt_dg.c#9 integrate
.. //depot/projects/usb/src/sys/rpc/clnt_vc.c#10 integrate
.. //depot/projects/usb/src/sys/rpc/rpc_generic.c#5 integrate
.. //depot/projects/usb/src/sys/sparc64/include/endian.h#3 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#25 integrate
.. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#16 integrate
.. //depot/projects/usb/src/sys/sun4v/include/endian.h#2 integrate
.. //depot/projects/usb/src/sys/sys/_task.h#5 integrate
.. //depot/projects/usb/src/sys/sys/conf.h#25 integrate
.. //depot/projects/usb/src/sys/sys/exec.h#2 integrate
.. //depot/projects/usb/src/sys/sys/module.h#4 integrate
.. //depot/projects/usb/src/sys/sys/mount.h#26 integrate
.. //depot/projects/usb/src/sys/sys/param.h#57 integrate
.. //depot/projects/usb/src/sys/sys/proc.h#31 integrate
.. //depot/projects/usb/src/sys/sys/signalvar.h#11 integrate
.. //depot/projects/usb/src/sys/sys/taskqueue.h#7 integrate
.. //depot/projects/usb/src/sys/sys/time.h#11 integrate
.. //depot/projects/usb/src/sys/sys/user.h#15 integrate
.. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#28 integrate
.. //depot/projects/usb/src/sys/ufs/ufs/ufsmount.h#6 integrate
.. //depot/projects/usb/src/sys/vm/vm_map.c#29 integrate
Differences ...
==== //depot/projects/usb/src/lib/libusb/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libusb/Makefile,v 1.8 2010/01/02 09:58:07 ed Exp $
+# $FreeBSD: src/lib/libusb/Makefile,v 1.9 2010/10/14 20:38:18 hselasky Exp $
#
# Makefile for the FreeBSD specific LibUSB 2.0
#
==== //depot/projects/usb/src/lib/libusb/libusb.3#26 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.10 2010/08/06 14:33:42 joel Exp $
+.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.12 2010/10/14 20:50:33 hselasky Exp $
.\"
-.Dd June 22, 2009
+.Dd October 14, 2010
.Dt LIBUSB 3
.Os
.Sh NAME
==== //depot/projects/usb/src/lib/libusb/libusb.h#18 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb.h,v 1.13 2010/05/13 00:25:30 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb.h,v 1.15 2010/10/14 20:50:33 hselasky Exp $ */
/*-
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb/libusb10.c#28 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.9 2010/05/13 00:25:30 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.11 2010/10/14 20:50:33 hselasky Exp $ */
/*-
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
* Copyright (c) 2009 Hans Petter Selasky. All rights reserved.
==== //depot/projects/usb/src/lib/libusb/libusb10_io.c#16 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.7 2010/05/13 00:25:30 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb10_io.c,v 1.8 2010/10/14 20:18:39 hselasky Exp $ */
/*-
* Copyright (c) 2009 Sylvestre Gallon. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb/libusb20.3#13 (text+ko) ====
@@ -24,9 +24,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.7 2010/08/16 15:18:30 joel Exp $
+.\" $FreeBSD: src/lib/libusb/libusb20.3,v 1.8 2010/10/14 20:50:33 hselasky Exp $
.\"
-.Dd November 18, 2009
+.Dd October 14, 2010
.Dt LIBUSB20 3
.Os
.Sh NAME
==== //depot/projects/usb/src/lib/libusb/libusb20.c#21 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.9 2010/02/13 09:45:50 wkoszek Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.10 2010/10/14 20:38:18 hselasky Exp $ */
/*-
* Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb/libusb20_compat01.c#12 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.7 2010/05/13 00:26:30 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_compat01.c,v 1.8 2010/10/14 20:04:36 hselasky Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#14 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.5 2010/01/29 02:44:06 thompsa Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.6 2010/10/14 20:38:18 hselasky Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#17 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.9 2010/02/13 09:45:50 wkoszek Exp $ */
+/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.10 2010/10/14 20:38:18 hselasky Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/lib/libusb/usb.h#6 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libusb/usb.h,v 1.3 2010/02/13 09:45:50 wkoszek Exp $ */
+/* $FreeBSD: src/lib/libusb/usb.h,v 1.4 2010/10/14 20:04:36 hselasky Exp $ */
/*-
* Copyright (c) 2008 Hans Petter Selasky. All rights reserved.
*
==== //depot/projects/usb/src/sys/amd64/amd64/identcpu.c#24 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.182 2010/07/22 09:13:49 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.183 2010/10/05 15:31:56 kib Exp $");
#include "opt_cpu.h"
@@ -278,7 +278,7 @@
"\017xTPR" /* Send Task Priority Messages*/
"\020PDCM" /* Perf/Debug Capability MSR */
"\021<b16>"
- "\022<b17>"
+ "\022PCID" /* Process-context Identifiers */
"\023DCA" /* Direct Cache Access */
"\024SSE4.1"
"\025SSE4.2"
==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#35 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.724 2010/09/13 07:25:35 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.726 2010/10/12 20:53:12 jkim Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -795,7 +795,8 @@
if (strcmp(idle_tbl[i].id_name, "acpi") == 0 &&
cpu_idle_hook == NULL)
continue;
- p += sprintf(p, "%s, ", idle_tbl[i].id_name);
+ p += sprintf(p, "%s%s", p != avail ? ", " : "",
+ idle_tbl[i].id_name);
}
error = sysctl_handle_string(oidp, avail, 0, req);
free(avail, M_TEMP);
@@ -1799,7 +1800,7 @@
pcb->pcb_rbp = tf->tf_rbp;
pcb->pcb_rbx = tf->tf_rbx;
pcb->pcb_rip = tf->tf_rip;
- pcb->pcb_rsp = (ISPL(tf->tf_cs)) ? tf->tf_rsp : (long)(tf + 1) - 8;
+ pcb->pcb_rsp = tf->tf_rsp;
}
int
==== //depot/projects/usb/src/sys/amd64/include/specialreg.h#20 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91
- * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.65 2010/07/29 19:08:22 delphij Exp $
+ * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.66 2010/10/05 15:31:56 kib Exp $
*/
#ifndef _MACHINE_SPECIALREG_H_
@@ -126,6 +126,7 @@
#define CPUID2_CX16 0x00002000
#define CPUID2_XTPR 0x00004000
#define CPUID2_PDCM 0x00008000
+#define CPUID2_PCID 0x00020000
#define CPUID2_DCA 0x00040000
#define CPUID2_SSE41 0x00080000
#define CPUID2_SSE42 0x00100000
==== //depot/projects/usb/src/sys/amd64/linux32/linux32_proto.h#12 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.41 2010/07/23 21:31:03 kib Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib
+ * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.42 2010/10/08 07:19:05 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/usb/src/sys/amd64/linux32/linux32_syscall.h#11 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.40 2010/07/23 21:31:03 kib Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib
+ * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.41 2010/10/08 07:19:05 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib
*/
#define LINUX_SYS_exit 1
==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#12 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.42 2010/07/23 21:31:03 kib Exp $
- * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 210431 2010-07-23 21:30:33Z kib
+ * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.43 2010/10/08 07:19:05 kib Exp $
+ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 213544 2010-10-08 07:18:44Z kib
*/
#include "opt_compat.h"
@@ -267,7 +267,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 245 = linux_io_setup */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 246 = linux_io_destroy */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 247 = linux_io_getevents */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 248 = inux_io_submit */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 248 = linux_io_submit */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 249 = linux_io_cancel */
{ 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 250 = linux_fadvise64 */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 251 = */
==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#26 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.58 2010/07/28 04:47:40 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.59 2010/10/12 09:18:17 kib Exp $");
#include "opt_compat.h"
#ifndef COMPAT_FREEBSD32
@@ -1210,4 +1210,4 @@
0
};
-DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY);
+DECLARE_MODULE_TIED(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY);
==== //depot/projects/usb/src/sys/amd64/linux32/syscalls.master#11 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.37 2010/07/23 21:30:33 kib Exp $
+ $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.38 2010/10/08 07:18:44 kib Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -416,7 +416,7 @@
245 AUE_NULL UNIMPL linux_io_setup
246 AUE_NULL UNIMPL linux_io_destroy
247 AUE_NULL UNIMPL linux_io_getevents
-248 AUE_NULL UNIMPL inux_io_submit
+248 AUE_NULL UNIMPL linux_io_submit
249 AUE_NULL UNIMPL linux_io_cancel
250 AUE_NULL STD { int linux_fadvise64(void); }
251 AUE_NULL UNIMPL
==== //depot/projects/usb/src/sys/arm/at91/at91.c#17 (text) ====
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2005 Olivier Houchard. All rights reserved.
+ * Copyright (c) 2010 Greg Ansley. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -24,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.25 2009/06/09 18:18:41 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.26 2010/10/06 22:25:21 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,14 +44,23 @@
#include <machine/bus.h>
#include <machine/intr.h>
-#include <arm/at91/at91rm92reg.h>
#include <arm/at91/at91var.h>
+#include <arm/at91/at91_pmcvar.h>
+#include <arm/at91/at91_aicreg.h>
static struct at91_softc *at91_softc;
static void at91_eoi(void *);
+extern const struct pmap_devmap at91_devmap[];
+
+uint32_t at91_chip_id;
+
+#ifdef AT91C_MASTER_CLOCK
uint32_t at91_master_clock = AT91C_MASTER_CLOCK;
+#else
+uint32_t at91_master_clock;
+#endif
static int
at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
@@ -99,6 +109,19 @@
{
}
+struct arm32_dma_range *
+bus_dma_get_range(void)
+{
+
+ return (NULL);
+}
+
+int
+bus_dma_get_range_nb(void)
+{
+ return (0);
+}
+
bs_protos(generic);
bs_protos(generic_armv4);
@@ -212,6 +235,7 @@
static int
at91_probe(device_t dev)
{
+
device_set_desc(dev, "AT91 device bus");
arm_post_filter = at91_eoi;
return (0);
@@ -224,324 +248,38 @@
BUS_ADD_CHILD(parent, 0, "atmelarm", 0);
}
-struct arm32_dma_range *
-bus_dma_get_range(void)
-{
-
- return (NULL);
-}
-
-int
-bus_dma_get_range_nb(void)
-{
- return (0);
-}
-
-extern void irq_entry(void);
-
-static void
-at91_add_child(device_t dev, int prio, const char *name, int unit,
- bus_addr_t addr, bus_size_t size, int irq0, int irq1, int irq2)
-{
- device_t kid;
- struct at91_ivar *ivar;
-
- kid = device_add_child_ordered(dev, prio, name, unit);
- if (kid == NULL) {
- printf("Can't add child %s%d ordered\n", name, unit);
- return;
- }
- ivar = malloc(sizeof(*ivar), M_DEVBUF, M_NOWAIT | M_ZERO);
- if (ivar == NULL) {
- device_delete_child(dev, kid);
- printf("Can't add alloc ivar\n");
- return;
- }
- device_set_ivars(kid, ivar);
- resource_list_init(&ivar->resources);
- if (irq0 != -1)
- bus_set_resource(kid, SYS_RES_IRQ, 0, irq0, 1);
- if (irq1 != 0)
- bus_set_resource(kid, SYS_RES_IRQ, 1, irq1, 1);
- if (irq2 != 0)
- bus_set_resource(kid, SYS_RES_IRQ, 2, irq2, 1);
- if (addr != 0)
- bus_set_resource(kid, SYS_RES_MEMORY, 0, addr, size);
-}
-
-struct cpu_devs
-{
- const char *name;
- int unit;
- bus_addr_t mem_base;
- bus_size_t mem_len;
- int irq0;
- int irq1;
- int irq2;
-};
-
-struct cpu_devs at91rm9200_devs[] =
-{
- // All the "system" devices
- {
- "at91_st", 0,
- AT91RM92_BASE + AT91RM92_ST_BASE, AT91RM92_ST_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_pio", 0,
- AT91RM92_BASE + AT91RM92_PIOA_BASE, AT91RM92_PIO_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_pio", 1,
- AT91RM92_BASE + AT91RM92_PIOB_BASE, AT91RM92_PIO_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_pio", 2,
- AT91RM92_BASE + AT91RM92_PIOC_BASE, AT91RM92_PIO_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_pio", 3,
- AT91RM92_BASE + AT91RM92_PIOD_BASE, AT91RM92_PIO_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_pmc", 0,
- AT91RM92_BASE + AT91RM92_PMC_BASE, AT91RM92_PMC_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_aic", 0,
- AT91RM92_BASE + AT91RM92_AIC_BASE, AT91RM92_AIC_SIZE,
- 0 // Interrupt controller has no interrupts!
- },
- {
- "at91_rtc", 0,
- AT91RM92_BASE + AT91RM92_RTC_BASE, AT91RM92_RTC_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "at91_mc", 0,
- AT91RM92_BASE + AT91RM92_MC_BASE, AT91RM92_MC_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
-
- // All other devices
- {
- "at91_tc", 0,
- AT91RM92_BASE + AT91RM92_TC0_BASE, AT91RM92_TC_SIZE,
- AT91RM92_IRQ_TC0, AT91RM92_IRQ_TC1, AT91RM92_IRQ_TC2
- },
- {
- "at91_tc", 1,
- AT91RM92_BASE + AT91RM92_TC1_BASE, AT91RM92_TC_SIZE,
- AT91RM92_IRQ_TC3, AT91RM92_IRQ_TC4, AT91RM92_IRQ_TC5
- },
- {
- "at91_udp", 0,
- AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE,
- AT91RM92_IRQ_UDP, AT91RM92_IRQ_PIOB
- },
- {
- "at91_mci", 0,
- AT91RM92_BASE + AT91RM92_MCI_BASE, AT91RM92_MCI_SIZE,
- AT91RM92_IRQ_MCI
- },
- {
- "at91_twi", 0,
- AT91RM92_BASE + AT91RM92_TWI_BASE, AT91RM92_TWI_SIZE,
- AT91RM92_IRQ_TWI
- },
- {
- "ate", 0,
- AT91RM92_BASE + AT91RM92_EMAC_BASE, AT91RM92_EMAC_SIZE,
- AT91RM92_IRQ_EMAC
- },
-#ifndef SKYEYE_WORKAROUNDS
- {
- "uart", 0,
- AT91RM92_BASE + AT91RM92_DBGU_BASE, AT91RM92_DBGU_SIZE,
- AT91RM92_IRQ_SYSTEM
- },
- {
- "uart", 1,
- AT91RM92_BASE + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE,
- AT91RM92_IRQ_USART0
- },
- {
- "uart", 2,
- AT91RM92_BASE + AT91RM92_USART1_BASE, AT91RM92_USART_SIZE,
- AT91RM92_IRQ_USART1
- },
- {
- "uart", 3,
- AT91RM92_BASE + AT91RM92_USART2_BASE, AT91RM92_USART_SIZE,
- AT91RM92_IRQ_USART2
- },
- {
- "uart", 4,
- AT91RM92_BASE + AT91RM92_USART3_BASE, AT91RM92_USART_SIZE,
- AT91RM92_IRQ_USART3
- },
-#else
- {
- "uart", 0,
- AT91RM92_BASE + AT91RM92_USART0_BASE, AT91RM92_USART_SIZE,
- AT91RM92_IRQ_USART0
- },
-#endif
- {
- "at91_ssc", 0,
- AT91RM92_BASE + AT91RM92_SSC0_BASE, AT91RM92_SSC_SIZE,
- AT91RM92_IRQ_SSC0
- },
- {
- "at91_ssc", 1,
- AT91RM92_BASE + AT91RM92_SSC1_BASE, AT91RM92_SSC_SIZE,
- AT91RM92_IRQ_SSC1
- },
- {
- "at91_ssc", 2,
- AT91RM92_BASE + AT91RM92_SSC2_BASE, AT91RM92_SSC_SIZE,
- AT91RM92_IRQ_SSC2
- },
- {
- "spi", 0,
- AT91RM92_BASE + AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE,
- AT91RM92_IRQ_SPI
- },
- {
- "ohci", 0,
- AT91RM92_OHCI_BASE, AT91RM92_OHCI_SIZE,
- AT91RM92_IRQ_UHP
- },
- {
- "at91_cfata", 0,
- AT91RM92_CF_BASE, AT91RM92_CF_SIZE,
- -1
- },
- { 0, 0, 0, 0, 0 }
-};
-
-static void
-at91_cpu_add_builtin_children(device_t dev, struct at91_softc *sc)
-{
- int i;
- struct cpu_devs *walker;
-
- // XXX should look at the device id in the DBGU register and
- // XXX based on the CPU load in these devices
- for (i = 0, walker = at91rm9200_devs; walker->name; i++, walker++) {
- at91_add_child(dev, i, walker->name, walker->unit,
- walker->mem_base, walker->mem_len, walker->irq0,
- walker->irq1, walker->irq2);
- }
-}
-
-#define NORMDEV 50
-
-/*
- * Standard priority levels for the system. 0 is lowest and 7 is highest.
- * These values are the ones Atmel uses for its Linux port, which differ
- * a little form the ones that are in the standard distribution. Also,
- * the ones marked with 'TWEEK' are different based on experience.
- */
-static int irq_prio[32] =
-{
- 7, /* Advanced Interrupt Controller (FIQ) */
- 7, /* System Peripherals */
- 1, /* Parallel IO Controller A */
- 1, /* Parallel IO Controller B */
- 1, /* Parallel IO Controller C */
- 1, /* Parallel IO Controller D */
- 5, /* USART 0 */
- 5, /* USART 1 */
- 5, /* USART 2 */
- 5, /* USART 3 */
- 0, /* Multimedia Card Interface */
- 2, /* USB Device Port */
- 4, /* Two-Wire Interface */ /* TWEEK */
- 5, /* Serial Peripheral Interface */
- 4, /* Serial Synchronous Controller 0 */
- 6, /* Serial Synchronous Controller 1 */ /* TWEEK */
- 4, /* Serial Synchronous Controller 2 */
- 0, /* Timer Counter 0 */
- 6, /* Timer Counter 1 */ /* TWEEK */
- 0, /* Timer Counter 2 */
- 0, /* Timer Counter 3 */
- 0, /* Timer Counter 4 */
- 0, /* Timer Counter 5 */
- 2, /* USB Host port */
- 3, /* Ethernet MAC */
- 0, /* Advanced Interrupt Controller (IRQ0) */
- 0, /* Advanced Interrupt Controller (IRQ1) */
- 0, /* Advanced Interrupt Controller (IRQ2) */
- 0, /* Advanced Interrupt Controller (IRQ3) */
- 0, /* Advanced Interrupt Controller (IRQ4) */
- 0, /* Advanced Interrupt Controller (IRQ5) */
- 0 /* Advanced Interrupt Controller (IRQ6) */
-};
-
static int
at91_attach(device_t dev)
{
struct at91_softc *sc = device_get_softc(dev);
- int i;
+ const struct pmap_devmap *pdevmap;
at91_softc = sc;
sc->sc_st = &at91_bs_tag;
- sc->sc_sh = AT91RM92_BASE;
+ sc->sc_sh = AT91_BASE;
sc->dev = dev;
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_SYS_BASE,
- AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0)
- panic("Enable to map IRQ registers");
+
sc->sc_irq_rman.rm_type = RMAN_ARRAY;
sc->sc_irq_rman.rm_descr = "AT91 IRQs";
- sc->sc_mem_rman.rm_type = RMAN_ARRAY;
- sc->sc_mem_rman.rm_descr = "AT91 Memory";
if (rman_init(&sc->sc_irq_rman) != 0 ||
rman_manage_region(&sc->sc_irq_rman, 1, 31) != 0)
panic("at91_attach: failed to set up IRQ rman");
- if (rman_init(&sc->sc_mem_rman) != 0 ||
- rman_manage_region(&sc->sc_mem_rman, 0xdff00000ul,
- 0xdffffffful) != 0)
+
+ sc->sc_mem_rman.rm_type = RMAN_ARRAY;
+ sc->sc_mem_rman.rm_descr = "AT91 Memory";
+ if (rman_init(&sc->sc_mem_rman) != 0)
panic("at91_attach: failed to set up memory rman");
- if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_OHCI_BASE,
- AT91RM92_OHCI_BASE + AT91RM92_OHCI_SIZE - 1) != 0)
- panic("at91_attach: failed to set up ohci memory");
- if (rman_manage_region(&sc->sc_mem_rman, AT91RM92_CF_BASE,
- AT91RM92_CF_BASE + AT91RM92_CF_SIZE - 1) != 0)
- panic("at91_attach: failed to set up CompactFlash ATA memory");
-
- for (i = 0; i < 32; i++) {
- bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SVR +
- i * 4, i);
- /* Priority. */
- bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SMR + i * 4,
- irq_prio[i]);
- if (i < 8)
- bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_EOICR,
- 1);
+ for ( pdevmap = at91_devmap; pdevmap->pd_va != 0; pdevmap++) {
+ if (rman_manage_region(&sc->sc_mem_rman, pdevmap->pd_va,
+ pdevmap->pd_va + pdevmap->pd_size - 1) != 0)
+ panic("at91_attach: failed to set up memory rman");
}
- bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_SPU, 32);
- /* No debug. */
- bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_DCR, 0);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list