CVS commit: src/sys/dev/usb
Module Name:src Committed By: sborrill Date: Thu Nov 25 14:16:55 UTC 2010 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.560 -r1.561 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.561 -r1.562 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.560 src/sys/dev/usb/usbdevs.h:1.561 --- src/sys/dev/usb/usbdevs.h:1.560 Thu Nov 4 09:19:14 2010 +++ src/sys/dev/usb/usbdevs.h Thu Nov 25 14:16:55 2010 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.560 2010/11/04 09:19:14 pooka Exp $ */ +/* $NetBSD: usbdevs.h,v 1.561 2010/11/25 14:16:55 sborrill Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.567 2010/11/04 09:18:39 pooka Exp + * NetBSD: usbdevs,v 1.568 2010/11/25 14:16:24 sborrill Exp */ /* @@ -423,6 +423,7 @@ #define USB_VENDOR_MSI 0x0db0 /* Micro Star */ #define USB_VENDOR_ELCON 0x0db7 /* ELCON Systemtechnik */ #define USB_VENDOR_SITECOMEU 0x0df6 /* Sitecom Europe */ +#define USB_VENDOR_AMIGO 0x0e0b /* Amigo Technology */ #define USB_VENDOR_HAWKING 0x0e66 /* Hawking */ #define USB_VENDOR_GMATE 0x0e7e /* G.Mate, Inc */ #define USB_VENDOR_MTK 0x0e8d /* MTK */ @@ -472,12 +473,14 @@ #define USB_VENDOR_BALTECH 0x13ad /* Baltech */ #define USB_VENDOR_CISCOLINKSYS 0x13b1 /* Cisco-Linksys */ #define USB_VENDOR_SHARK 0x13d2 /* Shark */ +#define USB_VENDOR_AZUREWAVE 0x13d3 /* AzureWave */ #define USB_VENDOR_PHISON 0x13fe /* Phison Electronics Corp. */ #define USB_VENDOR_NOVATEL2 0x1410 /* Novatel */ #define USB_VENDOR_OMNIVISION2 0x1415 /* OmniVision Technologies, Inc. */ #define USB_VENDOR_MERLIN 0x1416 /* Merlin */ #define USB_VENDOR_WISTRONNEWEB 0x1435 /* Wistron NeWeb */ #define USB_VENDOR_HUAWEI3COM 0x1472 /* Huawei-3Com */ +#define USB_VENDOR_ABOCOM2 0x1482 /* AboCom Systems */ #define USB_VENDOR_SILICOM 0x1485 /* Silicom */ #define USB_VENDOR_RALINK 0x1485 /* Ralink Technology */ #define USB_VENDOR_RALINK_2 0x148f /* Ralink Technology */ @@ -488,6 +491,8 @@ #define USB_VENDOR_OQO 0x1557 /* OQO */ #define USB_VENDOR_UMEDIA 0x157e /* U-MEDIA Communications */ #define USB_VENDOR_FIBERLINE 0x1582 /* Fiberline */ +#define USB_VENDOR_AMIT2 0x15c5 /* AMIT */ +#define USB_VENDOR_SPARKLAN 0x15a9 /* SparkLAN */ #define USB_VENDOR_SOHOWARE 0x15e8 /* SOHOware */ #define USB_VENDOR_UMAX 0x1606 /* UMAX Data Systems */ #define USB_VENDOR_INSIDEOUT 0x1608 /* Inside Out Networks */ @@ -500,6 +505,8 @@ #define USB_VENDOR_JABLOTRON 0x16d6 /* Jablotron */ #define USB_VENDOR_LINKSYS4 0x1737 /* Linksys */ #define USB_VENDOR_SENAO 0x1740 /* Senao */ +#define USB_VENDOR_ASUSTEK2 0x1761 /* ASUSTeK Computer */ +#define USB_VENDOR_SWEEX2 0x177f /* Sweex */ #define USB_VENDOR_METAGEEK 0x1781 /* MetaGeek */ #define USB_VENDOR_DISPLAYLINK 0x17e9 /* DisplayLink */ #define USB_VENDOR_AMIT 0x18c5 /* AMIT */ @@ -507,9 +514,13 @@ #define USB_VENDOR_LINKSYS3 0x1915 /* Linksys */ #define USB_VENDOR_MEINBERG 0x1938 /* Meinberg Funkuhren */ #define USB_VENDOR_QUALCOMMINC 0x19d2 /* Qualcomm, Incorporated */ +#define USB_VENDOR_QUANTA 0x1a32 /* Quanta */ #define USB_VENDOR_WINCHIPHEAD2 0x1a86 /* QinHeng Electronics */ +#define USB_VENDOR_PEGATRON 0x1d4d /* Pegatron */ +#define USB_VENDOR_AIRTIES 0x1eda /* AirTies */ #define USB_VENDOR_DLINK 0x2001 /* D-Link */ #define USB_VENDOR_PLANEX2 0x2019 /* Planex Communications */ +#define USB_VENDOR_ENCORE 0x203d /* Encore */ #define USB_VENDOR_DLINK3 0x2101 /* D-Link */ #define USB_VENDOR_ERICSSON 0x2282 /* Ericsson */ #define USB_VENDOR_MOTOROLA2 0x22b8 /* Motorola */ @@ -536,6 +547,7 @@ #define USB_VENDOR_SITECOM 0x6189 /* Sitecom */ #define USB_VENDOR_ARKMICROCHIPS 0x6547 /* ArkMicroChips */ #define USB_VENDOR_3COM2 0x6891 /* 3Com */ +#define USB_VENDOR_EDIMAX 0x7392 /* EDIMAX */ #define USB_VENDOR_INTEL 0x8086 /* Intel */ #define USB_VENDOR_MOSCHIP 0x9710 /* MosChip Semiconductor */ #define USB_VENDOR_CACE 0xcace /* CACE Technologies */ @@ -569,6 +581,12 @@ /* AboCom products */ #define USB_PRODUCT_ABOCOM_XX1 0x110c /* XX1 */ #define USB_PRODUCT_ABOCOM_XX2 0x200c /* XX2 */ +#define USB_PRODUCT_ABOCOM_RT2770 0x2770 /* RT2770 */ +#define USB_PRODUCT_ABOCOM_RT2870 0x2870 /* RT2870 */ +#define USB_PRODUCT_ABOCOM_RT3070 0x3070 /* RT3070 */ +#define USB_PRODUCT_ABOCOM_RT3071 0x3071 /* RT3071 */ +#define USB_PRODUCT_ABOCOM_RT3072 0x3072 /* RT3072 */ +#define USB_PRODUCT_ABOCOM2_RT2870_1 0x3c09 /* RT2870 */ #define USB_PRODUCT_ABOCOM_URE450 0x4000 /* URE450 Ethernet Adapter */ #define USB_PRODUCT_ABOCOM_UFE1000 0x4002 /* UFE1000 Fast Ethernet Adapter */ #define USB_PRODUCT_ABOCOM_DSB650TX_PNA 0x4003 /* 1/10/100 ethernet adapter */ @@ -689,6 +707,9
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10
Module Name:src
Committed By: mrg
Date: Thu Nov 25 16:02:02 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile
Log Message:
avoid i386 compile errors due to CARD32 lossage.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.5 Fri Jun 12 01:59:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Thu Nov 25 16:02:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/06/12 01:59:06 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/11/25 16:02:02 mrg Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -30,6 +30,8 @@
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1
+COPTS.xf86x86emu.c= -Wno-error # XXX?
+
.include bsd.x11.mk
LIBDIR= ${XMODULEDIR}
.include bsd.lib.mk
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src
Committed By: njoly
Date: Thu Nov 25 16:28:18 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
Log Message:
+fc-{query,scan}.debug
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/lists/xcomp/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.118 src/distrib/sets/lists/xcomp/mi:1.119
--- src/distrib/sets/lists/xcomp/mi:1.118 Tue Nov 23 10:24:03 2010
+++ src/distrib/sets/lists/xcomp/mi Thu Nov 25 16:28:18 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.118 2010/11/23 10:24:03 mrg Exp $
+# $NetBSD: mi,v 1.119 2010/11/25 16:28:18 njoly Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -9398,6 +9398,8 @@
./usr/libdata/debug/usr/X11R7/bin/fc-cat.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-list.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-match.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-query.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-scan.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fonttosfnt.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fslsfonts.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fstobdf.debug -unknown- debug,xorg
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: njoly Date: Thu Nov 25 16:32:40 UTC 2010 Modified Files: src/distrib/sets/lists/xcomp: shl.mi Log Message: Update minor for debug libfreetype.so. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xcomp/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xcomp/shl.mi diff -u src/distrib/sets/lists/xcomp/shl.mi:1.25 src/distrib/sets/lists/xcomp/shl.mi:1.26 --- src/distrib/sets/lists/xcomp/shl.mi:1.25 Mon Jul 19 14:30:51 2010 +++ src/distrib/sets/lists/xcomp/shl.mi Thu Nov 25 16:32:39 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.25 2010/07/19 14:30:51 njoly Exp $ +# $NetBSD: shl.mi,v 1.26 2010/11/25 16:32:39 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -230,7 +230,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libpciaccess.so.0.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/libpixman-1.so.2.1.debug -unknown- xorg,debug
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Thu Nov 25 17:53:24 UTC 2010 Modified Files: src/sys/arch/mips/mips: locore_mips1.S Log Message: Save t0-t2 on MIPS1 syscalls. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mips/mips/locore_mips1.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/locore_mips1.S diff -u src/sys/arch/mips/mips/locore_mips1.S:1.69 src/sys/arch/mips/mips/locore_mips1.S:1.70 --- src/sys/arch/mips/mips/locore_mips1.S:1.69 Wed Nov 10 01:49:00 2010 +++ src/sys/arch/mips/mips/locore_mips1.S Thu Nov 25 17:53:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_mips1.S,v 1.69 2010/11/10 01:49:00 dholland Exp $ */ +/* $NetBSD: locore_mips1.S,v 1.70 2010/11/25 17:53:24 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -418,9 +418,9 @@ sw a3, FRAME_A3(k1) lw a0, CPUVAR(CURLWP) # 1st arg is curlwp mfhi v1 - #sw t0, FRAME_T0(k1) # no need to save temp regs - #sw t1, FRAME_T1(k1) - #sw t2, FRAME_T2(k1) + sw t0, FRAME_T0(k1) # save temp regs t0-t2 + sw t1, FRAME_T1(k1) + sw t2, FRAME_T2(k1) #sw t3, FRAME_T3(k1) mfc0 a1, MIPS_COP_0_STATUS # 2nd arg is STATUS #sw t4, FRAME_T4(k1)
CVS commit: src
Module Name:src
Committed By: pooka
Date: Thu Nov 25 17:59:03 UTC 2010
Modified Files:
src/lib/librumpclient: rumpclient.c
src/lib/librumpuser: rumpuser_sp.c sp_common.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: rumpcopy.c
Log Message:
*facepalm*, adjust remote copyinstr to work in cases where the end
of the max copyin extends to an unmapped page.
Noticed, as usual, by tests.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/librumpclient/rumpclient.c
cvs rdiff -u -r1.14 -r1.15 src/lib/librumpuser/rumpuser_sp.c
cvs rdiff -u -r1.9 -r1.10 src/lib/librumpuser/sp_common.c
cvs rdiff -u -r1.52 -r1.53 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.12 -r1.13 src/sys/rump/librump/rumpkern/rumpcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.4 src/lib/librumpclient/rumpclient.c:1.5
--- src/lib/librumpclient/rumpclient.c:1.4 Wed Nov 24 17:03:39 2010
+++ src/lib/librumpclient/rumpclient.c Thu Nov 25 17:59:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.4 2010/11/24 17:03:39 pooka Exp $ */
+/* $NetBSD: rumpclient.c,v 1.5 2010/11/25 17:59:03 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -32,7 +32,7 @@
#include sys/cdefs.h
__RCSID($NetBSD);
-#include sys/types.h
+#include sys/param.h
#include sys/mman.h
#include sys/socket.h
@@ -84,11 +84,15 @@
}
static int
-send_copyin_resp(struct spclient *spc, uint64_t reqno, void *data, size_t dlen)
+send_copyin_resp(struct spclient *spc, uint64_t reqno, void *data, size_t dlen,
+ int wantstr)
{
struct rsp_hdr rhdr;
int rv;
+ if (wantstr)
+ dlen = MIN(dlen, strlen(data)+1);
+
rhdr.rsp_len = sizeof(rhdr) + dlen;
rhdr.rsp_reqno = reqno;
rhdr.rsp_class = RUMPSP_RESP;
@@ -155,17 +159,21 @@
struct rsp_copydata *copydata;
void *mapaddr;
size_t maplen;
+ int reqtype = spc-spc_hdr.rsp_type;
- switch (spc-spc_hdr.rsp_type) {
+ switch (reqtype) {
case RUMPSP_COPYIN:
+ case RUMPSP_COPYINSTR:
/*LINTED*/
copydata = (struct rsp_copydata *)spc-spc_buf;
DPRINTF((rump_sp handlereq: copyin request: %p/%zu\n,
copydata-rcp_addr, copydata-rcp_len));
send_copyin_resp(spc, spc-spc_hdr.rsp_reqno,
- copydata-rcp_addr, copydata-rcp_len);
+ copydata-rcp_addr, copydata-rcp_len,
+ reqtype == RUMPSP_COPYINSTR);
break;
case RUMPSP_COPYOUT:
+ case RUMPSP_COPYOUTSTR:
/*LINTED*/
copydata = (struct rsp_copydata *)spc-spc_buf;
DPRINTF((rump_sp handlereq: copyout request: %p/%zu\n,
Index: src/lib/librumpuser/rumpuser_sp.c
diff -u src/lib/librumpuser/rumpuser_sp.c:1.14 src/lib/librumpuser/rumpuser_sp.c:1.15
--- src/lib/librumpuser/rumpuser_sp.c:1.14 Wed Nov 24 20:29:13 2010
+++ src/lib/librumpuser/rumpuser_sp.c Thu Nov 25 17:59:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_sp.c,v 1.14 2010/11/24 20:29:13 pooka Exp $ */
+/* $NetBSD: rumpuser_sp.c,v 1.15 2010/11/25 17:59:02 pooka Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_sp.c,v 1.14 2010/11/24 20:29:13 pooka Exp $);
+__RCSID($NetBSD: rumpuser_sp.c,v 1.15 2010/11/25 17:59:02 pooka Exp $);
#include sys/types.h
#include sys/atomic.h
@@ -194,22 +194,26 @@
}
static int
-copyin_req(struct spclient *spc, const void *remaddr, size_t dlen, void **resp)
+copyin_req(struct spclient *spc, const void *remaddr, size_t *dlen,
+ int wantstr, void **resp)
{
struct rsp_hdr rhdr;
struct rsp_copydata copydata;
struct respwait rw;
int rv;
- DPRINTF((copyin_req: %zu bytes from %p\n, dlen, remaddr));
+ DPRINTF((copyin_req: %zu bytes from %p\n, *dlen, remaddr));
rhdr.rsp_len = sizeof(rhdr) + sizeof(copydata);
rhdr.rsp_class = RUMPSP_REQ;
- rhdr.rsp_type = RUMPSP_COPYIN;
+ if (wantstr)
+ rhdr.rsp_type = RUMPSP_COPYINSTR;
+ else
+ rhdr.rsp_type = RUMPSP_COPYIN;
rhdr.rsp_sysnum = 0;
copydata.rcp_addr = __UNCONST(remaddr);
- copydata.rcp_len = dlen;
+ copydata.rcp_len = *dlen;
putwait(spc, rw, rhdr);
rv = dosend(spc, rhdr, sizeof(rhdr));
@@ -224,6 +228,9 @@
DPRINTF((copyin: response %d\n, rv));
*resp = rw.rw_data;
+ if (wantstr)
+ *dlen = rw.rw_dlen;
+
return rv;
}
@@ -439,8 +446,8 @@
return NULL;
}
-int
-rumpuser_sp_copyin(void *arg, const void *uaddr, void *kaddr, size_t len)
+static int
+sp_copyin(void *arg, const void *raddr, void *laddr, size_t *len, int wantstr)
{
struct spclient *spc = arg;
void *rdata = NULL; /* XXXuninit */
@@ -448,11 +455,11 @@
rumpuser__kunlock(0, nlocks, NULL);
- rv = copyin_req(spc, uaddr, len, rdata);
+ rv = copyin_req(spc, raddr, len, wantstr, rdata);
if (rv)
goto out;
- memcpy(kaddr, rdata, len);
+ memcpy(laddr, rdata, *len);
free(rdata);
out:
@@ -463,13 +470,27 @@
CVS commit: src/lib/libc/sys
Module Name:src Committed By: dholland Date: Thu Nov 25 20:53:23 UTC 2010 Modified Files: src/lib/libc/sys: stat.2 Log Message: No file system I know of reports directory sizes that are multiples of sizeof(struct dirent) except by accident. So, sync with reality. Brought to my attention by Taylor R Campbell in chat. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libc/sys/stat.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/stat.2 diff -u src/lib/libc/sys/stat.2:1.46 src/lib/libc/sys/stat.2:1.47 --- src/lib/libc/sys/stat.2:1.46 Fri Jun 4 05:42:24 2010 +++ src/lib/libc/sys/stat.2 Thu Nov 25 20:53:23 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: stat.2,v 1.46 2010/06/04 05:42:24 jruoho Exp $ +.\ $NetBSD: stat.2,v 1.47 2010/11/25 20:53:23 dholland Exp $ .\ .\ Copyright (c) 1980, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)stat.2 8.4 (Berkeley) 5/1/95 .\ -.Dd June 4, 2010 +.Dd November 25, 2010 .Dt STAT 2 .Os .Sh NAME @@ -152,11 +152,12 @@ .Bl -tag -width st_blksize -offset indent .It Va st_size The size of the file in bytes. -A directory will be a multiple of the size of the -.Xr dirent 3 -structure. -Some file systems (notably ZFS) return the number of entries in the directory -instead of the size in bytes. +The meaning of the size reported for a directory is file system +dependent. +Some file systems (e.g. FFS) return the total size used for the +directory metadata, possibly including free slots; others (notably +ZFS) return the number of entries in the directory. +Some may also return other things or always report zero. .It Va st_blksize The optimal I/O block size for the file. .It Va st_blocks
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Thu Nov 25 21:31:09 UTC 2010
Modified Files:
src/usr.bin/make: arch.c compat.c make.c make.h targ.c
Log Message:
Instead of keeping around the mtime of the youngest child, keep a pointer
to it, so that we can print it when we do the out of date determination.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/make/arch.c
cvs rdiff -u -r1.81 -r1.82 src/usr.bin/make/compat.c
cvs rdiff -u -r1.82 -r1.83 src/usr.bin/make/make.c
cvs rdiff -u -r1.83 -r1.84 src/usr.bin/make/make.h
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/make/targ.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.59 src/usr.bin/make/arch.c:1.60
--- src/usr.bin/make/arch.c:1.59 Fri Jan 23 16:58:27 2009
+++ src/usr.bin/make/arch.c Thu Nov 25 16:31:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.59 2009/01/23 21:58:27 dsl Exp $ */
+/* $NetBSD: arch.c,v 1.60 2010/11/25 21:31:08 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: arch.c,v 1.59 2009/01/23 21:58:27 dsl Exp $;
+static char rcsid[] = $NetBSD: arch.c,v 1.60 2010/11/25 21:31:08 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)arch.c 8.2 (Berkeley) 1/2/94;
#else
-__RCSID($NetBSD: arch.c,v 1.59 2009/01/23 21:58:27 dsl Exp $);
+__RCSID($NetBSD: arch.c,v 1.60 2010/11/25 21:31:08 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -1212,7 +1212,7 @@
* A library will be considered out-of-date for any of these reasons,
* given that it is a target on a dependency line somewhere:
* Its modification time is less than that of one of its
- * sources (gn-mtime gn-cmtime).
+ * sources (gn-mtime gn-cmgn-mtime).
* Its modification time is greater than the time at which the
* make began (i.e. it's been modified in the course
* of the make, probably by archiving).
@@ -1245,8 +1245,8 @@
oodate = TRUE;
} else if (OP_NOP(gn-type) Lst_IsEmpty(gn-children)) {
oodate = FALSE;
-} else if ((!Lst_IsEmpty(gn-children) gn-cmtime == 0) ||
- (gn-mtime now) || (gn-mtime gn-cmtime)) {
+} else if ((!Lst_IsEmpty(gn-children) gn-cmgn == NULL) ||
+ (gn-mtime now) || (gn-mtime gn-cmgn-mtime)) {
oodate = TRUE;
} else {
#ifdef RANLIBMAG
@@ -1261,7 +1261,7 @@
if (DEBUG(ARCH) || DEBUG(MAKE)) {
fprintf(debug_file, %s modified %s..., RANLIBMAG, Targ_FmtTime(modTimeTOC));
}
- oodate = (gn-cmtime modTimeTOC);
+ oodate = (gn-cmgn == NULL || gn-gngm-mtime modTimeTOC);
} else {
/*
* A library w/o a table of contents is out-of-date
Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.81 src/usr.bin/make/compat.c:1.82
--- src/usr.bin/make/compat.c:1.81 Mon Sep 13 11:36:57 2010
+++ src/usr.bin/make/compat.c Thu Nov 25 16:31:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat.c,v 1.81 2010/09/13 15:36:57 sjg Exp $ */
+/* $NetBSD: compat.c,v 1.82 2010/11/25 21:31:09 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: compat.c,v 1.81 2010/09/13 15:36:57 sjg Exp $;
+static char rcsid[] = $NetBSD: compat.c,v 1.82 2010/11/25 21:31:09 christos Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)compat.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: compat.c,v 1.81 2010/09/13 15:36:57 sjg Exp $);
+__RCSID($NetBSD: compat.c,v 1.82 2010/11/25 21:31:09 christos Exp $);
#endif
#endif /* not lint */
#endif
@@ -527,10 +527,10 @@
}
/*
- * All the children were made ok. Now cmtime contains the modification
- * time of the newest child, we need to find out if we exist and when
- * we were modified last. The criteria for datedness are defined by the
- * Make_OODate function.
+ * All the children were made ok. Now cmgn-mtime contains the
+ * modification time of the newest child, we need to find out if we
+ * exist and when we were modified last. The criteria for datedness
+ * are defined by the Make_OODate function.
*/
if (DEBUG(MAKE)) {
fprintf(debug_file, Examining %s..., gn-name);
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.82 src/usr.bin/make/make.c:1.83
--- src/usr.bin/make/make.c:1.82 Mon Sep 13 11:36:57 2010
+++ src/usr.bin/make/make.c Thu Nov 25 16:31:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.82 2010/09/13 15:36:57 sjg Exp $ */
+/* $NetBSD: make.c,v 1.83 2010/11/25 21:31:09 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: make.c,v 1.82 2010/09/13 15:36:57 sjg Exp $;
+static char rcsid[] = $NetBSD: make.c,v 1.83
CVS commit: src/gnu/dist/gcc4/gcc/config/pa
Module Name:src
Committed By: skrll
Date: Thu Nov 25 21:37:04 UTC 2010
Modified Files:
src/gnu/dist/gcc4/gcc/config/pa: pa.c
Log Message:
Don't create weird notes section in hppa binaries.
XXX maybe pa_netbsd_file_start is the proper fix.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/gnu/dist/gcc4/gcc/config/pa/pa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gcc4/gcc/config/pa/pa.c
diff -u src/gnu/dist/gcc4/gcc/config/pa/pa.c:1.7 src/gnu/dist/gcc4/gcc/config/pa/pa.c:1.8
--- src/gnu/dist/gcc4/gcc/config/pa/pa.c:1.7 Sun Aug 31 09:51:32 2008
+++ src/gnu/dist/gcc4/gcc/config/pa/pa.c Thu Nov 25 21:37:04 2010
@@ -5258,7 +5258,7 @@
static void
pa_linux_file_start (void)
{
- pa_file_start_file (1);
+ pa_file_start_file (0);
pa_file_start_level ();
pa_file_start_mcount (CODE);
}
CVS commit: src
Module Name:src Committed By: christos Date: Thu Nov 25 22:08:50 UTC 2010 Modified Files: src: UPDATING Log Message: Mention setenv lossage. To generate a diff of this commit: cvs rdiff -u -r1.215 -r1.216 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.215 src/UPDATING:1.216 --- src/UPDATING:1.215 Tue Nov 23 01:49:29 2010 +++ src/UPDATING Thu Nov 25 17:08:49 2010 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.215 2010/11/23 06:49:29 mrg Exp $ +$NetBSD: UPDATING,v 1.216 2010/11/25 22:08:49 christos Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -15,6 +15,16 @@ Recent changes: ^^^ +20101125: + The latest changes to setenv(3) dissallow setting environment + variables with names that contain '='. Revision 1.18 of env.c + assumed that this was allowed. Installing a new libc with an + old copy of /usr/bin/env causes env x=1 printenv | grep x= to + break which affects the autoconf tests for dependency finding, + so building gcc will end up printing: + checking dependency style of gcc... none + configure: error: no usable dependency style found + Fix it by rebuilding and re-installing env. 20101119: Recent Xorg updates in xsrc/external/mit/ may cause various build
CVS commit: src/sys/uvm
Module Name:src Committed By: uebayasi Date: Fri Nov 26 00:45:28 UTC 2010 Modified Files: src/sys/uvm: uvm_page.h Log Message: Put back VM_PAGE_TO_MD(); pointed out by skrll@, thanks. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/uvm/uvm_page.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/uvm/uvm_page.h diff -u src/sys/uvm/uvm_page.h:1.68 src/sys/uvm/uvm_page.h:1.69 --- src/sys/uvm/uvm_page.h:1.68 Thu Nov 25 04:45:30 2010 +++ src/sys/uvm/uvm_page.h Fri Nov 26 00:45:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm_page.h,v 1.68 2010/11/25 04:45:30 uebayasi Exp $ */ +/* $NetBSD: uvm_page.h,v 1.69 2010/11/26 00:45:27 uebayasi Exp $ */ /* * Copyright (c) 1997 Charles D. Cranor and Washington University. @@ -306,6 +306,10 @@ #define VM_PAGE_TO_PHYS(entry) uvm_vm_page_to_phys(entry) +#ifdef __HAVE_VM_PAGE_MD +#define VM_PAGE_TO_MD(pg) ((pg)-mdpage) +#endif + /* * Compute the page color bucket for a given page. */
CVS commit: xsrc/external/mit/xcalc/dist
Module Name:xsrc Committed By: mrg Date: Fri Nov 26 05:41:07 UTC 2010 Update of /cvsroot/xsrc/external/mit/xcalc/dist In directory ivanova.netbsd.org:/tmp/cvs-serv20081 Log Message: initial import of xcalc 1.0.4. no real changes. Status: Vendor Tag: xorg Release Tags: xcalc-1-0-4 U xsrc/external/mit/xcalc/dist/configure.ac U xsrc/external/mit/xcalc/dist/Makefile.in U xsrc/external/mit/xcalc/dist/Makefile.am U xsrc/external/mit/xcalc/dist/xcalc.man U xsrc/external/mit/xcalc/dist/install-sh U xsrc/external/mit/xcalc/dist/INSTALL U xsrc/external/mit/xcalc/dist/xcalc.c U xsrc/external/mit/xcalc/dist/aclocal.m4 U xsrc/external/mit/xcalc/dist/autogen.sh U xsrc/external/mit/xcalc/dist/missing U xsrc/external/mit/xcalc/dist/depcomp U xsrc/external/mit/xcalc/dist/config.h.in U xsrc/external/mit/xcalc/dist/xcalc.h U xsrc/external/mit/xcalc/dist/ChangeLog U xsrc/external/mit/xcalc/dist/config.sub U xsrc/external/mit/xcalc/dist/COPYING U xsrc/external/mit/xcalc/dist/math.c U xsrc/external/mit/xcalc/dist/configure U xsrc/external/mit/xcalc/dist/config.guess U xsrc/external/mit/xcalc/dist/actions.c U xsrc/external/mit/xcalc/dist/README U xsrc/external/mit/xcalc/dist/app-defaults/XCalc-color U xsrc/external/mit/xcalc/dist/app-defaults/XCalc No conflicts created by this import
CVS commit: xsrc/external/mit/xeyes/dist
Module Name:xsrc Committed By: mrg Date: Fri Nov 26 05:41:21 UTC 2010 Update of /cvsroot/xsrc/external/mit/xeyes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16700 Log Message: initial import of xeyes 1.1.1. no real changes. Status: Vendor Tag: xorg Release Tags: xeyes-1-1-1 U xsrc/external/mit/xeyes/dist/install-sh U xsrc/external/mit/xeyes/dist/Eyes.h U xsrc/external/mit/xeyes/dist/Makefile.am U xsrc/external/mit/xeyes/dist/aclocal.m4 U xsrc/external/mit/xeyes/dist/config.guess U xsrc/external/mit/xeyes/dist/INSTALL U xsrc/external/mit/xeyes/dist/transform.h U xsrc/external/mit/xeyes/dist/ChangeLog U xsrc/external/mit/xeyes/dist/xeyes.c U xsrc/external/mit/xeyes/dist/eyesmask.bit U xsrc/external/mit/xeyes/dist/Makefile.in U xsrc/external/mit/xeyes/dist/xeyes.man U xsrc/external/mit/xeyes/dist/README U xsrc/external/mit/xeyes/dist/configure U xsrc/external/mit/xeyes/dist/depcomp U xsrc/external/mit/xeyes/dist/missing U xsrc/external/mit/xeyes/dist/config.sub U xsrc/external/mit/xeyes/dist/configure.ac U xsrc/external/mit/xeyes/dist/eyes.bit U xsrc/external/mit/xeyes/dist/Eyes.c U xsrc/external/mit/xeyes/dist/config.h.in U xsrc/external/mit/xeyes/dist/COPYING U xsrc/external/mit/xeyes/dist/EyesP.h U xsrc/external/mit/xeyes/dist/transform.c No conflicts created by this import
CVS commit: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Fri Nov 26 06:03:01 UTC 2010 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1192 Log Message: initial import of xterm 267. no real changes, some minor cleanups. Status: Vendor Tag: xorg Release Tags: xterm-267 U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/INSTALL U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/Makefile.in U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/README.i18n U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/TekPrsTbl.c U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/cursor.c U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/minstall.sh U xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/os2main.c U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/print.c U xsrc/external/mit/xterm/dist/proto.h U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/scrollbar.c U xsrc/external/mit/xterm/dist/sinstall.sh U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/testxmc.c U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/trace.c U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/uxterm U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/wcwidth.c U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/xcharmouse.h U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/xutf8.c U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/icons/xterm-color_32x32.xpm U xsrc/external/mit/xterm/dist/icons/xterm_48x48.xpm U xsrc/external/mit/xterm/dist/icons/xterm_32x32.xcf U xsrc/external/mit/xterm/dist/icons/xterm_32x32.xpm U
CVS commit: xsrc/external/mit/xterm/include
Module Name:xsrc Committed By: mrg Date: Fri Nov 26 06:15:18 UTC 2010 Modified Files: xsrc/external/mit/xterm/include: xtermcfg.h Log Message: merge xterm 267 xtermcfg.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xterm/include/xtermcfg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xterm/include/xtermcfg.h diff -u xsrc/external/mit/xterm/include/xtermcfg.h:1.3 xsrc/external/mit/xterm/include/xtermcfg.h:1.4 --- xsrc/external/mit/xterm/include/xtermcfg.h:1.3 Tue Sep 14 23:07:17 2010 +++ xsrc/external/mit/xterm/include/xtermcfg.h Fri Nov 26 06:15:18 2010 @@ -186,6 +186,7 @@ */ #ifndef __cplusplus /* #undef GCC_PRINTF */ +/* #undef GCC_PRINTFLIKE */ /* #undef GCC_UNUSED */ #endif
CVS commit: src
Module Name:src Committed By: skrll Date: Thu Nov 25 08:18:34 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man8/man8.acorn32: Makefile Added Files: src/share/man/man8/man8.acorn32: nbfs.8 Log Message: Add nbfs(8) man page from Ben Harris. To generate a diff of this commit: cvs rdiff -u -r1.1253 -r1.1254 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.3 -r1.4 src/share/man/man8/man8.acorn32/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man8/man8.acorn32/nbfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1253 src/distrib/sets/lists/man/mi:1.1254 --- src/distrib/sets/lists/man/mi:1.1253 Sun Nov 21 19:58:04 2010 +++ src/distrib/sets/lists/man/mi Thu Nov 25 08:18:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1253 2010/11/21 19:58:04 adam Exp $ +# $NetBSD: mi,v 1.1254 2010/11/25 08:18:33 skrll Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1989,6 +1989,7 @@ ./usr/share/man/cat8/acorn32/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/acorn32/boot.0 man-sys-catman .cat ./usr/share/man/cat8/acorn32/boot32.0 man-sys-catman .cat +./usr/share/man/cat8/acorn32/nbfs.0 man-sys-catman .cat ./usr/share/man/cat8/acorn32/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/acpidump.0 man-sysutil-catman .cat ./usr/share/man/cat8/adduser.0 man-sysutil-catman .cat @@ -4585,6 +4586,7 @@ ./usr/share/man/html8/acorn26/boot26.html man-sys-htmlman html ./usr/share/man/html8/acorn32/boot.html man-sys-htmlman html ./usr/share/man/html8/acorn32/boot32.html man-sys-htmlman html +./usr/share/man/html8/acorn32/nbfs.html man-sys-htmlman html ./usr/share/man/html8/acpidump.html man-sysutil-htmlman html ./usr/share/man/html8/adduser.html man-sysutil-htmlman html ./usr/share/man/html8/afterboot.html man-sysutil-htmlman html @@ -7170,6 +7172,7 @@ ./usr/share/man/man8/acorn32/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/acorn32/boot.8 man-sys-man .man ./usr/share/man/man8/acorn32/boot32.8 man-sys-man .man +./usr/share/man/man8/acorn32/nbfs.8 man-sys-man .man ./usr/share/man/man8/acorn32/makedev.8 man-obsolete obsolete ./usr/share/man/man8/acpidump.8 man-sysutil-man .man ./usr/share/man/man8/adduser.8 man-sysutil-man .man Index: src/share/man/man8/man8.acorn32/Makefile diff -u src/share/man/man8/man8.acorn32/Makefile:1.3 src/share/man/man8/man8.acorn32/Makefile:1.4 --- src/share/man/man8/man8.acorn32/Makefile:1.3 Mon Feb 23 17:03:28 2004 +++ src/share/man/man8/man8.acorn32/Makefile Thu Nov 25 08:18:33 2010 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2004/02/23 17:03:28 reinoud Exp $ +# $NetBSD: Makefile,v 1.4 2010/11/25 08:18:33 skrll Exp $ -MAN= boot32.8 +MAN= boot32.8 nbfs.8 MLINKS= boot32.8 boot.8 MANSUBDIR=/acorn32 Added files: Index: src/share/man/man8/man8.acorn32/nbfs.8 diff -u /dev/null src/share/man/man8/man8.acorn32/nbfs.8:1.1 --- /dev/null Thu Nov 25 08:18:34 2010 +++ src/share/man/man8/man8.acorn32/nbfs.8 Thu Nov 25 08:18:33 2010 @@ -0,0 +1,81 @@ +.\ $NetBSD: nbfs.8,v 1.1 2010/11/25 08:18:33 skrll Exp $ +.\ +.\ Copyright (c) 2006 Ben Harris +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ 3. The name of the author may not be used to endorse or promote products +.\derived from this software without specific prior written permission. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd July 3, 2006 +.Dt NBFS 8 acorn32 +.Os +.Sh NAME +.Nm nbfs +.Nd NetBSD boot filing system for RISC OS +.Sh SYNOPSIS +.Nm *NBFS +.Sh DESCRIPTION +.Nm +is a filing system, implemented as a RISC OS relocatable module, to allow
CVS commit: src/sys/dev
Module Name:src
Committed By: hannken
Date: Thu Nov 25 08:53:31 UTC 2010
Modified Files:
src/sys/dev: md.c
Log Message:
- Don't detach configured devices on last close.
- No kmem allocation and biodone() under lock (from rm...@netbsd.org).
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/md.c
diff -u src/sys/dev/md.c:1.65 src/sys/dev/md.c:1.66
--- src/sys/dev/md.c:1.65 Tue Nov 23 09:30:43 2010
+++ src/sys/dev/md.c Thu Nov 25 08:53:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.65 2010/11/23 09:30:43 hannken Exp $ */
+/* $NetBSD: md.c,v 1.66 2010/11/25 08:53:30 hannken Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross, Leo Weppelman.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: md.c,v 1.65 2010/11/23 09:30:43 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: md.c,v 1.66 2010/11/25 08:53:30 hannken Exp $);
#ifdef _KERNEL_OPT
#include opt_md.h
@@ -85,7 +85,7 @@
struct disk sc_dkdev; /* hook for generic disk handling */
struct md_conf sc_md;
kmutex_t sc_lock; /* Protect self. */
- kcondvar_t sc_cv; /* Signal work. */
+ kcondvar_t sc_cv; /* Wait here for work. */
struct bufq_state *sc_buflist;
};
/* shorthand for fields in sc_md: */
@@ -146,6 +146,7 @@
struct md_softc *sc = device_private(self);
sc-sc_dev = self;
+ sc-sc_type = MD_UNCONFIGURED;
mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_NONE);
cv_init(sc-sc_cv, mdidle);
bufq_alloc(sc-sc_buflist, fcfs, 0);
@@ -181,7 +182,7 @@
rc = 0;
mutex_enter(sc-sc_dkdev.dk_openlock);
- if (sc-sc_dkdev.dk_openmask == 0)
+ if (sc-sc_dkdev.dk_openmask == 0 sc-sc_type == MD_UNCONFIGURED)
; /* nothing to do */
else if ((flags DETACH_FORCE) == 0)
rc = EBUSY;
@@ -433,10 +434,11 @@
bp-b_error = EIO;
break;
}
- done:
- biodone(bp);
+ done:
mutex_exit(sc-sc_lock);
+
+ biodone(bp);
}
static int
@@ -561,14 +563,23 @@
vaddr_t addr;
vsize_t size;
- KASSERT(mutex_owned(sc-sc_lock));
+ mutex_exit(sc-sc_lock);
/* Sanity check the size. */
size = umd-md_size;
addr = uvm_km_alloc(kernel_map, size, 0, UVM_KMF_WIRED|UVM_KMF_ZERO);
+
+ mutex_enter(sc-sc_lock);
+
if (!addr)
return ENOMEM;
+ /* If another thread beat us to configure this unit: fail. */
+ if (sc-sc_type != MD_UNCONFIGURED) {
+ uvm_km_free(kernel_map, addr, size, UVM_KMF_WIRED);
+ return EINVAL;
+ }
+
/* This unit is now configured. */
sc-sc_addr = (void *)addr; /* kernel space */
sc-sc_size = (size_t)size;
CVS commit: src/share/man/man8/man8.acorn32
Module Name:src Committed By: wiz Date: Thu Nov 25 09:13:37 UTC 2010 Modified Files: src/share/man/man8/man8.acorn32: nbfs.8 Log Message: New sentence, new line. Use Nx. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man8/man8.acorn32/nbfs.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man8/man8.acorn32/nbfs.8 diff -u src/share/man/man8/man8.acorn32/nbfs.8:1.1 src/share/man/man8/man8.acorn32/nbfs.8:1.2 --- src/share/man/man8/man8.acorn32/nbfs.8:1.1 Thu Nov 25 08:18:33 2010 +++ src/share/man/man8/man8.acorn32/nbfs.8 Thu Nov 25 09:13:37 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: nbfs.8,v 1.1 2010/11/25 08:18:33 skrll Exp $ +.\ $NetBSD: nbfs.8,v 1.2 2010/11/25 09:13:37 wiz Exp $ .\ .\ Copyright (c) 2006 Ben Harris .\ All rights reserved. @@ -49,8 +49,9 @@ The underlying FileCore instance used by .Nm is selected by the filing system's special field, while the disk and -NetBSD partition are selected by the disk name. Thus, to refer -to the first +.Nx +partition are selected by the disk name. +Thus, to refer to the first .Nx partition of the first ADFS hard disk, one would use
CVS commit: src/sys/arch/acorn32/stand/lib
Module Name:src
Committed By: skrll
Date: Thu Nov 25 13:45:17 UTC 2010
Modified Files:
src/sys/arch/acorn32/stand/lib: riscospart.c
Log Message:
Use partition_cyl_high and partition_cyl_low to find the RiscBSD
partition.
Makes nbfs somewhat work on my RiscPC.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/acorn32/stand/lib/riscospart.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn32/stand/lib/riscospart.c
diff -u src/sys/arch/acorn32/stand/lib/riscospart.c:1.2 src/sys/arch/acorn32/stand/lib/riscospart.c:1.3
--- src/sys/arch/acorn32/stand/lib/riscospart.c:1.2 Sun Jun 25 21:32:41 2006
+++ src/sys/arch/acorn32/stand/lib/riscospart.c Thu Nov 25 13:45:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: riscospart.c,v 1.2 2006/06/25 21:32:41 christos Exp $ */
+/* $NetBSD: riscospart.c,v 1.3 2010/11/25 13:45:17 skrll Exp $ */
/*-
* Copyright (c) 2006 Ben Harris
@@ -160,7 +160,7 @@
bb = (struct filecore_bootblock *) buf;
if (bb-checksum == filecore_checksum((u_char *)bb)) {
if (bb-partition_type == PARTITION_FORMAT_RISCBSD)
- labelsect = (daddr_t)bb-partition_cyl_low *
+ labelsect = ((bb-partition_cyl_high 8) + bb-partition_cyl_low) *
bb-heads * bb-secspertrack + LABELSECTOR;
else {
err = EUNLAB;
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: pooka Date: Thu Nov 25 13:51:26 UTC 2010 Modified Files: src/games/fortune/datfiles: netbsd Log Message: add one i saw on irc today To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/games/fortune/datfiles/netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/netbsd diff -u src/games/fortune/datfiles/netbsd:1.26 src/games/fortune/datfiles/netbsd:1.27 --- src/games/fortune/datfiles/netbsd:1.26 Thu Oct 29 08:47:07 2009 +++ src/games/fortune/datfiles/netbsd Thu Nov 25 13:51:26 2010 @@ -46,6 +46,12 @@ http://www.imrryr.org/NetBSD/logo -- R. C. Dowdeswell % +I always think of NetBSD developers as special gnomes who smoke +pipes that make big bubbles and if the bubble hits the ceiling +before popping it gets committed and released. Lots of lung power +needed for this. + -- babybabybaby +% I didn't get where I am today without using NetBSD -- Dave Tyson %
CVS commit: src/sys/arch/pmax/stand/common
Module Name:src Committed By: tsutsui Date: Thu Nov 25 14:05:28 UTC 2010 Modified Files: src/sys/arch/pmax/stand/common: startprog.S Log Message: Fix botch on mips64 merge: - use correct offsets to pass args to loaded kernel in __mips_o32 case Now NetBSD/pmax kernel properly boots, but init(8) still doesn't start on GXemul emulating R3000 3MAX. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/pmax/stand/common/startprog.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/pmax/stand/common/startprog.S diff -u src/sys/arch/pmax/stand/common/startprog.S:1.5 src/sys/arch/pmax/stand/common/startprog.S:1.6 --- src/sys/arch/pmax/stand/common/startprog.S:1.5 Mon Dec 14 00:46:11 2009 +++ src/sys/arch/pmax/stand/common/startprog.S Thu Nov 25 14:05:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: startprog.S,v 1.5 2009/12/14 00:46:11 matt Exp $ */ +/* $NetBSD: startprog.S,v 1.6 2010/11/25 14:05:27 tsutsui Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -46,10 +46,10 @@ move a1,a3 #ifdef __mips_o32 - lw a2,48(sp) # load everything from old stack we need - lw a3,52(sp) - lw $8,56(sp) # use a4/t0 in case N32/N64 kernel - lw $9,60(sp) # use a5/t1 in case N32/N64 kernel + lw a2,CALLFRAME_SIZ+16(sp) # load everything from old stack we need + lw a3,CALLFRAME_SIZ+20(sp) + lw $8,CALLFRAME_SIZ+24(sp) # use a4/t0 in case N32/N64 kernel + lw $9,CALLFRAME_SIZ+28(sp) # use a5/t1 in case N32/N64 kernel #else move a2,a4 move a3,a5
