PERFORCE change 95707 for review

Marcel Moolenaar marcel at FreeBSD.org
Thu Apr 20 19:31:57 UTC 2006


http://perforce.freebsd.org/chv.cgi?CH=95707

Change 95707 by marcel at marcel_nfs on 2006/04/20 19:31:11

	IFC @95706

Affected files ...

.. //depot/projects/uart/alpha/isa/isa.c#5 integrate
.. //depot/projects/uart/alpha/pci/apecs_pci.c#3 integrate
.. //depot/projects/uart/alpha/pci/lca_pci.c#3 integrate
.. //depot/projects/uart/alpha/pci/pcibus.c#6 integrate
.. //depot/projects/uart/amd64/amd64/fpu.c#4 integrate
.. //depot/projects/uart/amd64/amd64/nexus.c#7 integrate
.. //depot/projects/uart/arm/arm/nexus.c#5 integrate
.. //depot/projects/uart/arm/at91/at91.c#4 integrate
.. //depot/projects/uart/arm/sa11x0/sa11x0.c#3 integrate
.. //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#7 integrate
.. //depot/projects/uart/arm/xscale/i80321/iq80321.c#8 integrate
.. //depot/projects/uart/arm/xscale/i80321/obio.c#4 integrate
.. //depot/projects/uart/boot/arm/at91/Makefile#1 branch
.. //depot/projects/uart/boot/arm/at91/Makefile.inc#1 branch
.. //depot/projects/uart/boot/arm/at91/boot0/Makefile#2 integrate
.. //depot/projects/uart/boot/arm/at91/boot0/at91rm9200_lowlevel.c#2 delete
.. //depot/projects/uart/boot/arm/at91/boot0/at91rm9200_lowlevel.h#2 delete
.. //depot/projects/uart/boot/arm/at91/boot0/lib.c#2 delete
.. //depot/projects/uart/boot/arm/at91/boot0/lib.h#2 delete
.. //depot/projects/uart/boot/arm/at91/boot0/main.c#2 integrate
.. //depot/projects/uart/boot/arm/at91/boot0/xmodem.c#2 delete
.. //depot/projects/uart/boot/arm/at91/boot0/xmodem.h#2 delete
.. //depot/projects/uart/boot/arm/at91/bootiic/Makefile#1 branch
.. //depot/projects/uart/boot/arm/at91/bootiic/README#1 branch
.. //depot/projects/uart/boot/arm/at91/bootiic/arm_init.s#1 branch
.. //depot/projects/uart/boot/arm/at91/bootiic/main.c#1 branch
.. //depot/projects/uart/boot/arm/at91/bootspi/Makefile#1 branch
.. //depot/projects/uart/boot/arm/at91/bootspi/README#1 branch
.. //depot/projects/uart/boot/arm/at91/bootspi/arm_init.s#1 branch
.. //depot/projects/uart/boot/arm/at91/bootspi/main.c#1 branch
.. //depot/projects/uart/boot/arm/at91/inc/AT91RM9200.h#2 delete
.. //depot/projects/uart/boot/arm/at91/libat91/Makefile#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/eeprom.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/eeprom.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/emac.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/emac.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/env_vars.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/env_vars.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/getc.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/lib.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/loader_prompt.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/loader_prompt.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/p_string.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/p_string.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/printf.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/putchar.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/tag_list.c#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/tag_list.h#1 branch
.. //depot/projects/uart/boot/arm/at91/libat91/xmodem.c#1 branch
.. //depot/projects/uart/boot/arm/at91/linker.cfg#1 branch
.. //depot/projects/uart/cam/cam.c#3 integrate
.. //depot/projects/uart/cam/scsi/scsi_da.c#18 integrate
.. //depot/projects/uart/conf/NOTES#34 integrate
.. //depot/projects/uart/conf/files#61 integrate
.. //depot/projects/uart/conf/options#30 integrate
.. //depot/projects/uart/crypto/via/padlock.c#3 integrate
.. //depot/projects/uart/dev/acpica/acpi.c#21 integrate
.. //depot/projects/uart/dev/ciss/ciss.c#15 integrate
.. //depot/projects/uart/dev/ispfw/asm_2300.h#5 integrate
.. //depot/projects/uart/dev/mpt/mpt.c#15 integrate
.. //depot/projects/uart/dev/mpt/mpt_cam.c#11 integrate
.. //depot/projects/uart/geom/eli/g_eli.c#7 integrate
.. //depot/projects/uart/geom/eli/g_eli_crypto.c#3 integrate
.. //depot/projects/uart/i386/i386/nexus.c#6 integrate
.. //depot/projects/uart/i386/isa/npx.c#11 integrate
.. //depot/projects/uart/ia64/ia64/nexus.c#7 integrate
.. //depot/projects/uart/kern/kern_rwlock.c#5 integrate
.. //depot/projects/uart/kern/subr_bus.c#14 integrate
.. //depot/projects/uart/kern/subr_rman.c#8 integrate
.. //depot/projects/uart/powerpc/powermac/grackle.c#4 integrate
.. //depot/projects/uart/powerpc/powermac/hrowpic.c#4 integrate
.. //depot/projects/uart/powerpc/powermac/macio.c#5 integrate
.. //depot/projects/uart/powerpc/powermac/uninorth.c#6 integrate
.. //depot/projects/uart/powerpc/powerpc/openpic.c#4 integrate
.. //depot/projects/uart/powerpc/psim/iobus.c#4 integrate
.. //depot/projects/uart/sparc64/conf/NOTES#11 integrate
.. //depot/projects/uart/sparc64/ebus/ebus.c#10 integrate
.. //depot/projects/uart/sparc64/pci/psycho.c#10 integrate
.. //depot/projects/uart/sparc64/sbus/sbus.c#10 integrate
.. //depot/projects/uart/sparc64/sparc64/nexus.c#6 integrate
.. //depot/projects/uart/sys/bus.h#11 integrate
.. //depot/projects/uart/sys/rwlock.h#3 integrate

Differences ...

==== //depot/projects/uart/alpha/isa/isa.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.38 2005/10/25 19:48:45 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.39 2006/04/20 04:16:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -231,6 +231,7 @@
 	    res = rman_reserve_resource(&isa_drq_rman, start, start, 1,
 					0, child);
 	    
+	rman_set_rid(res, *rid);
 	if (res && !passthrough) {
 		rle = resource_list_find(rl, type, *rid);
 		rle->start = rman_get_start(res);

==== //depot/projects/uart/alpha/pci/apecs_pci.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.16 2006/04/20 04:16:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,12 +79,17 @@
 apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid,
 			  u_long start, u_long end, u_long count, u_int flags)
 {
+	struct resource *rv = NULL;
+
 	if ((hwrpb->rpb_type == ST_DEC_2100_A50) &&
 	    (type == SYS_RES_IRQ))
-		return isa_alloc_intr(bus, child, start);
+		rv = isa_alloc_intr(bus, child, start);
 	else
-		return alpha_pci_alloc_resource(bus, child, type, rid,
-					  start, end, count, flags);
+		rv = alpha_pci_alloc_resource(bus, child, type, rid,
+		    start, end, count, flags);
+	if (rv != NULL)
+		rman_set_rid(rv, *rid);
+	return (rv);
 }
 
 static int

