CVS commit: src/sys/dev
Module Name:src
Committed By: tsutsui
Date: Mon Sep 21 08:12:47 UTC 2009
Modified Files:
src/sys/dev/ic: aha.c ahavar.h
src/sys/dev/isa: aha_isa.c
src/sys/dev/isapnp: aha_isapnp.c
src/sys/dev/mca: aha_mca.c
Log Message:
Split device_t/softc. Tested on AHA-1542CF.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/ic/aha.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/ahavar.h
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/isa/aha_isa.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/isapnp/aha_isapnp.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mca/aha_mca.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/ic/aha.c
diff -u src/sys/dev/ic/aha.c:1.58 src/sys/dev/ic/aha.c:1.59
--- src/sys/dev/ic/aha.c:1.58 Sat Mar 14 15:36:17 2009
+++ src/sys/dev/ic/aha.c Mon Sep 21 08:12:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: aha.c,v 1.58 2009/03/14 15:36:17 dsl Exp $ */
+/* $NetBSD: aha.c,v 1.59 2009/09/21 08:12:47 tsutsui Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.58 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aha.c,v 1.59 2009/09/21 08:12:47 tsutsui Exp $");
#include "opt_ddb.h"
@@ -134,7 +134,7 @@
u_char opcode = ibuf[0];
if (sc != NULL)
- name = device_xname(&sc->sc_dev);
+ name = device_xname(sc->sc_dev);
else
name = "(aha probe)";
@@ -250,7 +250,7 @@
* Fill in the scsipi_adapter.
*/
memset(adapt, 0, sizeof(*adapt));
- adapt->adapt_dev = &sc->sc_dev;
+ adapt->adapt_dev = sc->sc_dev;
adapt->adapt_nchannels = 1;
/* adapt_openings initialized below */
/* adapt_max_periph initialized below */
@@ -277,7 +277,7 @@
/*
* ask the adapter what subunits are present
*/
- config_found(&sc->sc_dev, &sc->sc_channel, scsiprint);
+ config_found(sc->sc_dev, &sc->sc_channel, scsiprint);
}
static void
@@ -297,7 +297,7 @@
for (i = 0; i < AHA_MBX_SIZE; i++) {
if (wmbi->stat != AHA_MBI_FREE) {
printf("%s: mbi not in round-robin order\n",
-device_xname(&sc->sc_dev));
+device_xname(sc->sc_dev));
goto AGAIN;
}
aha_nextmbx(wmbi, wmbx, mbi);
@@ -307,7 +307,7 @@
}
#ifdef AHADIAGnot
printf("%s: mbi interrupt with no full mailboxes\n",
- device_xname(&sc->sc_dev));
+ device_xname(sc->sc_dev));
#endif
return;
}
@@ -317,7 +317,7 @@
ccb = aha_ccb_phys_kv(sc, phystol(wmbi->ccb_addr));
if (!ccb) {
printf("%s: bad mbi ccb pointer; skipping\n",
- device_xname(&sc->sc_dev));
+ device_xname(sc->sc_dev));
goto next;
}
@@ -362,7 +362,7 @@
default:
printf("%s: bad mbi status %02x; skipping\n",
- device_xname(&sc->sc_dev), wmbi->stat);
+ device_xname(sc->sc_dev), wmbi->stat);
goto next;
}
@@ -395,7 +395,7 @@
u_char sts;
#ifdef AHADEBUG
- printf("%s: aha_intr ", device_xname(&sc->sc_dev));
+ printf("%s: aha_intr ", device_xname(sc->sc_dev));
#endif /*AHADEBUG */
/*
@@ -464,7 +464,8 @@
error = bus_dmamap_create(dmat, AHA_MAXXFER, AHA_NSEG, AHA_MAXXFER,
0, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, &ccb->dmamap_xfer);
if (error) {
- aprint_error_dev(&sc->sc_dev, "unable to create ccb DMA map, error = %d\n",
+ aprint_error_dev(sc->sc_dev,
+ "unable to create ccb DMA map, error = %d\n",
error);
return (error);
}
@@ -496,7 +497,8 @@
for (i = 0; i < count; i++) {
ccb = &ccbstore[i];
if ((error = aha_init_ccb(sc, ccb)) != 0) {
- aprint_error_dev(&sc->sc_dev, "unable to initialize ccb, error = %d\n",
+ aprint_error_dev(sc->sc_dev,
+ "unable to initialize ccb, error = %d\n",
error);
goto out;
}
@@ -679,13 +681,15 @@
*/
#ifdef AHADIAG
if (ccb->flags & CCB_SENDING) {
- printf("%s: exiting ccb still in transit!\n", device_xname(&sc->sc_dev));
+ printf("%s: exiting ccb still in transit!\n",
+ device_xname(sc->sc_dev));
Debugger();
return;
}
#endif
if ((ccb->flags & CCB_ALLOC) == 0) {
- printf("%s: exiting ccb not allocated!\n", device_xname(&sc->sc_dev));
+ printf("%s: exiting ccb not allocated!\n",
+ device_xname(sc->sc_dev));
Debugger();
return;
}
@@ -697,7 +701,7 @@
break;
default: /* Other scsi protocol messes */
printf("%s: host_stat %x\n",
-device_xname(&sc->sc_dev), ccb->host_stat);
+device_xname(sc->sc_dev), ccb->host_stat);
xs->error = XS_DRIVER_STUFFUP;
break;
}
@@ -715,7 +719,7 @@
break;
default:
printf("%s: target_stat %x\n",
-device_xname(&sc->sc_dev), ccb->target_stat);
+device_xname(sc->sc_dev), ccb->target_stat);
xs->error = XS_DRIVER_STUFFUP;
break;
}
@@ -860,7 +864,8 @@
struct aha_extbios extbios;
struct aha_unlock unlock;
- printf("%s: unlocking mailbox interface\n", device_xname(&sc->sc_dev));
+ printf("%s: unlocking mailbox i
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Mon Sep 21 12:14:47 UTC 2009
Modified Files:
src/sys/kern: init_main.c subr_autoconf.c
src/sys/rump/librump/rumpdev: rump_dev.c
src/sys/sys: device.h
Log Message:
Split config_init() into config_init() and config_init_mi() to help
platforms which want to call config_init() very early in the boot.
To generate a diff of this commit:
cvs rdiff -u -r1.400 -r1.401 src/sys/kern/init_main.c
cvs rdiff -u -r1.184 -r1.185 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/rump/librump/rumpdev/rump_dev.c
cvs rdiff -u -r1.123 -r1.124 src/sys/sys/device.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/init_main.c
diff -u src/sys/kern/init_main.c:1.400 src/sys/kern/init_main.c:1.401
--- src/sys/kern/init_main.c:1.400 Wed Sep 16 15:23:04 2009
+++ src/sys/kern/init_main.c Mon Sep 21 12:14:46 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.400 2009/09/16 15:23:04 pooka Exp $ */
+/* $NetBSD: init_main.c,v 1.401 2009/09/21 12:14:46 pooka Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.400 2009/09/16 15:23:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.401 2009/09/21 12:14:46 pooka Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -716,7 +716,7 @@
{
/* Initialize autoconf data structures. */
- config_init();
+ config_init_mi();
/*
* XXX
* callout_setfunc() requires mutex(9) so it can't be in config_init()
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.184 src/sys/kern/subr_autoconf.c:1.185
--- src/sys/kern/subr_autoconf.c:1.184 Wed Sep 16 22:45:24 2009
+++ src/sys/kern/subr_autoconf.c Mon Sep 21 12:14:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.184 2009/09/16 22:45:24 dyoung Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.185 2009/09/21 12:14:47 pooka Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.184 2009/09/16 22:45:24 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.185 2009/09/21 12:14:47 pooka Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -219,7 +219,7 @@
#define STREQ(s1, s2) \
(*(s1) == *(s2) && strcmp((s1), (s2)) == 0)
-static int config_initialized; /* config_init() has been called. */
+static bool config_initialized = false; /* config_init() has been called. */
static int config_do_twiddle;
static callout_t config_twiddle_ch;
@@ -237,8 +237,7 @@
const struct cfattachinit *cfai;
int i, j;
- if (config_initialized)
- return;
+ KASSERT(config_initialized == false);
mutex_init(&alldevs_mtx, MUTEX_DEFAULT, IPL_NONE);
cv_init(&alldevs_cv, "alldevs");
@@ -268,9 +267,18 @@
initcftable.ct_cfdata = cfdata;
TAILQ_INSERT_TAIL(&allcftables, &initcftable, ct_list);
- sysctl_detach_setup(NULL);
- config_initialized = 1;
+ config_initialized = true;
+}
+
+void
+config_init_mi(void)
+{
+
+ if (!config_initialized)
+ config_init();
+
+ sysctl_detach_setup(NULL);
}
void
Index: src/sys/rump/librump/rumpdev/rump_dev.c
diff -u src/sys/rump/librump/rumpdev/rump_dev.c:1.4 src/sys/rump/librump/rumpdev/rump_dev.c:1.5
--- src/sys/rump/librump/rumpdev/rump_dev.c:1.4 Sun Sep 20 23:16:09 2009
+++ src/sys/rump/librump/rumpdev/rump_dev.c Mon Sep 21 12:14:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev.c,v 1.4 2009/09/20 23:16:09 pooka Exp $ */
+/* $NetBSD: rump_dev.c,v 1.5 2009/09/21 12:14:47 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.4 2009/09/20 23:16:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.5 2009/09/21 12:14:47 pooka Exp $");
#include
#include
@@ -44,7 +44,7 @@
rump_dev_init(void)
{
- config_init();
+ config_init_mi();
rump_dev_cgd_init();
rump_dev_raidframe_init();
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.123 src/sys/sys/device.h:1.124
--- src/sys/sys/device.h:1.123 Wed Sep 16 22:45:23 2009
+++ src/sys/sys/device.h Mon Sep 21 12:14:47 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.123 2009/09/16 22:45:23 dyoung Exp $ */
+/* $NetBSD: device.h,v 1.124 2009/09/21 12:14:47 pooka Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -422,6 +422,7 @@
int config_handle_wedges(struct device *, int);
void config_init(void);
+void config_init_mi(void);
void drvctl_init(void);
int config_cfdriver_attach(struct cfdriver *);
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: macallan
Date: Mon Sep 21 13:23:43 UTC 2009
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
set is_console even if we don't have any fb_info so other console drivers
than genfb have a chance of working.
Tested with radeonfb which works fine with an RV280
TODO: figure out how to deal with more than one PCI_CLASS_DISPLAY device in
a halfway sane manner
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/x86/x86/x86_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/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.44 src/sys/arch/x86/x86/x86_autoconf.c:1.45
--- src/sys/arch/x86/x86/x86_autoconf.c:1.44 Mon Aug 24 23:48:57 2009
+++ src/sys/arch/x86/x86/x86_autoconf.c Mon Sep 21 13:23:43 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.44 2009/08/24 23:48:57 jmcneill Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.45 2009/09/21 13:23:43 macallan Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.44 2009/08/24 23:48:57 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.45 2009/09/21 13:23:43 macallan Exp $");
#include
#include
@@ -607,19 +607,38 @@
#endif
fbinfo = lookup_bootinfo(BTINFO_FRAMEBUFFER);
- if (fbinfo == NULL || fbinfo->physaddr == 0)
-return;
dict = device_properties(dev);
- prop_dictionary_set_uint32(dict, "width",
- fbinfo->width);
- prop_dictionary_set_uint32(dict, "height",
- fbinfo->height);
- prop_dictionary_set_uint8(dict, "depth",
- fbinfo->depth);
- prop_dictionary_set_uint64(dict, "address",
- fbinfo->physaddr);
- prop_dictionary_set_uint16(dict, "linebytes",
- fbinfo->stride);
+ /*
+ * framebuffer drivers other than genfb can work
+ * without the address property
+ */
+ if (fbinfo != NULL) {
+if (fbinfo->physaddr != 0) {
+prop_dictionary_set_uint32(dict, "width",
+fbinfo->width);
+prop_dictionary_set_uint32(dict, "height",
+fbinfo->height);
+prop_dictionary_set_uint8(dict, "depth",
+fbinfo->depth);
+prop_dictionary_set_uint16(dict, "linebytes",
+fbinfo->stride);
+
+ prop_dictionary_set_uint64(dict,
+ "address", fbinfo->physaddr);
+}
+#if notyet
+prop_dictionary_set_bool(dict, "splash",
+fbinfo->flags & BI_FB_SPLASH ?
+ true : false);
+#endif
+if (fbinfo->depth == 8) {
+ gfb_cb.gcc_cookie = NULL;
+ gfb_cb.gcc_set_mapreg =
+ x86_genfb_set_mapreg;
+ prop_dictionary_set_uint64(dict,
+ "cmap_callback", (uint64_t)&gfb_cb);
+}
+ }
prop_dictionary_set_bool(dict, "is_console", true);
prop_dictionary_set_bool(dict, "clear-screen", false);
#if NWSDISPLAY > 0 && NGENFB > 0
@@ -630,12 +649,6 @@
prop_dictionary_set_bool(dict, "splash",
fbinfo->flags & BI_FB_SPLASH ? true : false);
#endif
- if (fbinfo->depth == 8) {
-gfb_cb.gcc_cookie = NULL;
-gfb_cb.gcc_set_mapreg = x86_genfb_set_mapreg;
-prop_dictionary_set_uint64(dict,
-"cmap_callback", (uint64_t)&gfb_cb);
- }
pmf_cb.gpc_suspend = x86_genfb_suspend;
pmf_cb.gpc_resume = x86_genfb_resume;
prop_dictionary_set_uint64(dict,
CVS commit: src/sys/netsmb
Module Name:src Committed By: njoly Date: Mon Sep 21 14:13:35 UTC 2009 Modified Files: src/sys/netsmb: smb_dev.c Log Message: Do not call smb_rqpool_fini() on device close. Otherwise, we'll crash trying to use destroyed pools for SMB request. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/netsmb/smb_dev.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/netsmb/smb_dev.c diff -u src/sys/netsmb/smb_dev.c:1.32 src/sys/netsmb/smb_dev.c:1.33 --- src/sys/netsmb/smb_dev.c:1.32 Sat Sep 12 12:52:21 2009 +++ src/sys/netsmb/smb_dev.c Mon Sep 21 14:13:35 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: smb_dev.c,v 1.32 2009/09/12 12:52:21 pooka Exp $ */ +/* $NetBSD: smb_dev.c,v 1.33 2009/09/21 14:13:35 njoly Exp $ */ /* * Copyright (c) 2000-2001 Boris Popov @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.32 2009/09/12 12:52:21 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smb_dev.c,v 1.33 2009/09/21 14:13:35 njoly Exp $"); #include #include @@ -257,7 +257,6 @@ #ifndef __NetBSD__ destroy_dev(dev); #endif - smb_rqpool_fini(); splx(s); return 0; }
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Mon Sep 21 15:29:36 UTC 2009 Modified Files: src/sys/rump/include/rump: rumpuser.h Log Message: is a non-standard header, so include it only from kernel code (where it will be included from the NetBSD kernel source tree). Use in userland namespace, i.e. when compiling librumpuser. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/rumpuser.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/rump/include/rump/rumpuser.h diff -u src/sys/rump/include/rump/rumpuser.h:1.25 src/sys/rump/include/rump/rumpuser.h:1.26 --- src/sys/rump/include/rump/rumpuser.h:1.25 Wed Sep 2 19:02:51 2009 +++ src/sys/rump/include/rump/rumpuser.h Mon Sep 21 15:29:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser.h,v 1.25 2009/09/02 19:02:51 pooka Exp $ */ +/* $NetBSD: rumpuser.h,v 1.26 2009/09/21 15:29:36 pooka Exp $ */ /* * Copyright (c) 2007 Antti Kantee. All Rights Reserved. @@ -30,7 +30,11 @@ #ifndef _RUMP_RUMPUSER_H_ #define _RUMP_RUMPUSER_H_ +#ifdef _KERNEL #include +#else +#include +#endif struct msghdr; struct pollfd;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jakllsch Date: Mon Sep 21 16:18:31 UTC 2009 Modified Files: src/sys/dev/ic: i82801lpcreg.h Log Message: Add more-complete definitions of ICH GPIO-related registers. While here, fix a typo in a register number. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/ic/i82801lpcreg.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/ic/i82801lpcreg.h diff -u src/sys/dev/ic/i82801lpcreg.h:1.8 src/sys/dev/ic/i82801lpcreg.h:1.9 --- src/sys/dev/ic/i82801lpcreg.h:1.8 Mon Apr 28 20:23:50 2008 +++ src/sys/dev/ic/i82801lpcreg.h Mon Sep 21 16:18:31 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: i82801lpcreg.h,v 1.8 2008/04/28 20:23:50 martin Exp $ */ +/* $NetBSD: i82801lpcreg.h,v 1.9 2009/09/21 16:18:31 jakllsch Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -42,8 +42,12 @@ #define LPCIB_PCI_PMBASE 0x40 #define LPCIB_PCI_ACPI_CNTL 0x44 # define LPCIB_PCI_ACPI_CNTL_EN (1 << 4) +/* GPIO config registers ICH6+ */ +#define LPCIB_PCI_GPIO_BASE_ICH6 0x48 +#define LPCIB_PCI_GPIO_CNTL_ICH6 0x4c #define LPCIB_PCI_BIOS_CNTL 0x4e #define LPCIB_PCI_TCO_CNTL 0x54 +/* GPIO config registers ICH0-ICH5 */ #define LPCIB_PCI_GPIO_BASE 0x58 #define LPCIB_PCI_GPIO_CNTL 0x5c #define LPCIB_PCI_PIRQA_ROUT 0x60 @@ -69,7 +73,7 @@ #define LPCIB_PCI_MON5_TRP_RNG 0xc5 #define LPCIB_PCI_MON6_TRP_RNG 0xc6 #define LPCIB_PCI_MON7_TRP_RNG 0xc7 -#define LPCIB_PCI_MON_TRP_MSK oxcc +#define LPCIB_PCI_MON_TRP_MSK 0xcc #define LPCIB_PCI_GEN_CNTL 0xd0 #define LPCIB_ICH5_HPTC_EN 0x0002 #define LPCIB_ICH5_HPTC_WIN_MASK 0xc000 @@ -138,6 +142,20 @@ # define LPCIB_PM_SS_CNTL_ARB_DIS 0x01 /* disable arbiter */ /* + * General Purpose I/O Registers + * (offset from GPIO_BASE) + */ +#define LPCIB_GPIO_GPIO_USE_SEL 0x00 +#define LPCIB_GPIO_GP_IO_SEL 0x04 +#define LPCIB_GPIO_GP_LVL 0x0c +#define LPCIB_GPIO_GPO_TTL 0x14 +#define LPCIB_GPIO_GPO_BLINK 0x18 +#define LPCIB_GPIO_GPI_INV 0x2c +#define LPCIB_GPIO_GPIO_USE_SEL2 0x30 +#define LPCIB_GPIO_GP_IO_SEL2 0x34 +#define LPCIB_GPIO_GP_LVL2 0x38 + +/* * SMBus controller registers. */
CVS commit: src/share/mk
Module Name:src
Committed By: uwe
Date: Mon Sep 21 17:20:16 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch sh3el to binutils 2.19.
Boot-tested on landisk.
To generate a diff of this commit:
cvs rdiff -u -r1.578 -r1.579 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.578 src/share/mk/bsd.own.mk:1.579
--- src/share/mk/bsd.own.mk:1.578 Sat Sep 19 14:53:12 2009
+++ src/share/mk/bsd.own.mk Mon Sep 21 17:20:16 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.578 2009/09/19 14:53:12 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.579 2009/09/21 17:20:16 uwe Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -53,6 +53,7 @@
${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "hppa" || \
${MACHINE_ARCH} == "i386" || \
+${MACHINE_ARCH} == "sh3el" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "vax"
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: njoly
Date: Mon Sep 21 18:03:03 UTC 2009
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Make do_mtree correctly report failure if either special or
NetBSD.dist checks failed, not only the last one.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.103 src/usr.sbin/postinstall/postinstall:1.104
--- src/usr.sbin/postinstall/postinstall:1.103 Mon Sep 7 21:07:04 2009
+++ src/usr.sbin/postinstall/postinstall Mon Sep 21 18:03:03 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.103 2009/09/07 21:07:04 mrg Exp $
+# $NetBSD: postinstall,v 1.104 2009/09/21 18:03:03 njoly Exp $
#
# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -923,8 +923,11 @@
do_mtree()
{
[ -n "$1" ] || err 3 "USAGE: do_mtree fix|check"
+ failed=0
compare_dir "$1" "${SRC_DIR}/etc/mtree" "${DEST_DIR}/etc/mtree" 444 special
+ failed=$(( ${failed} + $? ))
+
if ! $SOURCEMODE; then
MTREE_DIR="${SRC_DIR}/etc/mtree"
else
@@ -938,6 +941,9 @@
MTREE_DIR="${SCRATCHDIR}"
fi
compare_dir "$1" "${MTREE_DIR}" "${DEST_DIR}/etc/mtree" 444 NetBSD.dist
+ failed=$(( ${failed} + $? ))
+
+ return ${failed}
}
#
CVS commit: src/doc/roadmaps
Module Name:src Committed By: agc Date: Mon Sep 21 19:41:23 UTC 2009 Modified Files: src/doc/roadmaps: system Log Message: Clarify a couple of entries in the system roadmap To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/doc/roadmaps/system Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/roadmaps/system diff -u src/doc/roadmaps/system:1.6 src/doc/roadmaps/system:1.7 --- src/doc/roadmaps/system:1.6 Tue Sep 15 21:07:58 2009 +++ src/doc/roadmaps/system Mon Sep 21 19:41:23 2009 @@ -1,4 +1,4 @@ -$NetBSD: system,v 1.6 2009/09/15 21:07:58 agc Exp $ +$NetBSD: system,v 1.7 2009/09/21 19:41:23 agc Exp $ NetBSD System Roadmap = @@ -33,7 +33,8 @@ The Unix 32-bit time_t value will overflow in 2037 - any mortgage calculations which use a time_t value are in danger of overflowing at the present time - and to address this, 64-bit time_t values will be used to contain the number -of seconds since 1970. +of seconds since 1970. This was completed in 5.99.7 by Christos (with no libc +major bump - kudos and respect), and will be in 6.0. Responsible: christos @@ -49,13 +50,17 @@ Responsible: ad, lukem -3. Full kernel preemption for real-time threads +3. Full kernel preemption for real-time threads on non-x86 +-- -With the revamp of the kernel concurrency model, much of the kernel is fully -multi-threaded and can therefore be preempted at any time. In support of -lower context switch and dispatch times for real-time threads, full kernel -preemption is being implemented. +With the revamp of the kernel concurrency model, much of the kernel is +fully multi-threaded and can therefore be preempted at any time. In +support of lower context switch and dispatch times for real-time +threads, full kernel preemption is being implemented. This has been +implemented already for i386 and x86_64 (and is in 5.0), but needs to +be extended to support the ARM, MIPS and SuperH ports. + +Responsible: rmind 4. POSIX shared memory -- @@ -71,7 +76,8 @@ In NetBSD 5.99.15, some changes were made to split the namei() routine up into logical parts, so that changes can be made to the constituent -parts in a less intrusive way. +parts in a less intrusive way. This is in the repository now, and will +be in 6.0. Responsible: dholland @@ -101,14 +107,15 @@ 9. Incremental namei improvements, Phase 2 -- -Implement the rest of the changes to namei outlined in Message-ID: -<20080319053709.gb3...@netbsd.org>. Simplify the locking and behavior -of namei() calls within the kernel to resolve path names within file -systems. +Building on the namei() split which was introduced in 5.99.15 (see (5) +above), further changes will be introduced: see the changes to namei +outlined in Message-ID: <20080319053709.gb3...@netbsd.org> for more +information. This will simplify the locking and behavior of namei() +calls within the kernel to resolve path names within file systems. Responsible: dholland Alistair Crooks -Tue 15 Sep 2009 08:02:11 PDT +Mon 21 Sep 2009 08:39:16 BST
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: bouyer
Date: Mon Sep 21 21:59:30 UTC 2009
Modified Files:
src/sys/arch/xen/xen: xbd_xenbus.c
Log Message:
Allow a xbd to be detached from the domU (e.g. at shutdown). Patch tested
and adjusted by David Young, discussed on port-xen@ early august.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/xen/xbd_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/xbd_xenbus.c
diff -u src/sys/arch/xen/xen/xbd_xenbus.c:1.41 src/sys/arch/xen/xen/xbd_xenbus.c:1.42
--- src/sys/arch/xen/xen/xbd_xenbus.c:1.41 Wed Jul 29 12:02:10 2009
+++ src/sys/arch/xen/xen/xbd_xenbus.c Mon Sep 21 21:59:30 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: xbd_xenbus.c,v 1.41 2009/07/29 12:02:10 cegger Exp $ */
+/* $NetBSD: xbd_xenbus.c,v 1.42 2009/09/21 21:59:30 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.41 2009/07/29 12:02:10 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xbd_xenbus.c,v 1.42 2009/09/21 21:59:30 bouyer Exp $");
#include "opt_xen.h"
#include "rnd.h"
@@ -110,6 +110,9 @@
#define BLKIF_STATE_CONNECTED1
#define BLKIF_STATE_SUSPENDED2
int sc_shutdown;
+#define BLKIF_SHUTDOWN_RUN0 /* no shutdown */
+#define BLKIF_SHUTDOWN_REMOTE 1 /* backend-initiated shutdown in progress */
+#define BLKIF_SHUTDOWN_LOCAL 2 /* locally-initiated shutdown in progress */
uint64_t sc_sectors; /* number of sectors for this device */
u_long sc_secsize; /* sector size */
@@ -140,8 +143,9 @@
static int xbd_map_align(struct xbd_req *);
static void xbd_unmap_align(struct xbd_req *);
-CFATTACH_DECL_NEW(xbd, sizeof(struct xbd_xenbus_softc),
- xbd_xenbus_match, xbd_xenbus_attach, xbd_xenbus_detach, NULL);
+CFATTACH_DECL3_NEW(xbd, sizeof(struct xbd_xenbus_softc),
+ xbd_xenbus_match, xbd_xenbus_attach, xbd_xenbus_detach, NULL, NULL, NULL,
+ DVF_DETACH_SHUTDOWN);
dev_type_open(xbdopen);
dev_type_close(xbdclose);
@@ -249,7 +253,7 @@
}
sc->sc_backend_status = BLKIF_STATE_DISCONNECTED;
- sc->sc_shutdown = 1;
+ sc->sc_shutdown = BLKIF_SHUTDOWN_REMOTE;
/* initialise shared structures and tell backend that we are ready */
xbd_xenbus_resume(sc);
@@ -263,16 +267,31 @@
xbd_xenbus_detach(device_t dev, int flags)
{
struct xbd_xenbus_softc *sc = device_private(dev);
- int s, bmaj, cmaj, i, mn;
+ int bmaj, cmaj, i, mn, rc, s;
+
+ rc = disk_begindetach(&sc->sc_dksc.sc_dkdev, NULL, dev, flags);
+ if (rc != 0)
+ return rc;
+
s = splbio();
DPRINTF(("%s: xbd_detach\n", device_xname(dev)));
- if (sc->sc_shutdown == 0) {
- sc->sc_shutdown = 1;
+ if (sc->sc_shutdown == BLKIF_SHUTDOWN_RUN) {
+ sc->sc_shutdown = BLKIF_SHUTDOWN_LOCAL;
/* wait for requests to complete */
while (sc->sc_backend_status == BLKIF_STATE_CONNECTED &&
sc->sc_dksc.sc_dkdev.dk_stats->io_busy > 0)
tsleep(xbd_xenbus_detach, PRIBIO, "xbddetach", hz/2);
+ xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateClosing);
}
+ if ((flags & DETACH_FORCE) == 0) {
+ /* xbd_xenbus_detach already in progress */
+ wakeup(xbd_xenbus_detach);
+ splx(s);
+ return EALREADY;
+ }
+ while (xenbus_read_driver_state(sc->sc_xbusd->xbusd_otherend)
+ != XenbusStateClosed)
+ tsleep(xbd_xenbus_detach, PRIBIO, "xbddetach2", hz/2);
splx(s);
/* locate the major number */
@@ -414,12 +433,12 @@
break;
case XenbusStateClosing:
s = splbio();
- sc->sc_shutdown = 1;
+ if (sc->sc_shutdown == BLKIF_SHUTDOWN_RUN)
+ sc->sc_shutdown = BLKIF_SHUTDOWN_REMOTE;
/* wait for requests to complete */
while (sc->sc_backend_status == BLKIF_STATE_CONNECTED &&
sc->sc_dksc.sc_dkdev.dk_stats->io_busy > 0)
- tsleep(xbd_xenbus_detach, PRIBIO, "xbddetach",
- hz/2);
+ tsleep(xbd_xenbus_detach, PRIBIO, "xbddetach", hz/2);
splx(s);
xenbus_switch_state(sc->sc_xbusd, NULL, XenbusStateClosed);
break;
@@ -434,7 +453,7 @@
return;
xbd_connect(sc);
- sc->sc_shutdown = 0;
+ sc->sc_shutdown = BLKIF_SHUTDOWN_RUN;
hypervisor_enable_event(sc->sc_evtchn);
sc->sc_xbdsize =
@@ -635,7 +654,7 @@
DPRINTF(("xbdstrategy(%p): b_bcount = %ld\n", bp,
(long)bp->b_bcount));
- if (sc == NULL || sc->sc_shutdown) {
+ if (sc == NULL || sc->sc_shutdown != BLKIF_SHUTDOWN_RUN) {
bp->b_error = EIO;
biodone(bp);
return;
@@ -659,7 +678,7 @@
DPRINTF(("xbdsize(%d)\n", dev));
sc = device_lookup_private(&xbd_cd, DISKUNIT(dev));
- if (sc == NULL || sc->sc_shutdown)
+ if (sc == NULL || sc->sc_shutdown != BLKIF_SHUTDOWN_RUN)
return -1;
return dk_size(sc->sc_di, &sc->sc_dksc, dev);
}
@@ -750,7 +769,7 @@
DPRINTF(("xbdstart(%p): b_bcount = %ld\n", bp, (long)bp->b_bcount));
sc = device_lookup_private(&xbd_cd, DISKUNIT(bp->b_dev));
- if (sc == NULL || sc->sc_shutdown) {
+ if (sc == NULL || sc->sc_shutdown != BLKIF_SHUTDOWN_RUN) {
CVS commit: xsrc/external/mit/xorg-server/dist
Module Name:xsrc
Committed By: snj
Date: Mon Sep 21 23:40:14 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/dix: globals.c
xsrc/external/mit/xorg-server/dist/os: utils.c
Log Message:
By default, use the old X server background and cursor mode (option
"-retro"). Add a "-noretro" option to get the new (black background
and no cursor) behavior.
Addresses part of PR xsrc/41870
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/xorg-server/dist/dix/globals.c
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/xorg-server/dist/os/utils.c
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-server/dist/dix/globals.c
diff -u xsrc/external/mit/xorg-server/dist/dix/globals.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/dix/globals.c:1.2
--- xsrc/external/mit/xorg-server/dist/dix/globals.c:1.1.1.2 Thu Jun 11 01:52:54 2009
+++ xsrc/external/mit/xorg-server/dist/dix/globals.c Mon Sep 21 23:40:14 2009
@@ -139,7 +139,7 @@
FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in
every compilation of dix code */
CursorPtr rootCursor;
-Bool party_like_its_1989 = FALSE;
+Bool party_like_its_1989 = TRUE;
Bool whiteRoot = FALSE;
int cursorScreenDevPriv[MAXSCREENS];
Index: xsrc/external/mit/xorg-server/dist/os/utils.c
diff -u xsrc/external/mit/xorg-server/dist/os/utils.c:1.1.1.2 xsrc/external/mit/xorg-server/dist/os/utils.c:1.2
--- xsrc/external/mit/xorg-server/dist/os/utils.c:1.1.1.2 Thu Jun 11 01:52:55 2009
+++ xsrc/external/mit/xorg-server/dist/os/utils.c Mon Sep 21 23:40:14 2009
@@ -525,6 +525,7 @@
ErrorF("-render [default|mono|gray|color] set render color alloc policy\n");
#endif
ErrorF("-retro start with classic stipple and cursor\n");
+ErrorF("-noretro start with black background and no cursor\n");
ErrorF("-s # screen-saver timeout (minutes)\n");
ErrorF("-t # mouse threshold (pixels)\n");
ErrorF("-terminate terminate at server reset\n");
@@ -821,6 +822,8 @@
defaultKeyboardControl.autoRepeat = FALSE;
else if ( strcmp( argv[i], "-retro") == 0)
party_like_its_1989 = TRUE;
+ else if ( strcmp( argv[i], "-noretro") == 0)
+ party_like_its_1989 = FALSE;
else if ( strcmp( argv[i], "-s") == 0)
{
if(++i < argc)
CVS commit: src/share/mk
Module Name:src
Committed By: uwe
Date: Tue Sep 22 01:28:50 UTC 2009
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch sh3eb to binutils 2.19.
Compile-tested for mmeye.
To generate a diff of this commit:
cvs rdiff -u -r1.579 -r1.580 src/share/mk/bsd.own.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.own.mk
diff -u src/share/mk/bsd.own.mk:1.579 src/share/mk/bsd.own.mk:1.580
--- src/share/mk/bsd.own.mk:1.579 Mon Sep 21 17:20:16 2009
+++ src/share/mk/bsd.own.mk Tue Sep 22 01:28:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.579 2009/09/21 17:20:16 uwe Exp $
+# $NetBSD: bsd.own.mk,v 1.580 2009/09/22 01:28:50 uwe Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -53,7 +53,7 @@
${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "hppa" || \
${MACHINE_ARCH} == "i386" || \
-${MACHINE_ARCH} == "sh3el" || \
+${MACHINE_ARCH} == "sh3eb" || ${MACHINE_ARCH} == "sh3el" || \
${MACHINE_ARCH} == "sparc" || \
${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "vax"
CVS commit: src/sys/sys
Module Name:src Committed By: isaki Date: Tue Sep 22 01:29:36 UTC 2009 Modified Files: src/sys/sys: gpio.h Log Message: Fix $NetBSD$ tag. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/sys/gpio.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/sys/gpio.h diff -u src/sys/sys/gpio.h:1.4 src/sys/sys/gpio.h:1.5 --- src/sys/sys/gpio.h:1.4 Sat Jul 25 16:17:10 2009 +++ src/sys/sys/gpio.h Tue Sep 22 01:29:36 2009 @@ -1,4 +1,4 @@ -/* $NetBSD */ +/* $NetBSD: gpio.h,v 1.5 2009/09/22 01:29:36 isaki Exp $ */ /* $OpenBSD: gpio.h,v 1.7 2008/11/26 14:51:20 mbalmer Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko
CVS commit: src/distrib/x68k/floppies/ramdisk
Module Name:src
Committed By: isaki
Date: Tue Sep 22 02:50:11 UTC 2009
Modified Files:
src/distrib/x68k/floppies/ramdisk: Makefile
Log Message:
termcap.vt was removed.
http://mail-index.netbsd.org/source-changes/2009/09/20/msg001101.html
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/x68k/floppies/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/x68k/floppies/ramdisk/Makefile
diff -u src/distrib/x68k/floppies/ramdisk/Makefile:1.36 src/distrib/x68k/floppies/ramdisk/Makefile:1.37
--- src/distrib/x68k/floppies/ramdisk/Makefile:1.36 Sun Sep 20 22:50:51 2009
+++ src/distrib/x68k/floppies/ramdisk/Makefile Tue Sep 22 02:50:11 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2009/09/20 22:50:51 abs Exp $
+# $NetBSD: Makefile,v 1.37 2009/09/22 02:50:11 isaki Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -19,7 +19,7 @@
MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS+= ${CRUNCHBIN} \
dot.profile \
- ${DISTRIBDIR}/common/services termcap.vt \
+ ${DISTRIBDIR}/common/services \
${DESTDIR}/usr/mdec/boot ${DESTDIR}/usr/mdec/mboot \
${DESTDIR}/usr/mdec/sdboot_ufs \
${NETBSDSRCDIR}/etc/group ${NETBSDSRCDIR}/etc/master.passwd \
CVS commit: src/usr.sbin/mtree
Module Name:src
Committed By: apb
Date: Tue Sep 22 04:38:21 UTC 2009
Modified Files:
src/usr.sbin/mtree: spec.c
Log Message:
Fix errors in previous: "optional" and "ignore" keywords also need the
appendfield treatment.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/usr.sbin/mtree/spec.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.sbin/mtree/spec.c
diff -u src/usr.sbin/mtree/spec.c:1.77 src/usr.sbin/mtree/spec.c:1.78
--- src/usr.sbin/mtree/spec.c:1.77 Sat Sep 19 21:41:43 2009
+++ src/usr.sbin/mtree/spec.c Tue Sep 22 04:38:21 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spec.c,v 1.77 2009/09/19 21:41:43 apb Exp $ */
+/* $NetBSD: spec.c,v 1.78 2009/09/22 04:38:21 apb Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -67,7 +67,7 @@
#if 0
static char sccsid[] = "@(#)spec.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: spec.c,v 1.77 2009/09/19 21:41:43 apb Exp $");
+__RCSID("$NetBSD: spec.c,v 1.78 2009/09/22 04:38:21 apb Exp $");
#endif
#endif /* not lint */
@@ -381,9 +381,9 @@
free(str);
}
if (MATCHFLAG(F_IGN))
- printf("ignore ");
+ appendfield(pathlast, "ignore");
if (MATCHFLAG(F_OPT))
- printf("optional ");
+ appendfield(pathlast, "optional");
if (MATCHFLAG(F_TAGS)) {
/* don't output leading or trailing commas */
p = cur->tags;
CVS commit: [netbsd-5] src/distrib/sets/lists/xserver
Module Name:src Committed By: snj Date: Tue Sep 22 06:31:52 UTC 2009 Modified Files: src/distrib/sets/lists/xserver [netbsd-5]: md.sparc64 Log Message: Apply patch (requested by mrg in ticket #958): Add ag10e.html and properly mark libxtrap.so as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.26.2.4 -r1.26.2.5 src/distrib/sets/lists/xserver/md.sparc64 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/xserver/md.sparc64 diff -u src/distrib/sets/lists/xserver/md.sparc64:1.26.2.4 src/distrib/sets/lists/xserver/md.sparc64:1.26.2.5 --- src/distrib/sets/lists/xserver/md.sparc64:1.26.2.4 Fri Sep 18 02:03:35 2009 +++ src/distrib/sets/lists/xserver/md.sparc64 Tue Sep 22 06:31:52 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.26.2.4 2009/09/18 02:03:35 snj Exp $ x11 +# $NetBSD: md.sparc64,v 1.26.2.5 2009/09/22 06:31:52 snj Exp $ x11 ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/XFree86 -unknown- x11 ./usr/X11R6/bin/Xsun -unknown- x11 @@ -383,7 +383,7 @@ ./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg ./usr/X11R7/lib/modules/extensions/libxtrap.a -unknown- obsolete -./usr/X11R7/lib/modules/extensions/libxtrap.so -unknown- xorobsolete +./usr/X11R7/lib/modules/extensions/libxtrap.so -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libxtrap.so.0 -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libxtrap_g.a -unknown- obsolete ./usr/X11R7/lib/modules/extensions/libxtrap_pic.a -unknown- obsolete @@ -486,6 +486,7 @@ ./usr/X11R7/man/html1/pcitweak.html -unknown- obsolete ./usr/X11R7/man/html1/scanpci.html -unknown- obsolete ./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete +./usr/X11R7/man/html4/ag10e.html -unknown- html,xorg ./usr/X11R7/man/html4/ati.html-unknown- html,xorg ./usr/X11R7/man/html4/exa.html-unknown- html,xorg ./usr/X11R7/man/html4/glint.html -unknown- html,xorg
CVS commit: [matt-nb5-mips64] src/sys/arch/mips/conf
Module Name:src Committed By: cliff Date: Tue Sep 22 06:58:20 UTC 2009 Modified Files: src/sys/arch/mips/conf [matt-nb5-mips64]: files.rmixl Log Message: add CONSFREQ to opt_com.h options To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/mips/conf/files.rmixl 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/conf/files.rmixl diff -u src/sys/arch/mips/conf/files.rmixl:1.1.2.2 src/sys/arch/mips/conf/files.rmixl:1.1.2.3 --- src/sys/arch/mips/conf/files.rmixl:1.1.2.2 Tue Sep 15 02:32:01 2009 +++ src/sys/arch/mips/conf/files.rmixl Tue Sep 22 06:58:20 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.rmixl,v 1.1.2.2 2009/09/15 02:32:01 cliff Exp $ +# $NetBSD: files.rmixl,v 1.1.2.3 2009/09/22 06:58:20 cliff Exp $ # # Configuration info for RMI XLP, XLR, XLS # @@ -16,5 +16,5 @@ # NS16550 compatible serial ports attach com at obio with rmixl_com file arch/mips/rmi/rmixl_com.c rmixl_com -defparam opt_com.hCONSADDR CONSPEED CONMODE +defparam opt_com.hCONSADDR CONSFREQ CONSPEED CONMODE
