Date: Tue, 11 Mar 2003 10:56:00 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 26700 for review Message-ID: <200303111856.h2BIu0bA066431@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=26700 Change 26700 by jhb@jhb_laptop on 2003/03/11 10:55:30 IFC @26698. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#9 integrate .. //depot/projects/smpng/sys/boot/common/help.common#9 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#17 integrate .. //depot/projects/smpng/sys/cam/cam_periph.h#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#14 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#33 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#11 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#7 integrate .. //depot/projects/smpng/sys/coda/coda_vfsops.c#11 integrate .. //depot/projects/smpng/sys/conf/NOTES#36 integrate .. //depot/projects/smpng/sys/conf/files#65 integrate .. //depot/projects/smpng/sys/conf/majors#23 integrate .. //depot/projects/smpng/sys/conf/options#47 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#6 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#22 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#7 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#9 integrate .. //depot/projects/smpng/sys/dev/aac/aac_disk.c#14 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#16 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#14 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_compat.h#4 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#8 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#16 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#7 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#31 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#16 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#7 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#15 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#5 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#21 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_agpsupport.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_auth.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_context.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_dma.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drawable.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/drm_fops.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_init.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_ioctl.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_lists.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_lock.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_memory.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sarea.h#1 branch .. //depot/projects/smpng/sys/dev/drm/drm_scatter.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/gamma.h#2 delete .. //depot/projects/smpng/sys/dev/drm/gamma_dma.c#2 delete .. //depot/projects/smpng/sys/dev/drm/gamma_drv.c#2 delete .. //depot/projects/smpng/sys/dev/drm/gamma_drv.h#3 delete .. //depot/projects/smpng/sys/dev/drm/i810_drm.h#2 delete .. //depot/projects/smpng/sys/dev/drm/mga.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#1 branch .. //depot/projects/smpng/sys/dev/drm/mga_state.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/mga_warp.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/r128.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/r128_cce.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#1 branch .. //depot/projects/smpng/sys/dev/drm/r128_state.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/radeon.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_mem.c#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drm.h#2 delete .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#6 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#12 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#10 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#25 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#6 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#8 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ida/idavar.h#2 integrate .. //depot/projects/smpng/sys/dev/kbd/kbd.c#7 integrate .. //depot/projects/smpng/sys/dev/md/md.c#29 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#8 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_compat.h#3 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#6 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/mlx/mlxvar.h#6 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#15 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_disk.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#7 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#9 integrate .. //depot/projects/smpng/sys/dev/sio/sio_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#4 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#12 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/ucom.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/uhci.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/umodem.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#26 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#27 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#27 integrate .. //depot/projects/smpng/sys/dev/usb/uvisor.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/uvscom.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#10 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#44 integrate .. //depot/projects/smpng/sys/dev/zs/zs.c#6 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#7 integrate .. //depot/projects/smpng/sys/geom/geom.h#19 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#18 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#52 integrate .. //depot/projects/smpng/sys/i386/i386/critical.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/loran.c#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/autoconf.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#11 integrate .. //depot/projects/smpng/sys/isa/fd.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#55 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#18 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#5 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#26 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#48 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#91 integrate .. //depot/projects/smpng/sys/kern/tty_cons.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#6 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#18 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#15 integrate .. //depot/projects/smpng/sys/modules/Makefile#45 integrate .. //depot/projects/smpng/sys/modules/drm/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/drm/gamma/Makefile#2 delete .. //depot/projects/smpng/sys/modules/drm/mga/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/drm/r128/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/if_tun/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/netgraph/iface/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/uvscom/Makefile#2 integrate .. //depot/projects/smpng/sys/net/if.c#32 integrate .. //depot/projects/smpng/sys/net/if_tun.c#23 integrate .. //depot/projects/smpng/sys/net/netisr.c#3 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#29 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#19 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/smpng/sys/netipx/ipx_proto.c#2 integrate .. //depot/projects/smpng/sys/netipx/ipx_tun.c#2 delete .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#11 integrate .. //depot/projects/smpng/sys/netncp/ncp_mod.c#3 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#3 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#20 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#26 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons.c#22 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#9 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#10 integrate .. //depot/projects/smpng/sys/sys/buf.h#17 integrate .. //depot/projects/smpng/sys/sys/ccdvar.h#6 integrate .. //depot/projects/smpng/sys/sys/conf.h#21 integrate .. //depot/projects/smpng/sys/sys/devicestat.h#4 integrate .. //depot/projects/smpng/sys/sys/disk.h#10 integrate .. //depot/projects/smpng/sys/sys/malloc.h#15 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#18 integrate .. //depot/projects/smpng/sys/sys/mount.h#19 integrate .. //depot/projects/smpng/sys/sys/param.h#34 integrate .. //depot/projects/smpng/sys/sys/proc.h#72 integrate .. //depot/projects/smpng/sys/sys/stat.h#10 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#24 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#22 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#9 (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/alpha/alpha/autoconf.c,v 1.54 2002/09/20 16:37:15 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.55 2003/03/08 08:01:26 phk Exp $ */ #include "opt_bootp.h" @@ -41,7 +41,6 @@ #include <sys/mount.h> #include <sys/sysctl.h> #include <sys/bus.h> -#include <sys/devicestat.h> #include <sys/cons.h> #include <machine/md_var.h> ==== //depot/projects/smpng/sys/boot/common/help.common#9 (text+ko) ==== @@ -10,7 +10,7 @@ described by the term. A term enclosed with [...] is optional, and may not be required by all forms of the command. - Some commands may not be availalble. Use the '?' command to list + Some commands may not be available. Use the '?' command to list most available commands. ################################################################################ @@ -199,7 +199,7 @@ set module_path=<path>[;<path>...] Sets the list of directories which will be searched in for modules - named in a load command or implicitly required by a dependancy. The + named in a load command or implicitly required by a dependency. The default module_path is "/boot/kernel;/boot/modules". ################################################################################ @@ -225,7 +225,7 @@ ################################################################################ # Tset Stunables DSet kernel tunable values - Various kernel tunable parameters can be overriden by specifying new + Various kernel tunable parameters can be overridden by specifying new values in the environment. set kern.ipc.nmbclusters=<value> NMBCLUSTERS ==== //depot/projects/smpng/sys/boot/forth/loader.conf#17 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.69 2003/03/02 18:04:10 harti Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.70 2003/03/11 12:09:25 ru Exp $ ############################################################## ### Basic configuration options ############################ @@ -48,7 +48,7 @@ #autoboot_delay="10" # Delay in seconds before autobooting #console="vidconsole" # Set the current console #currdev="disk1s1a" # Set the current device -module_path="/boot/kernel;/boot/modules;/modules" # Set the module search path +module_path="/boot/kernel;/boot/modules" # Set the module search path #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem ==== //depot/projects/smpng/sys/cam/cam_periph.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_periph.h,v 1.12 2001/02/07 07:05:56 peter Exp $ + * $FreeBSD: src/sys/cam/cam_periph.h,v 1.13 2003/03/08 08:01:26 phk Exp $ */ #ifndef _CAM_CAM_PERIPH_H @@ -35,6 +35,8 @@ #ifdef _KERNEL +struct devstat; + extern struct cam_periph *xpt_periph; extern struct periph_driver **periph_drivers; ==== //depot/projects/smpng/sys/cam/cam_xpt.c#14 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.131 2003/03/03 12:15:38 phk Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.132 2003/03/08 08:01:26 phk Exp $ */ #include <sys/param.h> #include <sys/bus.h> @@ -38,7 +38,6 @@ #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/md5.h> -#include <sys/devicestat.h> #include <sys/interrupt.h> #include <sys/sbuf.h> ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#14 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.73 2003/03/03 12:15:39 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.74 2003/03/08 21:40:13 phk Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -143,7 +143,7 @@ struct cd_params params; union ccb saved_ccb; cd_quirks quirks; - struct devstat device_stats; + struct devstat *device_stats; STAILQ_ENTRY(cd_softc) changer_links; struct cdchanger *changer; int bufs_left; @@ -524,7 +524,7 @@ free(softc->changer, M_DEVBUF); num_changers--; } - devstat_remove_entry(&softc->device_stats); + devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); EVENTHANDLER_DEREGISTER(dev_clone, softc->clonetag); free(softc, M_DEVBUF); @@ -736,7 +736,7 @@ * WORM peripheral driver. WORM drives will also have the WORM * driver attached to them. */ - devstat_add_entry(&softc->device_stats, "cd", + softc->device_stats = devstat_new_entry("cd", periph->unit_number, 0, DEVSTAT_BS_UNAVAILABLE, DEVSTAT_TYPE_CDROM | DEVSTAT_TYPE_IF_SCSI, @@ -1057,7 +1057,7 @@ * Since we're closing this CD, mark the blocksize as unavailable. * It will be marked as available when the CD is opened again. */ - softc->device_stats.flags |= DEVSTAT_BS_UNAVAILABLE; + softc->device_stats->flags |= DEVSTAT_BS_UNAVAILABLE; /* * We'll check the media and toc again at the next open(). @@ -1088,7 +1088,7 @@ * this device. If not, move it out of the active slot. */ if ((bioq_first(&changer->cur_device->bio_queue) == NULL) - && (changer->cur_device->device_stats.busy_count == 0)) { + && (changer->cur_device->device_stats->busy_count == 0)) { changer->flags |= CHANGER_MANUAL_CALL; cdrunchangerqueue(changer); } @@ -1187,10 +1187,10 @@ */ if (changer->devq.qfrozen_cnt > 0) { - if (changer->cur_device->device_stats.busy_count > 0) { + if (changer->cur_device->device_stats->busy_count > 0) { changer->cur_device->flags |= CD_FLAG_SCHED_ON_COMP; changer->cur_device->bufs_left = - changer->cur_device->device_stats.busy_count; + changer->cur_device->device_stats->busy_count; if (called_from_timeout) { changer->long_handle = timeout(cdrunchangerqueue, changer, @@ -1297,7 +1297,7 @@ cdrunchangerqueue(softc->changer); } } else if ((bioq_first(&softc->bio_queue) == NULL) - && (softc->device_stats.busy_count == 0)) { + && (softc->device_stats->busy_count == 0)) { softc->changer->flags |= CHANGER_MANUAL_CALL; cdrunchangerqueue(softc->changer); } @@ -1351,7 +1351,7 @@ softc = (struct cd_softc *)periph->softc; error = cam_periph_runccb(ccb, error_routine, cam_flags, sense_flags, - &softc->device_stats); + softc->device_stats); if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); @@ -1507,7 +1507,7 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction(&softc->device_stats); + devstat_start_transaction(softc->device_stats); scsi_read_write(&start_ccb->csio, /*retries*/4, @@ -1666,7 +1666,7 @@ if (softc->flags & CD_FLAG_CHANGER) cdchangerschedule(softc); - biofinish(bp, &softc->device_stats, 0); + biofinish(bp, softc->device_stats, 0); break; } case CD_CCB_PROBE: @@ -2828,9 +2828,9 @@ * XXX problems here if some slice or partition is still * open with the old size? */ - if ((softc->device_stats.flags & DEVSTAT_BS_UNAVAILABLE) != 0) - softc->device_stats.flags &= ~DEVSTAT_BS_UNAVAILABLE; - softc->device_stats.block_size = softc->params.blksize; + if ((softc->device_stats->flags & DEVSTAT_BS_UNAVAILABLE) != 0) + softc->device_stats->flags &= ~DEVSTAT_BS_UNAVAILABLE; + softc->device_stats->block_size = softc->params.blksize; return (error); } ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.34 2003/03/03 12:15:39 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.35 2003/03/08 21:41:15 phk Exp $ */ /* * Derived from the NetBSD SCSI changer driver. @@ -142,7 +142,7 @@ ch_state state; ch_quirks quirks; union ccb saved_ccb; - struct devstat device_stats; + struct devstat *device_stats; dev_t dev; int sc_picker; /* current picker */ @@ -283,7 +283,7 @@ softc = (struct ch_softc *)periph->softc; - devstat_remove_entry(&softc->device_stats); + devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); xpt_print_path(periph->path); printf("removing device entry\n"); @@ -369,7 +369,7 @@ * Changers don't have a blocksize, and obviously don't support * tagged queueing. */ - devstat_add_entry(&softc->device_stats, "ch", + softc->device_stats = devstat_new_entry("ch", periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | DEVSTAT_NO_ORDERED_TAGS, SID_TYPE(&cgd->inq_data)| DEVSTAT_TYPE_IF_SCSI, @@ -845,7 +845,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); xpt_release_ccb(ccb); @@ -908,7 +908,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); xpt_release_ccb(ccb); @@ -954,7 +954,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); xpt_release_ccb(ccb); @@ -1110,7 +1110,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); if (error) goto done; @@ -1146,7 +1146,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); if (error) goto done; @@ -1225,7 +1225,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); xpt_release_ccb(ccb); @@ -1312,7 +1312,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); xpt_release_ccb(ccb); @@ -1376,7 +1376,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /* sense_flags */ SF_RETRY_UA|SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); if (error) { if (dbd) { @@ -1389,7 +1389,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); } else { /* * Since we disabled sense printing above, print @@ -1439,7 +1439,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /* sense_flags */ SF_RETRY_UA | SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); if (error) { if (dbd) { @@ -1452,7 +1452,7 @@ error = cam_periph_runccb(ccb, cherror, /*cam_flags*/ CAM_RETRY_SELTO, /*sense_flags*/ SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); } else { /* * Since we disabled sense printing above, print ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#33 (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/scsi/scsi_da.c,v 1.130 2003/02/25 22:06:21 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.133 2003/03/11 02:07:17 njl Exp $ */ #ifdef _KERNEL @@ -116,7 +116,6 @@ struct da_softc { struct bio_queue_head bio_queue; - struct devstat device_stats; SLIST_ENTRY(da_softc) links; LIST_HEAD(, ccb_hdr) pending_ccbs; da_state state; @@ -445,6 +444,23 @@ */ {T_DIRECT, SIP_MEDIA_REMOVABLE, "LEXAR", "DIGITAL FILM", "*"}, /*quirks*/ DA_Q_NO_6_BYTE + }, + { + /* + * Pentax USB Optio 230 camera + * PR: kern/46369 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, + "PENTAX", "DIGITAL_CAMERA", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE + }, + { + /* + * SanDisk ImageMate II compact flash + * PR: kern/47877 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "SanDisk", "ImageMate*", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE } }; @@ -569,7 +585,7 @@ error = cam_periph_runccb(ccb, daerror, /*cam_flags*/CAM_RETRY_SELTO, /*sense_flags*/SF_RETRY_UA, - &softc->device_stats); + softc->disk.d_devstat); if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) cam_release_devq(ccb->ccb_h.path, @@ -591,16 +607,8 @@ /* XXX: these are not actually "firmware" values, so they may be wrong */ softc->disk.d_fwsectors = softc->params.secs_per_track; softc->disk.d_fwheads = softc->params.heads; - - /* - * Check to see whether or not the blocksize is set yet. - * If it isn't, set it and then clear the blocksize - * unavailable flag for the device statistics. - */ - if ((softc->device_stats.flags & DEVSTAT_BS_UNAVAILABLE) != 0){ - softc->device_stats.block_size = softc->params.secsize; - softc->device_stats.flags &= ~DEVSTAT_BS_UNAVAILABLE; - } + softc->disk.d_devstat->block_size = softc->params.secsize; + softc->disk.d_devstat->flags &= ~DEVSTAT_BS_UNAVAILABLE; } if (error == 0) { @@ -647,7 +655,7 @@ cam_periph_runccb(ccb, /*error_routine*/NULL, /*cam_flags*/0, /*sense_flags*/SF_RETRY_UA, - &softc->device_stats); + softc->disk.d_devstat); if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { if ((ccb->ccb_h.status & CAM_STATUS_MASK) == @@ -688,7 +696,7 @@ * unavailable, since it could change when new media is * inserted. */ - softc->device_stats.flags |= DEVSTAT_BS_UNAVAILABLE; + softc->disk.d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE; } softc->flags &= ~DA_FLAG_OPEN; @@ -976,7 +984,6 @@ softc = (struct da_softc *)periph->softc; - devstat_remove_entry(&softc->device_stats); xpt_print_path(periph->path); printf("removing device entry\n"); disk_destroy(&softc->disk); @@ -1187,20 +1194,6 @@ splx(s); /* - * The DA driver supports a blocksize, but - * we don't know the blocksize until we do - * a read capacity. So, set a flag to - * indicate that the blocksize is - * unavailable right now. We'll clear the - * flag as soon as we've done a read capacity. - */ - devstat_add_entry(&softc->device_stats, "da", - periph->unit_number, 0, - DEVSTAT_BS_UNAVAILABLE, - SID_TYPE(&cgd->inq_data) | DEVSTAT_TYPE_IF_SCSI, - DEVSTAT_PRIORITY_DISK); - - /* * Register this media as a disk */ @@ -1276,8 +1269,6 @@ bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction(&softc->device_stats); - if ((softc->flags & DA_FLAG_NEED_OTAG) != 0) { softc->flags &= ~DA_FLAG_NEED_OTAG; softc->ordered_tag_count++; @@ -1510,10 +1501,10 @@ LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); splx(oldspl); - if (softc->device_stats.busy_count == 0) + if (softc->disk.d_devstat->busy_count == 0) softc->flags |= DA_FLAG_WENT_IDLE; - biofinish(bp, &softc->device_stats, 0); + biodone(bp); break; } case DA_CCB_PROBE: @@ -1731,7 +1722,7 @@ 5000); error = cam_periph_runccb(ccb, /*error_routine*/NULL, CAM_RETRY_SELTO, - SF_RETRY_UA, &softc->device_stats); + SF_RETRY_UA, softc->disk.d_devstat); if (error == 0) { if (action == PR_ALLOW) @@ -1790,7 +1781,7 @@ && ((softc->flags & DA_FLAG_WENT_IDLE) == 0)) { softc->flags |= DA_FLAG_NEED_OTAG; } - if (softc->device_stats.busy_count > 0) + if (softc->disk.d_devstat->busy_count > 0) softc->flags &= ~DA_FLAG_WENT_IDLE; softc->ordered_tag_count = 0; ==== //depot/projects/smpng/sys/cam/scsi/scsi_low.c#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.18 2003/02/19 05:46:57 imp Exp $ */ +/* $FreeBSD: src/sys/cam/scsi/scsi_low.c,v 1.19 2003/03/08 08:01:26 phk Exp $ */ /* $NecBSD: scsi_low.c,v 1.24.10.8 2001/06/26 07:39:44 honda Exp $ */ /* $NetBSD$ */ @@ -75,7 +75,6 @@ #else #include <machine/clock.h> #endif -#include <sys/devicestat.h> #endif /* __FreeBSD__ */ #include <sys/buf.h> ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.36 2003/03/03 12:15:39 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.37 2003/03/08 21:41:54 phk Exp $ */ #include <sys/param.h> @@ -72,7 +72,7 @@ pass_flags flags; u_int8_t pd_type; union ccb saved_ccb; - struct devstat device_stats; + struct devstat *device_stats; dev_t dev; }; @@ -186,7 +186,7 @@ softc = (struct pass_softc *)periph->softc; - devstat_remove_entry(&softc->device_stats); + devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); @@ -284,7 +284,7 @@ * it even has a blocksize. */ no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; - devstat_add_entry(&softc->device_stats, "pass", periph->unit_number, 0, + softc->device_stats = devstat_new_entry("pass", periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | (no_tags ? DEVSTAT_NO_ORDERED_TAGS : 0), softc->pd_type | @@ -596,7 +596,7 @@ passerror : NULL, /* cam_flags */ CAM_RETRY_SELTO, /* sense_flags */SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); if (need_unmap != 0) cam_periph_unmapmem(ccb, &mapinfo); ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#5 (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/scsi/scsi_pt.c,v 1.34 2003/03/03 12:15:39 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.35 2003/03/08 21:44:31 phk Exp $ */ #include <sys/param.h> @@ -76,7 +76,7 @@ struct pt_softc { struct bio_queue_head bio_queue; - struct devstat device_stats; + struct devstat *device_stats; LIST_HEAD(, ccb_hdr) pending_ccbs; pt_state state; pt_flags flags; @@ -316,7 +316,7 @@ periph->softc = softc; - devstat_add_entry(&softc->device_stats, "pt", + softc->device_stats = devstat_new_entry("pt", periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE, SID_TYPE(&cgd->inq_data) | DEVSTAT_TYPE_IF_SCSI, @@ -402,7 +402,7 @@ softc = (struct pt_softc *)periph->softc; - devstat_remove_entry(&softc->device_stats); + devstat_remove_entry(softc->device_stats); destroy_dev(softc->dev); @@ -502,7 +502,7 @@ bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction(&softc->device_stats); + devstat_start_transaction(softc->device_stats); scsi_send_receive(&start_ccb->csio, /*retries*/4, @@ -631,7 +631,7 @@ LIST_REMOVE(&done_ccb->ccb_h, periph_links.le); splx(oldspl); - biofinish(bp, &softc->device_stats, 0); + biofinish(bp, softc->device_stats, 0); break; } case PT_CCB_WAITING: ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#11 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.89 2003/03/03 12:15:39 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.90 2003/03/08 21:44:46 phk Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -206,7 +206,7 @@ sa_quirks quirks; struct bio_queue_head bio_queue; int queue_count; - struct devstat device_stats; + struct devstat *device_stats; struct sa_devs devs; int blk_gran; int blk_mask; @@ -1333,7 +1333,7 @@ softc = (struct sa_softc *)periph->softc; - devstat_remove_entry(&softc->device_stats); + devstat_remove_entry(softc->device_stats); destroy_dev(softc->devs.ctl_dev); @@ -1450,7 +1450,7 @@ * blocksize until we media is inserted. So, set a flag to * indicate that the blocksize is unavailable right now. */ - devstat_add_entry(&softc->device_stats, "sa", periph->unit_number, 0, + softc->device_stats = devstat_new_entry("sa", periph->unit_number, 0, DEVSTAT_BS_UNAVAILABLE, SID_TYPE(&cgd->inq_data) | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_TAPE); @@ -1620,7 +1620,7 @@ CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_INFO, ("Variable Record Count is %d\n", length)); } - devstat_start_transaction(&softc->device_stats); + devstat_start_transaction(softc->device_stats); /* * Some people have theorized that we should * suppress illegal length indication if we are @@ -1767,7 +1767,7 @@ bp->bio_resid, bp->bio_bcount)); } #endif - biofinish(bp, &softc->device_stats, 0); + biofinish(bp, softc->device_stats, 0); break; } case SA_CCB_WAITING: @@ -1814,14 +1814,14 @@ scsi_test_unit_ready(&ccb->csio, 0, sadone, MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, IO_TIMEOUT); error = cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); if (error == ENXIO) { softc->flags &= ~SA_FLAG_TAPE_MOUNTED; scsi_test_unit_ready(&ccb->csio, 0, sadone, MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, IO_TIMEOUT); error = cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); } else if (error) { /* @@ -1843,7 +1843,7 @@ scsi_test_unit_ready(&ccb->csio, 0, sadone, MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, IO_TIMEOUT); error = cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); } @@ -1866,7 +1866,7 @@ scsi_load_unload(&ccb->csio, 2, sadone, MSG_SIMPLE_Q_TAG, FALSE, FALSE, FALSE, 1, SSD_FULL_SIZE, REWIND_TIMEOUT); error = cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); /* @@ -1876,7 +1876,7 @@ scsi_rewind(&ccb->csio, 2, sadone, MSG_SIMPLE_Q_TAG, FALSE, SSD_FULL_SIZE, REWIND_TIMEOUT); error = cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); } if (error) { @@ -1907,13 +1907,13 @@ (void *) rblim, 8192, SSD_FULL_SIZE, IO_TIMEOUT); (void) cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); scsi_rewind(&ccb->csio, 1, sadone, MSG_SIMPLE_Q_TAG, FALSE, SSD_FULL_SIZE, REWIND_TIMEOUT); error = cam_periph_runccb(ccb, saerror, CAM_RETRY_SELTO, SF_NO_PRINT | SF_RETRY_UA, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); if (error) { xpt_print_path(ccb->ccb_h.path); @@ -1930,7 +1930,7 @@ rblim, SSD_FULL_SIZE, SCSIOP_TIMEOUT); error = cam_periph_runccb(ccb, saerror, CAM_RETRY_SELTO, - SF_NO_PRINT | SF_RETRY_UA, &softc->device_stats); + SF_NO_PRINT | SF_RETRY_UA, softc->device_stats); QFRLS(ccb); xpt_release_ccb(ccb); @@ -2528,7 +2528,7 @@ SSD_FULL_SIZE, SCSIOP_TIMEOUT); error = cam_periph_runccb(ccb, saerror, 0, SF_NO_PRINT, - &softc->device_stats); + softc->device_stats); QFRLS(ccb); >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200303111856.h2BIu0bA066431>