==== //depot/projects/uart/alpha/pci/lca_pci.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.18 2006/04/20 04:16:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,11 +78,16 @@
 lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid,
 			u_long start, u_long end, u_long count, u_int flags)
 {
+	struct resource *rv = NULL;
+
 	if (type == SYS_RES_IRQ)
-		return isa_alloc_intr(bus, child, start);
+		rv = isa_alloc_intr(bus, child, start);
 	else
-		return alpha_pci_alloc_resource(bus, child, type, rid,
-					  start, end, count, flags);
+		rv = alpha_pci_alloc_resource(bus, child, type, rid,
+		    start, end, count, flags);
+	if (rv != NULL)
+		rman_set_rid(rv, *rid);
+	return (rv);
 }
 
 static int

==== //depot/projects/uart/alpha/pci/pcibus.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.37 2005/09/25 20:12:29 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.38 2006/04/20 04:16:02 imp Exp $");
 
 #include "opt_isa.h"
 
@@ -96,7 +96,12 @@
 alpha_platform_alloc_ide_intr(int chan)
 {
 	int irqs[2] = { 14, 15 };
-	return isa_alloc_intr(0, 0, irqs[chan]);
+	struct resource *rv;
+
+	rv = isa_alloc_intr(0, 0, irqs[chan]);
+	if (rv != NULL)
+		rman_set_rid(rv, *rid);
+	return (rv);
 }
 
 int
@@ -230,9 +235,11 @@
 #ifdef DEV_ISA
 		if((start >= ISA_IRQ_OFFSET) &&
 		   (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) {
-		  	return isa_alloc_intrs(bus, child,
-					       start - ISA_IRQ_OFFSET,
-					       end - ISA_IRQ_OFFSET);
+		  	rv = isa_alloc_intrs(bus, child,
+			    start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET);
+			if (rv != NULL)
+				rman_set_rid(rv, *rid);
+			return (rv);
 		}
 		else
 #endif
@@ -252,6 +259,7 @@
 	if (rv == 0)
 		return 0;
 
+	rman_set_rid(rv, *rid);
 	rstart = rman_get_start(rv);
 	rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type));
 	rman_set_bushandle(rv, rstart);

==== //depot/projects/uart/amd64/amd64/fpu.c#4 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.157 2005/03/11 22:16:09 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.158 2006/04/19 07:00:19 cperciva Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -96,6 +96,8 @@
 
 typedef u_char bool_t;
 
+static	void	fpu_clean_state(void);
+
 int	hw_float = 1;
 SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint,
 	CTLFLAG_RD, &hw_float, 0, 
@@ -407,6 +409,8 @@
 	PCPU_SET(fpcurthread, curthread);
 	pcb = PCPU_GET(curpcb);
 
