CVS commit: src/sys/arch/arm
Module Name:src
Committed By: uebayasi
Date: Tue Nov 2 06:07:06 UTC 2010
Modified Files:
src/sys/arch/arm/arm32: mem.c
src/sys/arch/arm/include/arm32: pmap.h
Log Message:
Fix build of evbarm.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/arm32/mem.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/arm/include/arm32/pmap.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/arch/arm/arm32/mem.c
diff -u src/sys/arch/arm/arm32/mem.c:1.27 src/sys/arch/arm/arm32/mem.c:1.28
--- src/sys/arch/arm/arm32/mem.c:1.27 Sat Oct 30 18:35:38 2010
+++ src/sys/arch/arm/arm32/mem.c Tue Nov 2 06:07:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.27 2010/10/30 18:35:38 uebayasi Exp $ */
+/* $NetBSD: mem.c,v 1.28 2010/11/02 06:07:05 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -76,7 +76,7 @@
#include opt_compat_netbsd.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mem.c,v 1.27 2010/10/30 18:35:38 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: mem.c,v 1.28 2010/11/02 06:07:05 uebayasi Exp $);
#include sys/param.h
#include sys/conf.h
@@ -146,7 +146,7 @@
{
struct vm_page *pg;
pg = PHYS_TO_VM_PAGE(trunc_page(v));
-if (pg != NULL pmap_is_page_colored_p(pg))
+if (pg != NULL pmap_is_page_colored_p(VM_PAGE_TO_MD(pg)))
o = VM_PAGE_TO_MD(pg)-pvh_attrs;
else
o = v;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.95 src/sys/arch/arm/include/arm32/pmap.h:1.96
--- src/sys/arch/arm/include/arm32/pmap.h:1.95 Wed Jun 16 22:06:53 2010
+++ src/sys/arch/arm/include/arm32/pmap.h Tue Nov 2 06:07:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.95 2010/06/16 22:06:53 jmcneill Exp $ */
+/* $NetBSD: pmap.h,v 1.96 2010/11/02 06:07:06 uebayasi Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -272,8 +272,8 @@
(((pg)-mdpage.pvh_attrs PVF_MOD) != 0)
#define pmap_is_referenced(pg) \
(((pg)-mdpage.pvh_attrs PVF_REF) != 0)
-#define pmap_is_page_colored_p(pg) \
- (((pg)-mdpage.pvh_attrs PVF_COLORED) != 0)
+#define pmap_is_page_colored_p(md) \
+ (((md)-pvh_attrs PVF_COLORED) != 0)
#define pmap_copy(dp, sp, da, l, sa) /* nothing */
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: uebayasi Date: Tue Nov 2 06:31:48 UTC 2010 Modified Files: src/sys/arch/evbppc/conf: PMPPC Log Message: Don't build flash because it's not implemented. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbppc/conf/PMPPC 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/evbppc/conf/PMPPC diff -u src/sys/arch/evbppc/conf/PMPPC:1.15 src/sys/arch/evbppc/conf/PMPPC:1.16 --- src/sys/arch/evbppc/conf/PMPPC:1.15 Sat May 8 22:16:27 2010 +++ src/sys/arch/evbppc/conf/PMPPC Tue Nov 2 06:31:48 2010 @@ -1,4 +1,4 @@ -# $NetBSD: PMPPC,v 1.15 2010/05/08 22:16:27 mrg Exp $ +# $NetBSD: PMPPC,v 1.16 2010/11/02 06:31:48 uebayasi Exp $ # # PMPPC # @@ -142,7 +142,7 @@ cs0 at mainbus0 addr 0x7fe0 # flash driver not implemented -flash0 at mainbus0 addr 0x7000 +#flash0 at mainbus0 addr 0x7000 # UARTs com0 at cpc0 addr 0xff600300
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: uebayasi
Date: Tue Nov 2 06:33:22 UTC 2010
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix build of XScale.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sys/arch/arm/arm32/pmap.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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.215 src/sys/arch/arm/arm32/pmap.c:1.216
--- src/sys/arch/arm/arm32/pmap.c:1.215 Sat Oct 30 16:14:08 2010
+++ src/sys/arch/arm/arm32/pmap.c Tue Nov 2 06:33:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.215 2010/10/30 16:14:08 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.216 2010/11/02 06:33:22 uebayasi Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
#include machine/param.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.215 2010/10/30 16:14:08 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.216 2010/11/02 06:33:22 uebayasi Exp $);
#define VM_PAGE_TO_MD(pg) ((pg)-mdpage)
@@ -4715,9 +4715,9 @@
void
pmap_copy_page_xscale(paddr_t src, paddr_t dst)
{
- struct vm_page *src_pg = PHYS_TO_VM_PAGE(src);
+ struct vm_page_md *src_md = VM_PAGE_TO_MD(PHYS_TO_VM_PAGE(src));
#ifdef DEBUG
- struct vm_page *dst_pg = PHYS_TO_VM_PAGE(dst);
+ struct vm_page_md *dst_md = VM_PAGE_TO_MD(PHYS_TO_VM_PAGE(dst));
if (!SLIST_EMPTY(dst_md-pvh_list))
panic(pmap_copy_page: dst page has mappings);
CVS commit: src/usr.bin/tset
Module Name:src Committed By: njoly Date: Tue Nov 2 12:10:13 UTC 2010 Modified Files: src/usr.bin/tset: tset.1 Log Message: Fix typo in date. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/tset/tset.1 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/tset/tset.1 diff -u src/usr.bin/tset/tset.1:1.17 src/usr.bin/tset/tset.1:1.18 --- src/usr.bin/tset/tset.1:1.17 Wed Feb 3 15:34:46 2010 +++ src/usr.bin/tset/tset.1 Tue Nov 2 12:10:13 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tset.1,v 1.17 2010/02/03 15:34:46 roy Exp $ +.\ $NetBSD: tset.1,v 1.18 2010/11/02 12:10:13 njoly Exp $ .\ .\ Copyright (c) 1985, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)tset.1 8.1 (Berkeley) 6/9/93 .\ -.Dd Septmeber 29, 2009 +.Dd September 29, 2009 .Dt TSET 1 .Os .Sh NAME
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: uebayasi
Date: Tue Nov 2 12:21:07 UTC 2010
Modified Files:
src/sys/arch/sparc64/sparc64: pmap.c
Log Message:
Fix DIAGNOSTIC build. Pointed out by Juergen Hannken-Illjes.
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.266 src/sys/arch/sparc64/sparc64/pmap.c:1.267
--- src/sys/arch/sparc64/sparc64/pmap.c:1.266 Sat Oct 30 18:30:55 2010
+++ src/sys/arch/sparc64/sparc64/pmap.c Tue Nov 2 12:21:07 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.266 2010/10/30 18:30:55 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.267 2010/11/02 12:21:07 uebayasi Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.266 2010/10/30 18:30:55 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.267 2010/11/02 12:21:07 uebayasi Exp $);
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -1446,6 +1446,8 @@
/* we could be a little smarter and leave pages zeroed */
for (pg = TAILQ_FIRST(pm-pm_obj.memq); pg != NULL; pg = nextpg) {
+ struct vm_page_md *md = VM_PAGE_TO_MD(pg);
+
KASSERT((pg-flags PG_MARKER) == 0);
nextpg = TAILQ_NEXT(pg, listq.queue);
TAILQ_REMOVE(pm-pm_obj.memq, pg, listq.queue);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: uebayasi
Date: Tue Nov 2 13:09:29 UTC 2010
Modified Files:
src/sys/arch/sparc64/sparc64: pmap.c
Log Message:
Oops, fix build !DIAGNOSTICS again.
To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 src/sys/arch/sparc64/sparc64/pmap.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/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.267 src/sys/arch/sparc64/sparc64/pmap.c:1.268
--- src/sys/arch/sparc64/sparc64/pmap.c:1.267 Tue Nov 2 12:21:07 2010
+++ src/sys/arch/sparc64/sparc64/pmap.c Tue Nov 2 13:09:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.267 2010/11/02 12:21:07 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.268 2010/11/02 13:09:29 uebayasi Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.267 2010/11/02 12:21:07 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.268 2010/11/02 13:09:29 uebayasi Exp $);
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -1446,7 +1446,9 @@
/* we could be a little smarter and leave pages zeroed */
for (pg = TAILQ_FIRST(pm-pm_obj.memq); pg != NULL; pg = nextpg) {
+#ifdef DIAGNOSTIC
struct vm_page_md *md = VM_PAGE_TO_MD(pg);
+#endif
KASSERT((pg-flags PG_MARKER) == 0);
nextpg = TAILQ_NEXT(pg, listq.queue);
CVS commit: [uebayasi-xip] src
Module Name:src Committed By: uebayasi Date: Tue Nov 2 14:05:28 UTC 2010 Modified Files: src/share/man/man9 [uebayasi-xip]: uvm.9 src/sys/arch/arm/imx [uebayasi-xip]: imx31_space.c src/sys/arch/powerpc/powerpc [uebayasi-xip]: bus_space.c src/sys/common/pmap [uebayasi-xip]: pmap_common.c src/sys/uvm [uebayasi-xip]: uvm_extern.h uvm_page.c Log Message: Drop the 'paddr_t avail_start' and 'paddr_t avail_end' arguments from uvm_page_physload_device(9). Those two arguments are used by uvm_page_physload(9) to specify a range of physical memory available for general purpose pages (pages which are linked to freelists). Totally irrelevant to device segments. To generate a diff of this commit: cvs rdiff -u -r1.102.2.1 -r1.102.2.2 src/share/man/man9/uvm.9 cvs rdiff -u -r1.3.2.5 -r1.3.2.6 src/sys/arch/arm/imx/imx31_space.c cvs rdiff -u -r1.20.20.2 -r1.20.20.3 src/sys/arch/powerpc/powerpc/bus_space.c cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/common/pmap/pmap_common.c cvs rdiff -u -r1.161.2.9 -r1.161.2.10 src/sys/uvm/uvm_extern.h cvs rdiff -u -r1.153.2.57 -r1.153.2.58 src/sys/uvm/uvm_page.c 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/man9/uvm.9 diff -u src/share/man/man9/uvm.9:1.102.2.1 src/share/man/man9/uvm.9:1.102.2.2 --- src/share/man/man9/uvm.9:1.102.2.1 Thu Oct 21 17:16:28 2010 +++ src/share/man/man9/uvm.9 Tue Nov 2 14:05:27 2010 @@ -1,5 +1,6 @@ -.\ $NetBSD: uvm.9,v 1.102.2.1 2010/10/21 17:16:28 uebayasi Exp $ +.\ $NetBSD: uvm.9,v 1.102.2.2 2010/11/02 14:05:27 uebayasi Exp $ .\ +.\ Copyright (c) 2010 The NetBSD Froundation, Inc. .\ Copyright (c) 1998 Matthew R. Green .\ All rights reserved. .\ @@ -24,7 +25,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd October 21, 2010 +.Dd November 2, 2010 .Dt UVM 9 .Os .Sh NAME @@ -659,7 +660,7 @@ .It Ft void .Fn uvm_page_physunload void *physseg ; .It Ft void * -.Fn uvm_page_physload_device paddr_t start paddr_t end paddr_t avail_start paddr_t avail_end int prot int flags ; +.Fn uvm_page_physload_device paddr_t start paddr_t end int prot int flags ; .It Ft void .Fn uvm_page_physunload_device void *physseg ; .El @@ -707,11 +708,7 @@ .Fa start and .Fa end -of the physical addresses of the segment, and the -.Fa avail_start -and -.Fa avail_end -addresses of pages not already in use. +of the physical addresses of the segment. The .Fa prot describes the potential protection (region accessibility) of the Index: src/sys/arch/arm/imx/imx31_space.c diff -u src/sys/arch/arm/imx/imx31_space.c:1.3.2.5 src/sys/arch/arm/imx/imx31_space.c:1.3.2.6 --- src/sys/arch/arm/imx/imx31_space.c:1.3.2.5 Wed Jul 28 04:16:12 2010 +++ src/sys/arch/arm/imx/imx31_space.c Tue Nov 2 14:05:27 2010 @@ -1,7 +1,7 @@ -/* $Id: imx31_space.c,v 1.3.2.5 2010/07/28 04:16:12 uebayasi Exp $ */ +/* $Id: imx31_space.c,v 1.3.2.6 2010/11/02 14:05:27 uebayasi Exp $ */ /* derived from: */ -/* $NetBSD: imx31_space.c,v 1.3.2.5 2010/07/28 04:16:12 uebayasi Exp $ */ +/* $NetBSD: imx31_space.c,v 1.3.2.6 2010/11/02 14:05:27 uebayasi Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -306,7 +306,7 @@ const paddr_t start = imx31_bs_mmap(t, addr, 0, prot, flags); const paddr_t end = imx31_bs_mmap(t, addr + size, 0, prot, flags); - return uvm_page_physload_device(start, end, start, end, prot, flags); + return uvm_page_physload_device(start, end, prot, flags); } void Index: src/sys/arch/powerpc/powerpc/bus_space.c diff -u src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.2 src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.3 --- src/sys/arch/powerpc/powerpc/bus_space.c:1.20.20.2 Wed Aug 11 13:20:08 2010 +++ src/sys/arch/powerpc/powerpc/bus_space.c Tue Nov 2 14:05:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space.c,v 1.20.20.2 2010/08/11 13:20:08 uebayasi Exp $ */ +/* $NetBSD: bus_space.c,v 1.20.20.3 2010/11/02 14:05:28 uebayasi Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.20.2 2010/08/11 13:20:08 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_space.c,v 1.20.20.3 2010/11/02 14:05:28 uebayasi Exp $); #include sys/param.h #include sys/systm.h @@ -793,7 +793,7 @@ const paddr_t start = memio_mmap(t, bpa, 0, prot, flags) PAGE_SHIFT; const paddr_t end = memio_mmap(t, bpa + size, 0, prot, flags) PAGE_SHIFT; - return uvm_page_physload_device(start, end, start, end, prot, flags); + return uvm_page_physload_device(start, end, prot, flags); } static void Index: src/sys/common/pmap/pmap_common.c diff -u src/sys/common/pmap/pmap_common.c:1.1.2.1 src/sys/common/pmap/pmap_common.c:1.1.2.2 --- src/sys/common/pmap/pmap_common.c:1.1.2.1 Sat Oct 30 08:41:14 2010 +++ src/sys/common/pmap/pmap_common.c Tue Nov 2 14:05:28 2010 @@ -1,4 +1,4 @@ -/*
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Tue Nov 2 14:32:58 UTC 2010
Modified Files:
src/sys/dev/pci: radeonfb.c radeonfbvar.h
Log Message:
when drawing characters by software make sure the engine is idle before
accessing video memory
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/radeonfbvar.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/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.37 src/sys/dev/pci/radeonfb.c:1.38
--- src/sys/dev/pci/radeonfb.c:1.37 Tue Aug 24 12:47:17 2010
+++ src/sys/dev/pci/radeonfb.c Tue Nov 2 14:32:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.37 2010/08/24 12:47:17 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.38 2010/11/02 14:32:58 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.37 2010/08/24 12:47:17 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.38 2010/11/02 14:32:58 macallan Exp $);
#define RADEONFB_DEFAULT_DEPTH 8
@@ -163,6 +163,7 @@
static void radeonfb_copycols(void *, int, int, int, int);
static void radeonfb_cursor(void *, int, int, int);
static void radeonfb_putchar(void *, int, int, unsigned, long);
+static void radeonfb_putchar_wrapper(void *, int, int, unsigned, long);
static int radeonfb_allocattr(void *, int, int, int, long *);
static int radeonfb_get_backlight(struct radeonfb_display *);
@@ -2206,6 +2207,7 @@
dp-rd_virtx / ri-ri_font-fontwidth);
/* enable acceleration */
+ dp-rd_putchar = ri-ri_ops.putchar;
ri-ri_ops.copyrows = radeonfb_copyrows;
ri-ri_ops.copycols = radeonfb_copycols;
ri-ri_ops.eraserows = radeonfb_eraserows;
@@ -2213,6 +2215,8 @@
ri-ri_ops.allocattr = radeonfb_allocattr;
if (!IS_R300(dp-rd_softc)) {
ri-ri_ops.putchar = radeonfb_putchar;
+ } else {
+ ri-ri_ops.putchar = radeonfb_putchar_wrapper;
}
ri-ri_ops.cursor = radeonfb_cursor;
}
@@ -2430,6 +2434,22 @@
}
}
+/*
+ * wrapper for software character drawing
+ * just sync the engine and call rasops*_putchar()
+ */
+
+static void
+radeonfb_putchar_wrapper(void *cookie, int row, int col, u_int c, long attr)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri-ri_hw;
+ struct radeonfb_display *dp = scr-scr_cookie;
+
+ radeonfb_engine_idle(dp-rd_softc);
+ dp-rd_putchar(ri, row, col, c, attr);
+}
+
static void
radeonfb_eraserows(void *cookie, int row, int nrows, long fillattr)
{
Index: src/sys/dev/pci/radeonfbvar.h
diff -u src/sys/dev/pci/radeonfbvar.h:1.8 src/sys/dev/pci/radeonfbvar.h:1.9
--- src/sys/dev/pci/radeonfbvar.h:1.8 Tue Aug 17 18:53:16 2010
+++ src/sys/dev/pci/radeonfbvar.h Tue Nov 2 14:32:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfbvar.h,v 1.8 2010/08/17 18:53:16 macallan Exp $ */
+/* $NetBSD: radeonfbvar.h,v 1.9 2010/11/02 14:32:58 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -190,7 +190,7 @@
struct wsscreen_descr *rd_wsscreens;
struct vcons_screen rd_vscreen;
struct vcons_data rd_vd;
-
+ void (*rd_putchar)(void *, int, int, u_int, long);
#if 0
uint8_t rd_cmap_red[256];
CVS commit: src/external/bsd/atf/share/doc/atf
Module Name:src
Committed By: njoly
Date: Tue Nov 2 14:41:32 UTC 2010
Modified Files:
src/external/bsd/atf/share/doc/atf: Makefile
Log Message:
Do substitute __TESTSDIR__ when generating atf(7) man page.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/share/doc/atf/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/bsd/atf/share/doc/atf/Makefile
diff -u src/external/bsd/atf/share/doc/atf/Makefile:1.3 src/external/bsd/atf/share/doc/atf/Makefile:1.4
--- src/external/bsd/atf/share/doc/atf/Makefile:1.3 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/doc/atf/Makefile Tue Nov 2 14:41:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/11/02 14:41:32 njoly Exp $
.include bsd.own.mk
@@ -18,7 +18,9 @@
CLEANFILES+= atf.7 atf.7.tmp
atf.7: atf.7.in
- ${TOOL_SED} -e 's,__DOCDIR__,/usr/share/doc/atf,g' \
+ ${TOOL_SED} \
+ -e 's,__DOCDIR__,/usr/share/doc/atf,g' \
+ -e 's,__TESTSDIR__,/usr/tests,g' \
${SRCDIR}/doc/atf.7.in atf.7.tmp
mv atf.7.tmp atf.7
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Tue Nov 2 15:09:52 UTC 2010 Modified Files: src/sys/kern: vfs_bio.c Log Message: Don't sleep forever if hz 25. from Alessandro Forin To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.224 src/sys/kern/vfs_bio.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/kern/vfs_bio.c diff -u src/sys/kern/vfs_bio.c:1.223 src/sys/kern/vfs_bio.c:1.224 --- src/sys/kern/vfs_bio.c:1.223 Tue Mar 2 14:22:44 2010 +++ src/sys/kern/vfs_bio.c Tue Nov 2 15:09:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_bio.c,v 1.223 2010/03/02 14:22:44 pooka Exp $ */ +/* $NetBSD: vfs_bio.c,v 1.224 2010/11/02 15:09:52 pooka Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -123,7 +123,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.223 2010/03/02 14:22:44 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_bio.c,v 1.224 2010/11/02 15:09:52 pooka Exp $); #include opt_bufcache.h @@ -1611,7 +1611,7 @@ if (nbusy_prev == 0) nbusy_prev = nbusy; printf(%d , nbusy); - kpause(bflush, false, (iter == 0) ? 1 : hz / 25 * iter, NULL); + kpause(bflush, false, MAX(1, hz / 25 * iter), NULL); if (nbusy = nbusy_prev) /* we didn't flush anything */ iter++; else
CVS commit: src/sys/kern
Module Name:src Committed By: pooka Date: Tue Nov 2 15:17:38 UTC 2010 Modified Files: src/sys/kern: kern_synch.c Log Message: KASSERT we don't kpause indefinitely without interruptability. XXX: using timo == 0 to mean sleep as long as you like, and forever if you're really tired is not the smartest interface considering the the hz/n idiom used to specify timo. This leads to unwanted behaviour when hz gets below some impossible-to-know limit. With a usec2ticks() routine it at least be a little more tolerable. To generate a diff of this commit: cvs rdiff -u -r1.283 -r1.284 src/sys/kern/kern_synch.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/kern/kern_synch.c diff -u src/sys/kern/kern_synch.c:1.283 src/sys/kern/kern_synch.c:1.284 --- src/sys/kern/kern_synch.c:1.283 Fri Apr 30 10:02:00 2010 +++ src/sys/kern/kern_synch.c Tue Nov 2 15:17:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_synch.c,v 1.283 2010/04/30 10:02:00 martin Exp $ */ +/* $NetBSD: kern_synch.c,v 1.284 2010/11/02 15:17:37 pooka Exp $ */ /*- * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009 @@ -69,7 +69,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kern_synch.c,v 1.283 2010/04/30 10:02:00 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: kern_synch.c,v 1.284 2010/11/02 15:17:37 pooka Exp $); #include opt_kstack.h #include opt_perfctrs.h @@ -256,6 +256,8 @@ sleepq_t *sq; int error; + KASSERT(!(timo == 0 intr == false)); + if (sleepq_dontsleep(l)) return sleepq_abort(NULL, 0);
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Nov 2 15:20:55 UTC 2010 Update of /cvsroot/src/external/public-domain/xz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29100 Log Message: Import stripped down version of xz-5.0.0. All non-public domain parts are removed to provide a prestine version. Status: Vendor Tag: XZ Release Tags: xz-5-0-0 N src/external/public-domain/xz/dist/PACKAGERS N src/external/public-domain/xz/dist/INSTALL N src/external/public-domain/xz/dist/ChangeLog N src/external/public-domain/xz/dist/config.h.in N src/external/public-domain/xz/dist/TODO N src/external/public-domain/xz/dist/THANKS N src/external/public-domain/xz/dist/NEWS N src/external/public-domain/xz/dist/COPYING N src/external/public-domain/xz/dist/AUTHORS N src/external/public-domain/xz/dist/configure.ac N src/external/public-domain/xz/dist/README N src/external/public-domain/xz/dist/tests/bcj_test.c N src/external/public-domain/xz/dist/tests/test_compress.sh N src/external/public-domain/xz/dist/tests/test_files.sh N src/external/public-domain/xz/dist/tests/tests.h N src/external/public-domain/xz/dist/tests/test_stream_flags.c N src/external/public-domain/xz/dist/tests/test_index.c N src/external/public-domain/xz/dist/tests/test_filter_flags.c N src/external/public-domain/xz/dist/tests/test_check.c N src/external/public-domain/xz/dist/tests/test_block_header.c N src/external/public-domain/xz/dist/tests/create_compress_files.c N src/external/public-domain/xz/dist/tests/compress_prepared_bcj_sparc.base64 N src/external/public-domain/xz/dist/tests/compress_prepared_bcj_x86.base64 N src/external/public-domain/xz/dist/tests/files/README N src/external/public-domain/xz/dist/tests/files/bad-0-footer_magic.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0-header_magic.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0-nonempty_index.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0cat-alone.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0catpad-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-0pad-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-block_header-5.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-check-crc32.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-vli-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-check-sha256.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-4.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-5.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-6.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-lzma2-7.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-stream_flags-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-stream_flags-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-stream_flags-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-1-vli-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-4.xz.base64 N src/external/public-domain/xz/dist/tests/files/bad-2-index-5.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-0-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-0cat-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-0pad-empty.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-3delta-lzma2.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-block_header-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-block_header-2.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-block_header-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-check-crc64.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-check-none.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-check-sha256.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-delta-lzma2.tiff.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-lzma2-1.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-lzma2-3.xz.base64 N src/external/public-domain/xz/dist/tests/files/good-1-lzma2-4.xz.base64 N
CVS commit: src/external/public-domain/xz/dist/src/liblzma/check
Module Name:src
Committed By: joerg
Date: Tue Nov 2 15:35:38 UTC 2010
Modified Files:
src/external/public-domain/xz/dist/src/liblzma/check: check.h
Log Message:
Use libc version of SHA256 on NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/public-domain/xz/dist/src/liblzma/check/check.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/public-domain/xz/dist/src/liblzma/check/check.h
diff -u src/external/public-domain/xz/dist/src/liblzma/check/check.h:1.1.1.1 src/external/public-domain/xz/dist/src/liblzma/check/check.h:1.2
--- src/external/public-domain/xz/dist/src/liblzma/check/check.h:1.1.1.1 Tue Nov 2 15:20:52 2010
+++ src/external/public-domain/xz/dist/src/liblzma/check/check.h Tue Nov 2 15:35:38 2010
@@ -15,6 +15,9 @@
#include common.h
+#ifdef NETBSD_NATIVE_SHA256
+#include sha2.h
+#endif
// Index hashing needs the best possible hash function (preferably
// a cryptographic hash) for maximum reliability.
@@ -43,7 +46,9 @@
union {
uint32_t crc32;
uint64_t crc64;
-
+#ifdef NETBSD_NATIVE_SHA256
+ SHA256_CTX sha256;
+#else
struct {
/// Internal state
uint32_t state[8];
@@ -51,6 +56,7 @@
/// Size of the message excluding padding
uint64_t size;
} sha256;
+#endif
} state;
} lzma_check_state;
@@ -81,7 +87,14 @@
/// Finish the check calculation and store the result to check-buffer.u8.
extern void lzma_check_finish(lzma_check_state *check, lzma_check type);
-
+#ifdef NETBSD_NATIVE_SHA256
+#define lzma_sha256_init(check) \
+ SHA256_Init((check)-state.sha256)
+#define lzma_sha256_update(buf,size,check) \
+ SHA256_Update((check)-state.sha256, buf, size)
+#define lzma_sha256_finish(check) \
+ SHA256_Final((check)-buffer.u8, (check)-state.sha256)
+#else
/// Prepare SHA-256 state for new input.
extern void lzma_sha256_init(lzma_check_state *check);
@@ -91,5 +104,6 @@
/// Finish the SHA-256 calculation and store the result to check-buffer.u8.
extern void lzma_sha256_finish(lzma_check_state *check);
+#endif
#endif
CVS commit: src/external/public-domain/xz/dist
Module Name:src Committed By: joerg Date: Tue Nov 2 15:40:58 UTC 2010 Modified Files: src/external/public-domain/xz/dist: configure.ac Log Message: Replace configure.ac with a stripped down version for later use by src/tools. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/public-domain/xz/dist/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/xz/dist/configure.ac diff -u src/external/public-domain/xz/dist/configure.ac:1.1.1.1 src/external/public-domain/xz/dist/configure.ac:1.2 --- src/external/public-domain/xz/dist/configure.ac:1.1.1.1 Tue Nov 2 15:20:27 2010 +++ src/external/public-domain/xz/dist/configure.ac Tue Nov 2 15:40:58 2010 @@ -15,174 +15,28 @@ # of malloc(), stat(), or lstat(), since we don't use those functions in # a way that would cause the problems the autoconf macros check. -AC_PREREQ([2.64]) +AC_PREREQ([2.52]) -AC_INIT([XZ Utils], m4_esyscmd([/bin/sh build-aux/version.sh]), - [lasse.col...@tukaani.org], [xz], [http://tukaani.org/xz/]) -AC_CONFIG_SRCDIR([src/liblzma/common/common.h]) -AC_CONFIG_AUX_DIR([build-aux]) +AC_INIT([XZ Utils], 5.0.0, [jo...@netbsd.org], [xz], [http://tukaani.org/xz/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_AUX_DIR([../../gnu/dist/autoconf/config]) -echo -echo $PACKAGE_STRING - -echo -echo System type: -# This is needed to know if assembler optimizations can be used. AC_CANONICAL_HOST - -# We do some special things on Windows (32-bit or 64-bit) builds. -case $host_os in - mingw* | cygwin*) is_w32=yes ;; - *)is_w32=no ;; -esac -AM_CONDITIONAL([COND_W32], [test $is_w32 = yes]) - -# We need to use $EXEEXT with $(LN_S) when creating symlinks to -# executables. Cygwin is an exception to this, since it is recommended -# that symlinks don't have the .exe suffix. To make this work, we -# define LN_EXEEXT. -case $host_os in - cygwin) LN_EXEEXT= ;; - *) LN_EXEEXT='$(EXEEXT)' ;; -esac -AC_SUBST([LN_EXEEXT]) - -echo -echo Configure options: -AM_CFLAGS= - - -# -# Debugging # -# - -AC_MSG_CHECKING([if debugging code should be compiled]) -AC_ARG_ENABLE([debug], AC_HELP_STRING([--enable-debug], [Enable debugging code.]), - [], enable_debug=no) -if test x$enable_debug = xyes; then - AC_MSG_RESULT([yes]) -else - AC_DEFINE([NDEBUG], [1], [Define to 1 to disable debugging code.]) - AC_MSG_RESULT([no]) -fi - +AC_USE_SYSTEM_EXTENSIONS ### # Filters # ### -m4_define([SUPPORTED_FILTERS], [lzma1,lzma2,delta,x86,powerpc,ia64,arm,armthumb,sparc])dnl -m4_define([SIMPLE_FILTERS], [x86,powerpc,ia64,arm,armthumb,sparc]) -m4_define([LZ_FILTERS], [lzma1,lzma2]) - -m4_foreach([NAME], [SUPPORTED_FILTERS], -[enable_filter_[]NAME=no -enable_encoder_[]NAME=no -enable_decoder_[]NAME=no -])dnl - -AC_MSG_CHECKING([which encoders to build]) -AC_ARG_ENABLE([encoders], AC_HELP_STRING([--enable-encoders=LIST], - [Comma-separated list of encoders to build. Default=all. - Available encoders:] - m4_translit(m4_defn([SUPPORTED_FILTERS]), [,], [ ])), - [], [enable_encoders=SUPPORTED_FILTERS]) -enable_encoders=`echo $enable_encoders | sed 's/,/ /g'` -if test x$enable_encoders = xno || test x$enable_encoders = x; then - AC_MSG_RESULT([(none)]) -else - for arg in $enable_encoders - do - case $arg in m4_foreach([NAME], [SUPPORTED_FILTERS], [ - NAME) -enable_filter_[]NAME=yes -enable_encoder_[]NAME=yes -AC_DEFINE(HAVE_ENCODER_[]m4_toupper(NAME), [1], -[Define to 1 if] NAME [encoder is enabled.]) -;;]) - *) -AC_MSG_RESULT([]) -AC_MSG_ERROR([unknown filter: $arg]) -;; - esac - done - AC_MSG_RESULT([$enable_encoders]) -fi - -AC_MSG_CHECKING([which decoders to build]) -AC_ARG_ENABLE([decoders], AC_HELP_STRING([--enable-decoders=LIST], - [Comma-separated list of decoders to build. Default=all. - Available decoders are the same as available encoders.]), - [], [enable_decoders=SUPPORTED_FILTERS]) -enable_decoders=`echo $enable_decoders | sed 's/,/ /g'` -if test x$enable_decoders = xno || test x$enable_decoders = x; then - AC_MSG_RESULT([(none)]) -else - for arg in $enable_decoders - do - case $arg in m4_foreach([NAME], [SUPPORTED_FILTERS], [ - NAME) -enable_filter_[]NAME=yes -enable_decoder_[]NAME=yes -AC_DEFINE(HAVE_DECODER_[]m4_toupper(NAME), [1], -[Define to 1 if] NAME [decoder is enabled.]) -;;]) - *) -AC_MSG_RESULT([]) -AC_MSG_ERROR([unknown filter: $arg]) -;; - esac - done - - # LZMA2 requires that LZMA1 is enabled. - test x$enable_encoder_lzma2 = xyes enable_encoder_lzma1=yes - test x$enable_decoder_lzma2 = xyes enable_decoder_lzma1=yes - - AC_MSG_RESULT([$enable_decoders]) -fi - -if test x$enable_encoder_lzma2$enable_encoder_lzma1 = xyesno \ - || test x$enable_decoder_lzma2$enable_decoder_lzma1 = xyesno; then - AC_MSG_ERROR([LZMA2 requires that
CVS commit: src/sys/arch/arc/conf
Module Name:src
Committed By: tsutsui
Date: Tue Nov 2 15:50:09 UTC 2010
Modified Files:
src/sys/arch/arc/conf: files.arc
Log Message:
Include files.ieee1394.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/arc/conf/files.arc
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/arc/conf/files.arc
diff -u src/sys/arch/arc/conf/files.arc:1.62 src/sys/arch/arc/conf/files.arc:1.63
--- src/sys/arch/arc/conf/files.arc:1.62 Wed Feb 20 21:43:33 2008
+++ src/sys/arch/arc/conf/files.arc Tue Nov 2 15:50:09 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.arc,v 1.62 2008/02/20 21:43:33 drochner Exp $
+# $NetBSD: files.arc,v 1.63 2010/11/02 15:50:09 tsutsui Exp $
# $OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
#
# maxpartitions must be first item in files.${ARCH}
@@ -267,6 +267,9 @@
# USB
include dev/usb/files.usb
+# IEEE1394
+include dev/ieee1394/files.ieee1394
+
#
# Common files
#
CVS commit: src/sys/arch/arc/pci
Module Name:src
Committed By: tsutsui
Date: Tue Nov 2 16:03:47 UTC 2010
Modified Files:
src/sys/arch/arc/pci: necpb.c
Log Message:
Use fixed pci_intr_handle_t per device number regardless of pin and swiz.
Tested the following multifunction card and devices over ppb(4)
on Express5800/230 (JC94):
---
uhci0 at pci0 dev 4 function 0: VIA Technologies VT83C572 USB Controller (rev.
0x61)
uhci0: interrupting at int C
usb0 at uhci0: USB revision 1.0
uhci1 at pci0 dev 4 function 1: VIA Technologies VT83C572 USB Controller (rev.
0x61)
uhci1: interrupting at int C
usb1 at uhci1: USB revision 1.0
ehci0 at pci0 dev 4 function 2: VIA Technologies VT8237 EHCI USB Controller
(rev. 0x63)
ehci0: interrupting at int C
ehci0: dropped intr workaround enabled
ehci0: EHCI version 1.0
ehci0: companion controllers, 2 ports each: uhci0 uhci1
usb2 at ehci0: USB revision 2.0
fwohci0 at pci0 dev 4 function 3: VIA Technologies VT6306 IEEE 1394 Host
Controller (rev. 0x46)
fwohci0: interrupting at int C
fwohci0: OHCI version 1.0 (ROM=1)
fwohci0: No. of Isochronous channels is 4.
fwohci0: EUI64 00:01:08:00:37:02:79:4f
fwohci0: Phy 1394a available S400, 3 ports.
fwohci0: Link S400, max_rec 1024 bytes.
fwohci0: max_rec 1024 - 2048
ieee1394if0 at fwohci0: IEEE1394 bus
fwip0 at ieee1394if0: IP over IEEE1394
fwohci0: Initiate bus reset
vge0 at pci0 dev 4 function 4: VIA VT612X Gigabit Ethernet (rev. 0x11)
vge0: interrupting at int C
vge0: Ethernet address: 00:01:08:00:b1:71
ciphy0 at vge0 phy 1: Cicada CS8201 10/100/1000TX PHY, rev. 2
ciphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, 1000baseT,
1000baseT-FDX, auto
:
---
ppb0 at pci0 dev 4 function 0: Digital Equipment DC21154 PCI-PCI Bridge (rev.
0x05)
pci1 at ppb0 bus 1
pci1: i/o space, memory space enabled
ex0 at pci1 dev 4 function 0: 3Com 3c980C-TXM 10/100 Ethernet (rev. 0x78)
ex0: interrupting at int C
ex0: MAC address 00:01:03:ce:74:48
bmtphy0 at ex0 phy 24: Broadcom 3c905C internal PHY, rev. 7
bmtphy0: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
ex1 at pci1 dev 5 function 0: 3Com 3c980C-TXM 10/100 Ethernet (rev. 0x78)
ex1: interrupting at int C
ex1: MAC address 00:01:03:ce:74:49
bmtphy1 at ex1 phy 24: Broadcom 3c905C internal PHY, rev. 7
bmtphy1: 10baseT, 10baseT-FDX, 100baseTX, 100baseTX-FDX, auto
:
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arc/pci/necpb.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/arc/pci/necpb.c
diff -u src/sys/arch/arc/pci/necpb.c:1.32 src/sys/arch/arc/pci/necpb.c:1.33
--- src/sys/arch/arc/pci/necpb.c:1.32 Sat Jul 5 08:46:25 2008
+++ src/sys/arch/arc/pci/necpb.c Tue Nov 2 16:03:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: necpb.c,v 1.32 2008/07/05 08:46:25 tsutsui Exp $ */
+/* $NetBSD: necpb.c,v 1.33 2010/11/02 16:03:47 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: necpb.c,v 1.32 2008/07/05 08:46:25 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: necpb.c,v 1.33 2010/11/02 16:03:47 tsutsui Exp $);
#include opt_pci.h
@@ -339,7 +339,6 @@
pci_chipset_tag_t pc = pa-pa_pc;
pcitag_t intrtag = pa-pa_intrtag;
int pin = pa-pa_intrpin;
- int swiz = pa-pa_intrswiz % 4;
int bus, dev;
if (pin == 0) {
@@ -363,13 +362,13 @@
switch (dev) {
case 3:
- *ihp = (pin - swiz + 2) % 4;
+ *ihp = 3;
break;
case 4:
- *ihp = (pin - swiz + 1) % 4;
+ *ihp = 2;
break;
case 5:
- *ihp = (pin - swiz + 0) % 4;
+ *ihp = 1;
break;
default:
*ihp = -1;
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Nov 2 16:34:36 UTC 2010
Modified Files:
src/compat: compatsubdir.mk
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/distrib/sets/lists/man: mi
src/external: Makefile
src/external/lib: Makefile
Added Files:
src/external/public-domain: Makefile
src/external/public-domain/xz: Makefile Makefile.inc prepare-import.sh
src/external/public-domain/xz/bin: Makefile
src/external/public-domain/xz/include: config.h
src/external/public-domain/xz/lib: Makefile shlib_version
Log Message:
Hook up xz into the build system.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/compat/compatsubdir.mk
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.884 -r1.885 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.552 -r1.553 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1518 -r1.1519 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.135 -r1.136 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.1244 -r1.1245 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.12 -r1.13 src/external/Makefile
cvs rdiff -u -r1.16 -r1.17 src/external/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/Makefile \
src/external/public-domain/xz/Makefile.inc \
src/external/public-domain/xz/prepare-import.sh
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/include/config.h
cvs rdiff -u -r0 -r1.1 src/external/public-domain/xz/lib/Makefile \
src/external/public-domain/xz/lib/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/compatsubdir.mk
diff -u src/compat/compatsubdir.mk:1.3 src/compat/compatsubdir.mk:1.4
--- src/compat/compatsubdir.mk:1.3 Tue Dec 15 05:23:25 2009
+++ src/compat/compatsubdir.mk Tue Nov 2 16:34:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: compatsubdir.mk,v 1.3 2009/12/15 05:23:25 mrg Exp $
+# $NetBSD: compatsubdir.mk,v 1.4 2010/11/02 16:34:33 joerg Exp $
# Build netbsd libraries.
@@ -27,6 +27,7 @@
../../../external/bsd/bind/lib \
../../../external/bsd/libevent/lib \
../../../external/bsd/file/lib \
+ ../../../external/public-domain/xz/lib \
../../../libexec/ld.elf_so
.if ${MKATF} != no
Index: src/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.22 src/distrib/sets/lists/base/ad.mips64eb:1.23
--- src/distrib/sets/lists/base/ad.mips64eb:1.22 Fri Sep 24 18:01:39 2010
+++ src/distrib/sets/lists/base/ad.mips64eb Tue Nov 2 16:34:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.22 2010/09/24 18:01:39 skrll Exp $
+# $NetBSD: ad.mips64eb,v 1.23 2010/11/02 16:34:33 joerg Exp $
./libexec/ld.elf_so-64base-compat-shlib compat,pic
./libexec/ld.elf_so-o32base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -123,6 +123,8 @@
./usr/lib/64/libldap_r.so.4.1 base-compat-shlib compat,pic,ldap
./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/64/liblwres.so.5.1 base-compat-shlib compat,pic
+./usr/lib/64/liblzma.so.1 base-compat-shlib compat,pic
+./usr/lib/64/liblzma.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/libm.so.0base-compat-shlib compat,pic
./usr/lib/64/libm.so.0.8 base-compat-shlib compat,pic
./usr/lib/64/libmagic.so.3 base-compat-shlib compat,pic
@@ -358,6 +360,8 @@
./usr/lib/o32/libldap_r.so.4.1 base-compat-shlib compat,pic,ldap
./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic
./usr/lib/o32/liblwres.so.5.1 base-compat-shlib compat,pic
+./usr/lib/o32/liblzma.so.1 base-compat-shlib compat,pic
+./usr/lib/o32/liblzma.so.1.0 base-compat-shlib compat,pic
./usr/lib/o32/libm.so.0base-compat-shlib compat,pic
./usr/lib/o32/libm.so.0.8 base-compat-shlib compat,pic
./usr/lib/o32/libmagic.so.3 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.21 src/distrib/sets/lists/base/ad.mips64el:1.22
--- src/distrib/sets/lists/base/ad.mips64el:1.21 Fri Sep 24 18:01:39 2010
+++ src/distrib/sets/lists/base/ad.mips64el Tue Nov 2 16:34:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.21 2010/09/24 18:01:39 skrll Exp $
+#
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Tue Nov 2 16:39:31 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Add entries for XZ 5.0.0 import. To generate a diff of this commit: cvs rdiff -u -r1.783 -r1.784 src/doc/3RDPARTY cvs rdiff -u -r1.1445 -r1.1446 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.783 src/doc/3RDPARTY:1.784 --- src/doc/3RDPARTY:1.783 Sun Oct 31 17:17:45 2010 +++ src/doc/3RDPARTY Tue Nov 2 16:39:31 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.783 2010/10/31 17:17:45 snj Exp $ +# $NetBSD: 3RDPARTY,v 1.784 2010/11/02 16:39:31 joerg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1147,3 +1147,16 @@ Responsible: mrg License: zlib Notes: + +Package: xz +Version: 5.0.0 +Current Vers: 5.0.0 +Maintainer: Lasse Collin lasse.col...@tukanni.org +Archive Site: http://tukaani.org/xz/ +Home Page: http://tukaani.org/xz/ +Responsible: joerg +License: public-domain +Notes: +1. See prepare-import script for stripping down the distribution. +2. Update configure.ac and use it to generate include/config.h. +3. Carefully check for GPL components leaked into the dist area. Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1445 src/doc/CHANGES:1.1446 --- src/doc/CHANGES:1.1445 Sun Oct 31 12:09:10 2010 +++ src/doc/CHANGES Tue Nov 2 16:39:31 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1445 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1446 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -765,3 +765,4 @@ [tsutsui 20101015] atf(7): Import 0.11. [jmmv 20101020] Lua: Import of Lua 5.1.4. [mbalmer 20103110] + XZ: Import of XZ 5.0.0. [joerg 20101102]
CVS commit: src/doc
Module Name:src Committed By: joerg Date: Tue Nov 2 16:39:53 UTC 2010 Modified Files: src/doc: CHANGES Log Message: ISOfy date of Lua import To generate a diff of this commit: cvs rdiff -u -r1.1446 -r1.1447 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1446 src/doc/CHANGES:1.1447 --- src/doc/CHANGES:1.1446 Tue Nov 2 16:39:31 2010 +++ src/doc/CHANGES Tue Nov 2 16:39:53 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1446 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1447 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -764,5 +764,5 @@ sun3: Make common kernel module binaries work on both sun3 and sun3x. [tsutsui 20101015] atf(7): Import 0.11. [jmmv 20101020] - Lua: Import of Lua 5.1.4. [mbalmer 20103110] + Lua: Import of Lua 5.1.4. [mbalmer 20101031] XZ: Import of XZ 5.0.0. [joerg 20101102]
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: gsutre Date: Tue Nov 2 16:45:48 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_util.c Log Message: acpi_eval_integer: check that the evaluation produced a result. ok jruoho@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/acpi_util.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/acpi/acpi_util.c diff -u src/sys/dev/acpi/acpi_util.c:1.5 src/sys/dev/acpi/acpi_util.c:1.6 --- src/sys/dev/acpi/acpi_util.c:1.5 Mon Jun 7 17:13:52 2010 +++ src/sys/dev/acpi/acpi_util.c Tue Nov 2 16:45:48 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_util.c,v 1.5 2010/06/07 17:13:52 jruoho Exp $ */ +/* $NetBSD: acpi_util.c,v 1.6 2010/11/02 16:45:48 gsutre Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_util.c,v 1.5 2010/06/07 17:13:52 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_util.c,v 1.6 2010/11/02 16:45:48 gsutre Exp $); #include sys/param.h @@ -90,6 +90,7 @@ if (handle == NULL) handle = ACPI_ROOT_OBJECT; + (void)memset(obj, 0, sizeof(obj)); buf.Pointer = obj; buf.Length = sizeof(obj); @@ -98,6 +99,10 @@ if (ACPI_FAILURE(rv)) return rv; + /* Check that evaluation produced a return value. */ + if (buf.Length == 0) + return AE_NULL_OBJECT; + if (obj.Type != ACPI_TYPE_INTEGER) return AE_TYPE;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Tue Nov 2 16:54:29 UTC 2010 Modified Files: src/sys/dev/pci: if_rtk_pci.c Log Message: Explicitly set PCI_COMMAND_MASTER_ENABLE, in case the platform firmware didn't. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/if_rtk_pci.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/pci/if_rtk_pci.c diff -u src/sys/dev/pci/if_rtk_pci.c:1.41 src/sys/dev/pci/if_rtk_pci.c:1.42 --- src/sys/dev/pci/if_rtk_pci.c:1.41 Tue Jul 27 21:02:00 2010 +++ src/sys/dev/pci/if_rtk_pci.c Tue Nov 2 16:54:29 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtk_pci.c,v 1.41 2010/07/27 21:02:00 jakllsch Exp $ */ +/* $NetBSD: if_rtk_pci.c,v 1.42 2010/11/02 16:54:29 jakllsch Exp $ */ /* * Copyright (c) 1997, 1998 @@ -47,7 +47,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_rtk_pci.c,v 1.41 2010/07/27 21:02:00 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: if_rtk_pci.c,v 1.42 2010/11/02 16:54:29 jakllsch Exp $); #include sys/param.h #include sys/systm.h @@ -158,6 +158,7 @@ bus_space_tag_t iot, memt; bus_space_handle_t ioh, memh; bus_size_t iosize, memsize; + pcireg_t csr; const char *intrstr = NULL; const struct rtk_type *t; bool ioh_valid, memh_valid; @@ -227,6 +228,10 @@ aprint_normal_dev(self, interrupting at %s\n, intrstr); + csr = pci_conf_read(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG); + csr |= PCI_COMMAND_MASTER_ENABLE; + pci_conf_write(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG, csr); + sc-sc_dmat = pa-pa_dmat; sc-sc_flags |= RTK_ENABLED;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Tue Nov 2 16:56:47 UTC 2010
Modified Files:
src/sys/dev/pci: if_nfe.c
Log Message:
Explicitly set PCI_COMMAND_MASTER_ENABLE.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_nfe.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/pci/if_nfe.c
diff -u src/sys/dev/pci/if_nfe.c:1.51 src/sys/dev/pci/if_nfe.c:1.52
--- src/sys/dev/pci/if_nfe.c:1.51 Mon Apr 5 07:20:26 2010
+++ src/sys/dev/pci/if_nfe.c Tue Nov 2 16:56:47 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.51 2010/04/05 07:20:26 joerg Exp $ */
+/* $NetBSD: if_nfe.c,v 1.52 2010/11/02 16:56:47 jakllsch Exp $ */
/* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_nfe.c,v 1.51 2010/04/05 07:20:26 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_nfe.c,v 1.52 2010/11/02 16:56:47 jakllsch Exp $);
#include opt_inet.h
#include vlan.h
@@ -219,7 +219,7 @@
const char *intrstr;
struct ifnet *ifp;
bus_size_t memsize;
- pcireg_t memtype;
+ pcireg_t memtype, csr;
char devinfo[256];
int mii_flags = 0;
@@ -258,6 +258,10 @@
sc-sc_dmat = pa-pa_dmat;
+ csr = pci_conf_read(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG);
+ csr |= PCI_COMMAND_MASTER_ENABLE;
+ pci_conf_write(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG, csr);
+
sc-sc_flags = 0;
switch (PCI_PRODUCT(pa-pa_id)) {
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: chs Date: Tue Nov 2 18:01:27 UTC 2010 Modified Files: src/sys/compat/linux/arch/alpha: linux_fcntl.h src/sys/compat/linux/arch/amd64: linux_fcntl.h src/sys/compat/linux/arch/arm: linux_fcntl.h src/sys/compat/linux/arch/i386: linux_fcntl.h src/sys/compat/linux/arch/m68k: linux_fcntl.h src/sys/compat/linux/arch/mips: linux_fcntl.h src/sys/compat/linux/arch/powerpc: linux_fcntl.h Log Message: define LINUX_O_CLOEXEC. sort definitions by value. consistently use hex instead of octal for the values. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/arch/alpha/linux_fcntl.h cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/arch/amd64/linux_fcntl.h cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/arch/arm/linux_fcntl.h cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/i386/linux_fcntl.h cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/arch/m68k/linux_fcntl.h cvs rdiff -u -r1.6 -r1.7 src/sys/compat/linux/arch/mips/linux_fcntl.h cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/powerpc/linux_fcntl.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/compat/linux/arch/alpha/linux_fcntl.h diff -u src/sys/compat/linux/arch/alpha/linux_fcntl.h:1.3 src/sys/compat/linux/arch/alpha/linux_fcntl.h:1.4 --- src/sys/compat/linux/arch/alpha/linux_fcntl.h:1.3 Tue Sep 21 19:26:19 2010 +++ src/sys/compat/linux/arch/alpha/linux_fcntl.h Tue Nov 2 18:01:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_fcntl.h,v 1.3 2010/09/21 19:26:19 chs Exp $ */ +/* $NetBSD: linux_fcntl.h,v 1.4 2010/11/02 18:01:25 chs Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39,19 +39,17 @@ /* read/write mode for open(2) defined in common/linux_fcntl.h */ /* flags used in open(2) */ -#define LINUX_O_CREAT 0x0200 -#define LINUX_O_TRUNC 0x0400 -#define LINUX_O_EXCL 0x0800 - -#define LINUX_O_NOCTTY 0x8000 - -#define LINUX_O_NONBLOCK 0x0004 -#define LINUX_O_APPEND 0x0008 +#define LINUX_O_NONBLOCK 0x04 +#define LINUX_O_APPEND 0x08 +#define LINUX_O_CREAT 0x000200 +#define LINUX_O_TRUNC 0x000400 +#define LINUX_O_EXCL 0x000800 #define LINUX_O_NDELAY LINUX_O_NONBLOCK -#define LINUX_O_SYNC 0x4000 -#define LINUX_O_DIRECTORY 0x8000 - -#define LINUX_FASYNC 0x2000 +#define LINUX_FASYNC 0x002000 +#define LINUX_O_SYNC 0x004000 +#define LINUX_O_NOCTTY 0x008000 +#define LINUX_O_DIRECTORY 0x04 +#define LINUX_O_CLOEXEC 0x20 /* fcntl(2) operations */ #define LINUX_F_DUPFD 0 Index: src/sys/compat/linux/arch/amd64/linux_fcntl.h diff -u src/sys/compat/linux/arch/amd64/linux_fcntl.h:1.3 src/sys/compat/linux/arch/amd64/linux_fcntl.h:1.4 --- src/sys/compat/linux/arch/amd64/linux_fcntl.h:1.3 Tue Sep 21 19:26:19 2010 +++ src/sys/compat/linux/arch/amd64/linux_fcntl.h Tue Nov 2 18:01:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_fcntl.h,v 1.3 2010/09/21 19:26:19 chs Exp $ */ +/* $NetBSD: linux_fcntl.h,v 1.4 2010/11/02 18:01:25 chs Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -31,23 +31,29 @@ * POSSIBILITY OF SUCH DAMAGE. */ +/* + * Various flag values used in Linux for open(2) and fcntl(2). + */ + #ifndef _AMD64_LINUX_FCNTL_H #define _AMD64_LINUX_FCNTL_H -#define LINUX_O_CREAT 0100 -#define LINUX_O_EXCL 0200 -#define LINUX_O_NOCTTY 0400 -#define LINUX_O_TRUNC 01000 -#define LINUX_O_APPEND 02000 -#define LINUX_O_NDELAY 04000 -#define LINUX_O_SYNC 01 -#define LINUX_FASYNC 02 -#define LINUX_O_DIRECTORY 0x1 +/* read/write mode for open(2) defined in common/linux_fcntl.h */ -#define LINUX_F_RDLCK 0 -#define LINUX_F_WRLCK 1 -#define LINUX_F_UNLCK 2 +/* flags used in open(2) */ +#define LINUX_O_CREAT 0x00040 +#define LINUX_O_EXCL 0x00080 +#define LINUX_O_NOCTTY 0x00100 +#define LINUX_O_TRUNC 0x00200 +#define LINUX_O_APPEND 0x00400 +#define LINUX_O_NONBLOCK 0x00800 +#define LINUX_O_NDELAY LINUX_O_NONBLOCK +#define LINUX_O_SYNC 0x01000 +#define LINUX_FASYNC 0x02000 +#define LINUX_O_DIRECTORY 0x1 +#define LINUX_O_CLOEXEC 0x8 +/* fcntl(2) operations */ #define LINUX_F_DUPFD 0 #define LINUX_F_GETFD 1 #define LINUX_F_SETFD 2 @@ -62,4 +68,8 @@ #define LINUX_F_SETLK64 13 #define LINUX_F_SETLKW64 14 +#define LINUX_F_RDLCK 0 +#define LINUX_F_WRLCK 1 +#define LINUX_F_UNLCK 2 + #endif /* !_AMD64_LINUX_FCNTL_H */ Index: src/sys/compat/linux/arch/arm/linux_fcntl.h diff -u src/sys/compat/linux/arch/arm/linux_fcntl.h:1.3 src/sys/compat/linux/arch/arm/linux_fcntl.h:1.4 --- src/sys/compat/linux/arch/arm/linux_fcntl.h:1.3 Tue Sep 21 19:26:19 2010 +++ src/sys/compat/linux/arch/arm/linux_fcntl.h Tue Nov 2 18:01:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_fcntl.h,v 1.3 2010/09/21 19:26:19 chs Exp $ */ +/* $NetBSD: linux_fcntl.h,v 1.4 2010/11/02 18:01:25 chs Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: chs
Date: Tue Nov 2 18:03:00 UTC 2010
Modified Files:
src/sys/compat/linux/common: linux_socket.c linux_socket.h
Log Message:
update linux_sys_socket() to understand the flags that are now
included in the type parameter. in linux_sys_sendmsg(),
if we see an SCM_CREDENTIALS control message, just drop it
instead of giving an error. the linux and native versions of
the cred-passing operation are very different and some apps
(eg. linux pulseaudio library talking to a native server)
will work without the control data.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/linux/common/linux_socket.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/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.107 src/sys/compat/linux/common/linux_socket.c:1.108
--- src/sys/compat/linux/common/linux_socket.c:1.107 Sat Nov 28 22:11:42 2009
+++ src/sys/compat/linux/common/linux_socket.c Tue Nov 2 18:02:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.107 2009/11/28 22:11:42 dsl Exp $ */
+/* $NetBSD: linux_socket.c,v 1.108 2010/11/02 18:02:59 chs Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_socket.c,v 1.107 2009/11/28 22:11:42 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_socket.c,v 1.108 2010/11/02 18:02:59 chs Exp $);
#if defined(_KERNEL_OPT)
#include opt_inet.h
@@ -70,6 +70,7 @@
#include sys/kauth.h
#include sys/syscallargs.h
#include sys/ktrace.h
+#include sys/fcntl.h
#include lib/libkern/libkern.h
@@ -84,6 +85,7 @@
#include compat/linux/common/linux_signal.h
#include compat/linux/common/linux_ioctl.h
#include compat/linux/common/linux_socket.h
+#include compat/linux/common/linux_fcntl.h
#if !defined(__alpha__) !defined(__amd64__)
#include compat/linux/common/linux_socketcall.h
#endif
@@ -200,13 +202,13 @@
{MSG_DONTWAIT, LINUX_MSG_DONTWAIT},
{MSG_BCAST, 0}, /* not supported, clear */
{MSG_MCAST, 0}, /* not supported, clear */
+ {MSG_NOSIGNAL, LINUX_MSG_NOSIGNAL},
{-1, /* not supp */ LINUX_MSG_PROBE},
{-1, /* not supp */ LINUX_MSG_FIN},
{-1, /* not supp */ LINUX_MSG_SYN},
{-1, /* not supp */ LINUX_MSG_CONFIRM},
{-1, /* not supp */ LINUX_MSG_RST},
{-1, /* not supp */ LINUX_MSG_ERRQUEUE},
- {-1, /* not supp */ LINUX_MSG_NOSIGNAL},
{-1, /* not supp */ LINUX_MSG_MORE},
};
@@ -297,15 +299,46 @@
syscallarg(int) protocol;
} */
struct sys___socket30_args bsa;
- int error;
+ struct sys_fcntl_args fsa;
+ register_t fretval[2];
+ int error, flags;
+
SCARG(bsa, protocol) = SCARG(uap, protocol);
- SCARG(bsa, type) = SCARG(uap, type);
+ SCARG(bsa, type) = SCARG(uap, type) LINUX_SOCK_TYPE_MASK;
SCARG(bsa, domain) = linux_to_bsd_domain(SCARG(uap, domain));
if (SCARG(bsa, domain) == -1)
return EINVAL;
+ flags = SCARG(uap, type) ~LINUX_SOCK_TYPE_MASK;
+ if (flags ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK))
+ return EINVAL;
error = sys___socket30(l, bsa, retval);
+ /*
+ * Linux overloads the type parameter to include some
+ * fcntl flags to be set on the file descriptor.
+ * Process those if creating the socket succeeded.
+ */
+
+ if (!error flags LINUX_SOCK_CLOEXEC) {
+ SCARG(fsa, fd) = *retval;
+ SCARG(fsa, cmd) = F_SETFD;
+ SCARG(fsa, arg) = (void *)(uintptr_t)FD_CLOEXEC;
+ (void) sys_fcntl(l, fsa, fretval);
+ }
+ if (!error flags LINUX_SOCK_NONBLOCK) {
+ SCARG(fsa, fd) = *retval;
+ SCARG(fsa, cmd) = F_SETFL;
+ SCARG(fsa, arg) = (void *)(uintptr_t)O_NONBLOCK;
+ error = sys_fcntl(l, fsa, fretval);
+ if (error) {
+ struct sys_close_args csa;
+
+ SCARG(csa, fd) = *retval;
+ (void) sys_close(l, csa, fretval);
+ }
+ }
+
#ifdef INET6
/*
* Linux AF_INET6 socket has IPV6_V6ONLY setsockopt set to 0 by
@@ -505,6 +538,14 @@
/* Linux SCM_RIGHTS is same as NetBSD */
break;
+case LINUX_SCM_CREDENTIALS:
+ /* no native equivalent, just drop it */
+ m_free(ctl_mbuf);
+ ctl_mbuf = NULL;
+ msg.msg_control = NULL;
+ msg.msg_controllen = 0;
+ goto skipcmsg;
+
default:
/* other types not supported */
error = EINVAL;
@@ -545,7 +586,7 @@
cmsg-cmsg_level = l_cmsg.cmsg_level;
cmsg-cmsg_type = l_cmsg.cmsg_type;
- /* Zero are between header and data */
+ /* Zero area between header and data */
memset(cmsg + 1, 0,
CMSG_ALIGN(sizeof(cmsg)) - sizeof(cmsg));
@@ -575,6 +616,7 @@
msg.msg_controllen);
}
+skipcmsg:
error = do_sys_sendmsg(l, SCARG(uap, s), msg, bflags, retval);
/* Freed internally */
ctl_mbuf = NULL;
Index: src/sys/compat/linux/common/linux_socket.h
diff -u src/sys/compat/linux/common/linux_socket.h:1.19 src/sys/compat/linux/common/linux_socket.h:1.20
CVS commit: src/sys/compat
Module Name:src
Committed By: chs
Date: Tue Nov 2 18:14:06 UTC 2010
Modified Files:
src/sys/compat/linux/common: linux_misc_notalpha.c linux_statfs.h
src/sys/compat/linux32/arch/amd64: linux32_machdep.c syscalls.master
src/sys/compat/linux32/common: linux32_misc.c linux32_types.h
Log Message:
implement the following syscalls for linux32:
truncate64
ftruncate64
profil
ioperm
iopl
setdomainname
modify_ldt
statfs64
fstatfs64
note that iopl(), ioperm() and modify_ldt() just call
the respective 64-bit handlers, which don't do anything yet.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 \
src/sys/compat/linux/common/linux_misc_notalpha.c
cvs rdiff -u -r1.4 -r1.5 src/sys/compat/linux/common/linux_statfs.h
cvs rdiff -u -r1.26 -r1.27 \
src/sys/compat/linux32/arch/amd64/linux32_machdep.c
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux32/arch/amd64/syscalls.master
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/linux32/common/linux32_misc.c
cvs rdiff -u -r1.13 -r1.14 src/sys/compat/linux32/common/linux32_types.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/compat/linux/common/linux_misc_notalpha.c
diff -u src/sys/compat/linux/common/linux_misc_notalpha.c:1.107 src/sys/compat/linux/common/linux_misc_notalpha.c:1.108
--- src/sys/compat/linux/common/linux_misc_notalpha.c:1.107 Wed Jul 7 01:30:35 2010
+++ src/sys/compat/linux/common/linux_misc_notalpha.c Tue Nov 2 18:14:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc_notalpha.c,v 1.107 2010/07/07 01:30:35 chs Exp $ */
+/* $NetBSD: linux_misc_notalpha.c,v 1.108 2010/11/02 18:14:05 chs Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,13 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_misc_notalpha.c,v 1.107 2010/07/07 01:30:35 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_misc_notalpha.c,v 1.108 2010/11/02 18:14:05 chs Exp $);
+
+/*
+ * Note that we must NOT include opt_compat_linux32.h here,
+ * the maze of ifdefs below relies on COMPAT_LINUX32 only being
+ * defined when this file is built for linux32.
+ */
#include sys/param.h
#include sys/systm.h
@@ -61,6 +67,7 @@
#include compat/linux/common/linux_util.h
#include compat/linux/common/linux_ipc.h
#include compat/linux/common/linux_sem.h
+#include compat/linux/common/linux_statfs.h
#include compat/linux/linux_syscallargs.h
@@ -79,10 +86,6 @@
#endif
#ifndef COMPAT_LINUX32
-#if !defined(__amd64__)
-static void bsd_to_linux_statfs64(const struct statvfs *,
- struct linux_statfs64 *);
-#endif
/*
* Alarm. This is a libc call which uses setitimer(2) in NetBSD.
@@ -401,49 +404,6 @@
return 0;
}
-#endif /* !amd64 */
-
-#if !defined(__amd64__)
-/*
- * Convert NetBSD statvfs structure to Linux statfs64 structure.
- * See comments in bsd_to_linux_statfs() for further background.
- * We can safely pass correct bsize and frsize here, since Linux glibc
- * statvfs() doesn't use statfs64().
- */
-static void
-bsd_to_linux_statfs64(const struct statvfs *bsp, struct linux_statfs64 *lsp)
-{
- int i, div;
-
- for (i = 0; i linux_fstypes_cnt; i++) {
- if (strcmp(bsp-f_fstypename, linux_fstypes[i].bsd) == 0) {
- lsp-l_ftype = linux_fstypes[i].linux;
- break;
- }
- }
-
- if (i == linux_fstypes_cnt) {
- DPRINTF((unhandled fstype in linux emulation: %s\n,
- bsp-f_fstypename));
- lsp-l_ftype = LINUX_DEFAULT_SUPER_MAGIC;
- }
-
- div = bsp-f_frsize ? (bsp-f_bsize / bsp-f_frsize) : 1;
- if (div == 0)
- div = 1;
- lsp-l_fbsize = bsp-f_bsize;
- lsp-l_ffrsize = bsp-f_frsize;
- lsp-l_fblocks = bsp-f_blocks / div;
- lsp-l_fbfree = bsp-f_bfree / div;
- lsp-l_fbavail = bsp-f_bavail / div;
- lsp-l_ffiles = bsp-f_files;
- lsp-l_fffree = bsp-f_ffree / div;
- /* Linux sets the fsid to 0..., we don't */
- lsp-l_ffsid.val[0] = bsp-f_fsidx.__fsid_val[0];
- lsp-l_ffsid.val[1] = bsp-f_fsidx.__fsid_val[1];
- lsp-l_fnamelen = bsp-f_namemax;
- (void)memset(lsp-l_fspare, 0, sizeof(lsp-l_fspare));
-}
/*
* Implement the fs stat functions. Straightforward.
@@ -497,5 +457,5 @@
STATVFSBUF_PUT(sb);
return error;
}
-#endif /* !__m68k__ !__amd64__ */
+#endif /* !__amd64__ */
#endif /* !COMPAT_LINUX32 */
Index: src/sys/compat/linux/common/linux_statfs.h
diff -u src/sys/compat/linux/common/linux_statfs.h:1.4 src/sys/compat/linux/common/linux_statfs.h:1.5
--- src/sys/compat/linux/common/linux_statfs.h:1.4 Sun Mar 15 15:55:51 2009
+++ src/sys/compat/linux/common/linux_statfs.h Tue Nov 2 18:14:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_statfs.h,v 1.4 2009/03/15 15:55:51 cegger Exp $ */
+/* $NetBSD: linux_statfs.h,v 1.5 2010/11/02 18:14:05 chs Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999 The NetBSD Foundation, Inc.
@@ -33,15 +33,17 @@
#ifndef _LINUX_STATFS_H
#define _LINUX_STATFS_H
-static void bsd_to_linux_statfs(const struct statvfs *,
+static void __unused
CVS commit: src/sys/compat/linux32/arch/amd64
Module Name:src
Committed By: chs
Date: Tue Nov 2 18:15:39 UTC 2010
Modified Files:
src/sys/compat/linux32/arch/amd64: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.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/compat/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.59 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.60
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.59 Wed Jul 7 01:31:54 2010
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Tue Nov 2 18:15:39 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.59 2010/07/07 01:31:54 chs Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.60 2010/11/02 18:15:39 chs Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2010/07/07 01:30:35 chs Exp
+ * created from NetBSD: syscalls.master,v 1.57 2010/11/02 18:14:06 chs Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -265,12 +265,18 @@
/* syscall: netbsd32_setpriority ret: int args: int int int */
#define LINUX32_SYS_netbsd32_setpriority 97
+/* syscall: netbsd32_profil ret: int args: netbsd32_voidp netbsd32_size_t netbsd32_u_long u_int */
+#define LINUX32_SYS_netbsd32_profil 98
+
/* syscall: statfs ret: int args: netbsd32_charp linux32_statfsp */
#define LINUX32_SYS_statfs 99
/* syscall: fstatfs ret: int args: int linux32_statfsp */
#define LINUX32_SYS_fstatfs 100
+/* syscall: ioperm ret: int args: unsigned int unsigned int int */
+#define LINUX32_SYS_ioperm 101
+
/* syscall: socketcall ret: int args: int netbsd32_voidp */
#define LINUX32_SYS_socketcall 102
@@ -292,6 +298,9 @@
/* syscall: olduname ret: int args: linux32_oldutsnamep_t */
#define LINUX32_SYS_olduname 109
+/* syscall: iopl ret: int args: int */
+#define LINUX32_SYS_iopl 110
+
/* syscall: wait4 ret: int args: int netbsd32_intp int netbsd32_rusage50p_t */
#define LINUX32_SYS_wait4 114
@@ -313,9 +322,15 @@
/* syscall: clone ret: int args: int netbsd32_voidp netbsd32_voidp netbsd32_voidp netbsd32_voidp */
#define LINUX32_SYS_clone 120
+/* syscall: setdomainname ret: int args: netbsd32_charp int */
+#define LINUX32_SYS_setdomainname 121
+
/* syscall: uname ret: int args: linux32_utsnamep */
#define LINUX32_SYS_uname 122
+/* syscall: modify_ldt ret: int args: int netbsd32_charp netbsd32_size_t */
+#define LINUX32_SYS_modify_ldt 123
+
/* syscall: mprotect ret: int args: netbsd32_voidp netbsd32_size_t int */
#define LINUX32_SYS_mprotect 125
@@ -457,6 +472,12 @@
/* syscall: mmap2 ret: linux32_off_t args: netbsd32_u_long netbsd32_size_t int int int linux32_off_t */
#define LINUX32_SYS_mmap2 192
+/* syscall: truncate64 ret: int args: netbsd32_charp uint32_t uint32_t */
+#define LINUX32_SYS_truncate64 193
+
+/* syscall: ftruncate64 ret: int args: unsigned int uint32_t uint32_t */
+#define LINUX32_SYS_ftruncate64 194
+
/* syscall: stat64 ret: int args: netbsd32_charp linux32_stat64p */
#define LINUX32_SYS_stat64 195
@@ -576,6 +597,12 @@
/* syscall: clock_nanosleep ret: int args: clockid_t int linux32_timespecp_t linux32_timespecp_t */
#define LINUX32_SYS_clock_nanosleep 267
+/* syscall: statfs64 ret: int args: netbsd32_charp netbsd32_size_t linux32_statfs64p */
+#define LINUX32_SYS_statfs64 268
+
+/* syscall: fstatfs64 ret: int args: int netbsd32_size_t linux32_statfs64p */
+#define LINUX32_SYS_fstatfs64 269
+
/* syscall: tgkill ret: int args: int int int */
#define LINUX32_SYS_tgkill 270
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.59 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.60
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.59 Wed Jul 7 01:31:54 2010
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Tue Nov 2 18:15:39 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.59 2010/07/07 01:31:54 chs Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.60 2010/11/02 18:15:39 chs Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.56 2010/07/07 01:30:35 chs Exp
+ * created from NetBSD: syscalls.master,v 1.57 2010/11/02 18:14:06 chs Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -316,6 +316,8 @@
struct netbsd32_setpriority_args;
+struct netbsd32_profil_args;
+
struct linux32_sys_statfs_args {
syscallarg(netbsd32_charp) path;
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Nov 2 19:12:48 UTC 2010
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/etc/mtree: NetBSD.dist.base
src/external/public-domain/xz/lib: Makefile
Log Message:
Install XZ's header files.
To generate a diff of this commit:
cvs rdiff -u -r1.885 -r1.886 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1519 -r1.1520 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.54 -r1.55 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/external/public-domain/xz/lib/Makefile
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/base/mi
diff -u src/distrib/sets/lists/base/mi:1.885 src/distrib/sets/lists/base/mi:1.886
--- src/distrib/sets/lists/base/mi:1.885 Tue Nov 2 16:34:33 2010
+++ src/distrib/sets/lists/base/mi Tue Nov 2 19:12:46 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.885 2010/11/02 16:34:33 joerg Exp $
+# $NetBSD: mi,v 1.886 2010/11/02 19:12:46 joerg Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -775,6 +775,7 @@
./usr/include/kerberosIV base-obsolete obsolete
./usr/include/krb5base-c-usr
./usr/include/libmilterbase-obsolete obsolete
+./usr/include/lzmabase-c-usr
./usr/include/machinebase-c-usr
./usr/include/milterbase-obsolete obsolete
./usr/include/miscfsbase-c-usr
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1519 src/distrib/sets/lists/comp/mi:1.1520
--- src/distrib/sets/lists/comp/mi:1.1519 Tue Nov 2 16:34:34 2010
+++ src/distrib/sets/lists/comp/mi Tue Nov 2 19:12:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1519 2010/11/02 16:34:34 joerg Exp $
+# $NetBSD: mi,v 1.1520 2010/11/02 19:12:47 joerg Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -1406,6 +1406,21 @@
./usr/include/lwp.hcomp-c-include
./usr/include/lzf.hcomp-c-include
./usr/include/lzfP.hcomp-c-include
+./usr/include/lzma.hcomp-c-include
+./usr/include/lzma/base.h comp-c-include
+./usr/include/lzma/bcj.h comp-c-include
+./usr/include/lzma/block.h comp-c-include
+./usr/include/lzma/check.h comp-c-include
+./usr/include/lzma/container.h comp-c-include
+./usr/include/lzma/delta.h comp-c-include
+./usr/include/lzma/filter.h comp-c-include
+./usr/include/lzma/hardware.h comp-c-include
+./usr/include/lzma/index.h comp-c-include
+./usr/include/lzma/index_hash.h comp-c-include
+./usr/include/lzma/lzma.h comp-c-include
+./usr/include/lzma/stream_flags.h comp-c-include
+./usr/include/lzma/version.h comp-c-include
+./usr/include/lzma/vli.h comp-c-include
./usr/include/magic.hcomp-c-include
./usr/include/malloc.hcomp-c-include
./usr/include/math.hcomp-c-include
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.54 src/etc/mtree/NetBSD.dist.base:1.55
--- src/etc/mtree/NetBSD.dist.base:1.54 Sun Oct 31 11:52:53 2010
+++ src/etc/mtree/NetBSD.dist.base Tue Nov 2 19:12:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.54 2010/10/31 11:52:53 mbalmer Exp $
+# $NetBSD: NetBSD.dist.base,v 1.55 2010/11/02 19:12:48 joerg Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -125,6 +125,7 @@
./usr/include/isofs/cd9660
./usr/include/kadm5
./usr/include/krb5
+./usr/include/lzma
./usr/include/miscfs
./usr/include/miscfs/fdesc
./usr/include/miscfs/fifofs
Index: src/external/public-domain/xz/lib/Makefile
diff -u src/external/public-domain/xz/lib/Makefile:1.1 src/external/public-domain/xz/lib/Makefile:1.2
--- src/external/public-domain/xz/lib/Makefile:1.1 Tue Nov 2 16:34:36 2010
+++ src/external/public-domain/xz/lib/Makefile Tue Nov 2 19:12:48 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/11/02 16:34:36 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/02 19:12:48 joerg Exp $
LIB= lzma
USE_SHLIBDIR= yes
@@ -6,6 +6,24 @@
.include bsd.init.mk
+# There are two different lzma.h files.
+# Copy public version to distinguish them.
+pub-lzma.h: ${XZSRCDIR}/src/liblzma/api/lzma.h
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_CAT} ${XZSRCDIR}/src/liblzma/api/lzma.h ${.TARGET}
+CLEANFILES+= pub-lzma.h
+INCS= pub-lzma.h
+INCSDIR_pub-lzma.h= /usr/include
+INCSNAME_pub-lzma.h= lzma.h
+
+.PATH: ${XZSRCDIR}/src/liblzma/api/lzma
+INCS+= base.h bcj.h block.h check.h container.h delta.h \
+ filter.h hardware.h index.h index_hash.h lzma.h stream_flags.h \
+ version.h vli.h
+
+INCSDIR= /usr/include/lzma
+
LDFLAGS+= -Wl,-z,defs
CPPFLAGS+= -I${XZSRCDIR}/src/liblzma/check
CVS commit: src/share/mk
Module Name:src Committed By: joerg Date: Tue Nov 2 19:13:58 UTC 2010 Modified Files: src/share/mk: bsd.hostprog.mk Log Message: Add LIBLZMA. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/share/mk/bsd.hostprog.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.hostprog.mk diff -u src/share/mk/bsd.hostprog.mk:1.57 src/share/mk/bsd.hostprog.mk:1.58 --- src/share/mk/bsd.hostprog.mk:1.57 Wed Feb 3 15:34:44 2010 +++ src/share/mk/bsd.hostprog.mk Tue Nov 2 19:13:58 2010 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.hostprog.mk,v 1.57 2010/02/03 15:34:44 roy Exp $ +# $NetBSD: bsd.hostprog.mk,v 1.58 2010/11/02 19:13:58 joerg Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .include bsd.init.mk @@ -28,6 +28,7 @@ LIBIPSEC?= /usr/lib/libipsec.a LIBKVM?= /usr/lib/libkvm.a LIBL?= /usr/lib/libl.a +LIBLZMA?= /usr/lib/liblzma.a LIBM?= /usr/lib/libm.a LIBMAGIC?= /usr/lib/libmagic.a LIBMENU?= /usr/lib/libmenu.a
CVS commit: src/external/bsd/libarchive
Module Name:src
Committed By: joerg
Date: Tue Nov 2 19:14:54 UTC 2010
Modified Files:
src/external/bsd/libarchive/bin: Makefile.inc
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile
Log Message:
Enable direct XZ support
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/bin/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libarchive/lib/libarchive/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/bsd/libarchive/bin/Makefile.inc
diff -u src/external/bsd/libarchive/bin/Makefile.inc:1.2 src/external/bsd/libarchive/bin/Makefile.inc:1.3
--- src/external/bsd/libarchive/bin/Makefile.inc:1.2 Sat Feb 20 02:55:53 2010
+++ src/external/bsd/libarchive/bin/Makefile.inc Tue Nov 2 19:14:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2010/02/20 02:55:53 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3 2010/11/02 19:14:53 joerg Exp $
.include ../Makefile.inc
@@ -8,6 +8,6 @@
LDSTATIC?= -static
.endif
-DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
-LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -lz
+DPADD= ${LIBARCHIVE_FE} ${LIBARCHIVE} ${LIBBZ2} ${LIBLZMA} ${LIBZ}
+LDADD= -L${LIBARCHIVE_FE_DIR} -larchive_fe -larchive -lbz2 -llzma -lz
CPPFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe
Index: src/external/bsd/libarchive/include/config_netbsd.h
diff -u src/external/bsd/libarchive/include/config_netbsd.h:1.4 src/external/bsd/libarchive/include/config_netbsd.h:1.5
--- src/external/bsd/libarchive/include/config_netbsd.h:1.4 Wed Jul 14 22:14:17 2010
+++ src/external/bsd/libarchive/include/config_netbsd.h Tue Nov 2 19:14:54 2010
@@ -305,7 +305,7 @@
/* #undef HAVE_LIBEXPAT */
/* Define to 1 if you have the `lzma' library (-llzma). */
-/* #undef HAVE_LIBLZMA */
+#define HAVE_LIBLZMA 1
/* Define to 1 if you have the `lzmadec' library (-llzmadec). */
/* #undef HAVE_LIBLZMADEC */
@@ -357,7 +357,7 @@
/* #undef HAVE_LZMADEC_H */
/* Define to 1 if you have the lzma.h header file. */
-/* #undef HAVE_LZMA_H */
+#define HAVE_LZMA_H 1
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.2 src/external/bsd/libarchive/lib/libarchive/Makefile:1.3
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.2 Sat Feb 20 22:49:22 2010
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Tue Nov 2 19:14:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/02/20 22:49:22 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/02 19:14:54 joerg Exp $
.include bsd.init.mk
@@ -7,6 +7,7 @@
LIB= archive
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2 \
+ lzma ${NETBSDSRCDIR}/external/public-domain/xz/lib \
z ${NETBSDSRCDIR}/lib/libz
SRCS= archive_check_magic.c \
CVS commit: src/external
Module Name:src Committed By: joerg Date: Tue Nov 2 19:17:02 UTC 2010 Modified Files: src/external: README Log Message: Add public-domain To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/README diff -u src/external/README:1.12 src/external/README:1.13 --- src/external/README:1.12 Sun Oct 24 23:38:06 2010 +++ src/external/README Tue Nov 2 19:17:02 2010 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.12 2010/10/24 23:38:06 wiz Exp $ +$NetBSD: README,v 1.13 2010/11/02 19:17:02 joerg Exp $ Organization of Sources: @@ -77,6 +77,9 @@ mit MIT (X11) style license. http://www.opensource.org/licenses/mit-license.php + public-domain Non-license for code that has been explicitly put + into the Public Domain. + zlib Zlib (BSD-like) license. http://www.zlib.net/zlib_license.html
CVS commit: src/sys/arch/ofppc/ofppc
Module Name:src
Committed By: phx
Date: Tue Nov 2 19:19:22 UTC 2010
Modified Files:
src/sys/arch/ofppc/ofppc: machdep.c
Log Message:
Default vesa mode for Pegasos is 0x103, not 0x102.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/ofppc/ofppc/machdep.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/ofppc/ofppc/machdep.c
diff -u src/sys/arch/ofppc/ofppc/machdep.c:1.112 src/sys/arch/ofppc/ofppc/machdep.c:1.113
--- src/sys/arch/ofppc/ofppc/machdep.c:1.112 Wed Mar 10 18:18:47 2010
+++ src/sys/arch/ofppc/ofppc/machdep.c Tue Nov 2 19:19:22 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.112 2010/03/10 18:18:47 kiyohara Exp $ */
+/* $NetBSD: machdep.c,v 1.113 2010/11/02 19:19:22 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.112 2010/03/10 18:18:47 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.113 2010/11/02 19:19:22 phx Exp $);
#include sys/param.h
#include sys/systm.h
@@ -118,11 +118,10 @@
char buf[32];
int i;
- modeldata.ranges_offset = 1;
modeldata.pciiodata[0].start = 0x1400;
modeldata.pciiodata[0].limit = 0x;
- /* the pegasos doesn't bother to set the L2 cache up*/
+ /* the pegasos doesn't bother to set the L2 cache up */
l2cr_config = L2CR_L2PE;
/* fix the device_type property of a graphics card */
@@ -161,7 +160,7 @@
}
}
if (!mode) {
- mode = 0x102;
+ mode = 0x103;
width = 800;
height = 600;
}
CVS commit: src/usr.bin/rfcomm_sppd
Module Name:src Committed By: plunky Date: Tue Nov 2 19:44:09 UTC 2010 Modified Files: src/usr.bin/rfcomm_sppd: rfcomm_sppd.1 Log Message: -s can be used in server mode too To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/rfcomm_sppd/rfcomm_sppd.1 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/rfcomm_sppd/rfcomm_sppd.1 diff -u src/usr.bin/rfcomm_sppd/rfcomm_sppd.1:1.7 src/usr.bin/rfcomm_sppd/rfcomm_sppd.1:1.8 --- src/usr.bin/rfcomm_sppd/rfcomm_sppd.1:1.7 Thu Sep 24 18:30:37 2009 +++ src/usr.bin/rfcomm_sppd/rfcomm_sppd.1 Tue Nov 2 19:44:09 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: rfcomm_sppd.1,v 1.7 2009/09/24 18:30:37 plunky Exp $ +.\ $NetBSD: rfcomm_sppd.1,v 1.8 2010/11/02 19:44:09 plunky Exp $ .\ .\ Copyright (c) 2006 Itronix Inc. .\ All rights reserved. @@ -52,7 +52,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd September 24, 2009 +.Dd November 2, 2010 .Dt RFCOMM_SPPD 1 .Os .Sh NAME @@ -137,7 +137,7 @@ In client mode where Service Discovery is being used, this value will be ignored. .It Fl s Ar service -This is the service class that will be searched for on the remote device. +Name of service class to connect to or register. If no .Ar service is given, the default
CVS commit: src
Module Name:src Committed By: skrll Date: Tue Nov 2 20:49:48 UTC 2010 Modified Files: src/lib/libc/sys: _lwp_unpark.2 _lwp_unpark_all.2 src/lib/libpthread: pthread_cond.c src/sys/dev/tc: stic.c src/sys/uvm: uvm_kmguard.c Log Message: Spell immediately correctly. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libc/sys/_lwp_unpark.2 cvs rdiff -u -r1.5 -r1.6 src/lib/libc/sys/_lwp_unpark_all.2 cvs rdiff -u -r1.55 -r1.56 src/lib/libpthread/pthread_cond.c cvs rdiff -u -r1.46 -r1.47 src/sys/dev/tc/stic.c cvs rdiff -u -r1.3 -r1.4 src/sys/uvm/uvm_kmguard.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/libc/sys/_lwp_unpark.2 diff -u src/lib/libc/sys/_lwp_unpark.2:1.3 src/lib/libc/sys/_lwp_unpark.2:1.4 --- src/lib/libc/sys/_lwp_unpark.2:1.3 Wed Apr 30 13:10:51 2008 +++ src/lib/libc/sys/_lwp_unpark.2 Tue Nov 2 20:49:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: _lwp_unpark.2,v 1.3 2008/04/30 13:10:51 martin Exp $ +.\ $NetBSD: _lwp_unpark.2,v 1.4 2010/11/02 20:49:47 skrll Exp $ .\ .\ Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -47,7 +47,7 @@ The target LWP is assumed to be waiting in the kernel as a result of a call to .Fn _lwp_park . -If the target LWP is not currently waiting, it will return immediatley +If the target LWP is not currently waiting, it will return immediately upon the next call to .Fn _lwp_park . .Pp Index: src/lib/libc/sys/_lwp_unpark_all.2 diff -u src/lib/libc/sys/_lwp_unpark_all.2:1.5 src/lib/libc/sys/_lwp_unpark_all.2:1.6 --- src/lib/libc/sys/_lwp_unpark_all.2:1.5 Wed Apr 30 13:10:51 2008 +++ src/lib/libc/sys/_lwp_unpark_all.2 Tue Nov 2 20:49:47 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: _lwp_unpark_all.2,v 1.5 2008/04/30 13:10:51 martin Exp $ +.\ $NetBSD: _lwp_unpark_all.2,v 1.6 2010/11/02 20:49:47 skrll Exp $ .\ .\ Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,7 +49,7 @@ calls to .Fn _lwp_park . If any of the target LWPs are not currently waiting, those LWPs will return -immediatley upon the next call to +immediately upon the next call to .Fn _lwp_park . .Pp The value pointed to by Index: src/lib/libpthread/pthread_cond.c diff -u src/lib/libpthread/pthread_cond.c:1.55 src/lib/libpthread/pthread_cond.c:1.56 --- src/lib/libpthread/pthread_cond.c:1.55 Tue Mar 23 20:35:44 2010 +++ src/lib/libpthread/pthread_cond.c Tue Nov 2 20:49:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_cond.c,v 1.55 2010/03/23 20:35:44 drochner Exp $ */ +/* $NetBSD: pthread_cond.c,v 1.56 2010/11/02 20:49:47 skrll Exp $ */ /*- * Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -46,7 +46,7 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: pthread_cond.c,v 1.55 2010/03/23 20:35:44 drochner Exp $); +__RCSID($NetBSD: pthread_cond.c,v 1.56 2010/11/02 20:49:47 skrll Exp $); #include errno.h #include sys/time.h @@ -234,7 +234,7 @@ /* * For all valid uses of pthread_cond_signal(), the caller will * hold the mutex that the target is using to synchronize with. - * To avoid the target awakening and immediatley blocking on the + * To avoid the target awakening and immediately blocking on the * mutex, transfer the thread to be awoken to the current thread's * deferred wakeup list. The waiter will be set running when the * caller (this thread) releases the mutex. Index: src/sys/dev/tc/stic.c diff -u src/sys/dev/tc/stic.c:1.46 src/sys/dev/tc/stic.c:1.47 --- src/sys/dev/tc/stic.c:1.46 Sat Aug 22 17:38:06 2009 +++ src/sys/dev/tc/stic.c Tue Nov 2 20:49:47 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: stic.c,v 1.46 2009/08/22 17:38:06 tsutsui Exp $ */ +/* $NetBSD: stic.c,v 1.47 2010/11/02 20:49:47 skrll Exp $ */ /*- * Copyright (c) 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: stic.c,v 1.46 2009/08/22 17:38:06 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: stic.c,v 1.47 2010/11/02 20:49:47 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -740,7 +740,7 @@ /* * XXX Since we don't yet receive vblank interrupts from the - * PXG, we must flush immediatley. + * PXG, we must flush immediately. */ if (si-si_disptype == WSDISPLAY_TYPE_PXG) stic_flush(si); @@ -1135,7 +1135,7 @@ /* * XXX Since we don't yet receive vblank interrupts from the - * PXG, we must flush immediatley. + * PXG, we must flush immediately. */ if (si-si_disptype == WSDISPLAY_TYPE_PXG) stic_flush(si); @@ -1275,7 +1275,7 @@ /* * XXX Since we don't yet receive vblank interrupts from the PXG, we - * must flush immediatley. + * must flush immediately. */ if (si-si_disptype == WSDISPLAY_TYPE_PXG) stic_flush(si); @@ -1352,7 +1352,7 @@ /* * XXX Since we don't yet receive vblank interrupts from the PXG, we - * must flush immediatley. + * must flush
CVS commit: src/sys/net
Module Name:src Committed By: christos Date: Tue Nov 2 22:34:21 UTC 2010 Modified Files: src/sys/net: if.c Log Message: PR/44030: Onno van der Linden: ifreqn2o gets called with the parameters the wrong way around in /sys/net/if.c To generate a diff of this commit: cvs rdiff -u -r1.245 -r1.246 src/sys/net/if.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/net/if.c diff -u src/sys/net/if.c:1.245 src/sys/net/if.c:1.246 --- src/sys/net/if.c:1.245 Thu Sep 23 17:16:42 2010 +++ src/sys/net/if.c Tue Nov 2 18:34:21 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if.c,v 1.245 2010/09/23 21:16:42 christos Exp $ */ +/* $NetBSD: if.c,v 1.246 2010/11/02 22:34:21 christos Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -90,7 +90,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if.c,v 1.245 2010/09/23 21:16:42 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: if.c,v 1.246 2010/11/02 22:34:21 christos Exp $); #include opt_inet.h @@ -1817,7 +1817,7 @@ } #ifdef COMPAT_OIFREQ if (cmd != ocmd) - ifreqn2o(ifr, oifr); + ifreqn2o(oifr, ifr); #endif return error;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: macallan
Date: Wed Nov 3 00:49:04 UTC 2010
Modified Files:
src/sys/dev/pci: files.pci radeonfb.c radeonfb_bios.c radeonfbvar.h
Log Message:
pull in rasops8 for radeonfb, while there defflag a bunch of options and
make them all use the same prefix
To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.330 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/radeonfb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/radeonfb_bios.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/radeonfbvar.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/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.329 src/sys/dev/pci/files.pci:1.330
--- src/sys/dev/pci/files.pci:1.329 Mon May 24 20:29:41 2010
+++ src/sys/dev/pci/files.pci Wed Nov 3 00:49:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.329 2010/05/24 20:29:41 pgoyette Exp $
+# $NetBSD: files.pci,v 1.330 2010/11/03 00:49:02 macallan Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -800,12 +800,15 @@
# ATI Radeon framebuffer console driver
# (Note: to enable the BIOS parser, add options RADEON_BIOS_INIT to the config)
-device radeonfb: wsemuldisplaydev, videomode, rasops32, vcons, splash, iic, i2c_bitbang, ddc_read_edid, edid, drm
+device radeonfb: wsemuldisplaydev, videomode, rasops8, rasops32, vcons, splash, iic, i2c_bitbang, ddc_read_edid, edid, drm
attach radeonfb at pci
file dev/pci/radeonfb.c radeonfb
file dev/pci/radeonfb_i2c.c radeonfb
file dev/pci/radeonfb_bios.c radeonfb
defflag opt_radeonfb.h RADEONFB_DEBUG
+defflag opt_radeonfb.h RADEONFB_BIOS_INIT
+defflag opt_radeonfb.h RADEONFB_BIOS_DEBUG
+defflag opt_radeonfb.h RADEONFB_MMAP_BARS
# Chelsio Terminator 3 (T3) 10 gigabit ethernet
device cxgbc { }
Index: src/sys/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.38 src/sys/dev/pci/radeonfb.c:1.39
--- src/sys/dev/pci/radeonfb.c:1.38 Tue Nov 2 14:32:58 2010
+++ src/sys/dev/pci/radeonfb.c Wed Nov 3 00:49:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.38 2010/11/02 14:32:58 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.39 2010/11/03 00:49:02 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.38 2010/11/02 14:32:58 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeonfb.c,v 1.39 2010/11/03 00:49:02 macallan Exp $);
#define RADEONFB_DEFAULT_DEPTH 8
@@ -572,10 +572,9 @@
radeonfb_loadbios(sc, pa);
-#ifdef RADEON_BIOS_INIT
+#ifdef RADEONFB_BIOS_INIT
if (radeonfb_bios_init(sc)) {
aprint_error(%s: BIOS inititialization failed\n, XNAME(sc));
- goto error;
}
#endif
Index: src/sys/dev/pci/radeonfb_bios.c
diff -u src/sys/dev/pci/radeonfb_bios.c:1.3 src/sys/dev/pci/radeonfb_bios.c:1.4
--- src/sys/dev/pci/radeonfb_bios.c:1.3 Sat Jan 3 03:43:22 2009
+++ src/sys/dev/pci/radeonfb_bios.c Wed Nov 3 00:49:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb_bios.c,v 1.3 2009/01/03 03:43:22 yamt Exp $ */
+/* $NetBSD: radeonfb_bios.c,v 1.4 2010/11/03 00:49:02 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeonfb_bios.c,v 1.3 2009/01/03 03:43:22 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeonfb_bios.c,v 1.4 2010/11/03 00:49:02 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -53,7 +53,9 @@
#include dev/pci/radeonfbreg.h
#include dev/pci/radeonfbvar.h
-#ifdef RADEON_BIOS_INIT
+#include opt_radeonfb.h
+
+#ifdef RADEONFB_BIOS_INIT
/*
* Globals for the entire BIOS.
@@ -106,7 +108,7 @@
#define PLL_WAIT_CHK_SET_CLK_PWRMGT_CNTL24 5
-#ifdef RADEON_BIOS_DEBUG
+#ifdef RADEONFB_BIOS_DEBUG
#define DPRINTF(x) printf x
#else
#define DPRINTF(x)
Index: src/sys/dev/pci/radeonfbvar.h
diff -u src/sys/dev/pci/radeonfbvar.h:1.9 src/sys/dev/pci/radeonfbvar.h:1.10
--- src/sys/dev/pci/radeonfbvar.h:1.9 Tue Nov 2 14:32:58 2010
+++ src/sys/dev/pci/radeonfbvar.h Wed Nov 3 00:49:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfbvar.h,v 1.9 2010/11/02 14:32:58 macallan Exp $ */
+/* $NetBSD: radeonfbvar.h,v 1.10 2010/11/03 00:49:02 macallan Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -363,9 +363,7 @@
void radeonfb_putpll(struct radeonfb_softc *, uint32_t, uint32_t);
void radeonfb_maskpll(struct radeonfb_softc *, uint32_t, uint32_t, uint32_t);
-#ifdef RADEON_BIOS_INIT
int radeonfb_bios_init(struct radeonfb_softc *);
-#endif
void radeonfb_i2c_init(struct radeonfb_softc *);
int radeonfb_i2c_read_edid(struct radeonfb_softc *, int, uint8_t *);
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Wed Nov 3 02:27:56 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: packet-print.c Log Message: Don't call exit(3) from library context - brought in with the initial import, so pink (rather than red) face here. Pointed out by Peter Pentchev in PR 44027. Thanks! To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 \ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.37 src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.38 --- src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c:1.37 Sun Aug 15 07:52:27 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/packet-print.c Wed Nov 3 02:27:56 2010 @@ -58,7 +58,7 @@ #if defined(__NetBSD__) __COPYRIGHT(@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved.); -__RCSID($NetBSD: packet-print.c,v 1.37 2010/08/15 07:52:27 agc Exp $); +__RCSID($NetBSD: packet-print.c,v 1.38 2010/11/03 02:27:56 agc Exp $); #endif #include string.h @@ -1406,7 +1406,7 @@ print_tagname(print-indent, UNKNOWN PACKET TYPE); fprintf(stderr, __ops_print_packet: unknown tag=%d (0x%x)\n, pkt-tag, pkt-tag); - exit(EXIT_FAILURE); + return 0; } return 1; }
CVS commit: src/crypto/external/bsd/netpgp/dist/src
Module Name:src
Committed By: agc
Date: Wed Nov 3 02:36:13 UTC 2010
Modified Files:
src/crypto/external/bsd/netpgp/dist/src/libpaa: server.c
src/crypto/external/bsd/netpgp/dist/src/netpgp: netpgp.1
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys: netpgpkeys.1
src/crypto/external/bsd/netpgp/dist/src/netpgpverify: netpgpverify.1
Log Message:
Escape hyphens properly in manual pages, so that groff can handle them.
Patch from Peter Pentchev in PR 44026.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/netpgp/dist/src/libpaa/server.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/netpgp/dist/src/netpgpverify/netpgpverify.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/dist/src/libpaa/server.c
diff -u src/crypto/external/bsd/netpgp/dist/src/libpaa/server.c:1.1 src/crypto/external/bsd/netpgp/dist/src/libpaa/server.c:1.2
--- src/crypto/external/bsd/netpgp/dist/src/libpaa/server.c:1.1 Fri Sep 10 05:15:16 2010
+++ src/crypto/external/bsd/netpgp/dist/src/libpaa/server.c Wed Nov 3 02:36:12 2010
@@ -94,7 +94,7 @@
/* write challenge to temp file */
paa_write_file(challenge, buf, cc);
/* get the client to authenticate via paa, writing to temp response file */
- system(clnt/paaclient -r authenticat...@bigco.com challenge response);
+ system(client/paaclient -r authenticat...@bigco.com challenge response);
/* read in response */
cc = paa_read_file(response, buf, sizeof(buf));
if (!paa_check_response(challenge, id, netpgp, buf)) {
Index: src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.14 src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.15
--- src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1:1.14 Fri Aug 13 18:29:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgp/netpgp.1 Wed Nov 3 02:36:12 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: netpgp.1,v 1.14 2010/08/13 18:29:41 agc Exp $
+.\ $NetBSD: netpgp.1,v 1.15 2010/11/03 02:36:12 agc Exp $
.\
.\ Copyright (c) 2009 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -42,7 +42,7 @@
.Nm
.Fl Fl decrypt
.Op Fl Fl output Ns = Ns Ar filename
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
.Op options
.Ar file ...
.Pp
@@ -52,7 +52,7 @@
.Op Fl Fl detach
.Op Fl Fl hash Ns = Ns Ar algorithm
.Op Fl Fl output Ns = Ns Ar filename
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
.Op Fl Fl from Ns = Ns Ar sig-valid-from
.Op Fl Fl duration Ns = Ns Ar sig-valid-duration
.Op options
@@ -69,12 +69,12 @@
.Nm
.Fl Fl clearsign
.Op Fl Fl output Ns = Ns Ar filename
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
.Op options
.Ar file ...
.Nm
-.Fl Fl list-packets
-.Op Fl Fl pass-fd Ns = Ns Ar fd
+.Fl Fl list\-packets
+.Op Fl Fl pass\-fd Ns = Ns Ar fd
.Ar file ...
.Nm
.Fl Fl version
@@ -93,7 +93,7 @@
.br
.Op Fl Fl results Ns = Ns Ar filename
.br
-.Op Fl Fl ssh-keys
+.Op Fl Fl ssh\-keys
.br
.Op Fl Fl userid Ns = Ns Ar userid
.br
@@ -142,7 +142,7 @@
and imported (i.e. users who have signed our public key).
.Pp
The
-.Fl Fl list-packets
+.Fl Fl list\-packets
command can be used for debugging purposes.
.Pp
The following commands are used to sign and verify signatures:
@@ -181,7 +181,7 @@
.Xr getpass 3 .
.It Fl Fl encrypt
Use the user's public key to encrypt the files named on the command line.
-.It Fl Fl list-packets
+.It Fl Fl list\-packets
List all the
.Dq packets
in an encrypted or signed file.
@@ -237,7 +237,7 @@
specifies a filename to which the results of the operation
should be sent.
The default is to send the results to stderr.
-.It Fl Fl ssh-keys
+.It Fl Fl ssh\-keys
specifies that the public and private keys should be taken
from the
.Xr ssh 1
@@ -258,7 +258,7 @@
The trust for a signed key is given by the other signers of that key.
The 16 hexadecimal digit user identity should be used when specifying
user identities - email addresses and names are provided as aliases.
-.It Fl Fl pass-fd Ns = Ns Ar fd
+.It Fl Fl pass\-fd Ns = Ns Ar fd
This option is intended for the use of external programs which may
like to use the
.Xr libnetpgp 3
Index: src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1
diff -u src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.14 src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.15
--- src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1:1.14 Fri Aug 13 18:29:41 2010
+++ src/crypto/external/bsd/netpgp/dist/src/netpgpkeys/netpgpkeys.1 Wed Nov 3 02:36:13 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: netpgpkeys.1,v 1.14
CVS commit: src/crypto/external/bsd/netpgp/dist/tests
Module Name:src Committed By: agc Date: Wed Nov 3 02:40:35 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/tests: Makefile.in Log Message: Clean up the test home directory in make distclean Patch from Peter Pentchev in PR 44025. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/netpgp/dist/tests/Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/tests/Makefile.in diff -u src/crypto/external/bsd/netpgp/dist/tests/Makefile.in:1.3 src/crypto/external/bsd/netpgp/dist/tests/Makefile.in:1.4 --- src/crypto/external/bsd/netpgp/dist/tests/Makefile.in:1.3 Wed Jun 10 00:38:10 2009 +++ src/crypto/external/bsd/netpgp/dist/tests/Makefile.in Wed Nov 3 02:40:34 2010 @@ -284,6 +284,7 @@ distclean: distclean-am -rm -f Makefile + -rm -rf homedir distclean-am: clean-am distclean-generic dvi: dvi-am
CVS commit: src/sys/miscfs/genfs
Module Name:src
Committed By: uebayasi
Date: Wed Nov 3 04:32:50 UTC 2010
Modified Files:
src/sys/miscfs/genfs: genfs_io.c
Log Message:
genfs_getpages: restore vm_page array correctly in PGO_LOCKED error
code path.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.40 src/sys/miscfs/genfs/genfs_io.c:1.41
--- src/sys/miscfs/genfs/genfs_io.c:1.40 Wed Sep 1 16:56:19 2010
+++ src/sys/miscfs/genfs/genfs_io.c Wed Nov 3 04:32:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.40 2010/09/01 16:56:19 chs Exp $ */
+/* $NetBSD: genfs_io.c,v 1.41 2010/11/03 04:32:50 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.40 2010/09/01 16:56:19 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_io.c,v 1.41 2010/11/03 04:32:50 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -236,9 +236,10 @@
for (i = 0; i npages; i++) {
pg = ap-a_m[i];
-if (pg != NULL || pg != PGO_DONTCARE) {
+if (pg != NULL pg != PGO_DONTCARE) {
ap-a_m[i] = NULL;
}
+KASSERT(pg == NULL || pg == PGO_DONTCARE);
}
} else {
genfs_node_unlock(vp);
CVS commit: src/sys/arch/xen/x86
Module Name:src Committed By: jruoho Date: Wed Nov 3 04:34:52 UTC 2010 Modified Files: src/sys/arch/xen/x86: cpu.c Log Message: Fill cpu_info::ci_acpiid also on Xen. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/xen/x86/cpu.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/xen/x86/cpu.c diff -u src/sys/arch/xen/x86/cpu.c:1.49 src/sys/arch/xen/x86/cpu.c:1.50 --- src/sys/arch/xen/x86/cpu.c:1.49 Fri Aug 20 06:34:33 2010 +++ src/sys/arch/xen/x86/cpu.c Wed Nov 3 04:34:51 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.49 2010/08/20 06:34:33 jruoho Exp $ */ +/* $NetBSD: cpu.c,v 1.50 2010/11/03 04:34:51 jruoho Exp $ */ /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */ /*- @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.49 2010/08/20 06:34:33 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.50 2010/11/03 04:34:51 jruoho Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -256,6 +256,7 @@ sc-sc_info = ci; ci-ci_dev = self; + ci-ci_acpiid = caa-cpu_id; ci-ci_cpuid = caa-cpu_number; ci-ci_vcpu = NULL;
CVS commit: src/sys/arch/bebox/conf
Module Name:src Committed By: kiyohara Date: Wed Nov 3 05:19:29 UTC 2010 Modified Files: src/sys/arch/bebox/conf: GENERIC Log Message: Enable wss(4) at port 0x82c. Also enable audio. To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 src/sys/arch/bebox/conf/GENERIC 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/bebox/conf/GENERIC diff -u src/sys/arch/bebox/conf/GENERIC:1.123 src/sys/arch/bebox/conf/GENERIC:1.124 --- src/sys/arch/bebox/conf/GENERIC:1.123 Sat Oct 30 05:57:41 2010 +++ src/sys/arch/bebox/conf/GENERIC Wed Nov 3 05:19:29 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.123 2010/10/30 05:57:41 kiyohara Exp $ +# $NetBSD: GENERIC,v 1.124 2010/11/03 05:19:29 kiyohara Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.123 $ +#ident GENERIC-$Revision: 1.124 $ maxusers 32 @@ -207,10 +207,10 @@ pcppi0 at isa? spkr0 at pcppi? -#wss0 at isa? port ? irq 30 drq 6 drq2 7 # Windows Sound System +wss0 at isa? port 0x82c irq 30 drq 6 drq2 7 # Windows Sound System # Audio support -#audio* at audiobus? +audio* at audiobus? # MIDI support midi* at pcppi? # MIDI interface to the PC speaker
CVS commit: src/sys/arch/bebox/pci
Module Name:src Committed By: kiyohara Date: Wed Nov 3 05:23:11 UTC 2010 Modified Files: src/sys/arch/bebox/pci: pci_machdep.c Log Message: Calculate IRQ from swiz, if bus != 0. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/bebox/pci/pci_machdep.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/bebox/pci/pci_machdep.c diff -u src/sys/arch/bebox/pci/pci_machdep.c:1.17 src/sys/arch/bebox/pci/pci_machdep.c:1.18 --- src/sys/arch/bebox/pci/pci_machdep.c:1.17 Fri May 30 15:56:32 2008 +++ src/sys/arch/bebox/pci/pci_machdep.c Wed Nov 3 05:23:11 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.17 2008/05/30 15:56:32 kiyohara Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.18 2010/11/03 05:23:11 kiyohara Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.17 2008/05/30 15:56:32 kiyohara Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.18 2010/11/03 05:23:11 kiyohara Exp $); #include sys/types.h #include sys/param.h @@ -114,6 +114,6 @@ *iline = BEBOX_PCIBUS0_DEV2LINE(dev); } } else -#define BEBOX_PCIBUS_DEV2LINE(d, s) d) + (s) + 1) 0x3) + 26) - *iline = BEBOX_PCIBUS_DEV2LINE(dev, swiz); +#define BEBOX_PCIBUS_SWIZ2LINE(s) ((s) + 14) + *iline = BEBOX_PCIBUS_SWIZ2LINE(swiz); }
