Date: Mon, 9 Jan 2006 01:18:17 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 89393 for review Message-ID: <200601090118.k091IHT9082903@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=89393 Change 89393 by kmacy@kmacy:freebsd7_xen3 on 2006/01/09 01:18:13 integrate recent changes from main branch Affected files ... .. //depot/projects/xen3/src/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/xen3/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/xen3/src/sys/arm/arm/trap.c#2 integrate .. //depot/projects/xen3/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/xen3/src/sys/conf/NOTES#2 integrate .. //depot/projects/xen3/src/sys/conf/files#3 integrate .. //depot/projects/xen3/src/sys/conf/options#2 integrate .. //depot/projects/xen3/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/xen3/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-disk.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-dma.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/ata_if.m#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/atapi-cd.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/atapi-fd.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ata/atapi-tape.h#2 integrate .. //depot/projects/xen3/src/sys/dev/atkbdc/psm.c#2 integrate .. //depot/projects/xen3/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/xen3/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/xen3/src/sys/dev/ips/ips_ioctl.h#2 integrate .. //depot/projects/xen3/src/sys/dev/ips/ipsreg.h#2 integrate .. //depot/projects/xen3/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/xen3/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/xen3/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/xen3/src/sys/dev/si/si.c#2 integrate .. //depot/projects/xen3/src/sys/dev/si/si2_z280.c#2 integrate .. //depot/projects/xen3/src/sys/dev/si/si3_t225.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sn/if_sn.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/xen3/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/usb_subr.c#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/xen3/src/sys/dev/usb/uscanner.c#2 integrate .. //depot/projects/xen3/src/sys/dev/xen/balloon/balloon.c#1 add .. //depot/projects/xen3/src/sys/fs/devfs/devfs_rule.c#2 integrate .. //depot/projects/xen3/src/sys/fs/ntfs/ntfs_subr.c#2 integrate .. //depot/projects/xen3/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/xen3/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/xen3/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/xen3/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/xen3/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate .. //depot/projects/xen3/src/sys/gnu/fs/reiserfs/reiserfs_inode.c#2 integrate .. //depot/projects/xen3/src/sys/i386-xen/i386-xen/machdep.c#4 edit .. //depot/projects/xen3/src/sys/i386/i386/bpf_jit_machdep.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/io_apic.c#2 edit .. //depot/projects/xen3/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/xen3/src/sys/i386/i386/trap.c#3 integrate .. //depot/projects/xen3/src/sys/i386/ibcs2/ibcs2_sysvec.c#2 integrate .. //depot/projects/xen3/src/sys/i386/isa/pcvt/pcvt_drv.c#2 integrate .. //depot/projects/xen3/src/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/xen3/src/sys/i386/xbox/xboxfb.c#2 integrate .. //depot/projects/xen3/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/xen3/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/xen3/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/xen3/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/xen3/src/sys/kern/tty.c#2 integrate .. //depot/projects/xen3/src/sys/kern/tty_pty.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/xen3/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/xen3/src/sys/net/bpf_filter.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_mib.c#2 integrate .. //depot/projects/xen3/src/sys/net/if_mib.h#2 integrate .. //depot/projects/xen3/src/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/xen3/src/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/conf/NOTES#2 integrate .. //depot/projects/xen3/src/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/xen3/src/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/xen3/src/sys/sys/_lock.h#2 integrate .. //depot/projects/xen3/src/sys/sys/lock.h#2 integrate .. //depot/projects/xen3/src/sys/sys/param.h#2 integrate .. //depot/projects/xen3/src/sys/sys/select.h#2 integrate .. //depot/projects/xen3/src/sys/sys/tty.h#2 integrate .. //depot/projects/xen3/src/sys/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/xen3/src/sys/vm/uma_core.c#2 integrate .. //depot/projects/xen3/src/sys/vm/vm_pageq.c#2 integrate Differences ... ==== //depot/projects/xen3/src/sys/amd64/amd64/bpf_jit_machdep.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.3 2005/12/06 07:22:00 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/bpf_jit_machdep.c,v 1.4 2006/01/03 20:26:02 jkim Exp $"); #include "opt_bpf.h" @@ -103,6 +103,10 @@ */ emit_func emitm; + /* Do not compile an empty filter. */ + if (nins == 0) + return NULL; + /* Allocate the reference table for the jumps */ stream.refs = (u_int *)malloc((nins + 1) * sizeof(u_int), M_BPFJIT, M_NOWAIT); ==== //depot/projects/xen3/src/sys/amd64/amd64/mptable_pci.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.3 2005/09/18 01:42:43 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mptable_pci.c,v 1.4 2006/01/06 19:22:18 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,13 +100,10 @@ { 0, 0 } }; -static driver_t mptable_hostb_driver = { - "pcib", - mptable_hostb_methods, - 1, -}; +static devclass_t hostb_devclass; -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, pcib_devclass, 0, 0); +DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); +DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); /* PCI to PCI bridge driver. */ @@ -155,11 +152,9 @@ {0, 0} }; -static driver_t mptable_pcib_driver = { - "pcib", - mptable_pcib_pci_methods, - sizeof(struct pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, + sizeof(struct pcib_softc)); DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); ==== //depot/projects/xen3/src/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.298 2005/12/09 13:30:34 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.299 2006/01/06 18:02:11 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -220,10 +220,10 @@ printf("kernel trap %d with interrupts disabled\n", type); /* - * We shouldn't enable interrupts while in a critical - * section or servicing an NMI. + * We shouldn't enable interrupts while holding a + * spin lock or servicing an NMI. */ - if (type != T_NMI && td->td_critnest == 0) + if (type != T_NMI && td->td_md.md_spinlock_count == 0) enable_intr(); } } ==== //depot/projects/xen3/src/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.115 2005/12/20 21:09:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.116 2006/01/06 19:22:18 jhb Exp $"); #include "opt_cpu.h" @@ -326,12 +326,9 @@ { 0, 0 } }; -static driver_t legacy_pcib_driver = { - "pcib", - legacy_pcib_methods, - 1, -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, pcib_devclass, 0, 0); @@ -377,12 +374,7 @@ { 0, 0 } }; -static driver_t pcibus_pnp_driver = { - "pcibus_pnp", - pcibus_pnp_methods, - 1, /* no softc */ -}; - static devclass_t pcibus_pnp_devclass; +DEFINE_CLASS_0(pcibus_pnp, pcibus_pnp_driver, pcibus_pnp_methods, 1); DRIVER_MODULE(pcibus_pnp, isa, pcibus_pnp_driver, pcibus_pnp_devclass, 0, 0); ==== //depot/projects/xen3/src/sys/arm/arm/trap.c#2 (text+ko) ==== @@ -82,7 +82,7 @@ #include "opt_ktrace.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.18 2005/10/14 12:43:44 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/trap.c,v 1.19 2006/01/06 18:02:12 jhb Exp $"); #include <sys/types.h> @@ -269,7 +269,8 @@ /* Grab the current pcb */ pcb = td->td_pcb; /* Re-enable interrupts if they were enabled previously */ - if (td->td_critnest == 0 && __predict_true(tf->tf_spsr & I32_bit) == 0) + if (td->td_md.md_spinlock_count == 0 && + __predict_true(tf->tf_spsr & I32_bit) == 0) enable_interrupts(I32_bit); /* Invoke the appropriate handler, if necessary */ @@ -729,7 +730,7 @@ thread_user_enter(td); } fault_pc = tf->tf_pc; - if (td->td_critnest == 0 && + if (td->td_md.md_spinlock_count == 0 && __predict_true((tf->tf_spsr & I32_bit) == 0)) enable_interrupts(I32_bit); @@ -1007,7 +1008,7 @@ * Since all syscalls *should* come from user mode it will always * be safe to enable them, but check anyway. */ - if (td->td_critnest == 0 && !(frame->tf_spsr & I32_bit)) + if (td->td_md.md_spinlock_count == 0 && !(frame->tf_spsr & I32_bit)) enable_interrupts(I32_bit); syscall(td, frame, insn); ==== //depot/projects/xen3/src/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.60 2005/07/01 15:21:29 avatar Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.61 2006/01/08 20:04:55 iedowse Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1656,6 +1656,8 @@ case CAM_NO_HBA: case CAM_PROVIDE_FAIL: case CAM_REQ_TOO_BIG: + case CAM_LUN_INVALID: + case CAM_TID_INVALID: error = EINVAL; break; case CAM_SCSI_BUS_RESET: ==== //depot/projects/xen3/src/sys/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1341 2005/12/31 14:39:19 netchild Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1343 2006/01/04 17:19:28 joel Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1922,9 +1922,9 @@ # zero if don't know what to put in (and you don't, # since this is unsupported at the moment...). # +# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_als4000: Avance Logic ALS4000 PCI. # snd_atiixp: ATI IXP 200/300/400 PCI. -# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP. # snd_audiocs: Crystal Semiconductor CS4231 SBus/EBus. # snd_cmi: CMedia CMI8338/CMI8738 PCI. # snd_cs4281: Crystal Semiconductor CS4281 PCI. @@ -1984,7 +1984,6 @@ device snd_via8233 device snd_via82c686 device snd_vibes -#device snd_vortex1 device snd_uaudio # For non-pnp sound cards: ==== //depot/projects/xen3/src/sys/conf/files#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1080 2005/12/29 01:43:46 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1081 2006/01/04 17:05:18 joel Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -860,7 +860,6 @@ dev/sound/pci/via8233.c optional snd_via8233 pci dev/sound/pci/via82c686.c optional snd_via82c686 pci dev/sound/pci/vibes.c optional snd_vibes pci -#dev/sound/pci/vortex1.c optional snd_vortex1 pci dev/sound/pcm/ac97.c optional sound dev/sound/pcm/ac97_if.m optional sound dev/sound/pcm/ac97_patch.c optional sound ==== //depot/projects/xen3/src/sys/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.522 2005/12/31 14:39:19 netchild Exp $ +# $FreeBSD: src/sys/conf/options,v 1.523 2006/01/06 04:44:09 imp Exp $ # # On the handling of kernel options # @@ -213,6 +213,11 @@ # otherwise a STUB module will be compiled in. SOFTUPDATES opt_ffs.h +# On small, embedded systems, it can be useful to turn off support for +# snapshots. It saves about 30-40k for a feature that would be lightly +# used, if it is used at all. +NO_FFS_SNAPSHOT opt_ffs.h + # Enabling this option turns on support for Access Control Lists in UFS, # which can be used to support high security configurations. Depends on # UFS_EXTATTR. ==== //depot/projects/xen3/src/sys/dev/acpica/acpi_pci_link.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.51 2005/12/05 19:50:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.53 2006/01/06 16:14:32 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -449,8 +449,10 @@ } } sc->pl_num_links = creq.count; - if (creq.count == 0) + if (creq.count == 0) { + ACPI_SERIAL_END(pci_link); return (0); + } sc->pl_links = malloc(sizeof(struct link) * sc->pl_num_links, M_PCI_LINK, M_WAITOK | M_ZERO); @@ -625,8 +627,11 @@ /* Bump the reference count. */ ACPI_SERIAL_BEGIN(pci_link); link = acpi_pci_link_lookup(dev, index); - if (link == NULL) - panic("%s: apparently invalid index %d", __func__, index); + if (link == NULL) { + device_printf(dev, "apparently invalid index %d\n", index); + ACPI_SERIAL_END(pci_link); + return; + } link->l_references++; if (link->l_routed) pci_link_interrupt_weights[link->l_irq]++; ==== //depot/projects/xen3/src/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.49 2005/09/16 07:02:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.50 2006/01/06 19:22:18 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -107,12 +107,10 @@ {0, 0} }; -static driver_t acpi_pcib_acpi_driver = { - "pcib", - acpi_pcib_acpi_methods, - sizeof(struct acpi_hpcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, acpi_pcib_acpi_driver, acpi_pcib_acpi_methods, + sizeof(struct acpi_hpcib_softc)); DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, pcib_devclass, 0, 0); MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); ==== //depot/projects/xen3/src/sys/dev/acpica/acpi_pcib_pci.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.13 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_pci.c,v 1.14 2006/01/06 19:22:18 jhb Exp $"); #include "opt_acpi.h" @@ -97,12 +97,10 @@ {0, 0} }; -static driver_t acpi_pcib_pci_driver = { - "pcib", - acpi_pcib_pci_methods, - sizeof(struct acpi_pcib_softc), -}; +static devclass_t pcib_devclass; +DEFINE_CLASS_0(pcib, acpi_pcib_pci_driver, acpi_pcib_pci_methods, + sizeof(struct acpi_pcib_softc)); DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, pcib_devclass, 0, 0); MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); ==== //depot/projects/xen3/src/sys/dev/ata/ata-all.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.260 2005/11/25 09:00:56 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.261 2006/01/05 21:27:18 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-all.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,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-all.h,v 1.109 2005/12/27 16:49:33 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.110 2006/01/05 21:27:19 sos Exp $ */ /* ATA register defines */ ==== //depot/projects/xen3/src/sys/dev/ata/ata-card.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.38 2005/09/22 18:46:29 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-card.c,v 1.39 2006/01/05 21:27:19 sos Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-cbus.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 2002 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.22 2005/04/30 16:22:06 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-cbus.c,v 1.23 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-chipset.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.146 2005/12/30 23:15:02 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.149 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -2920,7 +2918,8 @@ devid == ATA_I960RM) return ENXIO; - strcpy(buffer, idx->text); + strcpy(buffer, "Promise "); + strcat(buffer, idx->text); /* if we are on a FastTrak TX4, adjust the interrupt resource */ if ((idx->cfg2 & PRTX4) && pci_get_class(GRANDPARENT(dev))==PCIC_BRIDGE && @@ -2942,8 +2941,7 @@ start = end = 0; } } - sprintf(buffer, "Promise %s %s controller", - buffer, ata_mode2str(idx->max_dma)); + sprintf(buffer, "%s %s controller", buffer, ata_mode2str(idx->max_dma)); device_set_desc_copy(dev, buffer); ctlr->chip = idx; ctlr->chipinit = ata_promise_chipinit; @@ -2995,8 +2993,6 @@ break; case PRMIO: -// if (ctlr->r_res1) -// bus_release_resource(dev, ctlr->r_type1, ctlr->r_rid1,ctlr->r_res1); ctlr->r_type1 = SYS_RES_MEMORY; ctlr->r_rid1 = PCIR_BAR(4); if (!(ctlr->r_res1 = bus_alloc_resource_any(dev, ctlr->r_type1, @@ -3694,7 +3690,7 @@ struct ata_device *atadev = device_get_softc(dev); int devno = (ch->unit << 1) + ATA_DEV(atadev->unit); int error; - u_int32_t timings33[][2] = { + u_int32_t timings[][2] = { /* PROLD PRNEW mode */ { 0x004ff329, 0x004fff2f }, /* PIO 0 */ { 0x004fec25, 0x004ff82a }, /* PIO 1 */ @@ -3755,7 +3751,7 @@ if (!error) { if (ctlr->chip->cfg1 < PRTX) pci_write_config(gparent, 0x60 + (devno << 2), - timings33[ctlr->chip->cfg1][ata_mode2idx(mode)],4); + timings[ata_mode2idx(mode)][ctlr->chip->cfg1], 4); atadev->mode = mode; } return; ==== //depot/projects/xen3/src/sys/dev/ata/ata-disk.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.191 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.192 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-disk.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,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-disk.h,v 1.50 2005/03/30 12:03:37 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-disk.h,v 1.51 2006/01/05 21:27:19 sos Exp $ */ /* structure describing an ATA disk */ ==== //depot/projects/xen3/src/sys/dev/ata/ata-dma.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.140 2005/12/05 22:31:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.141 2006/01/05 21:27:19 sos Exp $"); #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-isa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.29 2005/04/30 16:22:07 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-isa.c,v 1.30 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-lowlevel.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.74 2005/12/05 22:31:55 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-lowlevel.c,v 1.75 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-pci.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.109 2005/12/27 18:22:11 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.110 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 2003 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,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.h,v 1.58 2005/12/27 17:09:52 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.59 2006/01/05 21:27:19 sos Exp $ */ /* structure holding chipset config info */ ==== //depot/projects/xen3/src/sys/dev/ata/ata-queue.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.52 2005/12/27 16:49:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.53 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-raid.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 2000 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.114 2005/12/27 16:49:33 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.115 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> ==== //depot/projects/xen3/src/sys/dev/ata/ata-raid.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2000 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 2000 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -25,7 +23,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-raid.h,v 1.41 2005/12/15 13:30:23 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.h,v 1.42 2006/01/05 21:27:19 sos Exp $ */ /* misc defines */ ==== //depot/projects/xen3/src/sys/dev/ata/ata_if.m#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# Copyright (c) 2004, 2005 Søren Schmidt <sos@FreeBSD.org> +# Copyright (c) 2004 - 2006 Søren Schmidt <sos@FreeBSD.org> # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -10,8 +10,6 @@ # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR # IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -24,7 +22,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_if.m,v 1.5 2005/04/30 16:22:07 sos Exp $ +# $FreeBSD: src/sys/dev/ata/ata_if.m,v 1.6 2006/01/05 21:27:19 sos Exp $ #include <sys/bus.h> #include <sys/kernel.h> ==== //depot/projects/xen3/src/sys/dev/ata/atapi-cd.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1998 - 2005 Søren Schmidt <sos@FreeBSD.org> + * Copyright (c) 1998 - 2006 Søren Schmidt <sos@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,8 +11,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -27,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.184 2005/10/31 15:41:18 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.186 2006/01/05 21:27:19 sos Exp $"); #include "opt_ata.h" #include <sys/param.h> @@ -1513,7 +1511,7 @@ case DVD_STRUCT_COPYRIGHT: s->cpst = d->data[0]; - s->rmi = d->data[0]; + s->rmi = d->data[1]; break; case DVD_STRUCT_DISCKEY: ==== //depot/projects/xen3/src/sys/dev/ata/atapi-cd.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601090118.k091IHT9082903>