Date: Wed, 30 Apr 2003 14:12:30 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30124 for review Message-ID: <200304302112.h3ULCUfQ057684@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30124 Change 30124 by jhb@jhb_laptop on 2003/04/30 14:12:14 IFC @30121. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/trap.c#47 integrate .. //depot/projects/smpng/sys/alpha/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/limits.h#6 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#19 integrate .. //depot/projects/smpng/sys/arm/include/limits.h#4 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_ccb.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#37 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#14 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#12 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#38 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#13 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_stats.c#13 integrate .. //depot/projects/smpng/sys/conf/files#75 integrate .. //depot/projects/smpng/sys/conf/files.i386#40 integrate .. //depot/projects/smpng/sys/conf/files.ia64#27 integrate .. //depot/projects/smpng/sys/conf/files.pc98#40 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#20 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/CHANGES.txt#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acapps.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acconfig.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdebug.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdisasm.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdispat.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acdos16.h#3 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/acefi.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acevents.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acexcep.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acgcc.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acglobal.h#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/achware.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acinterp.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/aclocal.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acmacros.h#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acnamesp.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acobject.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acoutput.h#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acparser.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpi.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpiosxf.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpixf.h#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acresrc.h#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acstruct.h#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actables.h#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl1.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl2.h#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/actbl71.h#3 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/actypes.h#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acutils.h#15 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlcode.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/amlresrc.h#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbdisply.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbexec.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbfileio.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbhistry.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbinput.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbstats.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmbuffer.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmnames.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmopcode.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrc.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcl.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmresrcs.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmutils.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dmwalk.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsfield.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsinit.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmethod.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsmthdat.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsobject.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsopcode.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dsutils.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswexec.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswload.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswscope.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dswstate.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evevent.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpe.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/evgpeblk.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/evmisc.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evregion.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evrgnini.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evsci.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxface.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfevnt.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/evxfregn.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconfig.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exconvrt.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/excreate.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exdump.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfield.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exfldio.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmisc.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exmutex.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exnames.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg1.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg2.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg3.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exoparg6.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exprep.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exregion.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresnte.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresolv.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exresop.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstore.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstoren.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exstorob.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exsystem.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/exutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwacpi.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwgpe.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwtimer.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsaccess.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsalloc.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdump.c#14 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsdumpdv.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nseval.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsinit.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsload.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsnames.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsobject.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsparse.c#1 branch .. //depot/projects/smpng/sys/contrib/dev/acpica/nssearch.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsutils.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nswalk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfeval.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfname.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/nsxfobj.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psargs.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psfind.c#10 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/psopcode.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psscope.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pstree.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psutils.c#9 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/pswalk.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psxface.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsaddr.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscalc.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rscreate.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsdump.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsio.c#5 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsirq.c#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rslist.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmemory.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsmisc.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsutils.c#8 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/rsxface.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbconvrt.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbget.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbgetall.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbinstal.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbrsdt.c#4 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbutils.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxface.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/tbxfroot.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utalloc.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utclib.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utcopy.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdebug.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utdelete.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/uteval.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utglobal.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utinit.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmath.c#6 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utmisc.c#12 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utobject.c#11 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/utxface.c#11 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#25 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdDebug.c#5 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdHardware.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdStream.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdTable.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#24 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#9 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#8 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#5 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#11 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#8 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#4 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#16 integrate .. //depot/projects/smpng/sys/dev/firewire/iec13213.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/iec68113.h#4 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#15 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#34 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#10 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbd.c#7 integrate .. //depot/projects/smpng/sys/dev/mca/mca_bus.c#3 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs#24 integrate .. //depot/projects/smpng/sys/dev/pccard/pccarddevs.h#24 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#26 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.c#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.h#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#6 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_types.h#3 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#7 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#28 integrate .. //depot/projects/smpng/sys/dev/sound/midi/midi.h#5 integrate .. //depot/projects/smpng/sys/dev/syscons/scmouse.c#8 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#11 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsecreg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#9 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#50 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#16 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_fileno.c#7 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vnops.c#18 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#9 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#10 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#22 integrate .. //depot/projects/smpng/sys/geom/geom_kern.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#57 integrate .. //depot/projects/smpng/sys/i386/conf/PAE#3 integrate .. //depot/projects/smpng/sys/i386/i386/autoconf.c#14 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#20 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#37 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#55 integrate .. //depot/projects/smpng/sys/i386/include/limits.h#6 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#24 integrate .. //depot/projects/smpng/sys/i386/isa/tw.c#7 delete .. //depot/projects/smpng/sys/ia64/ia64/mp_machdep.c#20 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#46 integrate .. //depot/projects/smpng/sys/ia64/include/bus.h#8 integrate .. //depot/projects/smpng/sys/ia64/include/cpufunc.h#16 integrate .. //depot/projects/smpng/sys/ia64/include/limits.h#6 integrate .. //depot/projects/smpng/sys/isa/atkbd_isa.c#6 integrate .. //depot/projects/smpng/sys/isa/atkbdc_isa.c#5 integrate .. //depot/projects/smpng/sys/isa/ppc.c#6 integrate .. //depot/projects/smpng/sys/isa/psm.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_clock.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#31 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#23 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#29 integrate .. //depot/projects/smpng/sys/kern/subr_scanf.c#3 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#23 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#44 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#55 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#37 integrate .. //depot/projects/smpng/sys/libkern/quad.h#4 integrate .. //depot/projects/smpng/sys/libkern/strtol.c#2 integrate .. //depot/projects/smpng/sys/libkern/strtoq.c#2 integrate .. //depot/projects/smpng/sys/libkern/strtoul.c#2 integrate .. //depot/projects/smpng/sys/libkern/strtouq.c#2 integrate .. //depot/projects/smpng/sys/modules/acpi/Makefile#11 integrate .. //depot/projects/smpng/sys/net/if.c#34 integrate .. //depot/projects/smpng/sys/net/if_atm.h#4 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#32 integrate .. //depot/projects/smpng/sys/net/if_ieee80211subr.c#3 integrate .. //depot/projects/smpng/sys/net/if_media.c#4 integrate .. //depot/projects/smpng/sys/net/if_media.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_base.c#15 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#17 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#11 integrate .. //depot/projects/smpng/sys/netinet/in.h#21 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#32 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#37 integrate .. //depot/projects/smpng/sys/netinet6/ah_output.c#4 integrate .. //depot/projects/smpng/sys/netinet6/esp_output.c#4 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#9 integrate .. //depot/projects/smpng/sys/netinet6/in6_cksum.c#4 integrate .. //depot/projects/smpng/sys/netinet6/ipcomp_output.c#5 integrate .. //depot/projects/smpng/sys/netinet6/ipsec.c#9 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#10 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#23 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#22 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#16 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98kbd.c#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#27 integrate .. //depot/projects/smpng/sys/pci/if_en_pci.c#5 integrate .. //depot/projects/smpng/sys/powerpc/include/limits.h#7 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#33 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#29 integrate .. //depot/projects/smpng/sys/sparc64/include/asm.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/asmacros.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/ktr.h#5 integrate .. //depot/projects/smpng/sys/sparc64/include/limits.h#6 integrate .. //depot/projects/smpng/sys/sparc64/include/trap.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/utrap.h#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#10 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#29 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/interrupt.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/locore.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_locore.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#50 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#3 delete .. //depot/projects/smpng/sys/sys/cdio.h#4 integrate .. //depot/projects/smpng/sys/sys/limits.h#2 integrate .. //depot/projects/smpng/sys/sys/param.h#39 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#14 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#32 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#28 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#14 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#25 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#30 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#35 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#17 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#29 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.h#9 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#29 integrate .. //depot/projects/smpng/sys/x86_64/include/limits.h#4 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#47 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.112 2003/04/22 03:17:41 davidxu Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.113 2003/04/30 17:59:26 jhb Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -778,7 +778,7 @@ cred_free_thread(td); #endif WITNESS_WARN(WARN_PANIC, NULL, "System call %s returning", - syscallnames[code]); + (code >= 0 && code < SYS_MAXSYSCALL) ? syscallnames[code] : "???"); mtx_assert(&sched_lock, MA_NOTOWNED); mtx_assert(&Giant, MA_NOTOWNED); } ==== //depot/projects/smpng/sys/alpha/include/_limits.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.11 2003/04/23 21:41:58 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.12 2003/04/28 22:35:34 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -87,6 +87,5 @@ #define __FLT_DIG 6 #define __FLT_MAX 3.40282347E+38F #define __FLT_MIN 1.17549435E-38F -#endif #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/smpng/sys/alpha/include/limits.h#6 (text+ko) ==== @@ -32,76 +32,16 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/limits.h,v 1.10 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/sys/alpha/include/limits.h,v 1.11 2003/04/29 13:35:58 kan Exp $ */ #ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ -#define CHAR_BIT 8 /* number of bits in a char */ +#if __GNUC__ +#warning "machine/limits.h is deprecated. Include sys/limits.h instead." +#endif -/* - * According to ANSI (section 2.2.4.2), the values below must be usable by - * #if preprocessing directives. Additionally, the expression must have the - * same type as would an expression that is an object of the corresponding - * type converted according to the integral promotions. The subtraction for - * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an - * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. - */ -#define SCHAR_MAX 0x7f /* max value for a signed char */ -#define SCHAR_MIN (-0x7f-1) /* min value for a signed char */ - -#define UCHAR_MAX 0xffU /* max value for an unsigned char */ -#define CHAR_MAX 0x7f /* max value for a char */ -#define CHAR_MIN (-0x7f-1) /* min value for a char */ - -#define USHRT_MAX 0xffffU /* max value for an unsigned short */ -#define SHRT_MAX 0x7fff /* max value for a short */ -#define SHRT_MIN (-0x7fff-1) /* min value for a short */ - -#define UINT_MAX 0xffffffffU /* max value for an unsigned int */ -#define INT_MAX 0x7fffffff /* max value for an int */ -#define INT_MIN (-0x7fffffff-1) /* min value for an int */ - -#define ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ -#define LONG_MAX 0x7fffffffffffffffL /* max for a long */ -#define LONG_MIN (-0x7fffffffffffffffL-1) /* min for a long */ - -/* Long longs and longs are the same size on the alpha. */ - /* max for an unsigned long long */ -#define ULLONG_MAX 0xffffffffffffffffULL -#define LLONG_MAX 0x7fffffffffffffffLL /* max for a long long */ -#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min for a long long */ - -#if !defined(_ANSI_SOURCE) -#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */ - -#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) -#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */ - -#define OFF_MAX LONG_MAX /* max value for a off_t */ -#define OFF_MIN LONG_MIN /* min value for a off_t */ - -/* Quads and longs are the same on the alpha. Ensure they stay in sync. */ -#define UQUAD_MAX (ULONG_MAX) /* max value for a uquad_t */ -#define QUAD_MAX (LONG_MAX) /* max value for a quad_t */ -#define QUAD_MIN (LONG_MIN) /* min value for a quad_t */ -#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */ -#endif /* !_ANSI_SOURCE */ - -#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE) -#define LONG_BIT 64 -#define WORD_BIT 32 - -#define DBL_DIG 15 -#define DBL_MAX 1.7976931348623157E+308 -#define DBL_MIN 2.2250738585072014E-308 - -#define FLT_DIG 6 -#define FLT_MAX 3.40282347E+38F -#define FLT_MIN 1.17549435E-38F -#endif +#include <sys/limits.h> #endif /* !_MACHINE_LIMITS_H_ */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#19 (text+ko) ==== @@ -30,7 +30,7 @@ * (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/osf1/osf1_signal.c,v 1.31 2003/04/25 19:52:30 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.32 2003/04/29 06:33:03 alc Exp $ */ #include "opt_compat.h" @@ -572,21 +572,12 @@ p = td->td_proc; scp = uap->sigcntxp; - mtx_lock(&Giant); - if (useracc((caddr_t)scp, sizeof (*scp), VM_PROT_READ) == 0 ) { - uprintf("uac fails\n"); - uprintf("scp: %p\n", scp); - } + /* - * Test and fetch the context structure. - * We grab it all at once for speed. + * Fetch the entire context structure at once for speed. */ - if (useracc((caddr_t)scp, sizeof (*scp), VM_PROT_READ) == 0 || - copyin((caddr_t)scp, (caddr_t)&ksc, sizeof ksc)) { - mtx_unlock(&Giant); + if (copyin((caddr_t)scp, (caddr_t)&ksc, sizeof ksc)) return (EFAULT); - } - mtx_unlock(&Giant); /* * Restore the user-supplied information. ==== //depot/projects/smpng/sys/arm/include/limits.h#4 (text+ko) ==== @@ -31,75 +31,16 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/limits.h,v 1.3 2002/12/22 06:38:44 tjr Exp $ + * $FreeBSD: src/sys/arm/include/limits.h,v 1.4 2003/04/29 13:35:58 kan Exp $ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ -#define CHAR_BIT 8 /* number of bits in a char */ - -/* - * According to ANSI (section 2.2.4.2), the values below must be usable by - * #if preprocessing directives. Additionally, the expression must have the - * same type as would an expression that is an object of the corresponding - * type converted according to the integral promotions. The subtraction for - * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an - * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). - * These numbers are for the default configuration of gcc. They work for - * some other compilers as well, but this should not be depended on. - */ -#define SCHAR_MAX 0x7f /* max value for a signed char */ -#define SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ - -#define UCHAR_MAX 0xff /* max value for an unsigned char */ - -#ifdef __CHAR_UNSIGNED__ -#define CHAR_MAX UCHAR_MAX /* max value for a char */ -#define CHAR_MIN 0 /* min value for a char */ -#else -#define CHAR_MAX SCHAR_MAX /* max value for a char */ -#define CHAR_MIN SCHAR_MIN /* min value for a char */ +#if __GNUC__ +#warning "machine/limits.h is deprecated. Include sys/limits.h instead." #endif -#define USHRT_MAX 0xffff /* max value for an unsigned short */ -#define SHRT_MAX 0x7fff /* max value for a short */ -#define SHRT_MIN (-0x7fff - 1) /* min value for a short */ - -#define UINT_MAX 0xffffffffU /* max value for an unsigned int */ -#define INT_MAX 0x7fffffff /* max value for an int */ -#define INT_MIN (-0x7fffffff - 1) /* min value for an int */ - -/* Bad hack for gcc configured to give 64-bit longs. */ -#ifdef _LARGE_LONG -#define ULONG_MAX 0xffffffffffffffffUL -#define LONG_MAX 0x7fffffffffffffffL -#define LONG_MIN (-0x7fffffffffffffffL - 1) -#else -#define ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ -#define LONG_MAX 0x7fffffffL /* max value for a long */ -#define LONG_MIN (-0x7fffffffL - 1) /* min value for a long */ -#endif - - /* max value for an unsigned long long */ -#define ULLONG_MAX 0xffffffffffffffffULL -#define LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ -#define LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ - -#if !defined(_ANSI_SOURCE) -#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ - -#if !defined(_POSIX_SOURCE) -#define SIZE_T_MAX UINT_MAX /* max value for a size_t */ - -#define OFF_MAX LLONG_MAX /* max value for a off_t */ -#define OFF_MIN LLONG_MIN /* min value for a off_t */ - -/* Quads and long longs are the same size. Ensure they stay in sync. */ -#define UQUAD_MAX ULLONG_MAX /* max value for a uquad_t */ -#define QUAD_MAX LLONG_MAX /* max value for a quad_t */ -#define QUAD_MIN LLONG_MIN /* min value for a quad_t */ -#endif /* !_POSIX_SOURCE */ -#endif /* !_ANSI_SOURCE */ +#include <sys/limits.h> #endif /* !_MACHINE_LIMITS_H_ */ ==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.3 2002/07/09 17:53:44 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.4 2003/04/29 18:50:34 njl Exp $ */ #include <stand.h> @@ -31,6 +31,7 @@ #include <bootstrap.h> #include "acfreebsd.h" +#define ACPI_SYSTEM_XFACE #include "actypes.h" #include "actbl.h" ==== //depot/projects/smpng/sys/cam/cam_ccb.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.22 2001/06/24 18:17:45 mjacob Exp $ + * $FreeBSD: src/sys/cam/cam_ccb.h,v 1.24 2003/04/30 00:35:22 ken Exp $ */ #ifndef _CAM_CAM_CCB_H @@ -35,7 +35,7 @@ #include <sys/cdefs.h> #include <sys/time.h> #ifdef CAM_NEW_TRAN_CODE -#include <machine/limits.h> +#include <sys/limits.h> #endif /* CAM_NEW_TRAN_CODE */ #ifndef _KERNEL #include <sys/callout.h> @@ -488,7 +488,7 @@ /* * Definitions for the path inquiry CCB fields. */ -#define CAM_VERSION 0x14 /* Hex value for current version */ +#define CAM_VERSION 0x15 /* Hex value for current version */ typedef enum { PI_MDP_ABLE = 0x80, /* Supports MDP message */ @@ -789,8 +789,8 @@ struct ccb_calc_geometry { struct ccb_hdr ccb_h; u_int32_t block_size; - u_int32_t volume_size; - u_int16_t cylinders; + u_int64_t volume_size; + u_int32_t cylinders; u_int8_t heads; u_int8_t secs_per_track; }; ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * Implementation of Utility functions for all SCSI device types. * * Copyright (c) 1997, 1998, 1999 Justin T. Gibbs. - * Copyright (c) 1997, 1998 Kenneth D. Merry. + * Copyright (c) 1997, 1998, 2003 Kenneth D. Merry. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.39 2003/02/21 06:19:37 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.40 2003/04/30 00:35:22 ken Exp $ */ #include <sys/param.h> @@ -507,9 +507,11 @@ /* 85 */ /* 86 */ /* 87 */ -/* 88 */ +/* 88 MM OO O O READ(16) */ +{0x88, D|T|W|R|O, "READ(16)"}, /* 89 */ -/* 8A */ +/* 8A OM O O O WRITE(16) */ +{0x8A, D|T|W|R|O, "WRITE(16)"}, /* 8B */ /* 8C */ /* 8D */ @@ -529,8 +531,11 @@ /* 9B */ /* 9C */ /* 9D */ -/* 9E */ -/* 9F */ +/* XXX KDM ALL for these? op-num.txt defines them for none.. */ +/* 9E SERVICE ACTION IN(16) */ +{0x9E, ALL, "SERVICE ACTION IN(16)"}, +/* 9F SERVICE ACTION OUT(16) */ +{0x9F, ALL, "SERVICE ACTION OUT(16)"}, /* A0 OOOOOOOOOOO REPORT LUNS */ {0xA0, ALL & ~(E), "REPORT LUNS"}, @@ -560,16 +565,16 @@ /* A7 OO OO OO MOVE MEDIUM ATTACHED */ {0xA7, D|T|W|R|O|M, "MOVE MEDIUM ATTACHED"}, -/* A8 OM O READ(12) */ -{0xA8, W|R|O, "READ(12)"}, +/* A8 O OM O READ(12) */ +{0xA8,D|W|R|O, "READ(12)"}, /* A8 O GET MESSAGE(12) */ {0xA8, C, "GET MESSAGE(12)"}, /* A9 O PLAY TRACK RELATIVE(12) */ {0xA9, R, "PLAY TRACK RELATIVE(12)"}, -/* AA O O WRITE(12) */ -{0xAA, W|O, "WRITE(12)"}, +/* AA O O O WRITE(12) */ +{0xAA,D|W|O, "WRITE(12)"}, /* AA O WRITE CD(12) {MMC Proposed} */ {0xAA, R, "WRITE CD(12) {MMC Proposed}"}, /* AA O SEND MESSAGE(12) */ @@ -2699,6 +2704,38 @@ } void +scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, union ccb *), + uint8_t tag_action, uint64_t lba, int reladr, int pmi, + struct scsi_read_capacity_data_long *rcap_buf, + uint8_t sense_len, uint32_t timeout) +{ + struct scsi_read_capacity_16 *scsi_cmd; + + + cam_fill_csio(csio, + retries, + cbfcnp, + /*flags*/CAM_DIR_IN, + tag_action, + /*data_ptr*/(u_int8_t *)rcap_buf, + /*dxfer_len*/sizeof(*rcap_buf), + sense_len, + sizeof(*scsi_cmd), + timeout); + scsi_cmd = (struct scsi_read_capacity_16 *)&csio->cdb_io.cdb_bytes; + bzero(scsi_cmd, sizeof(*scsi_cmd)); + scsi_cmd->opcode = SERVICE_ACTION_IN; + scsi_cmd->service_action = SRC16_SERVICE_ACTION; + scsi_u64to8b(lba, scsi_cmd->addr); + scsi_ulto4b(sizeof(*rcap_buf), scsi_cmd->alloc_len); + if (pmi) + reladr |= SRC16_PMI; + if (reladr) + reladr |= SRC16_RELADR; +} + +void scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, struct scsi_report_luns_data *rpl_buf, @@ -2758,7 +2795,7 @@ scsi_read_write(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, u_int8_t byte2, - int minimum_cmd_size, u_int32_t lba, u_int32_t block_count, + int minimum_cmd_size, u_int64_t lba, u_int32_t block_count, u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, u_int32_t timeout) { @@ -2790,7 +2827,8 @@ scsi_cmd->addr[1], scsi_cmd->addr[2], scsi_cmd->length, dxfer_len)); } else if ((minimum_cmd_size < 12) - && ((block_count & 0xffff) == block_count)) { + && ((block_count & 0xffff) == block_count) + && ((lba & 0xffffffff) == lba)) { /* * Need a 10 byte cdb. */ @@ -2810,11 +2848,12 @@ scsi_cmd->addr[1], scsi_cmd->addr[2], scsi_cmd->addr[3], scsi_cmd->length[0], scsi_cmd->length[1], dxfer_len)); - } else { + } else if ((minimum_cmd_size < 16) + && ((block_count & 0xffffffff) == block_count) + && ((lba & 0xffffffff) == lba)) { /* * The block count is too big for a 10 byte CDB, use a 12 - * byte CDB. READ/WRITE(12) are currently only defined for - * optical devices. + * byte CDB. */ struct scsi_rw_12 *scsi_cmd; @@ -2833,6 +2872,21 @@ scsi_cmd->addr[3], scsi_cmd->length[0], scsi_cmd->length[1], scsi_cmd->length[2], scsi_cmd->length[3], dxfer_len)); + } else { + /* + * 16 byte CDB. We'll only get here if the LBA is larger + * than 2^32, or if the user asks for a 16 byte command. + */ + struct scsi_rw_16 *scsi_cmd; + + scsi_cmd = (struct scsi_rw_16 *)&csio->cdb_io.cdb_bytes; + scsi_cmd->opcode = readop ? READ_16 : WRITE_16; + scsi_cmd->byte2 = byte2; + scsi_u64to8b(lba, scsi_cmd->addr); + scsi_cmd->reserved = 0; + scsi_ulto4b(block_count, scsi_cmd->length); + scsi_cmd->control = 0; + cdb_len = sizeof(*scsi_cmd); } cam_fill_csio(csio, retries, ==== //depot/projects/smpng/sys/cam/scsi/scsi_all.h#7 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.22 2003/02/21 06:19:38 ken Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.23 2003/04/30 00:35:22 ken Exp $ */ /* @@ -419,7 +419,9 @@ { u_int8_t opcode; #define SRW10_RELADDR 0x01 -#define SRW10_FUA 0x08 +/* EBP defined for WRITE(10) only */ +#define SRW10_EBP 0x04 +#define SRW10_FUA 0x08 #define SRW10_DPO 0x10 u_int8_t byte2; u_int8_t addr[4]; @@ -441,6 +443,19 @@ u_int8_t control; }; +struct scsi_rw_16 +{ + u_int8_t opcode; +#define SRW16_RELADDR 0x01 +#define SRW16_FUA 0x08 +#define SRW16_DPO 0x10 + u_int8_t byte2; + u_int8_t addr[8]; + u_int8_t length[4]; + u_int8_t reserved; + u_int8_t control; +}; + struct scsi_start_stop_unit { u_int8_t opcode; @@ -486,11 +501,14 @@ #define LOG_SENSE 0x4d #define MODE_SELECT_10 0x55 #define MODE_SENSE_10 0x5A +#define READ_16 0x88 +#define WRITE_16 0x8a +#define SERVICE_ACTION_IN 0x9e #define REPORT_LUNS 0xA0 -#define MOVE_MEDIUM 0xa5 -#define READ_12 0xa8 -#define WRITE_12 0xaa -#define READ_ELEMENT_STATUS 0xb8 +#define MOVE_MEDIUM 0xa5 +#define READ_12 0xa8 +#define WRITE_12 0xaa +#define READ_ELEMENT_STATUS 0xb8 /* @@ -651,12 +669,31 @@ u_int8_t control; }; +struct scsi_read_capacity_16 +{ + uint8_t opcode; +#define SRC16_SERVICE_ACTION 0x10 + uint8_t service_action; + uint8_t addr[8]; + uint8_t alloc_len[4]; +#define SRC16_PMI 0x01 +#define SRC16_RELADR 0x02 + uint8_t reladr; + uint8_t control; +}; + struct scsi_read_capacity_data { u_int8_t addr[4]; u_int8_t length[4]; }; +struct scsi_read_capacity_data_long +{ + uint8_t addr[8]; + uint8_t length[4]; +}; + struct scsi_report_luns { u_int8_t opcode; @@ -977,6 +1014,13 @@ union ccb *), u_int8_t tag_action, struct scsi_read_capacity_data *, u_int8_t sense_len, u_int32_t timeout); +void scsi_read_capacity_16(struct ccb_scsiio *csio, uint32_t retries, + void (*cbfcnp)(struct cam_periph *, + union ccb *), uint8_t tag_action, + uint64_t lba, int reladr, int pmi, + struct scsi_read_capacity_data_long + *rcap_buf, uint8_t sense_len, + uint32_t timeout); void scsi_report_luns(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, @@ -995,7 +1039,7 @@ void scsi_read_write(struct ccb_scsiio *csio, u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb *), u_int8_t tag_action, int readop, u_int8_t byte2, - int minimum_cmd_size, u_int32_t lba, + int minimum_cmd_size, u_int64_t lba, u_int32_t block_count, u_int8_t *data_ptr, u_int32_t dxfer_len, u_int8_t sense_len, u_int32_t timeout); @@ -1015,10 +1059,12 @@ static __inline void scsi_ulto2b(u_int32_t val, u_int8_t *bytes); static __inline void scsi_ulto3b(u_int32_t val, u_int8_t *bytes); static __inline void scsi_ulto4b(u_int32_t val, u_int8_t *bytes); +static __inline void scsi_u64to8b(u_int64_t val, u_int8_t *bytes); static __inline u_int32_t scsi_2btoul(u_int8_t *bytes); static __inline u_int32_t scsi_3btoul(u_int8_t *bytes); static __inline int32_t scsi_3btol(u_int8_t *bytes); static __inline u_int32_t scsi_4btoul(u_int8_t *bytes); +static __inline u_int64_t scsi_8btou64(u_int8_t *bytes); static __inline void *find_mode_page_6(struct scsi_mode_header_6 *mode_header); static __inline void *find_mode_page_10(struct scsi_mode_header_10 *mode_header); @@ -1059,6 +1105,20 @@ bytes[3] = val & 0xff; } +static __inline void +scsi_u64to8b(u_int64_t val, u_int8_t *bytes) +{ + + bytes[0] = (val >> 56) & 0xff; + bytes[1] = (val >> 48) & 0xff; + bytes[2] = (val >> 40) & 0xff; + bytes[3] = (val >> 32) & 0xff; + bytes[4] = (val >> 24) & 0xff; + bytes[5] = (val >> 16) & 0xff; + bytes[6] = (val >> 8) & 0xff; + bytes[7] = val & 0xff; +} + static __inline u_int32_t scsi_2btoul(u_int8_t *bytes) { @@ -1103,6 +1163,22 @@ return (rv); } +static __inline uint64_t +scsi_8btou64(uint8_t *bytes) +{ + uint64_t rv; + + rv = (((uint64_t)bytes[0]) << 56) | + (((uint64_t)bytes[1]) << 48) | + (((uint64_t)bytes[2]) << 40) | + (((uint64_t)bytes[3]) << 32) | + (((uint64_t)bytes[4]) << 24) | + (((uint64_t)bytes[5]) << 16) | + (((uint64_t)bytes[6]) << 8) | + bytes[7]; + return (rv); +} + /* * Given the pointer to a returned mode sense buffer, return a pointer to * the start of the first mode page. ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#37 (text+ko) ==== @@ -25,7 +25,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304302112.h3ULCUfQ057684>