Date: Mon, 25 Mar 2002 08:56:26 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8376 for review Message-ID: <200203251656.g2PGuQS42624@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8376 Change 8376 by jhb@jhb_laptop on 2002/03/25 08:56:13 IFC whitespace changes of death. Affected files ... ... //depot/projects/smpng/sys/alpha/conf/GENERIC#13 integrate ... //depot/projects/smpng/sys/alpha/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/alpha/include/asm.h#3 integrate ... //depot/projects/smpng/sys/arm/include/ansi.h#8 integrate ... //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#7 integrate ... //depot/projects/smpng/sys/cam/cam_xpt.c#7 integrate ... //depot/projects/smpng/sys/cam/scsi/scsi_da.c#20 integrate ... //depot/projects/smpng/sys/compat/linux/linux_mib.h#4 integrate ... //depot/projects/smpng/sys/conf/Makefile.ia64#16 integrate ... //depot/projects/smpng/sys/conf/Makefile.powerpc#14 integrate ... //depot/projects/smpng/sys/conf/Makefile.sparc64#14 integrate ... //depot/projects/smpng/sys/conf/files#29 integrate ... //depot/projects/smpng/sys/conf/files.i386#20 integrate ... //depot/projects/smpng/sys/conf/files.pc98#20 integrate ... //depot/projects/smpng/sys/conf/files.sparc64#12 integrate ... //depot/projects/smpng/sys/conf/kern.pre.mk#9 integrate ... //depot/projects/smpng/sys/conf/options#14 integrate ... //depot/projects/smpng/sys/ddb/db_command.c#7 integrate ... //depot/projects/smpng/sys/ddb/db_sym.h#3 integrate ... //depot/projects/smpng/sys/ddb/ddb.h#3 integrate ... //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#6 integrate ... //depot/projects/smpng/sys/dev/ata/ata-dma.c#14 integrate ... //depot/projects/smpng/sys/dev/ata/ata-pci.c#15 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#2 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_i2c.h#2 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_os.c#5 integrate ... //depot/projects/smpng/sys/dev/bktr/bktr_reg.h#2 integrate ... //depot/projects/smpng/sys/dev/gem/if_gem.c#3 integrate ... //depot/projects/smpng/sys/dev/gem/if_gemvar.h#3 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#3 integrate ... //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#2 integrate ... //depot/projects/smpng/sys/dev/hme/if_hmevar.h#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/if_ic.c#3 integrate ... //depot/projects/smpng/sys/dev/iicbus/iic.c#4 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicbb.c#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicbb_if.m#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicbus.c#3 integrate ... //depot/projects/smpng/sys/dev/iicbus/iiconf.c#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iiconf.h#2 integrate ... //depot/projects/smpng/sys/dev/iicbus/iicsmb.c#3 integrate ... //depot/projects/smpng/sys/dev/ppbus/lpbb.c#2 integrate ... //depot/projects/smpng/sys/dev/sio/sio.c#11 integrate ... //depot/projects/smpng/sys/dev/sio/sio_isa.c#8 integrate ... //depot/projects/smpng/sys/dev/smbus/smb.c#3 integrate ... //depot/projects/smpng/sys/dev/smbus/smbconf.c#2 integrate ... //depot/projects/smpng/sys/dev/smbus/smbconf.h#2 integrate ... //depot/projects/smpng/sys/dev/smbus/smbus.c#3 integrate ... //depot/projects/smpng/sys/dev/sound/midi/midi.h#4 integrate ... //depot/projects/smpng/sys/dev/syscons/dragon/dragon_saver.c#1 branch ... //depot/projects/smpng/sys/dev/syscons/fire/fire_saver.c#2 integrate ... //depot/projects/smpng/sys/dev/syscons/logo/logo_saver.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/rain/rain_saver.c#3 integrate ... //depot/projects/smpng/sys/dev/syscons/warp/warp_saver.c#3 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_fat.c#4 integrate ... //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate ... //depot/projects/smpng/sys/geom/geom.h#2 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_enc.c#1 branch ... //depot/projects/smpng/sys/geom/geom_mbr.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_mbrext.c#2 delete ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#2 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_alloc.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_extern.h#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_inode.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_lookup.c#5 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_subr.c#4 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#9 integrate ... //depot/projects/smpng/sys/gnu/ext2fs/ext2_vnops.c#5 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#29 integrate ... //depot/projects/smpng/sys/i386/i386/bios.c#7 integrate ... //depot/projects/smpng/sys/i386/i386/db_disasm.c#4 integrate ... //depot/projects/smpng/sys/i386/i386/db_trace.c#6 integrate ... //depot/projects/smpng/sys/i386/i386/mp_machdep.c#19 integrate ... //depot/projects/smpng/sys/i386/i386/sys_machdep.c#16 integrate ... //depot/projects/smpng/sys/i386/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/i386/include/asm.h#2 integrate ... //depot/projects/smpng/sys/i386/include/cpufunc.h#11 integrate ... //depot/projects/smpng/sys/i386/include/md_var.h#9 integrate ... //depot/projects/smpng/sys/i386/include/segments.h#4 integrate ... //depot/projects/smpng/sys/i386/include/smp.h#5 integrate ... //depot/projects/smpng/sys/i386/isa/cy.c#12 integrate ... //depot/projects/smpng/sys/i386/isa/icu.h#4 integrate ... //depot/projects/smpng/sys/i386/isa/if_rdp.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/mse.c#5 integrate ... //depot/projects/smpng/sys/i386/isa/npx.c#23 integrate ... //depot/projects/smpng/sys/i386/isa/rc.c#6 integrate ... //depot/projects/smpng/sys/i386/isa/spic.c#3 integrate ... //depot/projects/smpng/sys/i386/isa/spicreg.h#2 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#16 integrate ... //depot/projects/smpng/sys/i386/pci/pci_bus.c#4 integrate ... //depot/projects/smpng/sys/ia64/include/ansi.h#9 integrate ... //depot/projects/smpng/sys/ia64/include/asm.h#3 integrate ... //depot/projects/smpng/sys/isa/ppc.c#4 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_rrip.c#3 integrate ... //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#8 integrate ... //depot/projects/smpng/sys/isofs/cd9660/iso.h#4 integrate ... //depot/projects/smpng/sys/kern/imgact_gzip.c#4 integrate ... //depot/projects/smpng/sys/kern/inflate.c#3 integrate ... //depot/projects/smpng/sys/kern/kern_proc.c#17 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#26 integrate ... //depot/projects/smpng/sys/kern/tty_compat.c#3 integrate ... //depot/projects/smpng/sys/kern/uipc_syscalls.c#14 integrate ... //depot/projects/smpng/sys/kern/uipc_usrreq.c#17 integrate ... //depot/projects/smpng/sys/kern/vfs_export.c#5 integrate ... //depot/projects/smpng/sys/modules/bktr/bktr/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/i2c/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/alpm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/amdpm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/intpm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/lpbb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/pcf/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/controllers/viapm/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/if_ic/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iic/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iicbb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iicbus/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/iicsmb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/smb/Makefile#1 branch ... //depot/projects/smpng/sys/modules/i2c/smbus/Makefile#1 branch ... //depot/projects/smpng/sys/modules/syscons/Makefile#2 integrate ... //depot/projects/smpng/sys/modules/syscons/dragon/Makefile#1 branch ... //depot/projects/smpng/sys/net/bsd_comp.c#3 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#14 integrate ... //depot/projects/smpng/sys/net/if_fddisubr.c#5 integrate ... //depot/projects/smpng/sys/net/if_gif.h#5 integrate ... //depot/projects/smpng/sys/net/if_pppvar.h#5 integrate ... //depot/projects/smpng/sys/net/if_tap.c#8 integrate ... //depot/projects/smpng/sys/net/pfil.h#4 integrate ... //depot/projects/smpng/sys/net/ppp_comp.h#3 integrate ... //depot/projects/smpng/sys/net/ppp_deflate.c#3 integrate ... //depot/projects/smpng/sys/net/radix.c#3 integrate ... //depot/projects/smpng/sys/net/route.h#8 integrate ... //depot/projects/smpng/sys/net/zlib.c#4 integrate ... //depot/projects/smpng/sys/netinet/if_ether.h#4 integrate ... //depot/projects/smpng/sys/netinet/in_pcb.h#8 integrate ... //depot/projects/smpng/sys/netinet/in_var.h#5 integrate ... //depot/projects/smpng/sys/netinet/ip_mroute.c#10 integrate ... //depot/projects/smpng/sys/netinet/tcp_input.c#14 integrate ... //depot/projects/smpng/sys/netinet/tcp_usrreq.c#10 integrate ... //depot/projects/smpng/sys/netinet/udp_usrreq.c#15 integrate ... //depot/projects/smpng/sys/netinet6/ah_input.c#5 integrate ... //depot/projects/smpng/sys/netinet6/esp_input.c#5 integrate ... //depot/projects/smpng/sys/netinet6/scope6.c#2 integrate ... //depot/projects/smpng/sys/pc98/conf/GENERIC#16 integrate ... //depot/projects/smpng/sys/pc98/pc98/mse.c#4 integrate ... //depot/projects/smpng/sys/pc98/pc98/sio.c#12 integrate ... //depot/projects/smpng/sys/pc98/pc98/syscons.c#10 integrate ... //depot/projects/smpng/sys/pci/alpm.c#3 integrate ... //depot/projects/smpng/sys/pci/amdpm.c#4 integrate ... //depot/projects/smpng/sys/pci/intpm.c#4 integrate ... //depot/projects/smpng/sys/pci/viapm.c#1 branch ... //depot/projects/smpng/sys/powerpc/include/ansi.h#10 integrate ... //depot/projects/smpng/sys/powerpc/include/asm.h#2 integrate ... //depot/projects/smpng/sys/sparc64/conf/GENERIC#7 integrate ... //depot/projects/smpng/sys/sparc64/ebus/ebus.c#4 integrate ... //depot/projects/smpng/sys/sparc64/ebus/ebusvar.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/ansi.h#11 integrate ... //depot/projects/smpng/sys/sparc64/include/asm.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/bus.h#5 integrate ... //depot/projects/smpng/sys/sparc64/include/bus_private.h#1 branch ... //depot/projects/smpng/sys/sparc64/include/clock.h#3 integrate ... //depot/projects/smpng/sys/sparc64/include/iommuvar.h#4 integrate ... //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#2 integrate ... //depot/projects/smpng/sys/sparc64/include/tlb.h#9 integrate ... //depot/projects/smpng/sys/sparc64/isa/isa.c#3 integrate ... //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/apb.c#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#2 integrate ... //depot/projects/smpng/sys/sparc64/pci/psycho.c#5 integrate ... //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#3 integrate ... //depot/projects/smpng/sys/sparc64/pci/psychovar.h#4 integrate ... //depot/projects/smpng/sys/sparc64/sbus/sbus.c#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/cache.c#5 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_disasm.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#9 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/exception.s#16 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#7 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#4 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#2 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/pv.c#11 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/trap.c#30 integrate ... //depot/projects/smpng/sys/sys/bio.h#5 integrate ... //depot/projects/smpng/sys/sys/conf.h#12 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#8 integrate ... //depot/projects/smpng/sys/sys/diskslice.h#4 integrate ... //depot/projects/smpng/sys/sys/event.h#7 integrate ... //depot/projects/smpng/sys/sys/file.h#8 integrate ... //depot/projects/smpng/sys/sys/filedesc.h#8 integrate ... //depot/projects/smpng/sys/sys/libkern.h#5 integrate ... //depot/projects/smpng/sys/sys/malloc.h#5 integrate ... //depot/projects/smpng/sys/sys/mount.h#8 integrate ... //depot/projects/smpng/sys/sys/mouse.h#2 integrate ... //depot/projects/smpng/sys/sys/msgbuf.h#4 integrate ... //depot/projects/smpng/sys/sys/protosw.h#6 integrate ... //depot/projects/smpng/sys/sys/socketvar.h#14 integrate ... //depot/projects/smpng/sys/sys/sysent.h#6 integrate ... //depot/projects/smpng/sys/sys/systm.h#24 integrate ... //depot/projects/smpng/sys/vm/uma_core.c#3 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#13 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.132 2002/02/13 07:44:59 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.133 2002/03/24 14:35:20 wilko Exp $ machine alpha cpu EV4 @@ -137,7 +137,7 @@ device ppc device ppbus # Parallel port bus (required) device lpt # Printer -device plip # TCP/IP over parallel +#device plip # TCP/IP over parallel device ppi # Parallel port interface device #device vpo # Requires scbus and da ==== //depot/projects/smpng/sys/alpha/include/ansi.h#10 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: NetBSD: ansi.h,v 1.9 1997/11/23 20:20:53 kleink Exp - * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.25 2002/02/15 22:15:34 wollman Exp $ + * $FreeBSD: src/sys/alpha/include/ansi.h,v 1.26 2002/03/24 11:25:44 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -81,7 +81,8 @@ } __va_list; #define _BSD_VA_LIST_ __va_list /* va_list */ #endif /* post GCC 2.95 */ -#ifdef __GNUC__ +#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#define __GNUC_VA_LIST typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/smpng/sys/alpha/include/asm.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * From: NetBSD: asm.h,v 1.18 1997/11/03 04:22:06 ross Exp - * $FreeBSD: src/sys/alpha/include/asm.h,v 1.12 2001/12/11 23:33:39 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/asm.h,v 1.13 2002/03/23 02:01:27 obrien Exp $ */ /* @@ -648,3 +648,9 @@ #endif #endif /* _KERNEL */ + +#if !defined(lint) && !defined(STRIP_FBSDID) +#define __FBSDID(s) .ident s +#else +#define __FBSDID(s) /* nothing */ +#endif /* not lint and not STRIP_FBSDID */ ==== //depot/projects/smpng/sys/arm/include/ansi.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ansi.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/ansi.h,v 1.15 2001/12/09 19:38:21 obrien Exp $ + * $FreeBSD: src/sys/arm/include/ansi.h,v 1.16 2002/03/24 11:25:45 obrien Exp $ */ #ifndef _MACHINE_ANSI_H_ @@ -74,7 +74,8 @@ #else #define _BSD_VA_LIST_ char * /* va_list */ #endif /* post GCC 2.95 */ -#ifdef __GNUC__ +#if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) +#define __GNUC_VA_LIST typedef _BSD_VA_LIST_ __gnuc_va_list; /* compatibility w/GNU headers*/ #endif ==== //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#7 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.37 2002/03/13 11:03:36 ru Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.38 2002/03/23 19:40:27 pb Exp $ */ #include <sys/param.h> @@ -50,6 +50,7 @@ #define RBX_PAUSE 0x12 /* -p */ #define RBX_DUAL 0x1d /* -D */ #define RBX_PROBEKBD 0x1e /* -P */ +#define RBX_NOINTR 0x1f /* -n */ #define RBX_MASK 0x2005ffff @@ -58,7 +59,7 @@ #define PATH_KERNEL "/kernel" #define ARGS 0x900 -#define NOPT 13 +#define NOPT 14 #define NDEV 5 #define MEM_BASE 0x12 #define MEM_EXT 0x15 @@ -100,7 +101,7 @@ extern uint32_t _end; -static const char optstr[NOPT] = "DhaCcdgmPprsv"; +static const char optstr[NOPT] = "DhaCcdgmnPprsv"; static const unsigned char flags[NOPT] = { RBX_DUAL, RBX_SERIAL, @@ -110,6 +111,7 @@ RBX_KDB, RBX_GDB, RBX_MUTE, + RBX_NOINTR, RBX_PROBEKBD, RBX_PAUSE, RBX_DFLTROOT, @@ -775,6 +777,8 @@ { uint32_t t0, t1; + if (opts & 1 << RBX_NOINTR) + return 0; t0 = 0; for (;;) { if (xgetc(1)) @@ -800,6 +804,8 @@ static int xgetc(int fn) { + if (opts & 1 << RBX_NOINTR) + return 0; for (;;) { if (ioctrl & 0x1 && getc(1)) return fn ? 1 : getc(0); ==== //depot/projects/smpng/sys/cam/cam_xpt.c#7 (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.122 2002/01/09 03:38:58 msmith Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.123 2002/03/24 00:17:39 simokawa Exp $ */ #include <sys/param.h> #include <sys/bus.h> @@ -482,6 +482,17 @@ }, { /* + * Maxtor Personal Storage 3000XT (Firewire) + * hangs upon serial number probing. + */ + { + T_DIRECT, SIP_MEDIA_FIXED, "Maxtor", + "1394 storage", "*" + }, + CAM_QUIRK_NOSERIAL, /*mintags*/0, /*maxtags*/0 + }, + { + /* * Would repond to all LUNs if asked for. */ { ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#20 (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.100 2002/03/11 08:04:59 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.101 2002/03/23 18:18:02 simokawa Exp $ */ #ifdef _KERNEL @@ -416,6 +416,7 @@ static int da_retry_count = DA_DEFAULT_RETRY; static int da_default_timeout = DA_DEFAULT_TIMEOUT; +static int da_no_6_byte = 0; SYSCTL_NODE(_kern_cam, OID_AUTO, da, CTLFLAG_RD, 0, "CAM Direct Access Disk driver"); @@ -423,6 +424,8 @@ &da_retry_count, 0, "Normal I/O retry count"); SYSCTL_INT(_kern_cam_da, OID_AUTO, default_timeout, CTLFLAG_RW, &da_default_timeout, 0, "Normal I/O timeout (in seconds)"); +SYSCTL_INT(_kern_cam_da, OID_AUTO, no_6_byte, CTLFLAG_RW, + &da_no_6_byte, 0, "No 6 bytes commands"); /* * DA_ORDEREDTAG_INTERVAL determines how often, relative @@ -1249,6 +1252,8 @@ } else { tag_code = MSG_SIMPLE_Q_TAG; } + if (da_no_6_byte && softc->minimum_cmd_size == 6) + softc->minimum_cmd_size = 10; scsi_read_write(&start_ccb->csio, /*retries*/da_retry_count, dadone, @@ -1321,6 +1326,48 @@ } } +static int +cmd6workaround(union ccb *ccb) +{ + struct scsi_rw_6 cmd6; + struct scsi_rw_10 *cmd10; + struct da_softc *softc; + struct ccb_scsiio *csio; + u_int8_t opcode; + + csio = &ccb->csio; + opcode = ((struct scsi_rw_6 *)csio->cdb_io.cdb_bytes)->opcode; + + if (opcode != READ_6 && opcode != WRITE_6) + return 0; + + xpt_print_path(ccb->ccb_h.path); + printf("READ(6)/WRITE(6) failed, " + "minimum_cmd_size is increased to 10.\n"); + softc = (struct da_softc *)xpt_path_periph(ccb->ccb_h.path)->softc; + softc->minimum_cmd_size = 10; + + bcopy(&csio->cdb_io.cdb_bytes, &cmd6, sizeof(struct scsi_rw_6)); + cmd10 = (struct scsi_rw_10 *) &csio->cdb_io.cdb_bytes; + cmd10->opcode = (cmd6.opcode == READ_6) ? READ_10 : WRITE_10; + cmd10->byte2 = 0; + scsi_ulto4b(scsi_3btoul(cmd6.addr), cmd10->addr); + cmd10->reserved = 0; + scsi_ulto2b(cmd6.length, cmd10->length); + cmd10->control = cmd6.control; + csio->cdb_len = sizeof(*cmd10); + + /* requeue */ + ccb->ccb_h.status = CAM_REQUEUE_REQ; + xpt_action(ccb); + if ((ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) + cam_release_devq(ccb->ccb_h.path, + /*relsim_flags*/0, + /*reduction*/0, + /*timeout*/0, + /*getcount_only*/0); + return (ERESTART); +} static void dadone(struct cam_periph *periph, union ccb *done_ccb) @@ -1393,6 +1440,11 @@ bp->bio_error = 0; if (bp->bio_resid != 0) { /* Short transfer ??? */ +#if 0 + if (cmd6workaround(done_ccb) + == ERESTART) + return; +#endif bp->bio_flags |= BIO_ERROR; } } @@ -1406,8 +1458,14 @@ if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0) panic("REQ_CMP with QFRZN"); bp->bio_resid = csio->resid; - if (csio->resid > 0) + if (csio->resid > 0) { + /* Short transfer ??? */ +#if 0 /* XXX most of the broken umass devices need this ad-hoc work around */ + if (cmd6workaround(done_ccb) == ERESTART) + return; +#endif bp->bio_flags |= BIO_ERROR; + } } /* @@ -1574,10 +1632,26 @@ { struct da_softc *softc; struct cam_periph *periph; + int error, sense_key, error_code, asc, ascq; periph = xpt_path_periph(ccb->ccb_h.path); softc = (struct da_softc *)periph->softc; + /* + * Automatically detect devices that do not support + * READ(6)/WRITE(6) and upgrade to using 10 byte cdbs. + */ + error = 0; + if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_SCSI_STATUS_ERROR + && ccb->csio.scsi_status == SCSI_STATUS_CHECK_COND) { + scsi_extract_sense(&ccb->csio.sense_data, + &error_code, &sense_key, &asc, &ascq); + if (sense_key == SSD_KEY_ILLEGAL_REQUEST) + error = cmd6workaround(ccb); + } + if (error == ERESTART) + return ERESTART; + /* * XXX * Until we have a better way of doing pack validation, ==== //depot/projects/smpng/sys/compat/linux/linux_mib.h#4 (text+ko) ==== @@ -25,19 +25,19 @@ * (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/compat/linux/linux_mib.h,v 1.5 2002/03/20 05:42:02 alfred Exp $ + * $FreeBSD: src/sys/compat/linux/linux_mib.h,v 1.6 2002/03/24 04:04:50 bde Exp $ */ #ifndef _LINUX_MIB_H_ #define _LINUX_MIB_H_ -void linux_get_osname (struct proc *p, char *dst); -int linux_set_osname (struct proc *p, char *osname); +void linux_get_osname(struct proc *p, char *dst); +int linux_set_osname(struct proc *p, char *osname); -void linux_get_osrelease (struct proc *p, char *dst); -int linux_set_osrelease (struct proc *p, char *osrelease); +void linux_get_osrelease(struct proc *p, char *dst); +int linux_set_osrelease(struct proc *p, char *osrelease); -int linux_get_oss_version (struct proc *p); -int linux_set_oss_version (struct proc *p, int oss_version); +int linux_get_oss_version(struct proc *p); +int linux_set_oss_version(struct proc *p, int oss_version); #endif /* _LINUX_MIB_H_ */ ==== //depot/projects/smpng/sys/conf/Makefile.ia64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.47 2002/03/19 10:52:44 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.48 2002/03/24 17:45:46 obrien Exp $ # # Makefile for FreeBSD # @@ -27,7 +27,6 @@ OBJCOPY= ia64-unknown-freebsd5.0-objcopy OBJDUMP= ia64-unknown-freebsd5.0-objdump MACHINE_ARCH= ia64 -FMT= # Needs to be blank for cross tools. # Which version of config(8) is required. %VERSREQ= 500010 ==== //depot/projects/smpng/sys/conf/Makefile.powerpc#14 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.260 2002/02/20 23:35:51 peter Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.261 2002/03/24 17:45:46 obrien Exp $ # # Makefile for FreeBSD # @@ -21,7 +21,6 @@ # Temporary stuff while we're still embryonic NO_MODULES?= yes -FMT= STD8X16FONT?= iso ==== //depot/projects/smpng/sys/conf/Makefile.sparc64#14 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.17 2002/03/15 08:21:41 obrien Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.18 2002/03/24 17:42:06 obrien Exp $ # # Makefile for FreeBSD # @@ -16,16 +16,31 @@ # after which config should be rerun for all machines. # +THIS_ARCH!= uname -m +.if ${THIS_ARCH} != "sparc64" + +TOOLPATH= /arch/sparc64/uberbaum/bin +TOOLPREFIX= sparc64-deo-freebsd5- +AR= ${TOOLPATH}/${TOOLPREFIX}ar +CC= ${TOOLPATH}/${TOOLPREFIX}gcc +LD= ${TOOLPATH}/${TOOLPREFIX}ld +NM= ${TOOLPATH}/${TOOLPREFIX}nm +OBJCOPY= ${TOOLPATH}/${TOOLPREFIX}objcopy +OBJDUMP= ${TOOLPATH}/${TOOLPREFIX}objdump +RANLIB= ${TOOLPATH}/${TOOLPREFIX}ranlib +SIZE= ${TOOLPATH}/${TOOLPREFIX}size + +COPT+= -B${TOOLPATH}/ +NO_CPU_COPTFLAGS=true + MACHINE_ARCH= sparc64 -NO_CPU_COPTFLAGS=true +.endif # cross compiling CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ -ansi -FMT= - # Which version of config(8) is required. %VERSREQ= 500010 ==== //depot/projects/smpng/sys/conf/files#29 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.613 2002/03/19 09:11:46 jeff Exp $ +# $FreeBSD: src/sys/conf/files,v 1.615 2002/03/24 11:21:33 phk Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -690,11 +690,11 @@ geom/geom_dev.c optional geom geom/geom_disk.c optional geom geom/geom_dump.c optional geom +geom/geom_enc.c optional geom geom/geom_event.c optional geom geom/geom_io.c optional geom geom/geom_kern.c optional geom geom/geom_mbr.c optional geom -geom/geom_mbrext.c optional geom geom/geom_slice.c optional geom geom/geom_subr.c optional geom geom/geom_sunlabel.c optional geom @@ -1260,6 +1260,7 @@ pci/ohci_pci.c optional ohci pci/simos.c optional simos pci/uhci_pci.c optional uhci +pci/viapm.c optional viapm pci/xrpu.c optional xrpu posix4/ksched.c optional _kposix_priority_scheduling posix4/p1003_1b.c standard ==== //depot/projects/smpng/sys/conf/files.i386#20 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.395 2002/03/05 09:19:01 ume Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.396 2002/03/25 03:27:09 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -52,8 +52,8 @@ no-implicit-rule # trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ + dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ + compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # compat/linux/linux_file.c optional compat_linux ==== //depot/projects/smpng/sys/conf/files.pc98#20 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.226 2002/03/05 09:19:01 ume Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.227 2002/03/25 13:03:14 nyan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -49,8 +49,8 @@ no-implicit-rule # trlld.o optional oltr \ - dependency "$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ - compile-with "uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu" \ + dependency "$S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ + compile-with "uudecode < $S/contrib/dev/oltr/i386-elf.trlld.o.uu" \ no-implicit-rule # compat/linux/linux_file.c optional compat_linux ==== //depot/projects/smpng/sys/conf/files.sparc64#12 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.14 2002/03/09 22:33:14 tmm Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.15 2002/03/25 05:01:05 tmm Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -14,6 +14,7 @@ dev/ofw/openfirm.c standard libkern/ffs.c standard kern/subr_diskmbr.c standard +kern/syscalls.c optional ktr sparc64/ebus/ebus.c count ebus sparc64/isa/isa.c optional isa # The following is needed for both ISA and EBus. ==== //depot/projects/smpng/sys/conf/kern.pre.mk#9 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.9 2002/03/01 01:21:29 obrien Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.10 2002/03/24 17:45:46 obrien Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -47,7 +47,6 @@ # Select the correct set of tools. Can't set OBJFORMAT here because it # doesn't get exported into the environment, and if it were exported # then it might break building of utilities. -FMT?= -elf CFLAGS+= ${FMT} DEFINED_PROF= ${PROF} ==== //depot/projects/smpng/sys/conf/options#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.304 2002/03/12 04:00:11 jeff Exp $ +# $FreeBSD: src/sys/conf/options,v 1.305 2002/03/23 15:46:54 nsouch Exp $ # # On the handling of kernel options # @@ -441,6 +441,7 @@ BKTR_NO_MSP_RESET opt_bktr.h BKTR_430_FX_MODE opt_bktr.h BKTR_SIS_VIA_MODE opt_bktr.h +BKTR_USE_FREEBSD_SMBUS opt_bktr.h # meteor opt_meteor.h METEOR_ALLOC_PAGES opt_meteor.h ==== //depot/projects/smpng/sys/ddb/db_command.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_command.c,v 1.43 2002/03/20 05:14:27 alfred Exp $ + * $FreeBSD: src/sys/ddb/db_command.c,v 1.44 2002/03/23 11:53:03 bde Exp $ */ /* @@ -101,17 +101,14 @@ #define CMD_AMBIGUOUS 3 #define CMD_HELP 4 -static void db_cmd_list(struct command *table, - struct command **aux_tablep, - struct command **aux_tablep_end); +static void db_cmd_list(struct command *table, struct command **aux_tablep, + struct command **aux_tablep_end); static int db_cmd_search(char *name, struct command *table, - struct command **aux_tablep, - struct command **aux_tablep_end, - struct command **cmdp); + struct command **aux_tablep, + struct command **aux_tablep_end, struct command **cmdp); static void db_command(struct command **last_cmdp, - struct command *cmd_table, - struct command **aux_cmd_tablep, - struct command **aux_cmd_tablep_end); + struct command *cmd_table, struct command **aux_cmd_tablep, + struct command **aux_cmd_tablep_end); /* * Search for command prefix. @@ -504,9 +501,8 @@ int nargs = 0; db_expr_t retval; typedef db_expr_t fcn_10args_t(db_expr_t, db_expr_t, db_expr_t, - db_expr_t, db_expr_t, db_expr_t, - db_expr_t, db_expr_t, db_expr_t, - db_expr_t); + db_expr_t, db_expr_t, db_expr_t, db_expr_t, + db_expr_t, db_expr_t, db_expr_t); fcn_10args_t *func; int t; ==== //depot/projects/smpng/sys/ddb/db_sym.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/ddb/db_sym.h,v 1.20 2002/03/20 05:14:28 alfred Exp $ + * $FreeBSD: src/sys/ddb/db_sym.h,v 1.21 2002/03/23 11:53:03 bde Exp $ */ #ifndef _DDB_DB_SYM_H_ @@ -95,16 +95,12 @@ int db_sym_numargs(c_db_sym_t, int *, char **); boolean_t X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t cursym, - char **filename, int *linenum, - db_expr_t off); + char **filename, int *linenum, db_expr_t off); c_db_sym_t X_db_lookup(db_symtab_t *stab, const char *symstr); c_db_sym_t X_db_search_symbol(db_symtab_t *symtab, db_addr_t off, - db_strategy_t strategy, - db_expr_t *diffp); -int X_db_sym_numargs(db_symtab_t *, c_db_sym_t, int *, - char **); -void X_db_symbol_values(db_symtab_t *symtab, - c_db_sym_t sym, const char **namep, - db_expr_t *valuep); + db_strategy_t strategy, db_expr_t *diffp); +int X_db_sym_numargs(db_symtab_t *, c_db_sym_t, int *, char **); +void X_db_symbol_values(db_symtab_t *symtab, c_db_sym_t sym, + const char **namep, db_expr_t *valuep); #endif /* !_DDB_DB_SYM_H_ */ ==== //depot/projects/smpng/sys/ddb/ddb.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ddb/ddb.h,v 1.26 2002/03/20 05:14:28 alfred Exp $ + * $FreeBSD: src/sys/ddb/ddb.h,v 1.27 2002/03/23 11:53:03 bde Exp $ */ /* @@ -39,8 +39,8 @@ #include <machine/db_machdep.h> /* type definitions */ -typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, - db_expr_t count, char *modif); +typedef void db_cmdfcn_t(db_expr_t addr, boolean_t have_addr, db_expr_t count, + char *modif); #define DB_COMMAND(cmd_name, func_name) \ DB_SET(cmd_name, func_name, db_cmd_set) ==== //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#6 (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/dev/acpica/acpi_timer.c,v 1.14 2002/02/25 09:51:17 phk Exp $ + * $FreeBSD: src/sys/dev/acpica/acpi_timer.c,v 1.15 2002/03/24 11:33:52 phk Exp $ */ #include "opt_acpi.h" #include <sys/param.h> @@ -131,9 +131,10 @@ n = 0; else n = 1; - printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", - n ? "GOOD" : "BAD ", - min, max, max - min + 1); + if (bootverbose) + printf("ACPI timer looks %s min = %d, max = %d, width = %d\n", + n ? "GOOD" : "BAD ", + min, max, max - min + 1); return (n); } ==== //depot/projects/smpng/sys/dev/ata/ata-dma.c#14 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-dma.c,v 1.89 2002/03/18 12:13:13 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.90 2002/03/24 12:44:23 sos Exp $ */ #include <sys/param.h> @@ -371,6 +371,7 @@ /* we could set PIO mode timings, but we assume the BIOS did that */ break; + case 0x74411022: /* AMD 768 */ case 0x74111022: /* AMD 766 */ if (udmamode >= 5) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, ==== //depot/projects/smpng/sys/dev/ata/ata-pci.c#15 (text+ko) ==== @@ -25,7 +25,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/dev/ata/ata-pci.c,v 1.34 2002/03/18 13:56:44 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.35 2002/03/24 12:44:23 sos Exp $ */ #include <sys/param.h> @@ -224,6 +224,9 @@ case 0x74111022: return "AMD 766 ATA100 controller"; + case 0x74411022: + return "AMD 768 ATA100 controller"; + case 0x02111166: return "ServerWorks ROSB4 ATA33 controller"; @@ -446,6 +449,7 @@ case 0x74091022: /* AMD 756 default setup */ case 0x74111022: /* AMD 766 default setup */ + case 0x74411022: /* AMD 768 default setup */ /* set prefetch, postwrite */ pci_write_config(dev, 0x41, pci_read_config(dev, 0x41, 1) | 0xf0, 1); ==== //depot/projects/smpng/sys/dev/bktr/bktr_i2c.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 Nicolas Souchu + * Copyright (c) 1998, 2001 Nicolas Souchu * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.19 2001/01/20 02:24:01 wollman Exp $ + * $FreeBSD: src/sys/dev/bktr/bktr_i2c.c,v 1.20 2002/03/23 15:47:08 nsouch Exp $ * */ @@ -33,10 +33,13 @@ * From brooktree848.c <fsmp@freefall.org> */ +#include "opt_bktr.h" + #include "bktr.h" #include <sys/param.h> #include <sys/kernel.h> +#include <sys/malloc.h> #include <sys/systm.h> #include <sys/module.h> #include <sys/bus.h> @@ -62,196 +65,91 @@ #include <pci/pcireg.h> #include <machine/ioctl_meteor.h> >>> 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?200203251656.g2PGuQS42624>