+	fpu_clean_state();
+
 	if ((pcb->pcb_flags & PCB_FPUINITDONE) == 0) {
 		/*
 		 * This is the first time this thread has used the FPU,
@@ -474,6 +478,7 @@
 
 	s = intr_disable();
 	if (td == PCPU_GET(fpcurthread)) {
+		fpu_clean_state();
 		fxrstor(addr);
 		intr_restore(s);
 	} else {
@@ -484,6 +489,37 @@
 }
 
 /*
+ * On AuthenticAMD processors, the fxrstor instruction does not restore
+ * the x87's stored last instruction pointer, last data pointer, and last
+ * opcode values, except in the rare case in which the exception summary
+ * (ES) bit in the x87 status word is set to 1.
+ *
+ * In order to avoid leaking this information across processes, we clean
+ * these values by performing a dummy load before executing fxrstor().
+ */
+static	double	dummy_variable = 0.0;
+static void
+fpu_clean_state(void)
+{
+	u_short status;
+
+	/*
+	 * Clear the ES bit in the x87 status word if it is currently
+	 * set, in order to avoid causing a fault in the upcoming load.
+	 */
+	fnstsw(&status);
+	if (status & 0x80)
+		fnclex();
+
+	/*
+	 * Load the dummy variable into the x87 stack.  This mangles
+	 * the x87 stack, but we don't care since we're about to call
+	 * fxrstor() anyway.
+	 */
+	__asm __volatile("ffree %%st(7); fld %0" : : "m" (dummy_variable));
+}
+
+/*
  * This really sucks.  We want the acpi version only, but it requires
  * the isa_if.h file in order to get the definitions.
  */

==== //depot/projects/uart/amd64/amd64/nexus.c#7 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.67 2005/09/25 20:03:41 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.68 2006/04/20 04:16:34 imp Exp $");
 
 /*
  * This code implements a `root nexus' for Intel Architecture
@@ -340,7 +340,7 @@
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
 	if (rv == 0)
 		return 0;
-
+	rman_set_rid(rv, *rid);
 	if (type == SYS_RES_MEMORY) {
 		rman_set_bustag(rv, AMD64_BUS_SPACE_MEM);
 	} else if (type == SYS_RES_IOPORT) {

==== //depot/projects/uart/arm/arm/nexus.c#5 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.6 2005/09/25 21:06:49 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.7 2006/04/20 04:12:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -214,6 +214,7 @@
 	if (rv == 0)
 		return 0;
 
+	rman_set_rid(rv, *rid);
 	rman_set_bustag(rv, (void*)ARM_BUS_SPACE_MEM);
 	rman_set_bushandle(rv, rman_get_start(rv));		
 	

==== //depot/projects/uart/arm/at91/at91.c#4 (text) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.4 2006/04/06 04:32:29 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.5 2006/04/20 04:12:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -497,6 +497,7 @@
 		rle->start = rman_get_start(rle->res);
 		rle->end = rman_get_end(rle->res);
 		rle->count = count;
+		rman_set_rid(rle->res, *rid);
 	}
 	return (rle->res);
 }

==== //depot/projects/uart/arm/sa11x0/sa11x0.c#3 (text+ko) ====

@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.5 2005/09/25 21:06:50 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.6 2006/04/20 04:12:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -127,6 +127,8 @@
 	
 	res = rman_reserve_resource(&sa11x0_softc->sa11x0_rman, *rid, *rid,
 	    count, flags, child);
+	if (res != NULL)
+		rman_set_rid(res, *rid);
 
 	return (res);
 }

==== //depot/projects/uart/arm/xscale/i80321/i80321_pci.c#7 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.7 2006/04/13 15:07:59 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.8 2006/04/20 04:12:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -380,6 +380,7 @@
 	rv = rman_reserve_resource(rm, start, end, count, flags, child);
 	if (rv == NULL)
 		return (NULL);
+	rman_set_rid(rv, *rid);
 	if (type != SYS_RES_IRQ) {
 		if (type == SYS_RES_MEMORY)
 			bh += (rman_get_start(rv));

==== //depot/projects/uart/arm/xscale/i80321/iq80321.c#8 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.10 2005/10/03 14:19:55 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/iq80321.c,v 1.11 2006/04/20 04:12:02 imp Exp $");
 
 #define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
@@ -300,10 +300,14 @@
     u_long start, u_long end, u_long count, u_int flags)
 {
 	struct i80321_softc *sc = device_get_softc(dev);
-	
-	if (type == SYS_RES_IRQ) 
-		return (rman_reserve_resource(&sc->sc_irq_rman,
-		    start, end, count, flags, child));
+	struct resource *rv;
+
+	if (type == SYS_RES_IRQ) {
+		rv = rman_reserve_resource(&sc->sc_irq_rman,
+		    start, end, count, flags, child);
+		if (rv != NULL)
+			rman_set_rid(rv, *rid);
+	}
 	return (NULL);
 }
 

==== //depot/projects/uart/arm/xscale/i80321/obio.c#4 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio.c,v 1.3 2005/09/25 21:06:50 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/obio.c,v 1.4 2006/04/20 04:12:02 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -124,6 +124,7 @@
 		return (NULL);
 	if (type == SYS_RES_IRQ)
 		return (rv);
+	rman_set_rid(rv, *rid);
 	rman_set_bustag(rv, bt);
 	rman_set_bushandle(rv, bh);
 	

==== //depot/projects/uart/boot/arm/at91/boot0/Makefile#2 (text) ====

@@ -1,22 +1,11 @@
-#  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.2 2006/04/13 17:44:05 imp Exp $
+#  $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.3 2006/04/19 17:16:48 imp Exp $
 
-PROG=boot0
-SRCS=arm_init.s at91rm9200_lowlevel.c lib.c main.c xmodem.c
+P=boot0
+FILES=${P}
+SRCS=arm_init.s main.c
 NO_MAN=
 LDFLAGS=-e 0 -T linker.cfg
-CFLAGS=-O2 -mcpu=arm9 -ffreestanding -I${.CURDIR}/../inc
-CFLAGS+=-DBOOT0_KB9202
-#CFLAGS+=-DBOOT0_TSC
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
-CLEANFILES=${OBJS} ${PROG} ${PROG}.out
 
-all:	${PROG}
-
-${PROG}:	${PROG}.out ${OBJS}
-	objcopy -S -O binary ${PROG}.out ${PROG}
+.include <bsd.prog.mk>
 
-${PROG}.out: ${OBJS}
-	ld ${LDFLAGS} -o ${PROG}.out ${OBJS}
-
-clean:
-	rm -f ${CLEANFILES}

==== //depot/projects/uart/boot/arm/at91/boot0/main.c#2 (text) ====

@@ -21,10 +21,10 @@
  * (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/boot/arm/at91/boot0/main.c,v 1.2 2006/04/13 17:31:02 imp Exp $
+ * $FreeBSD: src/sys/boot/arm/at91/boot0/main.c,v 1.3 2006/04/19 17:16:48 imp Exp $
  */
 
-#include "AT91RM9200.h"
+#include "at91rm9200.h"
 #include "lib.h"
 #include "at91rm9200_lowlevel.h"
 
@@ -34,7 +34,7 @@
 main(void)
 {
 	char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
-	fn_t *fn = (fn_t *)addr;
+	fn_t *fn = (fn_t *)(SDRAM_BASE + (1 << 20)); /* Load to base + 1MB */
 
 	while (xmodem_rx(addr) == -1)
 		continue;

==== //depot/projects/uart/cam/cam.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.9 2005/01/05 22:34:34 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.10 2006/04/18 21:53:39 mjacob Exp $");
 
 #include <sys/param.h>
 #ifdef _KERNEL
@@ -373,7 +373,16 @@
 {
 	uint32_t size_mb, secs_per_cylinder;
 
-	size_mb = ccg->volume_size / ((1024L * 1024L) / ccg->block_size);
+	if (ccg->block_size == 0) {
+		ccg->ccb_h.status = CAM_REQ_CMP_ERR;
+		return;
+	}
+	size_mb = (1024L * 1024L) / ccg->block_size;
+	if (size_mb == 0) {
+		ccg->ccb_h.status = CAM_REQ_CMP_ERR;
+		return;
+	}
+	size_mb = ccg->volume_size / size_mb;
 	if (size_mb > 1024 && extended) {
 		ccg->heads = 255;
 		ccg->secs_per_track = 63;
@@ -382,6 +391,10 @@
 		ccg->secs_per_track = 32;
 	}
 	secs_per_cylinder = ccg->heads * ccg->secs_per_track;
+	if (secs_per_cylinder == 0) {
+		ccg->ccb_h.status = CAM_REQ_CMP_ERR;
+		return;
+	}
 	ccg->cylinders = ccg->volume_size / secs_per_cylinder;
 	ccg->ccb_h.status = CAM_REQ_CMP;
 }

==== //depot/projects/uart/cam/scsi/scsi_da.c#18 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.189 2006/03/18 21:13:14 joerg Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.190 2006/04/18 22:01:59 mjacob Exp $");
 
 #include <sys/param.h>
 
@@ -1865,9 +1865,23 @@
 	ccg.secs_per_track = 0;
 	ccg.cylinders = 0;
 	xpt_action((union ccb*)&ccg);
-	dp->heads = ccg.heads;
-	dp->secs_per_track = ccg.secs_per_track;
-	dp->cylinders = ccg.cylinders;
+	if ((ccg.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
+		/*
+		 * We don't know what went wrong here- but just pick
+		 * a geometry so we don't have nasty things like divide
+		 * by zero.
+		 */
+		dp->heads = 255;
+		dp->secs_per_track = 255;
+		dp->cylinders = dp->sectors / (255 * 255);
+		if (dp->cylinders == 0) {
+			dp->cylinders = 1;
+		}
+	} else {
+		dp->heads = ccg.heads;
+		dp->secs_per_track = ccg.secs_per_track;
+		dp->cylinders = ccg.cylinders;
+	}
 }
 
 static void

==== //depot/projects/uart/conf/NOTES#34 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1356 2006/03/30 18:39:24 marcel Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1358 2006/04/18 22:43:46 mjacob Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1363,6 +1363,7 @@
 #      ISP 12160 Ultra3 SCSI,
 #      Qlogic ISP 2100 and ISP 2200 1Gb Fibre Channel host adapters.
 #      Qlogic ISP 2300 and ISP 2312 2Gb Fibre Channel host adapters.
+#      Qlogic ISP 2322 and ISP 6322 2Gb Fibre Channel host adapters.
 # ispfw: Firmware module for Qlogic host adapters
 # mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4
 #      or FC9x9 Fibre Channel host adapters.
@@ -1463,6 +1464,10 @@
 #	ISP_TARGET_MODE		-	enable target mode operation
 #
 options 	ISP_TARGET_MODE=1
+#
+#	ISP_DEFAULT_ROLES	-	default role (none, target, init, both)
+#
+options 	ISP_DEFAULT_ROLES=3
 
 # Options used in dev/sym/ (Symbios SCSI driver).
 #options 	SYM_SETUP_LP_PROBE_MAP	#-Low Priority Probe Map (bits)

==== //depot/projects/uart/conf/files#61 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1109 2006/04/15 12:31:31 iwasaki Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1110 2006/04/19 19:38:35 marcel Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -834,7 +834,6 @@
 dev/rp/rp.c			optional rp
 dev/rp/rp_isa.c			optional rp isa
 dev/rp/rp_pci.c			optional rp pci
-dev/sab/sab.c			optional sab ebus
 dev/safe/safe.c			optional safe
 dev/sbsh/if_sbsh.c		optional sbsh
 dev/scc/scc_if.m		optional	scc

==== //depot/projects/uart/conf/options#30 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.534 2006/04/10 20:04:21 ps Exp $
+# $FreeBSD: src/sys/conf/options,v 1.535 2006/04/18 22:24:55 mjacob Exp $
 #
 #        On the handling of kernel options
 #
@@ -314,6 +314,7 @@
 # Options used only in dev/isp/*
 ISP_TARGET_MODE		opt_isp.h
 ISP_FW_CRASH_DUMP	opt_isp.h
+ISP_DEFAULT_ROLES	opt_isp.h
 
 # Options used in the 'ata' ATA/ATAPI driver
 ATA_STATIC_ID		opt_ata.h

==== //depot/projects/uart/crypto/via/padlock.c#3 (text+ko) ====

@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.2 2006/04/12 12:13:34 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/crypto/via/padlock.c,v 1.3 2006/04/20 06:31:44 pjd Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -366,6 +366,10 @@
 		err = EINVAL;
 		goto out;
 	}
+	if ((crd->crd_flags & CRD_F_KEY_EXPLICIT) != 0) {
+		err = EINVAL;
+		goto out;
+	}
 
 	mtx_lock(&sc->sc_sessions_mtx);
 	TAILQ_FOREACH(ses, &sc->sc_sessions, ses_next) {

==== //depot/projects/uart/dev/acpica/acpi.c#21 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.221 2006/04/15 12:31:32 iwasaki Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.222 2006/04/20 04:21:27 imp Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -1015,6 +1015,7 @@
 	    goto out;
 
 	/* Copy the bus tag and handle from the pre-allocated resource. */
+	rman_set_rid(res, *rid);
 	rman_set_bustag(res, rman_get_bustag(rle->res));
 	rman_set_bushandle(res, rman_get_start(res));
 

==== //depot/projects/uart/dev/ciss/ciss.c#15 (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/ciss/ciss.c,v 1.67 2005/12/16 06:50:55 ps Exp $
+ *	$FreeBSD: src/sys/dev/ciss/ciss.c,v 1.69 2006/04/20 03:05:02 ps Exp $
  */
 
 /*
@@ -1651,7 +1651,7 @@
 ciss_free(struct ciss_softc *sc)
 {
     struct ciss_request *cr;
-    int			i;
+    int			i, j;
 
     debug_called(1);
 
@@ -1725,8 +1725,15 @@
 	cam_simq_free(sc->ciss_cam_devq);
 
     if (sc->ciss_logical) {
-	for (i = 0; i < sc->ciss_max_logical_bus; i++)
+	for (i = 0; i <= sc->ciss_max_logical_bus; i++) {
+	    for (j = 0; j < CISS_MAX_LOGICAL; j++) {
+		if (sc->ciss_logical[i][j].cl_ldrive)
+		    free(sc->ciss_logical[i][j].cl_ldrive, CISS_MALLOC_CLASS);
+		if (sc->ciss_logical[i][j].cl_lstatus)
+		    free(sc->ciss_logical[i][j].cl_lstatus, CISS_MALLOC_CLASS);
+	    }
 	    free(sc->ciss_logical[i], CISS_MALLOC_CLASS);
+	}
 	free(sc->ciss_logical, CISS_MALLOC_CLASS);
     }
 
@@ -3588,7 +3595,7 @@
 static void
 ciss_notify_hotplug(struct ciss_softc *sc, struct ciss_notify *cn)
 {
-    struct ciss_lun_report *cll;
+    struct ciss_lun_report *cll = NULL;
     int bus, target;
     int s;
 
@@ -3626,6 +3633,9 @@
 	ciss_printf(sc, "Unknown hotplug event %d\n", cn->subclass);
 	return;
     }
+
+    if (cll != NULL)
+	free(cll, CISS_MALLOC_CLASS);
 }
 
 /************************************************************************

==== //depot/projects/uart/dev/ispfw/asm_2300.h#5 (text+ko) ====

@@ -1,6 +1,6 @@
-/* $FreeBSD: src/sys/dev/ispfw/asm_2300.h,v 1.8 2005/01/29 01:12:37 mjacob Exp $ */
+/* $FreeBSD: src/sys/dev/ispfw/asm_2300.h,v 1.9 2006/04/18 21:55:30 mjacob Exp $ */
 /*-
- * Copyright (C) 2001, 2002, 2003 by Qlogic, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005 by Qlogic, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted provided
@@ -27,21 +27,22 @@
 
 /************************************************************************
  *									*
- * 	       --- ISP2300 Initiator/Target Firmware ---                *
+ * 	       --- ISP2300 Initiator/Target Firmware ---   		*
  *		 with Fabric support (Public Loop) and			*
- *                   with expanded LUN addressing.                      *
+ *                   with expanded LUN addressing.      		*
+ *									*
  *									*
  ************************************************************************/
 /*
- *      Firmware Version 3.03.06 (18:09 Oct 04, 2004)
+ *	Firmware Version 3.03.19 (09:40 Nov 30, 2005)
  */
 static const u_int16_t isp_2300_risc_code[] = {
-	0x0470, 0x0000, 0x0000, 0xc058, 0x0000, 0x0003, 0x0003, 0x0006,
+	0x0470, 0x0000, 0x0000, 0xc646, 0x0000, 0x0003, 0x0003, 0x0013,
 	0x0007, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
 	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
 	0x5449, 0x4f4e, 0x2049, 0x5350, 0x3233, 0x3030, 0x2046, 0x6972,
 	0x6d77, 0x6172, 0x6520, 0x2056, 0x6572, 0x7369, 0x6f6e, 0x2030,
-	0x332e, 0x3033, 0x2e30, 0x3620, 0x2020, 0x2020, 0x2400, 0x20a9,
+	0x332e, 0x3033, 0x2e31, 0x3920, 0x2020, 0x2020, 0x2400, 0x20a9,
 	0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2200, 0x20a9, 0x000f,
 	0x2001, 0x0000, 0x400f, 0x2091, 0x2400, 0x20a9, 0x000f, 0x2001,
 	0x0000, 0x400f, 0x2091, 0x2600, 0x20a9, 0x000f, 0x2001, 0x0000,
@@ -50,837 +51,842 @@
 	0x2c00, 0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2e00,
 	0x20a9, 0x000f, 0x2001, 0x0000, 0x400f, 0x2091, 0x2000, 0x2001,
 	0x0000, 0x20c1, 0x0004, 0x20c9, 0x14ff, 0x2059, 0x0000, 0x2b78,
-	0x7883, 0x0004, 0x2089, 0x26a6, 0x2051, 0x1100, 0x2a70, 0x20e1,
-	0x0001, 0x20e9, 0x0001, 0x2009, 0x0000, 0x080c, 0x0e45, 0x2029,
+	0x7883, 0x0004, 0x2089, 0x2702, 0x2051, 0x1100, 0x2a70, 0x20e1,
+	0x0001, 0x20e9, 0x0001, 0x2009, 0x0000, 0x080c, 0x0e57, 0x2029,
 	0x2e00, 0x2031, 0xffff, 0x2039, 0x2dc8, 0x2021, 0x0200, 0x20e9,
 	0x0001, 0x20a1, 0x0000, 0x20a9, 0x0800, 0x900e, 0x4104, 0x20e9,
 	0x0001, 0x20a1, 0x1000, 0x900e, 0x2001, 0x05c0, 0x9084, 0x0fff,
 	0x20a8, 0x4104, 0x2001, 0x0000, 0x9086, 0x0000, 0x0120, 0x21a8,
 	0x4104, 0x8001, 0x1de0, 0x756a, 0x766e, 0x7766, 0x7472, 0x7476,
-	0x00e6, 0x2071, 0x13ff, 0x2472, 0x00ee, 0x20a1, 0x15c8, 0x716c,
+	0x00e6, 0x2071, 0x13f9, 0x2472, 0x00ee, 0x20a1, 0x15c8, 0x716c,
 	0x810d, 0x810d, 0x810d, 0x810d, 0x918c, 0x000f, 0x2001, 0x0001,
 	0x9112, 0x900e, 0x21a8, 0x4104, 0x8211, 0x1de0, 0x716c, 0x3400,
 	0x8001, 0x9102, 0x0120, 0x0218, 0x20a8, 0x900e, 0x4104, 0x2009,
 	0x1100, 0x810d, 0x810d, 0x810d, 0x810d, 0x810d, 0x918c, 0x001f,
 	0x2001, 0x0001, 0x9112, 0x20e9, 0x0001, 0x20a1, 0x0800, 0x900e,
-	0x20a9, 0x0800, 0x4104, 0x8211, 0x1dd8, 0x080c, 0x567d, 0x080c,
-	0x928c, 0x080c, 0x0fe4, 0x080c, 0x11c7, 0x080c, 0x1840, 0x080c,
-	0x0d5d, 0x080c, 0x0f55, 0x080c, 0x2d19, 0x080c, 0x6ba7, 0x080c,
-	0x5e69, 0x080c, 0x7739, 0x080c, 0x1ea4, 0x080c, 0x79eb, 0x080c,
-	0x7196, 0x080c, 0x1ce1, 0x080c, 0x1e15, 0x080c, 0x1e99, 0x2091,
+	0x20a9, 0x0800, 0x4104, 0x8211, 0x1dd8, 0x080c, 0x57ad, 0x080c,
+	0x9610, 0x080c, 0x0ff6, 0x080c, 0x11d9, 0x080c, 0x186d, 0x080c,
+	0x0d5d, 0x080c, 0x0f67, 0x080c, 0x2d98, 0x080c, 0x6e26, 0x080c,
+	0x6051, 0x080c, 0x7a42, 0x080c, 0x1edd, 0x080c, 0x7d1c, 0x080c,
+	0x7471, 0x080c, 0x1d12, 0x080c, 0x1e46, 0x080c, 0x1ed2, 0x2091,
 	0x3009, 0x7883, 0x0000, 0x1004, 0x091b, 0x7880, 0x9086, 0x0002,
 	0x1190, 0x7883, 0x4000, 0x7837, 0x4000, 0x7833, 0x0010, 0x0e04,
 	0x090f, 0x2091, 0x5000, 0x2091, 0x4080, 0x2001, 0x0089, 0x2004,
-	0xd084, 0x190c, 0x10b2, 0x2a70, 0x7003, 0x0000, 0x2a70, 0x7000,
-	0x908e, 0x0003, 0x1168, 0x080c, 0x4399, 0x080c, 0x2d30, 0x080c,
-	0x6c08, 0x080c, 0x6355, 0x080c, 0x775e, 0x080c, 0x2610, 0x0c70,
+	0xd084, 0x190c, 0x10c4, 0x2a70, 0x7003, 0x0000, 0x2a70, 0x7000,
+	0x908e, 0x0003, 0x1168, 0x080c, 0x449a, 0x080c, 0x2daf, 0x080c,
+	0x6e87, 0x080c, 0x6591, 0x080c, 0x7a6a, 0x080c, 0x264c, 0x0c70,
 	0x000b, 0x0c88, 0x093c, 0x093d, 0x0add, 0x093a, 0x0ba2, 0x0d5c,
 	0x0d5c, 0x0d5c, 0x080c, 0x0dc9, 0x0005, 0x0126, 0x00f6, 0x2091,
-	0x8000, 0x7000, 0x9086, 0x0001, 0x1904, 0x0ab2, 0x080c, 0x4d3e,
-	0x1130, 0x0026, 0x2011, 0x0080, 0x080c, 0x0ed3, 0x002e, 0x080c,
-	0x68b8, 0x0150, 0x080c, 0x68db, 0x15a0, 0x2079, 0x0100, 0x7828,
-	0x9085, 0x1800, 0x782a, 0x0468, 0x080c, 0x67ea, 0x7000, 0x9086,
-	0x0001, 0x1904, 0x0ab2, 0x7094, 0x9086, 0x0028, 0x1904, 0x0ab2,
-	0x080c, 0x7722, 0x080c, 0x7714, 0x2001, 0x0161, 0x2003, 0x0001,
+	0x8000, 0x7000, 0x9086, 0x0001, 0x1904, 0x0ab2, 0x080c, 0x4e65,
+	0x1130, 0x0026, 0x2011, 0x0080, 0x080c, 0x0ee5, 0x002e, 0x080c,
+	0x6b1f, 0x0150, 0x080c, 0x6b42, 0x15a0, 0x2079, 0x0100, 0x7828,
+	0x9085, 0x1800, 0x782a, 0x0468, 0x080c, 0x6a4b, 0x7000, 0x9086,
+	0x0001, 0x1904, 0x0ab2, 0x7094, 0x9086, 0x0029, 0x1904, 0x0ab2,
+	0x080c, 0x7a2b, 0x080c, 0x7a1d, 0x2001, 0x0161, 0x2003, 0x0001,
 	0x2079, 0x0100, 0x7827, 0xffff, 0x7a28, 0x9295, 0x5e2f, 0x7a2a,
-	0x2011, 0x674e, 0x080c, 0x77f8, 0x2011, 0x6741, 0x080c, 0x78bc,
-	0x2011, 0x54d8, 0x080c, 0x77f8, 0x2011, 0x8030, 0x901e, 0x7392,
-	0x04d0, 0x080c, 0x4d85, 0x2079, 0x0100, 0x7844, 0x9005, 0x1904,
-	0x0ab2, 0x2011, 0x54d8, 0x080c, 0x77f8, 0x2011, 0x674e, 0x080c,
-	0x77f8, 0x2011, 0x6741, 0x080c, 0x78bc, 0x2001, 0x0265, 0x2001,
+	0x2011, 0x69af, 0x080c, 0x7b29, 0x2011, 0x69a2, 0x080c, 0x7bed,
+	0x2011, 0x5608, 0x080c, 0x7b29, 0x2011, 0x8030, 0x901e, 0x7392,
+	0x04d0, 0x080c, 0x4eb5, 0x2079, 0x0100, 0x7844, 0x9005, 0x1904,
+	0x0ab2, 0x2011, 0x5608, 0x080c, 0x7b29, 0x2011, 0x69af, 0x080c,
+	0x7b29, 0x2011, 0x69a2, 0x080c, 0x7bed, 0x2001, 0x0265, 0x2001,
 	0x0205, 0x2003, 0x0000, 0x7840, 0x9084, 0xfffb, 0x7842, 0x2001,
-	0x12ea, 0x2004, 0x9005, 0x1140, 0x00c6, 0x2061, 0x0100, 0x080c,
-	0x5625, 0x00ce, 0x0804, 0x0ab2, 0x780f, 0x006b, 0x7a28, 0x080c,
-	0x68c0, 0x0118, 0x9295, 0x5e2f, 0x0010, 0x9295, 0x402f, 0x7a2a,
-	0x2011, 0x8010, 0x73d4, 0x2001, 0x12eb, 0x2003, 0x0001, 0x080c,
-	0x24d5, 0x080c, 0x431a, 0x7244, 0xc284, 0x7246, 0x2001, 0x110c,
-	0x200c, 0xc1ac, 0xc1cc, 0x2102, 0x080c, 0x8d5d, 0x2011, 0x0004,
-	0x080c, 0xaada, 0x080c, 0x5d52, 0x080c, 0x68b8, 0x1120, 0x080c,
-	0x2519, 0x02e0, 0x0400, 0x080c, 0x562c, 0x0140, 0x7093, 0x0001,
-	0x70cf, 0x0000, 0x080c, 0x4f52, 0x0804, 0x0ab2, 0x080c, 0x4d2f,
+	0x12dd, 0x2004, 0x9005, 0x1140, 0x00c6, 0x2061, 0x0100, 0x080c,
+	0x5755, 0x00ce, 0x0804, 0x0ab2, 0x780f, 0x006b, 0x7a28, 0x080c,
+	0x6b27, 0x0118, 0x9295, 0x5e2f, 0x0010, 0x9295, 0x402f, 0x7a2a,
+	0x2011, 0x8010, 0x73d4, 0x2001, 0x12de, 0x2003, 0x0001, 0x080c,
+	0x24f1, 0x080c, 0x441b, 0x7244, 0xc284, 0x7246, 0x2001, 0x110c,
+	0x200c, 0xc1ac, 0xc1cc, 0x2102, 0x080c, 0x90ee, 0x2011, 0x0004,
+	0x080c, 0xafb5, 0x080c, 0x5e85, 0x080c, 0x6b1f, 0x1120, 0x080c,
+	0x2535, 0x02e0, 0x0400, 0x080c, 0x575c, 0x0140, 0x7093, 0x0001,
+	0x70cf, 0x0000, 0x080c, 0x5082, 0x0804, 0x0ab2, 0x080c, 0x4e56,
 	0xd094, 0x0188, 0x2011, 0x110c, 0x2204, 0xc0cd, 0x2012, 0x080c,
-	0x4d33, 0xd0d4, 0x1118, 0x080c, 0x2519, 0x1270, 0x2011, 0x110c,
-	0x2204, 0xc0bc, 0x00a8, 0x080c, 0x4d33, 0xd0d4, 0x1db8, 0x2011,
+	0x4e5a, 0xd0d4, 0x1118, 0x080c, 0x2535, 0x1270, 0x2011, 0x110c,
+	0x2204, 0xc0bc, 0x00a8, 0x080c, 0x4e5a, 0xd0d4, 0x1db8, 0x2011,
 	0x110c, 0x2204, 0xc0bd, 0x0060, 0x2011, 0x110c, 0x2204, 0xc0bd,
-	0x2012, 0x080c, 0x5e3d, 0x1128, 0xd0a4, 0x0118, 0x2204, 0xc0fd,
-	0x2012, 0x080c, 0x5e05, 0x0120, 0x7a0c, 0xc2b4, 0x7a0e, 0x00a8,
-	0x707b, 0x0000, 0x080c, 0x68b8, 0x1130, 0x70ac, 0x9005, 0x1168,
-	0x080c, 0xae0a, 0x0050, 0x080c, 0xae0a, 0x70d8, 0xd09c, 0x1128,
-	0x70ac, 0x9005, 0x0110, 0x080c, 0x5602, 0x70e3, 0x0000, 0x70df,
-	0x0000, 0x70a3, 0x0000, 0x080c, 0x2521, 0x0228, 0x2011, 0x0101,
-	0x2204, 0xc0c4, 0x2012, 0x72d8, 0x080c, 0x68b8, 0x1178, 0x9016,
-	0x0016, 0x080c, 0x22d2, 0x2019, 0x12a1, 0x211a, 0x001e, 0x705b,
-	0xffff, 0x705f, 0x00ef, 0x707f, 0x0000, 0x0020, 0x2019, 0x12a1,
+	0x2012, 0x080c, 0x5f70, 0x1128, 0xd0a4, 0x0118, 0x2204, 0xc0fd,
+	0x2012, 0x080c, 0x5f38, 0x0120, 0x7a0c, 0xc2b4, 0x7a0e, 0x00a8,
+	0x707b, 0x0000, 0x080c, 0x6b1f, 0x1130, 0x70ac, 0x9005, 0x1168,
+	0x080c, 0xb2e7, 0x0050, 0x080c, 0xb2e7, 0x70d8, 0xd09c, 0x1128,
+	0x70ac, 0x9005, 0x0110, 0x080c, 0x5732, 0x70e3, 0x0000, 0x70df,
+	0x0000, 0x70a3, 0x0000, 0x080c, 0x253d, 0x0228, 0x2011, 0x0101,
+	0x2204, 0xc0c4, 0x2012, 0x72d8, 0x080c, 0x6b1f, 0x1178, 0x9016,
+	0x0016, 0x080c, 0x22fa, 0x2019, 0x1293, 0x211a, 0x001e, 0x705b,
+	0xffff, 0x705f, 0x00ef, 0x707f, 0x0000, 0x0020, 0x2019, 0x1293,
 	0x201b, 0x0000, 0x2079, 0x115b, 0x7804, 0xd0ac, 0x0108, 0xc295,
-	0x72da, 0x080c, 0x68b8, 0x0118, 0x9296, 0x0004, 0x0548, 0x2011,
-	0x0001, 0x080c, 0xaada, 0x70a7, 0x0000, 0x70ab, 0xffff, 0x7003,
+	0x72da, 0x080c, 0x6b1f, 0x0118, 0x9296, 0x0004, 0x0548, 0x2011,
+	0x0001, 0x080c, 0xafb5, 0x70a7, 0x0000, 0x70ab, 0xffff, 0x7003,
 	0x0002, 0x2079, 0x0100, 0x7827, 0x0003, 0x7828, 0x9085, 0x0003,
-	0x782a, 0x00fe, 0x080c, 0x2913, 0x2011, 0x0005, 0x080c, 0x8e68,
-	0x080c, 0x807c, 0x080c, 0x68b8, 0x0148, 0x00c6, 0x2061, 0x0100,
-	0x0016, 0x080c, 0x22d2, 0x61e2, 0x001e, 0x00ce, 0x012e, 0x0420,
+	0x782a, 0x00fe, 0x080c, 0x296f, 0x2011, 0x0005, 0x080c, 0x91f9,
+	0x080c, 0x83b3, 0x080c, 0x6b1f, 0x0148, 0x00c6, 0x2061, 0x0100,
+	0x0016, 0x080c, 0x22fa, 0x61e2, 0x001e, 0x00ce, 0x012e, 0x0420,
 	0x70a7, 0x0000, 0x70ab, 0xffff, 0x7003, 0x0002, 0x00f6, 0x2079,
 	0x0100, 0x7827, 0x0003, 0x7828, 0x9085, 0x0003, 0x782a, 0x00fe,
-	0x2011, 0x0005, 0x080c, 0x8e68, 0x080c, 0x807c, 0x080c, 0x68b8,
-	0x0148, 0x00c6, 0x2061, 0x0100, 0x0016, 0x080c, 0x22d2, 0x61e2,
-	0x001e, 0x00ce, 0x00fe, 0x012e, 0x0005, 0x00c6, 0x080c, 0x68b8,
-	0x1118, 0x20a9, 0x0100, 0x0010, 0x20a9, 0x0082, 0x080c, 0x68b8,
+	0x2011, 0x0005, 0x080c, 0x91f9, 0x080c, 0x83b3, 0x080c, 0x6b1f,
+	0x0148, 0x00c6, 0x2061, 0x0100, 0x0016, 0x080c, 0x22fa, 0x61e2,
+	0x001e, 0x00ce, 0x00fe, 0x012e, 0x0005, 0x00c6, 0x080c, 0x6b1f,
+	0x1118, 0x20a9, 0x0100, 0x0010, 0x20a9, 0x0082, 0x080c, 0x6b1f,
 	0x1110, 0x900e, 0x0010, 0x2009, 0x007e, 0x86ff, 0x0138, 0x9180,
-	0x1000, 0x2004, 0x9065, 0x0110, 0x6000, 0xd0bc, 0x090c, 0x2bdb,
+	0x1000, 0x2004, 0x9065, 0x0110, 0x6000, 0xd0bc, 0x090c, 0x2c5a,
 	0x8108, 0x1f04, 0x0ac5, 0x707b, 0x0000, 0x707c, 0x9084, 0x00ff,
 	0x707e, 0x70af, 0x0000, 0x00ce, 0x0005, 0x0126, 0x2091, 0x8000,
 	0x7000, 0x9086, 0x0002, 0x1904, 0x0ba0, 0x70a8, 0x9086, 0xffff,
-	0x0130, 0x080c, 0x2913, 0x080c, 0x807c, 0x0804, 0x0ba0, 0x70d8,
+	0x0130, 0x080c, 0x296f, 0x080c, 0x83b3, 0x0804, 0x0ba0, 0x70d8,
 	0xd0ac, 0x1110, 0xd09c, 0x0558, 0xd084, 0x0548, 0x0006, 0x2001,
-	0x0103, 0x2003, 0x002b, 0x000e, 0xd08c, 0x0508, 0x080c, 0x2c12,
-	0x11d0, 0x70dc, 0x9086, 0xffff, 0x01b0, 0x080c, 0x2a65, 0x080c,
-	0x807c, 0x70d8, 0xd094, 0x1904, 0x0ba0, 0x2011, 0x0001, 0x080c,
-	0xb076, 0x0110, 0x2011, 0x0003, 0x901e, 0x080c, 0x2a9a, 0x080c,
-	0x807c, 0x0804, 0x0ba0, 0x70e0, 0x9005, 0x1904, 0x0ba0, 0x70a4,
+	0x0103, 0x2003, 0x002b, 0x000e, 0xd08c, 0x0508, 0x080c, 0x2c91,
+	0x11d0, 0x70dc, 0x9086, 0xffff, 0x01b0, 0x080c, 0x2ae4, 0x080c,
+	0x83b3, 0x70d8, 0xd094, 0x1904, 0x0ba0, 0x2011, 0x0001, 0x080c,
+	0xb55c, 0x0110, 0x2011, 0x0003, 0x901e, 0x080c, 0x2b19, 0x080c,
+	0x83b3, 0x0804, 0x0ba0, 0x70e0, 0x9005, 0x1904, 0x0ba0, 0x70a4,
 	0x9005, 0x1904, 0x0ba0, 0x70d8, 0xd0a4, 0x0118, 0xd0b4, 0x0904,
-	0x0ba0, 0x080c, 0x5e05, 0x1904, 0x0ba0, 0x080c, 0x5e56, 0x1904,
-	0x0ba0, 0x080c, 0x5e3d, 0x01c0, 0x0156, 0x00c6, 0x20a9, 0x007f,
-	0x900e, 0x0016, 0x080c, 0x5b9a, 0x1118, 0x6000, 0xd0ec, 0x1138,
+	0x0ba0, 0x080c, 0x5f38, 0x1904, 0x0ba0, 0x080c, 0x5f89, 0x1904,
+	0x0ba0, 0x080c, 0x5f70, 0x01c0, 0x0156, 0x00c6, 0x20a9, 0x007f,
+	0x900e, 0x0016, 0x080c, 0x5ccd, 0x1118, 0x6000, 0xd0ec, 0x1138,
 	0x001e, 0x8108, 0x1f04, 0x0b39, 0x00ce, 0x015e, 0x0028, 0x001e,
 	0x00ce, 0x015e, 0x0804, 0x0ba0, 0x0006, 0x2001, 0x0103, 0x2003,
-	0x006b, 0x000e, 0x2011, 0x12f7, 0x080c, 0x0f2b, 0x2011, 0x1311,
-	0x080c, 0x0f2b, 0x7030, 0xc08c, 0x7032, 0x7003, 0x0003, 0x70ab,
-	0xffff, 0x080c, 0x4d3e, 0x1130, 0x0026, 0x2011, 0x0040, 0x080c,
-	0x0ed3, 0x002e, 0x9006, 0x080c, 0x2186, 0x080c, 0x2c12, 0x0118,
-	0x080c, 0x441f, 0x0050, 0x0036, 0x0046, 0x2019, 0xffff, 0x2021,
-	0x0006, 0x080c, 0x4439, 0x004e, 0x003e, 0x00f6, 0x2079, 0x0100,
-	0x080c, 0x68db, 0x0150, 0x080c, 0x68b8, 0x7828, 0x0118, 0x9084,
-	0xe1ff, 0x0010, 0x9084, 0xffdf, 0x782a, 0x00fe, 0x2001, 0x132c,
-	0x2004, 0x9086, 0x0005, 0x1120, 0x2011, 0x0000, 0x080c, 0x8e68,
-	0x2011, 0x0000, 0x080c, 0x8e72, 0x080c, 0x807c, 0x080c, 0x8152,
+	0x006b, 0x000e, 0x2011, 0x12ea, 0x080c, 0x0f3d, 0x2011, 0x1304,
+	0x080c, 0x0f3d, 0x7030, 0xc08c, 0x7032, 0x7003, 0x0003, 0x70ab,
+	0xffff, 0x080c, 0x4e65, 0x1130, 0x0026, 0x2011, 0x0040, 0x080c,
+	0x0ee5, 0x002e, 0x9006, 0x080c, 0x21ae, 0x080c, 0x2c91, 0x0118,
+	0x080c, 0x4520, 0x0050, 0x0036, 0x0046, 0x2019, 0xffff, 0x2021,
+	0x0006, 0x080c, 0x453a, 0x004e, 0x003e, 0x00f6, 0x2079, 0x0100,
+	0x080c, 0x6b42, 0x0150, 0x080c, 0x6b1f, 0x7828, 0x0118, 0x9084,
+	0xe1ff, 0x0010, 0x9084, 0xffdf, 0x782a, 0x00fe, 0x2001, 0x131f,
+	0x2004, 0x9086, 0x0005, 0x1120, 0x2011, 0x0000, 0x080c, 0x91f9,
+	0x2011, 0x0000, 0x080c, 0x9203, 0x080c, 0x83b3, 0x080c, 0x8489,
 	0x012e, 0x0005, 0x0016, 0x0046, 0x00f6, 0x0126, 0x2091, 0x8000,
 	0x2079, 0x0100, 0x7904, 0x918c, 0xfffd, 0x7906, 0x2009, 0x00f7,
-	0x080c, 0x55eb, 0x7940, 0x918c, 0x0010, 0x7942, 0x7924, 0xd1b4,
+	0x080c, 0x571b, 0x7940, 0x918c, 0x0010, 0x7942, 0x7924, 0xd1b4,
 	0x0110, 0x7827, 0x0040, 0xd19c, 0x0110, 0x7827, 0x0008, 0x0006,
-	0x0036, 0x0156, 0x7954, 0xd1ac, 0x1904, 0x0c2f, 0x2001, 0x12eb,
-	0x2004, 0x9005, 0x1518, 0x080c, 0x259c, 0x1148, 0x2001, 0x0001,
-	0x080c, 0x2504, 0x2001, 0x0001, 0x080c, 0x24e7, 0x00b8, 0x080c,
-	0x25a4, 0x1138, 0x9006, 0x080c, 0x2504, 0x9006, 0x080c, 0x24e7,
-	0x0068, 0x080c, 0x25ac, 0x1d50, 0x2001, 0x12dc, 0x2004, 0xd0fc,
-	0x0108, 0x0020, 0x080c, 0x22fe, 0x0804, 0x0d0e, 0x080c, 0x68c9,
-	0x0148, 0x080c, 0x68db, 0x1118, 0x080c, 0x6ba2, 0x0050, 0x080c,
-	0x68c0, 0x0dd0, 0x080c, 0x6b9d, 0x080c, 0x6b93, 0x080c, 0x67ea,
-	0x0058, 0x080c, 0x68b8, 0x0140, 0x2009, 0x00f8, 0x080c, 0x55eb,
+	0x0036, 0x0156, 0x7954, 0xd1ac, 0x1904, 0x0c2f, 0x2001, 0x12de,
+	0x2004, 0x9005, 0x1518, 0x080c, 0x25b8, 0x1148, 0x2001, 0x0001,
+	0x080c, 0x2520, 0x2001, 0x0001, 0x080c, 0x2503, 0x00b8, 0x080c,
+	0x25c0, 0x1138, 0x9006, 0x080c, 0x2520, 0x9006, 0x080c, 0x2503,
+	0x0068, 0x080c, 0x25c8, 0x1d50, 0x2001, 0x12ce, 0x2004, 0xd0fc,
+	0x0108, 0x0020, 0x080c, 0x232e, 0x0804, 0x0d0e, 0x080c, 0x6b30,
+	0x0148, 0x080c, 0x6b42, 0x1118, 0x080c, 0x6e21, 0x0050, 0x080c,
+	0x6b27, 0x0dd0, 0x080c, 0x6e1c, 0x080c, 0x6e12, 0x080c, 0x6a4b,
+	0x0058, 0x080c, 0x6b1f, 0x0140, 0x2009, 0x00f8, 0x080c, 0x571b,
 	0x7843, 0x0090, 0x7843, 0x0010, 0x20a9, 0x09c4, 0x7820, 0xd09c,
-	0x1138, 0x080c, 0x68b8, 0x0138, 0x7824, 0xd0ac, 0x1904, 0x0d13,
-	0x1f04, 0x0c0e, 0x0070, 0x7824, 0x080c, 0x68d2, 0x0118, 0xd0ac,
+	0x1138, 0x080c, 0x6b1f, 0x0138, 0x7824, 0xd0ac, 0x1904, 0x0d13,
+	0x1f04, 0x0c0e, 0x0070, 0x7824, 0x080c, 0x6b39, 0x0118, 0xd0ac,
 	0x1904, 0x0d13, 0x9084, 0x1800, 0x0d98, 0x7003, 0x0001, 0x0804,

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list