CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Mar 23 07:43:54 UTC 2010 Modified Files: src/share/man/man7: intro.7 Log Message: General update. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/share/man/man7/intro.7 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/man7/intro.7 diff -u src/share/man/man7/intro.7:1.15 src/share/man/man7/intro.7:1.16 --- src/share/man/man7/intro.7:1.15 Fri Jun 10 20:48:59 2005 +++ src/share/man/man7/intro.7 Tue Mar 23 07:43:54 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.7,v 1.15 2005/06/10 20:48:59 wiz Exp $ +.\ $NetBSD: intro.7,v 1.16 2010/03/23 07:43:54 jruoho Exp $ .\ .\ Copyright (c) 1983, 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,65 +29,76 @@ .\ .\ @(#)intro.7 8.1 (Berkeley) 6/5/93 .\ -.Dd May 6, 2005 +.Dd March 23, 2010 .Dt INTRO 7 .Os .Sh NAME .Nm intro .Nd miscellaneous information pages .Sh DESCRIPTION -This section contains miscellaneous documentation, including -information on -.Xr troff 1 -macro packages. -.Pp -.Bl -tag -width mailaddr -.It Sy ascii -map of ASCII character set -.It Sy environ +This section contains miscellaneous documentation, including: +.Bl -tag -width mdoc.samples(7) -offset indent +.It Xr ascii 7 +map of +.Tn ASCII +character set +.It Xr environ 7 user environment .\ .It Sy eqnchar .\ special character definitions for eqn -.It Sy hier -file system hierarchy -.It Sy hostname +.It Xr hier 7 +file system hierarchy in +.Nx +.It Xr hostname 7 host name resolution description -.It Sy mailaddr +.It Xr mailaddr 7 mail addressing description .\ .It Sy man .\ macros to typeset manual pages -.It Sy mdoc +.It Xr mdoc 7 macros for typesetting .Nm \-mdoc style manual pages -.It Sy mdoc.samples +.It Xr mdoc.samples 7 tutorial for writing BSD manuals with .Nm \-mdoc .\ .It Sy \me .\ macros for formatting papers .\ .It Sy \ms .\ macros for formatting manuscripts -.It Sy operator +.It Xr nls 7 +overview of national language support +.It Xr operator 7 C operator precedence and order of evaluation -.It Sy release +.It Xr pkgsrc 7 +the +.Nx +packages collection +.It Xr release 7 layout of .Nx releases and snapshots -.It Sy script +.It Xr script 7 how interpreter scripts are executed -.It Sy signal +.It Xr setuid 7 +checklist for security and setuid programs +.It Xr signal 7 available signals under .Nx -.It Sy sticky +.It Xr sticky 7 sticky bit .Pq Dv S_ISVTX handling -.It Sy symlink +.It Xr symlink 7 symbolic link handling +.It Xr sysctl 7 +system information variables in +.Nx .\ .It Sy term .\ conventional names for terminals .El .Sh HISTORY -.Nm -appeared in +The +.Xr intro 7 +manual page appeared in .Bx 4.2 .
CVS commit: src/share/man/man7
Module Name:src Committed By: jruoho Date: Tue Mar 23 07:45:58 UTC 2010 Modified Files: src/share/man/man7: pkgsrc.7 Log Message: Wrap the pkgsrc guide and its URL around .Rs/.Re. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man7/pkgsrc.7 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/man7/pkgsrc.7 diff -u src/share/man/man7/pkgsrc.7:1.4 src/share/man/man7/pkgsrc.7:1.5 --- src/share/man/man7/pkgsrc.7:1.4 Wed Sep 5 15:29:10 2007 +++ src/share/man/man7/pkgsrc.7 Tue Mar 23 07:45:58 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pkgsrc.7,v 1.4 2007/09/05 15:29:10 rillig Exp $ +.\ $NetBSD: pkgsrc.7,v 1.5 2010/03/23 07:45:58 jruoho Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -50,5 +50,11 @@ .Sh SEE ALSO .Xr pkg_add 1 , .Xr pkg_delete 1 , -.Xr pkg_info 1 , -.Pa http://www.NetBSD.org/docs/pkgsrc/ +.Xr pkg_info 1 +.Rs +.%A Alistair Crooks +.%A Hubert Feyrer +.%T The pkgsrc guide, +.%T Documentation on the NetBSD packages system +.%U http://www.NetBSD.org/docs/pkgsrc/ +.Re
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: kiyohara Date: Tue Mar 23 10:19:35 UTC 2010 Removed Files: src/sys/arch/evbppc/conf: Makefile.obs200.inc Log Message: Remove unused Makefile.obs200.inc since 'support OpenBlockS600'. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/sys/arch/evbppc/conf/Makefile.obs200.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: njoly Date: Tue Mar 23 12:13:28 UTC 2010 Modified Files: src/sys/dev/i2c: spdmem.c src/sys/dev/ic: nslm7x.c Log Message: Add some missing aprint_naive calls. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/i2c/spdmem.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/ic/nslm7x.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/i2c/spdmem.c diff -u src/sys/dev/i2c/spdmem.c:1.17 src/sys/dev/i2c/spdmem.c:1.18 --- src/sys/dev/i2c/spdmem.c:1.17 Sun Feb 28 11:36:27 2010 +++ src/sys/dev/i2c/spdmem.c Tue Mar 23 12:13:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: spdmem.c,v 1.17 2010/02/28 11:36:27 martin Exp $ */ +/* $NetBSD: spdmem.c,v 1.18 2010/03/23 12:13:28 njoly Exp $ */ /* * Copyright (c) 2007 Nicolas Joly @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: spdmem.c,v 1.17 2010/02/28 11:36:27 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: spdmem.c,v 1.18 2010/03/23 12:13:28 njoly Exp $); #include sys/param.h #include sys/device.h @@ -370,6 +370,7 @@ } } + aprint_naive(\n); aprint_normal(\n); aprint_normal_dev(self, %s, type); strlcpy(sc-sc_type, type, SPDMEM_TYPE_MAXLEN); Index: src/sys/dev/ic/nslm7x.c diff -u src/sys/dev/ic/nslm7x.c:1.54 src/sys/dev/ic/nslm7x.c:1.55 --- src/sys/dev/ic/nslm7x.c:1.54 Sat Feb 13 04:09:36 2010 +++ src/sys/dev/ic/nslm7x.c Tue Mar 23 12:13:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: nslm7x.c,v 1.54 2010/02/13 04:09:36 jakllsch Exp $ */ +/* $NetBSD: nslm7x.c,v 1.55 2010/03/23 12:13:28 njoly Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.54 2010/02/13 04:09:36 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: nslm7x.c,v 1.55 2010/03/23 12:13:28 njoly Exp $); #include sys/param.h #include sys/systm.h @@ -1740,6 +1740,7 @@ return 0; } + aprint_naive(\n); aprint_normal(\n); aprint_normal_dev(sc-sc_dev, National Semiconductor %s Hardware monitor\n, model); @@ -1755,6 +1756,7 @@ int chipid; chipid = (*sc-lm_readreg)(sc, LMD_CHIPID) LM_ID_MASK; + aprint_naive(\n); aprint_normal(\n); aprint_error_dev(sc-sc_dev, Unknown chip (ID %d)\n, chipid); @@ -1817,6 +1819,7 @@ const char *model = NULL; int banksel, vendid, devid, cf_flags; + aprint_naive(\n); aprint_normal(\n); /* Read vendor ID */ banksel = (*sc-lm_readreg)(sc, WB_BANKSEL);
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Tue Mar 23 12:42:55 UTC 2010
Modified Files:
src/sys/dev/scsipi: cd.c
Log Message:
Make cdclose() silent, if we only have the raw partition open (e.g. when
probing for media and not finding any)
To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/sys/dev/scsipi/cd.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/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.299 src/sys/dev/scsipi/cd.c:1.300
--- src/sys/dev/scsipi/cd.c:1.299 Mon Mar 22 16:49:41 2010
+++ src/sys/dev/scsipi/cd.c Tue Mar 23 12:42:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.299 2010/03/22 16:49:41 martin Exp $ */
+/* $NetBSD: cd.c,v 1.300 2010/03/23 12:42:55 martin Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.299 2010/03/22 16:49:41 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.300 2010/03/23 12:42:55 martin Exp $);
#include rnd.h
@@ -510,6 +510,12 @@
struct scsipi_periph *periph = cd-sc_periph;
struct scsipi_adapter *adapt = periph-periph_channel-chan_adapter;
int part = CDPART(dev);
+ int silent = 0;
+
+ if (part == RAW_PART ((cd-sc_dk.dk_label-d_npartitions == 0) ||
+ (part cd-sc_dk.dk_label-d_npartitions
+ cd-sc_dk.dk_label-d_partitions[part].p_fstype == FS_UNUSED)))
+ silent = XS_CTL_SILENT;
mutex_enter(cd-sc_lock);
@@ -526,14 +532,14 @@
if (cd-sc_dk.dk_openmask == 0) {
/* synchronise caches on last close */
- cdcachesync(periph, 0);
+ cdcachesync(periph, silent);
/* drain outstanding calls */
scsipi_wait_drain(periph);
scsipi_prevent(periph, SPAMR_ALLOW,
XS_CTL_IGNORE_ILLEGAL_REQUEST | XS_CTL_IGNORE_MEDIA_CHANGE |
- XS_CTL_IGNORE_NOT_READY);
+ XS_CTL_IGNORE_NOT_READY | silent);
periph-periph_flags = ~PERIPH_OPEN;
scsipi_wait_drain(periph);
CVS commit: src/share/man/man4
Module Name:src Committed By: tsutsui Date: Tue Mar 23 14:51:49 UTC 2010 Modified Files: src/share/man/man4: we.4 Log Message: Note atari SMC_TT in SYNOPSIS. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/we.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/we.4 diff -u src/share/man/man4/we.4:1.16 src/share/man/man4/we.4:1.17 --- src/share/man/man4/we.4:1.16 Wed Apr 30 13:10:55 2008 +++ src/share/man/man4/we.4 Tue Mar 23 14:51:49 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: we.4,v 1.16 2008/04/30 13:10:55 martin Exp $ +.\ $NetBSD: we.4,v 1.17 2010/03/23 14:51:49 tsutsui Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,16 +28,20 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 20, 1997 +.Dd March 23, 2010 .Dt WE 4 .Os .Sh NAME .Nm we .Nd Western Digital/SMC WD80x3, SMC Elite Ultra, and SMC EtherEZ Ethernet cards device driver .Sh SYNOPSIS +.Ss ISA boards .Cd we0 at isa? port 0x280 iomem 0xd irq 9 .Cd we1 at isa? port 0x300 iomem 0xcc000 irq 10 +.Ss MCA boards .Cd we* at mca? slot ? +.Ss atari +.Cd we0 at vme0 irq 4 # SMC Elite Ultra with SMC_TT VME-ISA bridge .Sh DESCRIPTION The .Nm @@ -69,7 +73,8 @@ the on-board RAM for more receive buffers. .El .Pp -Note that all supported MCA cards are 16bit. +Note that all supported MCA cards are 16bit, and the SMC_TT VME-ISA bridge +interface for atari supports only SMC Elite Ultra. .Sh MEDIA SELECTION The ability to select media from software is dependent on the particular model of WD/SMC card. The following models support only manual configuration:
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: jakllsch
Date: Tue Mar 23 15:09:45 UTC 2010
Modified Files:
src/sys/dev/dm: device-mapper.c
Log Message:
Rework module/builtin code so it works in both cases.
(Tested recently in the module case, slightly less recently as builtin.)
haad [if it works] go for it
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dm/device-mapper.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/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.20 src/sys/dev/dm/device-mapper.c:1.21
--- src/sys/dev/dm/device-mapper.c:1.20 Fri Mar 12 16:26:26 2010
+++ src/sys/dev/dm/device-mapper.c Tue Mar 23 15:09:45 2010
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.20 2010/03/12 16:26:26 haad Exp $ */
+/*$NetBSD: device-mapper.c,v 1.21 2010/03/23 15:09:45 jakllsch Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -45,8 +45,6 @@
#include sys/ioctl.h
#include sys/ioccom.h
#include sys/kmem.h
-#include sys/module.h
-#include sys/once.h
#include netbsd-dm.h
#include dm.h
@@ -61,10 +59,9 @@
/* attach and detach routines */
void dmattach(int);
-int dmdestroy(void);
+static int dmdestroy(void);
-static ONCE_DECL(doinit_control);
-static int doinit(void);
+static void dm_doinit(void);
static int dm_cmd_to_fun(prop_dictionary_t);
static int disk_ioctl_switch(dev_t, u_long, void *);
@@ -105,11 +102,6 @@
.d_strategy = dmstrategy
};
-#ifdef _MODULE
-/* Autoconf defines */
-CFDRIVER_DECL(dm, DV_DISK, NULL);
-#endif
-
CFATTACH_DECL3_NEW(dm, 0,
dm_match, dm_attach, dm_detach, NULL, NULL, NULL,
DVF_DETACH_SHUTDOWN);
@@ -146,6 +138,12 @@
{NULL, NULL}
};
+#ifdef _MODULE
+#include sys/module.h
+
+/* Autoconf defines */
+CFDRIVER_DECL(dm, DV_DISK, NULL);
+
MODULE(MODULE_CLASS_DRIVER, dm, NULL);
/* New module handle routine */
@@ -164,10 +162,11 @@
if (error)
break;
- error = RUN_ONCE(doinit_control, doinit);
+ error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
if (error) {
- config_cfdriver_detach(dm_cd);
- break;
+ aprint_error(%s: unable to register cfattach\n,
+ dm_cd.cd_name);
+ return error;
}
error = devsw_attach(dm_cd.cd_name, dm_bdevsw, bmajor,
@@ -177,6 +176,9 @@
config_cfdriver_detach(dm_cd);
break;
}
+
+ dm_doinit();
+
break;
case MODULE_CMD_FINI:
@@ -206,7 +208,7 @@
return error;
}
-
+#endif /* _MODULE */
/*
* dm_match:
@@ -272,34 +274,31 @@
return 0;
}
-static int
-doinit(void)
+static void
+dm_doinit(void)
{
- int error;
-
- error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
- if (error) {
- aprint_error(%s: unable to register cfattach\n,
- dm_cd.cd_name);
- return error;
- }
-
dm_target_init();
dm_dev_init();
dm_pdev_init();
-
- return 0;
}
/* attach routine */
void
dmattach(int n)
{
- RUN_ONCE(doinit_control, doinit);
+ int error;
+
+ error = config_cfattach_attach(dm_cd.cd_name, dm_ca);
+ if (error) {
+ aprint_error(%s: unable to register cfattach\n,
+ dm_cd.cd_name);
+ } else {
+ dm_doinit();
+ }
}
/* Destroy routine */
-int
+static int
dmdestroy(void)
{
int error;
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Mar 23 16:03:33 UTC 2010 Modified Files: src/share/man/man4: we.4 Log Message: New sentence, new line. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/we.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/we.4 diff -u src/share/man/man4/we.4:1.17 src/share/man/man4/we.4:1.18 --- src/share/man/man4/we.4:1.17 Tue Mar 23 14:51:49 2010 +++ src/share/man/man4/we.4 Tue Mar 23 16:03:33 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: we.4,v 1.17 2010/03/23 14:51:49 tsutsui Exp $ +.\ $NetBSD: we.4,v 1.18 2010/03/23 16:03:33 wiz Exp $ .\ .\ Copyright (c) 1997 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,8 +49,8 @@ SMC EtherEZ Ethernet cards. .Sh FLAG VALUES For some clone boards the driver is not able to recognize 16bit or 8bit -interfaces correctly. Since this makes a huge difference (see diagnostic -section below) +interfaces correctly. +Since this makes a huge difference (see diagnostic section below) you can override this by specifying flags value in the config file: .Pp .Cd we2 at isa? port 0x300 iomem 0xe irq 15 flags 4 @@ -60,14 +60,16 @@ .Bl -diag .It 2 force adapter to be treated as 8bit, even if it probes -as a 16bit interface. Improper use of this flag will make the -driver fail or send invalid Ethernet packets. +as a 16bit interface. +Improper use of this flag will make the driver fail or send invalid +Ethernet packets. .It 4 force adapter to be treated as 16bit, even if it probes -as a 8bit interface. For example the COMPEX ENT/U boards -identify as WD8003 compatibles, but are in fact 16bit cards. -Using this flag on a board that really is a 8bit board will -result in bogus packets being sent. +as a 8bit interface. +For example the COMPEX ENT/U boards identify as WD8003 compatibles, +but are in fact 16bit cards. +Using this flag on a board that really is a 8bit board will result +in bogus packets being sent. .It 8 disable the use of double transmit buffers to save space in the on-board RAM for more receive buffers. @@ -77,17 +79,20 @@ interface for atari supports only SMC Elite Ultra. .Sh MEDIA SELECTION The ability to select media from software is dependent on the particular -model of WD/SMC card. The following models support only manual configuration: +model of WD/SMC card. +The following models support only manual configuration: WD8003S, WD8003E, and WD8013EBT. .Pp Other WD/SMC 80x3 interfaces support two types of media on a single card. -All support the AUI media type. The other media is either BNC or UTP -behind a transceiver. Software cannot differentiate between BNC and UTP -cards. On some models, the AUI port is always active. +All support the AUI media type. +The other media is either BNC or UTP behind a transceiver. +Software cannot differentiate between BNC and UTP cards. +On some models, the AUI port is always active. .Pp The SMC Elite Ultra and SMC EtherEZ interfaces support three media -a single card: AUI, BNC, and UTP. If the transceiver is active, the BNC -media is selected. Otherwise, the AUI and UTP ports are both active. +a single card: AUI, BNC, and UTP. +If the transceiver is active, the BNC media is selected. +Otherwise, the AUI and UTP ports are both active. .Pp To enable the AUI media, select the .Em 10base5 @@ -96,7 +101,8 @@ media type with .Xr ifconfig 8 Ns 's .Cm media -directive. To select the other media (transceiver), select the +directive. +To select the other media (transceiver), select the .Em 10base2 or .Em bnc @@ -105,15 +111,17 @@ .Bl -diag .It we0: overriding IRQ \*[Lt]n\*[Gt] to \*[Lt]m\*[Gt] The IRQ specified in the kernel configuration file is different from that -found in the card's configuration registers. The value in the kernel -configuration file is being overridden by the one configured into the card. +found in the card's configuration registers. +The value in the kernel configuration file is being overridden by +the one configured into the card. .It we0: can't wildcard IRQ on a \*[Lt]model\*[Gt] The IRQ was wildcarded in the kernel configuration file, and the card is a WD8003S, WD8003E, or WD8013EBT, which do not support software IRQ configuration. .It we0: failed to clear shared memory at offset \*[Lt]off\*[Gt] The memory test was unable to clear the interface's shared memory -region. This often indicates that the card is configured at a conflicting +region. +This often indicates that the card is configured at a conflicting .Em iomem address. .It we0: warning - receiver ring buffer overrun @@ -121,28 +129,32 @@ ring-buffer to store incoming packets. .Pp The 16bit boards (8013 series) have 16k of memory as well as -fast memory access speed. Typical memory access speed on these -boards is about 4MB/second. These boards generally have no -problems keeping up with full Ethernet speed and
CVS commit: src/share/man/man7
Module Name:src Committed By: wiz Date: Tue Mar 23 16:04:45 UTC 2010 Modified Files: src/share/man/man7: pkgsrc.7 Log Message: Add The pkgsrc developers to guide authors. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man7/pkgsrc.7 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/man7/pkgsrc.7 diff -u src/share/man/man7/pkgsrc.7:1.5 src/share/man/man7/pkgsrc.7:1.6 --- src/share/man/man7/pkgsrc.7:1.5 Tue Mar 23 07:45:58 2010 +++ src/share/man/man7/pkgsrc.7 Tue Mar 23 16:04:45 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: pkgsrc.7,v 1.5 2010/03/23 07:45:58 jruoho Exp $ +.\ $NetBSD: pkgsrc.7,v 1.6 2010/03/23 16:04:45 wiz Exp $ .\ .\ Copyright (c) 2007 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -54,6 +54,7 @@ .Rs .%A Alistair Crooks .%A Hubert Feyrer +.%A The pkgsrc developers .%T The pkgsrc guide, .%T Documentation on the NetBSD packages system .%U http://www.NetBSD.org/docs/pkgsrc/
CVS commit: src/sys/dev/sysmon
Module Name:src Committed By: pgoyette Date: Tue Mar 23 16:52:02 UTC 2010 Modified Files: src/sys/dev/sysmon: sysmon_envsys_events.c Log Message: Additional info in DPRINTF to help debugging efforts To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/sysmon/sysmon_envsys_events.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/sysmon/sysmon_envsys_events.c diff -u src/sys/dev/sysmon/sysmon_envsys_events.c:1.87 src/sys/dev/sysmon/sysmon_envsys_events.c:1.88 --- src/sys/dev/sysmon/sysmon_envsys_events.c:1.87 Fri Mar 19 02:19:13 2010 +++ src/sys/dev/sysmon/sysmon_envsys_events.c Tue Mar 23 16:52:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: sysmon_envsys_events.c,v 1.87 2010/03/19 02:19:13 pgoyette Exp $ */ +/* $NetBSD: sysmon_envsys_events.c,v 1.88 2010/03/23 16:52:02 pgoyette Exp $ */ /*- * Copyright (c) 2007, 2008 Juan Romero Pardines. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.87 2010/03/19 02:19:13 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: sysmon_envsys_events.c,v 1.88 2010/03/23 16:52:02 pgoyette Exp $); #include sys/param.h #include sys/types.h @@ -113,8 +113,9 @@ * even if its ENVSYS_FPERCENT flag and value_max are set. */ - DPRINTF((%s: units %d props 0x%04x edata-flags 0x%04x\n, - __func__, edata-units, props, edata-flags)); + DPRINTF((%s: units %d props 0x%04x upropset 0x%04x max_val %PRId64 + edata-flags 0x%04x\n, __func__, edata-units, props, + edata-upropset, edata-value_max, edata-flags)); if (props edata-units == ENVSYS_INDICATOR) return ENOTSUP;
CVS commit: src/bin/pax
Module Name:src Committed By: dholland Date: Tue Mar 23 17:21:40 UTC 2010 Modified Files: src/bin/pax: tar.1 Log Message: The -X option of tar names a file containing exception globs, not exception filenames, same as in gtar. PR 41168 from Perry. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/bin/pax/tar.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/tar.1 diff -u src/bin/pax/tar.1:1.27 src/bin/pax/tar.1:1.28 --- src/bin/pax/tar.1:1.27 Sun Nov 23 09:51:10 2008 +++ src/bin/pax/tar.1 Tue Mar 23 17:21:40 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tar.1,v 1.27 2008/11/23 09:51:10 dholland Exp $ +.\ $NetBSD: tar.1,v 1.28 2010/03/23 17:21:40 dholland Exp $ .\ .\ Copyright (c) 1996 SigmaSoft, Th. Lockert .\ All rights reserved. @@ -249,7 +249,7 @@ A line may also specify the positional argument .Dq Fl C Ar directory . .It Fl X Ar file , Fl -exclude-from Ar file -Exclude files listed in the given file. +Exclude files matching the shell glob patterns listed in the given file. .\ exclude should be '-E' and '-X' should be one-file-system .Pp Note that it would be more standard to use this option to mean ``do not
CVS commit: src/bin/pax
Module Name:src Committed By: dholland Date: Tue Mar 23 18:09:17 UTC 2010 Modified Files: src/bin/pax: tar.1 Log Message: bump date for previous To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/bin/pax/tar.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/tar.1 diff -u src/bin/pax/tar.1:1.28 src/bin/pax/tar.1:1.29 --- src/bin/pax/tar.1:1.28 Tue Mar 23 17:21:40 2010 +++ src/bin/pax/tar.1 Tue Mar 23 18:09:16 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: tar.1,v 1.28 2010/03/23 17:21:40 dholland Exp $ +.\ $NetBSD: tar.1,v 1.29 2010/03/23 18:09:16 dholland Exp $ .\ .\ Copyright (c) 1996 SigmaSoft, Th. Lockert .\ All rights reserved. @@ -25,7 +25,7 @@ .\ .\ OpenBSD: tar.1,v 1.28 2000/11/09 23:58:56 aaron Exp .\ -.Dd May 4, 2007 +.Dd March 23, 2010 .Dt TAR 1 .Os .Sh NAME
CVS commit: src/share/man/man8
Module Name:src
Committed By: jakllsch
Date: Tue Mar 23 19:19:03 UTC 2010
Added Files:
src/share/man/man8: MAKEDEV2manpage.awk
Log Message:
This actually wasn't (completely) replaced by a shell script, restore.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.13 src/share/man/man8/MAKEDEV2manpage.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/share/man/man8/MAKEDEV2manpage.awk
diff -u /dev/null src/share/man/man8/MAKEDEV2manpage.awk:1.13
--- /dev/null Tue Mar 23 19:19:03 2010
+++ src/share/man/man8/MAKEDEV2manpage.awk Tue Mar 23 19:19:03 2010
@@ -0,0 +1,231 @@
+# $NetBSD: MAKEDEV2manpage.awk,v 1.13 2010/03/23 19:19:03 jakllsch Exp $
+#
+# Copyright (c) 2002
+# Dieter Baron di...@netbsd.org. All rights reserved.
+# Copyright (c) 1999
+# Hubert Feyrer hube...@netbsd.org. All rights reserved.
+# [converted from Hubert's Perl version]
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed by Hubert Feyrer for
+# the NetBSD Project.
+# 4. Neither the name of the University nor the names of its contributors
+#may be used to endorse or promote products derived from this software
+#without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+#
+#
+###
+#
+# Convert src/etc/MAKEDEV.tmpl and
+# src/share/man/man8/MAKEDEV.8.template to
+# src/share/man/man8/MAKEDEV.8, replacing
+# - @@@SPECIAL@@@ with all targets in the first section (all, std, ...)
+# - @@@DEVICES@@@ with the remaining targets
+# - @@@ARCH@@@ with the architecture name
+#
+
+# XXX: uses non-standard AWK function toupper()
+
+BEGIN {
+ MAKEDEV = ../../../etc/MAKEDEV.tmpl;
+print .\\\ *** --;
+print .\\\ *** This file was generated automatically;
+print .\\\ *** from src/etc/MAKEDEV.tmpl and;
+print .\\\ *** src/share/man/man8/MAKEDEV.8.template;
+print .\\\ ***;
+print .\\\ *** DO NOT EDIT - any changes will be lost!!!;
+print .\\\ *** --;
+print .\\\;
+}
+
+function read1line() {
+ if (r1kept)
+ r1l = r1last;
+ else
+ getline r1l MAKEDEV;
+
+ while (r1l ~ /^#[ \t]*$/)
+ getline r1l MAKEDEV;
+
+ if (r1l ~ /^#[ \t]/) {
+ if (r1l ~ /^# /) {
+ # Not a device/other target
+ r1kept = 0;
+ }
+ else {
+ # Continuation line (?)
+ getline r1ll MAKEDEV;
+ while (r1ll ~ /^#\t[ \t]/) {
+sub(/^#\t[ \t]/, , r1ll);
+r1l = r1l r1ll;
+getline r1ll MAKEDEV;
+ }
+ r1last = r1ll;
+ r1kept = 1;
+ }
+ }
+ else
+ r1kept = 0;
+
+ return 1;
+}
+
+/^@@@SPECIAL@@@$/ {
+print .\\\ $0;
+ print .Bl -tag -width 01234567 -compact;
+
+ while (getline l MAKEDEV 0 l !~ /^#.*Device.*Valid.*argument/)
+ ;
+ while (read1line() r1l ~ /^#\t/) {
+ sub(/#[ \t]*/, , r1l);
+ target=r1l;
+ sub(/[ \t].*/, , target);
+ line=r1l;
+ sub(/[^ \t]*[ \t]/, , line);
+ # replace foo with ``foo''
+ gsub(/\[^\]*\/, ``'', line)
+ gsub(/\/, , line)
+ gsub(/[ \t]+/, , line);
+ print .It Ar target;
+ print toupper(substr(line, 1, 1)) substr(line, 2);
+
+ }
+ r1last = r1l;
+ r1kept = 1;
+ print .El;
+ next;
+}
+/^@@@DEVICES@@@$/ {
+print .\\\ $0;
+ print .Bl -tag -width 01;
+
+ read1line();
+ do {
+ sub(/^#[ \t]+/, , r1l);
+ if (r1l ~ /[^ \t]:$/)
+ sub(/:$/, :, r1l);
+ print .It r1l; # print section heading
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: martin
Date: Tue Mar 23 20:01:09 UTC 2010
Modified Files:
src/sys/dev/sun: disksubr.c
Log Message:
Properly convert values according to block size differences between the
underlying device (might be a CD drive) and the sun label when carrying
over defaults from a ISO9660 partition.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sun/disksubr.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/sun/disksubr.c
diff -u src/sys/dev/sun/disksubr.c:1.13 src/sys/dev/sun/disksubr.c:1.14
--- src/sys/dev/sun/disksubr.c:1.13 Tue Mar 16 14:53:08 2010
+++ src/sys/dev/sun/disksubr.c Tue Mar 23 20:01:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.13 2010/03/16 14:53:08 martin Exp $ */
+/* $NetBSD: disksubr.c,v 1.14 2010/03/23 20:01:09 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -55,7 +55,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.13 2010/03/16 14:53:08 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: disksubr.c,v 1.14 2010/03/23 20:01:09 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -281,6 +281,7 @@
struct partition *npp;
struct sun_dkpart *spp;
int i, secpercyl;
+ unsigned int secpblck;
u_short cksum, *sp1, *sp2;
sl = (struct sun_disklabel *)cp;
@@ -299,6 +300,8 @@
lp-d_magic2 = DISKMAGIC;
memcpy(lp-d_packname, sl-sl_text, sizeof(lp-d_packname));
+ secpblck = lp-d_secsize / 512;
+ if (secpblck == 0) secpblck = 1; /* can't happen */
lp-d_secsize = 512;
lp-d_nsectors = sl-sl_nsectors;
lp-d_ntracks= sl-sl_ntracks;
@@ -321,9 +324,10 @@
for (i = 0; i 8; i++) {
spp = sl-sl_part[i];
npp = lp-d_partitions[i];
+
if (npp-p_fstype == FS_ISO9660
- spp-sdkp_cyloffset * secpercyl == npp-p_offset
- spp-sdkp_nsectors = npp-p_size
+ spp-sdkp_cyloffset * secpercyl == npp-p_offset*secpblck
+ spp-sdkp_nsectors = npp-p_size*secpblck
npp-p_size 0 spp-sdkp_nsectors 0) {
/*
* This happens for example on sunlabel'd hybrid
@@ -332,6 +336,9 @@
* partition (including session parameters), so
* we better not overwrite it.
*/
+ npp-p_offset *= secpblck;
+ npp-p_size = spp-sdkp_nsectors;
+ npp-p_cdsession *= secpblck;
continue;
}
npp-p_offset = spp-sdkp_cyloffset * secpercyl;
CVS commit: src/lib/libc
Module Name:src Committed By: drochner Date: Tue Mar 23 20:28:59 UTC 2010 Modified Files: src/lib/libc/gen: devname.c getpwent.c pwcache.c utime.c wait3.c src/lib/libc/rpc: pmap_rmt.c rpcb_clnt.c src/lib/libc/time: localtime.c Log Message: remove some stray __weak_aliases, where the target functions were __RENAMEd due to the time_t/dev_t type changes, which caused bogus references to compat functions now a libc built with BUILDCOLD is usable To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/lib/libc/gen/devname.c cvs rdiff -u -r1.76 -r1.77 src/lib/libc/gen/getpwent.c cvs rdiff -u -r1.30 -r1.31 src/lib/libc/gen/pwcache.c cvs rdiff -u -r1.12 -r1.13 src/lib/libc/gen/utime.c cvs rdiff -u -r1.8 -r1.9 src/lib/libc/gen/wait3.c cvs rdiff -u -r1.29 -r1.30 src/lib/libc/rpc/pmap_rmt.c cvs rdiff -u -r1.24 -r1.25 src/lib/libc/rpc/rpcb_clnt.c cvs rdiff -u -r1.47 -r1.48 src/lib/libc/time/localtime.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/devname.c diff -u src/lib/libc/gen/devname.c:1.20 src/lib/libc/gen/devname.c:1.21 --- src/lib/libc/gen/devname.c:1.20 Sun Apr 19 10:19:26 2009 +++ src/lib/libc/gen/devname.c Tue Mar 23 20:28:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: devname.c,v 1.20 2009/04/19 10:19:26 mrg Exp $ */ +/* $NetBSD: devname.c,v 1.21 2010/03/23 20:28:59 drochner Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #if 0 static char sccsid[] = @(#)devname.c 8.2 (Berkeley) 4/29/95; #else -__RCSID($NetBSD: devname.c,v 1.20 2009/04/19 10:19:26 mrg Exp $); +__RCSID($NetBSD: devname.c,v 1.21 2010/03/23 20:28:59 drochner Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -84,10 +84,6 @@ #include stdlib.h #include err.h -#ifdef __weak_alias -__weak_alias(devname,_devname) -#endif - #define DEV_SZ 317 /* show be prime for best results */ #define VALID 1 /* entry and devname are valid */ #define INVALID 2 /* entry valid, devname NOT valid */ Index: src/lib/libc/gen/getpwent.c diff -u src/lib/libc/gen/getpwent.c:1.76 src/lib/libc/gen/getpwent.c:1.77 --- src/lib/libc/gen/getpwent.c:1.76 Sun Jan 11 02:46:27 2009 +++ src/lib/libc/gen/getpwent.c Tue Mar 23 20:28:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: getpwent.c,v 1.76 2009/01/11 02:46:27 christos Exp $ */ +/* $NetBSD: getpwent.c,v 1.77 2010/03/23 20:28:59 drochner Exp $ */ /*- * Copyright (c) 1997-2000, 2004-2005 The NetBSD Foundation, Inc. @@ -88,7 +88,7 @@ #if 0 static char sccsid[] = @(#)getpwent.c 8.2 (Berkeley) 4/27/95; #else -__RCSID($NetBSD: getpwent.c,v 1.76 2009/01/11 02:46:27 christos Exp $); +__RCSID($NetBSD: getpwent.c,v 1.77 2010/03/23 20:28:59 drochner Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -129,12 +129,6 @@ #ifdef __weak_alias __weak_alias(endpwent,_endpwent) -__weak_alias(getpwent,_getpwent) -__weak_alias(getpwent_r,_getpwent_r) -__weak_alias(getpwnam,_getpwnam) -__weak_alias(getpwnam_r,_getpwnam_r) -__weak_alias(getpwuid,_getpwuid) -__weak_alias(getpwuid_r,_getpwuid_r) __weak_alias(setpassent,_setpassent) __weak_alias(setpwent,_setpwent) #endif Index: src/lib/libc/gen/pwcache.c diff -u src/lib/libc/gen/pwcache.c:1.30 src/lib/libc/gen/pwcache.c:1.31 --- src/lib/libc/gen/pwcache.c:1.30 Mon Apr 28 20:22:59 2008 +++ src/lib/libc/gen/pwcache.c Tue Mar 23 20:28:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pwcache.c,v 1.30 2008/04/28 20:22:59 martin Exp $ */ +/* $NetBSD: pwcache.c,v 1.31 2010/03/23 20:28:59 drochner Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -74,7 +74,7 @@ #if 0 static char sccsid[] = @(#)cache.c 8.1 (Berkeley) 5/31/93; #else -__RCSID($NetBSD: pwcache.c,v 1.30 2008/04/28 20:22:59 martin Exp $); +__RCSID($NetBSD: pwcache.c,v 1.31 2010/03/23 20:28:59 drochner Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -100,7 +100,6 @@ #ifdef __weak_alias __weak_alias(user_from_uid,_user_from_uid) __weak_alias(group_from_gid,_group_from_gid) -__weak_alias(pwcache_userdb,_pwcache_userdb) __weak_alias(pwcache_groupdb,_pwcache_groupdb) #endif Index: src/lib/libc/gen/utime.c diff -u src/lib/libc/gen/utime.c:1.12 src/lib/libc/gen/utime.c:1.13 --- src/lib/libc/gen/utime.c:1.12 Thu Aug 7 16:42:59 2003 +++ src/lib/libc/gen/utime.c Tue Mar 23 20:28:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: utime.c,v 1.12 2003/08/07 16:42:59 agc Exp $ */ +/* $NetBSD: utime.c,v 1.13 2010/03/23 20:28:59 drochner Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)utime.c 8.1 (Berkeley) 6/4/93; #else -__RCSID($NetBSD: utime.c,v 1.12 2003/08/07 16:42:59 agc Exp $); +__RCSID($NetBSD: utime.c,v 1.13 2010/03/23 20:28:59 drochner Exp $); #endif #endif /* LIBC_SCCS and not lint */ @@ -46,10 +46,6 @@ #include stddef.h #include utime.h -#ifdef __weak_alias -__weak_alias(utime,_utime) -#endif - int utime(path, times) const char *path; Index: src/lib/libc/gen/wait3.c
CVS commit: src/lib/libpthread
Module Name:src
Committed By: drochner
Date: Tue Mar 23 20:35:44 UTC 2010
Modified Files:
src/lib/libpthread: pthread_cond.c
Log Message:
catch up with the __RENAME of nanosleep(2) a while ago, otherwise we
get the compatibility function which assumes a different struct timespec
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/lib/libpthread/pthread_cond.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/libpthread/pthread_cond.c
diff -u src/lib/libpthread/pthread_cond.c:1.54 src/lib/libpthread/pthread_cond.c:1.55
--- src/lib/libpthread/pthread_cond.c:1.54 Sun Jan 18 12:14:17 2009
+++ src/lib/libpthread/pthread_cond.c Tue Mar 23 20:35:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread_cond.c,v 1.54 2009/01/18 12:14:17 lukem Exp $ */
+/* $NetBSD: pthread_cond.c,v 1.55 2010/03/23 20:35:44 drochner Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread_cond.c,v 1.54 2009/01/18 12:14:17 lukem Exp $);
+__RCSID($NetBSD: pthread_cond.c,v 1.55 2010/03/23 20:35:44 drochner Exp $);
#include errno.h
#include sys/time.h
@@ -55,7 +55,7 @@
#include pthread.h
#include pthread_int.h
-int _sys_nanosleep(const struct timespec *, struct timespec *);
+int _sys___nanosleep50(const struct timespec *, struct timespec *);
extern int pthread__started;
@@ -356,7 +356,7 @@
do {
pthread__testcancel(self);
pthread_mutex_unlock(mutex);
- retval = _sys_nanosleep(diff, NULL);
+ retval = _sys___nanosleep50(diff, NULL);
pthread_mutex_lock(mutex);
} while (abstime == NULL retval == 0);
pthread__testcancel(self);
CVS commit: src/sys/arch/i386/mca
Module Name:src Committed By: dyoung Date: Tue Mar 23 21:18:23 UTC 2010 Modified Files: src/sys/arch/i386/mca: mca_machdep.c Log Message: dmaiot is supposed to be a bus_space_tag_t, not a bus_space_handle_t. Make it so. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/i386/mca/mca_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/i386/mca/mca_machdep.c diff -u src/sys/arch/i386/mca/mca_machdep.c:1.38 src/sys/arch/i386/mca/mca_machdep.c:1.39 --- src/sys/arch/i386/mca/mca_machdep.c:1.38 Mon May 4 12:19:30 2009 +++ src/sys/arch/i386/mca/mca_machdep.c Tue Mar 23 21:18:23 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mca_machdep.c,v 1.38 2009/05/04 12:19:30 cegger Exp $ */ +/* $NetBSD: mca_machdep.c,v 1.39 2010/03/23 21:18:23 dyoung Exp $ */ /*- * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mca_machdep.c,v 1.38 2009/05/04 12:19:30 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: mca_machdep.c,v 1.39 2010/03/23 21:18:23 dyoung Exp $); #include sys/types.h #include sys/param.h @@ -129,7 +129,8 @@ /* Used to kick MCA DMA controller */ #define DMA_CMD 0x18 /* command the controller */ #define DMA_EXEC 0x1A /* tell controller how to do things */ -static bus_space_handle_t dmaiot, dmacmdh, dmaexech; +static bus_space_handle_t dmacmdh, dmaexech; +static bus_space_tag_t dmaiot; /* * MCA DMA controller commands. The exact sense of individual bits
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: dyoung
Date: Tue Mar 23 21:22:25 UTC 2010
Modified Files:
src/sys/dev/pci: if_hme_pci.c
Log Message:
Use the PCI BAR type to decide which I/O enables to set.
TBD: Put back the old BAR #definition, s/PCI_BAR(0)/PCI_HME_BASEADDR/.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_hme_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_hme_pci.c
diff -u src/sys/dev/pci/if_hme_pci.c:1.32 src/sys/dev/pci/if_hme_pci.c:1.33
--- src/sys/dev/pci/if_hme_pci.c:1.32 Thu Mar 11 04:00:36 2010
+++ src/sys/dev/pci/if_hme_pci.c Tue Mar 23 21:22:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.32 2010/03/11 04:00:36 mrg Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.33 2010/03/23 21:22:25 dyoung Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_hme_pci.c,v 1.32 2010/03/11 04:00:36 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_hme_pci.c,v 1.33 2010/03/23 21:22:25 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -144,23 +144,24 @@
PCI_REVISION(pa-pa_class));
aprint_naive(: Ethernet controller\n);
+ csr = pci_conf_read(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG);
+ type = pci_mapreg_type(pa-pa_pc, pa-pa_tag, PCI_BAR(0));
+
/*
* enable io/memory-space accesses. this is kinda of gross; but
- # the hme comes up with neither IO space enabled, or memory space.
+ * the hme comes up with neither IO space enabled, or memory space.
*/
- if (pa-pa_memt)
+ switch (type) {
+ case PCI_MAPREG_TYPE_MEM:
pa-pa_flags |= PCI_FLAGS_MEM_ENABLED;
- if (pa-pa_iot)
- pa-pa_flags |= PCI_FLAGS_IO_ENABLED;
- csr = pci_conf_read(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG);
- if (pa-pa_memt) {
- type = PCI_MAPREG_TYPE_MEM;
csr |= PCI_COMMAND_MEM_ENABLE;
sc-sc_bustag = pa-pa_memt;
- } else {
- type = PCI_MAPREG_TYPE_IO;
+ break;
+ case PCI_MAPREG_TYPE_IO:
+ pa-pa_flags |= PCI_FLAGS_IO_ENABLED;
csr |= PCI_COMMAND_IO_ENABLE;
sc-sc_bustag = pa-pa_iot;
+ break;
}
pci_conf_write(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG,
csr | PCI_COMMAND_MEM_ENABLE);
@@ -179,8 +180,7 @@
*
*/
-#define PCI_HME_BASEADDR 0x10
- if (pci_mapreg_map(pa, PCI_HME_BASEADDR, type, 0,
+ if (pci_mapreg_map(pa, PCI_BAR(0), type, 0,
hsc-hsc_memt, hsc-hsc_memh, NULL, NULL) != 0) {
aprint_error_dev(self, unable to map device registers\n);
return;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: dyoung
Date: Tue Mar 23 21:51:39 UTC 2010
Modified Files:
src/sys/dev/pci: if_hme_pci.c
Log Message:
Put back PCI_HME_BASEADDR.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/if_hme_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_hme_pci.c
diff -u src/sys/dev/pci/if_hme_pci.c:1.33 src/sys/dev/pci/if_hme_pci.c:1.34
--- src/sys/dev/pci/if_hme_pci.c:1.33 Tue Mar 23 21:22:25 2010
+++ src/sys/dev/pci/if_hme_pci.c Tue Mar 23 21:51:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.33 2010/03/23 21:22:25 dyoung Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.34 2010/03/23 21:51:39 dyoung Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_hme_pci.c,v 1.33 2010/03/23 21:22:25 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_hme_pci.c,v 1.34 2010/03/23 21:51:39 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -56,6 +56,8 @@
#include dev/ic/hmevar.h
+#define PCI_HME_BASEADDR 0x10
+
struct hme_pci_softc {
struct hme_softc hsc_hme; /* HME device */
bus_space_tag_t hsc_memt;
@@ -145,7 +147,7 @@
aprint_naive(: Ethernet controller\n);
csr = pci_conf_read(pa-pa_pc, pa-pa_tag, PCI_COMMAND_STATUS_REG);
- type = pci_mapreg_type(pa-pa_pc, pa-pa_tag, PCI_BAR(0));
+ type = pci_mapreg_type(pa-pa_pc, pa-pa_tag, PCI_HME_BASEADDR);
/*
* enable io/memory-space accesses. this is kinda of gross; but
@@ -180,7 +182,7 @@
*
*/
- if (pci_mapreg_map(pa, PCI_BAR(0), type, 0,
+ if (pci_mapreg_map(pa, PCI_HME_BASEADDR, type, 0,
hsc-hsc_memt, hsc-hsc_memh, NULL, NULL) != 0) {
aprint_error_dev(self, unable to map device registers\n);
return;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: dyoung
Date: Tue Mar 23 21:54:23 UTC 2010
Modified Files:
src/sys/dev/pci: if_hme_pci.c
Log Message:
In the #definition of PCI_HME_BASEADDR, use PCI_BAR(0) instead of the
anonymous constant 0x10.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/if_hme_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_hme_pci.c
diff -u src/sys/dev/pci/if_hme_pci.c:1.34 src/sys/dev/pci/if_hme_pci.c:1.35
--- src/sys/dev/pci/if_hme_pci.c:1.34 Tue Mar 23 21:51:39 2010
+++ src/sys/dev/pci/if_hme_pci.c Tue Mar 23 21:54:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.34 2010/03/23 21:51:39 dyoung Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.35 2010/03/23 21:54:23 dyoung Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_hme_pci.c,v 1.34 2010/03/23 21:51:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_hme_pci.c,v 1.35 2010/03/23 21:54:23 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -56,7 +56,7 @@
#include dev/ic/hmevar.h
-#define PCI_HME_BASEADDR 0x10
+#define PCI_HME_BASEADDR PCI_BAR(0)
struct hme_pci_softc {
struct hme_softc hsc_hme; /* HME device */
CVS commit: src/sys
Module Name:src
Committed By: pgoyette
Date: Wed Mar 24 00:31:41 UTC 2010
Modified Files:
src/sys/conf: files
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: spdmem_i2c.c
src/sys/dev/ic: spdmem.c spdmemreg.h spdmemvar.h
Removed Files:
src/sys/dev/i2c: spdmem.c spdmemreg.h spdmemvar.h
Log Message:
Split spdmem driver into a bus attachment and a common back-end
probe and ROM decode, to follow similar changes made in OpenBSD:
http://article.gmane.org/gmane.os.openbsd.cvs/94948
http://article.gmane.org/gmane.os.openbsd.cvs/94956
There exists at least one alternative attachment (for SGI IP35
systems; see http://article.gmane.org/gmane.os.openbsd.cvs/94947),
and there could be more in the future.
Thanks to Christoph Egger for pointing out the OpenBSD activity.
To generate a diff of this commit:
cvs rdiff -u -r1.983 -r1.984 src/sys/conf/files
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r1.18 -r0 src/sys/dev/i2c/spdmem.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/spdmem_i2c.c
cvs rdiff -u -r1.3 -r0 src/sys/dev/i2c/spdmemreg.h
cvs rdiff -u -r1.7 -r0 src/sys/dev/i2c/spdmemvar.h
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/spdmem.c src/sys/dev/ic/spdmemreg.h \
src/sys/dev/ic/spdmemvar.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/conf/files
diff -u src/sys/conf/files:1.983 src/sys/conf/files:1.984
--- src/sys/conf/files:1.983 Mon Mar 15 20:35:19 2010
+++ src/sys/conf/files Wed Mar 24 00:31:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.983 2010/03/15 20:35:19 christos Exp $
+# $NetBSD: files,v 1.984 2010/03/24 00:31:41 pgoyette Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20090313
@@ -328,6 +328,13 @@
device lm: sysmon_envsys
file dev/ic/nslm7x.c lm needs-flag
+# JEDEC standard SPD EPROM
+#
+# (included here so files.i2c can define an attachment)
+
+device spdmem
+file dev/ic/spdmem.c spdmem
+
# I2C device support
include dev/i2c/files.i2c
Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.26 src/sys/dev/i2c/files.i2c:1.27
--- src/sys/dev/i2c/files.i2c:1.26 Mon Feb 22 03:50:56 2010
+++ src/sys/dev/i2c/files.i2c Wed Mar 24 00:31:41 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.26 2010/02/22 03:50:56 pgoyette Exp $
+# $NetBSD: files.i2c,v 1.27 2010/03/24 00:31:41 pgoyette Exp $
defflag opt_i2cbus.hI2C_SCAN
define i2cbus { }
@@ -102,9 +102,8 @@
file dev/i2c/xbseeprom.c xbseeprom
# Memory Serial Presence Detect
-device spdmem
-attach spdmem at iic
-file dev/i2c/spdmem.c spdmem
+attach spdmem at iic with spdmem_iic
+file dev/i2c/spdmem_i2c.c spdmem_iic
# Memory Temp Sensor
device sdtemp: sysmon_envsys
Added files:
Index: src/sys/dev/i2c/spdmem_i2c.c
diff -u /dev/null src/sys/dev/i2c/spdmem_i2c.c:1.1
--- /dev/null Wed Mar 24 00:31:41 2010
+++ src/sys/dev/i2c/spdmem_i2c.c Wed Mar 24 00:31:41 2010
@@ -0,0 +1,122 @@
+/* $NetBSD: spdmem_i2c.c,v 1.1 2010/03/24 00:31:41 pgoyette Exp $ */
+
+/*
+ * Copyright (c) 2007 Nicolas Joly
+ * Copyright (c) 2007 Paul Goyette
+ * Copyright (c) 2007 Tobias Nygren
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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.
+ */
+
+/*
+ * Serial Presence Detect (SPD) memory identification
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: spdmem_i2c.c,v 1.1 2010/03/24 00:31:41 pgoyette Exp $);
+
+#include sys/param.h
+#include sys/device.h
+#include sys/endian.h
+#include sys/sysctl.h
+#include machine/bswap.h
+
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: macallan
Date: Wed Mar 24 00:33:06 UTC 2010
Modified Files:
src/sys/dev/sbus: files.sbus
Added Files:
src/sys/dev/sbus: cgtwelve.c cgtwelvereg.h
Log Message:
first stab at a driver for the cg12 / matrox cg3
for now it uses the same monochrome overlay as OBP, otherwise it's got the
usual wsdisplay / vcons goodies
TODO:
- fill in mmap and ioctl methods so we can at least run X in monochrome
- figure out where the 24bit buffer is ( and maybe if there's an 8 bit buffer )
- see if we can do any acceleration
- find the DAC registers
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/sbus/cgtwelve.c \
src/sys/dev/sbus/cgtwelvereg.h
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/sbus/files.sbus
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/sbus/files.sbus
diff -u src/sys/dev/sbus/files.sbus:1.35 src/sys/dev/sbus/files.sbus:1.36
--- src/sys/dev/sbus/files.sbus:1.35 Mon Mar 1 05:42:08 2010
+++ src/sys/dev/sbus/files.sbus Wed Mar 24 00:33:06 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.sbus,v 1.35 2010/03/01 05:42:08 macallan Exp $
+# $NetBSD: files.sbus,v 1.36 2010/03/24 00:33:06 macallan Exp $
#
# Config file and device description for machine-independent SBUS code.
# Included by ports that need it.
@@ -148,3 +148,9 @@
attach agten at sbus
file dev/sbus/agten.c agten needs-flag
file dev/ic/i128.c agten
+
+# Sun CG12 / Matrox SG3
+defflag opt_cgtwelve.h CG12_DEBUG
+device cgtwelve: fb, rasops1, rasops8, wsemuldisplaydev, vcons
+attach cgtwelve at sbus
+file dev/sbus/cgtwelve.c cgtwelve
Added files:
Index: src/sys/dev/sbus/cgtwelve.c
diff -u /dev/null src/sys/dev/sbus/cgtwelve.c:1.1
--- /dev/null Wed Mar 24 00:33:06 2010
+++ src/sys/dev/sbus/cgtwelve.c Wed Mar 24 00:33:06 2010
@@ -0,0 +1,250 @@
+/* $NetBSD: cgtwelve.c,v 1.1 2010/03/24 00:33:06 macallan Exp $ */
+
+/*-
+ * Copyright (c) 2010 Michael Lorenz
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * 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.
+ */
+
+/* a console driver for the Sun CG12 / Matrox SG3 graphics board */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: cgtwelve.c,v 1.1 2010/03/24 00:33:06 macallan Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/buf.h
+#include sys/device.h
+#include sys/ioctl.h
+#include sys/conf.h
+
+#include sys/bus.h
+#include machine/autoconf.h
+
+#include dev/sbus/sbusvar.h
+#include dev/sun/fbio.h
+#include dev/sun/fbvar.h
+
+#include dev/wscons/wsdisplayvar.h
+#include dev/wscons/wsconsio.h
+#include dev/wsfont/wsfont.h
+#include dev/rasops/rasops.h
+
+#include dev/wscons/wsdisplay_vconsvar.h
+
+#include dev/sbus/cgtwelvereg.h
+
+#include opt_wsemul.h
+#include opt_cgtwelve.h
+
+
+struct cgtwelve_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_tag;
+ void *sc_fbaddr;
+ int sc_width;
+ int sc_height;
+ int sc_stride;
+ int sc_fbsize;
+ int sc_mode;
+ struct vcons_data vd;
+};
+
+static int cgtwelve_match(device_t, cfdata_t, void *);
+static void cgtwelve_attach(device_t, device_t, void *);
+static int cgtwelve_ioctl(void *, void *, u_long, void *, int,
+ struct lwp*);
+static paddr_t cgtwelve_mmap(void *, void *, off_t, int);
+static void cgtwelve_init_screen(void *, struct vcons_screen *, int,
+ long *);
+
+CFATTACH_DECL_NEW(cgtwelve, sizeof(struct cgtwelve_softc),
+cgtwelve_match, cgtwelve_attach, NULL, NULL);
+
+struct wsscreen_descr cgtwelve_defscreendesc = {
+ default,
+ 0, 0,
+ NULL,
+ 8, 16,
+ 0,
+};
+
+static struct vcons_screen cgtwelve_console_screen;
+
+const struct wsscreen_descr *_cgtwelve_scrlist[] = {
+ cgtwelve_defscreendesc,
+ /* XXX other
CVS commit: src/sys/arch/sparc/conf
Module Name:src Committed By: macallan Date: Wed Mar 24 00:39:07 UTC 2010 Modified Files: src/sys/arch/sparc/conf: GENERIC INSTALL Log Message: enable CG12 support To generate a diff of this commit: cvs rdiff -u -r1.220 -r1.221 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sparc/conf/INSTALL 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/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.220 src/sys/arch/sparc/conf/GENERIC:1.221 --- src/sys/arch/sparc/conf/GENERIC:1.220 Mon Mar 1 06:14:17 2010 +++ src/sys/arch/sparc/conf/GENERIC Wed Mar 24 00:39:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.220 2010/03/01 06:14:17 macallan Exp $ +# $NetBSD: GENERIC,v 1.221 2010/03/24 00:39:07 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.220 $ +#ident GENERIC-$Revision: 1.221 $ maxusers 32 @@ -688,6 +688,10 @@ # there can be only one tcx0 at sbus? slot ? offset ? +## Sun CG12 / Matrox SG3 accelerated 24bit framebuffer +## runs monochrome only for now +cgtwelve* at sbus? slot ? offset ? + # Sun cgfourteen accelerated 24-bit framebuffer. cgfourteen* at obio0 # sun4m Index: src/sys/arch/sparc/conf/INSTALL diff -u src/sys/arch/sparc/conf/INSTALL:1.73 src/sys/arch/sparc/conf/INSTALL:1.74 --- src/sys/arch/sparc/conf/INSTALL:1.73 Mon Mar 1 06:14:17 2010 +++ src/sys/arch/sparc/conf/INSTALL Wed Mar 24 00:39:07 2010 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.73 2010/03/01 06:14:17 macallan Exp $ +# $NetBSD: INSTALL,v 1.74 2010/03/24 00:39:07 macallan Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -556,6 +556,11 @@ # there can be only one tcx0 at sbus? slot ? offset ? +## Sun CG12 / Matrox SG3 accelerated 24bit framebuffer +## runs monochrome only for now +## since it occupies 3 SBus slots there's no way to use more than one +cgtwelve0 at sbus? slot ? offset ? + # Sun cgfourteen accelerated 24-bit framebuffer. cgfourteen* at obio0 # sun4m
CVS commit: src/doc
Module Name:src Committed By: macallan Date: Wed Mar 24 00:41:21 UTC 2010 Modified Files: src/doc: CHANGES Log Message: mention cgtwelve To generate a diff of this commit: cvs rdiff -u -r1.1371 -r1.1372 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.1371 src/doc/CHANGES:1.1372 --- src/doc/CHANGES:1.1371 Fri Mar 19 04:19:28 2010 +++ src/doc/CHANGES Wed Mar 24 00:41:21 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1371 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1372 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -569,3 +569,5 @@ the SMC_TT VME-ISA bridge. [tsutsui 20100313] aibs(4): Remove aiboost(4) as obsolete and redundant since the introduction of aibs(4). [cnst 20100319] + cgtwelve: A driver for Sun CG12 / Matrox SG3 graphics boards + [macallan 20100323]
CVS commit: src/sys/dev
Module Name:src
Committed By: dyoung
Date: Wed Mar 24 01:13:30 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_ec.c
src/sys/dev/isa: pas.c
Log Message:
Do not use unitialized bus_space_tag_t's. Use the tag(s) from the
attachment arguments.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/isa/pas.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.62 src/sys/dev/acpi/acpi_ec.c:1.63
--- src/sys/dev/acpi/acpi_ec.c:1.62 Fri Mar 5 14:00:16 2010
+++ src/sys/dev/acpi/acpi_ec.c Wed Mar 24 01:13:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ec.c,v 1.62 2010/03/05 14:00:16 jruoho Exp $ */
+/* $NetBSD: acpi_ec.c,v 1.63 2010/03/24 01:13:30 dyoung Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.62 2010/03/05 14:00:16 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.63 2010/03/24 01:13:30 dyoung Exp $);
#include sys/param.h
#include sys/callout.h
@@ -149,7 +149,8 @@
static void acpiec_attach(device_t, device_t, void *);
static void acpiec_common_attach(device_t, device_t, ACPI_HANDLE,
-bus_addr_t, bus_addr_t, ACPI_HANDLE, uint8_t);
+bus_space_tag_t, bus_addr_t, bus_space_tag_t, bus_addr_t,
+ACPI_HANDLE, uint8_t);
static bool acpiec_suspend(device_t, const pmf_qual_t *);
static bool acpiec_resume(device_t, const pmf_qual_t *);
@@ -225,6 +226,7 @@
static void
acpiecdt_attach(device_t parent, device_t self, void *aux)
{
+ struct acpi_attach_args *aa = aux;
ACPI_HANDLE ec_handle;
bus_addr_t cmd_reg, data_reg;
uint8_t gpebit;
@@ -235,8 +237,8 @@
aprint_naive(\n);
aprint_normal(: ACPI Embedded Controller via ECDT\n);
- acpiec_common_attach(parent, self, ec_handle, cmd_reg, data_reg,
- NULL, gpebit);
+ acpiec_common_attach(parent, self, ec_handle, aa-aa_iot, cmd_reg,
+ aa-aa_iot, data_reg, NULL, gpebit);
}
static int
@@ -290,7 +292,8 @@
}
acpiec_common_attach(parent, self, aa-aa_node-ad_handle,
- io1-ar_base, io0-ar_base, gpe_handle, gpebit);
+ aa-aa_iot, io1-ar_base, aa-aa_iot, io0-ar_base,
+ gpe_handle, gpebit);
free_res:
acpi_resource_cleanup(ec_res);
@@ -298,13 +301,17 @@
static void
acpiec_common_attach(device_t parent, device_t self,
-ACPI_HANDLE ec_handle, bus_addr_t cmd_reg, bus_addr_t data_reg,
+ACPI_HANDLE ec_handle, bus_space_tag_t cmdt, bus_addr_t cmd_reg,
+bus_space_tag_t datat, bus_addr_t data_reg,
ACPI_HANDLE gpe_handle, uint8_t gpebit)
{
struct acpiec_softc *sc = device_private(self);
ACPI_STATUS rv;
ACPI_INTEGER val;
+ sc-sc_csr_st = cmdt;
+ sc-sc_data_st = datat;
+
sc-sc_ech = ec_handle;
sc-sc_gpeh = gpe_handle;
sc-sc_gpebit = gpebit;
Index: src/sys/dev/isa/pas.c
diff -u src/sys/dev/isa/pas.c:1.67 src/sys/dev/isa/pas.c:1.68
--- src/sys/dev/isa/pas.c:1.67 Sat Mar 15 21:09:02 2008
+++ src/sys/dev/isa/pas.c Wed Mar 24 01:13:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pas.c,v 1.67 2008/03/15 21:09:02 cube Exp $ */
+/* $NetBSD: pas.c,v 1.68 2010/03/24 01:13:30 dyoung Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pas.c,v 1.67 2008/03/15 21:09:02 cube Exp $);
+__KERNEL_RCSID(0, $NetBSD: pas.c,v 1.68 2010/03/24 01:13:30 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -287,7 +287,7 @@
return 0;
memset(sc, 0, sizeof *sc);
- return pasfind(match, sc, aux, PASPROBE);
+ return pasfind(match, sc, ia, PASPROBE);
}
/*
@@ -309,7 +309,7 @@
return 0;
}
- if (bus_space_map(sc-sc_sbdsp.sc_iot, PAS_DEFAULT_BASE, 1, 0,
+ if (bus_space_map(ia-ia_iot, PAS_DEFAULT_BASE, 1, 0,
sc-pas_port_handle)) {
printf(pas: can't map base register %x in probe\n,
PAS_DEFAULT_BASE);
@@ -395,7 +395,7 @@
sc-sc_sbdsp.sc_iot = ia-ia_iot;
/* Map i/o space [we map 24 ports which is the max of the sb and pro */
- if (bus_space_map(sc-sc_sbdsp.sc_iot, ia-ia_io[0].ir_addr,
+ if (bus_space_map(ia-ia_iot, ia-ia_io[0].ir_addr,
SBP_NPORT, 0, sc-sc_sbdsp.sc_ioh)) {
printf(pas: can't map i/o space 0x%x/%d in probe\n,
ia-ia_io[0].ir_addr, SBP_NPORT);
@@ -444,11 +444,11 @@
unmap:
if (rc == 0 || probing)
- bus_space_unmap(sc-sc_sbdsp.sc_iot, sc-sc_sbdsp.sc_ioh,
+ bus_space_unmap(ia-ia_iot, sc-sc_sbdsp.sc_ioh,
SBP_NPORT);
unmap1:
if (rc == 0 || probing)
- bus_space_unmap(sc-sc_sbdsp.sc_iot, PAS_DEFAULT_BASE, 1);
+ bus_space_unmap(ia-ia_iot, PAS_DEFAULT_BASE, 1);
return rc;
}
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: pgoyette
Date: Wed Mar 24 01:45:38 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_apm.c
Log Message:
Only set the APM_BATT_FLAG_NO_SYSTEM_BATTERY if _all_ batteries are
not_present.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_apm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_apm.c
diff -u src/sys/dev/acpi/acpi_apm.c:1.15 src/sys/dev/acpi/acpi_apm.c:1.16
--- src/sys/dev/acpi/acpi_apm.c:1.15 Fri Mar 5 14:00:16 2010
+++ src/sys/dev/acpi/acpi_apm.c Wed Mar 24 01:45:37 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $ */
+/* $NetBSD: acpi_apm.c,v 1.16 2010/03/24 01:45:37 pgoyette Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_apm.c,v 1.15 2010/03/05 14:00:16 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_apm.c,v 1.16 2010/03/24 01:45:37 pgoyette Exp $);
#include sys/param.h
#include sys/device.h
@@ -262,7 +262,7 @@
APM_BATT_FLAG_LOW | \
APM_BATT_FLAG_HIGH)
int i, curcap, lowcap, warncap, cap, descap, lastcap, discharge;
- int cap_valid, lastcap_valid, discharge_valid;
+ int cap_valid, lastcap_valid, discharge_valid, present;
envsys_tre_data_t etds;
envsys_basic_info_t ebis;
@@ -271,7 +271,7 @@
/* Prepare to aggregate these two variables over all batteries. */
cap = lastcap = discharge = 0;
- cap_valid = lastcap_valid = discharge_valid = 0;
+ cap_valid = lastcap_valid = discharge_valid = present = 0;
(void)memset(pinfo, 0, sizeof(*pinfo));
pinfo-ac_state = APM_AC_UNKNOWN;
@@ -307,8 +307,8 @@
continue;
if (strstr(desc, connected)) {
pinfo-ac_state = data ? APM_AC_ON : APM_AC_OFF;
- } else if (strstr(desc, present) data == 0)
- pinfo-battery_flags |= APM_BATT_FLAG_NO_SYSTEM_BATTERY;
+ } else if (strstr(desc, present) data != 0)
+ present++;
else if (strstr(desc, charging) data)
pinfo-battery_flags |= APM_BATT_FLAG_CHARGING;
else if (strstr(desc, charging) !data)
@@ -337,6 +337,9 @@
}
sysmonclose_envsys(0, 0, 0, lwp0);
+ if (present == 0)
+ pinfo-battery_flags |= APM_BATT_FLAG_NO_SYSTEM_BATTERY;
+
if (cap_valid 0) {
if (warncap != -1 cap warncap)
pinfo-battery_flags |= APM_BATT_FLAG_CRITICAL;
