Date: Wed, 29 May 2002 19:32:59 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 12115 for review Message-ID: <200205300232.g4U2Wxj55021@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12115 Change 12115 by julian@julian_ref on 2002/05/29 19:32:13 MFC to 12114 Affected files ... ... //depot/projects/kse/sys/boot/common/loader.8#11 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/Makefile#7 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/locore.S#2 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/main.c#7 integrate ... //depot/projects/kse/sys/boot/sparc64/loader/metadata.c#4 integrate ... //depot/projects/kse/sys/cam/scsi/scsi_da.c#20 integrate ... //depot/projects/kse/sys/conf/files#34 integrate ... //depot/projects/kse/sys/conf/files.sparc64#16 integrate ... //depot/projects/kse/sys/dev/wi/if_wi.c#22 integrate ... //depot/projects/kse/sys/geom/geom_gpt.c#2 integrate ... //depot/projects/kse/sys/i386/conf/GENERIC#18 integrate ... //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#9 integrate ... //depot/projects/kse/sys/ia64/ia64/machdep.c#33 integrate ... //depot/projects/kse/sys/ia64/ia64/mca.c#2 integrate ... //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#14 integrate ... //depot/projects/kse/sys/ia64/include/mca.h#4 integrate ... //depot/projects/kse/sys/kern/kern_condvar.c#36 integrate ... //depot/projects/kse/sys/kern/kern_intr.c#23 integrate ... //depot/projects/kse/sys/kern/kern_sig.c#54 integrate ... //depot/projects/kse/sys/kern/kern_synch.c#64 integrate ... //depot/projects/kse/sys/kern/subr_trap.c#57 integrate ... //depot/projects/kse/sys/libkern/crc32.c#1 branch ... //depot/projects/kse/sys/modules/Makefile#27 integrate ... //depot/projects/kse/sys/net/zlib.h#4 integrate ... //depot/projects/kse/sys/netncp/ncp_sock.c#3 integrate ... //depot/projects/kse/sys/sparc64/conf/GENERIC#12 integrate ... //depot/projects/kse/sys/sparc64/include/intr_machdep.h#9 integrate ... //depot/projects/kse/sys/sparc64/include/metadata.h#3 integrate ... //depot/projects/kse/sys/sparc64/include/pmap.h#13 integrate ... //depot/projects/kse/sys/sparc64/include/pv.h#6 integrate ... //depot/projects/kse/sys/sparc64/include/tlb.h#11 integrate ... //depot/projects/kse/sys/sparc64/include/tsb.h#10 integrate ... //depot/projects/kse/sys/sparc64/include/tte.h#10 integrate ... //depot/projects/kse/sys/sparc64/sparc64/genassym.c#25 integrate ... //depot/projects/kse/sys/sparc64/sparc64/machdep.c#31 integrate ... //depot/projects/kse/sys/sparc64/sparc64/mp_machdep.c#8 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pmap.c#27 integrate ... //depot/projects/kse/sys/sparc64/sparc64/pv.c#13 integrate ... //depot/projects/kse/sys/sparc64/sparc64/trap.c#27 integrate ... //depot/projects/kse/sys/sparc64/sparc64/tsb.c#13 integrate ... //depot/projects/kse/sys/sparc64/sparc64/vm_machdep.c#23 integrate ... //depot/projects/kse/sys/sys/gpt.h#2 integrate ... //depot/projects/kse/sys/sys/param.h#20 integrate ... //depot/projects/kse/sys/sys/signalvar.h#13 integrate ... //depot/projects/kse/sys/sys/systm.h#24 integrate ... //depot/projects/kse/sys/vm/uma_dbg.c#3 integrate Differences ... ==== //depot/projects/kse/sys/boot/common/loader.8#11 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.41 2002/03/15 15:12:10 ru Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.42 2002/05/29 22:57:18 schweikh Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -54,7 +54,7 @@ The smaller one is a set of commands designed for direct use by the casual user, called "builtin commands" for historical reasons. -The main drive behind these commands is user-friendlyness. +The main drive behind these commands is user-friendliness. The bigger component is an .Tn ANS Forth compatible Forth interpreter based on ficl, by @@ -96,7 +96,7 @@ will be read for historical reasons. These files are processed through the .Ic include -command, which read all of them into memory before processing them, +command, which reads all of them into memory before processing them, making disk changes possible. .Pp At this point, if an @@ -323,7 +323,7 @@ .Ic autoboot will be automatically attempted after processing .Pa /boot/loader.rc , -though explict +though explicit .Ic autoboot Ns 's will be processed normally, defaulting to 10 seconds delay. .It Va boot_askname @@ -365,13 +365,13 @@ Define the number of lines on the screen, to be used by the pager. .It Va module_path Sets the list of directories which will be searched in for modules -named in a load command or implicitly required by a dependancy. +named in a load command or implicitly required by a dependency. The default value for this variable is .Dq Li /;/boot;/modules . .It Va num_ide_disks Sets the number of IDE disks as a work around for some problems in finding the root disk at boot. -This has been deprecated in favour of +This has been deprecated in favor of .Va root_disk_unit . .It Va prompt Value of @@ -517,7 +517,7 @@ .It \e\e will be replaced with a single \e . .It -In any other occurance, backslash will just be removed. +In any other occurrence, backslash will just be removed. .El .It Every string between non-escaped quotes or double-quotes will be treated @@ -527,7 +527,7 @@ .Li $VARIABLE or .Li ${VARIABLE} -with the value of the environemnt variable +with the value of the environment variable .Va VARIABLE . .It Passes multiple space-delimited arguments to the builtin command called. @@ -575,7 +575,7 @@ .Ef \&! This is particular annoying for programs that want or need to treat exceptions. -In this case, it is recommended the use of a proxy. +In this case, it is recommended to use a proxy. For example: .Dl : (boot) boot ; .Sh FICL ==== //depot/projects/kse/sys/boot/sparc64/loader/Makefile#7 (text+ko) ==== @@ -1,12 +1,15 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.7 2002/05/10 09:26:35 obrien Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.8 2002/05/28 23:09:59 jake Exp $ BASE= loader PROG= ${BASE} +STRIP= NEWVERSWHAT= "bootstrap loader" sparc64 BINDIR?= /boot INSTALLFLAGS= -b +NOFORTH= yes -CFLAGS= -mno-app-regs +# Architecture-specific loader code +SRCS= locore.S main.c metadata.c LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes @@ -34,8 +37,16 @@ CFLAGS+= -DLOADER_TFTP_SUPPORT .endif -# Architecture-specific loader code -SRCS= locore.S main.c metadata.c +.if !defined(NOFORTH) +# Enable BootForth +BOOT_FORTH= yes +CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/sparc64 +.if exists(${.OBJDIR}/../../ficl/libficl.a) +LIBFICL= ${.OBJDIR}/../../ficl/libficl.a +.else +LIBFICL= ${.CURDIR}/../../ficl/libficl.a +.endif +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common @@ -43,11 +54,14 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I${.CURDIR}/../../.. -I. -CLEANFILES+= ${PROG}.help +CLEANFILES+= vers.c vers.o ${BASE}.help CFLAGS+= -ffreestanding LDFLAGS= -nostdlib -static -LDADD= ${LIBSTAND} ${LIBOFW} + +# Openfirmware standalone support library +LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a +CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ # where to get libstand from #XXX need a better way to do this @@ -58,37 +72,36 @@ LIBSTAND= -lstand .endif .endif -LIBOFW= ${.OBJDIR}/../../ofw/libofw/libofw.a CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ + +LDADD= ${LIBSTAND} ${LIBOFW} + +vers.o: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version + sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} + ${CC} -c vers.c ${BASE}.help: help.common help.sparc64 cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} -beforeinstall: ${PROG}.help -.if exists(${DESTDIR}/boot/loader) - mv ${DESTDIR}/boot/loader ${DESTDIR}/boot/loader.old -.endif -#.if exists(${.OBJDIR}/loader.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -#.else -# ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ -# ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -#.endif +.PATH: ${.CURDIR}/../../forth +FILES= ${BASE}.help loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults + .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults # There are no things relevant to all boot parts of FreeBSD/sparc64 yet. #.include <${.CURDIR}/../Makefile.inc> .include <bsd.prog.mk> + +.if exists(${.CURDIR}/../../../sparc64/include) +beforedepend ${OBJS}: machine + +machine: + ln -sf ${.CURDIR}/../../../sparc64/include machine +.endif + +CLEANFILES+= machine ==== //depot/projects/kse/sys/boot/sparc64/loader/locore.S#2 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.5 2002/04/02 17:10:15 tmm Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/locore.S,v 1.6 2002/05/29 05:49:58 jake Exp $ */ #define LOCORE @@ -92,7 +92,6 @@ ENTRY(itlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, PAGE_SHIFT, %o0 mov AA_IMMU_TAR, %o3 stxa %o0, [%o3] ASI_IMMU stxa %o1, [%g0] ASI_ITLB_DATA_IN_REG @@ -103,7 +102,6 @@ ENTRY(dtlb_enter) rdpr %pstate, %o4 wrpr %o4, PSTATE_IE, %pstate - sllx %o0, PAGE_SHIFT, %o0 mov AA_DMMU_TAR, %o3 stxa %o0, [%o3] ASI_DMMU stxa %o1, [%g0] ASI_DTLB_DATA_IN_REG ==== //depot/projects/kse/sys/boot/sparc64/loader/main.c#7 (text+ko) ==== @@ -6,7 +6,7 @@ * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. * - * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.10 2002/05/16 21:21:59 trhodes Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/main.c,v 1.12 2002/05/29 19:38:49 jake Exp $ */ /* * FreeBSD/sparc64 kernel loader - machine dependent part @@ -23,6 +23,7 @@ #include <sys/param.h> #include <sys/linker.h> #include <sys/pcpu.h> +#include <sys/queue.h> #include <machine/asi.h> #include <machine/atomic.h> @@ -30,7 +31,6 @@ #include <machine/elf.h> #include <machine/lsu.h> #include <machine/metadata.h> -#include <machine/smp.h> #include <machine/tte.h> #include <machine/upa.h> @@ -63,8 +63,8 @@ char __progname[] = "FreeBSD/sparc64 loader"; -struct tte *dtlb_store; -struct tte *itlb_store; +struct tlb_entry *dtlb_store; +struct tlb_entry *itlb_store; int dtlb_slot; int itlb_slot; @@ -240,7 +240,7 @@ mmu_mapin(vm_offset_t va, vm_size_t len) { vm_offset_t pa, mva; - struct tte tte; + u_long data; if (va + len > curkva) curkva = va + len; @@ -275,13 +275,16 @@ panic("mmu_mapin: out of dtlb_slots"); if (itlb_slot >= itlb_slot_max) panic("mmu_mapin: out of itlb_slots"); - tte.tte_vpn = TV_VPN(va); - tte.tte_data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | + data = TD_V | TD_4M | TD_PA(pa) | TD_L | TD_CP | TD_CV | TD_P | TD_W; - dtlb_store[dtlb_slot++] = tte; - itlb_store[itlb_slot++] = tte; - dtlb_enter(tte.tte_vpn, tte.tte_data); - itlb_enter(tte.tte_vpn, tte.tte_data); + dtlb_store[dtlb_slot].te_pa = pa; + dtlb_store[dtlb_slot].te_va = va; + itlb_store[itlb_slot].te_pa = pa; + itlb_store[itlb_slot].te_va = va; + dtlb_slot++; + itlb_slot++; + dtlb_enter(va, data); + itlb_enter(va, data); pa = (vm_offset_t)-1; } len -= len > PAGE_SIZE_4M ? PAGE_SIZE_4M : len; ==== //depot/projects/kse/sys/boot/sparc64/loader/metadata.c#4 (text+ko) ==== @@ -24,22 +24,21 @@ * SUCH DAMAGE. * * from: FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.29 - * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.4 2002/04/02 17:10:15 tmm Exp $ + * $FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.5 2002/05/29 05:49:58 jake Exp $ */ #include <stand.h> #include <sys/param.h> #include <sys/reboot.h> #include <sys/linker.h> -#include <machine/tte.h> #include <machine/metadata.h> #include "bootstrap.h" #include "libofw.h" -extern struct tte *dtlb_store; -extern struct tte *itlb_store; +extern struct tlb_entry *dtlb_store; +extern struct tlb_entry *itlb_store; extern int dtlb_slot; extern int itlb_slot; @@ -318,10 +317,10 @@ file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); file_addmetadata(kfp, MODINFOMD_DTLB_SLOTS, sizeof dtlb_slots, &dtlb_slots); file_addmetadata(kfp, MODINFOMD_ITLB_SLOTS, sizeof itlb_slots, &itlb_slots); - file_addmetadata(kfp, MODINFOMD_DTLB, dtlb_slots * sizeof(struct tte), - dtlb_store); - file_addmetadata(kfp, MODINFOMD_ITLB, itlb_slots * sizeof(struct tte), - itlb_store); + file_addmetadata(kfp, MODINFOMD_DTLB, + dtlb_slots * sizeof(*dtlb_store), dtlb_store); + file_addmetadata(kfp, MODINFOMD_ITLB, + itlb_slots * sizeof(*itlb_store), itlb_store); *modulep = addr; size = md_copymodules(0); ==== //depot/projects/kse/sys/cam/scsi/scsi_da.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.103 2002/05/19 21:59:28 dillon Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.104 2002/05/29 20:25:59 dillon Exp $ */ #ifdef _KERNEL @@ -376,6 +376,13 @@ }, { /* + * Minolta Dimage E203 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "MINOLTA", "DiMAGE E203", "*"}, + /*quirks*/ DA_Q_NO_6_BYTE|DA_Q_NO_SYNC_CACHE + }, + { + /* * DIVA USB Mp3 Player. * Doesn't work correctly with 6 byte reads/writes. */ ==== //depot/projects/kse/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.638 2002/05/28 09:04:48 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.641 2002/05/29 21:58:56 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -966,6 +966,7 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard +libkern/crc32.c standard net/bpf.c standard net/bpf_filter.c optional bpf bpf.h standard \ ==== //depot/projects/kse/sys/conf/files.sparc64#16 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.19 2002/05/20 16:10:17 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.20 2002/05/29 06:08:45 jake Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -56,7 +56,6 @@ sparc64/sparc64/ofw_bus.c standard sparc64/sparc64/ofw_machdep.c standard sparc64/sparc64/pmap.c standard -sparc64/sparc64/pv.c standard sparc64/sparc64/rwindow.c standard sparc64/sparc64/sparcbus_if.m standard sparc64/sparc64/support.s standard ==== //depot/projects/kse/sys/dev/wi/if_wi.c#22 (text+ko) ==== @@ -103,7 +103,7 @@ #if !defined(lint) static const char rcsid[] = - "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.104 2002/04/29 06:55:46 imp Exp $"; + "$FreeBSD: src/sys/dev/wi/if_wi.c,v 1.105 2002/05/29 20:24:09 phk Exp $"; #endif static void wi_intr(void *); @@ -2042,61 +2042,6 @@ return; } -static u_int32_t crc32_tab[] = { - 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, - 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, - 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, - 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, - 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, - 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, - 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, - 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, - 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, - 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, - 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, - 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, - 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, - 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, - 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, - 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, - 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, - 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, - 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, - 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, - 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, - 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, - 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, - 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, - 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, - 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, - 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, - 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, - 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, - 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, - 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, - 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, - 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, - 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, - 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, - 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, - 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, - 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, - 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, - 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, - 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, - 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, - 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, - 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, - 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, - 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, - 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, - 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, - 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, - 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, - 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, - 0x2d02ef8dL -}; - #define RC4STATE 256 #define RC4KEYLEN 16 #define RC4SWAP(x,y) \ ==== //depot/projects/kse/sys/geom/geom_gpt.c#2 (text+ko) ==== @@ -28,13 +28,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_gpt.c,v 1.1 2002/05/28 09:04:48 marcel Exp $ + * $FreeBSD: src/sys/geom/geom_gpt.c,v 1.2 2002/05/29 20:24:09 phk Exp $ */ -/* - * CRC32 code derived from work by Gary S. Brown. - */ - #include <sys/param.h> #ifndef _KERNEL #include <stdio.h> @@ -72,67 +68,6 @@ struct gpt_ent *part[GPT_MAX_SLICES]; }; -static uint32_t crc32_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - -static uint32_t -crc32(const void *buf, size_t size) -{ - const uint8_t *p; - uint32_t crc; - - p = buf; - crc = ~0U; - - while (size--) - crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8); - - return crc ^ ~0U; -} - static int is_gpt_hdr(struct gpt_hdr *hdr) { ==== //depot/projects/kse/sys/i386/conf/GENERIC#18 (text+ko) ==== @@ -15,7 +15,7 @@ # device lines is also present in the NOTES configuration file. If you are # in doubt as to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.343 2002/05/22 19:00:48 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.344 2002/05/29 18:42:26 obrien Exp $ machine i386 cpu I486_CPU @@ -166,7 +166,7 @@ # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') -device em # Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'') +device em # Intel PRO/1000 adapter Gigabit Ethernet Card device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') ==== //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.84 2002/04/24 15:30:11 imp Exp $ + * $FreeBSD: src/sys/i386/pci/pci_cfgreg.c,v 1.85 2002/05/29 16:16:16 brooks Exp $ * */ @@ -408,6 +408,14 @@ (pci_get_slot(*childp) == device) && (pci_get_intpin(*childp) == matchpin)) { irq = pci_get_irq(*childp); + /* + * Some BIOS writers seem to want to ignore the spec and put + * 0 in the intline rather than 255 to indicate none. Once + * we've found one that matches, we break because there can + * be no others (which is why test looks a little odd). + */ + if (irq == 0) + irq = 255; if (irq != 255) PRVERB(("pci_cfgintr_search: linked (%x) to configured irq %d at %d:%d:%d\n", pe->pe_intpin[pin - 1].link, irq, ==== //depot/projects/kse/sys/ia64/ia64/machdep.c#33 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.104 2002/05/20 05:41:20 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.105 2002/05/29 05:19:07 marcel Exp $ */ #include "opt_compat.h" @@ -58,6 +58,7 @@ #include <sys/linker.h> #include <sys/random.h> #include <sys/cons.h> +#include <sys/uuid.h> #include <net/netisr.h> #include <vm/vm.h> #include <vm/vm_kern.h> ==== //depot/projects/kse/sys/ia64/ia64/mca.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/mca.c,v 1.2 2002/05/01 22:10:03 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mca.c,v 1.3 2002/05/29 05:19:07 marcel Exp $ */ #include <sys/param.h> @@ -33,6 +33,7 @@ #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/sysctl.h> +#include <sys/uuid.h> #include <vm/vm.h> #include <vm/vm_kern.h> #include <machine/mca.h> ==== //depot/projects/kse/sys/ia64/ia64/mp_machdep.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.38 2002/05/19 04:42:19 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/mp_machdep.c,v 1.39 2002/05/29 05:19:07 marcel Exp $ */ #include <sys/param.h> @@ -37,6 +37,7 @@ #include <sys/pcpu.h> #include <sys/smp.h> #include <sys/sysctl.h> +#include <sys/uuid.h> #include <vm/vm.h> #include <vm/pmap.h> ==== //depot/projects/kse/sys/ia64/include/mca.h#4 (text+ko) ==== @@ -23,19 +23,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/mca.h,v 1.4 2002/05/22 02:25:06 marcel Exp $ + * $FreeBSD: src/sys/ia64/include/mca.h,v 1.5 2002/05/29 05:19:07 marcel Exp $ */ #ifndef _MACHINE_MCA_H_ #define _MACHINE_MCA_H_ -struct mca_guid { - uint32_t data1; - uint16_t data2; - uint16_t data3; - uint8_t data4[8]; -}; - struct mca_record_header { uint64_t rh_seqnr; /* Record id. */ uint8_t rh_major; /* BCD (=02). */ @@ -55,11 +48,11 @@ #define MCA_RH_TIME_MON 5 #define MCA_RH_TIME_YEAR 6 #define MCA_RH_TIME_CENT 7 - struct mca_guid rh_platform; /* XXX not really a GUID. */ + struct uuid rh_platform; }; struct mca_section_header { - struct mca_guid sh_guid; + struct uuid sh_uuid; uint8_t sh_major; /* BCD (=02). */ uint8_t sh_minor; /* BCD (=00). */ uint8_t sh_flags; @@ -163,7 +156,7 @@ uint64_t mem_rspid; uint64_t mem_tgtid; uint64_t mem_busdata; - struct mca_guid mem_oem_id; /* XXX not really a GUID. */ + struct uuid mem_oem_id; uint16_t mem_oem_length; /* Size of OEM data. */ /* N bytes of OEM platform data. */ }; @@ -191,7 +184,7 @@ uint64_t pcibus_reqid; uint64_t pcibus_rspid; uint64_t pcibus_tgtid; - struct mca_guid pcibus_oem_id; /* XXX not really a GUID. */ + struct uuid pcibus_oem_id; uint16_t pcibus_oem_length; /* Size of OEM data. */ /* N bytes of OEM platform data. */ }; @@ -228,20 +221,20 @@ uint64_t pcidev_reg_data; }; -#define MCA_GUID_CPU \ - {0xe429faf1,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_MEMORY \ - {0xe429faf2,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_SEL \ - {0xe429faf3,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_PCI_BUS \ - {0xe429faf4,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_SMBIOS \ - {0xe429faf5,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_PCI_DEV \ - {0xe429faf6,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} -#define MCA_GUID_GENERIC \ - {0xe429faf7,0x3cb7,0x11d4,{0xbc,0xa7,0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_CPU \ + {0xe429faf1,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_MEMORY \ + {0xe429faf2,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_SEL \ + {0xe429faf3,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_PCI_BUS \ + {0xe429faf4,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_SMBIOS \ + {0xe429faf5,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_PCI_DEV \ + {0xe429faf6,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} +#define MCA_UUID_GENERIC \ + {0xe429faf7,0x3cb7,0x11d4,0xbc,0xa7,{0x00,0x80,0xc7,0x3c,0x88,0x81}} #ifdef _KERNEL ==== //depot/projects/kse/sys/kern/kern_condvar.c#36 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.20 2002/04/23 19:50:22 hsu Exp $ + * $FreeBSD: src/sys/kern/kern_condvar.c,v 1.21 2002/05/29 23:44:31 julian Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/kse/sys/kern/kern_intr.c#23 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_intr.c,v 1.74 2002/04/11 21:03:35 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_intr.c,v 1.75 2002/05/29 20:40:50 julian Exp $ * */ ==== //depot/projects/kse/sys/kern/kern_sig.c#54 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.165 2002/05/19 00:14:49 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.166 2002/05/29 23:44:31 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/kse/sys/kern/kern_synch.c#64 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.173 2002/05/23 04:14:18 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.174 2002/05/29 23:44:31 julian Exp $ */ #include "opt_ddb.h" ==== //depot/projects/kse/sys/kern/subr_trap.c#57 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/kern/subr_trap.c,v 1.215 2002/04/04 17:49:47 bde Exp $ + * $FreeBSD: src/sys/kern/subr_trap.c,v 1.216 2002/05/29 23:44:32 julian Exp $ */ #ifdef __i386__ ==== //depot/projects/kse/sys/modules/Makefile#27 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/Makefile,v 1.243 2002/05/19 03:59:06 marcel Exp $ +# $FreeBSD: src/sys/modules/Makefile,v 1.245 2002/05/29 05:09:51 marcel Exp $ .if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) _random= random @@ -102,7 +102,6 @@ usb \ uscanner \ uvscom \ - vinum \ vpo \ vr \ vx \ @@ -161,6 +160,7 @@ stg \ streams \ vesa \ + vinum \ wi \ xe .endif @@ -168,7 +168,6 @@ .if ${MACHINE_ARCH} == "ia64" SUBDIR+=aic \ arcnet \ - bktr \ ciss \ cm \ coff \ @@ -189,7 +188,8 @@ .if ${MACHINE} == "pc98" SUBDIR+=pmc \ - snc + snc \ + vinum .endif .if ${MACHINE_ARCH} == "alpha" @@ -200,7 +200,8 @@ lomac \ osf1 \ sound \ - sppp + sppp \ + vinum .endif .if defined(WANT_EXT2FS_MODULE) ==== //depot/projects/kse/sys/net/zlib.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/net/zlib.h,v 1.8 2002/05/16 21:28:17 trhodes Exp $ */ +/* $FreeBSD: src/sys/net/zlib.h,v 1.9 2002/05/29 20:24:09 phk Exp $ */ /* * This file is derived from zlib.h and zconf.h from the zlib-1.0.4 @@ -88,8 +88,10 @@ # define compress z_compress # define uncompress z_uncompress # define adler32 z_adler32 +#if 0 # define crc32 z_crc32 # define get_crc_table z_get_crc_table +#endif # define Byte z_Byte # define uInt z_uInt @@ -958,6 +960,7 @@ if (adler != original_adler) error(); */ +#if 0 extern uLong EXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); /* Update a running crc with the bytes buf[0..len-1] and return the updated @@ -973,6 +976,7 @@ } if (crc != original_crc) error(); */ +#endif /* various hacks, don't look :) */ ==== //depot/projects/kse/sys/netncp/ncp_sock.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.8 2002/05/20 05:41:07 tanimura Exp $ + * $FreeBSD: src/sys/netncp/ncp_sock.c,v 1.9 2002/05/29 23:44:32 julian Exp $ * * Low level socket routines */ @@ -249,7 +249,7 @@ PROC_UNLOCK(p); done_noproclock: if (error == ERESTART) { -/* printf("Signal: %x", CURSIG(p));*/ +/* printf("Signal: %x", cursig(p));*/ error = 0; } return (error); ==== //depot/projects/kse/sys/sparc64/conf/GENERIC#12 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.17 2002/05/12 18:10:48 jake Exp $ +# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.18 2002/05/29 19:22:17 jake Exp $ machine sparc64 cpu SUN4U @@ -207,4 +207,3 @@ #options BOOTP_NFSROOT >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205300232.g4U2Wxj55021>