CVS commit: src/sys/dev/wsfb
Module Name:src
Committed By: macallan
Date: Thu Jun 2 02:33:42 UTC 2011
Modified Files:
src/sys/dev/wsfb: genfb.c genfbvar.h
Log Message:
some steps to make multiple instances work:
- don't bail if we're not the console. If we get the right paramters there is no
reason not to work
- move wsdisplay_accessops into the softc
- call wsdisplay_cnattach only if we're the console
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/wsfb/genfb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/wsfb/genfbvar.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/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.40 src/sys/dev/wsfb/genfb.c:1.41
--- src/sys/dev/wsfb/genfb.c:1.40 Tue Mar 8 04:47:10 2011
+++ src/sys/dev/wsfb/genfb.c Thu Jun 2 02:33:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.40 2011/03/08 04:47:10 macallan Exp $ */
+/* $NetBSD: genfb.c,v 1.41 2011/06/02 02:33:42 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.40 2011/03/08 04:47:10 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.41 2011/06/02 02:33:42 macallan Exp $");
#include
#include
@@ -85,17 +85,6 @@
static int genfb_cnattach_called = 0;
static int genfb_enabled = 1;
-struct wsdisplay_accessops genfb_accessops = {
- genfb_ioctl,
- genfb_mmap,
- NULL, /* alloc_screen */
- NULL, /* free_screen */
- NULL, /* show_screen */
- NULL, /* load_font */
- NULL, /* pollc */
- NULL /* scroll */
-};
-
static struct genfb_softc *genfb_softc = NULL;
void
@@ -217,14 +206,8 @@
== false)
sc->sc_want_clear = true;
- /* do not attach when we're not console */
- if (!console) {
- aprint_normal_dev(sc->sc_dev, "no console, unable to continue\n");
- return -1;
- }
-
- aprint_verbose_dev(sc->sc_dev, "framebuffer at %p, size %dx%d, depth %d, "
- "stride %d\n",
+ aprint_verbose_dev(sc->sc_dev, "framebuffer at %p, size %dx%d,"
+ "depth %d, stride %d\n",
sc->sc_fboffset ? (void *)(intptr_t)sc->sc_fboffset : sc->sc_fbaddr,
sc->sc_width, sc->sc_height, sc->sc_depth, sc->sc_stride);
@@ -243,6 +226,9 @@
if (sc->sc_modecb != NULL)
sc->sc_modecb->gmc_setmode(sc, sc->sc_mode);
+ sc->sc_accessops.ioctl = genfb_ioctl;
+ sc->sc_accessops.mmap = genfb_mmap;
+
#ifdef GENFB_SHADOWFB
sc->sc_shadowfb = kmem_alloc(sc->sc_fbsize, KM_SLEEP);
if (sc->sc_want_clear == false && sc->sc_shadowfb != NULL)
@@ -250,7 +236,7 @@
#endif
vcons_init(&sc->vd, sc, &sc->sc_defaultscreen_descr,
- &genfb_accessops);
+ &sc->sc_accessops);
sc->vd.init_screen = genfb_init_screen;
/* Do not print anything between this point and the screen
@@ -275,8 +261,10 @@
sc->sc_defaultscreen_descr.capabilities = ri->ri_caps;
sc->sc_defaultscreen_descr.nrows = ri->ri_rows;
sc->sc_defaultscreen_descr.ncols = ri->ri_cols;
- wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, crow,
- defattr);
+
+ if (console)
+ wsdisplay_cnattach(&sc->sc_defaultscreen_descr, ri, 0, crow,
+ defattr);
/* Clear the whole screen to bring it to a known state. */
if (sc->sc_want_clear)
@@ -331,7 +319,7 @@
aa.console = console;
aa.scrdata = &sc->sc_screenlist;
- aa.accessops = &genfb_accessops;
+ aa.accessops = &sc->sc_accessops;
aa.accesscookie = &sc->vd;
#ifdef GENFB_DISABLE_TEXT
Index: src/sys/dev/wsfb/genfbvar.h
diff -u src/sys/dev/wsfb/genfbvar.h:1.19 src/sys/dev/wsfb/genfbvar.h:1.20
--- src/sys/dev/wsfb/genfbvar.h:1.19 Wed Feb 9 13:19:19 2011
+++ src/sys/dev/wsfb/genfbvar.h Thu Jun 2 02:33:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: genfbvar.h,v 1.19 2011/02/09 13:19:19 jmcneill Exp $ */
+/* $NetBSD: genfbvar.h,v 1.20 2011/06/02 02:33:42 macallan Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.19 2011/02/09 13:19:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.20 2011/06/02 02:33:42 macallan Exp $");
#ifndef GENFBVAR_H
#define GENFBVAR_H
@@ -109,6 +109,7 @@
#ifdef SPLASHSCREEN
struct splash_info sc_splash;
#endif
+ struct wsdisplay_accessops sc_accessops;
};
void genfb_cnattach(void);
CVS commit: src/lib/libc/sys
Module Name:src Committed By: yamt Date: Thu Jun 2 01:04:18 UTC 2011 Modified Files: src/lib/libc/sys: accept.2 Log Message: compatibility note To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/sys/accept.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/accept.2 diff -u src/lib/libc/sys/accept.2:1.25 src/lib/libc/sys/accept.2:1.26 --- src/lib/libc/sys/accept.2:1.25 Fri Nov 17 23:59:33 2006 +++ src/lib/libc/sys/accept.2 Thu Jun 2 01:04:18 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: accept.2,v 1.25 2006/11/17 23:59:33 rillig Exp $ +.\" $NetBSD: accept.2,v 1.26 2011/06/02 01:04:18 yamt Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 .\" -.Dd November 18, 2006 +.Dd June 2, 2011 .Dt ACCEPT 2 .Os .Sh NAME @@ -135,6 +135,15 @@ The call returns \-1 on error. If it succeeds, it returns a non-negative integer that is a descriptor for the accepted socket. +.Sh COMPATIBILITY +This implementation makes the new file descriptor inherit file flags +(like +.Dv O_NONBLOCK ) +from the listening socket. +It's a traditional behaviour for BSD derivative systems. +On the other hand, there are implementations which don't do so. +Linux is an example of such implementations. +Portable programs should not rely on either of the behaviours. .Sh ERRORS The .Fn accept
CVS commit: src/share/man/man9
Module Name:src Committed By: yamt Date: Thu Jun 2 00:58:26 UTC 2011 Modified Files: src/share/man/man9: cpu_switchto.9 Log Message: mention memory barriers necessary for non-interlocked adaptive mutex release. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man9/cpu_switchto.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/cpu_switchto.9 diff -u src/share/man/man9/cpu_switchto.9:1.11 src/share/man/man9/cpu_switchto.9:1.12 --- src/share/man/man9/cpu_switchto.9:1.11 Tue Apr 13 06:05:56 2010 +++ src/share/man/man9/cpu_switchto.9 Thu Jun 2 00:58:26 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: cpu_switchto.9,v 1.11 2010/04/13 06:05:56 jruoho Exp $ +.\" $NetBSD: cpu_switchto.9,v 1.12 2011/06/02 00:58:26 yamt Exp $ .\" .\" Copyright (c)2007 YAMAMOTO Takashi, .\" All rights reserved. @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd April 13, 2010 +.Dd June 2, 2011 .Dt CPU_SWITCHTO 9 .Os .\" @@ -64,6 +64,12 @@ .Xr curlwp 9 to .Fa newlwp . +If the architecture does non-interlocked adaptive mutex release, +.Fn cpu_switchto +does an equivalent of +.Xr membar_producer 9 , +before and after the modification of +.Xr curlwp 9 . .It .Fn cpu_switchto should be called at @@ -138,5 +144,6 @@ .Sh SEE ALSO .Xr swapcontext 3 , .Xr intro 9 , +.Xr membar_producer 9 , .Xr mutex 9 , .Xr spl 9
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: christos
Date: Thu Jun 2 00:35:23 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
split mainbus
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/arch/sparc64/sparc64/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.179 src/sys/arch/sparc64/sparc64/autoconf.c:1.180
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.179 Wed Jun 1 12:00:10 2011
+++ src/sys/arch/sparc64/sparc64/autoconf.c Wed Jun 1 20:35:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.179 2011/06/01 16:00:10 macallan Exp $ */
+/* $NetBSD: autoconf.c,v 1.180 2011/06/02 00:35:23 christos Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.179 2011/06/01 16:00:10 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.180 2011/06/02 00:35:23 christos Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -149,8 +149,8 @@
int ofbootpackage;
static int mbprint(void *, const char *);
-int mainbus_match(struct device *, struct cfdata *, void *);
-static void mainbus_attach(struct device *, struct device *, void *);
+int mainbus_match(device_t, cfdata_t, void *);
+static void mainbus_attach(device_t, device_t, void *);
static void get_ncpus(void);
static void get_bootpath_from_prom(void);
@@ -190,7 +190,7 @@
int console_node, console_instance;
struct genfb_colormap_callback gfb_cb;
static void of_set_palette(void *, int, int, int, int);
-static void copyprops(struct device *busdev, int, prop_dictionary_t, int);
+static void copyprops(device_t, int, prop_dictionary_t, int);
static void
get_ncpus(void)
@@ -525,8 +525,7 @@
}
int
-mainbus_match(struct device * parent, struct cfdata * cf,
- void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
{
return (1);
@@ -540,8 +539,7 @@
* We also record the `node id' of the default frame buffer, if any.
*/
static void
-mainbus_attach(struct device * parent, struct device *dev,
- void *aux)
+mainbus_attach(device_t parent, device_t dev, void *aux)
{
extern struct sparc_bus_dma_tag mainbus_dma_tag;
extern struct sparc_bus_space_tag mainbus_space_tag;
@@ -602,7 +600,7 @@
/*
* Init static interrupt eventcounters
*/
- for (i = 0; i < sizeof(intr_evcnts)/sizeof(intr_evcnts[0]); i++)
+ for (i = 0; i < __arraycount(intr_evcnts); i++)
evcnt_attach_static(&intr_evcnts[i]);
node = findroot();
@@ -714,7 +712,7 @@
(void) config_found(dev, (void *)&ma, mbprint);
}
-CFATTACH_DECL(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, sizeof(struct device),
mainbus_match, mainbus_attach, NULL, NULL);
@@ -745,7 +743,7 @@
* exactly, we found the boot device.
*/
static void
-dev_path_exact_match(struct device *dev, int ofnode)
+dev_path_exact_match(device_t dev, int ofnode)
{
if (ofnode != ofbootpackage)
@@ -762,7 +760,7 @@
* the bootpath remainder.
*/
static void
-dev_path_drive_match(struct device *dev, int ctrlnode, int target,
+dev_path_drive_match(device_t dev, int ctrlnode, int target,
uint64_t wwn, int lun)
{
int child = 0;
@@ -814,7 +812,7 @@
* dictionary.
*/
static int
-device_ofnode(struct device *dev)
+device_ofnode(device_t dev)
{
prop_dictionary_t props;
prop_object_t obj;
@@ -836,7 +834,7 @@
* of a struct device.
*/
static void
-device_setofnode(struct device *dev, int node)
+device_setofnode(device_t dev, int node)
{
prop_dictionary_t props;
prop_object_t obj;
@@ -859,9 +857,9 @@
* Called back during autoconfiguration for each device found
*/
void
-device_register(struct device *dev, void *aux)
+device_register(device_t dev, void *aux)
{
- struct device *busdev = device_parent(dev);
+ device_t busdev = device_parent(dev);
int ofnode = 0;
/*
@@ -1115,7 +1113,7 @@
* Called back after autoconfiguration of a device is done
*/
void
-device_register_post_config(struct device *dev, void *aux)
+device_register_post_config(device_t dev, void *aux)
{
if (booted_device == NULL && device_is_a(dev, "sd")) {
struct scsipibus_attach_args *sa = aux;
@@ -1151,9 +1149,9 @@
}
static void
-copyprops(struct device *busdev, int node, prop_dictionary_t dict, int is_console)
+copyprops(device_t busdev, int node, prop_dictionary_t dict, int is_console)
{
- struct device *cntrlr;
+ device_t cntrlr;
prop_dictionary_t psycho;
paddr_t fbpa, mem_base = 0;
uint32_t temp, fboffset;
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: christos
Date: Thu Jun 2 00:24:24 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: auxio.c ebus.c ebus_mainbus.c ebusvar.h
psycho.c psychovar.h sab.c
Log Message:
split auxio, ebus, psycho, sab.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc64/dev/auxio.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/sparc64/dev/ebus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/dev/ebus_mainbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc64/dev/ebusvar.h
cvs rdiff -u -r1.106 -r1.107 src/sys/arch/sparc64/dev/psycho.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc64/dev/psychovar.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/sparc64/dev/sab.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/auxio.c
diff -u src/sys/arch/sparc64/dev/auxio.c:1.21 src/sys/arch/sparc64/dev/auxio.c:1.22
--- src/sys/arch/sparc64/dev/auxio.c:1.21 Sat Mar 12 06:43:38 2011
+++ src/sys/arch/sparc64/dev/auxio.c Wed Jun 1 20:24:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: auxio.c,v 1.21 2011/03/12 11:43:38 nakayama Exp $ */
+/* $NetBSD: auxio.c,v 1.22 2011/06/02 00:24:23 christos Exp $ */
/*
* Copyright (c) 2000, 2001 Matthew R. Green
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.21 2011/03/12 11:43:38 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.22 2011/06/02 00:24:23 christos Exp $");
#include "opt_auxio.h"
@@ -60,7 +60,7 @@
*/
struct auxio_softc {
- struct device sc_dev;
+ device_t sc_dev;
/* parent's tag */
bus_space_tag_t sc_tag;
@@ -81,15 +81,15 @@
#define AUXIO_ROM_NAME "auxio"
void auxio_attach_common(struct auxio_softc *);
-int auxio_ebus_match(struct device *, struct cfdata *, void *);
-void auxio_ebus_attach(struct device *, struct device *, void *);
-int auxio_sbus_match(struct device *, struct cfdata *, void *);
-void auxio_sbus_attach(struct device *, struct device *, void *);
+int auxio_ebus_match(device_t, cfdata_t, void *);
+void auxio_ebus_attach(device_t, device_t, void *);
+int auxio_sbus_match(device_t, cfdata_t, void *);
+void auxio_sbus_attach(device_t, device_t, void *);
-CFATTACH_DECL(auxio_ebus, sizeof(struct auxio_softc),
+CFATTACH_DECL_NEW(auxio_ebus, sizeof(struct auxio_softc),
auxio_ebus_match, auxio_ebus_attach, NULL, NULL);
-CFATTACH_DECL(auxio_sbus, sizeof(struct auxio_softc),
+CFATTACH_DECL_NEW(auxio_sbus, sizeof(struct auxio_softc),
auxio_sbus_match, auxio_sbus_attach, NULL, NULL);
extern struct cfdriver auxio_cd;
@@ -153,7 +153,7 @@
}
int
-auxio_ebus_match(struct device *parent, struct cfdata *cf, void *aux)
+auxio_ebus_match(device_t parent, cfdata_t cf, void *aux)
{
struct ebus_attach_args *ea = aux;
@@ -161,11 +161,12 @@
}
void
-auxio_ebus_attach(struct device *parent, struct device *self, void *aux)
+auxio_ebus_attach(device_t parent, device_t self, void *aux)
{
- struct auxio_softc *sc = (struct auxio_softc *)self;
+ struct auxio_softc *sc = device_private(self);
struct ebus_attach_args *ea = aux;
+ sc->sc_dev = self;
sc->sc_tag = ea->ea_bustag;
if (ea->ea_nreg < 1) {
@@ -212,19 +213,20 @@
}
int
-auxio_sbus_match(struct device *parent, struct cfdata *cf, void *aux)
+auxio_sbus_match(device_t parent, cfdata_t cf, void *aux)
{
struct sbus_attach_args *sa = aux;
- return (strcmp(AUXIO_ROM_NAME, sa->sa_name) == 0);
+ return strcmp(AUXIO_ROM_NAME, sa->sa_name) == 0;
}
void
-auxio_sbus_attach(struct device *parent, struct device *self, void *aux)
+auxio_sbus_attach(device_t parent, device_t self, void *aux)
{
- struct auxio_softc *sc = (struct auxio_softc *)self;
+ struct auxio_softc *sc = device_private(self);
struct sbus_attach_args *sa = aux;
+ sc->sc_dev = self;
sc->sc_tag = sa->sa_bustag;
if (sa->sa_nreg < 1) {
Index: src/sys/arch/sparc64/dev/ebus.c
diff -u src/sys/arch/sparc64/dev/ebus.c:1.56 src/sys/arch/sparc64/dev/ebus.c:1.57
--- src/sys/arch/sparc64/dev/ebus.c:1.56 Fri Mar 18 05:52:54 2011
+++ src/sys/arch/sparc64/dev/ebus.c Wed Jun 1 20:24:23 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ebus.c,v 1.56 2011/03/18 09:52:54 mrg Exp $ */
+/* $NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.56 2011/03/18 09:52:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.57 2011/06/02 00:24:23 christos Exp $");
#include "opt_ddb.h"
@@ -76,10 +76,10 @@
#include
#include
-int ebus_match(struct device *, struct cfdata *, void *);
-void ebus_attach(struct device *, struct device *, void *);
+int ebus_match(device_t, cfdata_t, void *);
+void ebus_attach(device_t, device_t, void *);
-CFATTACH_DECL(ebus, sizeof(struct ebus_softc),
+CFATTACH_DECL_NEW(ebus, sizeof(struct ebus_softc),
ebus_match, ebus_attach, NULL, NULL);
/*
@@ -91,7 +9
CVS commit: src/sys/dev
Module Name:src
Committed By: christos
Date: Thu Jun 2 00:23:28 UTC 2011
Modified Files:
src/sys/dev/ebus: cs4231_ebus.c
src/sys/dev/ic: ad1848var.h cs4231.c cs4231var.h
src/sys/dev/sbus: cs4231_sbus.c
Log Message:
split audiocs
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ebus/cs4231_ebus.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/ad1848var.h
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/cs4231.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/cs4231var.h
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/sbus/cs4231_sbus.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/ebus/cs4231_ebus.c
diff -u src/sys/dev/ebus/cs4231_ebus.c:1.33 src/sys/dev/ebus/cs4231_ebus.c:1.34
--- src/sys/dev/ebus/cs4231_ebus.c:1.33 Tue May 12 10:20:45 2009
+++ src/sys/dev/ebus/cs4231_ebus.c Wed Jun 1 20:23:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231_ebus.c,v 1.33 2009/05/12 14:20:45 cegger Exp $ */
+/* $NetBSD: cs4231_ebus.c,v 1.34 2011/06/02 00:23:28 christos Exp $ */
/*
* Copyright (c) 2002 Valeriy E. Ushakov
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.33 2009/05/12 14:20:45 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_ebus.c,v 1.34 2011/06/02 00:23:28 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_sparc_arch.h"
@@ -79,7 +79,7 @@
static int cs4231_ebus_pint(void *);
static int cs4231_ebus_rint(void *);
-CFATTACH_DECL(audiocs_ebus, sizeof(struct cs4231_ebus_softc),
+CFATTACH_DECL_NEW(audiocs_ebus, sizeof(struct cs4231_ebus_softc),
cs4231_ebus_match, cs4231_ebus_attach, NULL, NULL);
/* audio_hw_if methods specific to ebus DMA */
@@ -253,11 +253,11 @@
ea->ea_intr[i], IPL_SCHED,
cs4231_ebus_intr, ebsc);
- cs4231_common_attach(sc, bh);
+ cs4231_common_attach(sc, self, bh);
printf("\n");
/* XXX: todo: move to cs4231_common_attach, pass hw_if as arg? */
- audio_attach_mi(&audiocs_ebus_hw_if, sc, &sc->sc_ad1848.sc_dev);
+ audio_attach_mi(&audiocs_ebus_hw_if, sc, sc->sc_ad1848.sc_dev);
}
@@ -547,7 +547,7 @@
cs4231_ebus_regdump("audiointr", ebsc);
snprintb(bits, sizeof(bits), AD_R2_BITS, status);
- DPRINTF(("%s: status: %s\n", device_xname(&sc->sc_ad1848.sc_dev),
+ DPRINTF(("%s: status: %s\n", device_xname(sc->sc_ad1848.sc_dev),
bits));
#endif
@@ -557,7 +557,7 @@
reason = ad_read(&sc->sc_ad1848, CS_IRQ_STATUS);
snprintb(bits, sizeof(bits), CS_I24_BITS, reason);
- DPRINTF(("%s: i24: %s\n", device_xname(&sc->sc_ad1848.sc_dev),
+ DPRINTF(("%s: i24: %s\n", device_xname(sc->sc_ad1848.sc_dev),
bits));
#endif
/* clear interrupt from ad1848 */
Index: src/sys/dev/ic/ad1848var.h
diff -u src/sys/dev/ic/ad1848var.h:1.16 src/sys/dev/ic/ad1848var.h:1.17
--- src/sys/dev/ic/ad1848var.h:1.16 Mon Apr 28 16:23:48 2008
+++ src/sys/dev/ic/ad1848var.h Wed Jun 1 20:23:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ad1848var.h,v 1.16 2008/04/28 20:23:48 martin Exp $ */
+/* $NetBSD: ad1848var.h,v 1.17 2011/06/02 00:23:28 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -95,7 +95,7 @@
};
struct ad1848_softc {
- struct device sc_dev; /* base device */
+ device_t sc_dev; /* base device */
bus_space_tag_t sc_iot; /* tag */
bus_space_handle_t sc_ioh; /* handle */
Index: src/sys/dev/ic/cs4231.c
diff -u src/sys/dev/ic/cs4231.c:1.25 src/sys/dev/ic/cs4231.c:1.26
--- src/sys/dev/ic/cs4231.c:1.25 Fri Apr 16 14:59:12 2010
+++ src/sys/dev/ic/cs4231.c Wed Jun 1 20:23:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4231.c,v 1.25 2010/04/16 18:59:12 dyoung Exp $ */
+/* $NetBSD: cs4231.c,v 1.26 2011/06/02 00:23:28 christos Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.25 2010/04/16 18:59:12 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231.c,v 1.26 2011/06/02 00:23:28 christos Exp $");
#include "audio.h"
#if NAUDIO > 0
@@ -107,12 +107,14 @@
void
-cs4231_common_attach(struct cs4231_softc *sc, bus_space_handle_t ioh)
+cs4231_common_attach(struct cs4231_softc *sc, device_t self,
+bus_space_handle_t ioh)
{
char *buf;
int reg;
sc->sc_ad1848.parent = sc;
+ sc->sc_ad1848.sc_dev = self;
sc->sc_ad1848.sc_iot = sc->sc_bustag;
sc->sc_ad1848.sc_ioh = ioh;
sc->sc_ad1848.sc_readreg = cs4231_read;
@@ -123,23 +125,23 @@
evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR,
NULL,
- device_xname(&sc->sc_ad1848.sc_dev), "total");
+ device_xname(sc->sc_ad1848.sc_dev), "total");
evcnt_attach_dynamic(&sc->sc_playback.t_intrcnt, EVCNT_TYPE_INTR,
&sc->sc_intrcnt,
- device_xname(&sc->sc_ad1848.sc_dev), "playback");
+ device_xname(sc->sc_ad1848.sc_dev), "playback");
evcnt_attach_dynamic(&sc->sc_playback.t_ierrcnt, EVCNT_TYPE_INTR,
&sc->sc_intrcnt,
- device_xname(&sc->sc_ad1848.sc
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: mrg
Date: Thu Jun 2 00:16:22 UTC 2011
Modified Files:
src/sys/arch/sparc64/dev: com_ebus.c
Log Message:
also look for "FJSV,su" as found on PRIMEPOWER machines.
while here, copy some code from openbsd that should allow this to work
on the Fujitsu SPARC Enterprise Mx000 systems.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc64/dev/com_ebus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/dev/com_ebus.c
diff -u src/sys/arch/sparc64/dev/com_ebus.c:1.31 src/sys/arch/sparc64/dev/com_ebus.c:1.32
--- src/sys/arch/sparc64/dev/com_ebus.c:1.31 Tue Mar 15 11:22:18 2011
+++ src/sys/arch/sparc64/dev/com_ebus.c Thu Jun 2 00:16:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ebus.c,v 1.31 2011/03/15 11:22:18 mrg Exp $ */
+/* $NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.31 2011/03/15 11:22:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v 1.32 2011/06/02 00:16:22 mrg Exp $");
#include
#include
@@ -84,7 +84,8 @@
compat = prom_getpropstring(ea->ea_node, "compatible");
if (strcmp(compat, "su16550") == 0 ||
strcmp(compat, "su16552") == 0 ||
- strcmp(compat, "su") == 0) {
+ strcmp(compat, "su") == 0 ||
+ strcmp(compat, "FJSV,su") == 0) {
return (1);
}
}
@@ -109,6 +110,8 @@
bus_space_handle_t ioh;
bus_space_tag_t iot;
bus_addr_t iobase;
+ int node, port;
+ char buf[32];
sc->sc_dev = self;
iot = ea->ea_bustag;
@@ -145,9 +148,34 @@
kma.kmta_consdev = NULL;
- /* Figure out if we're the console. */
- com_is_input = (ea->ea_node == prom_instance_to_package(prom_stdin()));
- com_is_output = (ea->ea_node == prom_instance_to_package(prom_stdout()));
+ /*
+ * Figure out if we're the console.
+ *
+ * The Fujitsu SPARC Enterprise M4000/M5000/M8000/M9000 has a
+ * serial port on each I/O board and a pseudo console that is
+ * redirected to one of these serial ports. The board number
+ * of the serial port in question is encoded in the "tty-port#"
+ * property of the pseudo console, so we figure out what our
+ * board number is by walking up the device tree, and check
+ * for a match.
+ */
+ node = prom_instance_to_package(prom_stdin());
+ com_is_input = (ea->ea_node == node);
+ if (OF_getprop(node, "name", buf, sizeof(buf)) > 0 &&
+ strcmp(buf, "pseudo-console") == 0) {
+ port = prom_getpropint(node, "tty-port#", -1);
+ node = OF_parent(OF_parent(ea->ea_node));
+ com_is_input = (prom_getpropint(node, "board#", -2) == port);
+ }
+
+ node = prom_instance_to_package(prom_stdout());
+ com_is_output = (ea->ea_node == node);
+ if (OF_getprop(node, "name", buf, sizeof(buf)) > 0 &&
+ strcmp(buf, "pseudo-console") == 0) {
+ port = prom_getpropint(node, "tty-port#", -1);
+ node = OF_parent(OF_parent(ea->ea_node));
+ com_is_output = (prom_getpropint(node, "board#", -2) == port);
+ }
if (com_is_input || com_is_output) {
struct consdev *cn_orig;
@@ -178,6 +206,18 @@
cn_tab = cn_orig;
kma.kmta_consdev = cn_tab;
}
+
+ /*
+ * Apparently shoving too much data down the TX FIFO on the
+ * Fujitsu SPARC Enterprise M4000/M5000 causes a hardware
+ * fault. Avoid this issue by setting the FIFO depth to 1.
+ * This will effectively disable the TX FIFO, but will still
+ * enable the RX FIFO, which is what we really care about.
+ */
+ if (OF_getprop(ea->ea_node, "compatible", buf, sizeof(buf)) > 0 &&
+ strcmp(buf, "FJSV,su") == 0)
+ sc->sc_fifolen = 1;
+
/* Now attach the driver */
com_attach_subr(sc);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: mrg
Date: Wed Jun 1 23:41:04 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: machdep.c
Log Message:
convert stackdump() to look up symbols rather than dumping raw %pc values.
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.256 src/sys/arch/sparc64/sparc64/machdep.c:1.257
--- src/sys/arch/sparc64/sparc64/machdep.c:1.256 Fri Mar 4 22:25:29 2011
+++ src/sys/arch/sparc64/sparc64/machdep.c Wed Jun 1 23:41:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.256 2011/03/04 22:25:29 joerg Exp $ */
+/* $NetBSD: machdep.c,v 1.257 2011/06/01 23:41:04 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.256 2011/03/04 22:25:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.257 2011/06/01 23:41:04 mrg Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -103,6 +103,7 @@
#include
#include
#include
+#include
#include
@@ -131,6 +132,7 @@
#include
/* #include "fb.h" */
+#include "ksyms.h"
int bus_space_debug = 0; /* This may be used by macros elsewhere. */
#ifdef DEBUG
@@ -879,6 +881,31 @@
(unsigned long long)tf->tf_out[6],
(unsigned long long)tf->tf_out[7]);
}
+
+static void
+get_symbol_and_offset(const char **mod, const char **sym, vaddr_t *offset, vaddr_t pc)
+{
+ static char symbuf[256];
+ unsigned long symaddr;
+
+#if NKSYMS || defined(DDB) || defined(MODULAR)
+ if (ksyms_getname(mod, sym, pc,
+ KSYMS_CLOSEST|KSYMS_PROC|KSYMS_ANY) == 0) {
+ if (ksyms_getval(*mod, *sym, &symaddr,
+ KSYMS_CLOSEST|KSYMS_PROC|KSYMS_ANY) != 0)
+ goto failed;
+
+ *offset = (vaddr_t)(pc - symaddr);
+ return;
+ }
+#endif
+ failed:
+ snprintf(symbuf, sizeof symbuf, "%llx", (unsigned long long)pc);
+ *mod = "netbsd";
+ *sym = symbuf;
+ *offset = 0;
+}
+
/*
* get the fp and dump the stack as best we can. don't leave the
* current stack page
@@ -888,6 +915,8 @@
{
struct frame32 *fp = (struct frame32 *)getfp(), *sfp;
struct frame64 *fp64;
+ const char *mod, *sym;
+ vaddr_t offset;
sfp = fp;
printf("Frame pointer is at %p\n", fp);
@@ -896,8 +925,10 @@
if( ((long)fp) & 1 ) {
fp64 = (struct frame64*)(((char*)fp)+BIAS);
/* 64-bit frame */
- printf("%llx(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
- (unsigned long long)fp64->fr_pc,
+ get_symbol_and_offset(&mod, &sym, &offset, fp64->fr_pc);
+ printf(" %s:%s+%#llx(%llx, %llx, %llx, %llx, %llx, %llx, %llx) fp = %llx\n",
+ mod, sym,
+ (unsigned long long)offset,
(unsigned long long)fp64->fr_arg[0],
(unsigned long long)fp64->fr_arg[1],
(unsigned long long)fp64->fr_arg[2],
@@ -909,11 +940,19 @@
fp = (struct frame32 *)(u_long)fp64->fr_fp;
} else {
/* 32-bit frame */
- printf(" pc = %x args = (%x, %x, %x, %x, %x, %x, %x) fp = %x\n",
- fp->fr_pc, fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2],
- fp->fr_arg[3], fp->fr_arg[4], fp->fr_arg[5], fp->fr_arg[6],
+ get_symbol_and_offset(&mod, &sym, &offset, fp->fr_pc);
+ printf(" %s:%s+%#lx(%x, %x, %x, %x, %x, %x, %x) fp = %x\n",
+ mod, sym,
+ (unsigned long)offset,
+ fp->fr_arg[0],
+ fp->fr_arg[1],
+ fp->fr_arg[2],
+ fp->fr_arg[3],
+ fp->fr_arg[4],
+ fp->fr_arg[5],
+ fp->fr_arg[6],
fp->fr_fp);
- fp = (struct frame32*)(u_long)(u_short)fp->fr_fp;
+ fp = (struct frame32*)(u_long)fp->fr_fp;
}
}
}
CVS commit: src/sys/netinet6
Module Name:src Committed By: dyoung Date: Wed Jun 1 22:59:44 UTC 2011 Modified Files: src/sys/netinet6: ip6_input.c Log Message: Don't refer to extern tcbtable here, it is unused. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/netinet6/ip6_input.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/netinet6/ip6_input.c diff -u src/sys/netinet6/ip6_input.c:1.131 src/sys/netinet6/ip6_input.c:1.132 --- src/sys/netinet6/ip6_input.c:1.131 Tue May 24 18:07:11 2011 +++ src/sys/netinet6/ip6_input.c Wed Jun 1 22:59:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_input.c,v 1.131 2011/05/24 18:07:11 spz Exp $ */ +/* $NetBSD: ip6_input.c,v 1.132 2011/06/01 22:59:44 dyoung Exp $ */ /* $KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.131 2011/05/24 18:07:11 spz Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_input.c,v 1.132 2011/06/01 22:59:44 dyoung Exp $"); #include "opt_gateway.h" #include "opt_inet.h" @@ -138,8 +138,6 @@ #include -extern struct inpcbtable tcbtable; /* XXX include of tcp_var.h no good */ - extern struct domain inet6domain; u_char ip6_protox[IPPROTO_MAX];
CVS commit: src/usr.bin/ktrace
Module Name:src Committed By: wiz Date: Wed Jun 1 22:17:43 UTC 2011 Modified Files: src/usr.bin/ktrace: ktrace.1 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/usr.bin/ktrace/ktrace.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ktrace/ktrace.1 diff -u src/usr.bin/ktrace/ktrace.1:1.41 src/usr.bin/ktrace/ktrace.1:1.42 --- src/usr.bin/ktrace/ktrace.1:1.41 Wed Jun 1 21:28:33 2011 +++ src/usr.bin/ktrace/ktrace.1 Wed Jun 1 22:17:43 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: ktrace.1,v 1.41 2011/06/01 21:28:33 alnsn Exp $ +.\" $NetBSD: ktrace.1,v 1.42 2011/06/01 22:17:43 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)ktrace.1 8.1 (Berkeley) 6/6/93 .\" -.Dd April 27, 2011 +.Dd June 1, 2011 .Dt KTRACE 1 .Os .Sh NAME
CVS commit: src/usr.bin
Module Name:src
Committed By: alnsn
Date: Wed Jun 1 21:28:33 UTC 2011
Modified Files:
src/usr.bin/kdump: kdump.c
src/usr.bin/ktrace: ktrace.1 subr.c
Log Message:
kern/42030 - tracking of file descriptors by ktrace/kdump
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/usr.bin/kdump/kdump.c
cvs rdiff -u -r1.40 -r1.41 src/usr.bin/ktrace/ktrace.1
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/ktrace/subr.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/kdump/kdump.c
diff -u src/usr.bin/kdump/kdump.c:1.111 src/usr.bin/kdump/kdump.c:1.112
--- src/usr.bin/kdump/kdump.c:1.111 Wed Apr 27 00:00:47 2011
+++ src/usr.bin/kdump/kdump.c Wed Jun 1 21:28:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kdump.c,v 1.111 2011/04/27 00:00:47 joerg Exp $ */
+/* $NetBSD: kdump.c,v 1.112 2011/06/01 21:28:32 alnsn Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -39,12 +39,14 @@
#if 0
static char sccsid[] = "@(#)kdump.c 8.4 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: kdump.c,v 1.111 2011/04/27 00:00:47 joerg Exp $");
+__RCSID("$NetBSD: kdump.c,v 1.112 2011/06/01 21:28:32 alnsn Exp $");
#endif
#endif /* not lint */
#include
+#include /* XXX #include fails without this header */
#define _KERNEL
+#include
#include
#undef _KERNEL
#include
@@ -115,6 +117,7 @@
static void ktrcsw(struct ktr_csw *);
static void ktruser(struct ktr_user *, int);
static void ktrmib(int *, int);
+static void ktrexecfd(struct ktr_execfd *);
static void usage(void) __dead;
static void eprint(int);
static void rprint(register_t);
@@ -294,6 +297,9 @@
case KTR_EXEC_ENV:
visdump_buf(m, ktrlen, col);
break;
+ case KTR_EXEC_FD:
+ ktrexecfd(m);
+ break;
case KTR_MIB:
ktrmib(m, ktrlen);
break;
@@ -363,6 +369,9 @@
case KTR_EXEC_ARG:
type = "ARG";
break;
+ case KTR_EXEC_FD:
+ type = "FD";
+ break;
case KTR_SAUPCALL:
type = "SAU";
break;
@@ -632,6 +641,16 @@
}
static void
+ktrexecfd(struct ktr_execfd *ktr)
+{
+ static const char *dnames[] = { DTYPE_NAMES };
+ if (ktr->ktr_dtype < __arraycount(dnames))
+ printf("%s %d\n", dnames[ktr->ktr_dtype], ktr->ktr_fd);
+ else
+ printf("UNKNOWN(%u) %d\n", ktr->ktr_dtype, ktr->ktr_fd);
+}
+
+static void
rprint(register_t ret)
{
Index: src/usr.bin/ktrace/ktrace.1
diff -u src/usr.bin/ktrace/ktrace.1:1.40 src/usr.bin/ktrace/ktrace.1:1.41
--- src/usr.bin/ktrace/ktrace.1:1.40 Wed Apr 27 00:00:47 2011
+++ src/usr.bin/ktrace/ktrace.1 Wed Jun 1 21:28:33 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: ktrace.1,v 1.40 2011/04/27 00:00:47 joerg Exp $
+.\" $NetBSD: ktrace.1,v 1.41 2011/06/01 21:28:33 alnsn Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -181,6 +181,8 @@
trace system calls
.It Cm e
trace emulation changes
+.It Cm f
+trace open file descriptors after exec
.It Cm i
trace
.Tn I/O
Index: src/usr.bin/ktrace/subr.c
diff -u src/usr.bin/ktrace/subr.c:1.17 src/usr.bin/ktrace/subr.c:1.18
--- src/usr.bin/ktrace/subr.c:1.17 Wed Apr 27 00:00:47 2011
+++ src/usr.bin/ktrace/subr.c Wed Jun 1 21:28:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr.c,v 1.17 2011/04/27 00:00:47 joerg Exp $ */
+/* $NetBSD: subr.c,v 1.18 2011/06/01 21:28:33 alnsn Exp $ */
/*-
* Copyright (c) 1988, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)subr.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: subr.c,v 1.17 2011/04/27 00:00:47 joerg Exp $");
+__RCSID("$NetBSD: subr.c,v 1.18 2011/06/01 21:28:33 alnsn Exp $");
#endif
#endif /* not lint */
@@ -73,6 +73,9 @@
case 'e':
fac = KTRFAC_EMUL;
break;
+ case 'f':
+ fac = KTRFAC_EXEC_FD;
+ break;
case 'i':
fac = KTRFAC_GENIO;
break;
CVS commit: src/sys
Module Name:src
Committed By: alnsn
Date: Wed Jun 1 21:25:02 UTC 2011
Modified Files:
src/sys/kern: kern_exec.c kern_ktrace.c kern_stub.c subr_exec_fd.c
src/sys/sys: filedesc.h ktrace.h
Log Message:
kern/42030 - tracking of file descriptors by ktrace/kdump
To generate a diff of this commit:
cvs rdiff -u -r1.314 -r1.315 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.156 -r1.157 src/sys/kern/kern_ktrace.c
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/kern_stub.c
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/subr_exec_fd.c
cvs rdiff -u -r1.59 -r1.60 src/sys/sys/filedesc.h
cvs rdiff -u -r1.57 -r1.58 src/sys/sys/ktrace.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.314 src/sys/kern/kern_exec.c:1.315
--- src/sys/kern/kern_exec.c:1.314 Tue Apr 26 16:36:42 2011
+++ src/sys/kern/kern_exec.c Wed Jun 1 21:24:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.314 2011/04/26 16:36:42 joerg Exp $ */
+/* $NetBSD: kern_exec.c,v 1.315 2011/06/01 21:24:59 alnsn Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.314 2011/04/26 16:36:42 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.315 2011/06/01 21:24:59 alnsn Exp $");
#include "opt_ktrace.h"
#include "opt_modular.h"
@@ -979,6 +979,10 @@
cwdexec(p);
fd_closeexec(); /* handle close on exec */
+
+ if (__predict_false(ktrace_on))
+ fd_ktrexecfd();
+
execsigs(p); /* reset catched signals */
l->l_ctxlink = NULL; /* reset ucontext link */
Index: src/sys/kern/kern_ktrace.c
diff -u src/sys/kern/kern_ktrace.c:1.156 src/sys/kern/kern_ktrace.c:1.157
--- src/sys/kern/kern_ktrace.c:1.156 Wed Apr 27 00:00:46 2011
+++ src/sys/kern/kern_ktrace.c Wed Jun 1 21:25:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $ */
+/* $NetBSD: kern_ktrace.c,v 1.157 2011/06/01 21:25:00 alnsn Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.156 2011/04/27 00:00:46 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.157 2011/06/01 21:25:00 alnsn Exp $");
#include
#include
@@ -673,6 +673,25 @@
ktr_kmem(l, KTR_EXEC_ENV, bf, len);
}
+void
+ktr_execfd(int fd, u_int dtype)
+{
+ struct ktrace_entry *kte;
+ struct ktr_execfd* ktp;
+
+ lwp_t *l = curlwp;
+
+ if (!KTRPOINT(l->l_proc, KTR_EXEC_FD))
+ return;
+
+ if (ktealloc(&kte, (void *)&ktp, l, KTR_EXEC_FD, sizeof(*ktp)))
+ return;
+
+ ktp->ktr_fd = fd;
+ ktp->ktr_dtype = dtype;
+ ktraddentry(l, kte, KTA_WAITOK);
+}
+
static void
ktr_kmem(lwp_t *l, int type, const void *bf, size_t len)
{
Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.32 src/sys/kern/kern_stub.c:1.33
--- src/sys/kern/kern_stub.c:1.32 Tue May 31 23:28:53 2011
+++ src/sys/kern/kern_stub.c Wed Jun 1 21:25:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_stub.c,v 1.32 2011/05/31 23:28:53 dyoung Exp $ */
+/* $NetBSD: kern_stub.c,v 1.33 2011/06/01 21:25:01 alnsn Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.32 2011/05/31 23:28:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.33 2011/06/01 21:25:01 alnsn Exp $");
#include "opt_ptrace.h"
#include "opt_ktrace.h"
@@ -111,6 +111,7 @@
__weak_alias(ktr_mib,nullop);
__weak_alias(ktr_execarg,nullop);
__weak_alias(ktr_execenv,nullop);
+__weak_alias(ktr_execfd,nullop);
__weak_alias(sys_fktrace,sys_nosys); /* Syscalls */
__weak_alias(sys_ktrace,sys_nosys);
Index: src/sys/kern/subr_exec_fd.c
diff -u src/sys/kern/subr_exec_fd.c:1.5 src/sys/kern/subr_exec_fd.c:1.6
--- src/sys/kern/subr_exec_fd.c:1.5 Tue Feb 15 15:54:28 2011
+++ src/sys/kern/subr_exec_fd.c Wed Jun 1 21:25:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_exec_fd.c,v 1.5 2011/02/15 15:54:28 pooka Exp $ */
+/* $NetBSD: subr_exec_fd.c,v 1.6 2011/06/01 21:25:01 alnsn Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_exec_fd.c,v 1.5 2011/02/15 15:54:28 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_exec_fd.c,v 1.6 2011/06/01 21:25:01 alnsn Exp $");
#include
#include
@@ -36,6 +36,35 @@
#include
#include
#include
+#include
+
+void
+fd_ktrexecfd(void)
+{
+ proc_t *p;
+ filedesc_t *fdp;
+ fdfile_t *ff;
+ lwp_t *l;
+ fdtab_t *dt;
+ int fd;
+
+ l = curlwp;
+ p = l->l_proc;
+ fdp = p->p_fd;
+ dt = fdp->fd_dt;
+
+ for (fd = 0; fd <= fdp->fd_lastfile; fd++) {
+ if ((ff = dt->dt_ff[fd]) == NULL) {
+ KASSERT(fd >= NDFDFILE);
+ continue;
+ }
+ KASSERT(fd >= NDFDFILE ||
+ ff == (fdfile_t *)fdp->fd_dfdfile[fd]);
+ if (ff->ff_file == NULL)
+ continue;
+ ktr_execfd(fd, ff->ff_file->f_type);
+ }
+
CVS commit: src/share/man/man9
Module Name:src Committed By: dyoung Date: Wed Jun 1 20:49:22 UTC 2011 Modified Files: src/share/man/man9: pool_cache.9 Log Message: Describe the arguments to ctor and dtor. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man9/pool_cache.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/pool_cache.9 diff -u src/share/man/man9/pool_cache.9:1.17 src/share/man/man9/pool_cache.9:1.18 --- src/share/man/man9/pool_cache.9:1.17 Thu Dec 2 12:54:13 2010 +++ src/share/man/man9/pool_cache.9 Wed Jun 1 20:49:22 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: pool_cache.9,v 1.17 2010/12/02 12:54:13 wiz Exp $ +.\" $NetBSD: pool_cache.9,v 1.18 2011/06/01 20:49:22 dyoung Exp $ .\" .\" Copyright (c)2003 YAMAMOTO Takashi, .\" All rights reserved. @@ -53,7 +53,7 @@ .\" POSSIBILITY OF SUCH DAMAGE. .\" .\" -.Dd October 15, 2009 +.Dd June 1, 2011 .Dt POOL_CACHE 9 .Os .\" @@ -188,12 +188,23 @@ Specifies a constructor used to initialize newly allocated objects. If no constructor is required, specify .Dv NULL . +The first argument to +.Fa ctor +is +.Fa arg , +the second is the new object, and the third is +.Fa flags . .It Fa dtor .Pp Specifies a destructor used to destroy cached objects prior to their release to backing store. If no destructor is required, specify .Dv NULL . +The first argument to +.Fa dtor +is +.Fa arg , +and the second is the object. .It Fa arg .Pp This value of this argument will be passed to both the constructor
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: tron Date: Wed Jun 1 19:45:08 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add new test "syscall/t_poll". To generate a diff of this commit: cvs rdiff -u -r1.341 -r1.342 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.341 src/distrib/sets/lists/tests/mi:1.342 --- src/distrib/sets/lists/tests/mi:1.341 Mon May 30 18:14:11 2011 +++ src/distrib/sets/lists/tests/mi Wed Jun 1 19:45:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.341 2011/05/30 18:14:11 njoly Exp $ +# $NetBSD: mi,v 1.342 2011/06/01 19:45:08 tron Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -621,6 +621,7 @@ ./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_msync.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_nanosleep.debug tests-syscall-debug debug,atf +./usr/libdata/debug/usr/tests/syscall/t_poll.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_pollts.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_pselect.debug tests-syscall-debug debug,atf ./usr/libdata/debug/usr/tests/syscall/t_setrlimit.debug tests-syscall-debug debug,atf @@ -2326,6 +2327,7 @@ ./usr/tests/syscall/t_mprotect tests-syscall-tests atf ./usr/tests/syscall/t_msync tests-syscall-tests atf ./usr/tests/syscall/t_nanosleep tests-syscall-tests atf +./usr/tests/syscall/t_poll tests-syscall-tests atf ./usr/tests/syscall/t_pollts tests-syscall-tests atf ./usr/tests/syscall/t_pselect tests-syscall-tests atf ./usr/tests/syscall/t_setrlimit tests-syscall-tests atf
CVS commit: src/tests/syscall
Module Name:src
Committed By: tron
Date: Wed Jun 1 19:43:10 UTC 2011
Modified Files:
src/tests/syscall: Makefile
Added Files:
src/tests/syscall: t_poll.c
Log Message:
Add a regression test for poll(2) based on the test for pollts(2).
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_poll.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/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.28 src/tests/syscall/Makefile:1.29
--- src/tests/syscall/Makefile:1.28 Sat May 28 16:12:56 2011
+++ src/tests/syscall/Makefile Wed Jun 1 19:43:10 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/05/28 16:12:56 tron Exp $
+# $NetBSD: Makefile,v 1.29 2011/06/01 19:43:10 tron Exp $
.include
@@ -6,7 +6,7 @@
TESTS_C+= t_access t_cmsg t_dup t_fsync
TESTS_C+= t_getgroups t_getpid t_getrusage t_getsid t_gettimeofday
-TESTS_C+= t_itimer t_kill t_mmap t_mprotect t_msync t_nanosleep
+TESTS_C+= t_itimer t_kill t_mmap t_mprotect t_msync t_nanosleep t_poll
TESTS_C+= t_pollts t_pselect t_setrlimit t_setuid t_timer t_umask
LDADD.t_getpid+= -lpthread
Added files:
Index: src/tests/syscall/t_poll.c
diff -u /dev/null src/tests/syscall/t_poll.c:1.1
--- /dev/null Wed Jun 1 19:43:10 2011
+++ src/tests/syscall/t_poll.c Wed Jun 1 19:43:10 2011
@@ -0,0 +1,135 @@
+/* $NetBSD: t_poll.c,v 1.1 2011/06/01 19:43:10 tron Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matthias Scheler.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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
+#include
+#include
+#include
+#include
+
+#include
+
+ATF_TC(poll_basic);
+ATF_TC_HEAD(poll_basic, tc)
+{
+ atf_tc_set_md_var(tc, "timeout", "10");
+ atf_tc_set_md_var(tc, "descr",
+ "Basis functionality test for poll(2)");
+}
+
+ATF_TC_BODY(poll_basic, tc)
+{
+ int fds[2];
+ struct pollfd pfds[2];
+ int ret;
+
+ ATF_REQUIRE_EQ(pipe(fds), 0);
+
+ pfds[0].fd = fds[0];
+ pfds[0].events = POLLIN;
+ pfds[1].fd = fds[1];
+ pfds[1].events = POLLOUT;
+
+ /*
+ * Check that we get a timeout waiting for data on the read end
+ * of our pipe.
+ */
+ pfds[0].revents = -1;
+ pfds[1].revents = -1;
+ ATF_REQUIRE_EQ_MSG(ret = poll(&pfds[0], 1, 1), 0,
+ "got: %d", ret);
+ ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
+ ATF_REQUIRE_EQ_MSG(pfds[1].revents, -1, "got: %d", pfds[1].revents);
+
+ /* Check that the write end of the pipe as reported as ready. */
+ pfds[0].revents = -1;
+ pfds[1].revents = -1;
+ ATF_REQUIRE_EQ_MSG(ret = poll(&pfds[1], 1, 1), 1,
+ "got: %d", ret);
+ ATF_REQUIRE_EQ_MSG(pfds[0].revents, -1, "got: %d", pfds[0].revents);
+ ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",\
+ pfds[1].revents);
+
+ /* Check that only the write end of the pipe as reported as ready. */
+ pfds[0].revents = -1;
+ pfds[1].revents = -1;
+ ATF_REQUIRE_EQ_MSG(ret = poll(pfds, 2, 1), 1,
+ "got: %d", ret);
+ ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
+ ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
+ pfds[1].revents);
+
+ /* Write data to our pipe. */
+ ATF_REQUIRE_EQ(write(fds[1], "", 1), 1);
+
+ /* Check that both ends of our pipe are reported as ready. */
+ pfds[0].revents = -1;
+ pfds[1].revents = -1;
+ ATF_REQUIRE_EQ_MSG(ret = poll(pfds, 2, 1), 2,
+ "got: %d", ret);
+ ATF_REQUIRE_EQ_MSG(pfds[0].revents, POLLIN, "got: %d",
+ pfds[0].revents);
+ ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
+ p
CVS commit: src/tests/syscall
Module Name:src Committed By: tron Date: Wed Jun 1 19:32:51 UTC 2011 Modified Files: src/tests/syscall: t_pollts.c Log Message: pollts(2) is supposed to return -1 in particular and not a random non-zero value in case of an error. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/syscall/t_pollts.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/syscall/t_pollts.c diff -u src/tests/syscall/t_pollts.c:1.3 src/tests/syscall/t_pollts.c:1.4 --- src/tests/syscall/t_pollts.c:1.3 Wed Jun 1 03:39:45 2011 +++ src/tests/syscall/t_pollts.c Wed Jun 1 19:32:50 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: t_pollts.c,v 1.3 2011/06/01 03:39:45 jruoho Exp $ */ +/* $NetBSD: t_pollts.c,v 1.4 2011/06/01 19:32:50 tron Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -131,13 +131,13 @@ timeout.tv_nsec = 0; errno = 0; - ATF_REQUIRE_ERRNO(EFAULT, pollts((void *)-1, 1, &timeout, NULL) != 0); + ATF_REQUIRE_ERRNO(EFAULT, pollts((void *)-1, 1, &timeout, NULL) == -1); timeout.tv_sec = -1; timeout.tv_nsec = -1; errno = 0; - ATF_REQUIRE_ERRNO(EINVAL, pollts(&pfd, 1, &timeout, NULL) != 0); + ATF_REQUIRE_ERRNO(EINVAL, pollts(&pfd, 1, &timeout, NULL) == -1); } ATF_TC(pollts_sigmask);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: macallan
Date: Wed Jun 1 16:00:10 UTC 2011
Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c
Log Message:
allow display devices to work if they have been set up by OF even of they're
not the firmware console. While there get rid of some more code carried over
from macppc that doesn't work on sparc64 and consistently use node vs.
console_node.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/arch/sparc64/sparc64/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.178 src/sys/arch/sparc64/sparc64/autoconf.c:1.179
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.178 Tue May 24 10:08:03 2011
+++ src/sys/arch/sparc64/sparc64/autoconf.c Wed Jun 1 16:00:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.178 2011/05/24 10:08:03 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.179 2011/06/01 16:00:10 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.178 2011/05/24 10:08:03 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.179 2011/06/01 16:00:10 macallan Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -190,7 +190,7 @@
int console_node, console_instance;
struct genfb_colormap_callback gfb_cb;
static void of_set_palette(void *, int, int, int, int);
-static void copyprops(struct device *busdev, int, prop_dictionary_t);
+static void copyprops(struct device *busdev, int, prop_dictionary_t, int);
static void
get_ncpus(void)
@@ -1079,12 +1079,13 @@
console = true;
}
}
-
+
+ copyprops(busdev, ofnode, dict, console);
+
if (console) {
uint64_t cmap_cb;
prop_dictionary_set_uint32(dict,
"instance_handle", console_instance);
- copyprops(busdev, console_node, dict);
gfb_cb.gcc_cookie =
(void *)(intptr_t)console_instance;
@@ -1093,6 +1094,20 @@
prop_dictionary_set_uint64(dict,
"cmap_callback", cmap_cb);
}
+#ifdef notyet
+ else {
+ int width;
+
+ /*
+ * the idea is to 'open' display devices with no useful
+ * properties, in the hope that the firmware will
+ * properly initialize them and we can run things like
+ * genfb on them
+ */
+ if (OF_getprop(node, "width", &width, sizeof(width))
+ != 4) {
+instance = OF_open(name);
+#endif
}
}
@@ -1136,7 +1151,7 @@
}
static void
-copyprops(struct device *busdev, int node, prop_dictionary_t dict)
+copyprops(struct device *busdev, int node, prop_dictionary_t dict, int is_console)
{
struct device *cntrlr;
prop_dictionary_t psycho;
@@ -1153,21 +1168,15 @@
prop_dictionary_get_uint64(psycho, "mem_base", &mem_base);
}
- prop_dictionary_set_bool(dict, "is_console", 1);
- if (!of_to_uint32_prop(dict, node, "width", "width")) {
-
- OF_interpret("screen-width", 0, 1, &temp);
- prop_dictionary_set_uint32(dict, "width", temp);
- }
- if (!of_to_uint32_prop(dict, console_node, "height", "height")) {
+ if (is_console)
+ prop_dictionary_set_bool(dict, "is_console", 1);
- OF_interpret("screen-height", 0, 1, &temp);
- prop_dictionary_set_uint32(dict, "height", temp);
- }
- of_to_uint32_prop(dict, console_node, "linebytes", "linebytes");
- if (!of_to_uint32_prop(dict, console_node, "depth", "depth") &&
+ of_to_uint32_prop(dict, node, "width", "width");
+ of_to_uint32_prop(dict, node, "height", "height");
+ of_to_uint32_prop(dict, node, "linebytes", "linebytes");
+ if (!of_to_uint32_prop(dict, node, "depth", "depth") &&
/* Some cards have an extra space in the property name */
- !of_to_uint32_prop(dict, console_node, "depth ", "depth")) {
+ !of_to_uint32_prop(dict, node, "depth ", "depth")) {
/*
* XXX we should check linebytes vs. width but those
* FBs that don't have a depth property ( /chaos/control... )
@@ -1175,7 +1184,8 @@
*/
prop_dictionary_set_uint32(dict, "depth", 8);
}
- OF_getprop(console_node, "address", &fbaddr, sizeof(fbaddr));
+
+ OF_getprop(node, "address", &fbaddr, sizeof(fbaddr));
if (fbaddr != 0) {
pmap_extract(pmap_kernel(), fbaddr, &fbpa);
@@ -1190,22 +1200,28 @@
fboffset = (uint32_t)(fbpa - mem_base);
prop_dictionary_set_uint32(dict, "address", fboffset);
}
- if (!of_to_dataprop(dict, console_node, "EDID", "EDID"))
- of_to_dataprop(dict, console_node, "edid", "EDID");
+
+ if (!of_to_dataprop(dict, node, "EDID", "EDID"))
+ of_to_dataprop(dict, node, "edid", "EDID");
temp = 0;
- if (OF_getprop(console_node, "ATY,RefCLK", &temp, sizeof(temp)) != 4) {
+ if (OF_getprop(node, "ATY,RefCLK", &temp, sizeof(temp)) != 4) {
- OF_getprop(OF_parent(console_node), "ATY,RefCLK", &temp,
+ OF_getprop(OF_parent(node), "ATY,RefCLK", &temp,
sizeof(temp));
}
if (temp != 0)
prop_dictionary_set_uint32(dict, "refclk", temp / 10);
+
/*
* finally, let'
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: manu
Date: Wed Jun 1 15:54:10 UTC 2011
Modified Files:
src/lib/libperfuse: ops.c
Log Message:
Fix race conditions between write and getattr/setattr, which lead to
inconsitencies between kernel and filesystem idea of file size during
writes with IO_APPEND.
At mine, this resulted in a configure script producing config.status
with ": clr\n" lines stripped (not 100% reproductible, but always this
specific string. That is of little interest except for my own future
reference).
When a write is in progress, getattr/setattr get/set the maximum size
among kernel idea (grown by write) and filesystem idea (not yet grown).
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.29 src/lib/libperfuse/ops.c:1.30
--- src/lib/libperfuse/ops.c:1.29 Wed Jun 1 07:57:24 2011
+++ src/lib/libperfuse/ops.c Wed Jun 1 15:54:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.29 2011/06/01 07:57:24 manu Exp $ */
+/* $NetBSD: ops.c,v 1.30 2011/06/01 15:54:10 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -1439,12 +1439,14 @@
struct perfuse_state *ps;
struct fuse_getattr_in *fgi;
struct fuse_attr_out *fao;
+ u_quad_t va_size;
int error;
if (PERFUSE_NODE_DATA(opc)->pnd_flags & PND_REMOVED)
return ENOENT;
ps = puffs_getspecific(pu);
+ va_size = vap->va_size;
/*
* FUSE_GETATTR_FH must be set in fgi->flags
@@ -1476,6 +1478,13 @@
*/
fuse_attr_to_vap(ps, vap, &fao->attr);
+ /*
+ * If a write is in progress, do not trust filesystem opinion
+ * of file size, use the one from kernel.
+ */
+ if ((PERFUSE_NODE_DATA(opc)->pnd_flags & PND_INWRITE) &&
+ (va_size != (u_quad_t)PUFFS_VNOVAL))
+ vap->va_size = MAX(va_size, vap->va_size);;
out:
ps->ps_destroy_msg(pm);
@@ -1496,6 +1505,7 @@
struct fuse_setattr_in *fsi;
struct fuse_attr_out *fao;
struct vattr *old_va;
+ u_quad_t va_size;
int error;
ps = puffs_getspecific(pu);
@@ -1552,13 +1562,14 @@
return EACCES;
/*
- * It seems troublesome to resize a file while
- * a write is just beeing done. Wait for
- * it to finish.
- */
- if (vap->va_size != (u_quad_t)PUFFS_VNOVAL)
- while (pnd->pnd_flags & PND_INWRITE)
- requeue_request(pu, opc, PCQ_AFTERWRITE);
+ * If a write is in progress, set the highest
+ * value in the filesystem, otherwise we break
+ * IO_APPEND.
+ */
+ va_size = vap->va_size;
+ if ((pnd->pnd_flags & PND_INWRITE) &&
+ (va_size != (u_quad_t)PUFFS_VNOVAL))
+ va_size = MAX(va_size, old_va->va_size);
pm = ps->ps_new_msg(pu, opc, FUSE_SETATTR, sizeof(*fsi), pcr);
fsi = GET_INPAYLOAD(ps, pm, fuse_setattr_in);
@@ -1573,8 +1584,8 @@
fsi->valid |= FUSE_FATTR_FH;
}
- if (vap->va_size != (u_quad_t)PUFFS_VNOVAL) {
- fsi->size = vap->va_size;
+ if (va_size != (u_quad_t)PUFFS_VNOVAL) {
+ fsi->size = va_size;
fsi->valid |= FUSE_FATTR_SIZE;
}
CVS commit: src/external/bsd/mdocml/dist
Module Name:src Committed By: hans Date: Wed Jun 1 15:52:49 UTC 2011 Modified Files: src/external/bsd/mdocml/dist: read.c Log Message: include config.h To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/mdocml/dist/read.c 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/mdocml/dist/read.c diff -u src/external/bsd/mdocml/dist/read.c:1.1.1.1 src/external/bsd/mdocml/dist/read.c:1.2 --- src/external/bsd/mdocml/dist/read.c:1.1.1.1 Fri Apr 15 13:45:30 2011 +++ src/external/bsd/mdocml/dist/read.c Wed Jun 1 15:52:48 2011 @@ -15,6 +15,10 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include #include
CVS commit: othersrc/external/bsd/gensetlist
Module Name:othersrc
Committed By: agc
Date: Wed Jun 1 15:02:12 UTC 2011
Modified Files:
othersrc/external/bsd/gensetlist: bsd.setlist.mk gensetlist.c
Log Message:
Recognise LINKS definitions in Makefiles, and generate the appropriate
set list entries, so that "make setlist" in src/usr.bin/cksum, for
example, DTRT:
% pwd
/usr/src/usr.bin/cksum
% make setlist
[src/distrib/sets/lists/base/mi]
./usr/bin/cksum base-cksum-bin
./usr/bin/sum base-cksum-bin
./usr/bin/md2 base-cksum-bin
./usr/bin/md4 base-cksum-bin
./usr/bin/md5 base-cksum-bin
./usr/bin/sha1 base-cksum-bin
./usr/bin/rmd160base-cksum-bin
...
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/gensetlist/bsd.setlist.mk
cvs rdiff -u -r1.7 -r1.8 othersrc/external/bsd/gensetlist/gensetlist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/gensetlist/bsd.setlist.mk
diff -u othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.6 othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.7
--- othersrc/external/bsd/gensetlist/bsd.setlist.mk:1.6 Mon May 30 03:49:56 2011
+++ othersrc/external/bsd/gensetlist/bsd.setlist.mk Wed Jun 1 15:02:11 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.setlist.mk,v 1.6 2011/05/30 03:49:56 agc Exp $
+# $NetBSD: bsd.setlist.mk,v 1.7 2011/06/01 15:02:11 agc Exp $
# Copyright (c) 2010,2011 Alistair Crooks
# All rights reserved.
@@ -54,6 +54,10 @@
GENSETLIST_ARGS+=-v SCRIPTSDIR=${SCRIPTSDIR:Q}
.endif
+.if defined(LINKS)
+GENSETLIST_ARGS+=-v LINKS=${LINKS:Q}
+.endif
+
.if defined(MLINKS)
GENSETLIST_ARGS+=-v MLINKS=${MLINKS:Q}
.endif
Index: othersrc/external/bsd/gensetlist/gensetlist.c
diff -u othersrc/external/bsd/gensetlist/gensetlist.c:1.7 othersrc/external/bsd/gensetlist/gensetlist.c:1.8
--- othersrc/external/bsd/gensetlist/gensetlist.c:1.7 Mon May 30 03:48:36 2011
+++ othersrc/external/bsd/gensetlist/gensetlist.c Wed Jun 1 15:02:11 2011
@@ -50,6 +50,8 @@
int incc; /* # of headers */
char *defs[MAX_DEFS]; /* definitions */
int defc; /* # of definitions */
+ char *mlinks[MAX_LINKS]; /* man page hard links */
+ int mlinkc; /* # of links */
char *links[MAX_LINKS]; /* hard links */
int linkc; /* # of links */
char *symlinks[MAX_LINKS]; /* symbolic links */
@@ -120,6 +122,7 @@
static regex_t mandir;
static regex_t sub;
static regex_t mlinks;
+ static regex_t links;
static regex_t shlib;
static regex_t incs;
static regex_t prog;
@@ -145,6 +148,8 @@
(void) regcomp(&sub, "^[ \t]*([^ \t]+)", REG_EXTENDED);
(void) regcomp(&prog, "^[ \t]*PROG[ \t]*=[ \t]*([^ \t]+)",
REG_EXTENDED);
+ (void) regcomp(&links, "^[ \t]*LINKS[ \t]*=",
+REG_EXTENDED);
(void) regcomp(&bindir, "^[ \t]*BINDIR[ \t]*=[ \t]*([^ \t]+)",
REG_EXTENDED);
(void) regcomp(&mandir, "^[ \t]*MANDIR[ \t]*=[ \t]*([^ \t]+)",
@@ -248,6 +253,17 @@
for (cp = &in[(int)matches[0].rm_eo] ;
regexec(&sublinks, cp, 10, matches, 0) == 0 ;
cp += matches[0].rm_eo) {
+ (void) asprintf(&vars->mlinks[vars->mlinkc++],
+"%.*s",
+(int)(matches[2].rm_eo - matches[2].rm_so),
+&cp[(int)matches[2].rm_so]);
+ }
+ return 1;
+ }
+ if (regexec(&links, in, 10, matches, 0) == 0) {
+ for (cp = &in[(int)matches[0].rm_eo] ;
+ regexec(&sublinks, cp, 10, matches, 0) == 0 ;
+ cp += matches[0].rm_eo) {
(void) asprintf(&vars->links[vars->linkc++],
"%.*s",
(int)(matches[2].rm_eo - matches[2].rm_so),
@@ -406,6 +422,12 @@
vars.bindir, vars.progname, vars.category,
pdefs(&vars, buf, sizeof(buf), NULL));
}
+ /* binary links */
+ for (i = 0 ; i < vars.linkc ; i++) {
+ printf(".%s\t\tbase-%s-bin\t%s\n",
+ vars.links[i], vars.category,
+ pdefs(&vars, buf, sizeof(buf), NULL));
+ }
/* scripts */
for (i = 0 ; i < vars.scriptc ; i++) {
printf(".%s/%s\t\tbase-%s-bin\t%s\n",
@@ -460,23 +482,23 @@
pdefs(&vars, buf, sizeof(buf), ".man"));
}
/* man page links */
- for (i = 0 ; i < vars.linkc ; i++) {
+ for (i = 0 ; i < vars.mlinkc ; i++) {
printf(".%s/cat%c/%.*s.0\t\tcomp-%s-catman\t\t%s\n",
vars.mandir,
- vars.links[i][strlen(vars.links[i]) - 1],
- (int)strlen(vars.links[i]) - 2,
- vars.links[i], vars.category,
+ vars.mlinks[i][strlen(vars.mlinks[i]) - 1],
+ (int)strlen(vars.mlinks[i]) - 2,
+ vars.mlinks[i], vars.category,
pdefs(&vars, buf, sizeof(buf), ".cat"));
printf(".%s/html%c/%.*s.html\t\tcomp-%s-htmlman\t\t%s\n",
vars.mandir,
- vars.links[i][strlen(vars.links[i]) - 1],
- (int)strlen(vars.links[i]) - 2,
- vars.links[i], vars.category,
+ vars.mlinks[i][strlen(vars.mlinks[i]) - 1],
+ (int)strlen(vars.mlinks[i]) - 2,
+ vars.mlinks[i], vars.category,
pdefs(&vars, buf, sizeof(buf), ".html"));
printf(".%s/man%c/%s\t\tcomp-%s-man\t\t%s\n",
vars.mandir,
- vars.links[i][strlen(
CVS commit: src/external/bsd/llvm
Module Name:src
Committed By: joerg
Date: Wed Jun 1 14:13:42 UTC 2011
Modified Files:
src/external/bsd/llvm: Makefile.inc tablegen.mk
src/external/bsd/llvm/lib/libLLVMAsmPrinter: Makefile
src/external/bsd/llvm/lib/libLLVMCore: Makefile
src/external/bsd/llvm/lib/libLLVMJIT: Makefile
src/external/bsd/llvm/lib/libLLVMMC: Makefile
src/external/bsd/llvm/lib/libLLVMMCJIT: Makefile
src/external/bsd/llvm/lib/libclangTooling: Makefile
Log Message:
Update LLVM/Clang to r132395. This brings the usual set of improvements
and support for dependency tracking in tblgen. Use this to make updates
more robust.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/tablegen.mk
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/llvm/lib/libLLVMCore/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libLLVMJIT/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMMC/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/llvm/lib/libLLVMMCJIT/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/libclangTooling/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/llvm/Makefile.inc
diff -u src/external/bsd/llvm/Makefile.inc:1.9 src/external/bsd/llvm/Makefile.inc:1.10
--- src/external/bsd/llvm/Makefile.inc:1.9 Fri May 20 13:40:04 2011
+++ src/external/bsd/llvm/Makefile.inc Wed Jun 1 14:13:41 2011
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.inc,v 1.9 2011/05/20 13:40:04 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.10 2011/06/01 14:13:41 joerg Exp $
.if !defined(LLVM_TOPLEVEL_MK)
LLVM_TOPLEVEL_MK=
.include
-LLVM_REVISION= 131689
-CLANG_REVISION= 131689
+LLVM_REVISION= 132395
+CLANG_REVISION= 132395
LLVM_SRCDIR:= ${.PARSEDIR}/dist/llvm
CLANG_SRCDIR:= ${.PARSEDIR}/dist/clang
Index: src/external/bsd/llvm/tablegen.mk
diff -u src/external/bsd/llvm/tablegen.mk:1.1 src/external/bsd/llvm/tablegen.mk:1.2
--- src/external/bsd/llvm/tablegen.mk:1.1 Sun Feb 6 01:13:43 2011
+++ src/external/bsd/llvm/tablegen.mk Wed Jun 1 14:13:41 2011
@@ -1,15 +1,19 @@
-# $NetBSD: tablegen.mk,v 1.1 2011/02/06 01:13:43 joerg Exp $
+# $NetBSD: tablegen.mk,v 1.2 2011/06/01 14:13:41 joerg Exp $
.include
.for t in ${TABLEGEN_SRC}
.for f in ${TABLEGEN_OUTPUT} ${TABLEGEN_OUTPUT.${t}}
-${f:C,\|.*$,,}: ${t}
+${f:C,\|.*$,,}: ${t} ${TOOL_TBLGEN}
[ -z "${f:C,\|.*$,,}" ] || mkdir -p ${f:C,\|.*$,,:H}
${TOOL_TBLGEN} -I${LLVM_SRCDIR}/include ${TABLEGEN_INCLUDES} \
${TABLEGEN_INCLUDES.${t}} ${f:C,^.*\|,,:C,\^, ,} \
- ${.ALLSRC:M*/${t}} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+ ${.ALLSRC:M*/${t}} -d ${.TARGET}.d.tmp -o ${.TARGET}.tmp \
+ && mv ${.TARGET}.tmp ${.TARGET} && \
+ mv ${.TARGET}.d.tmp ${.TARGET}.d
DPSRCS+= ${f:C,\|.*$,,}
-CLEANFILES+= ${f:C,\|.*$,,}
+CLEANFILES+= ${f:C,\|.*$,,} ${f:C,\|.*$,,:C,$,.d,}
+
+.sinclude "${f:C,\|.*$,,:C,$,.d,}"
.endfor
.endfor
Index: src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.4 src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.5
--- src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile:1.4 Mon May 16 19:27:48 2011
+++ src/external/bsd/llvm/lib/libLLVMAsmPrinter/Makefile Wed Jun 1 14:13:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/05/16 19:27:48 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2011/06/01 14:13:42 joerg Exp $
LIB= LLVMAsmPrinter
@@ -15,7 +15,8 @@
DwarfCompileUnit.cpp \
DwarfDebug.cpp \
DwarfException.cpp \
- OcamlGCPrinter.cpp
+ OcamlGCPrinter.cpp \
+ Win64Exception.cpp
.if defined(HOSTLIB)
.include
Index: src/external/bsd/llvm/lib/libLLVMCore/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMCore/Makefile:1.3 src/external/bsd/llvm/lib/libLLVMCore/Makefile:1.4
--- src/external/bsd/llvm/lib/libLLVMCore/Makefile:1.3 Thu May 19 21:06:02 2011
+++ src/external/bsd/llvm/lib/libLLVMCore/Makefile Wed Jun 1 14:13:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/19 21:06:02 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2011/06/01 14:13:42 joerg Exp $
LIB= LLVMCore
@@ -33,7 +33,6 @@
PassManager.cpp \
PassRegistry.cpp \
PrintModulePass.cpp \
- StandardPasses.cpp \
Type.cpp \
TypeSymbolTable.cpp \
Use.cpp \
Index: src/external/bsd/llvm/lib/libLLVMJIT/Makefile
diff -u src/external/bsd/llvm/lib/libLLVMJIT/Makefile:1.1 src/external/bsd/llvm/lib/libLLVMJIT/Makefile:1.2
--- src/external/bsd/llvm/lib/libLLVMJIT/Makefile:1.1 Sun Feb 6 01:13:58 2011
+++ src/external/bsd/llvm/lib/libLLVMJIT/Makefile Wed Jun 1 14:13:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/02/06 01:13:58 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/01 14:13:42 joerg Exp $
LIB= LLVMJIT
@@ -14,7 +14,6 @@
JITDwarfEmitter.cpp \
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: njoly
Date: Wed Jun 1 13:58:51 UTC 2011
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen for Chipsbank vendor id.
To generate a diff of this commit:
cvs rdiff -u -r1.572 -r1.573 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.573 -r1.574 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.572 src/sys/dev/usb/usbdevs.h:1.573
--- src/sys/dev/usb/usbdevs.h:1.572 Thu Mar 10 00:12:51 2011
+++ src/sys/dev/usb/usbdevs.h Wed Jun 1 13:58:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.572 2011/03/10 00:12:51 scw Exp $ */
+/* $NetBSD: usbdevs.h,v 1.573 2011/06/01 13:58:51 njoly Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -66,6 +66,7 @@
*/
#define USB_VENDOR_EGALAX2 0x0123 /* eGalax, Inc. */
+#define USB_VENDOR_CHIPSBANK 0x0204 /* Chipsbank */
#define USB_VENDOR_AOX 0x03e8 /* AOX */
#define USB_VENDOR_ATMEL 0x03eb /* Atmel */
#define USB_VENDOR_MITSUMI 0x03ee /* Mitsumi */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.573 src/sys/dev/usb/usbdevs_data.h:1.574
--- src/sys/dev/usb/usbdevs_data.h:1.573 Thu Mar 10 00:12:51 2011
+++ src/sys/dev/usb/usbdevs_data.h Wed Jun 1 13:58:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.573 2011/03/10 00:12:51 scw Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.574 2011/06/01 13:58:51 njoly Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -43,6 +43,10 @@
"eGalax, Inc.",
},
{
+ USB_VENDOR_CHIPSBANK,
+ "Chipsbank",
+ },
+ {
USB_VENDOR_AOX,
"AOX",
},
@@ -2003,7 +2007,7 @@
"GNU Radio USRP",
},
};
-const int usb_nvendors = 491;
+const int usb_nvendors = 492;
const struct usb_product usb_products[] = {
{
CVS commit: src/sys/dev/usb
Module Name:src Committed By: njoly Date: Wed Jun 1 13:57:55 UTC 2011 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add Chipsbank vendor id. To generate a diff of this commit: cvs rdiff -u -r1.579 -r1.580 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.579 src/sys/dev/usb/usbdevs:1.580 --- src/sys/dev/usb/usbdevs:1.579 Thu Mar 10 00:11:59 2011 +++ src/sys/dev/usb/usbdevs Wed Jun 1 13:57:55 2011 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.579 2011/03/10 00:11:59 scw Exp $ +$NetBSD: usbdevs,v 1.580 2011/06/01 13:57:55 njoly Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -59,6 +59,7 @@ */ vendor EGALAX2 0x0123 eGalax, Inc. +vendor CHIPSBANK 0x0204 Chipsbank vendor AOX 0x03e8 AOX vendor ATMEL 0x03eb Atmel vendor MITSUMI 0x03ee Mitsumi
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: tsutsui Date: Wed Jun 1 11:43:56 UTC 2011 Removed Files: src/sys/arch/sparc/stand/ofwboot: md5.h Log Message: Remove unused header. To generate a diff of this commit: cvs rdiff -u -r1.5 -r0 src/sys/arch/sparc/stand/ofwboot/md5.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: tsutsui Date: Wed Jun 1 11:43:12 UTC 2011 Modified Files: src/sys/arch/sparc/stand/ofwboot: boot.h Log Message: - remove extern from function declarations - some KNF To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/stand/ofwboot/boot.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/sparc/stand/ofwboot/boot.h diff -u src/sys/arch/sparc/stand/ofwboot/boot.h:1.8 src/sys/arch/sparc/stand/ofwboot/boot.h:1.9 --- src/sys/arch/sparc/stand/ofwboot/boot.h:1.8 Thu May 19 15:18:29 2011 +++ src/sys/arch/sparc/stand/ofwboot/boot.h Wed Jun 1 11:43:12 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: boot.h,v 1.8 2011/05/19 15:18:29 hauke Exp $ */ +/* $NetBSD: boot.h,v 1.9 2011/06/01 11:43:12 tsutsui Exp $ */ /*- * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -44,29 +44,29 @@ extern const char bootprog_name[]; /* bootinfo.c */ -extern u_long bi_init(u_long); -extern void bi_add(void *, int, size_t); +u_long bi_init(u_long); +void bi_add(void *, int, size_t); /* sparc64.c */ -extern ssize_t sparc64_read(int, void *, size_t); -extern void* sparc64_memcpy(void *, const void *, size_t); -extern void* sparc64_memset(void *, int, size_t); -extern void sparc64_bi_add(void); -extern void sparc64_finalize_tlb(u_long); +ssize_t sparc64_read(int, void *, size_t); +void *sparc64_memcpy(void *, const void *, size_t); +void *sparc64_memset(void *, int, size_t); +void sparc64_bi_add(void); +void sparc64_finalize_tlb(u_long); /* srt0.s */ -extern u_int get_cpuid(void); +u_int get_cpuid(void); /* loadfile_machdep.c */ #define LOADFILE_NOP_ALLOCATOR 0x0 #define LOADFILE_OFW_ALLOCATOR 0x1 #define LOADFILE_MMU_ALLOCATOR 0x2 -extern void loadfile_set_allocator(int); +void loadfile_set_allocator(int); /* alloc.c */ -extern void freeall(void); +void freeall(void); /* ofdev.c */ -char *filename(char*, char*); +char *filename(char *, char *); #endif /* _BOOT_H_ */
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: tsutsui Date: Wed Jun 1 11:42:18 UTC 2011 Modified Files: src/sys/arch/sparc/stand/ofwboot: ofdev.c Log Message: Fix harmless merge botch. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/stand/ofwboot/ofdev.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/sparc/stand/ofwboot/ofdev.c diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.31 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.32 --- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.31 Sat May 21 16:32:00 2011 +++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Wed Jun 1 11:42:18 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ofdev.c,v 1.31 2011/05/21 16:32:00 nakayama Exp $ */ +/* $NetBSD: ofdev.c,v 1.32 2011/06/01 11:42:18 tsutsui Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -55,7 +55,6 @@ #include #include "ofdev.h" -#include "net.h" #include "boot.h" #include "net.h"
CVS commit: src/share/man/man9
Module Name:src Committed By: jruoho Date: Wed Jun 1 11:19:19 UTC 2011 Modified Files: src/share/man/man9: roundup.9 Log Message: Fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man9/roundup.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/roundup.9 diff -u src/share/man/man9/roundup.9:1.7 src/share/man/man9/roundup.9:1.8 --- src/share/man/man9/roundup.9:1.7 Fri Apr 8 08:49:19 2011 +++ src/share/man/man9/roundup.9 Wed Jun 1 11:19:19 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: roundup.9,v 1.7 2011/04/08 08:49:19 wiz Exp $ +.\" $NetBSD: roundup.9,v 1.8 2011/06/01 11:19:19 jruoho Exp $ .\" .\" Copyright (c) 2010 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 8, 2011 +.Dd June 1, 2011 .Dt ROUNDUP 9 .Os .Sh NAME @@ -84,7 +84,7 @@ is 0. .Sh EXAMPLES The following example rounds the variable -.Va x +.Va rx to a 32-bit boundary: .Bd -literal -offset indent uint16_t rx;
CVS commit: src/share/man/man5
Module Name:src Committed By: jruoho Date: Wed Jun 1 11:10:59 UTC 2011 Modified Files: src/share/man/man5: daily.5 Log Message: Indent the two lists with the same width. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man5/daily.5 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/man5/daily.5 diff -u src/share/man/man5/daily.5:1.2 src/share/man/man5/daily.5:1.3 --- src/share/man/man5/daily.5:1.2 Tue May 3 16:25:19 2011 +++ src/share/man/man5/daily.5 Wed Jun 1 11:10:59 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: daily.5,v 1.2 2011/05/03 16:25:19 jruoho Exp $ +.\" $NetBSD: daily.5,v 1.3 2011/06/01 11:10:59 jruoho Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 3, 2011 +.Dd June 1, 2011 .Dt DAILY 5 .Os .Sh NAME @@ -145,7 +145,7 @@ .El .Pp The variables described below can be set to modify the tests: -.Bl -tag -width check_network +.Bl -tag -width fetch_pkg_vulnerabilities .It Sy find_core_ignore_fstypes Lists filesystem types to ignore during the .Sy find_core
CVS commit: src/share/man/man5
Module Name:src Committed By: jruoho Date: Wed Jun 1 11:06:36 UTC 2011 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Remove the previous, as it was already there. Instead, split one long paragraph and fix a typo. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/share/man/man5/rc.conf.5 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/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.149 src/share/man/man5/rc.conf.5:1.150 --- src/share/man/man5/rc.conf.5:1.149 Wed Jun 1 11:03:27 2011 +++ src/share/man/man5/rc.conf.5 Wed Jun 1 11:06:36 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.149 2011/06/01 11:03:27 jruoho Exp $ +.\" $NetBSD: rc.conf.5,v 1.150 2011/06/01 11:06:36 jruoho Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -587,17 +587,6 @@ .El .Ss Networking startup .Bl -tag -width net_interfaces -.It Sy bluetooth -Boolean value. -Enables necessary configuration for Bluetooth, -including automatic attachment of Bluetooth devices (see -.Xr btdevctl 8 ) -and serial controllers (see -.Xr btattach 8 ) , -enabling Bluetooth controllers (see -.Xr btconfig 8 ) , -and starting the service discovery daemon, -.Xr sdpd 8 . .It Sy altqd Boolean value. ALTQ configuration/monitoring daemon. @@ -826,7 +815,8 @@ variable contains a single line with embedded semicolons, then the value is split into multiple lines prior to further parsing, treating the semicolon as a line separator. -One common case it to set +.Pp +One common case is to set .Sy ifconfig_xxN Ns Li \&= Ns Qq dhcp , which will cause .Xr dhcpcd 8
CVS commit: src/share/man/man5
Module Name:src Committed By: jruoho Date: Wed Jun 1 11:03:28 UTC 2011 Modified Files: src/share/man/man5: rc.conf.5 Log Message: Note bluetooth. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/share/man/man5/rc.conf.5 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/man5/rc.conf.5 diff -u src/share/man/man5/rc.conf.5:1.148 src/share/man/man5/rc.conf.5:1.149 --- src/share/man/man5/rc.conf.5:1.148 Fri May 27 11:15:17 2011 +++ src/share/man/man5/rc.conf.5 Wed Jun 1 11:03:27 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: rc.conf.5,v 1.148 2011/05/27 11:15:17 wiz Exp $ +.\" $NetBSD: rc.conf.5,v 1.149 2011/06/01 11:03:27 jruoho Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -55,7 +55,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 27, 2011 +.Dd June 1, 2011 .Dt RC.CONF 5 .Os .Sh NAME @@ -587,6 +587,17 @@ .El .Ss Networking startup .Bl -tag -width net_interfaces +.It Sy bluetooth +Boolean value. +Enables necessary configuration for Bluetooth, +including automatic attachment of Bluetooth devices (see +.Xr btdevctl 8 ) +and serial controllers (see +.Xr btattach 8 ) , +enabling Bluetooth controllers (see +.Xr btconfig 8 ) , +and starting the service discovery daemon, +.Xr sdpd 8 . .It Sy altqd Boolean value. ALTQ configuration/monitoring daemon.
CVS commit: src/sbin/swapctl
Module Name:src Committed By: jruoho Date: Wed Jun 1 09:46:48 UTC 2011 Modified Files: src/sbin/swapctl: swapctl.8 Log Message: Clarify placement of commas. From Snader_LB on freenode/#netbsd-code. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sbin/swapctl/swapctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/swapctl/swapctl.8 diff -u src/sbin/swapctl/swapctl.8:1.41 src/sbin/swapctl/swapctl.8:1.42 --- src/sbin/swapctl/swapctl.8:1.41 Thu Sep 24 16:15:20 2009 +++ src/sbin/swapctl/swapctl.8 Wed Jun 1 09:46:48 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: swapctl.8,v 1.41 2009/09/24 16:15:20 apb Exp $ +.\" $NetBSD: swapctl.8,v 1.42 2011/06/01 09:46:48 jruoho Exp $ .\" .\" Copyright (c) 1997 Matthew R. Green .\" All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 24, 2009 +.Dd June 1, 2011 .Dt SWAPCTL 8 .Os .Sh NAME @@ -71,18 +71,18 @@ The .Nm program adds, removes, -lists and prioritizes swap devices and files for the system. +lists, and prioritizes swap devices and files for the system. The .Nm swapon program acts the same as the .Nm -program, as if called with the +program as if called with the .Fl a option, except if .Nm swapon itself is called with .Fl a -in which case, +in which case .Nm swapon acts as .Nm
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Wed Jun 1 08:50:00 UTC 2011 Modified Files: src/doc: CHANGES Log Message: fujitsu(4) -> fujbp(4), fujhk(4). To generate a diff of this commit: cvs rdiff -u -r1.1551 -r1.1552 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.1551 src/doc/CHANGES:1.1552 --- src/doc/CHANGES:1.1551 Sun May 29 15:21:34 2011 +++ src/doc/CHANGES Wed Jun 1 08:50:00 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1551 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1552 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -784,8 +784,8 @@ [christos 20101103] rumpclient(3): Add a clientside library for remote rump kernel access. [pooka 20101104] - fujitsu(4): Add brightness and hotkey drivers for Fujitsu laptops. - [gsutre 20101105] + fujbp(4), fujhk(4): Add brightness and hotkey drivers + for Fujitsu laptops. [gsutre 20101105] rump_sp(7): Support local domain sockets. [pooka 20101105] schide(4): Add Intel SCH IDE driver from OpenBSD. [jakllsch 20101106]
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Wed Jun 1 08:40:02 UTC 2011 Modified Files: src/doc: 3RDPARTY Log Message: ACPICA 20110527 is out. To generate a diff of this commit: cvs rdiff -u -r1.842 -r1.843 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.842 src/doc/3RDPARTY:1.843 --- src/doc/3RDPARTY:1.842 Sun May 29 15:21:34 2011 +++ src/doc/3RDPARTY Wed Jun 1 08:40:02 2011 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.842 2011/05/29 15:21:34 spz Exp $ +# $NetBSD: 3RDPARTY,v 1.843 2011/06/01 08:40:02 jruoho Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -26,7 +26,7 @@ Package: acpica Version: 20110211 -Current Vers: 20110413 +Current Vers: 20110527 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/unix2_source_code.php Home Page: http://www.acpica.org/
CVS commit: [matt-nb5-mips64] src/distrib/sets/lists/comp
Module Name:src Committed By: cliff Date: Wed Jun 1 08:35:34 UTC 2011 Modified Files: src/distrib/sets/lists/comp [matt-nb5-mips64]: ad.mips64eb ad.mips64el Log Message: since elf2aout is obsolete, it's debug file is, for mips64e[bl] too. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/distrib/sets/lists/comp/ad.mips64eb \ src/distrib/sets/lists/comp/ad.mips64el 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/comp/ad.mips64eb diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.1.2.3 src/distrib/sets/lists/comp/ad.mips64eb:1.1.2.4 --- src/distrib/sets/lists/comp/ad.mips64eb:1.1.2.3 Thu Jan 28 17:10:20 2010 +++ src/distrib/sets/lists/comp/ad.mips64eb Wed Jun 1 08:35:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.1.2.3 2010/01/28 17:10:20 matt Exp $ +# $NetBSD: ad.mips64eb,v 1.1.2.4 2011/06/01 08:35:34 cliff Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include @@ -805,7 +805,7 @@ ./usr/lib/o32/libz.sobase-sys-shlib compat,pic ./usr/lib/o32/libz_p.acomp-c-proflib compat,profile ./usr/lib/o32/libz_pic.a comp-c-piclib compat,pic -./usr/libdata/debug/usr/bin/elf2aout.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug ./usr/libdata/ldscripts/elf32btsmip.x comp-util-bin ./usr/libdata/ldscripts/elf32btsmip.xbn comp-util-bin Index: src/distrib/sets/lists/comp/ad.mips64el diff -u src/distrib/sets/lists/comp/ad.mips64el:1.1.2.3 src/distrib/sets/lists/comp/ad.mips64el:1.1.2.4 --- src/distrib/sets/lists/comp/ad.mips64el:1.1.2.3 Thu Jan 28 17:10:20 2010 +++ src/distrib/sets/lists/comp/ad.mips64el Wed Jun 1 08:35:34 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.1.2.3 2010/01/28 17:10:20 matt Exp $ +# $NetBSD: ad.mips64el,v 1.1.2.4 2011/06/01 08:35:34 cliff Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/mipscomp-c-include @@ -805,7 +805,7 @@ ./usr/lib/o32/libz.sobase-sys-shlib compat,pic ./usr/lib/o32/libz_p.acomp-c-proflib compat,profile ./usr/lib/o32/libz_pic.a comp-c-piclib compat,pic -./usr/libdata/debug/usr/bin/elf2aout.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete ./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug ./usr/libdata/ldscripts/elf32btsmip.x comp-util-bin ./usr/libdata/ldscripts/elf32btsmip.xbn comp-util-bin
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Wed Jun 1 07:57:24 UTC 2011 Modified Files: src/lib/libperfuse: ops.c Log Message: Remove outdated comment about a fixed bug To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libperfuse/ops.c diff -u src/lib/libperfuse/ops.c:1.28 src/lib/libperfuse/ops.c:1.29 --- src/lib/libperfuse/ops.c:1.28 Mon May 30 14:50:08 2011 +++ src/lib/libperfuse/ops.c Wed Jun 1 07:57:24 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.28 2011/05/30 14:50:08 manu Exp $ */ +/* $NetBSD: ops.c,v 1.29 2011/06/01 07:57:24 manu Exp $ */ /*- * Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved. @@ -1370,12 +1370,6 @@ return 0; } -/* - * XXX - * This fails as unprivilegied, it should not: touch testa/testx/a - * d-wx-wx-wx 2 root wheel 512 Oct 5 04:32 testa/testx - * -rwxrwxrwx 1 root wheel 0 Oct 5 04:39 testa/testx/a - */ int perfuse_node_access(pu, opc, mode, pcr) struct puffs_usermount *pu;
