CVS commit: src/sys/arch/algor
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:51:22 UTC 2011
Modified Files:
src/sys/arch/algor/algor: algor_p4032_intr.c algor_p4032var.h
algor_p5064_intr.c algor_p5064var.h algor_p6032_intr.c cpu.c
interrupt.c machdep.c
src/sys/arch/algor/conf: P4032 P5064 P5064-64 files.algor
src/sys/arch/algor/dev: mainbus.c
src/sys/arch/algor/include: autoconf.h intr.h
src/sys/arch/algor/isa: isadma_bounce.c
Log Message:
Merge forward from matt-nb5-mips64.
Adapt to new interrupt/spl framework.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/algor/algor_p4032_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/algor/algor/algor_p4032var.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/algor/algor/algor_p5064_intr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/algor/algor/algor_p5064var.h \
src/sys/arch/algor/algor/cpu.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/algor/algor/algor_p6032_intr.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/algor/algor/interrupt.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/algor/algor/machdep.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/algor/conf/P4032
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/algor/conf/P5064
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/algor/conf/P5064-64
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/algor/conf/files.algor
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/algor/include/autoconf.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/algor/include/intr.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/algor/isa/isadma_bounce.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/algor/algor/algor_p4032_intr.c
diff -u src/sys/arch/algor/algor/algor_p4032_intr.c:1.20 src/sys/arch/algor/algor/algor_p4032_intr.c:1.21
--- src/sys/arch/algor/algor/algor_p4032_intr.c:1.20 Mon May 26 15:59:29 2008
+++ src/sys/arch/algor/algor/algor_p4032_intr.c Sun Feb 20 07:51:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032_intr.c,v 1.20 2008/05/26 15:59:29 tsutsui Exp $ */
+/* $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,9 +38,10 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.20 2008/05/26 15:59:29 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: algor_p4032_intr.c,v 1.21 2011/02/20 07:51:21 matt Exp $);
#include opt_ddb.h
+#define __INTR_PRIVATE
#include sys/param.h
#include sys/queue.h
@@ -99,7 +100,7 @@
#define IRQMAP_8BITBASE NPCIIRQS
#define NIRQMAPS (IRQMAP_8BITBASE + N8BITIRQS)
-const char *p4032_intrnames[NIRQMAPS] = {
+const char * const p4032_intrnames[NIRQMAPS] = {
/*
* PCI INTERRUPTS
*/
@@ -205,12 +206,12 @@
};
struct p4032_cpuintr p4032_cpuintrs[NINTRS];
-const char *p4032_cpuintrnames[NINTRS] = {
+const char * const p4032_cpuintrnames[NINTRS] = {
int 0 (pci),
int 1 (8-bit),
};
-const char *p4032_intrgroups[NINTRS] = {
+const char * const p4032_intrgroups[NINTRS] = {
pci,
8-bit,
};
@@ -226,7 +227,7 @@
void algor_p4032_pci_intr_disestablish(void *, void *);
void algor_p4032_pci_conf_interrupt(void *, int, int, int, int, int *);
-void algor_p4032_iointr(u_int32_t, u_int32_t, u_int32_t, u_int32_t);
+void algor_p4032_iointr(int, vaddr_t, uint32_t);
void
algor_p4032_intr_init(struct p4032_config *acp)
@@ -242,7 +243,6 @@
evcnt_attach_dynamic(p4032_cpuintrs[i].cintr_count,
EVCNT_TYPE_INTR, NULL, mips, p4032_cpuintrnames[i]);
}
- evcnt_attach_static(mips_int5_evcnt);
for (i = 0; i NIRQMAPS; i++) {
irqmap = p4032_irqmap[i];
@@ -414,8 +414,7 @@
}
void
-algor_p4032_iointr(u_int32_t status, u_int32_t cause, u_int32_t pc,
-u_int32_t ipending)
+algor_p4032_iointr(int ipl, vaddr_t pc, u_int32_t ipending)
{
const struct p4032_irqmap *irqmap;
struct algor_intrhand *ih;
@@ -452,9 +451,6 @@
* XXX the floppy interrupt here.
*/
- cause = ~MIPS_INT_MASK_3;
- _splset(MIPS_SR_INT_IE |
- ((status ~cause) MIPS_HARD_INT_MASK));
}
/*
@@ -481,11 +477,7 @@
(*ih-ih_func)(ih-ih_arg);
}
}
- cause = ~(MIPS_INT_MASK_0 level);
}
-
- /* Re-enable anything that we have processed. */
- _splset(MIPS_SR_INT_IE | ((status ~cause) MIPS_HARD_INT_MASK));
}
/*
Index: src/sys/arch/algor/algor/algor_p4032var.h
diff -u src/sys/arch/algor/algor/algor_p4032var.h:1.5 src/sys/arch/algor/algor/algor_p4032var.h:1.6
--- src/sys/arch/algor/algor/algor_p4032var.h:1.5 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/algor/algor_p4032var.h Sun Feb 20 07:51:21 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: algor_p4032var.h,v 1.5 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: algor_p4032var.h,v 1.6 2011/02/20 07:51:21 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
void
CVS commit: src/sys/arch/arc
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:52:43 UTC 2011
Modified Files:
src/sys/arch/arc/arc: autoconf.c bus_dma.c bus_space_sparse.c
c_magnum.c c_nec_eisa.c c_nec_pci.c cpu.c interrupt.c machdep.c
p_dti_arcstation.c p_dti_tyne.c p_sni_rm200pci.c
src/sys/arch/arc/conf: files.arc
src/sys/arch/arc/include: intr.h
src/sys/arch/arc/isa: isadma_bounce.c
src/sys/arch/arc/pci: necpb.c
src/sys/arch/arc/stand/boot: Makefile boot.c disk.c getchar.c putchar.c
start.S
Added Files:
src/sys/arch/arc/include: netbsd32_machdep.h
Log Message:
Merge forward from matt-nb5-mips64.
Adapt to new interrupt/spl framework.
Add LP64 support.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arc/arc/autoconf.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arc/arc/bus_dma.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arc/arc/bus_space_sparse.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arc/arc/c_magnum.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arc/arc/c_nec_eisa.c \
src/sys/arch/arc/arc/p_dti_arcstation.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/arc/c_nec_pci.c \
src/sys/arch/arc/arc/cpu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/arc/interrupt.c
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arc/arc/p_dti_tyne.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/arc/p_sni_rm200pci.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arc/conf/files.arc
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arc/include/intr.h
cvs rdiff -u -r0 -r1.2 src/sys/arch/arc/include/netbsd32_machdep.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/isa/isadma_bounce.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arc/pci/necpb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/stand/boot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/stand/boot/boot.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arc/stand/boot/disk.c \
src/sys/arch/arc/stand/boot/start.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arc/stand/boot/getchar.c \
src/sys/arch/arc/stand/boot/putchar.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/arc/autoconf.c
diff -u src/sys/arch/arc/arc/autoconf.c:1.32 src/sys/arch/arc/arc/autoconf.c:1.33
--- src/sys/arch/arc/arc/autoconf.c:1.32 Mon Dec 3 15:33:12 2007
+++ src/sys/arch/arc/arc/autoconf.c Sun Feb 20 07:52:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.32 2007/12/03 15:33:12 ad Exp $ */
+/* $NetBSD: autoconf.c,v 1.33 2011/02/20 07:52:42 matt Exp $ */
/* $OpenBSD: autoconf.c,v 1.9 1997/05/18 13:45:20 pefo Exp $ */
/*
@@ -88,7 +88,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.32 2007/12/03 15:33:12 ad Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.33 2011/02/20 07:52:42 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -148,9 +148,10 @@
* to disable it other than setting status register by spl(9).
*/
_spllower(MIPS_INT_MASK_5);
+#error need fix
#else
/* enable all source forcing SOFT_INTs cleared */
- _splnone();
+ spl0();
#endif
}
Index: src/sys/arch/arc/arc/bus_dma.c
diff -u src/sys/arch/arc/arc/bus_dma.c:1.31 src/sys/arch/arc/arc/bus_dma.c:1.32
--- src/sys/arch/arc/arc/bus_dma.c:1.31 Fri Nov 12 13:18:56 2010
+++ src/sys/arch/arc/arc/bus_dma.c Sun Feb 20 07:52:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:56 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.32 2011/02/20 07:52:42 matt Exp $ */
/* NetBSD: bus_dma.c,v 1.20 2000/01/10 03:24:36 simonb Exp */
/*-
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:56 uebayasi Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.32 2011/02/20 07:52:42 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -53,8 +53,6 @@
void *, bus_size_t, struct vmspace *, int, paddr_t *,
int *, int);
-extern paddr_t avail_start, avail_end; /* from pmap.c */
-
void
_bus_dma_tag_init(bus_dma_tag_t t)
{
@@ -405,6 +403,7 @@
_bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
bus_size_t len, int ops)
{
+ const struct mips_cache_info * const mci = mips_cache_info;
bus_size_t minlen;
bus_addr_t addr, start, end, preboundary, firstboundary, lastboundary;
int i, useindex;
@@ -517,19 +516,19 @@
case BUS_DMASYNC_PREREAD:
end = start + minlen;
- preboundary = start ~mips_dcache_align_mask;
- firstboundary = (start + mips_dcache_align_mask)
- ~mips_dcache_align_mask;
- lastboundary = end ~mips_dcache_align_mask;
+ preboundary = start ~mci-mci_dcache_align_mask;
+ firstboundary = (start + mci-mci_dcache_align_mask)
+ ~mci-mci_dcache_align_mask;
+ lastboundary = end ~mci-mci_dcache_align_mask;
if (preboundary start preboundary lastboundary)
mips_dcache_wbinv_range(preboundary,
-mips_dcache_align);
CVS commit: src/sys/arch/cobalt
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:54:11 UTC 2011
Modified Files:
src/sys/arch/cobalt/cobalt: bus.c cpu.c interrupt.c machdep.c
src/sys/arch/cobalt/conf: GENERIC files.cobalt std.cobalt
src/sys/arch/cobalt/dev: gt.c
src/sys/arch/cobalt/include: bootinfo.h intr.h
src/sys/arch/cobalt/pci: pci_machdep.c
src/sys/arch/cobalt/stand/boot: Makefile
Log Message:
Merge forward from matt-nb5-mips64.
(XXX generic kernels on raq2 die after interrupts are enabled but gxemul
works fine).
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/cobalt/cobalt/bus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/cobalt/cobalt/cpu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/cobalt/cobalt/interrupt.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/cobalt/cobalt/machdep.c
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cobalt/conf/files.cobalt
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cobalt/conf/std.cobalt
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/cobalt/include/bootinfo.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/cobalt/include/intr.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/cobalt/pci/pci_machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/cobalt/stand/boot/Makefile
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/cobalt/cobalt/bus.c
diff -u src/sys/arch/cobalt/cobalt/bus.c:1.38 src/sys/arch/cobalt/cobalt/bus.c:1.39
--- src/sys/arch/cobalt/cobalt/bus.c:1.38 Mon Dec 14 00:46:00 2009
+++ src/sys/arch/cobalt/cobalt/bus.c Sun Feb 20 07:54:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.38 2009/12/14 00:46:00 matt Exp $ */
+/* $NetBSD: bus.c,v 1.39 2011/02/20 07:54:10 matt Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.38 2009/12/14 00:46:00 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus.c,v 1.39 2011/02/20 07:54:10 matt Exp $);
#include sys/param.h
#include sys/systm.h
@@ -568,22 +568,24 @@
mips_dcache_wbinv_range(start, minlen);
break;
- case BUS_DMASYNC_PREREAD:
+ case BUS_DMASYNC_PREREAD: {
+ struct mips_cache_info * const mci = mips_cache_info;
end = start + minlen;
- preboundary = start ~mips_dcache_align_mask;
- firstboundary = (start + mips_dcache_align_mask)
- ~mips_dcache_align_mask;
- lastboundary = end ~mips_dcache_align_mask;
+ preboundary = start ~mci-mci_dcache_align_mask;
+ firstboundary = (start + mci-mci_dcache_align_mask)
+ ~mci-mci_dcache_align_mask;
+ lastboundary = end ~mci-mci_dcache_align_mask;
if (preboundary start preboundary lastboundary)
mips_dcache_wbinv_range(preboundary,
-mips_dcache_align);
+mci-mci_dcache_align);
if (firstboundary lastboundary)
mips_dcache_inv_range(firstboundary,
lastboundary - firstboundary);
if (lastboundary end)
mips_dcache_wbinv_range(lastboundary,
-mips_dcache_align);
+mci-mci_dcache_align);
break;
+ }
case BUS_DMASYNC_PREWRITE:
mips_dcache_wb_range(start, minlen);
@@ -606,12 +608,11 @@
bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
int flags)
{
- extern paddr_t avail_start, avail_end;
+ extern paddr_t mips_avail_start, mips_avail_end;
return (_bus_dmamem_alloc_range_common(t, size, alignment, boundary,
- segs, nsegs, rsegs, flags,
- avail_start /*low*/,
- avail_end - PAGE_SIZE /*high*/));
+ segs, nsegs, rsegs, flags,
+ mips_avail_start /*low*/, mips_avail_end - PAGE_SIZE /*high*/));
}
/*
Index: src/sys/arch/cobalt/cobalt/cpu.c
diff -u src/sys/arch/cobalt/cobalt/cpu.c:1.10 src/sys/arch/cobalt/cobalt/cpu.c:1.11
--- src/sys/arch/cobalt/cobalt/cpu.c:1.10 Fri May 9 10:59:55 2008
+++ src/sys/arch/cobalt/cobalt/cpu.c Sun Feb 20 07:54:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.10 2008/05/09 10:59:55 tsutsui Exp $ */
+/* $NetBSD: cpu.c,v 1.11 2011/02/20 07:54:10 matt Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -28,18 +28,19 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.10 2008/05/09 10:59:55 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.11 2011/02/20 07:54:10 matt Exp $);
#include sys/param.h
#include sys/device.h
#include sys/systm.h
+#include sys/cpu.h
#include machine/autoconf.h
#include ioconf.h
-int cpu_match(device_t, cfdata_t, void *);
-void cpu_attach(device_t, device_t, void *);
+static int cpu_match(device_t, cfdata_t, void *);
+static void cpu_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(cpu, 0,
cpu_match, cpu_attach, NULL, NULL);
@@ -55,6 +56,11 @@
cpu_attach(device_t parent, device_t self, void *aux)
{
+ struct cpu_info * const ci = curcpu();
+
+ ci-ci_dev = self;
+
CVS commit: src/sys/arch/ews4800mips
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:55:21 UTC 2011
Modified Files:
src/sys/arch/ews4800mips/conf: files.ews4800mips
src/sys/arch/ews4800mips/ews4800mips: autoconf.c bus_dma.c cpu.c
interrupt.c machdep.c mainbus.c tr2.c tr2_intr.c tr2a.c tr2a_intr.c
src/sys/arch/ews4800mips/include: intr.h sbdvar.h
Log Message:
Merge forward matt-nb5-mips64
Adapt to new interrupt/spl framework
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/conf/files.ews4800mips
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ews4800mips/ews4800mips/autoconf.c \
src/sys/arch/ews4800mips/ews4800mips/interrupt.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c \
src/sys/arch/ews4800mips/ews4800mips/tr2_intr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ews4800mips/ews4800mips/cpu.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/ews4800mips/ews4800mips/machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ews4800mips/ews4800mips/mainbus.c \
src/sys/arch/ews4800mips/ews4800mips/tr2.c \
src/sys/arch/ews4800mips/ews4800mips/tr2a.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/ews4800mips/ews4800mips/tr2a_intr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ews4800mips/include/intr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ews4800mips/include/sbdvar.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/ews4800mips/conf/files.ews4800mips
diff -u src/sys/arch/ews4800mips/conf/files.ews4800mips:1.4 src/sys/arch/ews4800mips/conf/files.ews4800mips:1.5
--- src/sys/arch/ews4800mips/conf/files.ews4800mips:1.4 Fri Aug 21 03:53:18 2009
+++ src/sys/arch/ews4800mips/conf/files.ews4800mips Sun Feb 20 07:55:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.ews4800mips,v 1.4 2009/08/21 03:53:18 thorpej Exp $
+# $NetBSD: files.ews4800mips,v 1.5 2011/02/20 07:55:20 matt Exp $
maxpartitions 16
@@ -6,7 +6,6 @@
include arch/ews4800mips/conf/majors.ews4800mips
-file arch/mips/mips/softintr.c
file arch/mips/mips/mips3_clock.c
file arch/ews4800mips/ews4800mips/autoconf.c
Index: src/sys/arch/ews4800mips/ews4800mips/autoconf.c
diff -u src/sys/arch/ews4800mips/ews4800mips/autoconf.c:1.7 src/sys/arch/ews4800mips/ews4800mips/autoconf.c:1.8
--- src/sys/arch/ews4800mips/ews4800mips/autoconf.c:1.7 Mon Apr 28 20:23:18 2008
+++ src/sys/arch/ews4800mips/ews4800mips/autoconf.c Sun Feb 20 07:55:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.7 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: autoconf.c,v 1.8 2011/02/20 07:55:20 matt Exp $ */
/*-
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.7 2008/04/28 20:23:18 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.8 2011/02/20 07:55:20 matt Exp $);
#include opt_sbd.h
@@ -35,6 +35,7 @@
#include sys/systm.h
#include sys/conf.h
#include sys/device.h
+#include sys/intr.h
#include machine/sbdvar.h
#include machine/disklabel.h
@@ -50,7 +51,7 @@
splhigh();
if (config_rootfound(mainbus, NULL) == NULL)
panic(no mainbus found);
- _splnone();
+ spl0();
}
void
Index: src/sys/arch/ews4800mips/ews4800mips/interrupt.c
diff -u src/sys/arch/ews4800mips/ews4800mips/interrupt.c:1.7 src/sys/arch/ews4800mips/ews4800mips/interrupt.c:1.8
--- src/sys/arch/ews4800mips/ews4800mips/interrupt.c:1.7 Mon Dec 20 00:25:33 2010
+++ src/sys/arch/ews4800mips/ews4800mips/interrupt.c Sun Feb 20 07:55:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.7 2010/12/20 00:25:33 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.8 2011/02/20 07:55:20 matt Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.7 2010/12/20 00:25:33 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.8 2011/02/20 07:55:20 matt Exp $);
#include sys/param.h
#include sys/intr.h
@@ -38,8 +38,7 @@
#include machine/sbdvar.h
-const uint32_t *ipl_sr_bits;
-static void (*platform_intr)(uint32_t, uint32_t, vaddr_t, uint32_t);
+static void (*platform_intr)(int, vaddr_t, uint32_t);
void
intr_init(void)
@@ -64,22 +63,9 @@
}
void
-cpu_intr(uint32_t status, uint32_t cause, vaddr_t pc, uint32_t ipending)
+cpu_intr(int ppl, vaddr_t pc, uint32_t status)
{
- struct cpu_info *ci;
+ curcpu()-ci_data.cpu_nintr++;
- ci = curcpu();
- ci-ci_data.cpu_nintr++;
-
- ci-ci_idepth++;
- (*platform_intr)(status, cause, pc, ipending);
- ci-ci_idepth--;
-
-#ifdef __HAVE_FAST_SOFTINTS
- ipending = (MIPS_SOFT_INT_MASK_1 | MIPS_SOFT_INT_MASK_0);
- if (ipending == 0)
- return;
- _clrsoftintr(ipending);
- softintr_dispatch(ipending);
-#endif
+ (*platform_intr)(ppl, pc, status);
}
Index: src/sys/arch/ews4800mips/ews4800mips/bus_dma.c
diff -u src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.10 src/sys/arch/ews4800mips/ews4800mips/bus_dma.c:1.11
---
CVS commit: src/sys/arch/mipsco
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:56:16 UTC 2011
Modified Files:
src/sys/arch/mipsco/include: intr.h sysconf.h
src/sys/arch/mipsco/mipsco: autoconf.c bus_dma.c cpu.c interrupt.c
machdep.c mainbus.c mips_3x30.c
Log Message:
Merge forward matt-nb5-mips64
Adapt to new interrupt/spl framework
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mipsco/include/intr.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mipsco/include/sysconf.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/mipsco/autoconf.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/mipsco/mipsco/bus_dma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mipsco/mipsco/cpu.c \
src/sys/arch/mipsco/mipsco/mainbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mipsco/mipsco/interrupt.c
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/mipsco/mipsco/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mipsco/mipsco/mips_3x30.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/mipsco/include/intr.h
diff -u src/sys/arch/mipsco/include/intr.h:1.18 src/sys/arch/mipsco/include/intr.h:1.19
--- src/sys/arch/mipsco/include/intr.h:1.18 Mon Apr 13 09:37:50 2009
+++ src/sys/arch/mipsco/include/intr.h Sun Feb 20 07:56:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.18 2009/04/13 09:37:50 he Exp $ */
+/* $NetBSD: intr.h,v 1.19 2011/02/20 07:56:16 matt Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -33,42 +33,12 @@
#ifndef _MACHINE_INTR_H_
#define _MACHINE_INTR_H_
-#define IPL_NONE 0 /* disable only this interrupt */
-#define IPL_SOFTCLOCK 1 /* generic software interrupts */
-#define IPL_SOFTBIO 1 /* clock software interrupts */
-#define IPL_SOFTNET 2 /* network software interrupts */
-#define IPL_SOFTSERIAL 2 /* serial software interrupts */
-#define IPL_VM 3
-#define IPL_SCHED 4
-#define IPL_HIGH 4 /* disable all interrupts */
-
-#define IPL_N 5
-
-/* Interrupt sharing types. */
-#define IST_NONE 0 /* none */
-#define IST_PULSE 1 /* pulsed */
-#define IST_EDGE 2 /* edge-triggered */
-#define IST_LEVEL 3 /* level-triggered */
+#include mips/intr.h
#ifdef _KERNEL
-#ifndef _LOCORE
-#include sys/types.h
+#ifdef __INTR_PRIVATE
#include sys/evcnt.h
-#include sys/queue.h
-#include mips/locore.h
-
-/*
- * software simulated interrupt
- */
-#define setsoft(x) do { \
- extern u_int ssir; \
- int _s; \
- \
- _s = splhigh();\
- ssir |= 1 (x); \
- _setsoftintr(MIPS_SOFT_INT_MASK_1); \
- splx(_s);\
-} while (0)
+#include mips/cpuregs.h
/*
* nesting interrupt masks.
@@ -82,34 +52,8 @@
#define MIPS_INT_MASK_SPL4 (MIPS_INT_MASK_4|MIPS_INT_MASK_SPL3)
#define MIPS_INT_MASK_SPL5 (MIPS_INT_MASK_5|MIPS_INT_MASK_SPL4)
-#define spl0() (void)_spllower(0)
-#define splx(s) (void)_splset(s)
-#define splvm() _splraise(MIPS_INT_MASK_SPL2)
-#define splsched() _splraise(MIPS_INT_MASK_SPL2)
-#define splhigh() _splraise(MIPS_INT_MASK_SPL2)
-
-#define splsoftclock() _splraise(MIPS_INT_MASK_SPL_SOFT0)
-#define splsoftbio() _splraise(MIPS_INT_MASK_SPL_SOFT0)
-#define splsoftnet() _splraise(MIPS_INT_MASK_SPL_SOFT1)
-#define splsoftserial() _splraise(MIPS_INT_MASK_SPL_SOFT1)
-
-typedef int ipl_t;
-typedef struct {
- int _sr;
-} ipl_cookie_t;
-
-ipl_cookie_t makeiplcookie(ipl_t ipl);
-
-static inline int
-splraiseipl(ipl_cookie_t icookie)
-{
-
- return _splraise(icookie._sr);
-}
-
struct mipsco_intrhand {
- LIST_ENTRY(mipsco_intrhand)
- ih_q;
+ LIST_ENTRY(mipsco_intrhand) ih_q;
int (*ih_fun)(void *);
void *ih_arg;
struct mipsco_intr *ih_intrhead;
@@ -117,14 +61,18 @@
};
struct mipsco_intr {
- LIST_HEAD(,mipsco_intrhand)
- intr_q;
+ LIST_HEAD(,mipsco_intrhand) intr_q;
struct evcnt ih_evcnt;
unsigned long intr_siq;
};
-
+extern const struct ipl_sr_map mipsco_ipl_sr_map;
extern struct mipsco_intrhand intrtab[];
+#define CALL_INTR(lev) ((*intrtab[lev].ih_fun)(intrtab[lev].ih_arg))
+
+#define MAX_INTR_COOKIES 16
+
+#endif /* __INTR_PRIVATE */
#define SYS_INTR_LEVEL0 0
#define SYS_INTR_LEVEL1 1
@@ -139,10 +87,5 @@
#define SYS_INTR_FDC 10
#define SYS_INTR_ATBUS 11
-#define MAX_INTR_COOKIES 16
-
-#define CALL_INTR(lev) ((*intrtab[lev].ih_fun)(intrtab[lev].ih_arg))
-
-#endif /* !_LOCORE */
#endif /* _KERNEL */
#endif /* _MACHINE_INTR_H_ */
Index: src/sys/arch/mipsco/include/sysconf.h
diff -u src/sys/arch/mipsco/include/sysconf.h:1.5 src/sys/arch/mipsco/include/sysconf.h:1.6
--- src/sys/arch/mipsco/include/sysconf.h:1.5 Sat Mar 14 14:46:02 2009
+++ src/sys/arch/mipsco/include/sysconf.h Sun Feb 20 07:56:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysconf.h,v 1.5 2009/03/14 14:46:02 dsl Exp $ */
+/* $NetBSD: sysconf.h,v 1.6 2011/02/20 07:56:16 matt Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -54,7 +54,7 @@
* clkinit - Initialize clocks
*/
void (*cons_init)(void);
- void (*iointr)(unsigned, unsigned, unsigned,
CVS commit: src/sys/arch/newsmips
Module Name:src
Committed By: matt
Date: Sun Feb 20 07:56:32 UTC 2011
Modified Files:
src/sys/arch/newsmips/apbus: apbus.c if_snvar.h if_tlp_ap.c
src/sys/arch/newsmips/conf: files.newsmips
src/sys/arch/newsmips/dev: hb.c scsi_1185.c
src/sys/arch/newsmips/include: intr.h
src/sys/arch/newsmips/newsmips: autoconf.c bus.c clock.c cpu.c
locore_machdep.S machdep.c news3400.c news5000.c
Log Message:
Merge forward matt-nb5-mips64
Adapt to new interrupt/spl framework
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/newsmips/apbus/apbus.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/newsmips/apbus/if_snvar.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/newsmips/apbus/if_tlp_ap.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/newsmips/conf/files.newsmips
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/newsmips/dev/hb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/newsmips/dev/scsi_1185.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/newsmips/include/intr.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/newsmips/newsmips/autoconf.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/newsmips/newsmips/bus.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/newsmips/newsmips/clock.c \
src/sys/arch/newsmips/newsmips/locore_machdep.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/newsmips/newsmips/cpu.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/newsmips/newsmips/machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/newsmips/newsmips/news3400.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/newsmips/newsmips/news5000.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/newsmips/apbus/apbus.c
diff -u src/sys/arch/newsmips/apbus/apbus.c:1.21 src/sys/arch/newsmips/apbus/apbus.c:1.22
--- src/sys/arch/newsmips/apbus/apbus.c:1.21 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/apbus/apbus.c Sun Feb 20 07:56:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.21 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: apbus.c,v 1.22 2011/02/20 07:56:31 matt Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,13 +27,16 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: apbus.c,v 1.21 2008/04/09 15:40:30 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: apbus.c,v 1.22 2011/02/20 07:56:31 matt Exp $);
+
+#define __INTR_PRIVATE
#include sys/param.h
#include sys/systm.h
#include sys/malloc.h
#include sys/device.h
#include sys/proc.h
+#include sys/intr.h
#include uvm/uvm_extern.h
@@ -41,7 +44,6 @@
#include machine/autoconf.h
#define _NEWSMIPS_BUS_DMA_PRIVATE
#include machine/bus.h
-#include machine/intr.h
#include newsmips/apbus/apbusvar.h
static int apbusmatch(device_t, cfdata_t, void *);
@@ -97,6 +99,8 @@
struct newsmips_intr *ip;
int i;
+ mips_set_wbflush(apbus_wbflush);
+
*(volatile uint32_t *)(NEWS5000_APBUS_INTST) = 0x;
*(volatile uint32_t *)(NEWS5000_APBUS_INTMSK) = 0x;
*(volatile uint32_t *)(NEWS5000_APBUS_CTRL) = 0x0004;
@@ -176,9 +180,10 @@
void
apbus_wbflush(void)
{
- volatile int32_t *wbflush = (uint32_t *)NEWS5000_WBFLUSH;
+ volatile int32_t * const our_wbflush = (int32_t *)NEWS5000_WBFLUSH;
- (void)*wbflush;
+ (*mips_locore_jumpvec.ljv_wbflush)();
+ (void)*our_wbflush;
}
/*
Index: src/sys/arch/newsmips/apbus/if_snvar.h
diff -u src/sys/arch/newsmips/apbus/if_snvar.h:1.12 src/sys/arch/newsmips/apbus/if_snvar.h:1.13
--- src/sys/arch/newsmips/apbus/if_snvar.h:1.12 Wed Apr 9 15:40:30 2008
+++ src/sys/arch/newsmips/apbus/if_snvar.h Sun Feb 20 07:56:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_snvar.h,v 1.12 2008/04/09 15:40:30 tsutsui Exp $ */
+/* $NetBSD: if_snvar.h,v 1.13 2011/02/20 07:56:31 matt Exp $ */
/*
* Copyright (c) 1991 Algorithmics Ltd (http://www.algor.co.uk)
@@ -32,14 +32,6 @@
#define SN_REGSIZE (SN_NREGS * 4)
#include mips/locore.h
-#undef wbflush /* XXX */
-
-static inline void
-wbflush(void)
-{
- mips3_wbflush();
- apbus_wbflush();
-};
/*
* buffer sizes in 32 bit mode
Index: src/sys/arch/newsmips/apbus/if_tlp_ap.c
diff -u src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.11 src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.12
--- src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.11 Fri Apr 17 14:48:17 2009
+++ src/sys/arch/newsmips/apbus/if_tlp_ap.c Sun Feb 20 07:56:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_ap.c,v 1.11 2009/04/17 14:48:17 tsutsui Exp $ */
+/* $NetBSD: if_tlp_ap.c,v 1.12 2011/02/20 07:56:31 matt Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tlp_ap.c,v 1.11 2009/04/17 14:48:17 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tlp_ap.c,v 1.12 2011/02/20 07:56:31 matt Exp $);
#include sys/param.h
#include sys/device.h
@@ -155,10 +155,10 @@
/*
* Initialize bus specific parameters.
*/
- if (mips_sdcache_line_size 0)
- sc-sc_cacheline = mips_sdcache_line_size / 4;
- else if (mips_pdcache_line_size 0)
CVS commit: src/sys/arch/hpcmips
Module Name:src Committed By: matt Date: Sun Feb 20 07:58:14 UTC 2011 Modified Files: src/sys/arch/hpcmips/conf: std.hpcmips std.lcard src/sys/arch/hpcmips/hpcmips: autoconf.c bus_dma.c bus_space.c cpu.c hpcapm_machdep.c interrupt.c machdep.c mainbus.c src/sys/arch/hpcmips/include: intr.h sysconf.h src/sys/arch/hpcmips/tx: tx39.c tx39icu.c src/sys/arch/hpcmips/vr: vr.c vrdcu.c Log Message: Merge forward matt-nb5-mips64 Adapt to new interrupt/spl framework (XXX don't know how to deal with use of spllower in sleep/pause code so hpcmips kernel will fail to compile). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hpcmips/conf/std.hpcmips cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hpcmips/conf/std.lcard cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcmips/hpcmips/autoconf.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/hpcmips/hpcmips/bus_dma.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hpcmips/hpcmips/bus_space.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcmips/hpcmips/cpu.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hpcmips/hpcmips/hpcapm_machdep.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/hpcmips/interrupt.c cvs rdiff -u -r1.113 -r1.114 src/sys/arch/hpcmips/hpcmips/machdep.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hpcmips/hpcmips/mainbus.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hpcmips/include/intr.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hpcmips/include/sysconf.h cvs rdiff -u -r1.41 -r1.42 src/sys/arch/hpcmips/tx/tx39.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hpcmips/tx/tx39icu.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/hpcmips/vr/vr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hpcmips/vr/vrdcu.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/hpcmips/conf/std.hpcmips diff -u src/sys/arch/hpcmips/conf/std.hpcmips:1.19 src/sys/arch/hpcmips/conf/std.hpcmips:1.20 --- src/sys/arch/hpcmips/conf/std.hpcmips:1.19 Sun Dec 11 12:17:33 2005 +++ src/sys/arch/hpcmips/conf/std.hpcmips Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.hpcmips,v 1.19 2005/12/11 12:17:33 christos Exp $ +# $NetBSD: std.hpcmips,v 1.20 2011/02/20 07:58:13 matt Exp $ # standard, required hpcmips info machine hpcmips mips @@ -6,7 +6,7 @@ makeoptions MACHINE_ARCH=mipsel options NOFPU # No FPU -options SOFTFLOAT # emulate FPU insn +options FPEMUL # emulate FPU insn mainbus0 at root cpu* at mainbus0 Index: src/sys/arch/hpcmips/conf/std.lcard diff -u src/sys/arch/hpcmips/conf/std.lcard:1.7 src/sys/arch/hpcmips/conf/std.lcard:1.8 --- src/sys/arch/hpcmips/conf/std.lcard:1.7 Sat Sep 16 02:14:56 2006 +++ src/sys/arch/hpcmips/conf/std.lcard Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.lcard,v 1.7 2006/09/16 02:14:56 gdamore Exp $ +# $NetBSD: std.lcard,v 1.8 2011/02/20 07:58:13 matt Exp $ # standard, required hpcmips info machine hpcmips mips @@ -6,7 +6,7 @@ makeoptions MACHINE_ARCH=mipsel options NOFPU # No FPU -options SOFTFLOAT # emulate FPU insn +options FPEMUL # emulate FPU insn options MIPS3 # R4000/R4400/R4600 CPUs options MIPS3_4100 # VR4100 core Index: src/sys/arch/hpcmips/hpcmips/autoconf.c diff -u src/sys/arch/hpcmips/hpcmips/autoconf.c:1.23 src/sys/arch/hpcmips/hpcmips/autoconf.c:1.24 --- src/sys/arch/hpcmips/hpcmips/autoconf.c:1.23 Tue Feb 8 20:20:14 2011 +++ src/sys/arch/hpcmips/hpcmips/autoconf.c Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.23 2011/02/08 20:20:14 rmind Exp $ */ +/* $NetBSD: autoconf.c,v 1.24 2011/02/20 07:58:13 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.23 2011/02/08 20:20:14 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.24 2011/02/20 07:58:13 matt Exp $); #include sys/param.h #include sys/systm.h @@ -76,7 +76,7 @@ panic(no mainbus found); /* Configuration is finished, turn on interrupts. */ - _splnone(); /* enable all source forcing SOFT_INTs cleared */ + spl0(); /* enable all source forcing SOFT_INTs cleared */ } void Index: src/sys/arch/hpcmips/hpcmips/bus_dma.c diff -u src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.35 src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.36 --- src/sys/arch/hpcmips/hpcmips/bus_dma.c:1.35 Mon Dec 14 00:46:03 2009 +++ src/sys/arch/hpcmips/hpcmips/bus_dma.c Sun Feb 20 07:58:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.35 2009/12/14 00:46:03 matt Exp $ */ +/* $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.35 2009/12/14 00:46:03 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.36 2011/02/20 07:58:13 matt Exp $); #include sys/param.h #include sys/systm.h @@ -516,13 +516,12 @@ bus_size_t boundary, bus_dma_segment_t *segs, int
CVS commit: src/sys/arch/emips/emips
Module Name:src Committed By: matt Date: Sun Feb 20 08:01:10 UTC 2011 Modified Files: src/sys/arch/emips/emips: machdep.c Log Message: Deal with mips_vector_init changes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/emips/emips/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/emips/emips/machdep.c diff -u src/sys/arch/emips/emips/machdep.c:1.2 src/sys/arch/emips/emips/machdep.c:1.3 --- src/sys/arch/emips/emips/machdep.c:1.2 Tue Feb 8 20:20:11 2011 +++ src/sys/arch/emips/emips/machdep.c Sun Feb 20 08:01:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.2 2011/02/08 20:20:11 rmind Exp $ */ +/* $NetBSD: machdep.c,v 1.3 2011/02/20 08:01:10 matt Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.2 2011/02/08 20:20:11 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.3 2011/02/20 08:01:10 matt Exp $); #include opt_ddb.h @@ -254,7 +254,7 @@ * Initialize locore-function vector. * Clear out the I and D caches. */ - mips_vector_init(); + mips_vector_init(NULL, false); /* * We know the CPU type now. Initialize our DMA tags (might
CVS commit: src/sys/dev/arcbios
Module Name:src
Committed By: matt
Date: Sun Feb 20 08:02:46 UTC 2011
Modified Files:
src/sys/dev/arcbios: arcbios.c arcbios.h arcbios_tty.c
Added Files:
src/sys/dev/arcbios: Makefile.inc arcbios_calls.S genassym.cf
Log Message:
(XXX this should be a library like libsa).
Deal with the need to save/restore T8 (CURLWP) across arcbios calls.
Call arcbios with O32 ABI conventions even if kernel/bootloader is N32/N64.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/arcbios/Makefile.inc \
src/sys/dev/arcbios/arcbios_calls.S src/sys/dev/arcbios/genassym.cf
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/arcbios/arcbios.c \
src/sys/dev/arcbios/arcbios.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/arcbios/arcbios_tty.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/arcbios/arcbios.c
diff -u src/sys/dev/arcbios/arcbios.c:1.12 src/sys/dev/arcbios/arcbios.c:1.13
--- src/sys/dev/arcbios/arcbios.c:1.12 Mon Apr 28 20:23:47 2008
+++ src/sys/dev/arcbios/arcbios.c Sun Feb 20 08:02:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.c,v 1.12 2008/04/28 20:23:47 martin Exp $ */
+/* $NetBSD: arcbios.c,v 1.13 2011/02/20 08:02:46 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: arcbios.c,v 1.12 2008/04/28 20:23:47 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: arcbios.c,v 1.13 2011/02/20 08:02:46 matt Exp $);
#include sys/param.h
@@ -87,7 +87,7 @@
}
/* Initialize our pointer to the firmware vector. */
- ARCBIOS = ARCBIOS_SPB-FirmwareVector;
+ ARCBIOS = (void *)(intptr_t)ARCBIOS_SPB-FirmwareVector;
/* Find the ARC BIOS console device major (needed by cnopen) */
maj = cdevsw_lookup_major(arcbios_cdevsw);
@@ -100,7 +100,7 @@
/*
* Fetch the system ID.
*/
- sid = (*ARCBIOS-GetSystemId)();
+ sid = arcbios_GetSystemId();
if (sid != NULL) {
memcpy(arcbios_sysid_vendor, sid-VendorId,
sizeof(sid-VendorId));
@@ -148,9 +148,9 @@
struct arcbios_treewalk_context *atc)
{
- for (node = (*ARCBIOS-GetChild)(node);
+ for (node = arcbios_GetChild(node);
node != NULL atc-atc_terminate == 0;
- node = (*ARCBIOS-GetPeer)(node)) {
+ node = arcbios_GetPeer(node)) {
(*func)(node, atc);
if (atc-atc_terminate)
return;
@@ -178,7 +178,7 @@
dstsize--;
if (dstsize node-IdentifierLength)
dstsize = node-IdentifierLength;
- memcpy(dst, node-Identifier, dstsize);
+ memcpy(dst, (void *)(intptr_t)node-Identifier, dstsize);
dst[dstsize] = '\0';
}
@@ -192,7 +192,7 @@
u_long count;
char c;
- (*ARCBIOS-Read)(ARCBIOS_STDIN, c, 1, count);
+ arcbios_Read(ARCBIOS_STDIN, c, 1, count);
return (c);
}
@@ -202,5 +202,5 @@
u_long count;
char ch = c;
- (*ARCBIOS-Write)(ARCBIOS_STDOUT, ch, 1, count);
+ arcbios_Write(ARCBIOS_STDOUT, ch, 1, count);
}
Index: src/sys/dev/arcbios/arcbios.h
diff -u src/sys/dev/arcbios/arcbios.h:1.12 src/sys/dev/arcbios/arcbios.h:1.13
--- src/sys/dev/arcbios/arcbios.h:1.12 Mon Apr 28 20:23:47 2008
+++ src/sys/dev/arcbios/arcbios.h Sun Feb 20 08:02:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcbios.h,v 1.12 2008/04/28 20:23:47 martin Exp $ */
+/* $NetBSD: arcbios.h,v 1.13 2011/02/20 08:02:46 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -78,22 +78,22 @@
* 4.2.2: System Parameter Block
*/
struct arcbios_spb {
- u_long SPBSignature;
- u_long SPBLength;
+ uint32_t SPBSignature;
+ uint32_t SPBLength;
uint16_t Version;
uint16_t Revision;
- void *RestartBlock;
- void *DebugBlock;
- void *GEVector;
- void *UTLBMissVector;
- u_long FirmwareVectorLength;
- void *FirmwareVector;
- u_long PrivateVectorLength;
- void *PrivateVector;
- u_long AdapterCount;
- u_long AdapterType;
- u_long AdapterVectorLength;
- void *AdapterVector;
+ int32_t RestartBlock;
+ int32_t DebugBlock;
+ int32_t GEVector;
+ int32_t UTLBMissVector;
+ uint32_t FirmwareVectorLength;
+ int32_t FirmwareVector;
+ uint32_t PrivateVectorLength;
+ int32_t PrivateVector;
+ uint32_t AdapterCount;
+ uint32_t AdapterType;
+ uint32_t AdapterVectorLength;
+ int32_t AdapterVector;
};
#define ARCBIOS_SPB_SIGNATURE 0x53435241 /* A R C S */
@@ -108,11 +108,11 @@
uint32_t Flags;
uint16_t Version;
uint16_t Revision;
- u_long Key;
- u_long AffinityMask;
- u_long ConfigurationDataSize;
- u_long IdentifierLength;
- char *Identifier;
+ uint32_t Key;
+ uint32_t AffinityMask;
+ uint32_t ConfigurationDataSize;
+ uint32_t IdentifierLength;
+ int32_t Identifier;
};
/*
@@ -277,8 +277,8 @@
*/
struct arcbios_mem {
uint32_t Type;
- u_long BasePage;
- u_long PageCount;
+ uint32_t BasePage;
+ uint32_t PageCount;
};
#if defined(sgimips)
@@ -320,148 +320,89 @@
* ARC firmware vector
*/
struct arcbios_fv {
- long (*Load)(
- char *, /* image to load */
- u_long, /* top address */
- u_long,
CVS commit: src/sys/dev/tc
Module Name:src
Committed By: matt
Date: Sun Feb 20 08:03:22 UTC 2011
Modified Files:
src/sys/dev/tc: ioasicvar.h tcvar.h
Log Message:
Add some missing includes of sys/device.h
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/tc/ioasicvar.h
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/tc/tcvar.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/tc/ioasicvar.h
diff -u src/sys/dev/tc/ioasicvar.h:1.20 src/sys/dev/tc/ioasicvar.h:1.21
--- src/sys/dev/tc/ioasicvar.h:1.20 Tue May 12 14:47:04 2009
+++ src/sys/dev/tc/ioasicvar.h Sun Feb 20 08:03:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ioasicvar.h,v 1.20 2009/05/12 14:47:04 cegger Exp $ */
+/* $NetBSD: ioasicvar.h,v 1.21 2011/02/20 08:03:22 matt Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -30,6 +30,8 @@
#ifndef _DEV_TC_IOASICVAR_H_
#define _DEV_TC_IOASICVAR_H_
+#include sys/device.h
+
struct ioasic_dev {
const char *iad_modname;
tc_offset_t iad_offset;
Index: src/sys/dev/tc/tcvar.h
diff -u src/sys/dev/tc/tcvar.h:1.24 src/sys/dev/tc/tcvar.h:1.25
--- src/sys/dev/tc/tcvar.h:1.24 Tue May 12 14:47:04 2009
+++ src/sys/dev/tc/tcvar.h Sun Feb 20 08:03:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tcvar.h,v 1.24 2009/05/12 14:47:04 cegger Exp $ */
+/* $NetBSD: tcvar.h,v 1.25 2011/02/20 08:03:22 matt Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -35,6 +35,7 @@
*/
#include sys/bus.h
+#include sys/device.h
#include dev/tc/tcreg.h
/*
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: matt Date: Sun Feb 20 08:07:10 UTC 2011 Modified Files: src/sys/compat/netbsd32: netbsd32_conv.h Log Message: Don't bother the iov in netbsd32_to_msghdr since it needs to handled specially. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/compat/netbsd32/netbsd32_conv.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/netbsd32/netbsd32_conv.h diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.24 src/sys/compat/netbsd32/netbsd32_conv.h:1.25 --- src/sys/compat/netbsd32/netbsd32_conv.h:1.24 Sun Jan 16 23:21:16 2011 +++ src/sys/compat/netbsd32/netbsd32_conv.h Sun Feb 20 08:07:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_conv.h,v 1.24 2011/01/16 23:21:16 njoly Exp $ */ +/* $NetBSD: netbsd32_conv.h,v 1.25 2011/02/20 08:07:09 matt Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -273,7 +273,6 @@ mhp-msg_name = NETBSD32PTR64(mhp32-msg_name); mhp-msg_namelen = mhp32-msg_namelen; - mhp-msg_iov = NETBSD32PTR64(mhp32-msg_iov); mhp-msg_iovlen = (size_t)mhp32-msg_iovlen; mhp-msg_control = NETBSD32PTR64(mhp32-msg_control); mhp-msg_controllen = mhp32-msg_controllen;
CVS commit: src/sys/compat/irix
Module Name:src
Committed By: matt
Date: Sun Feb 20 08:08:57 UTC 2011
Modified Files:
src/sys/compat/irix: irix_exec.c irix_prctl.c irix_signal.c
Log Message:
Deal with mips trapframe changes.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/compat/irix/irix_exec.c
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/irix/irix_prctl.c
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/irix/irix_signal.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/irix/irix_exec.c
diff -u src/sys/compat/irix/irix_exec.c:1.58 src/sys/compat/irix/irix_exec.c:1.59
--- src/sys/compat/irix/irix_exec.c:1.58 Wed Jul 7 01:30:33 2010
+++ src/sys/compat/irix/irix_exec.c Sun Feb 20 08:08:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_exec.c,v 1.58 2010/07/07 01:30:33 chs Exp $ */
+/* $NetBSD: irix_exec.c,v 1.59 2011/02/20 08:08:57 matt Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: irix_exec.c,v 1.58 2010/07/07 01:30:33 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: irix_exec.c,v 1.59 2011/02/20 08:08:57 matt Exp $);
#ifdef _KERNEL_OPT
#include opt_syscall_debug.h
@@ -44,7 +44,9 @@
#include sys/types.h
#include sys/malloc.h
-#include machine/regnum.h
+#include mips/locore.h
+#include mips/regnum.h
+
#include uvm/uvm_extern.h
#include compat/irix/irix_syscall.h
@@ -123,12 +125,12 @@
void
irix_n32_setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack)
{
- struct frame *f = l-l_md.md_regs;
+ struct trapframe *tf = l-l_md.md_utf;
/* Enable 64 bit instructions (eg: sd) */
- f-f_regs[_R_SR] |= MIPS3_SR_UX | MIPS3_SR_FR;
+ tf-tf_regs[_R_SR] |= MIPS3_SR_UX | MIPS3_SR_FR;
#ifdef _LP64
- f-f_regs[_R_SR] |= MIPS3_SR_KX;
+ tf-tf_regs[_R_SR] |= MIPS3_SR_KX;
#endif
}
Index: src/sys/compat/irix/irix_prctl.c
diff -u src/sys/compat/irix/irix_prctl.c:1.51 src/sys/compat/irix/irix_prctl.c:1.52
--- src/sys/compat/irix/irix_prctl.c:1.51 Thu Jul 1 02:38:28 2010
+++ src/sys/compat/irix/irix_prctl.c Sun Feb 20 08:08:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_prctl.c,v 1.51 2010/07/01 02:38:28 rmind Exp $ */
+/* $NetBSD: irix_prctl.c,v 1.52 2011/02/20 08:08:57 matt Exp $ */
/*-
* Copyright (c) 2001-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: irix_prctl.c,v 1.51 2010/07/01 02:38:28 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: irix_prctl.c,v 1.52 2011/02/20 08:08:57 matt Exp $);
#include sys/errno.h
#include sys/types.h
@@ -50,6 +50,7 @@
#include uvm/uvm_extern.h
#include uvm/uvm_map.h
+#include mips/locore.h
#include machine/regnum.h
#include machine/vmparam.h
@@ -400,8 +401,8 @@
int inh = isc-isc_inh;
struct lwp *lparent = isc-isc_parent_lwp;
struct proc *parent = lparent-l_proc;
- struct frame *tf = (struct frame *)l2-l_md.md_regs;
- struct frame *ptf = (struct frame *)lparent-l_md.md_regs;
+ struct trapframe *tf = l2-l_md.md_utf;
+ struct trapframe *ptf = lparent-l_md.md_utf;
kauth_cred_t pc;
struct irix_emuldata *ied;
struct irix_emuldata *parent_ied;
@@ -477,21 +478,21 @@
/*
* Setup PC to return to the child entry point
*/
- tf-f_regs[_R_PC] = (unsigned long)isc-isc_entry;
- tf-f_regs[_R_RA] = 0;
+ tf-tf_regs[_R_PC] = (unsigned long)isc-isc_entry;
+ tf-tf_regs[_R_RA] = 0;
/*
* Setup child arguments
*/
- tf-f_regs[_R_A0] = (unsigned long)isc-isc_arg;
- tf-f_regs[_R_A1] = 0;
- tf-f_regs[_R_A2] = 0;
- tf-f_regs[_R_A3] = 0;
- if (ptf-f_regs[_R_S3] == (unsigned long)isc-isc_len) {
- tf-f_regs[_R_S0] = ptf-f_regs[_R_S0];
- tf-f_regs[_R_S1] = ptf-f_regs[_R_S1];
- tf-f_regs[_R_S2] = ptf-f_regs[_R_S2];
- tf-f_regs[_R_S3] = ptf-f_regs[_R_S3];
+ tf-tf_regs[_R_A0] = (unsigned long)isc-isc_arg;
+ tf-tf_regs[_R_A1] = 0;
+ tf-tf_regs[_R_A2] = 0;
+ tf-tf_regs[_R_A3] = 0;
+ if (ptf-tf_regs[_R_S3] == (unsigned long)isc-isc_len) {
+ tf-tf_regs[_R_S0] = ptf-tf_regs[_R_S0];
+ tf-tf_regs[_R_S1] = ptf-tf_regs[_R_S1];
+ tf-tf_regs[_R_S2] = ptf-tf_regs[_R_S2];
+ tf-tf_regs[_R_S3] = ptf-tf_regs[_R_S3];
}
/*
Index: src/sys/compat/irix/irix_signal.c
diff -u src/sys/compat/irix/irix_signal.c:1.56 src/sys/compat/irix/irix_signal.c:1.57
--- src/sys/compat/irix/irix_signal.c:1.56 Thu Feb 3 21:45:31 2011
+++ src/sys/compat/irix/irix_signal.c Sun Feb 20 08:08:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: irix_signal.c,v 1.56 2011/02/03 21:45:31 joerg Exp $ */
+/* $NetBSD: irix_signal.c,v 1.57 2011/02/20 08:08:57 matt Exp $ */
/*-
* Copyright (c) 1994, 2001-2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: irix_signal.c,v 1.56 2011/02/03 21:45:31 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: irix_signal.c,v 1.57 2011/02/20 08:08:57 matt Exp $);
#include sys/types.h
#include sys/signal.h
@@ -44,9 +44,10 @@
#include sys/vnode.h
#include sys/wait.h
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src
Committed By: matt
Date: Sun Feb 20 08:13:29 UTC 2011
Modified Files:
src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/compat/linux/arch/mips/linux_syscall.h
cvs rdiff -u -r1.42 -r1.43 src/sys/compat/linux/arch/mips/linux_syscallargs.h \
src/sys/compat/linux/arch/mips/linux_syscalls.c \
src/sys/compat/linux/arch/mips/linux_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/linux/arch/mips/linux_syscall.h
diff -u src/sys/compat/linux/arch/mips/linux_syscall.h:1.43 src/sys/compat/linux/arch/mips/linux_syscall.h:1.44
--- src/sys/compat/linux/arch/mips/linux_syscall.h:1.43 Wed Jul 7 01:31:53 2010
+++ src/sys/compat/linux/arch/mips/linux_syscall.h Sun Feb 20 08:13:29 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.43 2010/07/07 01:31:53 chs Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.44 2011/02/20 08:13:29 matt Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.38 2010/07/07 01:30:34 chs Exp
+ * created from NetBSD: syscalls.master,v 1.39 2011/02/20 08:09:46 matt Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -80,7 +80,7 @@
/* syscall: stime ret: int args: linux_time_t * */
#define LINUX_SYS_stime 25
-/* syscall: ptrace ret: int args: int int int int */
+/* syscall: ptrace ret: int args: long long long long */
#define LINUX_SYS_ptrace 26
/* syscall: alarm ret: int args: unsigned int */
@@ -301,7 +301,7 @@
/* syscall: sysinfo ret: int args: struct linux_sysinfo * */
#define LINUX_SYS_sysinfo 116
-/* syscall: ipc ret: int args: int int int int void * */
+/* syscall: ipc ret: int args: int long long long void * */
#define LINUX_SYS_ipc 117
/* syscall: fsync ret: int args: int */
@@ -364,7 +364,7 @@
/* syscall: cacheflush ret: int args: void * int int */
#define LINUX_SYS_cacheflush 147
-/* syscall: sysmips ret: int args: int int int int */
+/* syscall: sysmips ret: int args: long long long long */
#define LINUX_SYS_sysmips 149
/* syscall: getsid ret: pid_t args: pid_t */
Index: src/sys/compat/linux/arch/mips/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.42 src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.43
--- src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.42 Wed Jul 7 01:31:53 2010
+++ src/sys/compat/linux/arch/mips/linux_syscallargs.h Sun Feb 20 08:13:29 2011
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.42 2010/07/07 01:31:53 chs Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.43 2011/02/20 08:13:29 matt Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.38 2010/07/07 01:30:34 chs Exp
+ * created from NetBSD: syscalls.master,v 1.39 2011/02/20 08:09:46 matt Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -27,7 +27,7 @@
}
#undef check_syscall_args
-#define check_syscall_args(call) \
+#define check_syscall_args(call) /*LINTED*/ \
typedef char call##_check_args[sizeof (struct call##_args) \
= LINUX_SYS_MAXSYSARGS * sizeof (register_t) ? 1 : -1];
@@ -99,10 +99,10 @@
check_syscall_args(linux_sys_stime)
struct linux_sys_ptrace_args {
- syscallarg(int) request;
- syscallarg(int) pid;
- syscallarg(int) addr;
- syscallarg(int) data;
+ syscallarg(long) request;
+ syscallarg(long) pid;
+ syscallarg(long) addr;
+ syscallarg(long) data;
};
check_syscall_args(linux_sys_ptrace)
@@ -368,9 +368,9 @@
struct linux_sys_ipc_args {
syscallarg(int) what;
- syscallarg(int) a1;
- syscallarg(int) a2;
- syscallarg(int) a3;
+ syscallarg(long) a1;
+ syscallarg(long) a2;
+ syscallarg(long) a3;
syscallarg(void *) ptr;
};
check_syscall_args(linux_sys_ipc)
@@ -476,10 +476,10 @@
check_syscall_args(linux_sys_cacheflush)
struct linux_sys_sysmips_args {
- syscallarg(int) cmd;
- syscallarg(int) arg1;
- syscallarg(int) arg2;
- syscallarg(int) arg3;
+ syscallarg(long) cmd;
+ syscallarg(long) arg1;
+ syscallarg(long) arg2;
+ syscallarg(long) arg3;
};
check_syscall_args(linux_sys_sysmips)
Index: src/sys/compat/linux/arch/mips/linux_syscalls.c
diff -u src/sys/compat/linux/arch/mips/linux_syscalls.c:1.42 src/sys/compat/linux/arch/mips/linux_syscalls.c:1.43
--- src/sys/compat/linux/arch/mips/linux_syscalls.c:1.42 Wed Jul 7 01:31:53 2010
+++ src/sys/compat/linux/arch/mips/linux_syscalls.c Sun Feb 20 08:13:29 2011
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.42 2010/07/07 01:31:53 chs Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.43 2011/02/20 08:13:29 matt Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.38 2010/07/07 01:30:34 chs
CVS commit: src/distrib
Module Name:src
Committed By: matt
Date: Sun Feb 20 08:26:10 UTC 2011
Modified Files:
src/distrib/cobalt/instkernel: Makefile
src/distrib/evbmips/instkernel/instkernel: Makefile
src/distrib/sgimips/instkernel: Makefile
src/distrib/utils/sysinst: Makefile.inc
src/distrib/utils/sysinst/arch/evbmips: md.h
Added Files:
src/distrib/sgimips/instkernel: list64
Log Message:
Deal with 64 bit versions of kernels
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/cobalt/instkernel/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/evbmips/instkernel/instkernel/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/sgimips/instkernel/Makefile
cvs rdiff -u -r0 -r1.2 src/distrib/sgimips/instkernel/list64
cvs rdiff -u -r1.51 -r1.52 src/distrib/utils/sysinst/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/distrib/utils/sysinst/arch/evbmips/md.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cobalt/instkernel/Makefile
diff -u src/distrib/cobalt/instkernel/Makefile:1.1 src/distrib/cobalt/instkernel/Makefile:1.2
--- src/distrib/cobalt/instkernel/Makefile:1.1 Sat Feb 2 14:06:48 2008
+++ src/distrib/cobalt/instkernel/Makefile Sun Feb 20 08:26:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/02/02 14:06:48 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/20 08:26:08 matt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -6,12 +6,16 @@
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-MDSETTARGETS= RAMDISK ${RAMDISK} -
+.if ${MACHINE_ARCH} == mips64el
+SFX= 64
+.endif
+
+MDSETTARGETS= RAMDISK${SFX} ${RAMDISK} -
MDSET_RELEASEDIR= binary/kernel
# do not strip kernels, there's no space constraints here.
-MDSET_NOSTRIP.netbsd-RAMDISK=
-MDSET_NOSYMBOLS.netbsd-RAMDISK=
+MDSET_NOSTRIP.netbsd-RAMDISK${SFX}=
+MDSET_NOSYMBOLS.netbsd-RAMDISK${SFX}=
.include ${DISTRIBDIR}/common/Makefile.mdset
Index: src/distrib/evbmips/instkernel/instkernel/Makefile
diff -u src/distrib/evbmips/instkernel/instkernel/Makefile:1.2 src/distrib/evbmips/instkernel/instkernel/Makefile:1.3
--- src/distrib/evbmips/instkernel/instkernel/Makefile:1.2 Mon Dec 14 01:12:05 2009
+++ src/distrib/evbmips/instkernel/instkernel/Makefile Sun Feb 20 08:26:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/12/14 01:12:05 matt Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/20 08:26:09 matt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -14,6 +14,8 @@
.elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
MDSETTARGETS= INSTALL_MALTA32 ${RAMDISK} -
MDSETTARGETS+= INSTALL_MALTA64 ${RAMDISK} -
+MDSETTARGETS+= INSTALL_XLSATX32 ${RAMDISK} -
+MDSETTARGETS+= INSTALL_XLSATX64 ${RAMDISK} -
.else
# Big endian platforms.
Index: src/distrib/sgimips/instkernel/Makefile
diff -u src/distrib/sgimips/instkernel/Makefile:1.7 src/distrib/sgimips/instkernel/Makefile:1.8
--- src/distrib/sgimips/instkernel/Makefile:1.7 Mon Aug 16 13:24:54 2010
+++ src/distrib/sgimips/instkernel/Makefile Sun Feb 20 08:26:09 2011
@@ -1,26 +1,35 @@
-# $NetBSD: Makefile,v 1.7 2010/08/16 13:24:54 he Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/20 08:26:09 matt Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
.include bsd.kernobj.mk
+.if ${MACHINE_ARCH} == mipseb
+NX= 32
+SFX= # none
+LISTS= ${.CURDIR}/list
+.else
+NX= 64
+SFX= .elf32
+LISTS= ${.CURDIR}/list64
+.endif
+
IMAGE= diskimage
IMAGESIZE= 3600k
-LISTS= ${.CURDIR}/list
MTREECONF= ${DISTRIBDIR}/common/mtree.dot
IMAGEENDIAN= be
-IMAGEDEPENDS= netbsd-INSTALL32_IP2x.gz netbsd-INSTALL32_IP3x.gz
RAMDISKDIR!= cd ${.CURDIR}/../ramdisk ${PRINTOBJDIR}
RAMDISK= ${RAMDISKDIR}/ramdisk.fs
-MDSETTARGETS= INSTALL32_IP2x ${RAMDISK} netbsd-INSTALL32_IP2x \
- INSTALL32_IP3x ${RAMDISK} netbsd-INSTALL32_IP3x
+IMAGEDEPENDS= netbsd-INSTALL${NX}_IP2x.gz netbsd-INSTALL${NX}_IP3x.gz
+MDSETTARGETS= INSTALL${NX}_IP2x ${RAMDISK} netbsd-INSTALL${NX}_IP2x${SFX} \
+ INSTALL${NX}_IP3x ${RAMDISK} netbsd-INSTALL${NX}_IP3x${SFX}
MDSET_RELEASEDIR= binary/kernel
-MDSET_SUFFIXES.netbsd-INSTALL32_IP2x=ecoff create-ecoff
+MDSET_SUFFIXES.netbsd-INSTALL${NX}_IP2x=ecoff create-ecoff
create-ecoff= ${OBJCOPY} --impure -O ecoff-bigmips \
-R .pdr -R .mdebug.abi32 -R .comment -R .ident \
${.TARGET:R} ${.TARGET}
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.51 src/distrib/utils/sysinst/Makefile.inc:1.52
--- src/distrib/utils/sysinst/Makefile.inc:1.51 Wed Feb 3 15:34:38 2010
+++ src/distrib/utils/sysinst/Makefile.inc Sun Feb 20 08:26:09 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.51 2010/02/03 15:34:38 roy Exp $
+# $NetBSD: Makefile.inc,v 1.52 2011/02/20 08:26:09 matt Exp $
#
# Makefile for sysinst
@@ -39,7 +39,8 @@
MSG_XLAT_SH=
CVS commit: src/etc
Module Name:src
Committed By: matt
Date: Sun Feb 20 08:27:32 UTC 2011
Modified Files:
src/etc/etc.cobalt: Makefile.inc
src/etc/etc.evbmips: Makefile.inc
Log Message:
Build different kernel when mips64e[bl]
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/etc/etc.cobalt/Makefile.inc
cvs rdiff -u -r1.12 -r1.13 src/etc/etc.evbmips/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.cobalt/Makefile.inc
diff -u src/etc/etc.cobalt/Makefile.inc:1.4 src/etc/etc.cobalt/Makefile.inc:1.5
--- src/etc/etc.cobalt/Makefile.inc:1.4 Sat Feb 2 14:07:39 2008
+++ src/etc/etc.cobalt/Makefile.inc Sun Feb 20 08:27:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2008/02/02 14:07:39 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.5 2011/02/20 08:27:32 matt Exp $
#
# etc.cobalt/Makefile.inc -- cobalt-specific etc Makefile targets
#
@@ -6,6 +6,12 @@
# If you change the list of distributed kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
+.if ${MACHINE_ARCH} == mips64el
+KERNEL_SETS= GENERIC32 GENERIC64 INSTALL32 INSTALL64
+
+BUILD_KERNELS= RAMDISK32 RAMDISK64
+.else
KERNEL_SETS= GENERIC INSTALL
BUILD_KERNELS= RAMDISK
+.endif
Index: src/etc/etc.evbmips/Makefile.inc
diff -u src/etc/etc.evbmips/Makefile.inc:1.12 src/etc/etc.evbmips/Makefile.inc:1.13
--- src/etc/etc.evbmips/Makefile.inc:1.12 Mon Dec 14 01:12:05 2009
+++ src/etc/etc.evbmips/Makefile.inc Sun Feb 20 08:27:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2009/12/14 01:12:05 matt Exp $
+# $NetBSD: Makefile.inc,v 1.13 2011/02/20 08:27:32 matt Exp $
#
# etc.evbmips/Makefile.inc -- evbmips-specific etc Makefile targets
#
@@ -13,8 +13,9 @@
BUILD_KERNELS= INSTALL_OMSAL400 INSTALL_MALTA
.elif ${MACHINE_ARCH} == mips64eb || ${MACHINE_ARCH} == mips64el
-KERNEL_SETS= MALTA32 MALTA64
+KERNEL_SETS= MALTA32 MALTA64 XLSATX32 XLSATX64
BUILD_KERNELS= INSTALL_MALTA32 INSTALL_MALTA64
+BUILD_KERNELS+= INSTALL_XLSATX32 INSTALL_XLSATX64
.else
KERNEL_SETS= ALCHEMY DBAU1500 DBAU1550 MALTA
CVS commit: src
Module Name:src Committed By: jruoho Date: Sun Feb 20 08:31:47 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/sys/dev/acpi: files.acpi Added Files: src/share/man/man4: fujbp.4 src/sys/dev/acpi: fujbp_acpi.c fujhk_acpi.c Removed Files: src/share/man/man4: fujitsu.4 src/sys/dev/acpi: fujitsu_acpi.c Log Message: Split fujbp(4) and fujhk(4) to separate instances from fujitsu(4). Allows modularization and takes care of tsutsui@'s justified concern over the too generic name fujitsu. Ok gsutre@. To generate a diff of this commit: cvs rdiff -u -r1.1289 -r1.1290 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.551 -r1.552 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/fujbp.4 cvs rdiff -u -r1.4 -r0 src/share/man/man4/fujitsu.4 cvs rdiff -u -r1.86 -r1.87 src/sys/dev/acpi/files.acpi cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/fujbp_acpi.c \ src/sys/dev/acpi/fujhk_acpi.c cvs rdiff -u -r1.2 -r0 src/sys/dev/acpi/fujitsu_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1289 src/distrib/sets/lists/man/mi:1.1290 --- src/distrib/sets/lists/man/mi:1.1289 Wed Feb 16 07:30:27 2011 +++ src/distrib/sets/lists/man/mi Sun Feb 20 08:31:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1289 2011/02/16 07:30:27 jruoho Exp $ +# $NetBSD: mi,v 1.1290 2011/02/20 08:31:46 jruoho Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -974,7 +974,7 @@ ./usr/share/man/cat4/fta.0 man-sys-catman .cat ./usr/share/man/cat4/fujbp.0 man-sys-catman .cat ./usr/share/man/cat4/fujhk.0 man-sys-catman .cat -./usr/share/man/cat4/fujitsu.0 man-sys-catman .cat +./usr/share/man/cat4/fujitsu.0 man-obsolete obsolete ./usr/share/man/cat4/fwhrng.0 man-obsolete obsolete ./usr/share/man/cat4/fwip.0 man-sys-catman .cat ./usr/share/man/cat4/fwiso.0 man-obsolete obsolete @@ -3736,7 +3736,7 @@ ./usr/share/man/html4/fta.html man-sys-htmlman html ./usr/share/man/html4/fujbp.html man-sys-htmlman html ./usr/share/man/html4/fujhk.html man-sys-htmlman html -./usr/share/man/html4/fujitsu.html man-sys-htmlman html +./usr/share/man/html4/fujitsu.html man-obsolete obsolete ./usr/share/man/html4/fwhrng.html man-obsolete obsolete ./usr/share/man/html4/fwip.html man-sys-htmlman html ./usr/share/man/html4/fwohci.html man-sys-htmlman html @@ -6273,7 +6273,7 @@ ./usr/share/man/man4/fta.4 man-sys-man .man ./usr/share/man/man4/fujbp.4 man-sys-man .man ./usr/share/man/man4/fujhk.4 man-sys-man .man -./usr/share/man/man4/fujitsu.4 man-sys-man .man +./usr/share/man/man4/fujitsu.4 man-obsolete obsolete ./usr/share/man/man4/fwhrng.4 man-obsolete obsolete ./usr/share/man/man4/fwip.4 man-sys-man .man ./usr/share/man/man4/fwiso.4 man-obsolete obsolete Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.551 src/share/man/man4/Makefile:1.552 --- src/share/man/man4/Makefile:1.551 Wed Feb 16 07:30:26 2011 +++ src/share/man/man4/Makefile Sun Feb 20 08:31:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.551 2011/02/16 07:30:26 jruoho Exp $ +# $NetBSD: Makefile,v 1.552 2011/02/20 08:31:46 jruoho Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -24,7 +24,7 @@ dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \ eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \ esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \ - fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fujitsu.4 fxp.4 \ + fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \ gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \ glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiosim.4 gre.4 gphyter.4 gsip.4 \ hdaudio.4 hifn.4 hme.4 hpqlb.4 hptide.4 \ @@ -181,7 +181,7 @@ MLINKS+=dbcool.4 adt7476.4 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4 MLINKS+=fpa.4 fea.4 fpa.4 fta.4 -MLINKS+=fujitsu.4 fujbp.4 fujitsu.4 fujhk.4 +MLINKS+=fujbp.4 fujhk.4 MLINKS+=hdaudio.4 hdafg.4 MLINKS+=hdaudio.4 hdaudiobus.4 MLINKS+=icp.4 icpsp.4 Index: src/sys/dev/acpi/files.acpi diff -u src/sys/dev/acpi/files.acpi:1.86 src/sys/dev/acpi/files.acpi:1.87 --- src/sys/dev/acpi/files.acpi:1.86 Mon Jan 17 15:55:24 2011 +++ src/sys/dev/acpi/files.acpi Sun Feb 20 08:31:46 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.acpi,v 1.86 2011/01/17 15:55:24 jmcneill Exp $ +# $NetBSD: files.acpi,v 1.87 2011/02/20 08:31:46 jruoho Exp $ include dev/acpi/acpica/files.acpica @@ -198,11 +198,14 @@ attach acpismbus at acpinodebus file dev/acpi/smbus_acpi.c acpismbus -# Fujitsu Brightness, Pointer and Hotkeys +# Fujitsu Brightness Pointer device fujbp attach fujbp at acpinodebus +file dev/acpi/fujbp_acpi.c fujbp + +# Fujitsu Hotkeys device fujhk: sysmon_power attach fujhk at acpinodebus
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 08:37:51 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Added Files:
src/sys/modules/fujbp: Makefile fujbp.ioconf
src/sys/modules/fujhk: Makefile fujhk.ioconf
Log Message:
Build fujbp(4), fujhk(4), and wmieeepc(4) as modules.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.62 -r1.63 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/fujbp/Makefile \
src/sys/modules/fujbp/fujbp.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/fujhk/Makefile \
src/sys/modules/fujhk/fujhk.ioconf
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/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.14 src/distrib/sets/lists/modules/md.amd64:1.15
--- src/distrib/sets/lists/modules/md.amd64:1.14 Sat Feb 5 23:22:16 2011
+++ src/distrib/sets/lists/modules/md.amd64 Sun Feb 20 08:37:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.14 2011/02/05 23:22:16 christos Exp $
+# $NetBSD: md.amd64,v 1.15 2011/02/20 08:37:50 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -47,6 +47,10 @@
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf64 base-kernel-modules kmod
./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules kmod
+./@MODULEDIR@/fujbpbase-kernel-modules kmod
+./@MODULEDIR@/fujbp/fujbp.kmod base-kernel-modules kmod
+./@MODULEDIR@/fujhkbase-kernel-modules kmod
+./@MODULEDIR@/fujhk/fujhk.kmod base-kernel-modules kmod
./@MODULEDIR@/hpqlbbase-kernel-modules kmod
./@MODULEDIR@/hpqlb/hpqlb.kmod base-kernel-modules kmod
./@MODULEDIR@/i915drmbase-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.16 src/distrib/sets/lists/modules/md.i386:1.17
--- src/distrib/sets/lists/modules/md.i386:1.16 Sat Feb 19 14:28:08 2011
+++ src/distrib/sets/lists/modules/md.i386 Sun Feb 20 08:37:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.16 2011/02/19 14:28:08 jmcneill Exp $
+# $NetBSD: md.i386,v 1.17 2011/02/20 08:37:50 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -49,8 +49,10 @@
./@MODULEDIR@/exec_aout/exec_aout.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
-./@MODULEDIR@/hpqlbbase-kernel-modules kmod
-./@MODULEDIR@/hpqlb/hpqlb.kmod base-kernel-modules kmod
+./@MODULEDIR@/fujbpbase-kernel-modules kmod
+./@MODULEDIR@/fujbp/fujbp.kmod base-kernel-modules kmod
+./@MODULEDIR@/fujhkbase-kernel-modules kmod
+./@MODULEDIR@/fujhk/fujhk.kmod base-kernel-modules kmod
./@MODULEDIR@/i915drmbase-kernel-modules kmod
./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod
./@MODULEDIR@/radeondrmbase-kernel-modules kmod
@@ -69,6 +71,8 @@
./@MODULEDIR@/viadrm/viadrm.kmod base-kernel-modules kmod
./@MODULEDIR@/wmidellbase-kernel-modules kmod
./@MODULEDIR@/wmidell/wmidell.kmod base-kernel-modules kmod
+./@MODULEDIR@/wmieeepcbase-kernel-modules kmod
+./@MODULEDIR@/wmieeepc/wmieeepc.kmod base-kernel-modules kmod
./@MODULEDIR@/wmihpbase-kernel-modules kmod
./@MODULEDIR@/wmihp/wmihp.kmod base-kernel-modules kmod
./@MODULEDIR@/wmimsibase-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.62 src/sys/modules/Makefile:1.63
--- src/sys/modules/Makefile:1.62 Sat Feb 19 14:28:07 2011
+++ src/sys/modules/Makefile Sun Feb 20 08:37:50 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2011/02/19 14:28:07 jmcneill Exp $
+# $NetBSD: Makefile,v 1.63 2011/02/20 08:37:50 jruoho Exp $
.include bsd.own.mk
@@ -111,6 +111,8 @@
SUBDIR+= acpiwmi
SUBDIR+= aibs
SUBDIR+= asus
+SUBDIR+= fujbp
+SUBDIR+= fujhk
SUBDIR+= hpqlb
SUBDIR+= thinkpad
SUBDIR+= wmidell
@@ -140,6 +142,7 @@
SUBDIR+= viadrm
SUBDIR+= pad
SUBDIR+= padlock
+SUBDIR+= wmieeepc
.endif
.if ${MACHINE_ARCH} == i386 || \
Added files:
Index: src/sys/modules/fujbp/Makefile
diff -u /dev/null src/sys/modules/fujbp/Makefile:1.1
--- /dev/null Sun Feb 20 08:37:51 2011
+++ src/sys/modules/fujbp/Makefile Sun Feb 20 08:37:50 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/02/20 08:37:50 jruoho Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/acpi
+
+KMOD= fujbp
+IOCONF= fujbp.ioconf
+SRCS= fujbp_acpi.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/fujbp/fujbp.ioconf
diff -u
CVS commit: src/distrib/sets/lists/modules
Module Name:src Committed By: jruoho Date: Sun Feb 20 08:40:24 UTC 2011 Modified Files: src/distrib/sets/lists/modules: md.i386 Log Message: hpqlb(4) was accidentally removed in the previous commit. Put it back. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/modules/md.i386 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/modules/md.i386 diff -u src/distrib/sets/lists/modules/md.i386:1.17 src/distrib/sets/lists/modules/md.i386:1.18 --- src/distrib/sets/lists/modules/md.i386:1.17 Sun Feb 20 08:37:50 2011 +++ src/distrib/sets/lists/modules/md.i386 Sun Feb 20 08:40:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.17 2011/02/20 08:37:50 jruoho Exp $ +# $NetBSD: md.i386,v 1.18 2011/02/20 08:40:24 jruoho Exp $ ./@MODULEDIR@/acpiacadbase-kernel-modules kmod ./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod ./@MODULEDIR@/acpibatbase-kernel-modules kmod @@ -53,6 +53,8 @@ ./@MODULEDIR@/fujbp/fujbp.kmod base-kernel-modules kmod ./@MODULEDIR@/fujhkbase-kernel-modules kmod ./@MODULEDIR@/fujhk/fujhk.kmod base-kernel-modules kmod +./@MODULEDIR@/hpqlbbase-kernel-modules kmod +./@MODULEDIR@/hpqlb/hpqlb.kmod base-kernel-modules kmod ./@MODULEDIR@/i915drmbase-kernel-modules kmod ./@MODULEDIR@/i915drm/i915drm.kmod base-kernel-modules kmod ./@MODULEDIR@/radeondrmbase-kernel-modules kmod
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun Feb 20 10:02:02 UTC 2011 Modified Files: src/sys/arch/sparc/sparc: cpu.c cpuvar.h genassym.cf locore.s Log Message: remove the evcnt for NULL struct fpstate * ipi, and switch over to an explicit panic() if we get one. i'm pretty sure that converting xmpsg_lock from IPL_VM to IPL_SCHED fixed this problem properly. i have not seen the evcnt trigger since that change, nor have several others queried. To generate a diff of this commit: cvs rdiff -u -r1.230 -r1.231 src/sys/arch/sparc/sparc/cpu.c cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc/sparc/cpuvar.h cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sparc/sparc/genassym.cf cvs rdiff -u -r1.262 -r1.263 src/sys/arch/sparc/sparc/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/sparc/cpu.c diff -u src/sys/arch/sparc/sparc/cpu.c:1.230 src/sys/arch/sparc/sparc/cpu.c:1.231 --- src/sys/arch/sparc/sparc/cpu.c:1.230 Tue Feb 15 09:05:14 2011 +++ src/sys/arch/sparc/sparc/cpu.c Sun Feb 20 10:02:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.230 2011/02/15 09:05:14 mrg Exp $ */ +/* $NetBSD: cpu.c,v 1.231 2011/02/20 10:02:01 mrg Exp $ */ /* * Copyright (c) 1996 @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.230 2011/02/15 09:05:14 mrg Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.231 2011/02/20 10:02:01 mrg Exp $); #include opt_multiprocessor.h #include opt_lockdebug.h @@ -342,14 +342,9 @@ /* * Setup the per-cpu counters. - * - * The savefp null counter should go away when the NULL - * struct fpstate * bug is fixed. */ evcnt_attach_dynamic(cpi-ci_savefpstate, EVCNT_TYPE_MISC, NULL, cpu_name(cpi), savefp ipi); - evcnt_attach_dynamic(cpi-ci_savefpstate_null, EVCNT_TYPE_MISC, - NULL, cpu_name(cpi), savefp null ipi); evcnt_attach_dynamic(cpi-ci_xpmsg_mutex_fail, EVCNT_TYPE_MISC, NULL, cpu_name(cpi), IPI mutex_trylock fail); evcnt_attach_dynamic(cpi-ci_xpmsg_mutex_fail_call, EVCNT_TYPE_MISC, Index: src/sys/arch/sparc/sparc/cpuvar.h diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.88 src/sys/arch/sparc/sparc/cpuvar.h:1.89 --- src/sys/arch/sparc/sparc/cpuvar.h:1.88 Tue Feb 15 09:05:14 2011 +++ src/sys/arch/sparc/sparc/cpuvar.h Sun Feb 20 10:02:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuvar.h,v 1.88 2011/02/15 09:05:14 mrg Exp $ */ +/* $NetBSD: cpuvar.h,v 1.89 2011/02/20 10:02:01 mrg Exp $ */ /* * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -337,7 +337,6 @@ vaddr_t ci_free_sva1, ci_free_eva1, ci_free_sva2, ci_free_eva2; struct evcnt ci_savefpstate; - struct evcnt ci_savefpstate_null; struct evcnt ci_xpmsg_mutex_fail; struct evcnt ci_xpmsg_mutex_fail_call; struct evcnt ci_intrcnt[16]; Index: src/sys/arch/sparc/sparc/genassym.cf diff -u src/sys/arch/sparc/sparc/genassym.cf:1.64 src/sys/arch/sparc/sparc/genassym.cf:1.65 --- src/sys/arch/sparc/sparc/genassym.cf:1.64 Thu Jan 27 06:24:59 2011 +++ src/sys/arch/sparc/sparc/genassym.cf Sun Feb 20 10:02:01 2011 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.64 2011/01/27 06:24:59 mrg Exp $ +# $NetBSD: genassym.cf,v 1.65 2011/02/20 10:02:01 mrg Exp $ # # Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -171,7 +171,6 @@ define CPUINFO_MTX_OLDSPL offsetof(struct cpu_info, ci_mtx_oldspl) define CPUINFO_IDEPTH offsetof(struct cpu_info, ci_idepth) define CPUINFO_SAVEFPSTATE offsetof(struct cpu_info, ci_savefpstate) -define CPUINFO_SAVEFPSTATE_NULL offsetof(struct cpu_info, ci_savefpstate_null) # PTE bits and related information define PG_W PG_W Index: src/sys/arch/sparc/sparc/locore.s diff -u src/sys/arch/sparc/sparc/locore.s:1.262 src/sys/arch/sparc/sparc/locore.s:1.263 --- src/sys/arch/sparc/sparc/locore.s:1.262 Tue Feb 15 11:30:21 2011 +++ src/sys/arch/sparc/sparc/locore.s Sun Feb 20 10:02:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.262 2011/02/15 11:30:21 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.263 2011/02/20 10:02:01 mrg Exp $ */ /* * Copyright (c) 1996 Paul Kranenburg @@ -5912,24 +5912,13 @@ std %f30, [%o0 + FS_REGS + (4*30)] /* - * We really should panic here but while we figure out what the bug is - * that a remote CPU gets a NULL struct fpstate *, this lets the system - * work at least seemingly stably. + * We got a NULL struct fpstate * on the IPI. We panic. */ Lfp_null_fpstate: -#if 1 - sethi %hi(CPUINFO_VA), %o5 - ldd [%o5 + CPUINFO_SAVEFPSTATE_NULL], %o2 - inccc %o3 - addx%o2, 0, %o2 - retl - std %o2, [%o5 + CPUINFO_SAVEFPSTATE_NULL] -#else ld [%o5 + CPUINFO_CPUNO], %o1 sethi %hi(Lpanic_savefpstate), %o0 call _C_LABEL(panic) or %o0, %lo(Lpanic_savefpstate), %o0 -#endif 1: /*
CVS commit: src/sys/ddb
Module Name:src
Committed By: hannken
Date: Sun Feb 20 10:24:45 UTC 2011
Modified Files:
src/sys/ddb: db_cpu.c
Log Message:
When looking for the next element of cpu_queue compare the pointer to the
address of the head, not to the head itself. Not sure if the cast of the
arg to db_value_name() is right, but works on i386 and compiles on sparc64.
Stack traces from ddb work again on i386.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/ddb/db_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/ddb/db_cpu.c
diff -u src/sys/ddb/db_cpu.c:1.3 src/sys/ddb/db_cpu.c:1.4
--- src/sys/ddb/db_cpu.c:1.3 Mon Mar 9 06:07:05 2009
+++ src/sys/ddb/db_cpu.c Sun Feb 20 10:24:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_cpu.c,v 1.3 2009/03/09 06:07:05 mrg Exp $ */
+/* $NetBSD: db_cpu.c,v 1.4 2011/02/20 10:24:45 hannken Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_cpu.c,v 1.3 2009/03/09 06:07:05 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_cpu.c,v 1.4 2011/02/20 10:24:45 hannken Exp $);
#ifndef _KERNEL
#include stdbool.h
@@ -43,12 +43,14 @@
#include ddb/ddb.h
static struct cpu_info *head;
+static void *head_addr;
struct cpu_info *
db_cpu_first(void)
{
head = db_read_ptr(cpu_queue);
+ (void) db_value_of_name(cpu_queue, (db_expr_t *)head_addr);
return head;
}
@@ -58,7 +60,7 @@
db_read_bytes((db_addr_t)ci-ci_data.cpu_qchain.cqe_next,
sizeof(ci), (char *)ci);
- if (ci == head) {
+ if (ci == head_addr) {
ci = NULL;
}
return ci;
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun Feb 20 10:26:26 UTC 2011 Modified Files: src/sys/arch/sparc/sparc: locore.s Log Message: remove an unused 1: label left over from previous commit. To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/sys/arch/sparc/sparc/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/sparc/locore.s diff -u src/sys/arch/sparc/sparc/locore.s:1.263 src/sys/arch/sparc/sparc/locore.s:1.264 --- src/sys/arch/sparc/sparc/locore.s:1.263 Sun Feb 20 10:02:01 2011 +++ src/sys/arch/sparc/sparc/locore.s Sun Feb 20 10:26:26 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.263 2011/02/20 10:02:01 mrg Exp $ */ +/* $NetBSD: locore.s,v 1.264 2011/02/20 10:26:26 mrg Exp $ */ /* * Copyright (c) 1996 Paul Kranenburg @@ -5919,7 +5919,6 @@ sethi %hi(Lpanic_savefpstate), %o0 call _C_LABEL(panic) or %o0, %lo(Lpanic_savefpstate), %o0 -1: /* * Store the (now known nonempty) FP queue.
CVS commit: src/sys/kern
Module Name:src
Committed By: nakayama
Date: Sun Feb 20 11:21:34 UTC 2011
Modified Files:
src/sys/kern: vfs_wapbl.c
Log Message:
Fix digit number of nanosecond.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/vfs_wapbl.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_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.42 src/sys/kern/vfs_wapbl.c:1.43
--- src/sys/kern/vfs_wapbl.c:1.42 Fri Feb 18 13:24:40 2011
+++ src/sys/kern/vfs_wapbl.c Sun Feb 20 11:21:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.42 2011/02/18 13:24:40 hannken Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.43 2011/02/20 11:21:34 nakayama Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_wapbl.c,v 1.42 2011/02/18 13:24:40 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_wapbl.c,v 1.43 2011/02/20 11:21:34 nakayama Exp $);
#include sys/param.h
#include sys/bitops.h
@@ -1406,7 +1406,7 @@
if (wapbl_verbose_commit) {
struct timespec ts;
getnanotime(ts);
- printf(%s: %lld.%06ld this transaction = %zu bytes\n,
+ printf(%s: %lld.%09ld this transaction = %zu bytes\n,
__func__, (long long)ts.tv_sec,
(long)ts.tv_nsec, flushsize);
}
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Sun Feb 20 11:22:34 UTC 2011 Modified Files: src/share/man/man4: ath.4 Log Message: add AR9280 support To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man4/ath.4 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/man4/ath.4 diff -u src/share/man/man4/ath.4:1.28 src/share/man/man4/ath.4:1.29 --- src/share/man/man4/ath.4:1.28 Sat Aug 7 14:56:02 2010 +++ src/share/man/man4/ath.4 Sun Feb 20 11:22:34 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ath.4,v 1.28 2010/08/07 14:56:02 jmcneill Exp $ +.\ $NetBSD: ath.4,v 1.29 2011/02/20 11:22:34 jmcneill Exp $ .\ .\ Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting .\ All rights reserved. @@ -41,7 +41,7 @@ .\ $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath.4,v 1.16 2004/02/18 08:30:08 maxim Exp $ .\ parts from $FreeBSD: /repoman/r/ncvs/src/share/man/man4/ath_hal.4,v 1.7 2004/01/07 20:49:51 blackend Exp $ .\ -.Dd August 7, 2010 +.Dd February 20, 2011 .Dt ATH 4 .Os .Sh NAME @@ -55,7 +55,7 @@ .Nm driver provides support for wireless network adapters based on the Atheros AR2413, AR2417, AR5210, AR5211, AR5212, AR5213, AR5413, -AR5416, AR5424, and AR9160 chips. +AR5416, AR5424, AR9160, and AR9280 chips. Chip-specific support is provided by the Atheros Hardware Access Layer (HAL). .Pp
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Sun Feb 20 11:23:26 UTC 2011 Modified Files: src/doc: CHANGES Log Message: ath(4): Add support for AR9280 devices. To generate a diff of this commit: cvs rdiff -u -r1.1508 -r1.1509 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.1508 src/doc/CHANGES:1.1509 --- src/doc/CHANGES:1.1508 Sat Feb 19 19:42:07 2011 +++ src/doc/CHANGES Sun Feb 20 11:23:25 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1508 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1509 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -859,3 +859,4 @@ bind: Update to 9.8.0rc1: Response policy zones (RPZ) and DNS64 support. [christos 20110215] acpi(4): Updated ACPICA to 20110211. [jruoho 20110217] + ath(4): Add support for AR9280 devices. [jmcneill 20110220]
CVS commit: src/sys/modules/ath_hal
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 11:26:34 UTC 2011
Modified Files:
src/sys/modules/ath_hal: Makefile Makefile.inc
Log Message:
catch up to AR9280 changes
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/ath_hal/Makefile \
src/sys/modules/ath_hal/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/ath_hal/Makefile
diff -u src/sys/modules/ath_hal/Makefile:1.1 src/sys/modules/ath_hal/Makefile:1.2
--- src/sys/modules/ath_hal/Makefile:1.1 Sun Feb 20 03:58:33 2011
+++ src/sys/modules/ath_hal/Makefile Sun Feb 20 11:26:33 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/20 03:58:33 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/20 11:26:33 jmcneill Exp $
.include ../Makefile.inc
@@ -17,6 +17,7 @@
ah_eeprom_v1.c \
ah_eeprom_v3.c \
ah_eeprom_v14.c \
+ ah_eeprom_v4k.c \
ah_regdomain.c
SRCS+= ah_osdep.c
SRCS+= ar5210_attach.c \
@@ -86,7 +87,9 @@
ar5416_recv.c \
ar5416_reset.c \
ar5416_xmit.c \
- ar9160_attach.c
+ ar9160_attach.c \
+ ar9280.c \
+ ar9280_attach.c
WARNS= 3
Index: src/sys/modules/ath_hal/Makefile.inc
diff -u src/sys/modules/ath_hal/Makefile.inc:1.1 src/sys/modules/ath_hal/Makefile.inc:1.2
--- src/sys/modules/ath_hal/Makefile.inc:1.1 Sun Feb 20 03:58:33 2011
+++ src/sys/modules/ath_hal/Makefile.inc Sun Feb 20 11:26:34 2011
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/02/20 03:58:33 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.2 2011/02/20 11:26:34 jmcneill Exp $
CPPFLAGS+= -I${S}/external/isc/atheros_hal/dist
CPPFLAGS+= -I${S}/external/isc/atheros_hal/ic
CPPFLAGS+= -DATHHAL_AR5210 -DATHHAL_AR5211 -DATHHAL_AR5212 \
- -DATHHAL_AR5311 -DATHHAL_AR5312 -DATHHAL_AR5416
+ -DATHHAL_AR5311 -DATHHAL_AR5312 -DATHHAL_AR5416 \
+ -DATHHAL_AR9280
CPPFLAGS+= -DATHHAL_RF2316 -DATHHAL_RF2317 -DATHHAL_RF2413 \
-DATHHAL_RF2425 -DATHHAL_RF5111 -DATHHAL_RF5112 \
-DATHHAL_RF5413
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: jmcneill Date: Sun Feb 20 12:47:22 UTC 2011 Modified Files: src/sys/arch/x86/include: cpu.h Log Message: cpu.h no longer needs via_padlock.h To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/include/cpu.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/x86/include/cpu.h diff -u src/sys/arch/x86/include/cpu.h:1.27 src/sys/arch/x86/include/cpu.h:1.28 --- src/sys/arch/x86/include/cpu.h:1.27 Sat Feb 19 13:52:28 2011 +++ src/sys/arch/x86/include/cpu.h Sun Feb 20 12:47:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.27 2011/02/19 13:52:28 jmcneill Exp $ */ +/* $NetBSD: cpu.h,v 1.28 2011/02/20 12:47:21 jmcneill Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -56,7 +56,6 @@ #include machine/intrdefs.h #include x86/cacheinfo.h -#include x86/via_padlock.h #include sys/cpu_data.h #include sys/evcnt.h
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: pooka Date: Sun Feb 20 13:09:57 UTC 2011 Modified Files: src/sys/rump/librump/rumpkern: signals.c Log Message: Change the default sigmodel to raise, it makes more sense than causing a panic. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/rump/librump/rumpkern/signals.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/rump/librump/rumpkern/signals.c diff -u src/sys/rump/librump/rumpkern/signals.c:1.7 src/sys/rump/librump/rumpkern/signals.c:1.8 --- src/sys/rump/librump/rumpkern/signals.c:1.7 Fri Jan 14 13:11:08 2011 +++ src/sys/rump/librump/rumpkern/signals.c Sun Feb 20 13:09:57 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: signals.c,v 1.7 2011/01/14 13:11:08 pooka Exp $ */ +/* $NetBSD: signals.c,v 1.8 2011/02/20 13:09:57 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: signals.c,v 1.7 2011/01/14 13:11:08 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: signals.c,v 1.8 2011/02/20 13:09:57 pooka Exp $); #include sys/param.h #include sys/atomic.h @@ -119,7 +119,7 @@ typedef void (*rumpsig_fn)(struct proc *, int); -static rumpsig_fn rumpsig = rumpsig_panic; +static rumpsig_fn rumpsig = rumpsig_raise; /* * Set signal delivery model. It would be nice if we could
CVS commit: src/tests/lib/librumpclient
Module Name:src
Committed By: pooka
Date: Sun Feb 20 13:27:46 UTC 2011
Modified Files:
src/tests/lib/librumpclient: t_fd.c
Log Message:
Add a test that checks that the client receives SIGIO for an O_ASYNC
socket.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/librumpclient/t_fd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumpclient/t_fd.c
diff -u src/tests/lib/librumpclient/t_fd.c:1.1 src/tests/lib/librumpclient/t_fd.c:1.2
--- src/tests/lib/librumpclient/t_fd.c:1.1 Wed Feb 9 14:32:45 2011
+++ src/tests/lib/librumpclient/t_fd.c Sun Feb 20 13:27:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fd.c,v 1.1 2011/02/09 14:32:45 pooka Exp $ */
+/* $NetBSD: t_fd.c,v 1.2 2011/02/20 13:27:46 pooka Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,9 +29,14 @@
#include sys/types.h
#include sys/stat.h
+#include sys/socket.h
+
+#include netinet/in.h
+#include arpa/inet.h
#include atf-c.h
#include errno.h
+#include fcntl.h
#include unistd.h
#include rump/rumpclient.h
@@ -45,9 +50,18 @@
atf_tc_set_md_var(tc, descr, Check that rumpclient uses
fd 2);
}
+ATF_TC_WITH_CLEANUP(sigio);
+ATF_TC_HEAD(sigio, tc)
+{
+ atf_tc_set_md_var(tc, descr, Check that rump client receives
+ SIGIO);
+}
#define RUMPSERV unix://sucket
+ATF_TC_CLEANUP(bigenough, tc){system(env RUMP_SERVER= RUMPSERV rump.halt);}
+ATF_TC_CLEANUP(sigio, tc) { system(env RUMP_SERVER= RUMPSERV rump.halt); }
+
ATF_TC_BODY(bigenough, tc)
{
struct stat sb;
@@ -78,15 +92,52 @@
dup2(12, 2);
}
-ATF_TC_CLEANUP(bigenough, tc)
+static volatile sig_atomic_t sigcnt;
+static void
+gotsig(int sig)
{
- system(env RUMP_SERVER= RUMPSERV rump.halt);
+ sigcnt++;
+}
+
+ATF_TC_BODY(sigio, tc)
+{
+ struct sockaddr_in sin;
+ int ls;
+ int cs;
+ int fl;
+
+ signal(SIGIO, gotsig);
+ RZ(system(rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet
+ RUMPSERV));
+ RL(setenv(RUMP_SERVER, RUMPSERV, 1));
+
+ RL(rumpclient_init());
+ RL(ls = rump_sys_socket(PF_INET, SOCK_STREAM, 0));
+
+ RL(rump_sys_fcntl(ls, F_SETOWN, rump_sys_getpid()));
+ RL(fl = rump_sys_fcntl(ls, F_GETFL));
+ RL(rump_sys_fcntl(ls, F_SETFL, fl | O_ASYNC));
+
+ memset(sin, 0, sizeof(sin));
+ sin.sin_len = sizeof(sin);
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(12345);
+ RL(rump_sys_bind(ls, (struct sockaddr *)sin, sizeof(sin)));
+ RL(rump_sys_listen(ls, 5));
+
+ RL(cs = rump_sys_socket(PF_INET, SOCK_STREAM, 0));
+ sin.sin_addr.s_addr = inet_addr(127.0.0.1);
+
+ ATF_REQUIRE_EQ(sigcnt, 0);
+ RL(rump_sys_connect(cs, (struct sockaddr *)sin, sizeof(sin)));
+ ATF_REQUIRE_EQ(sigcnt, 1);
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, bigenough);
+ ATF_TP_ADD_TC(tp, sigio);
return atf_no_error();
}
CVS commit: src/sys/arch
Module Name:src Committed By: jruoho Date: Sun Feb 20 13:42:46 UTC 2011 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: ALL GENERIC src/sys/arch/x86/conf: files.x86 src/sys/arch/x86/include: cpu.h cpuvar.h src/sys/arch/x86/x86: coretemp.c cpu.c identcpu.c Log Message: Modularize coretemp(4). Ok jmcneill@. To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.289 -r1.290 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1018 -r1.1019 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.58 -r1.59 src/sys/arch/x86/conf/files.x86 cvs rdiff -u -r1.28 -r1.29 src/sys/arch/x86/include/cpu.h cvs rdiff -u -r1.39 -r1.40 src/sys/arch/x86/include/cpuvar.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/x86/coretemp.c cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x86/x86/identcpu.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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.309 src/sys/arch/amd64/conf/GENERIC:1.310 --- src/sys/arch/amd64/conf/GENERIC:1.309 Sat Feb 19 00:13:55 2011 +++ src/sys/arch/amd64/conf/GENERIC Sun Feb 20 13:42:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.309 2011/02/19 00:13:55 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.310 2011/02/20 13:42:45 jruoho Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.309 $ +#ident GENERIC-$Revision: 1.310 $ maxusers 64 # estimated number of users @@ -86,6 +86,9 @@ # AMD PowerNow! and Cool`n'Quiet technology options POWERNOW_K8 +# Intel Core's on-die Thermal sensor +coretemp* at cpu? + # Intel(R) On Demand Clock Modulation (aka ODCM) # options INTEL_ONDEMAND_CLOCKMOD @@ -465,9 +468,6 @@ piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller iic* at piixpm? # SMBus on PIIX4 -# Intel Core's on-die Thermal sensor -options INTEL_CORETEMP - # Intel ICH SMBus controller ichsmb* at pci? dev ? function ? iic* at ichsmb? Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.289 src/sys/arch/i386/conf/ALL:1.290 --- src/sys/arch/i386/conf/ALL:1.289 Sat Feb 19 13:52:27 2011 +++ src/sys/arch/i386/conf/ALL Sun Feb 20 13:42:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.289 2011/02/19 13:52:27 jmcneill Exp $ +# $NetBSD: ALL,v 1.290 2011/02/20 13:42:45 jruoho Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.289 $ +#ident ALL-$Revision: 1.290 $ maxusers 64 # estimated number of users @@ -42,6 +42,9 @@ # VIA PadLock padlock0 at cpu0 +# Intel Core's on-die Thermal sensor +coretemp* at cpu? + # Intel(R) On Demand Clock Modulation (aka ODCM) options INTEL_ONDEMAND_CLOCKMOD @@ -685,9 +688,6 @@ alipm* at pci? dev ? function ? iic* at alipm? -# Intel Core's on-die Thermal sensor -options INTEL_CORETEMP - # VIA C7 Temperature sensor options VIA_C7TEMP Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1018 src/sys/arch/i386/conf/GENERIC:1.1019 --- src/sys/arch/i386/conf/GENERIC:1.1018 Sat Feb 19 13:52:27 2011 +++ src/sys/arch/i386/conf/GENERIC Sun Feb 20 13:42:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1018 2011/02/19 13:52:27 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1019 2011/02/20 13:42:45 jruoho Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1018 $ +#ident GENERIC-$Revision: 1.1019 $ maxusers 64 # estimated number of users @@ -47,6 +47,9 @@ # AMD PowerNow! and Cool`n'Quiet technology options POWERNOW_K8 +# Intel Core's on-die Thermal sensor +coretemp* at cpu? + # VIA PadLock #padlock0 at cpu0 @@ -643,9 +646,6 @@ alipm* at pci? dev ? function ? iic* at alipm? -# Intel Core's on-die Thermal sensor -options INTEL_CORETEMP - # VIA C7 Temperature sensor options VIA_C7TEMP Index: src/sys/arch/x86/conf/files.x86 diff -u src/sys/arch/x86/conf/files.x86:1.58 src/sys/arch/x86/conf/files.x86:1.59 --- src/sys/arch/x86/conf/files.x86:1.58 Sat Feb 19 13:52:28 2011 +++ src/sys/arch/x86/conf/files.x86 Sun Feb 20 13:42:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.58 2011/02/19 13:52:28 jmcneill Exp $ +# $NetBSD: files.x86,v 1.59 2011/02/20 13:42:45 jruoho Exp $ # options for MP configuration through the MP spec defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI @@ -17,9 +17,6 @@ defflag ENHANCED_SPEEDSTEP defflag opt_est.h EST_FREQ_USERWRITE -# Intel On Die Temperature sensor -defflag opt_intel_coretemp.h INTEL_CORETEMP: sysmon_envsys - #
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 13:48:26 UTC 2011
Modified Files:
src/distrib/sets/lists/modules: md.amd64 md.i386
src/sys/modules: Makefile
Added Files:
src/sys/modules/coretemp: Makefile coretemp.ioconf
Log Message:
Add build glue for coretemp(4).
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/modules/md.amd64
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/modules/md.i386
cvs rdiff -u -r1.63 -r1.64 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/coretemp/Makefile \
src/sys/modules/coretemp/coretemp.ioconf
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/modules/md.amd64
diff -u src/distrib/sets/lists/modules/md.amd64:1.15 src/distrib/sets/lists/modules/md.amd64:1.16
--- src/distrib/sets/lists/modules/md.amd64:1.15 Sun Feb 20 08:37:50 2011
+++ src/distrib/sets/lists/modules/md.amd64 Sun Feb 20 13:48:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.15 2011/02/20 08:37:50 jruoho Exp $
+# $NetBSD: md.amd64,v 1.16 2011/02/20 13:48:25 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -41,6 +41,8 @@
./@MODULEDIR@/compat_linux32/compat_linux32.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32 base-kernel-modules kmod
./@MODULEDIR@/compat_netbsd32/compat_netbsd32.kmod base-kernel-modules kmod
+./@MODULEDIR@/coretempbase-kernel-modules kmod
+./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod
./@MODULEDIR@/drmbase-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
Index: src/distrib/sets/lists/modules/md.i386
diff -u src/distrib/sets/lists/modules/md.i386:1.18 src/distrib/sets/lists/modules/md.i386:1.19
--- src/distrib/sets/lists/modules/md.i386:1.18 Sun Feb 20 08:40:24 2011
+++ src/distrib/sets/lists/modules/md.i386 Sun Feb 20 13:48:25 2011
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.18 2011/02/20 08:40:24 jruoho Exp $
+# $NetBSD: md.i386,v 1.19 2011/02/20 13:48:25 jruoho Exp $
./@MODULEDIR@/acpiacadbase-kernel-modules kmod
./@MODULEDIR@/acpiacad/acpiacad.kmod base-kernel-modules kmod
./@MODULEDIR@/acpibatbase-kernel-modules kmod
@@ -43,6 +43,8 @@
./@MODULEDIR@/compat_linux/compat_linux.kmod base-kernel-modules kmod
./@MODULEDIR@/compat_svr4 base-kernel-modules kmod
./@MODULEDIR@/compat_svr4/compat_svr4.kmod base-kernel-modules kmod
+./@MODULEDIR@/coretempbase-kernel-modules kmod
+./@MODULEDIR@/coretemp/coretemp.kmod base-kernel-modules kmod
./@MODULEDIR@/drmbase-kernel-modules kmod
./@MODULEDIR@/drm/drm.kmod base-kernel-modules kmod
./@MODULEDIR@/exec_aoutbase-kernel-modules kmod
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.63 src/sys/modules/Makefile:1.64
--- src/sys/modules/Makefile:1.63 Sun Feb 20 08:37:50 2011
+++ src/sys/modules/Makefile Sun Feb 20 13:48:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2011/02/20 08:37:50 jruoho Exp $
+# $NetBSD: Makefile,v 1.64 2011/02/20 13:48:26 jruoho Exp $
.include bsd.own.mk
@@ -86,6 +86,7 @@
.if ${MACHINE_ARCH} == i386 || \
${MACHINE_ARCH} == x86_64
+SUBDIR+= coretemp
SUBDIR+= tprof_pmi
#SUBDIR+= tprof_amdpmi
.endif
Added files:
Index: src/sys/modules/coretemp/Makefile
diff -u /dev/null src/sys/modules/coretemp/Makefile:1.1
--- /dev/null Sun Feb 20 13:48:26 2011
+++ src/sys/modules/coretemp/Makefile Sun Feb 20 13:48:26 2011
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2011/02/20 13:48:26 jruoho Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/arch/x86/x86
+
+KMOD= coretemp
+IOCONF= coretemp.ioconf
+SRCS= coretemp.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/coretemp/coretemp.ioconf
diff -u /dev/null src/sys/modules/coretemp/coretemp.ioconf:1.1
--- /dev/null Sun Feb 20 13:48:26 2011
+++ src/sys/modules/coretemp/coretemp.ioconf Sun Feb 20 13:48:26 2011
@@ -0,0 +1,10 @@
+# $NetBSD: coretemp.ioconf,v 1.1 2011/02/20 13:48:26 jruoho Exp $
+
+ioconf coretemp
+
+include conf/files
+include arch/x86/conf/files.x86
+
+pseudo-root cpufeaturebus*
+
+coretemp* at cpufeaturebus?
CVS commit: src/sys/net
Module Name:src
Committed By: cegger
Date: Sun Feb 20 13:51:17 UTC 2011
Modified Files:
src/sys/net: if_media.h
Log Message:
add MBSS. From FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/net/if_media.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/net/if_media.h
diff -u src/sys/net/if_media.h:1.54 src/sys/net/if_media.h:1.55
--- src/sys/net/if_media.h:1.54 Wed Jan 26 00:57:47 2011
+++ src/sys/net/if_media.h Sun Feb 20 13:51:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.h,v 1.54 2011/01/26 00:57:47 dyoung Exp $ */
+/* $NetBSD: if_media.h,v 1.55 2011/02/20 13:51:17 cegger Exp $ */
/*-
* Copyright (c) 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -244,6 +244,7 @@
#define IFM_IEEE80211_TURBO 0x0800 /* Operate in Turbo mode */
#define IFM_IEEE80211_IBSS 0x1000 /* Operate in IBSS mode */
#define IFM_IEEE80211_WDS 0x2000 /* Operate as an WDS master */
+#define IFM_IEEE80211_MBSS 0x4000 /* Operate in MBSS mode */
/* operating mode for multi-mode devices */
#define IFM_IEEE80211_11A 0x0001 /* 5 GHz, OFDM mode */
@@ -535,6 +536,7 @@
{ IFM_IEEE80211 | IFM_IEEE80211_TURBO, turbo }, \
{ IFM_IEEE80211 | IFM_IEEE80211_IBSS, ibss }, \
{ IFM_IEEE80211 | IFM_IEEE80211_WDS, wds }, \
+ { IFM_IEEE80211 | IFM_IEEE80211_MBSS, mesh }, \
\
{ 0, NULL }, \
}
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sun Feb 20 14:36:38 UTC 2011 Modified Files: src/share/man/man4: coretemp.4 Log Message: Adjust SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/coretemp.4 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/man4/coretemp.4 diff -u src/share/man/man4/coretemp.4:1.5 src/share/man/man4/coretemp.4:1.6 --- src/share/man/man4/coretemp.4:1.5 Sun Apr 25 18:01:08 2010 +++ src/share/man/man4/coretemp.4 Sun Feb 20 14:36:38 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: coretemp.4,v 1.5 2010/04/25 18:01:08 jruoho Exp $ +.\ $NetBSD: coretemp.4,v 1.6 2011/02/20 14:36:38 jruoho Exp $ .\- .\ Copyright (c) 2007 Juan Romero Pardines. .\ Copyright (c) 2007 Dag-Erling Coïdan Smørgrav @@ -27,14 +27,14 @@ .\ .\ $FreeBSD: src/share/man/man4/coretemp.4,v 1.4 2007/10/15 20:00:19 netchild Exp $ .\ -.Dd April 25, 2010 +.Dd February 20, 2010 .Dt CORETEMP 4 .Os .Sh NAME .Nm coretemp .Nd Intel Core on-die digital thermal sensor .Sh SYNOPSIS -.Cd options INTEL_CORETEMP +.Cd coretemp* at cpu? .Sh DESCRIPTION The .Nm
CVS commit: src/tests/lib/libpthread
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 14:37:44 UTC 2011
Modified Files:
src/tests/lib/libpthread: t_mutex.c
Log Message:
The mutex3 test is supposed to use a static initializer so that it differs
to the mutex2 test. This detail was lost during the atfification of these
tests.
Spotted by pooka@ and riz@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libpthread/t_mutex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libpthread/t_mutex.c
diff -u src/tests/lib/libpthread/t_mutex.c:1.2 src/tests/lib/libpthread/t_mutex.c:1.3
--- src/tests/lib/libpthread/t_mutex.c:1.2 Fri Jul 16 18:16:43 2010
+++ src/tests/lib/libpthread/t_mutex.c Sun Feb 20 14:37:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mutex.c,v 1.2 2010/07/16 18:16:43 njoly Exp $ */
+/* $NetBSD: t_mutex.c,v 1.3 2011/02/20 14:37:44 jmmv Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: t_mutex.c,v 1.2 2010/07/16 18:16:43 njoly Exp $);
+__RCSID($NetBSD: t_mutex.c,v 1.3 2011/02/20 14:37:44 jmmv Exp $);
#include pthread.h
#include stdio.h
@@ -40,6 +40,7 @@
#include h_common.h
static pthread_mutex_t mutex;
+static pthread_mutex_t static_mutex = PTHREAD_MUTEX_INITIALIZER;
static int global_x;
static void *
@@ -158,9 +159,9 @@
printf(2: Second thread (%p). Count is %ld\n, pthread_self(), count);
while (count--) {
- PTHREAD_REQUIRE(pthread_mutex_lock(mutex));
+ PTHREAD_REQUIRE(pthread_mutex_lock(static_mutex));
global_x++;
- PTHREAD_REQUIRE(pthread_mutex_unlock(mutex));
+ PTHREAD_REQUIRE(pthread_mutex_unlock(static_mutex));
}
return (void *)count;
@@ -169,7 +170,8 @@
ATF_TC(mutex3);
ATF_TC_HEAD(mutex3, tc)
{
- atf_tc_set_md_var(tc, descr, Checks mutexes);
+ atf_tc_set_md_var(tc, descr, Checks mutexes using a static
+ initializer);
}
ATF_TC_BODY(mutex3, tc)
{
@@ -179,26 +181,25 @@
printf(1: Mutex-test 3\n);
- PTHREAD_REQUIRE(pthread_mutex_init(mutex, NULL));
-
global_x = 0;
count = count2 = 1000;
- PTHREAD_REQUIRE(pthread_mutex_lock(mutex));
+ PTHREAD_REQUIRE(pthread_mutex_lock(static_mutex));
PTHREAD_REQUIRE(pthread_create(new, NULL, mutex3_threadfunc, count2));
printf(1: Thread %p\n, pthread_self());
- PTHREAD_REQUIRE(pthread_mutex_unlock(mutex));
+
+ PTHREAD_REQUIRE(pthread_mutex_unlock(static_mutex));
while (count--) {
- PTHREAD_REQUIRE(pthread_mutex_lock(mutex));
+ PTHREAD_REQUIRE(pthread_mutex_lock(static_mutex));
global_x++;
- PTHREAD_REQUIRE(pthread_mutex_unlock(mutex));
+ PTHREAD_REQUIRE(pthread_mutex_unlock(static_mutex));
}
PTHREAD_REQUIRE(pthread_join(new, joinval));
- PTHREAD_REQUIRE(pthread_mutex_lock(mutex));
+ PTHREAD_REQUIRE(pthread_mutex_lock(static_mutex));
printf(1: Thread joined. X was %d. Return value (long) was %ld\n,
global_x, (long)joinval);
ATF_REQUIRE_EQ(global_x, 2000);
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Sun Feb 20 15:40:21 UTC 2011
Modified Files:
src/sys/conf: files
Added Files:
src/sys/dev/drm: files.drm vbox_drv.c
src/sys/modules/vboxdrm: Makefile vboxdrm.ioconf
Log Message:
add VirtualBox DRM driver
To generate a diff of this commit:
cvs rdiff -u -r1.1001 -r1.1002 src/sys/conf/files
cvs rdiff -u -r0 -r1.9 src/sys/dev/drm/files.drm
cvs rdiff -u -r0 -r1.1 src/sys/dev/drm/vbox_drv.c
cvs rdiff -u -r0 -r1.1 src/sys/modules/vboxdrm/Makefile \
src/sys/modules/vboxdrm/vboxdrm.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1001 src/sys/conf/files:1.1002
--- src/sys/conf/files:1.1001 Sat Feb 19 20:19:54 2011
+++ src/sys/conf/files Sun Feb 20 15:40:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1001 2011/02/19 20:19:54 matt Exp $
+# $NetBSD: files,v 1.1002 2011/02/20 15:40:21 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -1069,6 +1069,7 @@
# DRM - Direct Rendering Infrastructure: dev/drm
define drm {}
include external/bsd/drm/conf/files.drm
+include dev/drm/files.drm
# Definitions for wscons
# device attributes: display, display with emulator, keyboard, and mouse
Added files:
Index: src/sys/dev/drm/files.drm
diff -u /dev/null src/sys/dev/drm/files.drm:1.9
--- /dev/null Sun Feb 20 15:40:21 2011
+++ src/sys/dev/drm/files.drm Sun Feb 20 15:40:21 2011
@@ -0,0 +1,5 @@
+# $NetBSD: files.drm,v 1.9 2011/02/20 15:40:21 jmcneill Exp $
+
+device vboxdrm: drmbase, drmpci
+attach vboxdrm at drm
+file dev/drm/vbox_drv.c vboxdrm
Index: src/sys/dev/drm/vbox_drv.c
diff -u /dev/null src/sys/dev/drm/vbox_drv.c:1.1
--- /dev/null Sun Feb 20 15:40:21 2011
+++ src/sys/dev/drm/vbox_drv.c Sun Feb 20 15:40:21 2011
@@ -0,0 +1,132 @@
+/* $NetBSD: vbox_drv.c,v 1.1 2011/02/20 15:40:21 jmcneill Exp $ */
+
+/*
+ * Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: vbox_drv.c,v 1.1 2011/02/20 15:40:21 jmcneill Exp $);
+
+#include drmP.h
+#include drm.h
+
+static drm_pci_id_list_t vboxdrm_pciidlist[] = {
+ { 0x80ee, 0xbeef, 0, VirtualBox Video },
+ { 0, 0, 0, NULL },
+};
+
+static int
+vboxdrm_driver_load(struct drm_device *dev, unsigned long flags)
+{
+ return drm_vblank_init(dev, 1);
+}
+
+static void
+vboxdrm_configure(struct drm_device *dev)
+{
+ dev-driver-buf_priv_size = 1;
+ dev-driver-load = vboxdrm_driver_load;
+ dev-driver-name = vbox;
+ dev-driver-desc = VirtualBox Video;
+ dev-driver-date = 20110130;
+ dev-driver-major = 1;
+ dev-driver-minor = 0;
+ dev-driver-patchlevel = 0;
+}
+
+static int
+vboxdrm_match(device_t parent, cfdata_t match, void *opaque)
+{
+ struct pci_attach_args *pa = opaque;
+
+ return drm_probe(pa, vboxdrm_pciidlist);
+}
+
+static void
+vboxdrm_attach(device_t parent, device_t self, void *opaque)
+{
+ struct pci_attach_args *pa = opaque;
+ struct drm_device *dev = device_private(self);
+
+ pmf_device_register(self, NULL, NULL);
+
+ dev-driver = kmem_zalloc(sizeof(struct drm_driver_info), KM_SLEEP);
+ if (dev-driver == NULL) {
+ aprint_error_dev(self, couldn't allocate memory\n);
+ return;
+ }
+
+ vboxdrm_configure(dev);
+ drm_attach(self, pa, vboxdrm_pciidlist);
+}
+
+static int
+vboxdrm_detach(device_t self, int flags)
+{
+ struct drm_device *dev = device_private(self);
+ int error;
+
+ pmf_device_deregister(self);
+
+ error = drm_detach(self, flags);
+ kmem_free(dev-driver, sizeof(struct drm_driver_info));
+
+ return error;
+}
+
+CFATTACH_DECL_NEW(
+vboxdrm,
+sizeof(struct drm_device),
+vboxdrm_match,
+vboxdrm_attach,
+vboxdrm_detach,
+
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Sun Feb 20 15:41:22 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: add vboxdrm* at drm? To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/arch/i386/conf/ALL 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/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.290 src/sys/arch/i386/conf/ALL:1.291 --- src/sys/arch/i386/conf/ALL:1.290 Sun Feb 20 13:42:45 2011 +++ src/sys/arch/i386/conf/ALL Sun Feb 20 15:41:22 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.290 2011/02/20 13:42:45 jruoho Exp $ +# $NetBSD: ALL,v 1.291 2011/02/20 15:41:22 jmcneill Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.290 $ +#ident ALL-$Revision: 1.291 $ maxusers 64 # estimated number of users @@ -605,6 +605,7 @@ savagedrm* at drm? # S3 Savage DRM driver sisdrm* at drm? # SiS DRM driver tdfxdrm* at drm? # 3dfx (voodoo) DRM driver +vboxdrm* at drm? # VirtualBox DRM driver viadrm* at drm? # VIA UniChrome DRM driver attimer0 at isa?
CVS commit: src/sys/arch/cobalt/cobalt
Module Name:src Committed By: tsutsui Date: Sun Feb 20 15:47:28 UTC 2011 Modified Files: src/sys/arch/cobalt/cobalt: machdep.c Log Message: Remove leftover debug stuff. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/arch/cobalt/cobalt/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/cobalt/cobalt/machdep.c diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.110 src/sys/arch/cobalt/cobalt/machdep.c:1.111 --- src/sys/arch/cobalt/cobalt/machdep.c:1.110 Sun Feb 20 07:54:10 2011 +++ src/sys/arch/cobalt/cobalt/machdep.c Sun Feb 20 15:47:28 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.110 2011/02/20 07:54:10 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.111 2011/02/20 15:47:28 tsutsui Exp $ */ /*- * Copyright (c) 2006 Izumi Tsutsui. All rights reserved. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.110 2011/02/20 07:54:10 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.111 2011/02/20 15:47:28 tsutsui Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -281,7 +281,7 @@ #endif KASSERT(lwp0 == curlwp); #ifdef DDB -// if (boothowto RB_KDB) + if (boothowto RB_KDB) Debugger(); #endif #ifdef KGDB
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: rmind Date: Sun Feb 20 16:03:50 UTC 2011 Modified Files: src/sys/arch/mips/include: types.h Log Message: Minor fix of previous: remove __SWAP_BROKEN (it is no more in -current). To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/mips/include/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/arch/mips/include/types.h diff -u src/sys/arch/mips/include/types.h:1.47 src/sys/arch/mips/include/types.h:1.48 --- src/sys/arch/mips/include/types.h:1.47 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/include/types.h Sun Feb 20 16:03:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.47 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: types.h,v 1.48 2011/02/20 16:03:49 rmind Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -138,8 +138,6 @@ #define __SIMPLELOCK_LOCKED 1 #define __SIMPLELOCK_UNLOCKED 0 -#define __SWAP_BROKEN - #define __HAVE_FAST_SOFTINTS #define __HAVE_AST_PERPROC #define __HAVE_SYSCALL_INTERN
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sun Feb 20 16:23:59 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: missing directory To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.75 src/etc/mtree/NetBSD.dist.base:1.76 --- src/etc/mtree/NetBSD.dist.base:1.75 Sat Feb 19 21:16:05 2011 +++ src/etc/mtree/NetBSD.dist.base Sun Feb 20 11:23:59 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.75 2011/02/20 02:16:05 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.76 2011/02/20 16:23:59 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -52,6 +52,7 @@ ./etc/rc.conf.d ./etc/rc.d ./etc/saslc.d +./etc/saslc.d/mech ./etc/saslc.d/postfix ./etc/saslc.d/postfix/mech ./etc/skel
CVS commit: src/distrib/sets/lists/misc
Module Name:src Committed By: christos Date: Sun Feb 20 16:24:53 UTC 2011 Modified Files: src/distrib/sets/lists/misc: mi Log Message: one more missing dir. To generate a diff of this commit: cvs rdiff -u -r1.171 -r1.172 src/distrib/sets/lists/misc/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.171 src/distrib/sets/lists/misc/mi:1.172 --- src/distrib/sets/lists/misc/mi:1.171 Sat Feb 19 21:26:40 2011 +++ src/distrib/sets/lists/misc/mi Sun Feb 20 11:24:53 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.171 2011/02/20 02:26:40 christos Exp $ +# $NetBSD: mi,v 1.172 2011/02/20 16:24:53 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -732,6 +732,7 @@ ./usr/share/examples/isdn/isdnd.rates.UK.BT misc-isdn-examples share ./usr/share/examples/isdn/isdnd.rc.sample misc-isdn-examples share ./usr/share/examples/kerberos/krb5.conf misc-krb5-examples kerberos,share +./usr/share/examples/libsaslc misc-libsaslc-examples share ./usr/share/examples/libsaslc/README misc-libsaslc-examples share ./usr/share/examples/libsaslc/mech misc-libsaslc-examples share ./usr/share/examples/libsaslc/saslc.conf misc-libsaslc-examples share
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 16:24:54 UTC 2011
Modified Files:
src/sys/dev/acpi: acpi.c
Log Message:
Use kmem(9). Also retire ACPI_PCI_FIXUP and PCI_INTR_FIXUP_DISABLED #ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.238 -r1.239 src/sys/dev/acpi/acpi.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.c
diff -u src/sys/dev/acpi/acpi.c:1.238 src/sys/dev/acpi/acpi.c:1.239
--- src/sys/dev/acpi/acpi.c:1.238 Sun Feb 20 06:45:32 2011
+++ src/sys/dev/acpi/acpi.c Sun Feb 20 16:24:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.238 2011/02/20 06:45:32 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.239 2011/02/20 16:24:54 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.238 2011/02/20 06:45:32 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.239 2011/02/20 16:24:54 jruoho Exp $);
#include opt_acpi.h
#include opt_pcifixup.h
@@ -108,6 +108,7 @@
#include sys/param.h
#include sys/device.h
#include sys/kernel.h
+#include sys/kmem.h
#include sys/malloc.h
#include sys/module.h
#include sys/mutex.h
@@ -123,21 +124,11 @@
#include dev/acpi/acpi_timer.h
#include dev/acpi/acpi_wakedev.h
+#include machine/acpi_machdep.h
+
#define _COMPONENT ACPI_BUS_COMPONENT
ACPI_MODULE_NAME (acpi)
-#if defined(ACPI_PCI_FIXUP)
-#error The option ACPI_PCI_FIXUP has been obsoleted by PCI_INTR_FIXUP_DISABLED. Please adjust your kernel configuration file.
-#endif
-
-#ifdef PCI_INTR_FIXUP_DISABLED
-#include dev/pci/pcidevs.h
-#endif
-
-MALLOC_DECLARE(M_ACPI);
-
-#include machine/acpi_machdep.h
-
/*
* The acpi_active variable is set when the ACPI subsystem is active.
* Machine-dependent code may wish to skip other steps (such as attaching
@@ -548,9 +539,6 @@
return 0;
}
-/*
- * XXX: Need to reclaim any resources? Yes.
- */
static void
acpi_childdet(device_t self, device_t child)
{
@@ -559,7 +547,8 @@
if (sc-sc_apmbus == child)
sc-sc_apmbus = NULL;
- if (sc-sc_wdrt == child)
+
+ if (sc-sc_wdrt == child)
sc-sc_wdrt = NULL;
SIMPLEQ_FOREACH(ad, sc-ad_head, ad_list) {
@@ -670,7 +659,7 @@
case ACPI_TYPE_THERMAL:
case ACPI_TYPE_POWER:
- ad = malloc(sizeof(*ad), M_ACPI, M_NOWAIT | M_ZERO);
+ ad = kmem_zalloc(sizeof(*ad), KM_NOSLEEP);
if (ad == NULL)
return AE_NO_MEMORY;
@@ -1726,6 +1715,8 @@
acpi_print_dev(pnpstr);
}
+MALLOC_DECLARE(M_ACPI); /* XXX: ACPI_ACTIVATE_DEV should use kmem(9). */
+
/*
* ACPI_ACTIVATE_DEV.
*/
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: rmind Date: Sun Feb 20 16:38:13 UTC 2011 Modified Files: src/sys/arch/mips/mips: cpu_subr.c ipifuncs.c mips_fixup.c mips_fpu.c mips_softint.c spl_stubs.c Log Message: Sprinkle some RCS IDs. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/mips/cpu_subr.c \ src/sys/arch/mips/mips/ipifuncs.c src/sys/arch/mips/mips/mips_fixup.c \ src/sys/arch/mips/mips/mips_fpu.c src/sys/arch/mips/mips/mips_softint.c \ src/sys/arch/mips/mips/spl_stubs.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/mips/mips/cpu_subr.c diff -u src/sys/arch/mips/mips/cpu_subr.c:1.2 src/sys/arch/mips/mips/cpu_subr.c:1.3 --- src/sys/arch/mips/mips/cpu_subr.c:1.2 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/mips/cpu_subr.c Sun Feb 20 16:38:13 2011 @@ -1,3 +1,5 @@ +/* $NetBSD: cpu_subr.c,v 1.3 2011/02/20 16:38:13 rmind Exp $ */ + /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,13 +30,12 @@ */ #include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.3 2011/02/20 16:38:13 rmind Exp $); #include opt_ddb.h #include opt_multiprocessor.h #include opt_sa.h -__KERNEL_RCSID(0, $NetBSD: cpu_subr.c,v 1.2 2011/02/20 07:45:47 matt Exp $); - #include sys/param.h #include sys/cpu.h #include sys/intr.h Index: src/sys/arch/mips/mips/ipifuncs.c diff -u src/sys/arch/mips/mips/ipifuncs.c:1.2 src/sys/arch/mips/mips/ipifuncs.c:1.3 --- src/sys/arch/mips/mips/ipifuncs.c:1.2 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/mips/ipifuncs.c Sun Feb 20 16:38:13 2011 @@ -1,3 +1,5 @@ +/* $NetBSD: ipifuncs.c,v 1.3 2011/02/20 16:38:13 rmind Exp $ */ + /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,8 +32,7 @@ #include opt_ddb.h #include sys/cdefs.h - -__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.2 2011/02/20 07:45:47 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ipifuncs.c,v 1.3 2011/02/20 16:38:13 rmind Exp $); #include sys/param.h #include sys/cpu.h Index: src/sys/arch/mips/mips/mips_fixup.c diff -u src/sys/arch/mips/mips/mips_fixup.c:1.2 src/sys/arch/mips/mips/mips_fixup.c:1.3 --- src/sys/arch/mips/mips/mips_fixup.c:1.2 Sun Feb 20 07:45:48 2011 +++ src/sys/arch/mips/mips/mips_fixup.c Sun Feb 20 16:38:13 2011 @@ -1,3 +1,5 @@ +/* $NetBSD: mips_fixup.c,v 1.3 2011/02/20 16:38:13 rmind Exp $ */ + /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,8 +30,7 @@ */ #include sys/cdefs.h - -__KERNEL_RCSID(0, $NetBSD: mips_fixup.c,v 1.2 2011/02/20 07:45:48 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mips_fixup.c,v 1.3 2011/02/20 16:38:13 rmind Exp $); #include opt_multiprocessor.h #include opt_mips3_wired.h Index: src/sys/arch/mips/mips/mips_fpu.c diff -u src/sys/arch/mips/mips/mips_fpu.c:1.2 src/sys/arch/mips/mips/mips_fpu.c:1.3 --- src/sys/arch/mips/mips/mips_fpu.c:1.2 Sun Feb 20 07:45:48 2011 +++ src/sys/arch/mips/mips/mips_fpu.c Sun Feb 20 16:38:13 2011 @@ -1,3 +1,5 @@ +/* $NetBSD: mips_fpu.c,v 1.3 2011/02/20 16:38:13 rmind Exp $ */ + /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,8 +30,7 @@ */ #include sys/cdefs.h - -__KERNEL_RCSID(0, $NetBSD: mips_fpu.c,v 1.2 2011/02/20 07:45:48 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: mips_fpu.c,v 1.3 2011/02/20 16:38:13 rmind Exp $); #include opt_multiprocessor.h Index: src/sys/arch/mips/mips/mips_softint.c diff -u src/sys/arch/mips/mips/mips_softint.c:1.2 src/sys/arch/mips/mips/mips_softint.c:1.3 --- src/sys/arch/mips/mips/mips_softint.c:1.2 Sun Feb 20 07:45:48 2011 +++ src/sys/arch/mips/mips/mips_softint.c Sun Feb 20 16:38:13 2011 @@ -1,3 +1,5 @@ +/* $NetBSD: mips_softint.c,v 1.3 2011/02/20 16:38:13 rmind Exp $ */ + /*- * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -27,9 +29,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include sys/cdefs.h /* RCS ID Copyright macro defns */ - -__KERNEL_RCSID(0, $NetBSD: mips_softint.c,v 1.2 2011/02/20 07:45:48 matt Exp $); +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: mips_softint.c,v 1.3 2011/02/20 16:38:13 rmind Exp $); #include sys/param.h #include sys/proc.h Index: src/sys/arch/mips/mips/spl_stubs.c diff -u src/sys/arch/mips/mips/spl_stubs.c:1.2 src/sys/arch/mips/mips/spl_stubs.c:1.3 --- src/sys/arch/mips/mips/spl_stubs.c:1.2 Sun Feb 20 07:45:48 2011 +++ src/sys/arch/mips/mips/spl_stubs.c Sun Feb 20 16:38:13 2011 @@ -1,4 +1,5 @@ -/* $NetBSD: spl_stubs.c,v 1.2 2011/02/20 07:45:48 matt Exp $ */ +/* $NetBSD: spl_stubs.c,v 1.3 2011/02/20 16:38:13 rmind Exp $ */ + /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,8 +30,7 @@ */ #include sys/cdefs.h - -__KERNEL_RCSID(0, $NetBSD: spl_stubs.c,v 1.2 2011/02/20 07:45:48 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: spl_stubs.c,v 1.3 2011/02/20 16:38:13 rmind Exp $); #define
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: matt Date: Sun Feb 20 16:58:33 UTC 2011 Modified Files: src/sys/arch/mips/mips: locore.S Log Message: Make sure to pass cause as the 3rd arg to mips_emul_fp To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/arch/mips/mips/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/mips/locore.S diff -u src/sys/arch/mips/mips/locore.S:1.176 src/sys/arch/mips/mips/locore.S:1.177 --- src/sys/arch/mips/mips/locore.S:1.176 Sun Feb 20 07:45:47 2011 +++ src/sys/arch/mips/mips/locore.S Sun Feb 20 16:58:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.176 2011/02/20 07:45:47 matt Exp $ */ +/* $NetBSD: locore.S,v 1.177 2011/02/20 16:58:33 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -610,7 +610,7 @@ COP0_HAZARD_FPUENABLE REG_PROLOGUE - REG_L t3, TF_REG_CAUSE(a1) + REG_L a2, TF_REG_CAUSE(a1) REG_EPILOGUE cfc1 t0, MIPS_FPU_CSR # stall til FP done @@ -629,13 +629,11 @@ * * fetch the instruction and emulate the instruction. */ - bgez t3, 1f # Check the branch delay bit. + bgez a2, 1f # Check the branch delay bit. nop /* * The instruction is in the branch delay slot. */ - move a2, a0 # 3rd arg is opcode address - b 2f INT_L a0, 4(a0) # a0 = coproc instruction /*
CVS commit: src/doc
Module Name:src Committed By: rmind Date: Sun Feb 20 17:09:31 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note major MIPS improvements. OK matt@. To generate a diff of this commit: cvs rdiff -u -r1.1509 -r1.1510 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.1509 src/doc/CHANGES:1.1510 --- src/doc/CHANGES:1.1509 Sun Feb 20 11:23:25 2011 +++ src/doc/CHANGES Sun Feb 20 17:09:31 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1509 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1510 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -860,3 +860,8 @@ [christos 20110215] acpi(4): Updated ACPICA to 20110211. [jruoho 20110217] ath(4): Add support for AR9280 devices. [jmcneill 20110220] + mips: Second merge of matt-nb5-mips64 branch. Added SMP support for + MIPS architecture. Rewritten interrupt handling to be much + more efficient, added fast software interrupts and kernel + preemption. Added support for RMI (NetLogic) XLS/XLR models. + Major clean up for MIPS port. [matt 20110220]
CVS commit: src/share/misc
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 17:29:28 UTC 2011
Modified Files:
src/share/misc: acronyms
Log Message:
AAMOF, ADN, AWK, AYOR, BBR, BOT, CC, CFY, CTN, CYE, DMZ, DYK, EIE, EOS, ETR,
FBOW, FCOL, FOC, FTTT, GOK, GOWI, GTSY, HOAS, IAW, IAY, IB, IDC, IDGI, IDGW,
IDI, IDTT, IQ, IRT, ISBN, IUSS, IW, IYD, JAM, JAS, JFK, JGI, JJA, JW, LMC,
LMK, MMB, MO, NM, NOM, NTN, NW, OAO, PDS, PM, PMFI, PMFJI, PR, RMS, RSI,
SERP, STW, SYS, TCO, TJM, TOC, TOH, TTT, VIP.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.203 src/share/misc/acronyms:1.204
--- src/share/misc/acronyms:1.203 Mon Feb 14 18:33:26 2011
+++ src/share/misc/acronyms Sun Feb 20 17:29:28 2011
@@ -1,11 +1,13 @@
-$NetBSD: acronyms,v 1.203 2011/02/14 18:33:26 jruoho Exp $
+$NetBSD: acronyms,v 1.204 2011/02/20 17:29:28 jruoho Exp $
10Q thank you
10X thanks
1337 elite (leet)
224 today, tomorrow, forever
31337 elite (eleet)
4TW for the win
+AAMOF as a matter of fact
AC audible chuckle
+ADN any day now
AEAP as early as possible
AFAIAC as far as I am concerned
AFAIC as far as I'm concerned
@@ -31,9 +33,11 @@
ATM at the moment
ATM automatic teller machine
ATW around the world
+AWK Aho Weinberger Kernighan
AWOL absent without official leave
AYBABTU all your base are belong to us
AYF all your fault
+AYOR at your own risk
AYT are you there
B/C because
B/S bullshit
@@ -42,6 +46,7 @@
BAK back at keyboard
BBIAB be back in a bit
BBL [I'll] be back later
+BBR burnt beyond repair
BBS be back soon
BBT be back tomorrow
BCNU be seeing you
@@ -63,47 +68,59 @@
BOFH bastard operator from hell
BOGAHICA bend over, grab ankles, here it comes again
BOHICA bend over here it comes again
+BOT back on topic
BRB [I'll] be right back
BS bullshit
BTDT been there, done that
BTFT been there, fixed that
BTTH boot to the head
BTW by the way
+CC credit card
CFV call for votes
+CFY calling for you
CG center of gravity
CMIIW correct me if I'm wrong
CNP continued [in my] next post
COB close of business [day]
COTS commercial off-the-shelf
CPC cost per click
+CTN can't talk now
CU see you
CYA see you around
+CYE check your email
D/L download
DBEYR don't believe everything you read
DGAS don't give a shit
DIAFYO did I ask for your opinion?
DIY do it yourself
DKDC don't know, don't care
+DMZ demilitarized zone
DND do not disturb
DOA dead on arrival
DRY don't repeat yourself
DSTM don't shoot the messenger
DTRT do the right thing
DTWT do the wrong thing
+DYK do you know?
DWIM do what I mean
EDS eternal downward spiral
EG evil grin
+EIE enough is enough
EMSG email message
EOB end of business [day]
-EOD end of discussion
+EOD end of {day, discussion}
EOL end of life
EOM end of message
+EOS end of story
ETA estimated time of arrival
ETA edited to add
ETLA extended three letter acronym
+ETR early to rise
EWAG experienced wild-ass guess
F9 fine
FAQ frequently asked question
+FBOW for better or worse
+FCOL for crying out loud
FCFS first come first served
FFS for fuck's sake
FFS free for shipping
@@ -116,6 +133,7 @@
FNO from now on
FNO for nerds only
FOAD {fuck off,fall over} and die
+FOC free of charge
FOS full of shit
FPS first person shooter
FSCK fuck
@@ -129,6 +147,7 @@
FTL for the loss
FTMFW for the motherfucking win
FTS fuck that shit
+FTTT from time to time
FTW for the win
FUBAR fucked up beyond all recognition
FUD fear, uncertainty and doubt
@@ -155,11 +174,14 @@
GLHF good luck, have fun
GLWT good luck with that
GMTA great minds think alike
+GOK god only knows
+GOWI get on with it
GPS global positioning system
GR8 great
GTFO get the fuck out
GTG got to go
GTH go to hell
+GTSY {good, glad} to see you
GWS get well soon
H8 hate
HAND have a nice day
@@ -170,19 +192,28 @@
HHOS ha ha, only serious
HICA here it comes again
HNY happy new year
+HOAS hold on a second
HSIW HOLY SHIT IT WORKS
HTH hope this helps
IAC in any case
IAE in any event
IANAL I am not a lawyer
+IAW in another window
IAWTC I agree with this comment
+IAY I adore you
+IB I'm back
IC I see
-ICBW I could be wrong
+ICBW I could be {wrong, worse}
ICCL I couldn't care less
ICUR I see you are
+IDC I don't care
+IDGI I don't get it
+IDGW in a good way
+IDI I doubt it
IDK I don't know
IDRC I don't really care
IDTS I don't think so
+IDTT I drink to that
IHAFC I haven't a fucking clue
IHBW I have been wrong
IHNFC I have no fucking clue
@@ -200,26 +231,40 @@
IMO in my opinion
INPO in no particular order
IOW in other words
+IQ intelligence quotient
IPML I pissed myself laughing
IRL in real life
+IRT in real time
+IRT in regards to
ISAGN I see a great need
+ISBN international standard book number
ISTM it seems to me
ISTR I seem to recall
ITYM I think you mean
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src Committed By: tteras Date: Sun Feb 20 17:32:02 UTC 2011 Modified Files: src/crypto/dist/ipsec-tools/src/racoon: oakley.c Log Message: From Roman Hoog Antink r...@open.ch: Fix memory leak when using plain RSA key authentication. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/crypto/dist/ipsec-tools/src/racoon/oakley.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/dist/ipsec-tools/src/racoon/oakley.c diff -u src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.18 src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.19 --- src/crypto/dist/ipsec-tools/src/racoon/oakley.c:1.18 Thu Dec 16 16:59:05 2010 +++ src/crypto/dist/ipsec-tools/src/racoon/oakley.c Sun Feb 20 17:32:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: oakley.c,v 1.18 2010/12/16 16:59:05 gdt Exp $ */ +/* $NetBSD: oakley.c,v 1.19 2011/02/20 17:32:02 tteras Exp $ */ /* Id: oakley.c,v 1.32 2006/05/26 12:19:46 manubsd Exp */ @@ -1524,6 +1524,8 @@ iph1-rsa_p = rsa_try_check_rsasign(my_hash, iph1-sig_p, iph1-rsa_candidates); error = iph1-rsa_p ? 0 : -1; + genlist_free(iph1-rsa_candidates, NULL); + iph1-rsa_candidates = NULL; break; default: plog(LLV_ERROR, LOCATION, NULL,
CVS commit: src/external/bsd/bind/dist/lib/isc/noatomic/include/isc
Module Name:src
Committed By: ws
Date: Sun Feb 20 19:05:32 UTC 2011
Modified Files:
src/external/bsd/bind/dist/lib/isc/noatomic/include/isc: atomic.h
Log Message:
Fix return values.
OK christos.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.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/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h
diff -u src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h:1.3 src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h:1.4
--- src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h:1.3 Wed Feb 16 03:47:13 2011
+++ src/external/bsd/bind/dist/lib/isc/noatomic/include/isc/atomic.h Sun Feb 20 19:05:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.h,v 1.3 2011/02/16 03:47:13 christos Exp $ */
+/* $NetBSD: atomic.h,v 1.4 2011/02/20 19:05:32 ws Exp $ */
/*
* Copyright (C) 2005, 2007 Internet Systems Consortium, Inc. (ISC)
@@ -31,7 +31,7 @@
*/
static __inline isc_int32_t
isc_atomic_xadd(isc_int32_t *p, isc_int32_t val) {
- isc_int32_t prev = val;
+ isc_int32_t prev = *p;
*p += val;
@@ -53,11 +53,12 @@
*/
static __inline isc_int32_t
isc_atomic_cmpxchg(isc_int32_t *p, isc_int32_t cmpval, isc_int32_t val) {
+ isc_int32_t prev = *p;
if (*p == cmpval)
*p = val;
- return cmpval;
+ return prev;
}
#endif /* ISC_ATOMIC_H */
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sun Feb 20 19:23:19 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: fix wrong path. Pointed by Anon Ymous To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.76 src/etc/mtree/NetBSD.dist.base:1.77 --- src/etc/mtree/NetBSD.dist.base:1.76 Sun Feb 20 11:23:59 2011 +++ src/etc/mtree/NetBSD.dist.base Sun Feb 20 14:23:19 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.76 2011/02/20 16:23:59 christos Exp $ +# $NetBSD: NetBSD.dist.base,v 1.77 2011/02/20 19:23:19 christos Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -52,7 +52,8 @@ ./etc/rc.conf.d ./etc/rc.d ./etc/saslc.d -./etc/saslc.d/mech +./etc/saslc.d/saslc +./etc/saslc.d/saslc/mech ./etc/saslc.d/postfix ./etc/saslc.d/postfix/mech ./etc/skel
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: jruoho
Date: Sun Feb 20 19:24:09 UTC 2011
Modified Files:
src/sys/arch/x86/x86: coretemp.c
Log Message:
Add proper definitions. Remove (too) verbose comments. Remove (wrong) debug
printf. Do not mark the sensor as invalid based on whether the critical
detector output signal has (ever) been asserted without reset. Support for
trip-points will be added later.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/x86/coretemp.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/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.17 src/sys/arch/x86/x86/coretemp.c:1.18
--- src/sys/arch/x86/x86/coretemp.c:1.17 Sun Feb 20 13:42:46 2011
+++ src/sys/arch/x86/x86/coretemp.c Sun Feb 20 19:24:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.17 2011/02/20 13:42:46 jruoho Exp $ */
+/* $NetBSD: coretemp.c,v 1.18 2011/02/20 19:24:07 jruoho Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: coretemp.c,v 1.17 2011/02/20 13:42:46 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: coretemp.c,v 1.18 2011/02/20 19:24:07 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -51,6 +51,30 @@
#include machine/cputypes.h
#include machine/specialreg.h
+#define MSR_THERM_STATUS_STA __BIT(0)
+#define MSR_THERM_STATUS_LOG __BIT(1)
+#define MSR_THERM_STATUS_PROCHOT_EVT __BIT(2)
+#define MSR_THERM_STATUS_PROCHOT_LOG __BIT(3)
+#define MSR_THERM_STATUS_CRIT_STA __BIT(4)
+#define MSR_THERM_STATUS_CRIT_LOG __BIT(5)
+#define MSR_THERM_STATUS_TRIP1_STA __BIT(6)
+#define MSR_THERM_STATUS_TRIP1_LOG __BIT(7)
+#define MSR_THERM_STATUS_TRIP2_STA __BIT(8)
+#define MSR_THERM_STATUS_TRIP2_LOG __BIT(9)
+#define MSR_THERM_STATUS_READOUT __BITS(16, 22)
+#define MSR_THERM_STATUS_RESOLUTION __BITS(27, 30)
+#define MSR_THERM_STATUS_VALID __BIT(31)
+
+#define MSR_THERM_INTR_HITEMP __BIT(0)
+#define MSR_THERM_INTR_LOTEMPT __BIT(1)
+#define MSR_THERM_INTR_PROCHOT __BIT(2)
+#define MSR_THERM_INTR_FORCPR __BIT(3)
+#define MSR_THERM_INTR_OVERHEAT __BIT(4)
+#define MSR_THERM_INTR_TRIP1_VAL __BITS(8, 14)
+#define MSR_THERM_INTR_TRIP1 __BIT(15)
+#define MSR_THERM_INTR_TRIP2_VAL __BIT(16, 22)
+#define MSR_THERM_INTR_TRIP2 __BIT(23)
+
static int coretemp_match(device_t, cfdata_t, void *);
static void coretemp_attach(device_t, device_t, void *);
static int coretemp_detach(device_t, int);
@@ -102,12 +126,16 @@
struct coretemp_softc *sc = device_private(self);
struct cpufeature_attach_args *cfaa = aux;
struct cpu_info *ci = cfaa-ci;
+ uint64_t msr;
sc-sc_ci = ci;
sc-sc_dev = self;
+ msr = rdmsr(MSR_THERM_STATUS);
+ msr = __SHIFTOUT(msr, MSR_THERM_STATUS_RESOLUTION);
+
aprint_naive(\n);
- aprint_normal(: Intel on-die thermal sensor\n);
+ aprint_normal(: thermal sensor, %u C resolution\n, (uint32_t)msr);
sc-sc_sensor.units = ENVSYS_STEMP;
sc-sc_sensor.flags = ENVSYS_FMONCRITICAL;
@@ -237,53 +265,27 @@
envsys_data_t *edata = arg1;
uint64_t msr;
- /*
- * The digital temperature reading is located at bit 16
- * of MSR_THERM_STATUS.
- *
- * There is a bit on that MSR that indicates whether the
- * temperature is valid or not.
- *
- * The temperature is computed by subtracting the temperature
- * reading by Tj(max).
- */
msr = rdmsr(MSR_THERM_STATUS);
- /*
- * Check for Thermal Status and Thermal Status Log.
- */
- if ((msr 0x03) == 0x03)
- aprint_debug_dev(sc-sc_dev, PROCHOT asserted\n);
-
- /*
- * Bit 31 contains Reading valid.
- */
- if (((msr 31) 0x01) == 1) {
+ if ((msr MSR_THERM_STATUS_VALID) == 0)
+ edata-state = ENVSYS_SINVALID;
+ else {
/*
- * Starting on bit 16 and ending on bit 22.
+ * The temperature is computed by
+ * subtracting the reading by Tj(max).
*/
- edata-value_cur = sc-sc_tjmax - ((msr 16) 0x7F);
+ edata-value_cur = sc-sc_tjmax;
+ edata-value_cur -= __SHIFTOUT(msr, MSR_THERM_STATUS_READOUT);
+
/*
* Convert to mK.
*/
edata-value_cur *= 100;
edata-value_cur += 27315;
edata-state = ENVSYS_SVALID;
- } else
- edata-state = ENVSYS_SINVALID;
+ }
- /*
- * Check for Critical Temperature Status and Critical
- * Temperature Log.
- * It doesn't really matter if the current temperature is
- * invalid because the Critical Temperature Log bit will
- * tell us if the Critical Temperature has been reached in
- * past. It's not directly related to the current temperature.
- *
- * If we reach a critical level, send a critical event to
- * powerd(8) (if running).
- */
- if (((msr 4) 0x03) == 0x03)
+ if ((msr MSR_THERM_STATUS_CRIT_STA) != 0)
edata-state = ENVSYS_SCRITICAL;
}
CVS commit: src/tests/rump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Feb 20 19:45:45 UTC 2011
Modified Files:
src/tests/rump/rumpkern: t_signals.c
Log Message:
explicitly set the signal model
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/t_signals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/rumpkern/t_signals.c
diff -u src/tests/rump/rumpkern/t_signals.c:1.1 src/tests/rump/rumpkern/t_signals.c:1.2
--- src/tests/rump/rumpkern/t_signals.c:1.1 Fri Jan 14 13:08:00 2011
+++ src/tests/rump/rumpkern/t_signals.c Sun Feb 20 19:45:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_signals.c,v 1.1 2011/01/14 13:08:00 pooka Exp $ */
+/* $NetBSD: t_signals.c,v 1.2 2011/02/20 19:45:45 pooka Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -98,6 +98,8 @@
{
int status;
+ rump_boot_setsigmodel(RUMP_SIGMODEL_PANIC);
+
switch (fork()) {
case 0:
rump_init();
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sun Feb 20 19:49:28 UTC 2011 Modified Files: src/share/man/man4: aps.4 Log Message: Update the table of sensors. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/aps.4 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/man4/aps.4 diff -u src/share/man/man4/aps.4:1.3 src/share/man/man4/aps.4:1.4 --- src/share/man/man4/aps.4:1.3 Wed Jun 9 13:44:24 2010 +++ src/share/man/man4/aps.4 Sun Feb 20 19:49:28 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: aps.4,v 1.3 2010/06/09 13:44:24 jruoho Exp $ +.\ $NetBSD: aps.4,v 1.4 2011/02/20 19:49:28 jruoho Exp $ .\ $OpenBSD: aps.4,v 1.7 2007/05/31 19:19:49 jmc Exp $ .\ .\ Copyright (c) 2005 Jonathan Gray j...@openbsd.org @@ -15,7 +15,7 @@ .\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\ -.Dd June 9, 2010 +.Dd February 20, 2010 .Dt APS 4 .Os .Sh NAME @@ -31,17 +31,17 @@ The sensors currently exposed via the .Xr envsys 4 interface are: -.Bl -column Sensor Units Typical -offset indent -.It Sy Sensor Ta Sy Units Ta Sy Typical Use -.It Li X_ACCEL Ta Integer Ta X Acceleration -.It Li Y_ACCEL Ta Integer Ta Y Acceleration -.It Li X_VAR Ta Integer Ta Weighted X Acceleration? -.It Li Y_VAR Ta Integer Ta Weighted Y Acceleration? -.It Li Temp1 Ta uK Ta Unknown -.It Li Temp2 Ta uK Ta Unknown -.It Li Keyboard Active Ta Boolean Ta Keyboard activity -.It Li Mouse Active Ta Boolean Ta Mouse activity -.It Li Lid Open Ta Boolean Ta Lid state +.Bl -column Sensor Units Typical -offset indent +.It Sy Sensor Ta Sy Units Ta Sy Typical Use +.It Li x-acceleration Ta integer Ta X-axis acceleration +.It Li y-acceleration Ta integer Ta Y-axis acceleration +.It Li x-variable Ta integer Ta Weighted X acceleration? +.It Li y-variable Ta integer Ta Weighted Y acceleration? +.It Li temperature 1 Ta degC Ta Unknown temperature +.It Li temperature 2 Ta degC Ta Unknown temperature +.It Li keyboard active Ta boolean Ta Keyboard activity +.It Li mouse active Ta boolean Ta Mouse activity +.It Li lid open Ta boolean Ta Lid state .El .Sh SEE ALSO .Xr envsys 4 ,
CVS commit: src/usr.bin/make
Module Name:src
Committed By: dholland
Date: Sun Feb 20 20:15:36 UTC 2011
Modified Files:
src/usr.bin/make: parse.c
Log Message:
Remove stray extra newline in error message.
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.173 src/usr.bin/make/parse.c:1.174
--- src/usr.bin/make/parse.c:1.173 Sat Dec 25 21:39:11 2010
+++ src/usr.bin/make/parse.c Sun Feb 20 20:15:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.173 2010/12/25 21:39:11 dholland Exp $ */
+/* $NetBSD: parse.c,v 1.174 2011/02/20 20:15:36 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: parse.c,v 1.173 2010/12/25 21:39:11 dholland Exp $;
+static char rcsid[] = $NetBSD: parse.c,v 1.174 2011/02/20 20:15:36 dholland Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)parse.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: parse.c,v 1.173 2010/12/25 21:39:11 dholland Exp $);
+__RCSID($NetBSD: parse.c,v 1.174 2011/02/20 20:15:36 dholland Exp $);
#endif
#endif /* not lint */
#endif
@@ -2665,7 +2665,7 @@
line = ParseGetLine(PARSE_RAW, lineLength);
if (line == NULL) {
Parse_Error(PARSE_FATAL,
- Unexpected end of file in for loop.\n);
+ Unexpected end of file in for loop.);
break;
}
} while (For_Accum(line));
CVS commit: src/share/mk
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 20:16:01 UTC 2011
Modified Files:
src/share/mk: bsd.README bsd.hostprog.mk bsd.prog.mk bsd.test.mk
Log Message:
Define LIBATF_C and LIBATF_CXX to point to their corresponding .a files and
use these to properly set DPADD for test programs.
To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 src/share/mk/bsd.README
cvs rdiff -u -r1.60 -r1.61 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.259 -r1.260 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.15 -r1.16 src/share/mk/bsd.test.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.README
diff -u src/share/mk/bsd.README:1.278 src/share/mk/bsd.README:1.279
--- src/share/mk/bsd.README:1.278 Wed Jan 12 23:05:31 2011
+++ src/share/mk/bsd.README Sun Feb 20 20:16:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.278 2011/01/12 23:05:31 joerg Exp $
+# $NetBSD: bsd.README,v 1.279 2011/02/20 20:16:01 jmmv Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -1316,6 +1316,8 @@
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
LIBARCHIVE?= ${DESTDIR}/usr/lib/libarchive.a
LIBASN1?= ${DESTDIR}/usr/lib/libasn1.a
+ LIBATF_C?= ${DESTDIR}/usr/lib/libatf-c.a
+ LIBATF_CXX?= ${DESTDIR}/usr/lib/libatf-c++.a
LIBBLUETOOTH?= ${DESTDIR}/usr/lib/libbluetooth.a
LIBBSDMALLOC?= ${DESTDIR}/usr/lib/libbsdmalloc.a
LIBBZ2?= ${DESTDIR}/usr/lib/libbz2.a
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.60 src/share/mk/bsd.hostprog.mk:1.61
--- src/share/mk/bsd.hostprog.mk:1.60 Sat Dec 25 18:56:45 2010
+++ src/share/mk/bsd.hostprog.mk Sun Feb 20 20:16:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.60 2010/12/25 18:56:45 joerg Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.61 2011/02/20 20:16:01 jmmv Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include bsd.init.mk
@@ -8,6 +8,8 @@
clean: cleanprog
# Default values
+LIBATF_C?= /usr/lib/libatf-c.a
+LIBATF_CXX?= /usr/lib/libatf-c++.a
LIBBLUETOOTH?= /usr/lib/libbluetooth.a
LIBBZ2?= /usr/lib/libbz2.a
LIBC?= /usr/lib/libc.a
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.259 src/share/mk/bsd.prog.mk:1.260
--- src/share/mk/bsd.prog.mk:1.259 Sun Feb 13 00:42:45 2011
+++ src/share/mk/bsd.prog.mk Sun Feb 20 20:16:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.259 2011/02/13 00:42:45 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.260 2011/02/20 20:16:01 jmmv Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -113,6 +113,11 @@
.MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded
.endif
.endfor
+# atf-c and atf-c++ are special cases because we cannot use [-+] as part of
+# make(1) variable names. Just define them here.
+LIBATF_C= ${DESTDIR}/usr/lib/libatf-c.a
+LIBATF_CXX= ${DESTDIR}/usr/lib/libatf-c++.a
+.MADE: ${LIBATF_C} ${LIBATF_CXX}
# PAM applications, if linked statically, need more libraries
.if (${MKPIC} == no)
Index: src/share/mk/bsd.test.mk
diff -u src/share/mk/bsd.test.mk:1.15 src/share/mk/bsd.test.mk:1.16
--- src/share/mk/bsd.test.mk:1.15 Wed Feb 16 10:13:00 2011
+++ src/share/mk/bsd.test.mk Sun Feb 20 20:16:01 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.15 2011/02/16 10:13:00 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.16 2011/02/20 20:16:01 jmmv Exp $
#
.include bsd.init.mk
@@ -16,6 +16,7 @@
_TESTS+= ${TESTS_C}
PROGS+= ${TESTS_C}
LDADD+= -latf-c
+DPADD+= ${LIBATF_C}
. for _T in ${TESTS_C}
BINDIR.${_T}= ${TESTSDIR}
MAN.${_T}?= # empty
@@ -26,6 +27,7 @@
_TESTS+= ${TESTS_CXX}
PROGS_CXX+= ${TESTS_CXX}
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
. for _T in ${TESTS_CXX}
BINDIR.${_T}= ${TESTSDIR}
MAN.${_T}?= # empty
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 20:18:57 UTC 2011
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/libexec/atf-check: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Set DPADD to point to the static versions of libatf-c and libatf-c++ as
appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-check/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-version/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/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.7 src/external/bsd/atf/lib/libatf-c++/Makefile:1.8
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.7 Sun Feb 6 19:34:20 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Feb 20 20:18:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/02/06 19:34:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/20 20:18:56 jmmv Exp $
NOLINT= # defined
@@ -6,7 +6,7 @@
LIB= atf-c++
LDADD= -L${.OBJDIR}/../libatf-c -latf-c
-DPADD= libatf-c.a
+DPADD= ${LIBATF_C}
NOPIC= # defined; interface is still too unstable
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
Index: src/external/bsd/atf/libexec/atf-check/Makefile
diff -u src/external/bsd/atf/libexec/atf-check/Makefile:1.1 src/external/bsd/atf/libexec/atf-check/Makefile:1.2
--- src/external/bsd/atf/libexec/atf-check/Makefile:1.1 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/libexec/atf-check/Makefile Sun Feb 20 20:18:56 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/20 20:18:56 jmmv Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
MAN= atf-check.1
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
MAN= atf-config.1
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
.include bsd.own.mk
@@ -11,6 +11,7 @@
MAN= atf-report.1
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${SRCDIR}
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/20 20:18:57 jmmv Exp $
.include bsd.own.mk
@@ -17,6 +17,7 @@
CPPFLAGS+= -I${SRCDIR}
CPPFLAGS+= -I${.CURDIR}/../../lib/libatf-c
LDADD+= -latf-c++ -latf-c
+DPADD+= ${LIBATF_CXX} ${LIBATF_C}
COPTS.atf-run.cpp+= -Wno-stack-protector
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sun Feb 20 20:18:57 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/20 20:18:57 jmmv Exp $
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 20:56:34 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-config: integration_test.sh
src/external/bsd/atf/lib/libatf-c: Makefile
Log Message:
Fix the values of atf_arch and atf_machine: the former is supposed to be
the cpu name and the latter the port name. They had been reversed until
now due to some smart stupidity^Wlogic in the upstream configure script,
which is now gone.
This is a pullup of revision f9329ca68da7e8557e0803b5747a12f8c10b1258
plus the corresponding reachover build changes.
Addresses PR bin/44305.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/bsd/atf/dist/atf-config/integration_test.sh
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/lib/libatf-c/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/dist/atf-config/integration_test.sh
diff -u src/external/bsd/atf/dist/atf-config/integration_test.sh:1.1.1.3 src/external/bsd/atf/dist/atf-config/integration_test.sh:1.2
--- src/external/bsd/atf/dist/atf-config/integration_test.sh:1.1.1.3 Sun Nov 7 17:43:26 2010
+++ src/external/bsd/atf/dist/atf-config/integration_test.sh Sun Feb 20 20:56:34 2011
@@ -164,36 +164,6 @@
done
}
-# XXX: This does not seem to belong here...
-atf_test_case arch
-arch_head()
-{
-atf_set descr Tests that the current value of atf_arch is correct \
-for the corresponding atf_machine
-}
-arch_body()
-{
-atf_check -s eq:0 -o save:stdout -e empty atf-config -t atf_arch
-arch=$(cat stdout)
-atf_check -s eq:0 -o save:stdout -e empty atf-config -t atf_machine
-machine=$(cat stdout)
-echo Machine type ${machine}, architecture ${arch}
-
-case ${machine} in
-i386|i486|i586|i686)
-exp_arch=i386
-;;
-x86_64)
-exp_arch=amd64
-;;
-*)
-exp_arch=${machine}
-esac
-echo Expected architecture ${exp_arch}
-
-atf_check_equal ${arch} ${exp_arch}
-}
-
atf_init_test_cases()
{
atf_add_test_case list_all
@@ -205,8 +175,6 @@
atf_add_test_case query_mixture
atf_add_test_case override_env
-
-atf_add_test_case arch
}
# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
Index: src/external/bsd/atf/lib/libatf-c/Makefile
diff -u src/external/bsd/atf/lib/libatf-c/Makefile:1.8 src/external/bsd/atf/lib/libatf-c/Makefile:1.9
--- src/external/bsd/atf/lib/libatf-c/Makefile:1.8 Sun Nov 7 17:46:46 2010
+++ src/external/bsd/atf/lib/libatf-c/Makefile Sun Feb 20 20:56:34 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/07 17:46:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/20 20:56:34 jmmv Exp $
NOLINT= # defined
@@ -16,7 +16,7 @@
CPPFLAGS+= -I.
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -DATF_ARCH=\${MACHINE}\
+CPPFLAGS+= -DATF_ARCH=\${MACHINE_ARCH}\
CPPFLAGS+= -DATF_BUILD_CC=\/usr/bin/cc\
CPPFLAGS+= -DATF_BUILD_CFLAGS=\\
CPPFLAGS+= -DATF_BUILD_CPP=\/usr/bin/cpp\
@@ -27,12 +27,14 @@
CPPFLAGS+= -DATF_INCLUDEDIR=\/usr/include\
CPPFLAGS+= -DATF_LIBDIR=\/usr/lib\
CPPFLAGS+= -DATF_LIBEXECDIR=\/usr/libexec\
-CPPFLAGS+= -DATF_MACHINE=\${MACHINE_ARCH}\
+CPPFLAGS+= -DATF_MACHINE=\${MACHINE}\
CPPFLAGS+= -DATF_M4=\/usr/bin/m4\
CPPFLAGS+= -DATF_PKGDATADIR=\/usr/share/atf\
CPPFLAGS+= -DATF_SHELL=\/bin/sh\
CPPFLAGS+= -DATF_WORKDIR=\/tmp\
+config.o: Makefile
+
WARNS?= 4
SRCS= build.c \
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sun Feb 20 21:03:15 UTC 2011 Modified Files: src/share/man/man4: coretemp.4 Log Message: Add one white paper. (Prompted by the comment of undocumented MSR.) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/coretemp.4 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/man4/coretemp.4 diff -u src/share/man/man4/coretemp.4:1.6 src/share/man/man4/coretemp.4:1.7 --- src/share/man/man4/coretemp.4:1.6 Sun Feb 20 14:36:38 2011 +++ src/share/man/man4/coretemp.4 Sun Feb 20 21:03:15 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: coretemp.4,v 1.6 2011/02/20 14:36:38 jruoho Exp $ +.\ $NetBSD: coretemp.4,v 1.7 2011/02/20 21:03:15 jruoho Exp $ .\- .\ Copyright (c) 2007 Juan Romero Pardines. .\ Copyright (c) 2007 Dag-Erling Coïdan Smørgrav @@ -63,6 +63,13 @@ .Xr envsys 4 , .Xr envstat 8 , .Xr powerd 8 +.Rs +.%A Michael Berktold +.%A Tian Tian (Intel Corporation) +.%T CPU Monitoring With DTS/PECI, White Paper +.%D September 2010 +.%U http://edc.intel.com/Download.aspx?id=2612 +.Re .Sh HISTORY The .Nm
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: jruoho Date: Sun Feb 20 21:09:32 UTC 2011 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add MSR_TEMPERATURE_TARGET. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.50 src/sys/arch/x86/include/specialreg.h:1.51 --- src/sys/arch/x86/include/specialreg.h:1.50 Tue Feb 15 10:11:25 2011 +++ src/sys/arch/x86/include/specialreg.h Sun Feb 20 21:09:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.50 2011/02/15 10:11:25 cegger Exp $ */ +/* $NetBSD: specialreg.h,v 1.51 2011/02/20 21:09:32 jruoho Exp $ */ /*- * Copyright (c) 1991 The Regents of the University of California. @@ -357,6 +357,7 @@ #define MSR_THERM_STATUS 0x19c #define MSR_THERM2_CTL 0x19d /* Pentium M */ #define MSR_MISC_ENABLE 0x1a0 +#define MSR_TEMPERATURE_TARGET 0x1a2 #define MSR_DEBUGCTLMSR 0x1d9 #define MSR_LASTBRANCHFROMIP 0x1db #define MSR_LASTBRANCHTOIP 0x1dc
CVS commit: src/tests/lib/libc
Module Name:src
Committed By: jmmv
Date: Sun Feb 20 20:57:46 UTC 2011
Modified Files:
src/tests/lib/libc/gen: t_ldexp.c
src/tests/lib/libc/ieeefp: t_nan_inf.c
Log Message:
Adjust tests now that the values of atf_arch and atf_machine have been
reversed to carry their real intended meanings.
This is part of PR bin/44305.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/gen/t_ldexp.c
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/ieeefp/t_nan_inf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_ldexp.c
diff -u src/tests/lib/libc/gen/t_ldexp.c:1.3 src/tests/lib/libc/gen/t_ldexp.c:1.4
--- src/tests/lib/libc/gen/t_ldexp.c:1.3 Mon Jan 3 20:51:26 2011
+++ src/tests/lib/libc/gen/t_ldexp.c Sun Feb 20 20:57:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ldexp.c,v 1.3 2011/01/03 20:51:26 pgoyette Exp $ */
+/* $NetBSD: t_ldexp.c,v 1.4 2011/02/20 20:57:46 jmmv Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -182,11 +182,11 @@
}\
ATF_TC_BODY(name, tc) \
{\
- const char *arch; \
+ const char *machine; \
\
- arch = atf_config_get(atf_arch); \
- if (strcmp(vax, arch) == 0)\
- atf_tc_skip(Test not valid for %s, arch); \
+ machine = atf_config_get(atf_machine); \
+ if (strcmp(vax, machine) == 0) \
+ atf_tc_skip(Test not valid for %s, machine); \
run_test(name); \
}
Index: src/tests/lib/libc/ieeefp/t_nan_inf.c
diff -u src/tests/lib/libc/ieeefp/t_nan_inf.c:1.1 src/tests/lib/libc/ieeefp/t_nan_inf.c:1.2
--- src/tests/lib/libc/ieeefp/t_nan_inf.c:1.1 Sun Jan 2 03:51:21 2011
+++ src/tests/lib/libc/ieeefp/t_nan_inf.c Sun Feb 20 20:57:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_nan_inf.c,v 1.1 2011/01/02 03:51:21 pgoyette Exp $ */
+/* $NetBSD: t_nan_inf.c,v 1.2 2011/02/20 20:57:46 jmmv Exp $ */
/*
* This file is in the Public Domain.
@@ -54,7 +54,7 @@
{
const char *arch;
- arch = atf_config_get(atf_machine);
+ arch = atf_config_get(atf_arch);
if (strcmp(vax, arch) == 0 || strcmp(m68000, arch) == 0)
atf_tc_skip(Test not applicable on %s, arch);
else {
CVS commit: src/sbin/fsck_msdos
Module Name:src
Committed By: christos
Date: Sun Feb 20 21:42:50 UTC 2011
Modified Files:
src/sbin/fsck_msdos: dir.c
Log Message:
undo part of the previous patch, which I suspect is bad.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sbin/fsck_msdos/dir.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_msdos/dir.c
diff -u src/sbin/fsck_msdos/dir.c:1.24 src/sbin/fsck_msdos/dir.c:1.25
--- src/sbin/fsck_msdos/dir.c:1.24 Mon Feb 7 12:36:42 2011
+++ src/sbin/fsck_msdos/dir.c Sun Feb 20 16:42:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.24 2011/02/07 17:36:42 christos Exp $ */
+/* $NetBSD: dir.c,v 1.25 2011/02/20 21:42:50 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -30,7 +30,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: dir.c,v 1.24 2011/02/07 17:36:42 christos Exp $);
+__RCSID($NetBSD: dir.c,v 1.25 2011/02/20 21:42:50 christos Exp $);
#endif /* not lint */
#include stdio.h
@@ -560,7 +560,7 @@
vallfn = p;
valcl = cl;
} else if (shortSum != p[13]
- || lidx != lrnomask || lrnomask != 0) {
+ || lidx != lrnomask) {
if (!invlfn) {
invlfn = vallfn;
invcl = valcl;
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: jakllsch Date: Sun Feb 20 22:03:13 UTC 2011 Modified Files: src/sys/arch/i386/stand/lib: biosvbe.S Log Message: Follow a minor detail in the spec a bit more closely. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/i386/stand/lib/biosvbe.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/stand/lib/biosvbe.S diff -u src/sys/arch/i386/stand/lib/biosvbe.S:1.2 src/sys/arch/i386/stand/lib/biosvbe.S:1.3 --- src/sys/arch/i386/stand/lib/biosvbe.S:1.2 Wed Feb 9 04:37:54 2011 +++ src/sys/arch/i386/stand/lib/biosvbe.S Sun Feb 20 22:03:13 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: biosvbe.S,v 1.2 2011/02/09 04:37:54 jmcneill Exp $ */ +/* $NetBSD: biosvbe.S,v 1.3 2011/02/20 22:03:13 jakllsch Exp $ */ /*- * Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca @@ -273,14 +273,18 @@ call _C_LABEL(prot_to_real) .code16 + pushw %es + + xorw %di, %di + movw %di, %es /* es:di == 0:0 */ + movw $0x4f15, %ax /* display identification extensions */ mov $0x00, %bx /* report DDC capabilities */ - - movl $0x, %esi /* ES:DI == 0:0 */ - movl $0x, %edi mov $0x00, %cx /* controller unit number (00h = primary) */ int $0x10 + popw %es + calll _C_LABEL(real_to_prot) .code32
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Feb 20 22:16:19 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add MosChip(Netmos) 9904 and 9922. Add MosChip(Netmos) 9865 (already supported by puc(4)) To generate a diff of this commit: cvs rdiff -u -r1.1058 -r1.1059 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1058 src/sys/dev/pci/pcidevs:1.1059 --- src/sys/dev/pci/pcidevs:1.1058 Fri Feb 18 22:52:53 2011 +++ src/sys/dev/pci/pcidevs Sun Feb 20 22:16:18 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1058 2011/02/18 22:52:53 jmcneill Exp $ +$NetBSD: pcidevs,v 1.1059 2011/02/20 22:16:18 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3349,8 +3349,11 @@ product NETMOS NM9835 0x9835 Dual UART and 1284 Printer Port product NETMOS NM9845 0x9845 Quad UART and 1284 Printer Port product NETMOS NM9855 0x9855 9855 Quad UART and 1284 Printer Port +product NETMOS NM9865 0x9865 9865 Quad UART and 1284 Printer Port product NETMOS MCS9990 0x9990 MCS9990 Quad USB 2.0 Port product NETMOS NM9901 0x9901 Dual PCI-E UART +product NETMOS NM9904 0x9904 Quad PCI-E UART +product NETMOS NM9922 0x9922 Dual PCI-E UART /* Network Security Technologies */ product NETSEC 7751 0x7751 7751
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sun Feb 20 22:22:02 UTC 2011
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
- Add support for Moschip NM9904 and NM9922. These devices uses PCI multi
function, so only one PUC_PORT_TYPE_COM entry is used in these devices.
- Use macro.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.69 src/sys/dev/pci/pucdata.c:1.70
--- src/sys/dev/pci/pucdata.c:1.69 Sun Aug 1 18:50:24 2010
+++ src/sys/dev/pci/pucdata.c Sun Feb 20 22:22:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.69 2010/08/01 18:50:24 msaitoh Exp $ */
+/* $NetBSD: pucdata.c,v 1.70 2011/02/20 22:22:02 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.69 2010/08/01 18:50:24 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pucdata.c,v 1.70 2011/02/20 22:22:02 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -721,7 +721,7 @@
/* NetMos 1P PCI : 1P */
{ NetMos NM9805 1284 Printer port,
- { PCI_VENDOR_NETMOS, 0x9805, 0, 0 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9805, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
@@ -730,7 +730,7 @@
/* NetMos 2P PCI : 2P */
{ NetMos NM9815 Dual 1284 Printer port,
- { PCI_VENDOR_NETMOS, 0x9815, 0, 0 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9815, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
@@ -740,7 +740,7 @@
/* NetMos 1S PCI NM9835 : 1S */
{ NetMos NM9835 UART,
- { PCI_VENDOR_NETMOS, 0x9835, 0x1000, 0x0001 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9835, 0x1000, 0x0001 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -749,7 +749,7 @@
/* NetMos 2S PCI NM9835 : 2S */
{ NetMos NM9835 Dual UART,
- { PCI_VENDOR_NETMOS, 0x9835, 0x1000, 0x0002 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9835, 0x1000, 0x0002 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -759,7 +759,7 @@
/* NetMos 2S1P PCI 16C650 : 2S, 1P */
{ NetMos NM9835 Dual UART and 1284 Printer port,
- { PCI_VENDOR_NETMOS, 0x9835, 0, 0 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9835, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -770,7 +770,7 @@
/* NetMos 4S0P PCI NM9845 : 4S, 0P */
{ NetMos NM9845 Quad UART,
- { PCI_VENDOR_NETMOS, 0x9845, 0x1000, 0x0004 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0x1000, 0x0004 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -782,7 +782,7 @@
/* NetMos 4S1P PCI NM9845 : 4S, 1P */
{ NetMos NM9845 Quad UART and 1284 Printer port,
- { PCI_VENDOR_NETMOS, 0x9845, 0x1000, 0x0014 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0x1000, 0x0014 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -795,7 +795,7 @@
/* NetMos 6S PCI 16C650 : 6S, 0P */
{ NetMos NM9845 6 UART,
- { PCI_VENDOR_NETMOS, 0x9845, 0x1000, 0x0006 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0x1000, 0x0006 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -809,7 +809,7 @@
/* NetMos 4S1P PCI NM9845 : 4S, 1P */
{ NetMos NM9845 Quad UART and 1284 Printer port (unknown type),
- { PCI_VENDOR_NETMOS, 0x9845, 0, 0 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9845, 0, 0 },
{ 0x, 0x, 0, 0 },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -822,7 +822,7 @@
/* NetMos 4S1P PCI NM9855 : 4S, 1P */
{ NetMos NM9855 Quad UART and 1284 Printer port (unknown type),
- { PCI_VENDOR_NETMOS, 0x9855, 0x1000, 0x0014 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9855, 0x1000, 0x0014 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_LPT, 0x10, 0x00, 0x00 },
@@ -835,7 +835,7 @@
/* NetMos 6S PCI NM9865 : 1S */
{ NetMos NM9865 1 UART,
- { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x1000 },
+ { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x1000 },
{ 0x, 0x, 0x, 0x },
{
{ PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ },
@@ -844,7 +844,7 @@
/* NetMos 2S PCI NM9865 : 2S */
{ NetMos NM9865 2 UART,
- { PCI_VENDOR_NETMOS, 0x9865, 0xa000, 0x3002 },
+ { PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9865, 0xa000, 0x3002 },
{ 0x, 0x, 0x, 0x },
{
CVS commit: src/usr.bin/make
Module Name:src
Committed By: joerg
Date: Sun Feb 20 23:12:09 UTC 2011
Modified Files:
src/usr.bin/make: main.c make.h parse.c
Log Message:
Use the current directory at start time for .PARSEDIR, if the filename
contains no /.
To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/usr.bin/make/main.c
cvs rdiff -u -r1.84 -r1.85 src/usr.bin/make/make.h
cvs rdiff -u -r1.175 -r1.176 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.195 src/usr.bin/make/main.c:1.196
--- src/usr.bin/make/main.c:1.195 Sun Feb 13 21:24:43 2011
+++ src/usr.bin/make/main.c Sun Feb 20 23:12:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.195 2011/02/13 21:24:43 sjg Exp $ */
+/* $NetBSD: main.c,v 1.196 2011/02/20 23:12:09 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.195 2011/02/13 21:24:43 sjg Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.196 2011/02/20 23:12:09 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.195 2011/02/13 21:24:43 sjg Exp $);
+__RCSID($NetBSD: main.c,v 1.196 2011/02/20 23:12:09 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -181,8 +181,8 @@
static void usage(void);
static Boolean ignorePWD; /* if we use -C, PWD is meaningless */
-static char curdir[MAXPATHLEN + 1]; /* startup directory */
static char objdir[MAXPATHLEN + 1]; /* where we chdir'ed to */
+char curdir[MAXPATHLEN + 1]; /* Startup directory */
char *progname;/* the program name */
char *makeDependfile;
pid_t myPid;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.84 src/usr.bin/make/make.h:1.85
--- src/usr.bin/make/make.h:1.84 Thu Nov 25 21:31:09 2010
+++ src/usr.bin/make/make.h Sun Feb 20 23:12:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.84 2010/11/25 21:31:09 christos Exp $ */
+/* $NetBSD: make.h,v 1.85 2011/02/20 23:12:09 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -394,6 +394,7 @@
extern Lst sysIncPath; /* The system include path. */
extern Lst defIncPath; /* The default include path. */
+extern char curdir[]; /* Startup directory */
extern char *progname; /* The program name */
extern char *makeDependfile; /* .depend */
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.175 src/usr.bin/make/parse.c:1.176
--- src/usr.bin/make/parse.c:1.175 Sun Feb 20 20:17:35 2011
+++ src/usr.bin/make/parse.c Sun Feb 20 23:12:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.175 2011/02/20 20:17:35 dholland Exp $ */
+/* $NetBSD: parse.c,v 1.176 2011/02/20 23:12:09 joerg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: parse.c,v 1.175 2011/02/20 20:17:35 dholland Exp $;
+static char rcsid[] = $NetBSD: parse.c,v 1.176 2011/02/20 23:12:09 joerg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)parse.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: parse.c,v 1.175 2011/02/20 20:17:35 dholland Exp $);
+__RCSID($NetBSD: parse.c,v 1.176 2011/02/20 23:12:09 joerg Exp $);
#endif
#endif /* not lint */
#endif
@@ -2208,7 +2208,7 @@
slash = strrchr(filename, '/');
if (slash == NULL) {
- Var_Set(.PARSEDIR, ., VAR_GLOBAL, 0);
+ Var_Set(.PARSEDIR, curdir, VAR_GLOBAL, 0);
Var_Set(.PARSEFILE, filename, VAR_GLOBAL, 0);
} else {
len = slash - filename;
CVS commit: src/tests/lib/librumphijack
Module Name:src
Committed By: pooka
Date: Sun Feb 20 23:45:46 UTC 2011
Modified Files:
src/tests/lib/librumphijack: h_client.c t_asyncio.sh
Log Message:
check that poll on an invalid fd doesn't hang in the dual poll case
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/librumphijack/h_client.c \
src/tests/lib/librumphijack/t_asyncio.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/h_client.c
diff -u src/tests/lib/librumphijack/h_client.c:1.2 src/tests/lib/librumphijack/h_client.c:1.3
--- src/tests/lib/librumphijack/h_client.c:1.2 Sat Feb 12 10:28:08 2011
+++ src/tests/lib/librumphijack/h_client.c Sun Feb 20 23:45:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: h_client.c,v 1.2 2011/02/12 10:28:08 pooka Exp $ */
+/* $NetBSD: h_client.c,v 1.3 2011/02/20 23:45:46 pooka Exp $ */
/*
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -28,10 +28,12 @@
*/
#include sys/types.h
+#include sys/poll.h
#include sys/select.h
#include err.h
#include errno.h
+#include fcntl.h
#include stdio.h
#include stdlib.h
#include string.h
@@ -88,6 +90,26 @@
errx(1, select2 succesful);
exit(0);
+ } else if (strcmp(argv[1], invafd) == 0) {
+ struct pollfd pfd[2];
+ int fd;
+
+ fd = open(/rump/dev/null, O_RDWR);
+ if (fd == -1)
+ err(1, open);
+ close(fd);
+
+ pfd[0].fd = STDIN_FILENO;
+ pfd[0].events = POLLIN;
+ pfd[1].fd = fd;
+ pfd[1].events = POLLIN;
+
+ if (poll(pfd, 2, INFTIM) != 1)
+ errx(1, poll unexpected rv);
+ if (pfd[1].revents != POLLNVAL || pfd[0].revents != 0)
+ errx(1, poll unexpected revents);
+
+ exit(0);
} else {
return ENOTSUP;
}
Index: src/tests/lib/librumphijack/t_asyncio.sh
diff -u src/tests/lib/librumphijack/t_asyncio.sh:1.2 src/tests/lib/librumphijack/t_asyncio.sh:1.3
--- src/tests/lib/librumphijack/t_asyncio.sh:1.2 Sat Feb 12 10:28:08 2011
+++ src/tests/lib/librumphijack/t_asyncio.sh Sun Feb 20 23:45:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_asyncio.sh,v 1.2 2011/02/12 10:28:08 pooka Exp $
+# $NetBSD: t_asyncio.sh,v 1.3 2011/02/20 23:45:46 pooka Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -66,8 +66,29 @@
rump.halt
}
+atf_test_case invafd cleanup
+invafd_head()
+{
+atf_set descr poll on invalid rump fd
+ atf_set timeout 4
+}
+
+invafd_body()
+{
+
+ atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER}
+ atf_check -s exit:0 env LD_PRELOAD=/usr/lib/librumphijack.so \
+ $(atf_get_srcdir)/h_client invafd
+}
+
+invafd_cleanup()
+{
+ rump.halt
+}
+
atf_init_test_cases()
{
atf_add_test_case select_timeout
atf_add_test_case select_allunset
+ atf_add_test_case invafd
}
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src Committed By: dyoung Date: Mon Feb 21 00:39:54 UTC 2011 Modified Files: src/sys/arch/i386/stand/lib: libi386.h Log Message: biosdisk_getextinfo() returns 0 on success, non-zero on failure, so change its return type from void to int. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/stand/lib/libi386.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/i386/stand/lib/libi386.h diff -u src/sys/arch/i386/stand/lib/libi386.h:1.34 src/sys/arch/i386/stand/lib/libi386.h:1.35 --- src/sys/arch/i386/stand/lib/libi386.h:1.34 Sun Feb 6 23:16:05 2011 +++ src/sys/arch/i386/stand/lib/libi386.h Mon Feb 21 00:39:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: libi386.h,v 1.34 2011/02/06 23:16:05 jmcneill Exp $ */ +/* $NetBSD: libi386.h,v 1.35 2011/02/21 00:39:54 dyoung Exp $ */ /* * Copyright (c) 1996 @@ -121,7 +121,7 @@ int biosdisk_int13ext(int); int biosdisk_getinfo(int); struct biosdisk_extinfo; -void biosdisk_getextinfo(int, struct biosdisk_extinfo *); +int biosdisk_getextinfo(int, struct biosdisk_extinfo *); int get_harddrives(void); void biosdisk_probe(void);
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon Feb 21 00:40:08 UTC 2011
Modified Files:
src/include/ssp: ssp.h
src/lib/libc/gen: getcwd.c
Log Message:
Redo the SSP wrappers to be transparent on the resulting object files.
This works by having the inline wrapper calling a second function which
uses renaming to output the correct function name.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/include/ssp/ssp.h
cvs rdiff -u -r1.49 -r1.50 src/lib/libc/gen/getcwd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/ssp/ssp.h
diff -u src/include/ssp/ssp.h:1.8 src/include/ssp/ssp.h:1.9
--- src/include/ssp/ssp.h:1.8 Wed Jan 26 18:08:00 2011
+++ src/include/ssp/ssp.h Mon Feb 21 00:40:08 2011
@@ -1,7 +1,7 @@
-/* $NetBSD: ssp.h,v 1.8 2011/01/26 18:08:00 christos Exp $ */
+/* $NetBSD: ssp.h,v 1.9 2011/02/21 00:40:08 joerg Exp $ */
/*-
- * Copyright (c) 2006 The NetBSD Foundation, Inc.
+ * Copyright (c) 2006, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -40,16 +40,20 @@
# else
# define __SSP_FORTIFY_LEVEL 1
# endif
+# else
+# define __SSP_FORTIFY_LEVEL 0
# endif
+#else
+# define __SSP_FORTIFY_LEVEL 0
#endif
-#ifndef __ssp_weak_name
-#ifdef _NAMESPACE_H_
-#define __ssp_weak_name(fun) _sys ## fun
+/* __ssp_real is used by the implementation in libc */
+#if __SSP_FORTIFY_LEVEL == 0
+#define __ssp_real_(fun) fun
#else
-#define __ssp_weak_name(fun) _sys_ ## fun
-#endif
+#define __ssp_real_(fun) __ssp_real_ ## fun
#endif
+#define __ssp_real(fun) __ssp_real_(fun)
#define __ssp_inline static __inline __attribute__((__always_inline__))
@@ -59,18 +63,18 @@
#define __ssp_check(buf, len, bos) \
if (bos(buf) != (size_t)-1 len bos(buf)) \
__chk_fail()
-#define __ssp_redirect_raw(rtype, fun, args, call, bos) \
-rtype __ssp_weak_name(fun) args; \
-__ssp_inline rtype fun args; \
+#define __ssp_redirect_raw(rtype, fun, symbol, args, call, bos) \
+rtype __ssp_real_(fun) args __RENAME(symbol); \
+__ssp_inline rtype fun args __RENAME(__ssp_protected_ ## fun); \
__ssp_inline rtype fun args { \
__ssp_check(__buf, __len, bos); \
- return __ssp_weak_name(fun) call; \
+ return __ssp_real_(fun) call; \
}
#define __ssp_redirect(rtype, fun, args, call) \
-__ssp_redirect_raw(rtype, fun, args, call, __ssp_bos)
+__ssp_redirect_raw(rtype, fun, fun, args, call, __ssp_bos)
#define __ssp_redirect0(rtype, fun, args, call) \
-__ssp_redirect_raw(rtype, fun, args, call, __ssp_bos0)
+__ssp_redirect_raw(rtype, fun, fun, args, call, __ssp_bos0)
__BEGIN_DECLS
void __stack_chk_fail(void) __dead;
Index: src/lib/libc/gen/getcwd.c
diff -u src/lib/libc/gen/getcwd.c:1.49 src/lib/libc/gen/getcwd.c:1.50
--- src/lib/libc/gen/getcwd.c:1.49 Wed Feb 16 20:20:25 2011
+++ src/lib/libc/gen/getcwd.c Mon Feb 21 00:40:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getcwd.c,v 1.49 2011/02/16 20:20:25 tron Exp $ */
+/* $NetBSD: getcwd.c,v 1.50 2011/02/21 00:40:07 joerg Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)getcwd.c 8.5 (Berkeley) 2/7/95;
#else
-__RCSID($NetBSD: getcwd.c,v 1.49 2011/02/16 20:20:25 tron Exp $);
+__RCSID($NetBSD: getcwd.c,v 1.50 2011/02/21 00:40:07 joerg Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,22 +50,14 @@
#include stdlib.h
#include string.h
#include unistd.h
+#include ssp/ssp.h
#include extern.h
#ifdef __weak_alias
-__weak_alias(getcwd,_sys_getcwd)
-__weak_alias(_getcwd,_sys_getcwd)
+__weak_alias(getcwd,_getcwd)
+__weak_alias(_sys_getcwd,_getcwd)
__weak_alias(realpath,_realpath)
-
-#if !defined(lint)
-#undef getcwd
-#define getcwd _sys_getcwd
-#if !defined(_FORTIFY_SOURCE)
-char *_sys_getcwd(char *, size_t);
-#endif
-
-#endif
#endif
/*
@@ -216,7 +208,7 @@
}
char *
-getcwd(char *pt, size_t size)
+__ssp_real(getcwd)(char *pt, size_t size)
{
char *npt;
CVS commit: xsrc/external/mit/xf86-video-ati/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 00:55:19 UTC 2011 Update of /cvsroot/xsrc/external/mit/xf86-video-ati/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22501 Log Message: - various fixes for Xvideo - significantly superior evergreen support: - Xv, EXA, DRI2/KMS, UMS VT switching - various other UMS fixes - a few random bug fixes for older chipsets - add support for ontario (AMD Fusion), including; - Xv, EXA, UMS - DVI vs. HDMI fixes - various DRI2/KMS fixes - add support for NI family cards, which *require* KMS. foo.. - many other random bug fixes Status: Vendor Tag: xorg Release Tags: xf86-video-ati-6-14-0 U xsrc/external/mit/xf86-video-ati/dist/INSTALL U xsrc/external/mit/xf86-video-ati/dist/configure.ac U xsrc/external/mit/xf86-video-ati/dist/configure U xsrc/external/mit/xf86-video-ati/dist/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/README U xsrc/external/mit/xf86-video-ati/dist/COPYING U xsrc/external/mit/xf86-video-ati/dist/install-sh U xsrc/external/mit/xf86-video-ati/dist/config.guess U xsrc/external/mit/xf86-video-ati/dist/compile U xsrc/external/mit/xf86-video-ati/dist/depcomp U xsrc/external/mit/xf86-video-ati/dist/config.h.in U xsrc/external/mit/xf86-video-ati/dist/config.sub U xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati/dist/Makefile.am U xsrc/external/mit/xf86-video-ati/dist/ChangeLog U xsrc/external/mit/xf86-video-ati/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati/dist/missing U xsrc/external/mit/xf86-video-ati/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati/dist/src/ativersion.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h U xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/legacy_output.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c N xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c U xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_video.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/theatre.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_macros.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c N xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_version.h C xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c U xsrc/external/mit/xf86-video-ati/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_mm_i2c.c U xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h N xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_probe.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c C xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c N xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.c U xsrc/external/mit/xf86-video-ati/dist/src/ati.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_module.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_pm.c U xsrc/external/mit/xf86-video-ati/dist/src/radeon_misc.c C xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre_detect_module.c U xsrc/external/mit/xf86-video-ati/dist/src/theatre200_module.c U xsrc/external/mit/xf86-video-ati/dist/src/r600_reg_r6xx.h U
CVS commit: xsrc/external/mit/xf86-video-ati/include
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 01:01:00 UTC 2011 Modified Files: xsrc/external/mit/xf86-video-ati/include: config.h Log Message: regenerate this for x86-video-ati 6.14.0 To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-ati/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-video-ati/include/config.h diff -u xsrc/external/mit/xf86-video-ati/include/config.h:1.9 xsrc/external/mit/xf86-video-ati/include/config.h:1.10 --- xsrc/external/mit/xf86-video-ati/include/config.h:1.9 Sat Nov 20 10:13:30 2010 +++ xsrc/external/mit/xf86-video-ati/include/config.h Mon Feb 21 01:01:00 2011 @@ -24,6 +24,9 @@ /* libudev support */ /* #undef HAVE_LIBUDEV */ +/* Define to 1 if you have the list.h header file. */ +#undef HAVE_LIST_H + /* Define to 1 if you have the memory.h header file. */ #define HAVE_MEMORY_H 1 @@ -80,7 +83,7 @@ #define PACKAGE_NAME xf86-video-ati /* Define to the full name and version of this package. */ -#define PACKAGE_STRING xf86-video-ati 6.13.2 +#define PACKAGE_STRING xf86-video-ati 6.14.0 /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME xf86-video-ati @@ -89,16 +92,16 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION 6.13.2 +#define PACKAGE_VERSION 6.14.0 /* Major version of this package */ #define PACKAGE_VERSION_MAJOR 6 /* Minor version of this package */ -#define PACKAGE_VERSION_MINOR 13 +#define PACKAGE_VERSION_MINOR 14 /* Patch version of this package */ -#define PACKAGE_VERSION_PATCHLEVEL 2 +#define PACKAGE_VERSION_PATCHLEVEL 0 /* Enable DRI2 code */ #define RADEON_DRI2 1 @@ -116,7 +119,7 @@ #define USE_XAA 1 /* Version number of package */ -#define VERSION 6.13.2 +#define VERSION 6.14.0 /* Enable DRI driver support */ #define XF86DRI 1
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src Committed By: mrg Date: Mon Feb 21 01:01:54 UTC 2011 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile Log Message: build the new evergreen files in xf86-video-ati 6.14.0 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.11 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.12 --- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.11 Sat Nov 20 21:24:00 2010 +++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Mon Feb 21 01:01:54 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/11/20 21:24:00 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2011/02/21 01:01:54 mrg Exp $ .include bsd.own.mk @@ -20,7 +20,9 @@ SRCS.EXA= radeon_exa.c r600_exa.c r6xx_accel.c \ r600_textured_videofuncs.c r600_shader.c \ - radeon_exa_shared.c + radeon_exa_shared.c \ + evergreen_exa.c evergreen_accel.c evergreen_shader.c \ + evergreen_textured_videofuncs.c SRCS= radeon_accel.c radeon_cursor.c \ radeon_driver.c radeon_video.c radeon_bios.c \
CVS commit: src
Module Name:src Committed By: itohy Date: Mon Feb 21 02:32:00 UTC 2011 Modified Files: src/share/man/man4: njata.4 njs.4 src/share/man/man5: locate.conf.5 src/sys/arch/hp700/stand/xxboot: iplsum.c readufs.c readufs.h readufs_ffs.c readufs_lfs.c src/sys/arch/x68k/stand/aout2hux: aout2hux.c aout68k.h hux.h type_local.h src/sys/arch/x68k/stand/boot_ufs: boot.S readufs.c readufs.h readufs_ffs.c readufs_lfs.c src/sys/arch/x68k/stand/boot_ustar: boot_ustar.S src/sys/arch/x68k/stand/bootlogo: setbootimg.c xpm2bootimg.c src/sys/arch/x68k/stand/common: chkfmt.s execkern.S execkern.h start.S xprintf.c xprintf.h src/sys/arch/x68k/stand/libdos: dos.h dos_asm.h dos_cerror.S dos_errno.h dos_procerr.S dos_rename.S makedoscalls.awk makestrerror.awk src/sys/arch/x68k/stand/libiocs: iocs.h makeiocscalls.awk src/sys/arch/x68k/stand/libsa: putimage.S src/sys/arch/x68k/stand/loadbsd: loadbsd.c trampoline.S trampoline.h src/sys/dev/cardbus: njata_cardbus.c src/sys/dev/ic: ninjaata32.c ninjaata32reg.h ninjaata32var.h Log Message: Cleanup my copyright notice. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/njata.4 cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/njs.4 cvs rdiff -u -r1.7 -r1.8 src/share/man/man5/locate.conf.5 cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp700/stand/xxboot/iplsum.c \ src/sys/arch/hp700/stand/xxboot/readufs.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hp700/stand/xxboot/readufs.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp700/stand/xxboot/readufs_ffs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hp700/stand/xxboot/readufs_lfs.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/aout2hux/aout2hux.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/aout2hux/aout68k.h \ src/sys/arch/x68k/stand/aout2hux/hux.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/aout2hux/type_local.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/stand/boot_ufs/boot.S cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/stand/boot_ufs/readufs.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x68k/stand/boot_ufs/readufs.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/readufs_ffs.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x68k/stand/boot_ustar/boot_ustar.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/bootlogo/setbootimg.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/bootlogo/xpm2bootimg.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/common/chkfmt.s cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/common/execkern.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/x68k/stand/common/execkern.h \ src/sys/arch/x68k/stand/common/xprintf.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/common/start.S \ src/sys/arch/x68k/stand/common/xprintf.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/stand/libdos/dos.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/libdos/dos_asm.h \ src/sys/arch/x68k/stand/libdos/dos_rename.S \ src/sys/arch/x68k/stand/libdos/makestrerror.awk cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/libdos/dos_cerror.S \ src/sys/arch/x68k/stand/libdos/dos_procerr.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/libdos/dos_errno.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/libdos/makedoscalls.awk cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x68k/stand/libiocs/iocs.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/libiocs/makeiocscalls.awk cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/libsa/putimage.S cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x68k/stand/loadbsd/loadbsd.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x68k/stand/loadbsd/trampoline.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x68k/stand/loadbsd/trampoline.h cvs rdiff -u -r1.13 -r1.14 src/sys/dev/cardbus/njata_cardbus.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/ninjaata32.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/ninjaata32reg.h cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/ninjaata32var.h 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/man4/njata.4 diff -u src/share/man/man4/njata.4:1.6 src/share/man/man4/njata.4:1.7 --- src/share/man/man4/njata.4:1.6 Wed Apr 30 13:10:54 2008 +++ src/share/man/man4/njata.4 Mon Feb 21 02:31:57 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: njata.4,v 1.6 2008/04/30 13:10:54 martin Exp $ +.\ $NetBSD: njata.4,v 1.7 2011/02/21 02:31:57 itohy Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -87,4 +87,4 @@ device driver first appeared in .Nx 4.0 . .Sh AUTHORS -.An ITOH Yasufumi Aq it...@netbsd.org +.An ITOH Yasufumi Index: src/share/man/man4/njs.4 diff -u src/share/man/man4/njs.4:1.5 src/share/man/man4/njs.4:1.6 --- src/share/man/man4/njs.4:1.5 Wed Apr 30 13:10:54 2008 +++ src/share/man/man4/njs.4 Mon Feb 21 02:31:57
CVS commit: src/doc
Module Name:src Committed By: itohy Date: Mon Feb 21 02:35:55 UTC 2011 Modified Files: src/doc: BRANCHES Log Message: Terminate itohy-usb1 Failed to get stabilized To generate a diff of this commit: cvs rdiff -u -r1.304 -r1.305 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.304 src/doc/BRANCHES:1.305 --- src/doc/BRANCHES:1.304 Thu Jan 20 11:46:19 2011 +++ src/doc/BRANCHES Mon Feb 21 02:35:55 2011 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.304 2011/01/20 11:46:19 bouyer Exp $ +# $NetBSD: BRANCHES,v 1.305 2011/02/21 02:35:55 itohy Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -319,7 +319,7 @@ Branch: itohy-usb1 Description: USB stack overhaul, mostly DMA related -Status: Active +Status: Terminated Start Date: 22 May 2007 End Date: Base Tag: itohy-usb1-base
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: jakllsch
Date: Mon Feb 21 02:58:03 UTC 2011
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk_ll.c
Log Message:
Rework previous commit. Return non-zero instead of turning off
BIOSDISK_INT13EXT. BIOSDISK_INT13EXT also enables LBA access mechanisms
that we really want to be using if at all possible.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/stand/lib/biosdisk_ll.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/i386/stand/lib/biosdisk_ll.c
diff -u src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.30 src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.31
--- src/sys/arch/i386/stand/lib/biosdisk_ll.c:1.30 Mon Feb 21 00:43:19 2011
+++ src/sys/arch/i386/stand/lib/biosdisk_ll.c Mon Feb 21 02:58:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk_ll.c,v 1.30 2011/02/21 00:43:19 dyoung Exp $ */
+/* $NetBSD: biosdisk_ll.c,v 1.31 2011/02/21 02:58:02 jakllsch Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -129,7 +129,7 @@
if (ed != NULL) {
ed-size = sizeof(*ed);
if (biosdisk_getextinfo(d-dev, ed) != 0)
-d-flags = ~BIOSDISK_INT13EXT;
+return -1;
}
}
CVS commit: xsrc/external/mit/evieext/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:01:43 UTC 2011 Update of /cvsroot/xsrc/external/mit/evieext/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1336 Log Message: initial import of evieext-1.1.1 Status: Vendor Tag: xorg Release Tags: evieext-1-1-1 U xsrc/external/mit/evieext/dist/evieproto.pc.in N xsrc/external/mit/evieext/dist/config.sub U xsrc/external/mit/evieext/dist/COPYING U xsrc/external/mit/evieext/dist/configure.ac N xsrc/external/mit/evieext/dist/README U xsrc/external/mit/evieext/dist/missing U xsrc/external/mit/evieext/dist/Xeviestr.h U xsrc/external/mit/evieext/dist/evieproto.h U xsrc/external/mit/evieext/dist/Makefile.in U xsrc/external/mit/evieext/dist/aclocal.m4 U xsrc/external/mit/evieext/dist/install-sh N xsrc/external/mit/evieext/dist/INSTALL U xsrc/external/mit/evieext/dist/ChangeLog U xsrc/external/mit/evieext/dist/Makefile.am N xsrc/external/mit/evieext/dist/config.guess U xsrc/external/mit/evieext/dist/configure No conflicts created by this import
CVS commit: xsrc/external/mit/xbitmaps/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:01:47 UTC 2011 Update of /cvsroot/xsrc/external/mit/xbitmaps/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24729 Log Message: initial import of xbitmaps-1.1.1 Status: Vendor Tag: xorg Release Tags: xbitmaps-1-1-1 U xsrc/external/mit/xbitmaps/dist/keyboard16 U xsrc/external/mit/xbitmaps/dist/gray1 U xsrc/external/mit/xbitmaps/dist/escherknot U xsrc/external/mit/xbitmaps/dist/COPYING U xsrc/external/mit/xbitmaps/dist/grid4 U xsrc/external/mit/xbitmaps/dist/configure.ac U xsrc/external/mit/xbitmaps/dist/flagup U xsrc/external/mit/xbitmaps/dist/woman U xsrc/external/mit/xbitmaps/dist/dimple3 U xsrc/external/mit/xbitmaps/dist/calculator U xsrc/external/mit/xbitmaps/dist/vlines2 U xsrc/external/mit/xbitmaps/dist/stipple U xsrc/external/mit/xbitmaps/dist/xbitmaps.pc.in U xsrc/external/mit/xbitmaps/dist/xsnow U xsrc/external/mit/xbitmaps/dist/cross_weave U xsrc/external/mit/xbitmaps/dist/dot U xsrc/external/mit/xbitmaps/dist/star U xsrc/external/mit/xbitmaps/dist/scales U xsrc/external/mit/xbitmaps/dist/menu16 U xsrc/external/mit/xbitmaps/dist/config.h.in U xsrc/external/mit/xbitmaps/dist/gray U xsrc/external/mit/xbitmaps/dist/target U xsrc/external/mit/xbitmaps/dist/wingdogs U xsrc/external/mit/xbitmaps/dist/sipb U xsrc/external/mit/xbitmaps/dist/icon U xsrc/external/mit/xbitmaps/dist/mailemptymsk U xsrc/external/mit/xbitmaps/dist/menu12 U xsrc/external/mit/xbitmaps/dist/root_weave U xsrc/external/mit/xbitmaps/dist/black6 U xsrc/external/mit/xbitmaps/dist/flipped_gray U xsrc/external/mit/xbitmaps/dist/letters U xsrc/external/mit/xbitmaps/dist/configure U xsrc/external/mit/xbitmaps/dist/mailfullmsk U xsrc/external/mit/xbitmaps/dist/terminal U xsrc/external/mit/xbitmaps/dist/mailempty U xsrc/external/mit/xbitmaps/dist/aclocal.m4 U xsrc/external/mit/xbitmaps/dist/flagdown U xsrc/external/mit/xbitmaps/dist/tie_fighter U xsrc/external/mit/xbitmaps/dist/dropbar8 U xsrc/external/mit/xbitmaps/dist/ChangeLog U xsrc/external/mit/xbitmaps/dist/xlogo32 U xsrc/external/mit/xbitmaps/dist/install-sh U xsrc/external/mit/xbitmaps/dist/xlogo64 U xsrc/external/mit/xbitmaps/dist/hlines3 U xsrc/external/mit/xbitmaps/dist/light_gray U xsrc/external/mit/xbitmaps/dist/mailfull U xsrc/external/mit/xbitmaps/dist/opendotMask U xsrc/external/mit/xbitmaps/dist/missing U xsrc/external/mit/xbitmaps/dist/xlogo11 U xsrc/external/mit/xbitmaps/dist/grid2 U xsrc/external/mit/xbitmaps/dist/grid8 U xsrc/external/mit/xbitmaps/dist/Makefile.in U xsrc/external/mit/xbitmaps/dist/right_ptr U xsrc/external/mit/xbitmaps/dist/xfd_icon U xsrc/external/mit/xbitmaps/dist/boxes U xsrc/external/mit/xbitmaps/dist/left_ptr U xsrc/external/mit/xbitmaps/dist/cntr_ptr U xsrc/external/mit/xbitmaps/dist/dropbar7 U xsrc/external/mit/xbitmaps/dist/vlines3 U xsrc/external/mit/xbitmaps/dist/menu8 U xsrc/external/mit/xbitmaps/dist/plaid N xsrc/external/mit/xbitmaps/dist/INSTALL U xsrc/external/mit/xbitmaps/dist/menu10 U xsrc/external/mit/xbitmaps/dist/xlogo16 U xsrc/external/mit/xbitmaps/dist/config.sub U xsrc/external/mit/xbitmaps/dist/menu6 U xsrc/external/mit/xbitmaps/dist/hlines2 U xsrc/external/mit/xbitmaps/dist/grid16 U xsrc/external/mit/xbitmaps/dist/wide_weave U xsrc/external/mit/xbitmaps/dist/black U xsrc/external/mit/xbitmaps/dist/starMask U xsrc/external/mit/xbitmaps/dist/noletters U xsrc/external/mit/xbitmaps/dist/mensetmanus U xsrc/external/mit/xbitmaps/dist/opendot U xsrc/external/mit/xbitmaps/dist/Makefile.am U xsrc/external/mit/xbitmaps/dist/config.guess U xsrc/external/mit/xbitmaps/dist/box6 U xsrc/external/mit/xbitmaps/dist/dimple1 U xsrc/external/mit/xbitmaps/dist/left_ptrmsk U xsrc/external/mit/xbitmaps/dist/cntr_ptrmsk U xsrc/external/mit/xbitmaps/dist/weird_size U xsrc/external/mit/xbitmaps/dist/gray3 U xsrc/external/mit/xbitmaps/dist/1x1 U xsrc/external/mit/xbitmaps/dist/2x2 U xsrc/external/mit/xbitmaps/dist/right_ptrmsk No conflicts created by this import
CVS commit: xsrc/external/mit/xf86vidmodeproto/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:01:51 UTC 2011 Update of /cvsroot/xsrc/external/mit/xf86vidmodeproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14096 Log Message: initial import of xf86vidmodeproto-2.3.1 Status: Vendor Tag: xorg Release Tags: xf86vidmodeproto-2-3-1 U xsrc/external/mit/xf86vidmodeproto/dist/xf86vmproto.h U xsrc/external/mit/xf86vidmodeproto/dist/config.guess U xsrc/external/mit/xf86vidmodeproto/dist/Makefile.am N xsrc/external/mit/xf86vidmodeproto/dist/INSTALL U xsrc/external/mit/xf86vidmodeproto/dist/Makefile.in U xsrc/external/mit/xf86vidmodeproto/dist/config.sub N xsrc/external/mit/xf86vidmodeproto/dist/README U xsrc/external/mit/xf86vidmodeproto/dist/xf86vm.h U xsrc/external/mit/xf86vidmodeproto/dist/configure U xsrc/external/mit/xf86vidmodeproto/dist/xf86vidmodeproto.pc.in U xsrc/external/mit/xf86vidmodeproto/dist/xf86vmstr.h U xsrc/external/mit/xf86vidmodeproto/dist/COPYING U xsrc/external/mit/xf86vidmodeproto/dist/ChangeLog U xsrc/external/mit/xf86vidmodeproto/dist/missing U xsrc/external/mit/xf86vidmodeproto/dist/install-sh U xsrc/external/mit/xf86vidmodeproto/dist/configure.ac U xsrc/external/mit/xf86vidmodeproto/dist/aclocal.m4 No conflicts created by this import
CVS commit: xsrc/external/mit/xf86driproto/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:01:49 UTC 2011 Update of /cvsroot/xsrc/external/mit/xf86driproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7435 Log Message: initial import of xf86driproto-2.1.1 Status: Vendor Tag: xorg Release Tags: xf86driproto-2-1-1 U xsrc/external/mit/xf86driproto/dist/xf86driproto.pc.in U xsrc/external/mit/xf86driproto/dist/xf86dri.h U xsrc/external/mit/xf86driproto/dist/ChangeLog U xsrc/external/mit/xf86driproto/dist/configure U xsrc/external/mit/xf86driproto/dist/xf86driproto.h U xsrc/external/mit/xf86driproto/dist/xf86dristr.h U xsrc/external/mit/xf86driproto/dist/configure.ac N xsrc/external/mit/xf86driproto/dist/INSTALL N xsrc/external/mit/xf86driproto/dist/config.sub U xsrc/external/mit/xf86driproto/dist/Makefile.in U xsrc/external/mit/xf86driproto/dist/missing N xsrc/external/mit/xf86driproto/dist/README N xsrc/external/mit/xf86driproto/dist/config.guess U xsrc/external/mit/xf86driproto/dist/install-sh U xsrc/external/mit/xf86driproto/dist/aclocal.m4 U xsrc/external/mit/xf86driproto/dist/Makefile.am U xsrc/external/mit/xf86driproto/dist/COPYING No conflicts created by this import
CVS commit: xsrc/external/mit/xineramaproto/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:01:54 UTC 2011 Update of /cvsroot/xsrc/external/mit/xineramaproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22577 Log Message: initial import of xineramaproto-1.2.1 Status: Vendor Tag: xorg Release Tags: xineramaproto-1-2-1 U xsrc/external/mit/xineramaproto/dist/Makefile.am U xsrc/external/mit/xineramaproto/dist/COPYING U xsrc/external/mit/xineramaproto/dist/xineramaproto.pc.in U xsrc/external/mit/xineramaproto/dist/panoramiXproto.h U xsrc/external/mit/xineramaproto/dist/config.guess U xsrc/external/mit/xineramaproto/dist/Makefile.in U xsrc/external/mit/xineramaproto/dist/config.sub U xsrc/external/mit/xineramaproto/dist/missing U xsrc/external/mit/xineramaproto/dist/configure.ac N xsrc/external/mit/xineramaproto/dist/README U xsrc/external/mit/xineramaproto/dist/configure N xsrc/external/mit/xineramaproto/dist/INSTALL U xsrc/external/mit/xineramaproto/dist/install-sh U xsrc/external/mit/xineramaproto/dist/ChangeLog U xsrc/external/mit/xineramaproto/dist/aclocal.m4 No conflicts created by this import
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:08:30 UTC 2011 Update of /cvsroot/xsrc/external/mit/xorg-cf-files/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6000 Log Message: initial import of xorg-cf-files-1.0.4 Status: Vendor Tag: xorg Release Tags: xorg-cf-files-1-0-4 U xsrc/external/mit/xorg-cf-files/dist/ServerLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/OpenBSD.cf U xsrc/external/mit/xorg-cf-files/dist/ncr.cf U xsrc/external/mit/xorg-cf-files/dist/site.def.in U xsrc/external/mit/xorg-cf-files/dist/xorgsite.def U xsrc/external/mit/xorg-cf-files/dist/sunLib.rules U xsrc/external/mit/xorg-cf-files/dist/xorg.cf U xsrc/external/mit/xorg-cf-files/dist/COPYING U xsrc/external/mit/xorg-cf-files/dist/cygwin.cf U xsrc/external/mit/xorg-cf-files/dist/nec.cf U xsrc/external/mit/xorg-cf-files/dist/Oki.cf C xsrc/external/mit/xorg-cf-files/dist/X11.tmpl U xsrc/external/mit/xorg-cf-files/dist/cross.def U xsrc/external/mit/xorg-cf-files/dist/DGUX.cf U xsrc/external/mit/xorg-cf-files/dist/configure U xsrc/external/mit/xorg-cf-files/dist/necLib.rules U xsrc/external/mit/xorg-cf-files/dist/Server.tmpl U xsrc/external/mit/xorg-cf-files/dist/ibm.cf U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.rules U xsrc/external/mit/xorg-cf-files/dist/sony.cf U xsrc/external/mit/xorg-cf-files/dist/ChangeLog U xsrc/external/mit/xorg-cf-files/dist/Amoeba.cf U xsrc/external/mit/xorg-cf-files/dist/QNX4.cf U xsrc/external/mit/xorg-cf-files/dist/X11.rules U xsrc/external/mit/xorg-cf-files/dist/sun.cf U xsrc/external/mit/xorg-cf-files/dist/xprint_host.def U xsrc/external/mit/xorg-cf-files/dist/OpenBSDLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sv3Lib.rules U xsrc/external/mit/xorg-cf-files/dist/dmx.cf U xsrc/external/mit/xorg-cf-files/dist/sgiLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/svr4.cf U xsrc/external/mit/xorg-cf-files/dist/lnxdoc.tmpl U xsrc/external/mit/xorg-cf-files/dist/gnuLib.rules U xsrc/external/mit/xorg-cf-files/dist/xf86site.def U xsrc/external/mit/xorg-cf-files/dist/sco5.cf U xsrc/external/mit/xorg-cf-files/dist/WinLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/bsdLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/cygwin.rules U xsrc/external/mit/xorg-cf-files/dist/ibmLib.rules U xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl U xsrc/external/mit/xorg-cf-files/dist/minix.cf U xsrc/external/mit/xorg-cf-files/dist/isc.cf U xsrc/external/mit/xorg-cf-files/dist/darwinLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/cygwin.tmpl U xsrc/external/mit/xorg-cf-files/dist/FreeBSD.cf U xsrc/external/mit/xorg-cf-files/dist/nto.rules U xsrc/external/mit/xorg-cf-files/dist/nto.cf U xsrc/external/mit/xorg-cf-files/dist/pegasus.cf U xsrc/external/mit/xorg-cf-files/dist/config.guess U xsrc/external/mit/xorg-cf-files/dist/mach.cf U xsrc/external/mit/xorg-cf-files/dist/xorgversion.def U xsrc/external/mit/xorg-cf-files/dist/fujitsu.cf U xsrc/external/mit/xorg-cf-files/dist/sv4Lib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sunLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/cde.rules U xsrc/external/mit/xorg-cf-files/dist/config.sub U xsrc/external/mit/xorg-cf-files/dist/bsdi.cf U xsrc/external/mit/xorg-cf-files/dist/svr3.cf U xsrc/external/mit/xorg-cf-files/dist/os2.cf U xsrc/external/mit/xorg-cf-files/dist/cde.tmpl U xsrc/external/mit/xorg-cf-files/dist/ibmLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sgi.cf U xsrc/external/mit/xorg-cf-files/dist/Win32.rules U xsrc/external/mit/xorg-cf-files/dist/missing U xsrc/external/mit/xorg-cf-files/dist/hp.cf U xsrc/external/mit/xorg-cf-files/dist/apollo.cf U xsrc/external/mit/xorg-cf-files/dist/README U xsrc/external/mit/xorg-cf-files/dist/lynx.cf U xsrc/external/mit/xorg-cf-files/dist/darwinLib.rules U xsrc/external/mit/xorg-cf-files/dist/ultrix.cf U xsrc/external/mit/xorg-cf-files/dist/cross.rules U xsrc/external/mit/xorg-cf-files/dist/Imake.rules U xsrc/external/mit/xorg-cf-files/dist/xorg.tmpl U xsrc/external/mit/xorg-cf-files/dist/lnxLib.rules U xsrc/external/mit/xorg-cf-files/dist/os2Lib.rules U xsrc/external/mit/xorg-cf-files/dist/mingw.rules U xsrc/external/mit/xorg-cf-files/dist/oldlib.rules U xsrc/external/mit/xorg-cf-files/dist/linux.cf U xsrc/external/mit/xorg-cf-files/dist/moto.cf U xsrc/external/mit/xorg-cf-files/dist/bsd.cf U xsrc/external/mit/xorg-cf-files/dist/macII.cf U xsrc/external/mit/xorg-cf-files/dist/hpLib.rules U xsrc/external/mit/xorg-cf-files/dist/Motif.tmpl U xsrc/external/mit/xorg-cf-files/dist/mingw.tmpl U xsrc/external/mit/xorg-cf-files/dist/usl.cf U xsrc/external/mit/xorg-cf-files/dist/x386.cf U xsrc/external/mit/xorg-cf-files/dist/site.sample U xsrc/external/mit/xorg-cf-files/dist/Win32.cf U xsrc/external/mit/xorg-cf-files/dist/darwin.cf U xsrc/external/mit/xorg-cf-files/dist/bsdiLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/necLib.tmpl U xsrc/external/mit/xorg-cf-files/dist/sgiLib.rules C xsrc/external/mit/xorg-cf-files/dist/Imake.cf U xsrc/external/mit/xorg-cf-files/dist/configure.ac U
CVS commit: xsrc/external/mit/xorg-cf-files/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:09:07 UTC 2011 Modified Files: xsrc/external/mit/xorg-cf-files/dist: Imake.cf X11.tmpl Log Message: merge xorg-cf-files 1.0.4 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.cf \ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.3 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.4 --- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.3 Sun Nov 8 11:39:23 2009 +++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Mon Feb 21 04:09:07 2011 @@ -33,6 +33,10 @@ # define i386DarwinArchitecture # undef __i386__ # endif +# ifdef __x86_64__ +# define x86_64DarwinArchitecture +# undef __x86_64__ +# endif #endif #if defined(clipper) || defined(__clipper__) Index: xsrc/external/mit/xorg-cf-files/dist/X11.tmpl diff -u xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.3 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.4 --- xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.3 Sun Nov 8 11:39:23 2009 +++ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Mon Feb 21 04:09:07 2011 @@ -45,7 +45,7 @@ # if defined XorgVersionString # define XOrgReleaseString Release XorgVersionString # else -# define XOrgReleaseString Release 6.8 +# define XOrgReleaseString Release 7 # endif #endif @@ -1675,6 +1675,7 @@ DOCPSDIR = DocPsDir DOCPDFDIR = DocPdfDir FONTDIR = FontDir /* font directories */ + FONTROOTDIR = FontDir /* font directories */ ENCODINGSDIR = FontEncDir /* font encodings directory */ XINITDIR = XinitDir /* xinit config files */ XDMDIR = XdmDir /* xdm config files */
CVS commit: xsrc/external/mit/twm/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:23:35 UTC 2011 Update of /cvsroot/xsrc/external/mit/twm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv6384 Log Message: initial import of twm-1.0.6 Status: Vendor Tag: xorg Release Tags: twm-1-0-6 U xsrc/external/mit/twm/dist/install-sh U xsrc/external/mit/twm/dist/COPYING U xsrc/external/mit/twm/dist/ylwrap U xsrc/external/mit/twm/dist/depcomp U xsrc/external/mit/twm/dist/ChangeLog U xsrc/external/mit/twm/dist/aclocal.m4 U xsrc/external/mit/twm/dist/configure U xsrc/external/mit/twm/dist/config.h.in U xsrc/external/mit/twm/dist/missing U xsrc/external/mit/twm/dist/INSTALL U xsrc/external/mit/twm/dist/configure.ac U xsrc/external/mit/twm/dist/config.guess U xsrc/external/mit/twm/dist/Makefile.am U xsrc/external/mit/twm/dist/Makefile.in U xsrc/external/mit/twm/dist/README U xsrc/external/mit/twm/dist/config.sub U xsrc/external/mit/twm/dist/src/deftwmrc.c U xsrc/external/mit/twm/dist/src/iconmgr.c U xsrc/external/mit/twm/dist/src/icons.c U xsrc/external/mit/twm/dist/src/deftwmrc.sed U xsrc/external/mit/twm/dist/src/Makefile.in U xsrc/external/mit/twm/dist/src/parse.c U xsrc/external/mit/twm/dist/src/list.c U xsrc/external/mit/twm/dist/src/add_window.h U xsrc/external/mit/twm/dist/src/gram.y U xsrc/external/mit/twm/dist/src/gc.h U xsrc/external/mit/twm/dist/src/menus.h U xsrc/external/mit/twm/dist/src/version.c U xsrc/external/mit/twm/dist/src/twm.c U xsrc/external/mit/twm/dist/src/Makefile.am U xsrc/external/mit/twm/dist/src/gram.c U xsrc/external/mit/twm/dist/src/util.c U xsrc/external/mit/twm/dist/src/events.h U xsrc/external/mit/twm/dist/src/lex.l U xsrc/external/mit/twm/dist/src/system.twmrc U xsrc/external/mit/twm/dist/src/session.c U xsrc/external/mit/twm/dist/src/resize.c U xsrc/external/mit/twm/dist/src/add_window.c U xsrc/external/mit/twm/dist/src/gc.c U xsrc/external/mit/twm/dist/src/menus.c U xsrc/external/mit/twm/dist/src/version.h U xsrc/external/mit/twm/dist/src/twm.h U xsrc/external/mit/twm/dist/src/parse.h U xsrc/external/mit/twm/dist/src/list.h U xsrc/external/mit/twm/dist/src/lex.c U xsrc/external/mit/twm/dist/src/iconmgr.h U xsrc/external/mit/twm/dist/src/icons.h U xsrc/external/mit/twm/dist/src/session.h U xsrc/external/mit/twm/dist/src/resize.h U xsrc/external/mit/twm/dist/src/siconify.bm U xsrc/external/mit/twm/dist/src/screen.h U xsrc/external/mit/twm/dist/src/util.h U xsrc/external/mit/twm/dist/src/events.c U xsrc/external/mit/twm/dist/src/gram.h U xsrc/external/mit/twm/dist/src/cursor.c U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc U xsrc/external/mit/twm/dist/man/Makefile.am U xsrc/external/mit/twm/dist/man/twm.man U xsrc/external/mit/twm/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/x11perf/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:23:48 UTC 2011 Update of /cvsroot/xsrc/external/mit/x11perf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11367 Log Message: initial import of x11perf-1.5.3: - fix overflow bugs - fixes Xft bugs - add -falseprecision flag Status: Vendor Tag: xorg Release Tags: x11perf-1-5-3 U xsrc/external/mit/x11perf/dist/x11perf.man U xsrc/external/mit/x11perf/dist/config.sub U xsrc/external/mit/x11perf/dist/x11pcomp.cpp U xsrc/external/mit/x11perf/dist/INSTALL U xsrc/external/mit/x11perf/dist/Makefile.am U xsrc/external/mit/x11perf/dist/do_blt.c U xsrc/external/mit/x11perf/dist/do_tris.c U xsrc/external/mit/x11perf/dist/bitmaps.c U xsrc/external/mit/x11perf/dist/Xmark U xsrc/external/mit/x11perf/dist/Makefile.in U xsrc/external/mit/x11perf/dist/Xmark.man U xsrc/external/mit/x11perf/dist/config.guess U xsrc/external/mit/x11perf/dist/do_simple.c U xsrc/external/mit/x11perf/dist/do_windows.c U xsrc/external/mit/x11perf/dist/do_text.c U xsrc/external/mit/x11perf/dist/do_traps.c U xsrc/external/mit/x11perf/dist/x11perf.c U xsrc/external/mit/x11perf/dist/do_segs.c U xsrc/external/mit/x11perf/dist/bitmaps.h U xsrc/external/mit/x11perf/dist/configure.ac U xsrc/external/mit/x11perf/dist/do_complex.c U xsrc/external/mit/x11perf/dist/x11perfcomp.man U xsrc/external/mit/x11perf/dist/do_rects.c U xsrc/external/mit/x11perf/dist/COPYING U xsrc/external/mit/x11perf/dist/aclocal.m4 U xsrc/external/mit/x11perf/dist/install-sh U xsrc/external/mit/x11perf/dist/do_arcs.c U xsrc/external/mit/x11perf/dist/x11perf.h U xsrc/external/mit/x11perf/dist/do_lines.c U xsrc/external/mit/x11perf/dist/configure U xsrc/external/mit/x11perf/dist/do_movewin.c U xsrc/external/mit/x11perf/dist/depcomp U xsrc/external/mit/x11perf/dist/missing U xsrc/external/mit/x11perf/dist/ChangeLog U xsrc/external/mit/x11perf/dist/README U xsrc/external/mit/x11perf/dist/do_dots.c U xsrc/external/mit/x11perf/dist/fillblnk U xsrc/external/mit/x11perf/dist/do_valgc.c U xsrc/external/mit/x11perf/dist/perfboth U xsrc/external/mit/x11perf/dist/do_tests.c U xsrc/external/mit/x11perf/dist/perfratio U xsrc/external/mit/x11perf/dist/config.h.in No conflicts created by this import
CVS commit: xsrc/external/mit/xbiff/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:23:50 UTC 2011 Update of /cvsroot/xsrc/external/mit/xbiff/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3390 Log Message: initial import of xbiff-1.0.3 Status: Vendor Tag: xorg Release Tags: xbiff-1-0-3 U xsrc/external/mit/xbiff/dist/config.guess U xsrc/external/mit/xbiff/dist/depcomp U xsrc/external/mit/xbiff/dist/missing U xsrc/external/mit/xbiff/dist/README U xsrc/external/mit/xbiff/dist/configure U xsrc/external/mit/xbiff/dist/ChangeLog U xsrc/external/mit/xbiff/dist/COPYING U xsrc/external/mit/xbiff/dist/config.h.in U xsrc/external/mit/xbiff/dist/MailboxP.h U xsrc/external/mit/xbiff/dist/config.sub U xsrc/external/mit/xbiff/dist/Mailbox.c U xsrc/external/mit/xbiff/dist/Makefile.am U xsrc/external/mit/xbiff/dist/configure.ac U xsrc/external/mit/xbiff/dist/Mailbox.h U xsrc/external/mit/xbiff/dist/aclocal.m4 U xsrc/external/mit/xbiff/dist/Makefile.in U xsrc/external/mit/xbiff/dist/INSTALL U xsrc/external/mit/xbiff/dist/install-sh U xsrc/external/mit/xbiff/dist/xbiff.c N xsrc/external/mit/xbiff/dist/man/Makefile.in N xsrc/external/mit/xbiff/dist/man/xbiff.man N xsrc/external/mit/xbiff/dist/man/Makefile.am U xsrc/external/mit/xbiff/dist/bitmaps/mail-down-mask U xsrc/external/mit/xbiff/dist/bitmaps/mail-up U xsrc/external/mit/xbiff/dist/bitmaps/mail-up-mask U xsrc/external/mit/xbiff/dist/bitmaps/mail-down No conflicts created by this import
CVS commit: xsrc/external/mit/xfindproxy/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:23:52 UTC 2011 Update of /cvsroot/xsrc/external/mit/xfindproxy/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1684 Log Message: initial import of xfindproxy-1.0.2 Status: Vendor Tag: xorg Release Tags: xfindproxy-1-0-2 U xsrc/external/mit/xfindproxy/dist/configure U xsrc/external/mit/xfindproxy/dist/NEWS U xsrc/external/mit/xfindproxy/dist/xfindproxy.man U xsrc/external/mit/xfindproxy/dist/configure.ac U xsrc/external/mit/xfindproxy/dist/INSTALL U xsrc/external/mit/xfindproxy/dist/install-sh U xsrc/external/mit/xfindproxy/dist/ChangeLog U xsrc/external/mit/xfindproxy/dist/aclocal.m4 U xsrc/external/mit/xfindproxy/dist/README U xsrc/external/mit/xfindproxy/dist/config.h.in U xsrc/external/mit/xfindproxy/dist/xfindproxy.c U xsrc/external/mit/xfindproxy/dist/Makefile.am U xsrc/external/mit/xfindproxy/dist/config.sub U xsrc/external/mit/xfindproxy/dist/AUTHORS U xsrc/external/mit/xfindproxy/dist/Makefile.in U xsrc/external/mit/xfindproxy/dist/COPYING U xsrc/external/mit/xfindproxy/dist/xfindproxy.h U xsrc/external/mit/xfindproxy/dist/missing U xsrc/external/mit/xfindproxy/dist/depcomp U xsrc/external/mit/xfindproxy/dist/config.guess No conflicts created by this import
CVS commit: xsrc/external/mit/xfwp/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:23:55 UTC 2011 Update of /cvsroot/xsrc/external/mit/xfwp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv92 Log Message: initial import of xfwp-1.0.2 Status: Vendor Tag: xorg Release Tags: xfwp-1-0-2 U xsrc/external/mit/xfwp/dist/transport.c U xsrc/external/mit/xfwp/dist/pm.h U xsrc/external/mit/xfwp/dist/misc.c U xsrc/external/mit/xfwp/dist/config.guess U xsrc/external/mit/xfwp/dist/xfwp.h U xsrc/external/mit/xfwp/dist/config.h.in U xsrc/external/mit/xfwp/dist/README U xsrc/external/mit/xfwp/dist/INSTALL U xsrc/external/mit/xfwp/dist/config.sub U xsrc/external/mit/xfwp/dist/xfwp.man U xsrc/external/mit/xfwp/dist/io.c U xsrc/external/mit/xfwp/dist/COPYING U xsrc/external/mit/xfwp/dist/Makefile.in U xsrc/external/mit/xfwp/dist/xfwp.c U xsrc/external/mit/xfwp/dist/ChangeLog U xsrc/external/mit/xfwp/dist/configure U xsrc/external/mit/xfwp/dist/transport.h U xsrc/external/mit/xfwp/dist/pm.c U xsrc/external/mit/xfwp/dist/AUTHORS U xsrc/external/mit/xfwp/dist/NEWS U xsrc/external/mit/xfwp/dist/misc.h U xsrc/external/mit/xfwp/dist/io.h U xsrc/external/mit/xfwp/dist/Makefile.am U xsrc/external/mit/xfwp/dist/install-sh U xsrc/external/mit/xfwp/dist/missing U xsrc/external/mit/xfwp/dist/configure.ac U xsrc/external/mit/xfwp/dist/depcomp U xsrc/external/mit/xfwp/dist/aclocal.m4 No conflicts created by this import
CVS commit: xsrc/external/mit/xrdb/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:24:00 UTC 2011 Update of /cvsroot/xsrc/external/mit/xrdb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv302 Log Message: initial import of xrdb-1.0.8 - fix -nocpp - fix interaction with gcc 4.5 cpp -P feature change Status: Vendor Tag: xorg Release Tags: xrdb-1-0-8 U xsrc/external/mit/xrdb/dist/missing U xsrc/external/mit/xrdb/dist/aclocal.m4 U xsrc/external/mit/xrdb/dist/AUTHORS U xsrc/external/mit/xrdb/dist/ChangeLog U xsrc/external/mit/xrdb/dist/config.guess U xsrc/external/mit/xrdb/dist/config.h.in U xsrc/external/mit/xrdb/dist/config.sub U xsrc/external/mit/xrdb/dist/configure U xsrc/external/mit/xrdb/dist/configure.ac U xsrc/external/mit/xrdb/dist/COPYING U xsrc/external/mit/xrdb/dist/depcomp U xsrc/external/mit/xrdb/dist/INSTALL U xsrc/external/mit/xrdb/dist/install-sh U xsrc/external/mit/xrdb/dist/Makefile.am U xsrc/external/mit/xrdb/dist/Makefile.in U xsrc/external/mit/xrdb/dist/README C xsrc/external/mit/xrdb/dist/xrdb.c N xsrc/external/mit/xrdb/dist/man/Makefile.am N xsrc/external/mit/xrdb/dist/man/Makefile.in N xsrc/external/mit/xrdb/dist/man/xrdb.man 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrdb/dist
CVS commit: xsrc/external/mit/x11perf/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:29:58 UTC 2011 Removed Files: xsrc/external/mit/x11perf/dist: AUTHORS NEWS Log Message: merge x11perf 1.5.3 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/x11perf/dist/AUTHORS \ xsrc/external/mit/x11perf/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xbiff/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:30:25 UTC 2011 Removed Files: xsrc/external/mit/xbiff/dist: xbiff.man Log Message: merge xbiff 1.0.3 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xbiff/dist/xbiff.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xfindproxy/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:30:41 UTC 2011 Removed Files: xsrc/external/mit/xfindproxy/dist: compile mkinstalldirs Log Message: merge xfindproxy 1.0.2. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfindproxy/dist/compile \ xsrc/external/mit/xfindproxy/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xfwp/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:30:56 UTC 2011 Removed Files: xsrc/external/mit/xfwp/dist: compile mkinstalldirs Log Message: merge xfwp 1.0.2 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xfwp/dist/compile \ xsrc/external/mit/xfwp/dist/mkinstalldirs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xrdb/dist
Module Name:xsrc
Committed By: mrg
Date: Mon Feb 21 04:31:22 UTC 2011
Modified Files:
xsrc/external/mit/xrdb/dist: xrdb.c
Removed Files:
xsrc/external/mit/xrdb/dist: xrdb.man
Log Message:
merge xrdb 1.0.8. XXX: this one needs to be tested carefully.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xrdb/dist/xrdb.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.3 xsrc/external/mit/xrdb/dist/xrdb.c:1.4
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.3 Sat Nov 20 23:22:38 2010
+++ xsrc/external/mit/xrdb/dist/xrdb.c Mon Feb 21 04:31:22 2011
@@ -152,6 +152,48 @@
static void ShuffleEntries ( Entries *db, Entries *dbs, int num );
static void ReProcess ( int scrno, Bool doScreen );
+#ifndef HAVE_ASPRINTF
+/* sprintf variant found in newer libc's which allocates string to print to */
+static int _X_ATTRIBUTE_PRINTF(2,3)
+asprintf(char ** ret, const char *format, ...)
+{
+char buf[256];
+int len;
+va_list ap;
+
+va_start(ap, format);
+len = vsnprintf(buf, sizeof(buf), format, ap);
+va_end(ap);
+
+if (len 0)
+ return -1;
+
+if (len sizeof(buf))
+{
+ *ret = strdup(buf);
+}
+else
+{
+ *ret = malloc(len + 1); /* snprintf doesn't count trailing '\0' */
+ if (*ret != NULL)
+ {
+ va_start(ap, format);
+ len = vsnprintf(*ret, len + 1, format, ap);
+ va_end(ap);
+ if (len 0) {
+ free(*ret);
+ *ret = NULL;
+ }
+ }
+}
+
+if (*ret == NULL)
+ return -1;
+
+return len;
+}
+#endif /* HAVE_ASPRINTF */
+
static void
InitBuffer(Buffer *b)
{
@@ -669,55 +711,30 @@
Syntax (void)
{
fprintf (stderr,
- usage: %s [-options ...] [filename]\n\n,
- ProgramName);
-fprintf (stderr,
- where options include:\n);
-fprintf (stderr,
- -display host:dpy display to use\n);
-fprintf (stderr,
- -alldo all resources [default]\n);
-fprintf (stderr,
- -global do screen-independent resources\n);
-fprintf (stderr,
- -screen do screen-specific resources for one screen\n);
-fprintf (stderr,
- -screensdo screen-specific resources for all screens\n);
-fprintf (stderr,
- -n show but don't do changes\n);
-fprintf (stderr,
- -cpp filename preprocessor to use [%s]\n,
- CPP);
-fprintf (stderr,
- -nocpp do not use a preprocessor\n);
-fprintf (stderr,
- -query query resources\n);
-fprintf (stderr,
- -load load resources from file [default]\n);
-fprintf (stderr,
- -override add in resources from file\n);
-fprintf (stderr,
- -merge merge resources from file sort\n);
-fprintf (stderr,
- -edit filename edit resources into file\n);
-fprintf (stderr,
- -backup string backup suffix for -edit [%s]\n,
- BACKUP_SUFFIX);
-fprintf (stderr,
- -symbolsshow preprocessor symbols\n);
-fprintf (stderr,
- -remove remove resources\n);
-fprintf (stderr,
- -retain avoid server reset (avoid using this)\n);
-fprintf (stderr,
- -quiet don't warn about duplicates\n);
-fprintf (stderr,
- -Dname[=value], -Uname, -Idirectory%s\n,
- passed to preprocessor);
-fprintf (stderr,
- \n);
-fprintf (stderr,
- A - or no input filename represents stdin.\n);
+ usage: %s [-options ...] [filename]\n\n
+ where options include:\n
+ -display host:dpy display to use\n
+ -alldo all resources [default]\n
+ -global do screen-independent resources\n
+ -screen do screen-specific resources for one screen\n
+ -screensdo screen-specific resources for all screens\n
+ -n show but don't do changes\n
+ -cpp filename preprocessor to use [%s]\n
+ -nocpp do not use a preprocessor\n
+ -query query resources\n
+ -load load resources from file [default]\n
+ -override add in resources from file\n
+ -merge merge resources from file sort\n
+ -edit filename edit resources into file\n
+ -backup string backup suffix for -edit [%s]\n
+ -symbolsshow preprocessor symbols\n
+ -remove remove resources\n
+ -retain avoid server reset (avoid using this)\n
+ -quiet don't warn about duplicates\n
+ -Dname[=value], -Uname, -Idirectorypassed to preprocessor\n
+ \n
+ A - or
CVS commit: xsrc/external/mit/xbiff/include
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:38:54 UTC 2011 Added Files: xsrc/external/mit/xbiff/include: config.h Log Message: add the xbiff generated config.h To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xbiff/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: xsrc/external/mit/xbiff/include/config.h diff -u /dev/null xsrc/external/mit/xbiff/include/config.h:1.1 --- /dev/null Mon Feb 21 04:38:54 2011 +++ xsrc/external/mit/xbiff/include/config.h Mon Feb 21 04:38:54 2011 @@ -0,0 +1,71 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if you have the inttypes.h header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the memory.h header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the paths.h header file. */ +#define HAVE_PATHS_H 1 + +/* Define to 1 if you have the stdint.h header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the stdlib.h header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the strings.h header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the string.h header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the sys/stat.h header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the sys/types.h header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the unistd.h header file. */ +#define HAVE_UNISTD_H 1 + +/* Directory containing user mailboxes */ +/* #undef MAILBOX_DIRECTORY */ + +/* Name of package */ +#define PACKAGE xbiff + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg; + +/* Define to the full name of this package. */ +#define PACKAGE_NAME xbiff + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING xbiff 1.0.3 + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME xbiff + +/* Define to the home page for this package. */ +#define PACKAGE_URL + +/* Define to the version of this package. */ +#define PACKAGE_VERSION 1.0.3 + +/* Major version of this package */ +#define PACKAGE_VERSION_MAJOR 1 + +/* Minor version of this package */ +#define PACKAGE_VERSION_MINOR 0 + +/* Patch version of this package */ +#define PACKAGE_VERSION_PATCHLEVEL 3 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION 1.0.3
CVS commit: src/external/mit/xorg/bin/xbiff
Module Name:src
Committed By: mrg
Date: Mon Feb 21 04:40:24 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xbiff: Makefile
Log Message:
find config.h and the man page after xbiff updates.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xbiff/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xbiff/Makefile
diff -u src/external/mit/xorg/bin/xbiff/Makefile:1.1.1.1 src/external/mit/xorg/bin/xbiff/Makefile:1.2
--- src/external/mit/xorg/bin/xbiff/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xbiff/Makefile Mon Feb 21 04:40:24 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/21 04:40:24 mrg Exp $
.include bsd.own.mk
@@ -9,9 +9,10 @@
DPADD+= ${LIBXEXT} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBX11} ${LIBSM} ${LIBICE} \
${LIBXAU}
-#cc -O2 -I/usr/pkg/include -L/usr/pkg/lib -Wl,-R/usr/pkg/lib -o xbiff xbiff-Mailbox.o xbiff-xbiff.o -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lXext -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lXaw8 -lXmu -lXt -lX11 -lSM -lICE -lXau
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/bin/xrdb
Module Name:src
Committed By: mrg
Date: Mon Feb 21 04:40:55 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xrdb: Makefile
Log Message:
define HAVE_ASPRINTF and find the moved man page after xrdb 1.0.8 update.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xrdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.2 src/external/mit/xorg/bin/xrdb/Makefile:1.3
--- src/external/mit/xorg/bin/xrdb/Makefile:1.2 Sat Dec 5 03:28:08 2009
+++ src/external/mit/xorg/bin/xrdb/Makefile Mon Feb 21 04:40:55 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/12/05 03:28:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/21 04:40:55 mrg Exp $
.include bsd.own.mk
@@ -6,11 +6,13 @@
CPPFLAGS+=-DCPP=\/usr/bin/cpp\ -DHAS_MKSTEMP # XXX
CPPFLAGS+=-DCPP_ARGS=\-traditional\
+CPPFLAGS+=-DHAVE_ASPRINTF
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86
Module Name:src
Committed By: mrg
Date: Mon Feb 21 04:42:17 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
Log Message:
define PCVT_SUPPORT ofppc anywhere other ppc platforms do.
part of the way to getting xorg working on ofppc.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.17
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.16 Sat Jan 22 15:21:37 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Mon Feb 21 04:42:16 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/01/22 15:21:37 cegger Exp $
+# $NetBSD: Makefile,v 1.17 2011/02/21 04:42:16 mrg Exp $
.include bsd.sys.mk # for HOST_SH
@@ -90,7 +90,7 @@
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif
-.if ${MACHINE} == cats
+.if ${MACHINE} == cats || ${MACHINE} == ofppc
CPPFLAGS+= -DPCVT_SUPPORT
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.7 Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
.include bsd.sys.mk # for HOST_SH
@@ -51,7 +51,7 @@
CPPFLAGS+= -DPCCONS_SUPPORT -DPCVT_SUPPORT
.endif
-.if ${MACHINE} == cats
+.if ${MACHINE} == cats || ${MACHINE} == ofppc
CPPFLAGS+= -DPCVT_SUPPORT
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.15
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile:1.14 Sun Aug 1 06:24:31 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/08/01 06:24:31 kiyohara Exp $
+# $NetBSD: Makefile,v 1.15 2011/02/21 04:42:17 mrg Exp $
SUBDIR= cvt gtf
#SUBDIR= cvt gtf xorgconfig
@@ -10,7 +10,8 @@
.if ${MACHINE} == cats || ${MACHINE} == macppc || \
${MACHINE} == netwinder || ${MACHINE_ARCH} == sparc || \
${MACHINE_ARCH} == sparc64 || ${MACHINE_ARCH} == alpha || \
-${MACHINE} == prep || ${MACHINE} == bebox
+${MACHINE} == prep || ${MACHINE} == bebox || \
+${MACHINE} == ofppc
#SUBDIR+=pcitweak scanpci
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.7 src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.8
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile:1.7 Mon Nov 29 09:34:41 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile Mon Feb 21 04:42:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/11/29 09:34:41 skrll Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
.include bsd.own.mk
@@ -22,7 +22,7 @@
-DFILEMANSUFFIX=\5\ \
-DXVERSIONSTRING=\1.4.2\
-.if ${MACHINE_ARCH} == i386 || ${MACHINE} == cats
+.if ${MACHINE_ARCH} == i386 || ${MACHINE} == cats || ${MACHINE} == ofppc
CPPFLAGS+= -DPCVT_SUPPORT
.endif
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.27 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.28
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.27
CVS commit: xsrc/external/mit/xf86-video-savage/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:47:55 UTC 2011 Update of /cvsroot/xsrc/external/mit/xf86-video-savage/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3064 Log Message: initial import of xf86-video-savage-2.3.2 Status: Vendor Tag: xorg Release Tags: xf86-video-savage-2-3-2 U xsrc/external/mit/xf86-video-savage/dist/README U xsrc/external/mit/xf86-video-savage/dist/Makefile.am N xsrc/external/mit/xf86-video-savage/dist/INSTALL U xsrc/external/mit/xf86-video-savage/dist/configure.ac U xsrc/external/mit/xf86-video-savage/dist/COPYING U xsrc/external/mit/xf86-video-savage/dist/config.h.in U xsrc/external/mit/xf86-video-savage/dist/missing U xsrc/external/mit/xf86-video-savage/dist/config.sub U xsrc/external/mit/xf86-video-savage/dist/configure U xsrc/external/mit/xf86-video-savage/dist/ChangeLog U xsrc/external/mit/xf86-video-savage/dist/install-sh U xsrc/external/mit/xf86-video-savage/dist/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/ltmain.sh U xsrc/external/mit/xf86-video-savage/dist/aclocal.m4 U xsrc/external/mit/xf86-video-savage/dist/config.guess U xsrc/external/mit/xf86-video-savage/dist/depcomp U xsrc/external/mit/xf86-video-savage/dist/src/savage_accel.c U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/src/savage_hwmc.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_shadow.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_regs.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_dga.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_cursor.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_driver.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_bci.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_xaa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_exa.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_i2c.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_common.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_video.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_dripriv.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_sarea.h U xsrc/external/mit/xf86-video-savage/dist/src/Makefile.in U xsrc/external/mit/xf86-video-savage/dist/src/savage_dri.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_vbe.c U xsrc/external/mit/xf86-video-savage/dist/src/savage_drm.h U xsrc/external/mit/xf86-video-savage/dist/src/savage_streams.h U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.am U xsrc/external/mit/xf86-video-savage/dist/man/savage.man U xsrc/external/mit/xf86-video-savage/dist/man/Makefile.in No conflicts created by this import
CVS commit: xsrc/external/mit/xkbcomp/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:52:57 UTC 2011 Update of /cvsroot/xsrc/external/mit/xkbcomp/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9335 Log Message: initial import of xkbcomp-1.2.1 Status: Vendor Tag: xorg Release Tags: xkbcomp-1-2-1 U xsrc/external/mit/xkbcomp/dist/indicators.c U xsrc/external/mit/xkbcomp/dist/compat.c U xsrc/external/mit/xkbcomp/dist/configure.ac U xsrc/external/mit/xkbcomp/dist/symbols.c U xsrc/external/mit/xkbcomp/dist/config.guess U xsrc/external/mit/xkbcomp/dist/utils.c U xsrc/external/mit/xkbcomp/dist/xkbscan.c U xsrc/external/mit/xkbcomp/dist/indicators.h U xsrc/external/mit/xkbcomp/dist/keycodes.h U xsrc/external/mit/xkbcomp/dist/vmod.h U xsrc/external/mit/xkbcomp/dist/xkbparse.c U xsrc/external/mit/xkbcomp/dist/Makefile.in U xsrc/external/mit/xkbcomp/dist/xkbpath.c U xsrc/external/mit/xkbcomp/dist/config.sub U xsrc/external/mit/xkbcomp/dist/INSTALL U xsrc/external/mit/xkbcomp/dist/xkbcomp.c U xsrc/external/mit/xkbcomp/dist/install-sh U xsrc/external/mit/xkbcomp/dist/xkbcomp.h U xsrc/external/mit/xkbcomp/dist/xkbparse.y U xsrc/external/mit/xkbcomp/dist/geometry.c U xsrc/external/mit/xkbcomp/dist/vmod.c U xsrc/external/mit/xkbcomp/dist/ylwrap U xsrc/external/mit/xkbcomp/dist/ChangeLog U xsrc/external/mit/xkbcomp/dist/keymap.c U xsrc/external/mit/xkbcomp/dist/compat.h U xsrc/external/mit/xkbcomp/dist/tokens.h U xsrc/external/mit/xkbcomp/dist/README U xsrc/external/mit/xkbcomp/dist/keytypes.c U xsrc/external/mit/xkbcomp/dist/expr.c U xsrc/external/mit/xkbcomp/dist/aclocal.m4 U xsrc/external/mit/xkbcomp/dist/expr.h U xsrc/external/mit/xkbcomp/dist/utils.h U xsrc/external/mit/xkbcomp/dist/alias.h U xsrc/external/mit/xkbcomp/dist/config.h.in U xsrc/external/mit/xkbcomp/dist/missing U xsrc/external/mit/xkbcomp/dist/action.h U xsrc/external/mit/xkbcomp/dist/parseutils.c U xsrc/external/mit/xkbcomp/dist/action.c U xsrc/external/mit/xkbcomp/dist/keycodes.c U xsrc/external/mit/xkbcomp/dist/COPYING U xsrc/external/mit/xkbcomp/dist/configure U xsrc/external/mit/xkbcomp/dist/misc.h U xsrc/external/mit/xkbcomp/dist/depcomp U xsrc/external/mit/xkbcomp/dist/xkbpath.h U xsrc/external/mit/xkbcomp/dist/parseutils.h U xsrc/external/mit/xkbcomp/dist/Makefile.am U xsrc/external/mit/xkbcomp/dist/alias.c U xsrc/external/mit/xkbcomp/dist/misc.c U xsrc/external/mit/xkbcomp/dist/listing.c N xsrc/external/mit/xkbcomp/dist/man/Makefile.in N xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man N xsrc/external/mit/xkbcomp/dist/man/Makefile.am No conflicts created by this import
CVS commit: xsrc/external/mit/xkbprint/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:53:00 UTC 2011 Update of /cvsroot/xsrc/external/mit/xkbprint/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11842 Log Message: initial import of xkbprint-1.0.3 Status: Vendor Tag: xorg Release Tags: xkbprint-1-0-3 U xsrc/external/mit/xkbprint/dist/configure.ac U xsrc/external/mit/xkbprint/dist/utils.c U xsrc/external/mit/xkbprint/dist/config.h.in U xsrc/external/mit/xkbprint/dist/INSTALL U xsrc/external/mit/xkbprint/dist/psgeom.c U xsrc/external/mit/xkbprint/dist/config.sub U xsrc/external/mit/xkbprint/dist/xkbprint.c U xsrc/external/mit/xkbprint/dist/missing U xsrc/external/mit/xkbprint/dist/depcomp U xsrc/external/mit/xkbprint/dist/Makefile.in U xsrc/external/mit/xkbprint/dist/xkbprint.man U xsrc/external/mit/xkbprint/dist/README U xsrc/external/mit/xkbprint/dist/utils.h U xsrc/external/mit/xkbprint/dist/isokeys.h U xsrc/external/mit/xkbprint/dist/xkbprint.h U xsrc/external/mit/xkbprint/dist/config.guess U xsrc/external/mit/xkbprint/dist/ChangeLog U xsrc/external/mit/xkbprint/dist/Makefile.am U xsrc/external/mit/xkbprint/dist/install-sh U xsrc/external/mit/xkbprint/dist/configure U xsrc/external/mit/xkbprint/dist/COPYING U xsrc/external/mit/xkbprint/dist/aclocal.m4 No conflicts created by this import
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: mrg Date: Mon Feb 21 04:53:52 UTC 2011 Modified Files: src/distrib/sets/lists/xbase: mi Log Message: obsolete a couple of xkb files no longer present in xkbcomp 1.2.1. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/xbase/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/mi diff -u src/distrib/sets/lists/xbase/mi:1.104 src/distrib/sets/lists/xbase/mi:1.105 --- src/distrib/sets/lists/xbase/mi:1.104 Mon Nov 29 12:18:45 2010 +++ src/distrib/sets/lists/xbase/mi Mon Feb 21 04:53:52 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.104 2010/11/29 12:18:45 wiz Exp $ +# $NetBSD: mi,v 1.105 2011/02/21 04:53:52 mrg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1842,8 +1842,8 @@ ./usr/X11R7/lib/X11/xedit/lisp/xedit.lsp -unknown- xorg ./usr/X11R7/lib/X11/xkb base-x11-root xorg ./usr/X11R7/lib/X11/xkb/README-unknown- xorg -./usr/X11R7/lib/X11/xkb/README.config -unknown- xorg -./usr/X11R7/lib/X11/xkb/README.enhancing -unknown- xorg +./usr/X11R7/lib/X11/xkb/README.config -unknown- obsolete +./usr/X11R7/lib/X11/xkb/README.enhancing -unknown- obsolete ./usr/X11R7/lib/X11/xkb/compatbase-x11-root xorg ./usr/X11R7/lib/X11/xkb/compat.dir -unknown- xorg ./usr/X11R7/lib/X11/xkb/compat/README -unknown- xorg
CVS commit: xsrc/external/mit/xkbcomp/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:54:17 UTC 2011 Removed Files: xsrc/external/mit/xkbcomp/dist: README.config README.enhancing xkbcomp.man Log Message: merge xkbcomp 1.2.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xkbcomp/dist/README.config \ xsrc/external/mit/xkbcomp/dist/README.enhancing \ xsrc/external/mit/xkbcomp/dist/xkbcomp.man Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xkbprint/dist
Module Name:xsrc Committed By: mrg Date: Mon Feb 21 04:54:27 UTC 2011 Removed Files: xsrc/external/mit/xkbprint/dist: AUTHORS NEWS Log Message: merge xkbprint 1.0.3. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xkbprint/dist/AUTHORS \ xsrc/external/mit/xkbprint/dist/NEWS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xkbcomp
Module Name:src
Committed By: mrg
Date: Mon Feb 21 04:54:53 UTC 2011
Modified Files:
src/external/mit/xorg/bin/xkbcomp: Makefile
Log Message:
find the moved man page from xkbcomp 1.2.1.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xkbcomp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkbcomp/Makefile
diff -u src/external/mit/xorg/bin/xkbcomp/Makefile:1.6 src/external/mit/xorg/bin/xkbcomp/Makefile:1.7
--- src/external/mit/xorg/bin/xkbcomp/Makefile:1.6 Thu May 20 12:51:16 2010
+++ src/external/mit/xorg/bin/xkbcomp/Makefile Mon Feb 21 04:54:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/05/20 12:51:16 christos Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/21 04:54:52 mrg Exp $
.include bsd.own.mk
.include Makefile.common
@@ -15,7 +15,7 @@
CPPFLAGS.geometry.c= -Wno-error # XXX
FILESDIR=${XKBROOTDIR}
-FILES= README README.config README.enhancing
+FILES= README
SYMLINKS+= ${BINDIR}/xkbcomp ${XKBROOTDIR}/xkbcomp
SYMLINKS+= ${XKBDATADIR} ${XKBCOMPDIR}
@@ -24,6 +24,7 @@
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include bsd.x11.mk
.include bsd.prog.mk
