Date: Wed, 10 Dec 2003 08:46:09 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 43729 for review Message-ID: <200312101646.hBAGk9G3010472@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=43729 Change 43729 by jhb@jhb_blue on 2003/12/10 08:45:23 IFC @43726. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#25 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#34 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#4 integrate .. //depot/projects/smpng/sys/alpha/include/ioctl_bt848.h#2 integrate .. //depot/projects/smpng/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64-gdbstub.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/apic_vector.S#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/critical.c#5 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#18 integrate .. //depot/projects/smpng/sys/amd64/amd64/mem.c#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/critical.h#4 integrate .. //depot/projects/smpng/sys/amd64/include/mutex.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/pcvt_ioctl.h#1 branch .. //depot/projects/smpng/sys/amd64/include/runq.h#2 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#6 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#7 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#3 integrate .. //depot/projects/smpng/sys/boot/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/ficl/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ficl/loader.c#7 integrate .. //depot/projects/smpng/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/smpng/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/smpng/sys/boot/i386/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0.s#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot0/boot0sio.s#1 branch .. //depot/projects/smpng/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/smpng/sys/boot/ia64/libski/acpi_stub.c#3 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/conf.c#4 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#47 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#21 integrate .. //depot/projects/smpng/sys/conf/NOTES#60 integrate .. //depot/projects/smpng/sys/conf/files#97 integrate .. //depot/projects/smpng/sys/conf/files.i386#49 integrate .. //depot/projects/smpng/sys/conf/files.pc98#50 integrate .. //depot/projects/smpng/sys/conf/kern.mk#8 integrate .. //depot/projects/smpng/sys/conf/ldscript.i386#6 integrate .. //depot/projects/smpng/sys/conf/majors#31 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#9 integrate .. //depot/projects/smpng/sys/conf/options#68 integrate .. //depot/projects/smpng/sys/conf/options.i386#36 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmobject.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#16 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ah.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/freebsd/i386-elf.hal.o.uu#6 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/version.h#5 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#10 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#53 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/madt.h#2 delete .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#24 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#37 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#16 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#44 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_audio.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#5 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#14 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#6 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#18 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_tuner.c#3 integrate .. //depot/projects/smpng/sys/dev/bktr/ioctl_bt848.h#1 branch .. //depot/projects/smpng/sys/dev/bktr/ioctl_meteor.h#1 branch .. //depot/projects/smpng/sys/dev/bktr/msp34xx.c#2 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#24 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#4 integrate .. //depot/projects/smpng/sys/dev/cx/cronyxfw.h#1 branch .. //depot/projects/smpng/sys/dev/cx/csigma.c#1 branch .. //depot/projects/smpng/sys/dev/cx/csigmafw.h#1 branch .. //depot/projects/smpng/sys/dev/cx/cxddk.c#1 branch .. //depot/projects/smpng/sys/dev/cx/cxddk.h#1 branch .. //depot/projects/smpng/sys/dev/cx/cxreg.h#1 branch .. //depot/projects/smpng/sys/dev/cx/if_cx.c#1 branch .. //depot/projects/smpng/sys/dev/cx/machdep.h#1 branch .. //depot/projects/smpng/sys/dev/cx/ng_cx.h#1 branch .. //depot/projects/smpng/sys/dev/dgb/dgb.c#14 delete .. //depot/projects/smpng/sys/dev/dgb/dgbios.h#2 delete .. //depot/projects/smpng/sys/dev/dgb/dgfep.h#2 delete .. //depot/projects/smpng/sys/dev/dgb/dgreg.h#3 delete .. //depot/projects/smpng/sys/dev/ed/if_ed.c#17 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#29 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#9 integrate .. //depot/projects/smpng/sys/dev/hea/eni.c#7 delete .. //depot/projects/smpng/sys/dev/hea/eni.h#8 delete .. //depot/projects/smpng/sys/dev/hea/eni_buffer.c#10 delete .. //depot/projects/smpng/sys/dev/hea/eni_globals.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_if.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_init.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_intr.c#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#7 delete .. //depot/projects/smpng/sys/dev/hea/eni_stats.h#2 delete .. //depot/projects/smpng/sys/dev/hea/eni_suni.h#2 delete .. //depot/projects/smpng/sys/dev/hea/eni_transmit.c#7 delete .. //depot/projects/smpng/sys/dev/hea/eni_var.h#4 delete .. //depot/projects/smpng/sys/dev/hea/eni_vcm.c#7 delete .. //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#6 delete .. //depot/projects/smpng/sys/dev/hea/hea_freebsd.h#2 delete .. //depot/projects/smpng/sys/dev/hea/hea_pci.c#7 delete .. //depot/projects/smpng/sys/dev/led/led.c#3 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#18 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#9 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmc_common.c#4 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmc_fbsd3.c#4 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmc_media.c#4 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmcioctl.h#3 delete .. //depot/projects/smpng/sys/dev/lmc/if_lmcvar.h#3 delete .. //depot/projects/smpng/sys/dev/lnc/if_lnc.c#11 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#14 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#28 integrate .. //depot/projects/smpng/sys/dev/owi/if_owi.c#4 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#21 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#6 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/channel.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sndstat.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#20 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#16 integrate .. //depot/projects/smpng/sys/dev/twe/twe.c#8 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#8 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#17 integrate .. //depot/projects/smpng/sys/dev/twe/twe_tables.h#4 integrate .. //depot/projects/smpng/sys/dev/twe/tweio.h#3 integrate .. //depot/projects/smpng/sys/dev/twe/twereg.h#6 integrate .. //depot/projects/smpng/sys/dev/twe/twevar.h#5 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/if_aue.c#28 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#7 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#59 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#17 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#14 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_conv.c#6 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#14 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs.c#9 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ctl.c#19 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_ioctl.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_map.c#6 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_rlimit.c#3 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#18 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_type.c#4 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#17 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#19 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/smpng/sys/geom/geom.h#33 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#31 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#22 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#44 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#70 integrate .. //depot/projects/smpng/sys/i386/i386/apic_vector.s#4 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#70 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#61 integrate .. //depot/projects/smpng/sys/i386/i386/mptable.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#45 integrate .. //depot/projects/smpng/sys/i386/include/cronyx.h#2 delete .. //depot/projects/smpng/sys/i386/include/cserial.h#1 branch .. //depot/projects/smpng/sys/i386/include/ioctl_bt848.h#2 integrate .. //depot/projects/smpng/sys/i386/include/pcvt_ioctl.h#2 integrate .. //depot/projects/smpng/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/smpng/sys/i386/isa/cronyx.c#3 delete .. //depot/projects/smpng/sys/i386/isa/cx.c#12 delete .. //depot/projects/smpng/sys/i386/isa/cxreg.h#3 delete .. //depot/projects/smpng/sys/i386/isa/cy.c#21 integrate .. //depot/projects/smpng/sys/i386/isa/if_cx.c#7 delete .. //depot/projects/smpng/sys/i386/isa/loran.c#9 delete .. //depot/projects/smpng/sys/ia64/acpica/madt.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#75 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#61 integrate .. //depot/projects/smpng/sys/ia64/include/ioctl_bt848.h#2 delete .. //depot/projects/smpng/sys/ia64/include/ioctl_meteor.h#2 delete .. //depot/projects/smpng/sys/ia64/include/ucontext.h#6 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#78 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#79 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#17 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#22 integrate .. //depot/projects/smpng/sys/kern/subr_mbpool.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#39 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#32 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#5 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#37 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#36 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#41 integrate .. //depot/projects/smpng/sys/libkern/iconv_xlat16.c#2 integrate .. //depot/projects/smpng/sys/modules/Makefile#66 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#17 integrate .. //depot/projects/smpng/sys/modules/cx/Makefile#1 branch .. //depot/projects/smpng/sys/modules/hea/Makefile#2 delete .. //depot/projects/smpng/sys/net/if_gre.c#10 integrate .. //depot/projects/smpng/sys/net/if_var.h#20 integrate .. //depot/projects/smpng/sys/net/route.c#17 integrate .. //depot/projects/smpng/sys/netgraph/atm/ngatmbase.c#2 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#19 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#26 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#3 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#17 integrate .. //depot/projects/smpng/sys/netkey/key.c#23 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#16 integrate .. //depot/projects/smpng/sys/pci/cy_pci.c#7 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#50 integrate .. //depot/projects/smpng/sys/pci/if_dcreg.h#20 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#22 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#41 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#24 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#35 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#27 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#26 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#19 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#22 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#21 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#40 integrate .. //depot/projects/smpng/sys/pci/meteor.c#11 delete .. //depot/projects/smpng/sys/pci/meteor_reg.h#2 delete .. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/powerpc/include/powerpc.h#4 integrate .. //depot/projects/smpng/sys/powerpc/powermac/ata_macio.c#6 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/db_interface.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#45 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofw_machdep.c#8 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#33 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#22 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#17 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#21 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#6 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#21 integrate .. //depot/projects/smpng/sys/sys/_null.h#1 branch .. //depot/projects/smpng/sys/sys/iconv.h#7 integrate .. //depot/projects/smpng/sys/sys/kse.h#14 integrate .. //depot/projects/smpng/sys/sys/mac.h#22 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#18 integrate .. //depot/projects/smpng/sys/sys/param.h#52 integrate .. //depot/projects/smpng/sys/sys/smp.h#9 integrate .. //depot/projects/smpng/sys/sys/stddef.h#2 integrate .. //depot/projects/smpng/sys/sys/syscall.h#37 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#37 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#39 integrate .. //depot/projects/smpng/sys/sys/systm.h#45 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#49 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#40 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#37 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/mp_machdep.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.50 2003/11/30 22:08:24 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/mp_machdep.c,v 1.51 2003/12/03 14:57:25 jhb Exp $"); #include "opt_kstack_pages.h" @@ -339,7 +339,6 @@ continue; mp_maxid = i; } - mp_maxid++; } int ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#34 (text+ko) ==== @@ -12,13 +12,13 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.164 2003/11/13 02:04:34 jeff Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.165 2003/12/08 05:20:34 obrien Exp $ machine alpha cpu EV4 @@ -62,7 +62,7 @@ options PSEUDOFS #Pseudo-filesystem framework options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options COMPAT_FREEBSD4 #Compatible with FreeBSD4 -options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI +options SCSI_DELAY=15000 #Delay (in ms) before probing SCSI options KTRACE #ktrace(1) syscall trace support options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues @@ -111,8 +111,10 @@ device pass # Passthrough device (direct SCSI access) device ses # SCSI Environmental Services (and SAF-TE) +# RAID controllers interfaced to the SCSI subsystem +device amr # AMI MegaRAID + # RAID controllers -device amr # AMI MegaRAID device mlx # Mylex DAC960 family # atkbdc0 controls both the keyboard and the PS/2 mouse @@ -139,12 +141,12 @@ device lpt # Printer device ppi # Parallel port interface device #device vpo # Requires scbus and da - + # If you've got a "dumb" serial or parallel PCI card that is # supported by the puc(4) glue driver, uncomment the following # line to enable it (connects to the sio and/or ppc drivers): #device puc - + # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') device txp # 3Com 3cR990 (``Typhoon'') ==== //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,10 +1,11 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.6 2002/11/14 14:59:27 jhb Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.7 2003/12/05 00:57:11 des Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" hint.fdc.0.drq="2" hint.fd.0.at="fdc0" hint.fd.0.drive="0" +hint.fd.0.flags="4" hint.ata.0.at="isa" hint.ata.0.port="0x1F0" hint.ata.0.irq="14" ==== //depot/projects/smpng/sys/alpha/include/ioctl_bt848.h#2 (text+ko) ==== @@ -1,298 +1,38 @@ -/* - * extensions to ioctl_meteor.h for the bt848 cards +/*- + * Copyright (c) 2003 David O'Brien + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.2 2000/10/27 07:07:24 roger Exp $ + * $FreeBSD: src/sys/alpha/include/ioctl_bt848.h,v 1.3 2003/12/08 07:22:41 obrien Exp $ */ -#ifndef _MACHINE_IOCTL_BT848_H_ -#define _MACHINE_IOCTL_BT848_H_ +#ifndef _MACHINE_IOCTL_BT848_H_ +#define _MACHINE_IOCTL_BT848_H_ -/* - * frequency sets - */ -#define CHNLSET_NABCST 1 -#define CHNLSET_CABLEIRC 2 -#define CHNLSET_CABLEHRC 3 -#define CHNLSET_WEUROPE 4 -#define CHNLSET_JPNBCST 5 -#define CHNLSET_JPNCABLE 6 -#define CHNLSET_XUSSR 7 -#define CHNLSET_AUSTRALIA 8 -#define CHNLSET_FRANCE 9 -#define CHNLSET_MIN CHNLSET_NABCST -#define CHNLSET_MAX CHNLSET_FRANCE +#ifdef __GNUC__ +#warning Include dev/bktr/ioctl_bt848.h instead of this header. +#endif - -/* - * constants for various tuner registers - */ -#define BT848_HUEMIN (-90) -#define BT848_HUEMAX 90 -#define BT848_HUECENTER 0 -#define BT848_HUERANGE 179.3 -#define BT848_HUEREGMIN (-128) -#define BT848_HUEREGMAX 127 -#define BT848_HUESTEPS 256 - -#define BT848_BRIGHTMIN (-50) -#define BT848_BRIGHTMAX 50 -#define BT848_BRIGHTCENTER 0 -#define BT848_BRIGHTRANGE 99.6 -#define BT848_BRIGHTREGMIN (-128) -#define BT848_BRIGHTREGMAX 127 -#define BT848_BRIGHTSTEPS 256 - -#define BT848_CONTRASTMIN 0 -#define BT848_CONTRASTMAX 237 -#define BT848_CONTRASTCENTER 100 -#define BT848_CONTRASTRANGE 236.57 -#define BT848_CONTRASTREGMIN 0 -#define BT848_CONTRASTREGMAX 511 -#define BT848_CONTRASTSTEPS 512 - -#define BT848_CHROMAMIN 0 -#define BT848_CHROMAMAX 284 -#define BT848_CHROMACENTER 100 -#define BT848_CHROMARANGE 283.89 -#define BT848_CHROMAREGMIN 0 -#define BT848_CHROMAREGMAX 511 -#define BT848_CHROMASTEPS 512 - -#define BT848_SATUMIN 0 -#define BT848_SATUMAX 202 -#define BT848_SATUCENTER 100 -#define BT848_SATURANGE 201.18 -#define BT848_SATUREGMIN 0 -#define BT848_SATUREGMAX 511 -#define BT848_SATUSTEPS 512 - -#define BT848_SATVMIN 0 -#define BT848_SATVMAX 284 -#define BT848_SATVCENTER 100 -#define BT848_SATVRANGE 283.89 -#define BT848_SATVREGMIN 0 -#define BT848_SATVREGMAX 511 -#define BT848_SATVSTEPS 512 - - -/* - * audio stuff - */ -#define AUDIO_TUNER 0x00 /* command for the audio routine */ -#define AUDIO_EXTERN 0x01 /* don't confuse them with bit */ -#define AUDIO_INTERN 0x02 /* settings */ -#define AUDIO_MUTE 0x80 -#define AUDIO_UNMUTE 0x81 - - -/* - * EEProm stuff - */ -struct eeProm { - short offset; - short count; - u_char bytes[ 256 ]; -}; - - -/* - * XXX: this is a hack, should be in ioctl_meteor.h - * here to avoid touching that file for now... - */ -#define TVTUNER_SETCHNL _IOW('x', 32, unsigned int) /* set channel */ -#define TVTUNER_GETCHNL _IOR('x', 32, unsigned int) /* get channel */ -#define TVTUNER_SETTYPE _IOW('x', 33, unsigned int) /* set tuner type */ -#define TVTUNER_GETTYPE _IOR('x', 33, unsigned int) /* get tuner type */ -#define TVTUNER_GETSTATUS _IOR('x', 34, unsigned int) /* get tuner status */ -#define TVTUNER_SETFREQ _IOW('x', 35, unsigned int) /* set frequency */ -#define TVTUNER_GETFREQ _IOR('x', 36, unsigned int) /* get frequency */ - - -#define BT848_SHUE _IOW('x', 37, int) /* set hue */ -#define BT848_GHUE _IOR('x', 37, int) /* get hue */ -#define BT848_SBRIG _IOW('x', 38, int) /* set brightness */ -#define BT848_GBRIG _IOR('x', 38, int) /* get brightness */ -#define BT848_SCSAT _IOW('x', 39, int) /* set chroma sat */ -#define BT848_GCSAT _IOR('x', 39, int) /* get UV saturation */ -#define BT848_SCONT _IOW('x', 40, int) /* set contrast */ -#define BT848_GCONT _IOR('x', 40, int) /* get contrast */ -#define BT848_SVSAT _IOW('x', 41, int) /* set chroma V sat */ -#define BT848_GVSAT _IOR('x', 41, int) /* get V saturation */ -#define BT848_SUSAT _IOW('x', 42, int) /* set chroma U sat */ -#define BT848_GUSAT _IOR('x', 42, int) /* get U saturation */ - -#define BT848_SCBARS _IOR('x', 43, int) /* set colorbar */ -#define BT848_CCBARS _IOR('x', 44, int) /* clear colorbar */ - - -#define BT848_SAUDIO _IOW('x', 46, int) /* set audio channel */ -#define BT848_GAUDIO _IOR('x', 47, int) /* get audio channel */ -#define BT848_SBTSC _IOW('x', 48, int) /* set audio channel */ - -#define BT848_GSTATUS _IOR('x', 49, unsigned int) /* reap status */ - -#define BT848_WEEPROM _IOWR('x', 50, struct eeProm) /* write to EEProm */ -#define BT848_REEPROM _IOWR('x', 51, struct eeProm) /* read from EEProm */ +#include <dev/bktr/ioctl_bt848.h> -#define BT848_SIGNATURE _IOWR('x', 52, struct eeProm) /* read card sig */ - -#define TVTUNER_SETAFC _IOW('x', 53, int) /* turn AFC on/off */ -#define TVTUNER_GETAFC _IOR('x', 54, int) /* query AFC on/off */ -#define BT848_SLNOTCH _IOW('x', 55, int) /* set luma notch */ -#define BT848_GLNOTCH _IOR('x', 56, int) /* get luma notch */ - -/* Read/Write the BT848's I2C bus directly - * b7-b0: data (read/write) - * b15-b8: internal peripheral register (write) - * b23-b16: i2c addr (write) - * b31-b24: 1 = write, 0 = read - */ -#define BT848_I2CWR _IOWR('x', 57, u_long) /* i2c read-write */ - -struct bktr_msp_control { - unsigned char function; - unsigned int address; - unsigned int data; -}; - -#define BT848_MSP_RESET _IO('x', 76) /* MSP chip reset */ -#define BT848_MSP_READ _IOWR('x', 77, struct bktr_msp_control) /* MSP chip reset */ -#define BT848_MSP_WRITE _IOWR('x', 78, struct bktr_msp_control) /* MSP chip reset */ - -/* Support for radio tuner */ -#define RADIO_SETMODE _IOW('x', 58, unsigned int) /* set radio modes */ -#define RADIO_GETMODE _IOR('x', 58, unsigned char) /* get radio modes */ -#define RADIO_AFC 0x01 /* These modes will probably not */ -#define RADIO_MONO 0x02 /* work on the FRxxxx. It does */ -#define RADIO_MUTE 0x08 /* work on the FMxxxx. */ -#define RADIO_SETFREQ _IOW('x', 59, unsigned int) /* set frequency */ -#define RADIO_GETFREQ _IOR('x', 59, unsigned int) /* set frequency */ - /* Argument is frequency*100MHz */ - -/* - * XXX: more bad magic, - * we need to fix the METEORGINPUT to return something public - * duplicate them here for now... - */ -#define METEOR_DEV0 0x00001000 -#define METEOR_DEV1 0x00002000 -#define METEOR_DEV2 0x00004000 -#define METEOR_DEV3 0x00008000 -#define METEOR_DEV_SVIDEO 0x00006000 -/* - * right now I don't know were to put these, but as they are suppose to be - * a part of a common video capture interface, these should be relocated to - * another place. Probably most of the METEOR_xxx defines need to be - * renamed and moved to a common header - */ - -typedef enum { METEOR_PIXTYPE_RGB, METEOR_PIXTYPE_YUV, - METEOR_PIXTYPE_YUV_PACKED, - METEOR_PIXTYPE_YUV_12 } METEOR_PIXTYPE; - - -struct meteor_pixfmt { - u_int index; /* Index in supported pixfmt list */ - METEOR_PIXTYPE type; /* What's the board gonna feed us */ - u_int Bpp; /* Bytes per pixel */ - u_long masks[3]; /* R,G,B or Y,U,V masks, respectively */ - unsigned swap_bytes :1; /* Bytes swapped within shorts */ - unsigned swap_shorts:1; /* Shorts swapped within longs */ -}; - - -struct bktr_clip { - int x_min; - int x_max; - int y_min; - int y_max; -}; - -#define BT848_MAX_CLIP_NODE 100 -struct _bktr_clip { - struct bktr_clip x[BT848_MAX_CLIP_NODE]; -}; - -/* - * I'm using METEOR_xxx just because that will be common to other interface - * and less of a surprise - */ -#define METEORSACTPIXFMT _IOW('x', 64, int ) -#define METEORGACTPIXFMT _IOR('x', 64, int ) -#define METEORGSUPPIXFMT _IOWR('x', 65, struct meteor_pixfmt) - -/* set clip list */ -#define BT848SCLIP _IOW('x', 66, struct _bktr_clip ) -#define BT848GCLIP _IOR('x', 66, struct _bktr_clip ) - - -/* set input format */ -#define BT848SFMT _IOW('x', 67, unsigned long ) -#define BT848GFMT _IOR('x', 67, unsigned long ) - -/* set clear-buffer-on-start */ -#define BT848SCBUF _IOW('x', 68, int) -#define BT848GCBUF _IOR('x', 68, int) - -/* set capture area */ -/* The capture area is the area of the video image which is grabbed */ -/* Usually the capture area is 640x480 (768x576 PAL) pixels */ -/* This area is then scaled to the dimensions the user requires */ -/* using the METEORGEO ioctl */ -/* However, the capture area could be 400x300 pixels from the top right */ -/* corner of the video image */ -struct bktr_capture_area { - int x_offset; - int y_offset; - int x_size; - int y_size; -}; -#define BT848_SCAPAREA _IOW('x', 69, struct bktr_capture_area) -#define BT848_GCAPAREA _IOR('x', 69, struct bktr_capture_area) - - -/* Get channel Set */ -#define BT848_MAX_CHNLSET_NAME_LEN 16 -struct bktr_chnlset { - short index; - short max_channel; - char name[BT848_MAX_CHNLSET_NAME_LEN]; -}; -#define TVTUNER_GETCHNLSET _IOWR('x', 70, struct bktr_chnlset) - - - -/* Infra Red Remote Control */ -struct bktr_remote { - unsigned char data[3]; -}; -#define REMOTE_GETKEY _IOR('x', 71, struct bktr_remote)/*read the remote */ - /*control receiver*/ - /*returns raw data*/ - - -/* - * Direct access to GPIO pins. You must add BKTR_GPIO_ACCESS to your kernel - * configuration file to use these - */ -#define BT848_GPIO_SET_EN _IOW('x', 72, int) /* set gpio_out_en */ -#define BT848_GPIO_GET_EN _IOR('x', 73, int) /* get gpio_out_en */ -#define BT848_GPIO_SET_DATA _IOW('x', 74, int) /* set gpio_data */ -#define BT848_GPIO_GET_DATA _IOR('x', 75, int) /* get gpio_data */ - - - -/* XXX - Copied from /sys/pci/brktree_reg.h */ -#define BT848_IFORM_FORMAT (0x7<<0) -# define BT848_IFORM_F_RSVD (0x7) -# define BT848_IFORM_F_SECAM (0x6) -# define BT848_IFORM_F_PALN (0x5) -# define BT848_IFORM_F_PALM (0x4) -# define BT848_IFORM_F_PALBDGHI (0x3) -# define BT848_IFORM_F_NTSCJ (0x2) -# define BT848_IFORM_F_NTSCM (0x1) -# define BT848_IFORM_F_AUTO (0x0) - - #endif /* _MACHINE_IOCTL_BT848_H_ */ - ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.7 2003/11/14 22:26:29 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.10 2003/12/09 03:04:19 njl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,6 @@ #include "acpi.h" #include <dev/acpica/acpivar.h> -#include <dev/acpica/madt.h> #include <dev/pci/pcivar.h> #define NIOAPICS 32 /* Max number of I/O APICs */ @@ -70,7 +69,7 @@ u_int la_apic_id:8; } lapics[NLAPICS + 1]; -static APIC_TABLE *madt; +static MULTIPLE_APIC_TABLE *madt; static vm_paddr_t madt_physaddr; static vm_offset_t madt_length; @@ -83,10 +82,10 @@ static void *madt_map(vm_paddr_t pa, int offset, vm_offset_t length); static void *madt_map_table(vm_paddr_t pa, int offset, const char *sig); static void madt_parse_apics(APIC_HEADER *entry, void *arg); -static void madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr); +static void madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr); static void madt_parse_ints(APIC_HEADER *entry, void *arg __unused); -static void madt_parse_local_nmi(LAPIC_NMI *nmi); -static void madt_parse_nmi(NMI *nmi); +static void madt_parse_local_nmi(MADT_LOCAL_APIC_NMI *nmi); +static void madt_parse_nmi(MADT_NMI_SOURCE *nmi); static int madt_probe(void); static int madt_probe_cpus(void); static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg __unused); @@ -222,7 +221,7 @@ printf("MADT: Failed to map XSDT\n"); return (ENXIO); } - count = (xsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (xsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT64); for (i = 0; i < count; i++) if (madt_probe_table(xsdt->TableOffsetEntry[i])) @@ -235,7 +234,7 @@ printf("MADT: Failed to map RSDT\n"); return (ENXIO); } - count = (rsdt->Header.Length - sizeof(ACPI_TABLE_HEADER)) / + count = (rsdt->Length - sizeof(ACPI_TABLE_HEADER)) / sizeof(UINT32); for (i = 0; i < count; i++) if (madt_probe_table(rsdt->TableOffsetEntry[i])) @@ -310,8 +309,8 @@ madt = pmap_mapdev(madt_physaddr, madt_length); lapic_init((uintptr_t)madt->LocalApicAddress); printf("ACPI APIC Table: <%.*s %.*s>\n", - (int)sizeof(madt->Header.OemId), madt->Header.OemId, - (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId); + (int)sizeof(madt->OemId), madt->OemId, + (int)sizeof(madt->OemTableId), madt->OemTableId); /* * We ignore 64-bit local APIC override entries. Should we @@ -363,7 +362,7 @@ APIC_HEADER *entry; u_char *p, *end; - end = (u_char *)(madt) + madt->Header.Length; + end = (u_char *)(madt) + madt->Length; for (p = (u_char *)(madt + 1); p < end; ) { entry = (APIC_HEADER *)p; handler(entry, arg); @@ -374,27 +373,27 @@ static void madt_probe_cpus_handler(APIC_HEADER *entry, void *arg) { - PROCESSOR_APIC *proc; + MADT_PROCESSOR_APIC *proc; struct lapic_info *la; switch (entry->Type) { - case APIC_PROC: + case APIC_PROCESSOR: /* * The MADT does not include a BSP flag, so we have to * let the MP code figure out which CPU is the BSP on * its own. */ - proc = (PROCESSOR_APIC *)entry; + proc = (MADT_PROCESSOR_APIC *)entry; if (bootverbose) printf("MADT: Found CPU APIC ID %d ACPI ID %d: %s\n", - proc->LocalApicId, proc->ProcessorApicId, + proc->LocalApicId, proc->ProcessorId, proc->ProcessorEnabled ? "enabled" : "disabled"); - if (proc->ProcessorApicId > NLAPICS) + if (proc->ProcessorId > NLAPICS) panic("%s: CPU ID %d too high", __func__, - proc->ProcessorApicId); - la = &lapics[proc->ProcessorApicId]; + proc->ProcessorId); + la = &lapics[proc->ProcessorId]; KASSERT(la->la_present == 0, - ("Duplicate local ACPI ID %d", proc->ProcessorApicId)); + ("Duplicate local ACPI ID %d", proc->ProcessorId)); la->la_present = 1; la->la_apic_id = proc->LocalApicId; if (proc->ProcessorEnabled) { @@ -412,16 +411,15 @@ static void madt_parse_apics(APIC_HEADER *entry, void *arg __unused) { - IO_APIC *apic; + MADT_IO_APIC *apic; - switch (entry->Type) { case APIC_IO: - apic = (IO_APIC *)entry; + apic = (MADT_IO_APIC *)entry; if (bootverbose) - printf("MADT: Found IO APIC ID %d, Vector %d at %p\n", - apic->IoApicId, apic->Vector, - (void *)(uintptr_t)apic->IoApicAddress); + printf("MADT: Found IO APIC ID %d, Interrupt %d at %p\n", + apic->IoApicId, apic->Interrupt, + (void *)(uintptr_t)apic->Address); if (apic->IoApicId >= NIOAPICS) panic("%s: I/O APIC ID %d too high", __func__, apic->IoApicId); @@ -429,9 +427,9 @@ panic("%s: Double APIC ID %d", __func__, apic->IoApicId); ioapics[apic->IoApicId].io_apic = ioapic_create( - (uintptr_t)apic->IoApicAddress, apic->IoApicId, - apic->Vector); - ioapics[apic->IoApicId].io_vector = apic->Vector; + (uintptr_t)apic->Address, apic->IoApicId, + apic->Interrupt); + ioapics[apic->IoApicId].io_vector = apic->Interrupt; break; default: break; @@ -448,10 +446,10 @@ { switch (Polarity) { - case APIC_POLARITY_CONFORM: - case APIC_POLARITY_ACTIVEHI: + case POLARITY_CONFORMS: + case POLARITY_ACTIVE_HIGH: return (1); - case APIC_POLARITY_ACTIVELO: + case POLARITY_ACTIVE_LOW: return (0); default: panic("Bogus Interrupt Polarity"); @@ -463,10 +461,10 @@ { switch (TriggerMode) { - case APIC_TRIGGER_CONFORM: - case APIC_TRIGGER_EDGE: + case TRIGGER_CONFORMS: + case TRIGGER_EDGE: return (1); - case APIC_TRIGGER_LEVEL: + case TRIGGER_LEVEL: return (0); default: panic("Bogus Interrupt Trigger Mode"); @@ -521,27 +519,26 @@ * Parse an interrupt source override for an ISA interrupt. */ static void -madt_parse_interrupt_override(INTERRUPT_SOURCE_OVERRIDE *intr) +madt_parse_interrupt_override(MADT_INTERRUPT_OVERRIDE *intr) { void *new_ioapic, *old_ioapic; u_int new_pin, old_pin; if (bootverbose) printf("MADT: intr override: source %u, irq %u\n", - intr->Source, intr->GlobalSystemInterrupt); + intr->Source, intr->Interrupt); KASSERT(intr->Bus == 0, ("bus for interrupt overrides must be zero")); - if (madt_find_interrupt(intr->GlobalSystemInterrupt, &new_ioapic, + if (madt_find_interrupt(intr->Interrupt, &new_ioapic, &new_pin) != 0) { printf("MADT: Could not find APIC for vector %d (IRQ %d)\n", - intr->GlobalSystemInterrupt, intr->Source); + intr->Interrupt, intr->Source); return; } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200312101646.hBAGk9G3010472>