From owner-p4-projects@FreeBSD.ORG Mon Apr 1 13:19:53 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C6A7518; Mon, 1 Apr 2013 13:19:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 5E01A515 for ; Mon, 1 Apr 2013 13:19:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 34A5134B for ; Mon, 1 Apr 2013 13:19:53 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31DJrxk084942 for ; Mon, 1 Apr 2013 13:19:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31DJrTm084939 for perforce@freebsd.org; Mon, 1 Apr 2013 13:19:53 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 13:19:53 GMT Message-Id: <201304011319.r31DJrTm084939@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227272 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 13:19:53 -0000 http://p4web.freebsd.org/@@227272?ac=10 Change 227272 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 13:19:10 Lift PowerPC metadata.c as a starting point for loader metadata on BERI. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/metadata.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 1 16:13:04 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07770961; Mon, 1 Apr 2013 16:13:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BF12995F for ; Mon, 1 Apr 2013 16:13:03 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id AE7E368 for ; Mon, 1 Apr 2013 16:13:03 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31GD3Gk002890 for ; Mon, 1 Apr 2013 16:13:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31GD32R002887 for perforce@freebsd.org; Mon, 1 Apr 2013 16:13:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 16:13:03 GMT Message-Id: <201304011613.r31GD32R002887@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227275 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 16:13:04 -0000 http://p4web.freebsd.org/@@227275?ac=10 Change 227275 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 16:12:20 The actual target is 'boot2', a binary file to be stuffed in ROM or flash, rather than the ELF file, so rearrange targets to reflect this. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#7 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#7 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -PROG= boot2 +PROG= boot2.elf BINDIR?= /boot INSTALLFLAGS= -b @@ -33,12 +33,14 @@ .PATH: ${.CURDIR}/../common CFLAGS+= -I${.CURDIR}/../common -boot2: linker.cfg +boot2.elf: linker.cfg + +boot2: boot2.elf + objcopy -S -O binary boot2.elf boot2 -boot2.img: boot2 - objcopy -S -O binary boot2 boot2.img +boot2.dump: boot2.elf + objdump -dS boot2.elf > boot2.dump -boot2.dump: boot2 - objdump -dS boot2 > boot2.dump +all: boot2 boot2.dump .include From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:25:35 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AD0EA4F; Mon, 1 Apr 2013 19:25:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id DF9BCA4D for ; Mon, 1 Apr 2013 19:25:34 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id CF108B07 for ; Mon, 1 Apr 2013 19:25:34 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JPYTm023867 for ; Mon, 1 Apr 2013 19:25:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JPYSG023864 for perforce@freebsd.org; Mon, 1 Apr 2013 19:25:34 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:25:34 GMT Message-Id: <201304011925.r31JPYSG023864@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227281 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:25:35 -0000 http://p4web.freebsd.org/@@227281?ac=10 Change 227281 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:25:05 Use appropriate compiler and linker flags when compiling libstand and libficl on MIPS. These correspond loosely to similar flags already set for other architectures. Affected files ... .. //depot/projects/ctsrd/beribsd/src/lib/libstand/Makefile#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/ficl/Makefile#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/lib/libstand/Makefile#4 (text+ko) ==== @@ -36,6 +36,9 @@ .if ${MACHINE_CPUARCH} == "arm" CFLAGS+= -msoft-float -D_STANDALONE .endif +.if ${MACHINE_CPUARCH} == "mips" +CFLAGS+= -G0 -fno-pic -mno-abicalls +.endif # standalone components and stuff we have modified locally SRCS+= gzguts.h zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ @@ -53,7 +56,7 @@ .PATH: ${.CURDIR}/../libc/string .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc" || \ ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" + ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \ memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \ strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \ @@ -90,6 +93,8 @@ .PATH: ${.CURDIR}/i386 .elif ${MACHINE_ARCH} == "powerpc64" .PATH: ${.CURDIR}/powerpc +.elif ${MACHINE_ARCH} == "mips64" +.PATH: ${.CURDIR}/mips .else .PATH: ${.CURDIR}/${MACHINE_CPUARCH} .endif ==== //depot/projects/ctsrd/beribsd/src/sys/boot/ficl/Makefile#4 (text+ko) ==== @@ -27,6 +27,9 @@ .if ${MACHINE} == "pc98" CFLAGS+= -Os -DPC98 .endif +.if ${MACHINE_CPUARCH} == "mips" +CFLAGS+= -G0 -fno-pic -mno-abicalls +.endif .if HAVE_PNP CFLAGS+= -DHAVE_PNP .endif From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:30:41 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2C847BE6; Mon, 1 Apr 2013 19:30:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E23DCBE4 for ; Mon, 1 Apr 2013 19:30:40 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id D2646B54 for ; Mon, 1 Apr 2013 19:30:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JUexj024395 for ; Mon, 1 Apr 2013 19:30:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JUeJ8024392 for perforce@freebsd.org; Mon, 1 Apr 2013 19:30:40 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:30:40 GMT Message-Id: <201304011930.r31JUeJ8024392@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227282 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:30:41 -0000 http://p4web.freebsd.org/@@227282?ac=10 Change 227282 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:29:41 Various boot2 improvements: Teach MIPS boot2 to pass on information on the boot-time environment to loader using bootinfo. In particular, if we get passed a dtb, send it on to loader. Abstract the flash read interface very slightly so that we can more easily interpose a device switch later, and rename the flash-level read interface to cfi_read() to make it more reusable in loader. Scrub bootinfo a bit more of things that, at higher levels in the stack, will be handled by loader meta-data. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#8 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/drv.h#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/flash.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/bootinfo.h#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#8 (text+ko) ==== @@ -56,9 +56,12 @@ #include +#include #include #include +extern register_t beri_argc, beri_argv, beri_envv, beri_memsize; + #define IO_KEYBOARD 1 #define IO_SERIAL 2 @@ -160,8 +163,8 @@ static uint32_t opts; #if 0 static int comspeed = SIOSPD; -static struct bootinfo bootinfo; #endif +struct bootinfo bootinfo; static uint8_t ioctrl = IO_KEYBOARD; void exit(int); @@ -252,9 +255,9 @@ dsk.type = dsk.drive & DRV_HARD ? TYPE_AD : TYPE_FD; dsk.unit = dsk.drive & DRV_MASK; dsk.slice = *(uint8_t *)PTOV(ARGS + 1) + 1; +#endif bootinfo.bi_version = BOOTINFO_VERSION; bootinfo.bi_size = sizeof(bootinfo); -#endif /* Process configuration file */ @@ -391,8 +394,14 @@ MAKEBOOTDEV(dev_maj[dsk.type], dsk.slice, dsk.unit, dsk.part), 0, 0, 0, VTOP(&bootinfo)); #endif - ((void(*)(int, int, int, int))addr)(opts & RBX_MASK, /* board_id */ 0, 0, - 0); + bootinfo.bi_kernelname = kname; + bootinfo.bi_boot2opts = opts & RBX_MASK; + if (beri_memsize <= BERI_MEMVSDTB) + bootinfo.bi_memsize = beri_memsize; + else + bootinfo.bi_dtb = beri_memsize; + ((void(*)(int, int, int, void *))addr)(beri_argc, beri_argv, beri_envv, + &bootinfo); } static int @@ -455,6 +464,7 @@ #endif } else { for (q = arg--; *q && *q != '('; q++); +#if 0 if (*q) { drv = -1; if (arg[1] == ':') { @@ -494,6 +504,7 @@ ? DRV_HARD : 0) + drv; dsk_meta = 0; } +#endif if ((i = ep - arg)) { if ((size_t)i >= sizeof(knamebuf)) return -1; @@ -507,6 +518,14 @@ } static int +drvread(void *buf, unsigned lba, unsigned nblk) +{ + + /* XXXRW: Eventually, a device switch. */ + return (cfi_read(buf, lba, nblk)); +} + +static int dskread(void *buf, unsigned lba, unsigned nblk) { #if 0 ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/drv.h#2 (text+ko) ==== @@ -31,7 +31,6 @@ #ifndef _DRV_H_ #define _DRV_H_ -struct dsk; -int drvread(void *buf, unsigned lba, unsigned nblk); +int cfi_read(void *buf, unsigned lba, unsigned blk); #endif ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/flash.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #define CHERI_BOOTFS_LENGTH ((uintptr_t)&__cheri_flash_bootfs_len__) int -drvread(void *buf, unsigned lba, unsigned nblk) +cfi_read(void *buf, unsigned lba, unsigned nblk) { if ((lba << 9) + (nblk << 9) > CHERI_BOOTFS_LENGTH) ==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/bootinfo.h#4 (text+ko) ==== @@ -56,20 +56,13 @@ /* bootinfo meta-data. */ uint32_t bi_version; uint32_t bi_size; - uint32_t bi_bootopts; - uint32_t _bi_pad0; /* bootinfo contents. */ + uint64_t bi_boot2opts; /* boot2 flags to loader. */ bi_ptr_t bi_kernelname; /* Pointer to name. */ bi_ptr_t bi_nfs_diskless;/* Pointer to NFS data. */ bi_ptr_t bi_dtb; /* Pointer to dtb. */ - bi_ptr_t bi_physmem; /* Physical memory size in bytes. */ - - /* Kernel bits. */ - bi_ptr_t bi_symtab; /* Symbol table... */ - bi_ptr_t bi_esymtab; /* ... */ - bi_ptr_t bi_kernend; /* End of kernel address space. */ - bi_ptr_t bi_envp; /* Kernel environment. */ + bi_ptr_t bi_memsize; /* Physical memory size in bytes. */ bi_ptr_t bi_modulep; /* Preloaded modules. */ }; From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:33:44 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6106D4D; Mon, 1 Apr 2013 19:33:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 868CBD4B for ; Mon, 1 Apr 2013 19:33:44 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 773E2BF4 for ; Mon, 1 Apr 2013 19:33:44 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JXiGX024719 for ; Mon, 1 Apr 2013 19:33:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JXihH024716 for perforce@freebsd.org; Mon, 1 Apr 2013 19:33:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:33:44 GMT Message-Id: <201304011933.r31JXihH024716@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227283 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:33:45 -0000 http://p4web.freebsd.org/@@227283?ac=10 Change 227283 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:33:07 Trim openfirmware-include from MIPS metadata.c, but otherwise try to reuse 100% from PowerPC. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/metadata.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/metadata.c#2 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include "bootstrap.h" -#include "libofw.h" /* * Return a 'boothowto' value corresponding to the kernel arguments in From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:36:48 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 43F4AE98; Mon, 1 Apr 2013 19:36:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0499AE96 for ; Mon, 1 Apr 2013 19:36:48 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id E955AC1B for ; Mon, 1 Apr 2013 19:36:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JalAq024861 for ; Mon, 1 Apr 2013 19:36:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JalvL024858 for perforce@freebsd.org; Mon, 1 Apr 2013 19:36:47 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:36:47 GMT Message-Id: <201304011936.r31JalvL024858@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227284 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:36:48 -0000 http://p4web.freebsd.org/@@227284?ac=10 Change 227284 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:36:11 Port loader to BERI. Compilers and links, but not yet tested. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_console.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_disk.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/exec.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/help.mips#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/linker.cfg#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/loader.h#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/start.S#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/version#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:37:49 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DA10F8E; Mon, 1 Apr 2013 19:37:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 3DFAEF8C for ; Mon, 1 Apr 2013 19:37:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 2E968C26 for ; Mon, 1 Apr 2013 19:37:49 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JbnwL024918 for ; Mon, 1 Apr 2013 19:37:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JbnGn024915 for perforce@freebsd.org; Mon, 1 Apr 2013 19:37:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:37:49 GMT Message-Id: <201304011937.r31JbnGn024915@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227285 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:37:49 -0000 http://p4web.freebsd.org/@@227285?ac=10 Change 227285 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:37:46 Rename excessively generically named "flash.c" to "cfi.c" boot2 and loader. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#8 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cfi.c#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/flash.c#3 delete .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#8 (text+ko) ==== @@ -8,7 +8,7 @@ SRCS= start.S \ boot2.c \ altera_jtag_uart.c \ - flash.c + cfi.c NO_MAN= ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#2 (text+ko) ==== @@ -9,7 +9,7 @@ # Architecture-specific loader code SRCS= start.S main.c exec.c metadata.c vers.c -SRCS+= beri_console.c altera_jtag_uart.c beri_disk.c flash.c +SRCS+= beri_console.c altera_jtag_uart.c beri_disk.c cfi.c LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:39:52 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E0C64303; Mon, 1 Apr 2013 19:39:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A2954301 for ; Mon, 1 Apr 2013 19:39:51 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 92F02C3E for ; Mon, 1 Apr 2013 19:39:51 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31JdpaH025016 for ; Mon, 1 Apr 2013 19:39:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JdpCB025013 for perforce@freebsd.org; Mon, 1 Apr 2013 19:39:51 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:39:51 GMT Message-Id: <201304011939.r31JdpCB025013@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227286 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:39:52 -0000 http://p4web.freebsd.org/@@227286?ac=10 Change 227286 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:39:34 Rename "drv.h" to "cfi.h" to reflect the practical reality that the only driver described in the file is the CFI driver. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#9 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cfi.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cfi.h#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_disk.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#9 (text+ko) ==== @@ -57,8 +57,8 @@ #include #include +#include #include -#include extern register_t beri_argc, beri_argv, beri_envv, beri_memsize; ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cfi.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include "util.h" #include "mips.h" -#include "drv.h" +#include "cfi.h" /* * Memory-mapped Intel StrataFlash mini-driver. Very mini. Nothing fancy -- ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_disk.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include -#include +#include static int beri_disk_init(void); static int beri_disk_strategy(void *, int, daddr_t, size_t, char *, From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:40:53 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 462B7436; Mon, 1 Apr 2013 19:40:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 094BC433 for ; Mon, 1 Apr 2013 19:40:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id D685ACBF for ; Mon, 1 Apr 2013 19:40:52 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31Jeqk6025525 for ; Mon, 1 Apr 2013 19:40:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JeqQF025522 for perforce@freebsd.org; Mon, 1 Apr 2013 19:40:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:40:52 GMT Message-Id: <201304011940.r31JeqQF025522@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227287 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:40:53 -0000 http://p4web.freebsd.org/@@227287?ac=10 Change 227287 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:39:58 Delete now-unused drv.h. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/drv.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 1 19:40:53 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87F0A4D2; Mon, 1 Apr 2013 19:40:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2D3FE434 for ; Mon, 1 Apr 2013 19:40:53 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 060F5CC0 for ; Mon, 1 Apr 2013 19:40:53 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31Jeqeb025531 for ; Mon, 1 Apr 2013 19:40:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31JeqAM025528 for perforce@freebsd.org; Mon, 1 Apr 2013 19:40:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 19:40:52 GMT Message-Id: <201304011940.r31JeqAM025528@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227288 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 19:40:53 -0000 http://p4web.freebsd.org/@@227288?ac=10 Change 227288 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 19:40:37 Add Makefiles to automatically build BERI parts of the boot loader. In the future, we might want some sort of MK_BERI or similar to control this on other MIPS platforms. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/Makefile#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/Makefile.inc#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Apr 1 20:09:24 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3984AC3F; Mon, 1 Apr 2013 20:09:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EE948C3D for ; Mon, 1 Apr 2013 20:09:23 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id DF670DDF for ; Mon, 1 Apr 2013 20:09:23 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31K9Nba027724 for ; Mon, 1 Apr 2013 20:09:23 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31K9NA6027721 for perforce@freebsd.org; Mon, 1 Apr 2013 20:09:23 GMT (envelope-from brooks@freebsd.org) Date: Mon, 1 Apr 2013 20:09:23 GMT Message-Id: <201304012009.r31K9NA6027721@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227289 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 20:09:24 -0000 http://p4web.freebsd.org/@@227289?ac=10 Change 227289 by brooks@brooks_zenith on 2013/04/01 20:08:35 Record the interrupt-parent of devices that have one in struct device. Use this to improve reporting of interrupt-parents in two ways: Add an indication of the interrupt-parent when printing the child's resources: altera_jtag_uart0: mem 0x900000007f000000-0x900000007f00003f irq 0 (beripic0) on simplebus0 Extend struct u_device and the hw.bus.devices sysctl used by libdevinfo to include the device parent. This is done in a fully foward and backward compatible manner. The kernel can now return a partial structure when an old libdevinfo requests a u_device that is shorter than the current version. Each new field or set of fields in u_device is indicated by a bit in the dv_fields entry. Use this new functionality to add a -i option to devinfo that shows the device tree by interrupt-parent rather than bus. Resources described as "Interrupt" are always shown in -i mode Affected files ... .. //depot/projects/ctsrd/beribsd/src/lib/libdevinfo/devinfo.3#3 edit .. //depot/projects/ctsrd/beribsd/src/lib/libdevinfo/devinfo.c#3 edit .. //depot/projects/ctsrd/beribsd/src/lib/libdevinfo/devinfo.h#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/simplebus.c#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/kern/subr_bus.c#6 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_pic.c#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/sys/bus.h#4 edit .. //depot/projects/ctsrd/beribsd/src/usr.sbin/devinfo/devinfo.c#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/lib/libdevinfo/devinfo.3#3 (text+ko) ==== @@ -36,6 +36,7 @@ .Nm devinfo_handle_to_resource , .Nm devinfo_handle_to_rman , .Nm devinfo_foreach_device_child , +.Nm devinfo_foreach_device_intr_child , .Nm devinfo_foreach_device_resource , .Nm devinfo_foreach_rman_resource , .Nm devinfo_foreach_rman @@ -61,6 +62,12 @@ .Fa "void *arg" .Fc .Ft int +.Fo devinfo_foreach_device_intr_child +.Fa "struct devinfo_dev *parent" +.Fa "int \*[lp]*fn\*[rp]\*[lp]struct devinfo_dev *child, void *arg\*[rp]" +.Fa "void *arg" +.Fc +.Ft int .Fo devinfo_foreach_device_resource .Fa "struct devinfo_dev *dev" .Fa "int \*[lp]*fn\*[rp]\*[lp]struct devinfo_dev *dev, \:struct devinfo_res *res, void *arg\*[rp]" @@ -163,9 +170,11 @@ it will return the handle to the root of the device tree. .Pp .Fn devinfo_foreach_device_child -invokes its callback argument +and +.Fn devinfo_foreach_device_intr_child +invoke its callback argument .Fa fn -on every device which is an immediate child of +on every device which is an immediate child or interrupt child of .Fa device . The .Fa fn ==== //depot/projects/ctsrd/beribsd/src/lib/libdevinfo/devinfo.c#3 (text+ko) ==== @@ -171,7 +171,7 @@ int dev_ptr; int name2oid[2]; int oid[CTL_MAXNAME + 12]; - size_t oidlen, rlen; + size_t newfields, oidlen, rlen; char *name; int error; @@ -217,6 +217,12 @@ warn("sysctl hw.bus.devices.%d", dev_idx); return(errno); } + if (rlen < sizeof(struct ou_device)) { + warnx("impossibly small u_device"); + return(EINVAL); + } + if (rlen > sizeof(struct ou_device)) + newfields = 1; if ((dd = malloc(sizeof(*dd))) == NULL) return(ENOMEM); dd->dd_dev.dd_handle = udev.dv_handle; @@ -237,6 +243,11 @@ dd->dd_dev.dd_devflags = udev.dv_devflags; dd->dd_dev.dd_flags = udev.dv_flags; dd->dd_dev.dd_state = udev.dv_state; + if (newfields && (udev.dv_fields & DV_FIELD_INTR_PARENT) && + udev.dv_intr_parent != 0) + dd->dd_dev.dd_intr_parent = udev.dv_intr_parent; + else + dd->dd_dev.dd_intr_parent = udev.dv_parent; TAILQ_INSERT_TAIL(&devinfo_dev, dd, dd_link); } debug("fetched %d devices", dev_idx); @@ -448,6 +459,25 @@ } /* + * Iterate over the interrupt children of a device, calling (fn) on each. + * If (fn) returns nonzero, abort the scan and return. + */ +int +devinfo_foreach_device_intr_child(struct devinfo_dev *parent, + int (* fn)(struct devinfo_dev *child, void *arg), + void *arg) +{ + struct devinfo_i_dev *dd; + int error; + + TAILQ_FOREACH(dd, &devinfo_dev, dd_link) + if (dd->dd_dev.dd_intr_parent == parent->dd_handle) + if ((error = fn(&dd->dd_dev, arg)) != 0) + return(error); + return(0); +} + +/* * Iterate over all the resources owned by a device, calling (fn) on each. * If (fn) returns nonzero, abort the scan and return. */ ==== //depot/projects/ctsrd/beribsd/src/lib/libdevinfo/devinfo.h#3 (text+ko) ==== @@ -51,6 +51,7 @@ uint32_t dd_devflags; /* API flags */ uint16_t dd_flags; /* internal dev flags */ devinfo_state_t dd_state; /* attacement state of dev */ + devinfo_handle_t dd_intr_parent; /* Interrupt parent */ }; struct devinfo_rman { @@ -108,6 +109,15 @@ void *arg); /* + * Iterate over the interrupt children of a device, calling (fn) on each. If + * If (fn) returns nonzero, abort the scan and return. + */ +extern int + devinfo_foreach_device_intr_child(struct devinfo_dev *parent, + int (* fn)(struct devinfo_dev *child, void *arg), + void *arg); + +/* * Iterate over all the resources owned by a device, calling (fn) on each. * If (fn) returns nonzero, abort the scan and return. */ ==== //depot/projects/ctsrd/beribsd/src/sys/dev/fdt/simplebus.c#5 (text+ko) ==== @@ -228,6 +228,7 @@ static int simplebus_print_child(device_t dev, device_t child) { + device_t ip; struct simplebus_devinfo *di; struct resource_list *rl; int rv; @@ -239,6 +240,8 @@ rv += bus_print_child_header(dev, child); rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx"); rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld"); + if ((ip = simplebus_get_interrupt_parent(child)) != NULL) + rv += printf(" (%s)", device_get_nameunit(ip)); rv += bus_print_child_footer(dev, child); return (rv); @@ -335,9 +338,14 @@ { struct simplebus_devinfo *di; struct fdt_ic *ic; + device_t ip; ihandle_t iph; phandle_t ph; + ip = device_get_intr_parent(dev); + if (ip != NULL) + return (ip); + di = device_get_ivars(dev); if (di == NULL) return (NULL); @@ -347,11 +355,14 @@ iph = fdt32_to_cpu(iph); ph = OF_instance_to_package(iph); SLIST_FOREACH(ic, &fdt_ic_list_head, fdt_ics) { - if (ic->iph == ph) - return (ic->dev); + if (ic->iph == ph) { + ip = ic->dev; + device_set_intr_parent(dev, ip); + break; + } } } - return (NULL); + return (ip); } static int ==== //depot/projects/ctsrd/beribsd/src/sys/kern/subr_bus.c#6 (text+ko) ==== @@ -108,6 +108,7 @@ TAILQ_ENTRY(device) link; /**< list of devices in parent */ TAILQ_ENTRY(device) devlink; /**< global device list membership */ device_t parent; /**< parent of this device */ + device_t intr_parent; /**< interrupt parent of this device */ device_list_t children; /**< list of child devices */ /* @@ -2162,6 +2163,24 @@ } /** + * @brief Return the interrupt parent of a device + */ +device_t +device_get_intr_parent(device_t dev) +{ + return (dev->intr_parent); +} + +/** + * @brief Set the interrupt parent of a device + */ +void +device_set_intr_parent(device_t dev, device_t intr_parent) +{ + dev->intr_parent = intr_parent; +} + +/** * @brief Get a list of children of a device * * An array containing a list of all the children of the given device @@ -4805,7 +4824,9 @@ udev.dv_devflags = dev->devflags; udev.dv_flags = dev->flags; udev.dv_state = dev->state; - error = SYSCTL_OUT(req, &udev, sizeof(udev)); + udev.dv_fields = DV_FIELDS; + udev.dv_intr_parent = (uintptr_t)dev->intr_parent; + error = SYSCTL_OUT(req, &udev, MIN(req->oldlen, sizeof(udev))); return (error); } ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_pic.c#3 (text+ko) ==== @@ -425,7 +425,7 @@ sc->bp_src_rman.rm_start = 0; sc->bp_src_rman.rm_end = sc->bp_nsrcs - 1; sc->bp_src_rman.rm_type = RMAN_ARRAY; - sc->bp_src_rman.rm_descr = "Interrupt sources"; + sc->bp_src_rman.rm_descr = "Interrupt source"; if (rman_init(&(sc->bp_src_rman)) != 0 || rman_manage_region(&(sc->bp_src_rman), 0, sc->bp_nsrcs - 1) != 0) { device_printf(dev, "Failed to set up sources rman"); ==== //depot/projects/ctsrd/beribsd/src/sys/sys/bus.h#4 (text+ko) ==== @@ -59,6 +59,13 @@ /** * @brief Device information exported to userspace. + * + * New fields must be appended to the structure. Each new field or set of + * fields should be paired with a bit in dv_fields_present. When libdevinfo + * reads a structure from hw.bus.devices that is larger than sizeof(ou_device) + * it will use these bits to determine which fields the current kernel + * provides. This allows never versions of libdevinfo to operate with older + * kernels. */ struct u_device { uintptr_t dv_handle; @@ -72,7 +79,30 @@ uint32_t dv_devflags; /**< @brief API Flags for device */ uint16_t dv_flags; /**< @brief flags for dev date */ device_state_t dv_state; /**< @brief State of attachment */ - /* XXX more driver info? */ + uint64_t dv_fields; /**< @brief Further fields */ +#define DV_FIELD_INTR_PARENT 0x1 +#define DV_FIELDS (DV_FIELD_INTR_PARENT) + uintptr_t dv_intr_parent; /**< @brief Interrupt-parent */ +}; + +/** + * @brief Old, static set of device information exported to userspace. + * + * This definition exists to portably provide size information to + * consumers of hw.bus.devices. + */ +struct ou_device { + uintptr_t dv_handle; + uintptr_t dv_parent; + + char dv_name[32]; /**< @brief Name of device in tree. */ + char dv_desc[32]; /**< @brief Driver description */ + char dv_drivername[32]; /**< @brief Driver name */ + char dv_pnpinfo[128]; /**< @brief Plug and play info */ + char dv_location[128]; /**< @brief Where is the device? */ + uint32_t dv_devflags; /**< @brief API Flags for device */ + uint16_t dv_flags; /**< @brief flags for dev date */ + device_state_t dv_state; /**< @brief State of attachment */ }; #ifdef _KERNEL @@ -437,6 +467,8 @@ driver_t *device_get_driver(device_t dev); u_int32_t device_get_flags(device_t dev); device_t device_get_parent(device_t dev); +device_t device_get_intr_parent(device_t dev); +void device_set_intr_parent(device_t dev, device_t intr_parent); int device_get_children(device_t dev, device_t **listp, int *countp); void *device_get_ivars(device_t dev); void device_set_ivars(device_t dev, void *ivars); ==== //depot/projects/ctsrd/beribsd/src/usr.sbin/devinfo/devinfo.c#3 (text+ko) ==== @@ -36,9 +36,11 @@ #include #include #include +#include #include #include "devinfo.h" +static int iflag; static int rflag; static int vflag; @@ -113,6 +115,9 @@ ia->indent = 0; if (devinfo_foreach_rman_resource(rman, print_device_matching_resource, ia) != 0) { + /* XXX: Resources should have types... */ + if(iflag && !rflag && strncmp("Interrupt", rman->dm_desc, 9) != 0) + goto skip; /* there are, print header */ for (i = 0; i < indent; i++) @@ -124,12 +129,13 @@ devinfo_foreach_rman_resource(rman, print_device_matching_resource, ia); } +skip: ia->indent = indent; return(0); } /* - * Print information about a device. + * Print information about a device and its children. */ int print_device(struct devinfo_dev *dev, void *arg) @@ -147,7 +153,7 @@ if (vflag && *dev->dd_location) printf(" at %s", dev->dd_location); printf("\n"); - if (rflag) { + if (iflag || rflag) { ia.indent = indent + 4; ia.arg = dev; devinfo_foreach_rman(print_device_rman_resources, @@ -155,8 +161,12 @@ } } - return(devinfo_foreach_device_child(dev, print_device, - (void *)((char *)arg + 2))); + if (iflag) + return(devinfo_foreach_device_intr_child(dev, print_device, + (void *)((char *)arg + 2))); + else + return(devinfo_foreach_device_child(dev, print_device, + (void *)((char *)arg + 2))); } /* @@ -197,8 +207,11 @@ int c, uflag; uflag = 0; - while ((c = getopt(argc, argv, "ruv")) != -1) { + while ((c = getopt(argc, argv, "iruv")) != -1) { switch(c) { + case 'i': + iflag++; + break; case 'r': rflag++; break; @@ -210,7 +223,7 @@ break; default: fprintf(stderr, "%s\n%s\n", - "usage: devinfo [-rv]", + "usage: devinfo [-irv]", " devinfo -u"); exit(1); } @@ -227,7 +240,11 @@ devinfo_foreach_rman(print_rman, NULL); } else { /* print device hierarchy */ - devinfo_foreach_device_child(root, print_device, (void *)0); + if (iflag) + devinfo_foreach_device_intr_child(root, print_device, + NULL); + else + devinfo_foreach_device_child(root, print_device, NULL); } return(0); } From owner-p4-projects@FreeBSD.ORG Mon Apr 1 21:46:10 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68B63789; Mon, 1 Apr 2013 21:46:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 14DDE787 for ; Mon, 1 Apr 2013 21:46:10 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id E021B2C2 for ; Mon, 1 Apr 2013 21:46:09 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31Lk9MA039130 for ; Mon, 1 Apr 2013 21:46:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31Lk9JG039127 for perforce@freebsd.org; Mon, 1 Apr 2013 21:46:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 21:46:09 GMT Message-Id: <201304012146.r31Lk9JG039127@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227296 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 21:46:10 -0000 http://p4web.freebsd.org/@@227296?ac=10 Change 227296 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 21:46:06 Link /boot/loader at 128k, rather than at 16k underneath (or perhaps on top of) boot2. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/linker.cfg#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/linker.cfg#2 (text+ko) ==== @@ -35,26 +35,19 @@ __mips64_xkphys_cached__ = 0x9800000000000000; /* Device memory here. */ /* - * Location of boot2 in flash. + * Location of boot file system in flash. */ __cheri_flash_base__ = 0x74000000; -__cheri_flash_boot_loader_base_ = 0x01f00000; -__cheri_flash_boot_loader_vaddr__ = __mips64_xkphys_cached__ + - __cheri_flash_base__ + __cheri_flash_boot_loader_base_; - -/* - * Location of boot file system in flash. - */ __cheri_flash_bootfs_base__ = 0x2000000; __cheri_flash_bootfs_len__ = 0x2000000; __cheri_flash_bootfs_vaddr__ = __mips64_xkphys_cached__ + __cheri_flash_base__ + __cheri_flash_bootfs_base__; /* - * Location where boot2 will self-relocate to as its first step. + * Location where loader will execute. */ -__boot2_base__ = 0x4000; -__boot2_base_vaddr__ = __mips64_xkphys_cached__ + __boot2_base__; +__loader_base__ = 0x20000; +__loader_base_vaddr__ = __mips64_xkphys_cached__ + __loader_base__; OUTPUT_FORMAT("elf64-tradbigmips"); OUTPUT_ARCH(mips) @@ -62,11 +55,11 @@ SECTIONS { /* - * Before entering linked C, boot2 will self-relocate from Intel + * Before entering linked C, loader will self-relocate from Intel * StrataFlash into DRAM reached via MIPS ckseg0. We depend on the * firmware having set up a stack for us. */ - . = __boot2_base_vaddr__; + . = __loader_base_vaddr__; .text ALIGN(0x8): { start.o(.text) @@ -77,7 +70,7 @@ __heap = ALIGN(0x8); /* 64-bit aligned heap pointer */ __data_end = .; - __boot_loader_len__ = . - __boot2_base_vaddr__; + __boot_loader_len__ = . - __loader_base_vaddr__; __bss_start = ADDR(.bss); __bss_end = ALIGN(__bss_start + SIZEOF(.bss), 0x8); } From owner-p4-projects@FreeBSD.ORG Mon Apr 1 21:47:11 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8051C926; Mon, 1 Apr 2013 21:47:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 42B61923 for ; Mon, 1 Apr 2013 21:47:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 325402D6 for ; Mon, 1 Apr 2013 21:47:11 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31LlBlk039196 for ; Mon, 1 Apr 2013 21:47:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31LlB2B039193 for perforce@freebsd.org; Mon, 1 Apr 2013 21:47:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 21:47:11 GMT Message-Id: <201304012147.r31LlB2B039193@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227297 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 21:47:11 -0000 http://p4web.freebsd.org/@@227297?ac=10 Change 227297 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 21:46:29 Various BERI /boot/loader bugfixes. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_console.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/loader.h#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/beri_console.c#2 (text+ko) ==== @@ -37,7 +37,9 @@ #include -static void c_out(int c); +static void c_probe(struct console *); +static int c_init(int); +static void c_out(int); static int c_in(void); static int c_ready(void); @@ -45,14 +47,28 @@ .c_name = "comconsole", .c_desc = "altera jtag uart", .c_flags = 0, - .c_probe = NULL, - .c_init = NULL, + .c_probe = c_probe, + .c_init = c_init, .c_out = c_out, .c_in = c_in, .c_ready = c_ready, }; static void +c_probe(struct console *cp) +{ + + cp->c_flags |= C_PRESENTIN|C_PRESENTOUT; +} + +static int +c_init(int arg) +{ + + return (0); +} + +static void c_out(int c) { ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/loader.h#2 (text+ko) ==== @@ -50,7 +50,7 @@ int md_load64(char *args, vm_offset_t *modulep); /* vers.c */ -extern char *bootprog_name, *bootprog_rev; -extern char *bootprog_date, *bootprog_maker; +extern char bootprog_name[], bootprog_rev[]; +extern char bootprog_date[], bootprog_maker[]; #endif /* !_BOOT_LOADER_H_ */ ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#2 (text+ko) ==== @@ -45,6 +45,7 @@ struct devsw *devsw[] = { &beri_disk, + NULL }; struct arch_switch archsw; From owner-p4-projects@FreeBSD.ORG Mon Apr 1 21:47:12 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D54509A8; Mon, 1 Apr 2013 21:47:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 625D8924 for ; Mon, 1 Apr 2013 21:47:11 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5264E2D8 for ; Mon, 1 Apr 2013 21:47:11 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31LlBO7039202 for ; Mon, 1 Apr 2013 21:47:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31LlBYD039199 for perforce@freebsd.org; Mon, 1 Apr 2013 21:47:11 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 21:47:11 GMT Message-Id: <201304012147.r31LlBYD039199@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227298 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 21:47:12 -0000 http://p4web.freebsd.org/@@227298?ac=10 Change 227298 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 21:46:43 Generate loader with debug symbols, generate a .dump file. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#3 (text+ko) ==== @@ -85,7 +85,8 @@ # Generate code appropriate for the loader environment CFLAGS+= -G0 \ -fno-pic \ - -mno-abicalls + -mno-abicalls \ + -g LDFLAGS= -nostdlib \ -static \ @@ -122,4 +123,9 @@ FILES+= menu.rc .endif +loader.dump: loader + objdump -dS loader > loader.dump + +all: loader loader.dump + .include From owner-p4-projects@FreeBSD.ORG Mon Apr 1 22:46:16 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EC3EF6C0; Mon, 1 Apr 2013 22:46:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 9005A6BE for ; Mon, 1 Apr 2013 22:46:15 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7E4786E3 for ; Mon, 1 Apr 2013 22:46:15 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31MkFrC045655 for ; Mon, 1 Apr 2013 22:46:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31MkF67045652 for perforce@freebsd.org; Mon, 1 Apr 2013 22:46:15 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 22:46:15 GMT Message-Id: <201304012246.r31MkF67045652@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227299 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 22:46:16 -0000 http://p4web.freebsd.org/@@227299?ac=10 Change 227299 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 22:45:52 Further 64-bit MIPS improvements for libstand's longjmp code: use dli in preference to li on 64-bit systems to avoid sign extension of the jmp_buf magic number. Affected files ... .. //depot/projects/ctsrd/beribsd/src/lib/libstand/mips/_setjmp.S#4 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/lib/libstand/mips/_setjmp.S#4 (text+ko) ==== @@ -59,7 +59,7 @@ LEAF(_setjmp) .set noreorder - li v0, 0xACEDBADE # sigcontext magic number + REG_LI v0, 0xACEDBADE # sigcontext magic number REG_S ra, (2 * SZREG)(a0) # sc_pc = return address REG_S v0, (3 * SZREG)(a0) # saved in sc_regs[0] REG_S s0, ((S0 + 3) * SZREG)(a0) From owner-p4-projects@FreeBSD.ORG Mon Apr 1 22:47:17 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E56B7AF; Mon, 1 Apr 2013 22:47:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D42C97AD for ; Mon, 1 Apr 2013 22:47:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id C42956EE for ; Mon, 1 Apr 2013 22:47:16 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r31MlGI8045712 for ; Mon, 1 Apr 2013 22:47:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r31MlGNb045709 for perforce@freebsd.org; Mon, 1 Apr 2013 22:47:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 1 Apr 2013 22:47:16 GMT Message-Id: <201304012247.r31MlGNb045709@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227300 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 22:47:17 -0000 http://p4web.freebsd.org/@@227300?ac=10 Change 227300 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/01 22:46:32 For now, convince FICL that MIPS is 64-bit; later, we'll want to teach it that MIPS can also be 32-bit. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/ficl/mips/sysdep.h#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/ficl/mips/sysdep.h#3 (text+ko) ==== @@ -105,11 +105,11 @@ ** (11/2000: same for FICL_FLOAT) */ #if !defined FICL_INT -#define FICL_INT INT32 +#define FICL_INT long #endif #if !defined FICL_UNS -#define FICL_UNS UNS32 +#define FICL_UNS unsigned long #endif #if !defined FICL_FLOAT @@ -120,7 +120,7 @@ ** Ficl presently supports values of 32 and 64 for BITS_PER_CELL */ #if !defined BITS_PER_CELL -#define BITS_PER_CELL 32 +#define BITS_PER_CELL 64 #endif #if ((BITS_PER_CELL != 32) && (BITS_PER_CELL != 64)) @@ -366,7 +366,7 @@ ** machine. 3 would be appropriate for a 64 bit machine. */ #if !defined FICL_ALIGN -#define FICL_ALIGN 2 +#define FICL_ALIGN 3 #define FICL_ALIGN_ADD ((1 << FICL_ALIGN) - 1) #endif From owner-p4-projects@FreeBSD.ORG Wed Apr 3 16:12:47 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CC5C804; Wed, 3 Apr 2013 16:12:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 4D127802 for ; Wed, 3 Apr 2013 16:12:47 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3BD89D76 for ; Wed, 3 Apr 2013 16:12:47 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r33GClpL011496 for ; Wed, 3 Apr 2013 16:12:47 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r33GClR5011493 for perforce@freebsd.org; Wed, 3 Apr 2013 16:12:47 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Apr 2013 16:12:47 GMT Message-Id: <201304031612.r33GClR5011493@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227349 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 16:12:47 -0000 http://p4web.freebsd.org/@@227349?ac=10 Change 227349 by brooks@brooks_zenith on 2013/04/03 16:12:06 Integrate the latest changes to beribsd. This includes Robert's work on boot2 and the loader as well as devinfo improvements. Affected files ... .. //depot/projects/ctsrd/cheribsd/src/lib/libdevinfo/devinfo.3#3 integrate .. //depot/projects/ctsrd/cheribsd/src/lib/libdevinfo/devinfo.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/lib/libdevinfo/devinfo.h#3 integrate .. //depot/projects/ctsrd/cheribsd/src/lib/libstand/Makefile#4 integrate .. //depot/projects/ctsrd/cheribsd/src/lib/libstand/mips/_setjmp.S#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/ficl/Makefile#4 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/ficl/mips/sysdep.h#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/Makefile.inc#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/Makefile#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/altera_jtag_uart.c#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/boot2.c#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/cons.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/drv.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/flash.c#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/linker.cfg#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/mips.h#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/start.S#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/start.s#2 delete .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/common/altera_jtag_uart.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/common/cfi.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/common/cfi.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/common/cons.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/common/mips.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/Makefile#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/beri_console.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/beri_disk.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/exec.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/help.mips#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/linker.cfg#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/loader.h#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/main.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/metadata.c#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/start.S#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/loader/version#1 branch .. //depot/projects/ctsrd/cheribsd/src/sys/dev/fdt/simplebus.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/beri/beri_pic.c#2 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/mips/include/bootinfo.h#3 integrate .. //depot/projects/ctsrd/cheribsd/src/sys/sys/bus.h#4 integrate .. //depot/projects/ctsrd/cheribsd/src/usr.sbin/devinfo/devinfo.c#3 integrate Differences ... ==== //depot/projects/ctsrd/cheribsd/src/lib/libdevinfo/devinfo.3#3 (text+ko) ==== @@ -36,6 +36,7 @@ .Nm devinfo_handle_to_resource , .Nm devinfo_handle_to_rman , .Nm devinfo_foreach_device_child , +.Nm devinfo_foreach_device_intr_child , .Nm devinfo_foreach_device_resource , .Nm devinfo_foreach_rman_resource , .Nm devinfo_foreach_rman @@ -61,6 +62,12 @@ .Fa "void *arg" .Fc .Ft int +.Fo devinfo_foreach_device_intr_child +.Fa "struct devinfo_dev *parent" +.Fa "int \*[lp]*fn\*[rp]\*[lp]struct devinfo_dev *child, void *arg\*[rp]" +.Fa "void *arg" +.Fc +.Ft int .Fo devinfo_foreach_device_resource .Fa "struct devinfo_dev *dev" .Fa "int \*[lp]*fn\*[rp]\*[lp]struct devinfo_dev *dev, \:struct devinfo_res *res, void *arg\*[rp]" @@ -163,9 +170,11 @@ it will return the handle to the root of the device tree. .Pp .Fn devinfo_foreach_device_child -invokes its callback argument +and +.Fn devinfo_foreach_device_intr_child +invoke its callback argument .Fa fn -on every device which is an immediate child of +on every device which is an immediate child or interrupt child of .Fa device . The .Fa fn ==== //depot/projects/ctsrd/cheribsd/src/lib/libdevinfo/devinfo.c#3 (text+ko) ==== @@ -171,7 +171,7 @@ int dev_ptr; int name2oid[2]; int oid[CTL_MAXNAME + 12]; - size_t oidlen, rlen; + size_t newfields, oidlen, rlen; char *name; int error; @@ -217,6 +217,12 @@ warn("sysctl hw.bus.devices.%d", dev_idx); return(errno); } + if (rlen < sizeof(struct ou_device)) { + warnx("impossibly small u_device"); + return(EINVAL); + } + if (rlen > sizeof(struct ou_device)) + newfields = 1; if ((dd = malloc(sizeof(*dd))) == NULL) return(ENOMEM); dd->dd_dev.dd_handle = udev.dv_handle; @@ -237,6 +243,11 @@ dd->dd_dev.dd_devflags = udev.dv_devflags; dd->dd_dev.dd_flags = udev.dv_flags; dd->dd_dev.dd_state = udev.dv_state; + if (newfields && (udev.dv_fields & DV_FIELD_INTR_PARENT) && + udev.dv_intr_parent != 0) + dd->dd_dev.dd_intr_parent = udev.dv_intr_parent; + else + dd->dd_dev.dd_intr_parent = udev.dv_parent; TAILQ_INSERT_TAIL(&devinfo_dev, dd, dd_link); } debug("fetched %d devices", dev_idx); @@ -448,6 +459,25 @@ } /* + * Iterate over the interrupt children of a device, calling (fn) on each. + * If (fn) returns nonzero, abort the scan and return. + */ +int +devinfo_foreach_device_intr_child(struct devinfo_dev *parent, + int (* fn)(struct devinfo_dev *child, void *arg), + void *arg) +{ + struct devinfo_i_dev *dd; + int error; + + TAILQ_FOREACH(dd, &devinfo_dev, dd_link) + if (dd->dd_dev.dd_intr_parent == parent->dd_handle) + if ((error = fn(&dd->dd_dev, arg)) != 0) + return(error); + return(0); +} + +/* * Iterate over all the resources owned by a device, calling (fn) on each. * If (fn) returns nonzero, abort the scan and return. */ ==== //depot/projects/ctsrd/cheribsd/src/lib/libdevinfo/devinfo.h#3 (text+ko) ==== @@ -51,6 +51,7 @@ uint32_t dd_devflags; /* API flags */ uint16_t dd_flags; /* internal dev flags */ devinfo_state_t dd_state; /* attacement state of dev */ + devinfo_handle_t dd_intr_parent; /* Interrupt parent */ }; struct devinfo_rman { @@ -108,6 +109,15 @@ void *arg); /* + * Iterate over the interrupt children of a device, calling (fn) on each. If + * If (fn) returns nonzero, abort the scan and return. + */ +extern int + devinfo_foreach_device_intr_child(struct devinfo_dev *parent, + int (* fn)(struct devinfo_dev *child, void *arg), + void *arg); + +/* * Iterate over all the resources owned by a device, calling (fn) on each. * If (fn) returns nonzero, abort the scan and return. */ ==== //depot/projects/ctsrd/cheribsd/src/lib/libstand/Makefile#4 (text+ko) ==== @@ -36,6 +36,9 @@ .if ${MACHINE_CPUARCH} == "arm" CFLAGS+= -msoft-float -D_STANDALONE .endif +.if ${MACHINE_CPUARCH} == "mips" +CFLAGS+= -G0 -fno-pic -mno-abicalls +.endif # standalone components and stuff we have modified locally SRCS+= gzguts.h zutil.h __main.c assert.c bcd.c bswap.c environment.c getopt.c gets.c \ @@ -53,7 +56,7 @@ .PATH: ${.CURDIR}/../libc/string .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "powerpc" || \ ${MACHINE_CPUARCH} == "sparc64" || ${MACHINE_CPUARCH} == "amd64" || \ - ${MACHINE_CPUARCH} == "arm" + ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "mips" SRCS+= bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \ memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \ strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \ @@ -90,6 +93,8 @@ .PATH: ${.CURDIR}/i386 .elif ${MACHINE_ARCH} == "powerpc64" .PATH: ${.CURDIR}/powerpc +.elif ${MACHINE_ARCH} == "mips64" +.PATH: ${.CURDIR}/mips .else .PATH: ${.CURDIR}/${MACHINE_CPUARCH} .endif ==== //depot/projects/ctsrd/cheribsd/src/lib/libstand/mips/_setjmp.S#3 (text+ko) ==== @@ -59,33 +59,36 @@ LEAF(_setjmp) .set noreorder - li v0, 0xACEDBADE # sigcontext magic number - sw ra, (2 * 4)(a0) # sc_pc = return address - sw v0, (3 * 4)(a0) # saved in sc_regs[0] - sw s0, ((S0 + 3) * 4)(a0) - sw s1, ((S1 + 3) * 4)(a0) - sw s2, ((S2 + 3) * 4)(a0) - sw s3, ((S3 + 3) * 4)(a0) - sw s4, ((S4 + 3) * 4)(a0) - sw s5, ((S5 + 3) * 4)(a0) - sw s6, ((S6 + 3) * 4)(a0) - sw s7, ((S7 + 3) * 4)(a0) - sw sp, ((SP + 3) * 4)(a0) - sw s8, ((S8 + 3) * 4)(a0) + REG_LI v0, 0xACEDBADE # sigcontext magic number + REG_S ra, (2 * SZREG)(a0) # sc_pc = return address + REG_S v0, (3 * SZREG)(a0) # saved in sc_regs[0] + REG_S s0, ((S0 + 3) * SZREG)(a0) + REG_S s1, ((S1 + 3) * SZREG)(a0) + REG_S s2, ((S2 + 3) * SZREG)(a0) + REG_S s3, ((S3 + 3) * SZREG)(a0) + REG_S s4, ((S4 + 3) * SZREG)(a0) + REG_S s5, ((S5 + 3) * SZREG)(a0) + REG_S s6, ((S6 + 3) * SZREG)(a0) + REG_S s7, ((S7 + 3) * SZREG)(a0) + REG_S sp, ((SP + 3) * SZREG)(a0) + REG_S s8, ((S8 + 3) * SZREG)(a0) +/* XXXRW: Don't try to save/restore FP in libstand. */ +#if 0 cfc1 v0, $31 # too bad cant check if FP used - swc1 $f20, ((20 + 38) * 4)(a0) - swc1 $f21, ((21 + 38) * 4)(a0) - swc1 $f22, ((22 + 38) * 4)(a0) - swc1 $f23, ((23 + 38) * 4)(a0) - swc1 $f24, ((24 + 38) * 4)(a0) - swc1 $f25, ((25 + 38) * 4)(a0) - swc1 $f26, ((26 + 38) * 4)(a0) - swc1 $f27, ((27 + 38) * 4)(a0) - swc1 $f28, ((28 + 38) * 4)(a0) - swc1 $f29, ((29 + 38) * 4)(a0) - swc1 $f30, ((30 + 38) * 4)(a0) - swc1 $f31, ((31 + 38) * 4)(a0) - sw v0, ((32 + 38) * 4)(a0) + FP_S $f20, ((20 + 38) * SZREG)(a0) + FP_S $f21, ((21 + 38) * SZREG)(a0) + FP_S $f22, ((22 + 38) * SZREG)(a0) + FP_S $f23, ((23 + 38) * SZREG)(a0) + FP_S $f24, ((24 + 38) * SZREG)(a0) + FP_S $f25, ((25 + 38) * SZREG)(a0) + FP_S $f26, ((26 + 38) * SZREG)(a0) + FP_S $f27, ((27 + 38) * SZREG)(a0) + FP_S $f28, ((28 + 38) * SZREG)(a0) + FP_S $f29, ((29 + 38) * SZREG)(a0) + FP_S $f30, ((30 + 38) * SZREG)(a0) + FP_S $f31, ((31 + 38) * SZREG)(a0) +#endif + REG_S v0, ((32 + 38) * SZREG)(a0) j ra move v0, zero END(_setjmp) @@ -96,38 +99,41 @@ .cprestore 16 #endif .set noreorder - lw v0, (3 * 4)(a0) # get magic number - lw ra, (2 * 4)(a0) + REG_L v0, (3 * SZREG)(a0) # get magic number + REG_L ra, (2 * SZREG)(a0) bne v0, 0xACEDBADE, botch # jump if error addu sp, sp, 32 # does not matter, sanity - lw s0, ((S0 + 3) * 4)(a0) - lw s1, ((S1 + 3) * 4)(a0) - lw s2, ((S2 + 3) * 4)(a0) - lw s3, ((S3 + 3) * 4)(a0) - lw s4, ((S4 + 3) * 4)(a0) - lw s5, ((S5 + 3) * 4)(a0) - lw s6, ((S6 + 3) * 4)(a0) - lw s7, ((S7 + 3) * 4)(a0) - lw v0, ((32 + 38) * 4)(a0) # get fpu status - lw sp, ((SP + 3) * 4)(a0) - lw s8, ((S8 + 3) * 4)(a0) + REG_L s0, ((S0 + 3) * SZREG)(a0) + REG_L s1, ((S1 + 3) * SZREG)(a0) + REG_L s2, ((S2 + 3) * SZREG)(a0) + REG_L s3, ((S3 + 3) * SZREG)(a0) + REG_L s4, ((S4 + 3) * SZREG)(a0) + REG_L s5, ((S5 + 3) * SZREG)(a0) + REG_L s6, ((S6 + 3) * SZREG)(a0) + REG_L s7, ((S7 + 3) * SZREG)(a0) + REG_L v0, ((32 + 38) * SZREG)(a0) # get fpu status + REG_L sp, ((SP + 3) * SZREG)(a0) + REG_L s8, ((S8 + 3) * SZREG)(a0) +/* XXXRW: Don't try to save/restore FP in libstand. */ +#if 0 /* Octeon does not have an FPU */ #if !defined(_MIPS_ARCH_OCTEON) ctc1 v0, $31 - lwc1 $f20, ((20 + 38) * 4)(a0) - lwc1 $f21, ((21 + 38) * 4)(a0) - lwc1 $f22, ((22 + 38) * 4)(a0) - lwc1 $f23, ((23 + 38) * 4)(a0) - lwc1 $f24, ((24 + 38) * 4)(a0) - lwc1 $f25, ((25 + 38) * 4)(a0) - lwc1 $f26, ((26 + 38) * 4)(a0) - lwc1 $f27, ((27 + 38) * 4)(a0) - lwc1 $f28, ((28 + 38) * 4)(a0) - lwc1 $f29, ((29 + 38) * 4)(a0) - lwc1 $f30, ((30 + 38) * 4)(a0) - lwc1 $f31, ((31 + 38) * 4)(a0) + FP_L $f20, ((20 + 38) * SZREG)(a0) + FP_L $f21, ((21 + 38) * SZREG)(a0) + FP_L $f22, ((22 + 38) * SZREG)(a0) + FP_L $f23, ((23 + 38) * SZREG)(a0) + FP_L $f24, ((24 + 38) * SZREG)(a0) + FP_L $f25, ((25 + 38) * SZREG)(a0) + FP_L $f26, ((26 + 38) * SZREG)(a0) + FP_L $f27, ((27 + 38) * SZREG)(a0) + FP_L $f28, ((28 + 38) * SZREG)(a0) + FP_L $f29, ((29 + 38) * SZREG)(a0) + FP_L $f30, ((30 + 38) * SZREG)(a0) + FP_L $f31, ((31 + 38) * SZREG)(a0) #endif /* _MIPS_ARCH_OCTEON */ +#endif j ra move v0, a1 ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/ficl/Makefile#4 (text+ko) ==== @@ -27,6 +27,9 @@ .if ${MACHINE} == "pc98" CFLAGS+= -Os -DPC98 .endif +.if ${MACHINE_CPUARCH} == "mips" +CFLAGS+= -G0 -fno-pic -mno-abicalls +.endif .if HAVE_PNP CFLAGS+= -DHAVE_PNP .endif ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/ficl/mips/sysdep.h#3 (text+ko) ==== @@ -105,11 +105,11 @@ ** (11/2000: same for FICL_FLOAT) */ #if !defined FICL_INT -#define FICL_INT INT32 +#define FICL_INT long #endif #if !defined FICL_UNS -#define FICL_UNS UNS32 +#define FICL_UNS unsigned long #endif #if !defined FICL_FLOAT @@ -120,7 +120,7 @@ ** Ficl presently supports values of 32 and 64 for BITS_PER_CELL */ #if !defined BITS_PER_CELL -#define BITS_PER_CELL 32 +#define BITS_PER_CELL 64 #endif #if ((BITS_PER_CELL != 32) && (BITS_PER_CELL != 64)) @@ -366,7 +366,7 @@ ** machine. 3 would be appropriate for a 64 bit machine. */ #if !defined FICL_ALIGN -#define FICL_ALIGN 2 +#define FICL_ALIGN 3 #define FICL_ALIGN_ADD ((1 << FICL_ALIGN) - 1) #endif ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/Makefile#3 (text+ko) ==== @@ -1,14 +1,14 @@ # $FreeBSD$ -PROG= boot2 +PROG= boot2.elf BINDIR?= /boot INSTALLFLAGS= -b FILES= ${PROG} -SRCS= start.s \ +SRCS= start.S \ boot2.c \ altera_jtag_uart.c \ - flash.c + cfi.c NO_MAN= @@ -24,15 +24,23 @@ -fno-pic -mno-abicalls \ -g -LDFLAGS= -nostdlib \ - -static \ - -N \ - -T linker.cfg \ +LDFLAGS= -nostdlib \ + -static \ + -N \ + -T ${.CURDIR}/linker.cfg \ -G0 -boot2: linker.cfg +.PATH: ${.CURDIR}/../common +CFLAGS+= -I${.CURDIR}/../common + +boot2.elf: linker.cfg + +boot2: boot2.elf + objcopy -S -O binary boot2.elf boot2 + +boot2.dump: boot2.elf + objdump -dS boot2.elf > boot2.dump -boot2.img: boot2 - objcopy -S -O binary boot2 boot2.img +all: boot2 boot2.dump .include ==== //depot/projects/ctsrd/cheribsd/src/sys/boot/mips/beri/boot2/boot2.c#3 (text+ko) ==== @@ -27,8 +27,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * Copyright (c) 2008 John Hay - * Copyright (c) 2006 Warner Losh * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -44,23 +42,30 @@ */ #include -__FBSDID("$FreeBSD: head/sys/boot/arm/at91/boot2/boot2.c 235988 2012-05-25 09:36:39Z gleb $"); +__FBSDID("$FreeBSD: head/sys/boot/i386/boot2/boot2.c 241301 2012-10-06 20:08:29Z avg $"); #include #include #include #include +#include #include +#include #include #include -#include "cons.h" -#include "drv.h" +#include +#include +#include + +extern register_t beri_argc, beri_argv, beri_envv, beri_memsize; + +#define IO_KEYBOARD 1 +#define IO_SERIAL 2 -//#include "lib.h" -//#include "board.h" +#define SECOND 1 /* Circa that many ticks in a second. */ #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ @@ -68,363 +73,601 @@ /* 0x3 is reserved for log2(RB_HALT). */ /* 0x4 is reserved for log2(RB_INITNAME). */ #define RBX_DFLTROOT 0x5 /* -r */ -/* #define RBX_KDB 0x6 -d */ +#define RBX_KDB 0x6 /* -d */ /* 0x7 is reserved for log2(RB_RDONLY). */ /* 0x8 is reserved for log2(RB_DUMP). */ /* 0x9 is reserved for log2(RB_MINIROOT). */ #define RBX_CONFIG 0xa /* -c */ #define RBX_VERBOSE 0xb /* -v */ -/* #define RBX_SERIAL 0xc -h */ -/* #define RBX_CDROM 0xd -C */ +#define RBX_SERIAL 0xc /* -h */ +#define RBX_CDROM 0xd /* -C */ /* 0xe is reserved for log2(RB_POWEROFF). */ #define RBX_GDB 0xf /* -g */ -/* #define RBX_MUTE 0x10 -m */ +#define RBX_MUTE 0x10 /* -m */ /* 0x11 is reserved for log2(RB_SELFTEST). */ /* 0x12 is reserved for boot programs. */ /* 0x13 is reserved for boot programs. */ -/* #define RBX_PAUSE 0x14 -p */ -/* #define RBX_QUIET 0x15 -q */ +#define RBX_PAUSE 0x14 /* -p */ +#define RBX_QUIET 0x15 /* -q */ #define RBX_NOINTR 0x1c /* -n */ /* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */ -/* #define RBX_DUAL 0x1d -D */ +#define RBX_DUAL 0x1d /* -D */ /* 0x1f is reserved for log2(RB_BOOTINFO). */ -/* pass: -a, -s, -r, -v, -g */ +/* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ #define RBX_MASK (OPT_SET(RBX_ASKNAME) | OPT_SET(RBX_SINGLE) | \ - OPT_SET(RBX_DFLTROOT) | \ - OPT_SET(RBX_VERBOSE) | \ - OPT_SET(RBX_GDB)) + OPT_SET(RBX_DFLTROOT) | OPT_SET(RBX_KDB ) | \ + OPT_SET(RBX_CONFIG) | OPT_SET(RBX_VERBOSE) | \ + OPT_SET(RBX_SERIAL) | OPT_SET(RBX_CDROM) | \ + OPT_SET(RBX_GDB ) | OPT_SET(RBX_MUTE) | \ + OPT_SET(RBX_PAUSE) | OPT_SET(RBX_DUAL)) #define PATH_DOTCONFIG "/boot.config" #define PATH_CONFIG "/boot/config" +#define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/boot/kernel/kernel" -extern uint32_t _end; +#define ARGS 0x900 +#define NOPT 14 +#define NDEV 3 +#define MEM_BASE 0x12 +#define MEM_EXT 0x15 + +#define DRV_HARD 0x80 +#define DRV_MASK 0x7f -#define NOPT 6 +#define TYPE_AD 0 +#define TYPE_DA 1 +#define TYPE_MAXHARD TYPE_DA +#define TYPE_FD 2 #define OPT_SET(opt) (1 << (opt)) #define OPT_CHECK(opt) ((opts) & OPT_SET(opt)) -static const char optstr[NOPT] = "agnrsv"; +extern uint32_t _end; + +static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */ static const unsigned char flags[NOPT] = { - RBX_ASKNAME, - RBX_GDB, - RBX_NOINTR, - RBX_DFLTROOT, - RBX_SINGLE, - RBX_VERBOSE + RBX_DUAL, + RBX_SERIAL, + RBX_ASKNAME, + RBX_CDROM, + RBX_CONFIG, + RBX_KDB, + RBX_GDB, + RBX_MUTE, + RBX_NOINTR, + RBX_PAUSE, + RBX_QUIET, + RBX_DFLTROOT, + RBX_SINGLE, + RBX_VERBOSE }; -unsigned board_id; /* board type to pass to kernel, if set by board_* code */ -unsigned dsk_start; -static char cmd[512]; -static char kname[1024]; +static const char *const dev_nm[NDEV] = {"ad", "da", "fd"}; +static const unsigned char dev_maj[NDEV] = {30, 4, 2}; + +static struct dmadat __dmadat; + +static struct dsk { + unsigned drive; + unsigned type; + unsigned unit; + uint8_t slice; + uint8_t part; + unsigned start; + int init; +} dsk; +static char cmd[512], cmddup[512], knamebuf[1024]; +static const char *kname; static uint32_t opts; -static uint8_t dsk_meta; +#if 0 +static int comspeed = SIOSPD; +#endif +struct bootinfo bootinfo; +static uint8_t ioctrl = IO_KEYBOARD; +void exit(int); static void load(void); static int parse(void); static int dskread(void *, unsigned, unsigned); -#ifdef FIXUP_BOOT_DRV -static void fixup_boot_drv(caddr_t, int, int, int); +static void printf(const char *,...); +static void putchar(int); +static int xputc(int); +static int xgetc(int); + +#if 0 +void memcpy(void *, const void *, int); #endif +void +memcpy(void *dst, const void *src, int len) +{ + const char *s = src; + char *d = dst; -#include "util.c" + while (len--) + *d++ = *s++; +} + +static inline int +strcmp(const char *s1, const char *s2) +{ + for (; *s1 == *s2 && *s1; s1++, s2++); + return (unsigned char)*s1 - (unsigned char)*s2; +} + #define UFS_SMALL_CGBASE #include "ufsread.c" -static struct dmadat __dmadat; - -#ifdef DEBUG -#define DPRINTF(fmt, ...) printf(fmt, __VA_ARGS__) -#else -#define DPRINTF(fmt, ...) -#endif - static inline int xfsread(ufs_ino_t inode, void *buf, size_t nbyte) { - if ((size_t)fsread(inode, buf, nbyte) != nbyte) - return -1; - return 0; + if ((size_t)fsread(inode, buf, nbyte) != nbyte) { + printf("Invalid %s\n", "format"); + return -1; + } + return 0; } static inline void -getstr(int c) +getstr(void) { - char *s; + char *s; + int c; - s = cmd; - if (c == 0) - c = getc(10000); - for (;;) { - switch (c) { - case 0: - break; - case '\177': - case '\b': - if (s > cmd) { - s--; - printf("\b \b"); - } - break; - case '\n': - case '\r': - *s = 0; - return; - default: - if (s - cmd < sizeof(cmd) - 1) - *s++ = c; - putchar(c); - } - c = getc(10000); + s = cmd; + for (;;) { + switch (c = xgetc(0)) { + case 0: + break; + case '\177': + case '\b': + if (s > cmd) { + s--; + printf("\b \b"); + } + break; + case '\n': + case '\r': + *s = 0; + return; + default: + if (s - cmd < sizeof(cmd) - 1) + *s++ = c; + putchar(c); } + } } int main(void) { - int autoboot, c = 0; - ufs_ino_t ino; + uint8_t autoboot; + ufs_ino_t ino; + size_t nbyte; + + dmadat = &__dmadat; +#if 0 + /* XXXRW: more here. */ + v86.ctl = V86_FLAGS; + v86.efl = PSL_RESERVED_DEFAULT | PSL_I; + dsk.drive = *(uint8_t *)PTOV(ARGS); + dsk.type = dsk.drive & DRV_HARD ? TYPE_AD : TYPE_FD; + dsk.unit = dsk.drive & DRV_MASK; + dsk.slice = *(uint8_t *)PTOV(ARGS + 1) + 1; +#endif + bootinfo.bi_version = BOOTINFO_VERSION; + bootinfo.bi_size = sizeof(bootinfo); + + /* Process configuration file */ + + autoboot = 1; - dmadat = &__dmadat; - //board_init(); + if ((ino = lookup(PATH_CONFIG)) || + (ino = lookup(PATH_DOTCONFIG))) { + nbyte = fsread(ino, cmd, sizeof(cmd) - 1); + cmd[nbyte] = '\0'; + } - autoboot = 1; + if (*cmd) { + memcpy(cmddup, cmd, sizeof(cmd)); + if (parse()) + autoboot = 0; + if (!OPT_CHECK(RBX_QUIET)) + printf("%s: %s", PATH_CONFIG, cmddup); + /* Do not process this command twice */ + *cmd = 0; + } - /* Process configuration file */ - if ((ino = lookup(PATH_CONFIG)) || - (ino = lookup(PATH_DOTCONFIG))) - fsread(ino, cmd, sizeof(cmd)); + /* + * Try to exec stage 3 boot loader. If interrupted by a keypress, + * or in case of failure, try to load a kernel directly instead. + */ - if (*cmd) { - if (parse()) - autoboot = 0; - printf("%s: %s\n", PATH_CONFIG, cmd); - /* Do not process this command twice */ - *cmd = 0; + if (!kname) { + kname = PATH_BOOT3; + if (autoboot && !keyhit(3*SECOND)) { + load(); + kname = PATH_KERNEL; } + } - if (*kname == '\0') - strcpy(kname, PATH_KERNEL); + /* Present the user with the boot2 prompt. */ + + for (;;) { + if (!autoboot || !OPT_CHECK(RBX_QUIET)) + printf("\nFreeBSD/mips boot\n" + "Default: %u:%s(%u,%c)%s\n" + "boot: ", + dsk.drive & DRV_MASK, dev_nm[dsk.type], dsk.unit, + 'a' + dsk.part, kname); +#if 0 + if (ioctrl & IO_SERIAL) + sio_flush(); +#endif + if (!autoboot || keyhit(3*SECOND)) + getstr(); + else if (!autoboot || !OPT_CHECK(RBX_QUIET)) + putchar('\n'); + autoboot = 0; + if (parse()) + putchar('\a'); + else + load(); + } +} - /* Present the user with the boot2 prompt. */ - for (;;) { - printf("\nDefault: %s\nboot: ", kname); - if (!autoboot || - (OPT_CHECK(RBX_NOINTR) == 0 && (c = getc(2)) != 0)) - getstr(c); - printf("\n"); - autoboot = 0; - c = 0; - if (parse()) - putchar('\a'); - else - load(); - } +/* XXX - Needed for btxld to link the boot2 binary; do not remove. */ +void +exit(int x) +{ } static void load(void) { + union { Elf64_Ehdr eh; - static Elf64_Phdr ep[2]; - caddr_t p; - ufs_ino_t ino; - uint64_t addr; - int i, j; -#ifdef FIXUP_BOOT_DRV - caddr_t staddr; - int klen; + } hdr; + static Elf64_Phdr ep[2]; +#if 0 + static Elf64_Shdr es[2]; +#endif + caddr_t p; + ufs_ino_t ino; + uint64_t addr; + int i, j; + + if (!(ino = lookup(kname))) { + if (!ls) + printf("No %s\n", kname); + return; + } + if (xfsread(ino, &hdr, sizeof(hdr))) + return; - staddr = (caddr_t)0xffffffff; - klen = 0; -#endif - if (!(ino = lookup(kname))) { - if (!ls) - printf("No %s\n", kname); + if (IS_ELF(hdr.eh)) { + fs_off = hdr.eh.e_phoff; + for (j = i = 0; i < hdr.eh.e_phnum && j < 2; i++) { + if (xfsread(ino, ep + j, sizeof(ep[0]))) return; + if (ep[j].p_type == PT_LOAD) + j++; } - if (xfsread(ino, &eh, sizeof(eh))) + for (i = 0; i < 2; i++) { + p = (caddr_t)ep[i].p_paddr; + fs_off = ep[i].p_offset; + if (xfsread(ino, p, ep[i].p_filesz)) return; - if (!IS_ELF(eh)) { - printf("Invalid %s\n", "format"); + } + p += roundup2(ep[1].p_memsz, PAGE_SIZE); +#if 0 + bootinfo.bi_symtab = VTOP(p); + if (hdr.eh.e_shnum == hdr.eh.e_shstrndx + 3) { + fs_off = hdr.eh.e_shoff + sizeof(es[0]) * + (hdr.eh.e_shstrndx + 1); + if (xfsread(ino, &es, sizeof(es))) return; + for (i = 0; i < 2; i++) { + *(Elf32_Word *)p = es[i].sh_size; + p += sizeof(es[i].sh_size); + fs_off = es[i].sh_offset; + if (xfsread(ino, p, es[i].sh_size)) + return; + p += es[i].sh_size; + } } - fs_off = eh.e_phoff; - for (j = i = 0; i < eh.e_phnum && j < 2; i++) { - if (xfsread(ino, ep + j, sizeof(ep[0]))) - return; - if (ep[j].p_type == PT_LOAD) - j++; - } - for (i = 0; i < 2; i++) { - p = (caddr_t)ep[i].p_paddr; - fs_off = ep[i].p_offset; -#ifdef FIXUP_BOOT_DRV - if (staddr == (caddr_t)0xffffffff) - staddr = p; - klen += ep[i].p_filesz; +#endif + addr = hdr.eh.e_entry; +#if 0 + bootinfo.bi_esymtab = VTOP(p); #endif - if (xfsread(ino, p, ep[i].p_filesz)) - return; - } - addr = eh.e_entry; -#ifdef FIXUP_BOOT_DRV - fixup_boot_drv(staddr, klen, bootslice, bootpart); + } else { + printf("Invalid %s\n", "format"); + return; + } + +#if 0 + bootinfo.bi_kernelname = VTOP(kname); + bootinfo.bi_bios_dev = dsk.drive; + __exec((caddr_t)addr, RB_BOOTINFO | (opts & RBX_MASK), + MAKEBOOTDEV(dev_maj[dsk.type], dsk.slice, dsk.unit, dsk.part), + 0, 0, 0, VTOP(&bootinfo)); #endif - ((void(*)(int, int, int, int))addr)(opts & RBX_MASK, board_id, 0, 0); + bootinfo.bi_kernelname = kname; + bootinfo.bi_boot2opts = opts & RBX_MASK; + if (beri_memsize <= BERI_MEMVSDTB) + bootinfo.bi_memsize = beri_memsize; + else + bootinfo.bi_dtb = beri_memsize; + ((void(*)(int, int, int, void *))addr)(beri_argc, beri_argv, beri_envv, + &bootinfo); } static int parse() { - char *arg = cmd; - char *ep, *p; - int c, i; + char *arg = cmd; + char *ep, *p, *q; +#if 0 + const char *cp; +#endif + unsigned int drv; +#if 0 + int c, i, j; +#else + int c, i; +#endif - while ((c = *arg++)) { - if (c == ' ' || c == '\t' || c == '\n') - continue; - for (p = arg; *p && *p != '\n' && *p != ' ' && *p != '\t'; p++); - ep = p; - if (*p) - *p++ = 0; - if (c == '-') { - while ((c = *arg++)) { - for (i = 0; c != optstr[i]; i++) - if (i == NOPT - 1) - return -1; - opts ^= OPT_SET(flags[i]); - } - } else { - arg--; - if ((i = ep - arg)) { - if ((size_t)i >= sizeof(kname)) - return -1; - memcpy(kname, arg, i + 1); - } + while ((c = *arg++)) { + if (c == ' ' || c == '\t' || c == '\n') >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 3 16:19:00 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 018C8A24; Wed, 3 Apr 2013 16:19:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B63BCA22 for ; Wed, 3 Apr 2013 16:18:59 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id A5401DD4 for ; Wed, 3 Apr 2013 16:18:59 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r33GIx48012630 for ; Wed, 3 Apr 2013 16:18:59 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r33GIsI3012626 for perforce@freebsd.org; Wed, 3 Apr 2013 16:18:54 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Apr 2013 16:18:54 GMT Message-Id: <201304031618.r33GIsI3012626@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227350 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 16:19:00 -0000 http://p4web.freebsd.org/@@227350?ac=10 Change 227350 by brooks@brooks_zenith on 2013/04/03 16:18:27 IFC @ 227326. This pulls in the last two months of FreeBSD changes. Affected files ... .. //depot/projects/ctsrd/beribsd/src/MAINTAINERS#5 integrate .. //depot/projects/ctsrd/beribsd/src/Makefile#6 integrate .. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#10 integrate .. //depot/projects/ctsrd/beribsd/src/ObsoleteFiles.inc#7 integrate .. //depot/projects/ctsrd/beribsd/src/UPDATING#8 integrate .. //depot/projects/ctsrd/beribsd/src/bin/chflags/chflags.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/cp/cp.1#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/ed/cbc.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/ls/ls.1#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/mkdir/mkdir.1#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/mv/mv.1#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/mv/mv.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/ps/ps.1#5 integrate .. //depot/projects/ctsrd/beribsd/src/bin/rm/rm.1#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/rmdir/rmdir.1#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/setfacl/setfacl.1#5 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/eval.c#6 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/exec.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/expand.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/expand.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/input.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/input.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/jobs.c#6 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/main.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/memalloc.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/memalloc.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/miscbltin.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/mksyntax.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/nodetypes#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/parser.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/parser.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/redir.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/sh.1#5 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/trap.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/sh/trap.h#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/test/test.1#4 integrate .. //depot/projects/ctsrd/beribsd/src/bin/test/test.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.tolower.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.toupper.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolower.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.tolowertoomany.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.toupper.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.touppertoomany.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostrbase.d.out#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.tolower.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.toupper.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.array.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.array.d.out#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.bitfield.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.bitfield.d.out#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.primitive.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.primitive.d.out#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.struct.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.struct.d.out#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_PROTO_LEN.toomany.d#2 delete .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_ARGS.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/err.D_TRACEMEM_DYNSIZE.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.dynsize.d.out#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zdb/zdb.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#6 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zhack/zhack.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zinject/translate.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zinject/zinject.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zpool/zpool.8#5 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/cmd/ztest/ztest.c#6 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_print.c#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.h#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core_compat.c#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core_compat.h#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/lib/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/lib/libdtrace/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/lib/libdtrace/io.d#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/lib/libzfs_core/Makefile#1 branch .. //depot/projects/ctsrd/beribsd/src/cddl/sbin/zfs/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/usr.bin/zinject/Makefile#3 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/usr.bin/ztest/Makefile#5 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/cddl/usr.sbin/zhack/Makefile#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bind9/CHANGES#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bind9/config.h.in#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bind9/configure.in#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bind9/version#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/bfd/dwarf2.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/binutils/dwarf.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-arm.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/gas/config/tc-i386.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/include/elf/common.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/opcodes/i386-dis.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/opcodes/i386-opc.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/binutils/opcodes/i386-tbl.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/ChangeLog#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/FILES#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/Makefile#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/Makefile.config.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/Makefile.in#2 delete .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/bmake.1#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/bmake.cat1#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/boot-strap#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/bsd.after-import.mk#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/compat.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/configure#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/configure.in#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/job.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/main.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/make-bootstrap.sh.in#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/make.1#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/meta.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/ChangeLog#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/FILES#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/README#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/auto.dep.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/auto.obj.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/autoconf.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/autodep.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/dep.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/dirdeps.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/doc.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/dpadd.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/final.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/gendirdeps.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/host-target.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/host.libnames.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/inc.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/init.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/install-mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/install-new.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/java.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/lib.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/libnames.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/libs.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/links.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/man.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/meta.autodep.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/meta.stage.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/meta.subdir.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/meta.sys.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/meta2deps.py#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/meta2deps.sh#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/mk-files.txt#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/nls.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/obj.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/options.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/own.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/prlist.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/prog.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/progs.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/rst2htm.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/scripts.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/srctop.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/subdir.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys.clean-env.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys.dependfile.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/AIX.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/Darwin.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/Generic.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/HP-UX.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/IRIX.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/Linux.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/NetBSD.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/OSF1.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/OpenBSD.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/SunOS.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/sys/UnixWare.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/target-flags.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/warnings.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/mk/yacc.mk#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/realpath.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/unit-tests/Makefile.in#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/bmake/var.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/Changes#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/FREEBSD-Xlist#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/expat/FREEBSD-upgrade#3 delete .. //depot/projects/ctsrd/beribsd/src/contrib/expat/MANIFEST#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/Makefile.in#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/README#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/configure#2 delete .. //depot/projects/ctsrd/beribsd/src/contrib/expat/configure.in#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/doc/reference.html#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/doc/valid-xhtml10.png#2 delete .. //depot/projects/ctsrd/beribsd/src/contrib/expat/doc/xmlwf.sgml#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/expat_config.h.in#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/lib/expat.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/lib/winconfig.h#2 delete .. //depot/projects/ctsrd/beribsd/src/contrib/expat/lib/xmlparse.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/lib/xmlrole.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/lib/xmltok.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/lib/xmltok_impl.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/tests/README.txt#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/tests/benchmark/benchmark.dsp#2 delete .. //depot/projects/ctsrd/beribsd/src/contrib/expat/tests/benchmark/benchmark.dsw#2 delete .. //depot/projects/ctsrd/beribsd/src/contrib/expat/tests/minicheck.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/tests/runtests.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/tests/xmltest.sh#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/xmlwf/readfilemap.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/expat/xmlwf/xmlwf.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/gcc/config/arm/freebsd.h#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/gcc/config/arm/unwind-arm.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/gdb/gdb/osabi.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/Changelog#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/LICENSE#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/README#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/README.snapshots#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/README.svn#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/aclocal.m4#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/acx_nlnetlabs.m4#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ax_pkg_swig.m4#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ax_python_devel.m4#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/buffer.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/b32_ntop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/b32_pton.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/b64_ntop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/b64_pton.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/calloc.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/ctime_r.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/fake-rfc2553.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/fake-rfc2553.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/gmtime_r.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/inet_aton.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/inet_ntop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/inet_pton.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/isascii.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/isblank.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/localtime_r.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/malloc.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/memmove.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/realloc.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/snprintf.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/strlcpy.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/compat/timegm.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/config.guess#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/config.sub#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/configure#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/configure.ac#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/dane.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/dname.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/dnssec.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/dnssec_sign.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/dnssec_verify.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/dnssec_zone.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/ChangeLog.22-nov-2005#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/README#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/REGRESSIONS#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/chasetrace.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/config.h.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/configure#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/configure.ac#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/dnssec.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/drill.1.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/drill.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/drill.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/drill_util.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/drill_util.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/error.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/install-sh#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/root.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/securetrace.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/drill/work.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/duration.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/error.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/higher.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/host2str.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/host2wire.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/install-sh#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/keys.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/buffer.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/common.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/common.h.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/config.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/config.h.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/dane.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/dname.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/dnssec.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/dnssec_sign.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/dnssec_verify.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/dnssec_zone.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/duration.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/error.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/higher.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/host2str.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/host2wire.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/keys.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/ldns.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/net.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/net.h.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/packet.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/parse.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/rbtree.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/rdata.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/resolver.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/rr.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/rr_functions.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/sha1.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/sha2.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/str2host.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/tsig.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/update.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/util.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/util.h.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/wire2host.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ldns/zone.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/libdns.doxygen#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/libdns.vim#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/linktest.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/ltmain.sh#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/net.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/packet.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/parse.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/rbtree.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/rdata.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/resolver.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/rr.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/rr_functions.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/sha1.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/sha2.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/str2host.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/tsig.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/update.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/util.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/wire2host.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/ldns/zone.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/NEWS#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/README#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/bsdcpio.1#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/cmdline.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/cpio.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/cpio.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/main.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_basic.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.Z.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.bz2.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.grz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.gz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.lrz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.lz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.lzma.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract.cpio.xz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_Z.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_bz2.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_grz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_gz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_lrz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_lz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_lzma.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_lzo.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_extract_cpio_xz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_format_newc.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_b64encode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_grzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_lrzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_uuencode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_xz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_y.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/cpio/test/test_option_z.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_cmdline.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_cmdline_private.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_crypto.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_entry.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_entry.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_entry_link_resolver.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_getdate.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_match.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_options.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_ppmd7.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_private.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_rb.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_append_filter.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_disk_posix.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_extract.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_open_fd.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_open_file.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_private.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_set_format.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_all.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_bzip2.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_compress.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_grzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_gzip.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_lrzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_program.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_rpm.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_uu.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_filter_xz.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_7zip.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_ar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_cab.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_cpio.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_empty.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_lha.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_mtree.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_rar.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_raw.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_xar.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_read_support_format_zip.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_string.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_util.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_virtual.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_b64encode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_by_name.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_bzip2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_compress.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_grzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_gzip.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_lrzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_program.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_uuencode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_add_filter_xz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_disk_acl.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_disk_posix.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_free.3#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_open_filename.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_private.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_7zip.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_ar.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_by_name.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_mtree.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_xar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_format_zip.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/archive_write_set_options.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/filter_fork.c#3 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/filter_fork.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/filter_fork_posix.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/libarchive-formats.5#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/main.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_acl_freebsd.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_acl_nfs4.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_acl_pax.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_acl_posix1e.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_clear_error.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_cmdline.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_getdate.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_close_twice.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_fd.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_close_twice_open_filename.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_multiple_data_objects.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_set_filter_option.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_set_format_option.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_set_option.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_read_set_options.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_set_error.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_write_add_filter_by_name.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_write_set_filter_option.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_write_set_format_by_name.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_write_set_format_option.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_write_set_option.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_archive_write_set_options.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_bzip2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_cpio.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_gzip.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_lzip.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_lzma.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_lzop_1.tar.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_lzop_2.tar.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_lzop_3.tar.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_mac.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_tar_hardlink.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_uudecode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_xz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_compat_zip.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_empty_write.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_entry.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_extattr_freebsd.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_filter_count.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_fuzz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_open_failure.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_open_fd.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_open_file.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_open_filename.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_pax_filename_encoding.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part1.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part2.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part3.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part4.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part5.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_multiple_files.part6.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_compress_program.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_data_large.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_disk.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_extract.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_grzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_grzip.tar.grz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_lrzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_lrzip.tar.lrz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_lzop.tar.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.tar.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_program.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_program_signature.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_filter_uudecode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_7zip.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_ar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cab.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cab_filename.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_afio.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_Z.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_be.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_bz2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_gz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzip.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_lzma.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_bin_xz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_filename.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_odc.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_cpio_svr4c_Z.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_empty.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_gtar_gz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_gtar_lzma.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_iso_Z.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_iso_multi_extent.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_iso_xorriso.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isojoliet_bz2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isojoliet_long.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isojoliet_rr.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isojoliet_versioned.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isorr_bz2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isorr_ce.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isorr_new_bz2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isorr_rr_moved.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_isozisofs_bz2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_lha.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_lha_filename.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_mtree.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic2.mtree.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_mtree_nomagic3.mtree.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_pax_bz2.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_rar.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_tar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_tar_empty_filename.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_tbz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_tgz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_tlz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_txz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_tz.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_xar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_1.zip.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored_2.zip.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_filename.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.zip.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_aa.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ab.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ac.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ad.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_large_splitted_rar_ae.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_pax_truncated.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_set_format.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_splitted_rar_aa.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_splitted_rar_ab.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_splitted_rar_ac.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_splitted_rar_ad.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_truncated.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_truncated_filter.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_read_uu.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_sparse_basic.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_aa.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ab.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_splitted_rar_seek_support_ac.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_tar_filenames.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_ustar_filenames.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress_bzip2.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress_gzip.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress_lzip.c#3 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress_lzma.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress_program.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_compress_xz.c#4 delete .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_appledouble.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_appledouble.cpio.gz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_hfs_compression.tgz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_mac_metadata.tar.gz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_no_hfs_compression.tgz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_disk_sparse.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_b64encode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_bzip2.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_compress.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_gzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_gzip_timestamp.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_lrzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_lzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_lzma.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_program.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_uuencode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_filter_xz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_7zip.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_7zip_empty.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_7zip_large.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_ar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_cpio.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_cpio_newc.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_cpio_odc.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_gnutar.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_iso9660.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_iso9660_boot.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_iso9660_empty.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_iso9660_filename.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_iso9660_zisofs.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree_absolute_path.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree_classic.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree_classic_indent.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree_fflags.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree_no_separator.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_mtree_quoted_filename.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_pax.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_tar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_tar_empty.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_tar_sparse.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_tar_ustar.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_tar_v7tar.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_xar.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_xar_empty.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_zip.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_zip_empty.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_format_zip_no_compression.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_open_memory.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/libarchive/test/test_write_zip_set_compression_store.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/bsdtar.1#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/bsdtar.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/bsdtar.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/cmdline.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/creation_set.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/read.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/subst.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/main.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_copy.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.Z.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.bz2.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.grz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.gz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.lrz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.lz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.lzma.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.lzo.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract.tar.xz.uu#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_Z.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_bz2.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_grz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_gz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_lrz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_lz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_lzma.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_lzo.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_extract_tar_xz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_a.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_b64encode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_grzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_j.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_lrzip.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_lzma.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_lzop.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_newer_than.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_older_than.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_r.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_uuencode.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_xz.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_option_z.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/test/test_stdio.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/util.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/tar/write.c#6 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/test_utils/test_utils.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libarchive/test_utils/test_utils.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/__config#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/algorithm#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/array#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/atomic#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/cmath#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/functional#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/future#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/istream#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/iterator#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/limits#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/locale#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/memory#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/ostream#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/random#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/regex#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/string#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/type_traits#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/include/vector#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/chrono.cpp#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/debug.cpp#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/exception.cpp#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/future.cpp#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/hash.cpp#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/locale.cpp#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/string.cpp#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc++/src/thread.cpp#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc-vis/unvis.3#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc-vis/unvis.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc-vis/vis.3#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc-vis/vis.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libc-vis/vis.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libcxxrt/exception.cc#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libstdc++/libsupc++/unwind-cxx.h#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/LICENSE#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/Makefile.am#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/README#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/aclocal.m4#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config.h.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config/config.guess#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config/config.sub#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config/depcomp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config/install-sh#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config/ltmain.sh#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/config/missing#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/configure#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/configure.ac#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/doxygen.cfg#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/annotated.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/bc_s.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/classes.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/closed.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/doxygen.css#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/doxygen.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/files.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x62.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x63.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x64.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x65.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x66.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x68.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x69.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x6b.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x6c.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x6d.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x6e.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x6f.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x70.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x71.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x72.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x73.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x74.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x75.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x76.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_0x77.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x62.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x63.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x64.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x65.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x66.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x68.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x69.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x6b.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x6c.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x6d.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x6e.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x6f.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x70.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x71.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x72.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x73.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x74.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x75.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x76.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/functions_vars_0x77.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/globals.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/globals_defs.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/globals_enum.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/globals_eval.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/globals_func.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/globals_type.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__basic.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__emitter.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__events.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__export.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__nodes.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__parser.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__styles.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__tokens.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/group__version.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/index.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/modules.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/nav_f.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/nav_h.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/open.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__alias__data__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__document__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__emitter__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__event__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__mark__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__node__pair__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__node__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__parser__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__simple__key__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__tag__directive__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__token__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/structyaml__version__directive__s.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/tab_a.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/tab_b.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/tab_h.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/tab_s.png#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/tabs.css#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/doc/html/yaml_8h.html#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/include/Makefile.am#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/include/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/include/yaml.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/Makefile.am#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/api.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/dumper.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/emitter.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/loader.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/parser.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/reader.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/scanner.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/writer.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/src/yaml_private.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/Makefile.am#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/example-deconstructor-alt.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/example-deconstructor.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/example-reformatter-alt.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/example-reformatter.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/run-dumper.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/run-emitter.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/run-loader.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/run-parser.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/run-scanner.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/test-reader.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/tests/test-version.c#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/Makefile.am#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/Makefile.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/config.h#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/example_deconstructor.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/example_deconstructor_alt.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/example_reformatter.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/example_reformatter_alt.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/libyaml.dsw#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/run_dumper.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/run_emitter.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/run_loader.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/run_parser.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/run_scanner.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/test_reader.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/test_version.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/yaml.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vc6/yamldll.dsp#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/example_deconstructor.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/example_deconstructor_alt.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/example_reformatter.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/example_reformatter_alt.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/libyaml.sln#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/run_dumper.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/run_emitter.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/run_loader.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/run_parser.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/run_scanner.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/test_reader.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/test_version.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/yaml.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2003/yamldll.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/example_deconstructor.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/example_deconstructor_alt.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/example_reformatter.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/example_reformatter_alt.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/libyaml.sln#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/run_dumper.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/run_emitter.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/run_loader.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/run_parser.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/run_scanner.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/test_reader.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/test_version.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/yaml.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/win32/vs2008/yamldll.vcproj#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/libyaml/yaml-0.1.pc.in#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/lib/MC/MCParser/AsmParser.cpp#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/lib/Target/X86/X86InstrCompiler.td#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/lib/Target/X86/X86SelectionDAGInfo.cpp#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticFrontendKinds.td#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/tools/clang/lib/Driver/Tools.cpp#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/tools/clang/lib/Driver/Tools.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/llvm/tools/clang/lib/FrontendTool/ExecuteCompilerInvocation.cpp#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/nvi/ex/ex_txt.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/nvi/vi/v_txt.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/openbsm/bin/auditdistd/sender.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/openbsm/bin/auditdistd/token.l#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/openbsm/etc/audit_event#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/openpam/doc/man/openpam_straddch.3#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/openpam/lib/openpam_readline.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/openpam/lib/openpam_readword.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/opie/opiekey.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/sendmail/src/milter.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/africa#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/antarctica#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/asia#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/australasia#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/europe#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/northamerica#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/southamerica#5 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/tzdata/zone.tab#4 integrate .. //depot/projects/ctsrd/beribsd/src/contrib/unvis/Makefile#1 branch .. //depot/projects/ctsrd/beribsd/src/contrib/unvis/unvis.1#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Apr 3 19:14:48 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 929E74A6; Wed, 3 Apr 2013 19:14:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 525204A3; Wed, 3 Apr 2013 19:14:48 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) by mx1.freebsd.org (Postfix) with ESMTP id 3263F927; Wed, 3 Apr 2013 19:14:48 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 246FBB9A3; Wed, 3 Apr 2013 15:14:47 -0400 (EDT) From: John Baldwin To: Brooks Davis Subject: Re: PERFORCE change 227289 for review Date: Wed, 3 Apr 2013 15:12:44 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; ) References: <201304012009.r31K9NA6027721@skunkworks.freebsd.org> In-Reply-To: <201304012009.r31K9NA6027721@skunkworks.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201304031512.44463.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Wed, 03 Apr 2013 15:14:47 -0400 (EDT) Cc: Perforce Change Reviews X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 19:14:48 -0000 On Monday, April 01, 2013 4:09:23 pm Brooks Davis wrote: > http://p4web.freebsd.org/@@227289?ac=10 > > Change 227289 by brooks@brooks_zenith on 2013/04/01 20:08:35 > > Record the interrupt-parent of devices that have one in > struct device. Use this to improve reporting of interrupt-parents > in two ways: > > Add an indication of the interrupt-parent when printing the > child's resources: > > altera_jtag_uart0: mem 0x900000007f000000-0x900000007f00003f irq 0 (beripic0) on simplebus0 > > Extend struct u_device and the hw.bus.devices sysctl used > by libdevinfo to include the device parent. This is done > in a fully foward and backward compatible manner. The > kernel can now return a partial structure when an old > libdevinfo requests a u_device that is shorter than the > current version. Each new field or set of fields in > u_device is indicated by a bit in the dv_fields entry. > > Use this new functionality to add a -i option to devinfo > that shows the device tree by interrupt-parent rather than > bus. Resources described as "Interrupt" are always shown > in -i mode Hmm, is this really generically useful? I would rather think that you might want to export more information about interrupt sources that maps IRQ cookies to (pic, pin) tuples or the like. This seems like a very platform-specific thing to be putting into 'struct device'. -- John Baldwin From owner-p4-projects@FreeBSD.ORG Wed Apr 3 19:50:13 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B075F3D; Wed, 3 Apr 2013 19:50:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 496C4F3A; Wed, 3 Apr 2013 19:50:13 +0000 (UTC) (envelope-from brooks@lor.one-eyed-alien.net) Received: from lor.one-eyed-alien.net (lor.one-eyed-alien.net [69.66.77.232]) by mx1.freebsd.org (Postfix) with ESMTP id 97A60AC1; Wed, 3 Apr 2013 19:50:12 +0000 (UTC) Received: from lor.one-eyed-alien.net (localhost [127.0.0.1]) by lor.one-eyed-alien.net (8.14.5/8.14.5) with ESMTP id r33JoHut098794; Wed, 3 Apr 2013 14:50:17 -0500 (CDT) (envelope-from brooks@lor.one-eyed-alien.net) Received: (from brooks@localhost) by lor.one-eyed-alien.net (8.14.5/8.14.5/Submit) id r33JoHtf098793; Wed, 3 Apr 2013 14:50:17 -0500 (CDT) (envelope-from brooks) Date: Wed, 3 Apr 2013 14:50:17 -0500 From: Brooks Davis To: John Baldwin Subject: Re: PERFORCE change 227289 for review Message-ID: <20130403195017.GB97453@lor.one-eyed-alien.net> References: <201304012009.r31K9NA6027721@skunkworks.freebsd.org> <201304031512.44463.jhb@freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="xXmbgvnjoT4axfJE" Content-Disposition: inline In-Reply-To: <201304031512.44463.jhb@freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: Perforce Change Reviews X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 19:50:13 -0000 --xXmbgvnjoT4axfJE Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 03, 2013 at 03:12:44PM -0400, John Baldwin wrote: > On Monday, April 01, 2013 4:09:23 pm Brooks Davis wrote: > > http://p4web.freebsd.org/@@227289?ac=3D10 > >=20 > > Change 227289 by brooks@brooks_zenith on 2013/04/01 20:08:35 > >=20 > > Record the interrupt-parent of devices that have one in > > struct device. Use this to improve reporting of interrupt-parents > > in two ways: > > =09 > > Add an indication of the interrupt-parent when printing the > > child's resources: > > =09 > > altera_jtag_uart0: mem 0x900000007f000000-0x9000000= 07f00003f irq 0 (beripic0) on simplebus0 > > =09 > > Extend struct u_device and the hw.bus.devices sysctl used > > by libdevinfo to include the device parent. This is done > > in a fully foward and backward compatible manner. The > > kernel can now return a partial structure when an old > > libdevinfo requests a u_device that is shorter than the > > current version. Each new field or set of fields in > > u_device is indicated by a bit in the dv_fields entry. > > =09 > > Use this new functionality to add a -i option to devinfo > > that shows the device tree by interrupt-parent rather than > > bus. Resources described as "Interrupt" are always shown > > in -i mode >=20 > Hmm, is this really generically useful? I would rather think that you mi= ght > want to export more information about interrupt sources that maps IRQ coo= kies > to (pic, pin) tuples or the like. This seems like a very platform-specif= ic > thing to be putting into 'struct device'. My thought was that interrupt parents are a fundamental concept for systems described by FDT so it was fairly generic, if not universal. It would definitely be better if information about the mapping was available, but I've not really thought of a good way to do that (at least in part because even after writing a PIC driver I still don't feel like I've got my head around the whole of our interrupt code.) As background, I've taken a non-standard approach with our pic in that it attaches to the bus and allocates interrupts from its parent. It currently installs an event handler for each child interrupt that includes a filter and handler. The filter that increments the per-source counter and calls the child's filter if there is one (it will soon do it's own filtering based on the PIC's interrupt present bit, but I've not implemented that quite yet). The event handler just calls the child's event handler. The reason for this approach vs the traditional approach of teaching nexus about each PIC is that this felt like a better abstraction for both how FDT describes interrupts and the way our PIC works. As a side benefit beri_pic knows nothing about MIPS (except in the interrupt counter code) which is relevant in that you could hook it up to a soft-core arm CPU fairly easily. -- Brooks --xXmbgvnjoT4axfJE Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iD8DBQFRXIf4XY6L6fI4GtQRAie+AKDdlfXCkwOxj1tPyj4gYv2uFZEQfwCfeHLC 71Mwj8hns/nVZb0KiTHxeKI= =avXI -----END PGP SIGNATURE----- --xXmbgvnjoT4axfJE-- From owner-p4-projects@FreeBSD.ORG Wed Apr 3 21:37:49 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A298EA7F; Wed, 3 Apr 2013 21:37:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 65CF8A7D for ; Wed, 3 Apr 2013 21:37:49 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 566E2113 for ; Wed, 3 Apr 2013 21:37:49 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r33LbnZG045960 for ; Wed, 3 Apr 2013 21:37:49 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r33Lbnfu045957 for perforce@freebsd.org; Wed, 3 Apr 2013 21:37:49 GMT (envelope-from brooks@freebsd.org) Date: Wed, 3 Apr 2013 21:37:49 GMT Message-Id: <201304032137.r33Lbnfu045957@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 227360 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Apr 2013 21:37:49 -0000 http://p4web.freebsd.org/@@227360?ac=10 Change 227360 by brooks@brooks_zenith on 2013/04/03 21:37:03 Forcably reintegrate Subversion revision 239677 which fixes an mdoc bug. Affected files ... .. //depot/projects/ctsrd/beribsd/src/share/man/man4/altera_avgen.4#4 integrate Differences ... ==== //depot/projects/ctsrd/beribsd/src/share/man/man4/altera_avgen.4#4 (text+ko) ==== @@ -79,7 +79,7 @@ .It maddr base physical address of the memory region to export; must be aligned to .Li width -.Ot msize +.It msize length of the memory region export; must be aligned to .Li width .It width From owner-p4-projects@FreeBSD.ORG Thu Apr 4 19:26:49 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D13D95BB; Thu, 4 Apr 2013 19:26:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 92BC55B9 for ; Thu, 4 Apr 2013 19:26:49 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6894C959 for ; Thu, 4 Apr 2013 19:26:49 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r34JQnBQ085681 for ; Thu, 4 Apr 2013 19:26:49 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r34JQmpU085678 for perforce@freebsd.org; Thu, 4 Apr 2013 19:26:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 4 Apr 2013 19:26:48 GMT Message-Id: <201304041926.r34JQmpU085678@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 227393 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Apr 2013 19:26:50 -0000 http://p4web.freebsd.org/@@227393?ac=10 Change 227393 by rwatson@rwatson_zenith_cl_cam_ac_uk on 2013/04/04 19:25:54 Initialise the /boot/loader heap (allowing FICL to be less FICL), and implement the architecture-specific switch used by the loader->kernel metadata code. One remaining function to implement here, however. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/Makefile#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/arch.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/linker.cfg#3 edit .. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#3 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/Makefile#2 (text+ko) ==== @@ -1,3 +1,5 @@ # $FreeBSD$ +SUBDIR= beri + .include ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/Makefile#4 (text+ko) ==== @@ -8,7 +8,7 @@ INSTALLFLAGS= -b # Architecture-specific loader code -SRCS= start.S main.c exec.c metadata.c vers.c +SRCS= start.S main.c exec.c metadata.c vers.c arch.c SRCS+= beri_console.c altera_jtag_uart.c beri_disk.c cfi.c LOADER_DISK_SUPPORT?= yes ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/linker.cfg#3 (text+ko) ==== @@ -49,6 +49,12 @@ __loader_base__ = 0x20000; __loader_base_vaddr__ = __mips64_xkphys_cached__ + __loader_base__; +/* + * Highest address the loader is allowed to use below the kernel. + */ +__loader_end__ = 0x100000; +__loader_end_vaddr__ = __mips64_xkphys_cached__ + __loader_end__; + OUTPUT_FORMAT("elf64-tradbigmips"); OUTPUT_ARCH(mips) ENTRY(start) @@ -73,4 +79,8 @@ __boot_loader_len__ = . - __loader_base_vaddr__; __bss_start = ADDR(.bss); __bss_end = ALIGN(__bss_start + SIZEOF(.bss), 0x8); + + __heap_base = .; + __heap_top = __loader_end_vaddr__; + __heap_len = __heap_top - __heap_base; } ==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/loader/main.c#3 (text+ko) ==== @@ -67,6 +67,9 @@ NULL }; +extern void *__heap_base; +extern void *__heap_top; + static int __elfN(exec)(struct preloaded_file *fp) { @@ -92,6 +95,8 @@ boot2_envv = envv; boot2_bootinfop = bootinfop; + setheap((void *)&__heap_base, (void *)&__heap_top); + /* * Probe for a console. */ From owner-p4-projects@FreeBSD.ORG Fri Apr 5 14:52:18 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9739C6A; Fri, 5 Apr 2013 14:52:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 9B311C68 for ; Fri, 5 Apr 2013 14:52:17 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 7EE21B06 for ; Fri, 5 Apr 2013 14:52:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r35EqHLg011909 for ; Fri, 5 Apr 2013 14:52:17 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r35EqH0M011906 for perforce@freebsd.org; Fri, 5 Apr 2013 14:52:17 GMT (envelope-from bz@freebsd.org) Date: Fri, 5 Apr 2013 14:52:17 GMT Message-Id: <201304051452.r35EqH0M011906@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" Subject: PERFORCE change 227440 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2013 14:52:18 -0000 http://p4web.freebsd.org/@@227440?ac=10 Change 227440 by bz@bz_zenith on 2013/04/05 14:51:38 Convert the structures to C99 style initialisation, which makes it a lot easier to check that all of them are set and to generate a derived template from them. MFP4 after: 1 week Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/bus_space_fdt.c#4 edit .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/bus_space_generic.c#9 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/bus_space_fdt.c#4 (text+ko) ==== @@ -94,109 +94,109 @@ static struct bus_space fdt_space = { /* cookie */ - (void *) 0, + .bs_cookie = (void *) 0, /* mapping/unmapping */ - fdt_bs_map, - generic_bs_unmap, - generic_bs_subregion, + .bs_map = fdt_bs_map, + .bs_unmap = generic_bs_unmap, + .bs_subregion = generic_bs_subregion, /* allocation/deallocation */ - generic_bs_alloc, - generic_bs_free, + .bs_alloc = generic_bs_alloc, + .bs_free = generic_bs_free, /* barrier */ - generic_bs_barrier, + .bs_barrier = generic_bs_barrier, /* read (single) */ - generic_bs_r_1, - generic_bs_r_2, - generic_bs_r_4, - generic_bs_r_8, + .bs_r_1 = generic_bs_r_1, + .bs_r_2 = generic_bs_r_2, + .bs_r_4 = generic_bs_r_4, + .bs_r_8 = generic_bs_r_8, /* read multiple */ - generic_bs_rm_1, - generic_bs_rm_2, - generic_bs_rm_4, - generic_bs_rm_8, + .bs_rm_1 = generic_bs_rm_1, + .bs_rm_2 = generic_bs_rm_2, + .bs_rm_4 = generic_bs_rm_4, + .bs_rm_8 = generic_bs_rm_8, /* read region */ - generic_bs_rr_1, - generic_bs_rr_2, - generic_bs_rr_4, - generic_bs_rr_8, + .bs_rr_1 = generic_bs_rr_1, + .bs_rr_2 = generic_bs_rr_2, + .bs_rr_4 = generic_bs_rr_4, + .bs_rr_8 = generic_bs_rr_8, /* write (single) */ - generic_bs_w_1, - generic_bs_w_2, - generic_bs_w_4, - generic_bs_w_8, + .bs_w_1 = generic_bs_w_1, + .bs_w_2 = generic_bs_w_2, + .bs_w_4 = generic_bs_w_4, + .bs_w_8 = generic_bs_w_8, /* write multiple */ - generic_bs_wm_1, - generic_bs_wm_2, - generic_bs_wm_4, - generic_bs_wm_8, + .bs_wm_1 = generic_bs_wm_1, + .bs_wm_2 = generic_bs_wm_2, + .bs_wm_4 = generic_bs_wm_4, + .bs_wm_8 = generic_bs_wm_8, /* write region */ - generic_bs_wr_1, - generic_bs_wr_2, - generic_bs_wr_4, - generic_bs_wr_8, + .bs_wr_1 = generic_bs_wr_1, + .bs_wr_2 = generic_bs_wr_2, + .bs_wr_4 = generic_bs_wr_4, + .bs_wr_8 = generic_bs_wr_8, /* set multiple */ - generic_bs_sm_1, - generic_bs_sm_2, - generic_bs_sm_4, - generic_bs_sm_8, + .bs_sm_1 = generic_bs_sm_1, + .bs_sm_2 = generic_bs_sm_2, + .bs_sm_4 = generic_bs_sm_4, + .bs_sm_8 = generic_bs_sm_8, /* set region */ - generic_bs_sr_1, - generic_bs_sr_2, - generic_bs_sr_4, - generic_bs_sr_8, + .bs_sr_1 = generic_bs_sr_1, + .bs_sr_2 = generic_bs_sr_2, + .bs_sr_4 = generic_bs_sr_4, + .bs_sr_8 = generic_bs_sr_8, /* copy */ - generic_bs_c_1, - generic_bs_c_2, - generic_bs_c_4, - generic_bs_c_8, + .bs_c_1 = generic_bs_c_1, + .bs_c_2 = generic_bs_c_2, + .bs_c_4 = generic_bs_c_4, + .bs_c_8 = generic_bs_c_8, /* read (single) stream */ - generic_bs_r_1, - generic_bs_r_2, - generic_bs_r_4, - generic_bs_r_8, + .bs_r_1_s = generic_bs_r_1, + .bs_r_2_s = generic_bs_r_2, + .bs_r_4_s = generic_bs_r_4, + .bs_r_8_s = generic_bs_r_8, /* read multiple stream */ - generic_bs_rm_1, - generic_bs_rm_2, - generic_bs_rm_4, - generic_bs_rm_8, + .bs_rm_1_s = generic_bs_rm_1, + .bs_rm_2_s = generic_bs_rm_2, + .bs_rm_4_s = generic_bs_rm_4, + .bs_rm_8_s = generic_bs_rm_8, /* read region stream */ - generic_bs_rr_1, - generic_bs_rr_2, - generic_bs_rr_4, - generic_bs_rr_8, + .bs_rr_1_s = generic_bs_rr_1, + .bs_rr_2_s = generic_bs_rr_2, + .bs_rr_4_s = generic_bs_rr_4, + .bs_rr_8_s = generic_bs_rr_8, /* write (single) stream */ - generic_bs_w_1, - generic_bs_w_2, - generic_bs_w_4, - generic_bs_w_8, + .bs_w_1_s = generic_bs_w_1, + .bs_w_2_s = generic_bs_w_2, + .bs_w_4_s = generic_bs_w_4, + .bs_w_8_s = generic_bs_w_8, /* write multiple stream */ - generic_bs_wm_1, - generic_bs_wm_2, - generic_bs_wm_4, - generic_bs_wm_8, + .bs_wm_1_s = generic_bs_wm_1, + .bs_wm_2_s = generic_bs_wm_2, + .bs_wm_4_s = generic_bs_wm_4, + .bs_wm_8_s = generic_bs_wm_8, /* write region stream */ - generic_bs_wr_1, - generic_bs_wr_2, - generic_bs_wr_4, - generic_bs_wr_8, + .bs_wr_1_s = generic_bs_wr_1, + .bs_wr_2_s = generic_bs_wr_2, + .bs_wr_4_s = generic_bs_wr_4, + .bs_wr_8_s = generic_bs_wr_8, }; /* generic bus_space tag */ ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/bus_space_generic.c#9 (text+ko) ==== @@ -91,109 +91,109 @@ static struct bus_space generic_space = { /* cookie */ - (void *) 0, + .bs_cookie = (void *) 0, /* mapping/unmapping */ - generic_bs_map, - generic_bs_unmap, - generic_bs_subregion, + .bs_map = generic_bs_map, + .bs_unmap = generic_bs_unmap, + .bs_subregion = generic_bs_subregion, /* allocation/deallocation */ - generic_bs_alloc, - generic_bs_free, + .bs_alloc = generic_bs_alloc, + .bs_free = generic_bs_free, /* barrier */ - generic_bs_barrier, + .bs_barrier = generic_bs_barrier, /* read (single) */ - generic_bs_r_1, - generic_bs_r_2, - generic_bs_r_4, - generic_bs_r_8, + .bs_r_1 = generic_bs_r_1, + .bs_r_2 = generic_bs_r_2, + .bs_r_4 = generic_bs_r_4, + .bs_r_8 = generic_bs_r_8, /* read multiple */ - generic_bs_rm_1, - generic_bs_rm_2, - generic_bs_rm_4, - generic_bs_rm_8, + .bs_rm_1 = generic_bs_rm_1, + .bs_rm_2 = generic_bs_rm_2, + .bs_rm_4 = generic_bs_rm_4, + .bs_rm_8 = generic_bs_rm_8, /* read region */ - generic_bs_rr_1, - generic_bs_rr_2, - generic_bs_rr_4, - generic_bs_rr_8, + .bs_rr_1 = generic_bs_rr_1, + .bs_rr_2 = generic_bs_rr_2, + .bs_rr_4 = generic_bs_rr_4, + .bs_rr_8 = generic_bs_rr_8, /* write (single) */ - generic_bs_w_1, - generic_bs_w_2, - generic_bs_w_4, - generic_bs_w_8, + .bs_w_1 = generic_bs_w_1, + .bs_w_2 = generic_bs_w_2, + .bs_w_4 = generic_bs_w_4, + .bs_w_8 = generic_bs_w_8, /* write multiple */ - generic_bs_wm_1, - generic_bs_wm_2, - generic_bs_wm_4, - generic_bs_wm_8, + .bs_wm_1 = generic_bs_wm_1, + .bs_wm_2 = generic_bs_wm_2, + .bs_wm_4 = generic_bs_wm_4, + .bs_wm_8 = generic_bs_wm_8, /* write region */ - generic_bs_wr_1, - generic_bs_wr_2, - generic_bs_wr_4, - generic_bs_wr_8, + .bs_wr_1 = generic_bs_wr_1, + .bs_wr_2 = generic_bs_wr_2, + .bs_wr_4 = generic_bs_wr_4, + .bs_wr_8 = generic_bs_wr_8, /* set multiple */ - generic_bs_sm_1, - generic_bs_sm_2, - generic_bs_sm_4, - generic_bs_sm_8, + .bs_sm_1 = generic_bs_sm_1, + .bs_sm_2 = generic_bs_sm_2, + .bs_sm_4 = generic_bs_sm_4, + .bs_sm_8 = generic_bs_sm_8, /* set region */ - generic_bs_sr_1, - generic_bs_sr_2, - generic_bs_sr_4, - generic_bs_sr_8, + .bs_sr_1 = generic_bs_sr_1, + .bs_sr_2 = generic_bs_sr_2, + .bs_sr_4 = generic_bs_sr_4, + .bs_sr_8 = generic_bs_sr_8, /* copy */ - generic_bs_c_1, - generic_bs_c_2, - generic_bs_c_4, - generic_bs_c_8, + .bs_c_1 = generic_bs_c_1, + .bs_c_2 = generic_bs_c_2, + .bs_c_4 = generic_bs_c_4, + .bs_c_8 = generic_bs_c_8, /* read (single) stream */ - generic_bs_r_1, - generic_bs_r_2, - generic_bs_r_4, - generic_bs_r_8, + .bs_r_1_s = generic_bs_r_1, + .bs_r_2_s = generic_bs_r_2, + .bs_r_4_s = generic_bs_r_4, + .bs_r_8_s = generic_bs_r_8, /* read multiple stream */ - generic_bs_rm_1, - generic_bs_rm_2, - generic_bs_rm_4, - generic_bs_rm_8, + .bs_rm_1_s = generic_bs_rm_1, + .bs_rm_2_s = generic_bs_rm_2, + .bs_rm_4_s = generic_bs_rm_4, + .bs_rm_8_s = generic_bs_rm_8, /* read region stream */ - generic_bs_rr_1, - generic_bs_rr_2, - generic_bs_rr_4, - generic_bs_rr_8, + .bs_rr_1_s = generic_bs_rr_1, + .bs_rr_2_s = generic_bs_rr_2, + .bs_rr_4_s = generic_bs_rr_4, + .bs_rr_8_s = generic_bs_rr_8, /* write (single) stream */ - generic_bs_w_1, - generic_bs_w_2, - generic_bs_w_4, - generic_bs_w_8, + .bs_w_1_s = generic_bs_w_1, + .bs_w_2_s = generic_bs_w_2, + .bs_w_4_s = generic_bs_w_4, + .bs_w_8_s = generic_bs_w_8, /* write multiple stream */ - generic_bs_wm_1, - generic_bs_wm_2, - generic_bs_wm_4, - generic_bs_wm_8, + .bs_wm_1_s = generic_bs_wm_1, + .bs_wm_2_s = generic_bs_wm_2, + .bs_wm_4_s = generic_bs_wm_4, + .bs_wm_8_s = generic_bs_wm_8, /* write region stream */ - generic_bs_wr_1, - generic_bs_wr_2, - generic_bs_wr_4, - generic_bs_wr_8, + .bs_wr_1_s = generic_bs_wr_1, + .bs_wr_2_s = generic_bs_wr_2, + .bs_wr_4_s = generic_bs_wr_4, + .bs_wr_8_s = generic_bs_wr_8, }; /* Ultra-gross kludge */ From owner-p4-projects@FreeBSD.ORG Fri Apr 5 15:11:39 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C126238; Fri, 5 Apr 2013 15:11:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0EEEA236 for ; Fri, 5 Apr 2013 15:11:39 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id DC63ED49 for ; Fri, 5 Apr 2013 15:11:38 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r35FBc9P013697 for ; Fri, 5 Apr 2013 15:11:38 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r35FBcsa013694 for perforce@freebsd.org; Fri, 5 Apr 2013 15:11:38 GMT (envelope-from bz@freebsd.org) Date: Fri, 5 Apr 2013 15:11:38 GMT Message-Id: <201304051511.r35FBcsa013694@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" Subject: PERFORCE change 227441 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2013 15:11:39 -0000 http://p4web.freebsd.org/@@227441?ac=10 Change 227441 by bz@bz_zenith on 2013/04/05 15:10:56 Bottom half of the implementation to support ISP1761 on the DE4. This allows us to detect the Host Controller and Root Hub but nothing further, thus disable the FDT attachment for the moment and do not include any USB related options into the kernel config. We use a private bus_space template as we do need to byte swap the register values, which is not the same as USB_EHCI_BIG_ENDIAN_DESC. We force the chip to 32bit access only given we hardwire the A1 line to 0. For the moment the OTG (DC, Peripheral) interrupt and special IO space can be optionally mapped should we decide we need it and want to have it all in the one file. The current assumption is that someone will need to implement the slightly Philips specific PTD handling, but it could be that this is not the only thing preventing us from discovering the Internal Hub (with TT support) and powering up individual ports and detecting devices. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#21 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/usb/controller/ehci_isp1761_fdt.c#1 add .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#32 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/boot/fdt/dts/beripad-de4.dts#21 (text+ko) ==== @@ -180,6 +180,9 @@ 0x7f005520 0x20 0x7f005400 0x8 0x7f005420 0x20>; + /* RX, TX */ + interrupts = <11 12>; + interrupt-parent = <&beripic>; }; touchscreen@70400000 { @@ -189,6 +192,17 @@ 0x70177000 0x2000>; }; +/* + usb@0x7f100000 { + compatible = "philips,isp1761"; + reg = <0x7f100000 0x40000 + 0x7f140000 0x4>; + / * IRQ 4 is DC, IRQ 5 is HC. * / + interrupts = <4 5>; + interrupt-parent = <&beripic>; + }; +*/ + avgen@0x7f009000 { compatible = "sri-cambridge,avgen"; reg = <0x7f009000 0x2>; @@ -212,5 +226,14 @@ sri-cambridge,fileio = "rw"; sri-cambridge,devname = "de4tempfan"; }; + + avgen@0x7f100000 { + compatible = "sri-cambridge,avgen"; + reg = <0x7f100000 0x40000>; + sri-cambridge,width = <4>; + sri-cambridge,fileio = "r"; + sri-cambridge,devname = "usbmem"; + }; + }; }; ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/files.beri#32 (text+ko) ==== @@ -16,6 +16,7 @@ dev/terasic/mtl/terasic_mtl_reg.c optional terasic_mtl dev/terasic/mtl/terasic_mtl_syscons.c optional terasic_mtl dev/terasic/mtl/terasic_mtl_text.c optional terasic_mtl +dev/usb/controller/ehci_isp1761_fdt.c optional ehci usb fdt mips/beri/beri_asm.S standard mips/beri/beri_machdep.c standard mips/beri/beri_mp.c optional smp