CVS commit: src/sys/dev/mii
Module Name:src Committed By: rjs Date: Thu Jun 18 08:40:26 UTC 2009 Modified Files: src/sys/dev/mii: mvphy.c Log Message: Make it compile. Change a commented out printf() to aprint_error_dev(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/mii/mvphy.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/mii/mvphy.c diff -u src/sys/dev/mii/mvphy.c:1.8 src/sys/dev/mii/mvphy.c:1.9 --- src/sys/dev/mii/mvphy.c:1.8 Mon Nov 17 03:04:27 2008 +++ src/sys/dev/mii/mvphy.c Thu Jun 18 08:40:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: mvphy.c,v 1.8 2008/11/17 03:04:27 dyoung Exp $ */ +/* $NetBSD: mvphy.c,v 1.9 2009/06/18 08:40:26 rjs Exp $ */ /*- * Copyright (c) 2006 Sam Leffler, Errno Consulting @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: mvphy.c,v 1.8 2008/11/17 03:04:27 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: mvphy.c,v 1.9 2009/06/18 08:40:26 rjs Exp $); #include sys/param.h #include sys/systm.h @@ -53,10 +53,10 @@ #define MV_CPU_PORT 5 /* port # of CPU port */ #define MV_READ(p, phy, r) \ - (*(p)-mii_pdata-mii_readreg)(device_parent((p)-mii_dev), \ + (*(p)-mii_pdata-mii_readreg)(device_parent((p)-mii_dev), \ phy, (r)) #define MV_WRITE(p, phy, r, v) \ - (*(p)-mii_pdata-mii_writereg)(device_parent((p)-mii_dev), \ + (*(p)-mii_pdata-mii_writereg)(device_parent((p)-mii_dev), \ phy, (r), (v)) /* XXX sysctl'able */ @@ -346,6 +346,5 @@ MV_WRITE(sc, MII_MV_SWITCH_GLOBAL_ADDR, MV_ATU_OPERATION, MV_ATU_OP_FLUSH_ALL | MV_ATU_BUSY); } /*else - printf(%s: timeout waiting for ATU flush\n, - device_xname(sc-mii_dev));*/ + aprint_error_dev(sc-mii_dev, timeout waiting for ATU flush\n);*/ }
CVS commit: [jym-xensuspend] src/sys/arch/xen/x86
Module Name:src Committed By: cegger Date: Thu Jun 18 11:12:07 UTC 2009 Modified Files: src/sys/arch/xen/x86 [jym-xensuspend]: cpu.c Log Message: register physical CPUs with pmf. No suspend/resume handlers needed since the hypervisor itself handles them. ok @jym To generate a diff of this commit: cvs rdiff -u -r1.31.2.1 -r1.31.2.2 src/sys/arch/xen/x86/cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/x86/cpu.c diff -u src/sys/arch/xen/x86/cpu.c:1.31.2.1 src/sys/arch/xen/x86/cpu.c:1.31.2.2 --- src/sys/arch/xen/x86/cpu.c:1.31.2.1 Mon Feb 9 00:03:55 2009 +++ src/sys/arch/xen/x86/cpu.c Thu Jun 18 11:12:07 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.31.2.1 2009/02/09 00:03:55 jym Exp $ */ +/* $NetBSD: cpu.c,v 1.31.2.2 2009/06/18 11:12:07 cegger Exp $ */ /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp */ /*- @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.31.2.1 2009/02/09 00:03:55 jym Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.31.2.2 2009/06/18 11:12:07 cegger Exp $); #include opt_ddb.h #include opt_multiprocessor.h @@ -275,6 +275,10 @@ default: panic(unknown processor type??\n); } + + if (!pmf_device_register(self, NULL, NULL)) + aprint_error_dev(self, couldn't establish power handler\n); + return; #else cpu_attach_common(parent, self, aux);
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: rjs
Date: Thu Jun 18 11:33:32 UTC 2009
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.89 src/sys/dev/mii/miidevs.h:1.90
--- src/sys/dev/mii/miidevs.h:1.89 Sun Apr 19 11:18:07 2009
+++ src/sys/dev/mii/miidevs.h Thu Jun 18 11:33:31 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.89 2009/04/19 11:18:07 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.90 2009/06/18 11:33:31 rjs Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.87 2009/04/19 11:17:46 msaitoh Exp
+ * NetBSD: miidevs,v 1.88 2009/06/18 11:32:29 rjs Exp
*/
/*-
@@ -309,6 +309,8 @@
#define MII_STR_xxMARVELL_E Marvell 88E Gigabit PHY
#define MII_MODEL_xxMARVELL_E1116 0x0021
#define MII_STR_xxMARVELL_E1116 Marvell 88E1116 Gigabit PHY
+#define MII_MODEL_xxMARVELL_E1116R 0x0024
+#define MII_STR_xxMARVELL_E1116R Marvell 88E1116R Gigabit PHY
/* Myson Technology PHYs */
#define MII_MODEL_xxMYSON_MTD972 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.79 src/sys/dev/mii/miidevs_data.h:1.80
--- src/sys/dev/mii/miidevs_data.h:1.79 Sun Apr 19 11:18:07 2009
+++ src/sys/dev/mii/miidevs_data.h Thu Jun 18 11:33:31 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.79 2009/04/19 11:18:07 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.80 2009/06/18 11:33:31 rjs Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.87 2009/04/19 11:17:46 msaitoh Exp
+ * NetBSD: miidevs,v 1.88 2009/06/18 11:32:29 rjs Exp
*/
/*-
@@ -117,6 +117,7 @@
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E6060, MII_STR_xxMARVELL_E6060 },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E, MII_STR_xxMARVELL_E },
{ MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116, MII_STR_xxMARVELL_E1116 },
+ { MII_OUI_xxMARVELL, MII_MODEL_xxMARVELL_E1116R, MII_STR_xxMARVELL_E1116R },
{ MII_OUI_xxMYSON, MII_MODEL_xxMYSON_MTD972, MII_STR_xxMYSON_MTD972 },
{ MII_OUI_MYSON, MII_MODEL_MYSON_MTD803, MII_STR_MYSON_MTD803 },
{ MII_OUI_xxNATSEMI, MII_MODEL_xxNATSEMI_DP83840, MII_STR_xxNATSEMI_DP83840 },
CVS commit: src/sys/fs/udf
Module Name:src Committed By: reinoud Date: Thu Jun 18 14:56:09 UTC 2009 Modified Files: src/sys/fs/udf: udf.h Log Message: Remove now unused UDF_DIRHASH constants To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/fs/udf/udf.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/fs/udf/udf.h diff -u src/sys/fs/udf/udf.h:1.30 src/sys/fs/udf/udf.h:1.31 --- src/sys/fs/udf/udf.h:1.30 Sun Feb 8 19:14:52 2009 +++ src/sys/fs/udf/udf.h Thu Jun 18 14:56:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: udf.h,v 1.30 2009/02/08 19:14:52 reinoud Exp $ */ +/* $NetBSD: udf.h,v 1.31 2009/06/18 14:56:09 reinoud Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -116,11 +116,6 @@ #define UDF_ECCBUF_HASHSIZE (1UDF_ECCBUF_HASHBITS) #define UDF_ECCBUF_HASHMASK (UDF_ECCBUF_HASHSIZE -1) -#define UDF_DIRHASH_DEFAULTMEM (1024*1024) -#define UDF_DIRHASH_HASHBITS 5 -#define UDF_DIRHASH_HASHSIZE (1UDF_DIRHASH_HASHBITS) -#define UDF_DIRHASH_HASHMASK (UDF_DIRHASH_HASHSIZE -1) - #define UDF_ECCLINE_MAXFREE 5 /* picked, needs calculation */ #define UDF_ECCLINE_MAXBUSY 300 /* picked, needs calculation */
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Thu Jun 18 15:01:34 UTC 2009
Modified Files:
src/sys/fs/udf: udf_subr.c
Log Message:
Remove unneeded wait for SYNC being finished on node disposal of deleted node;
this could interfere and lockup.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/fs/udf/udf_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.91 src/sys/fs/udf/udf_subr.c:1.92
--- src/sys/fs/udf/udf_subr.c:1.91 Wed May 20 15:30:26 2009
+++ src/sys/fs/udf/udf_subr.c Thu Jun 18 15:01:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.91 2009/05/20 15:30:26 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.92 2009/06/18 15:01:34 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.91 2009/05/20 15:30:26 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.92 2009/06/18 15:01:34 reinoud Exp $);
#endif /* not lint */
@@ -5494,14 +5494,6 @@
v_numoutput = %d, udf_node, vp-v_numoutput);
#endif
- /* wait until out of sync (just in case we happen to stumble over one */
- KASSERT(!mutex_owned(mntvnode_lock));
- mutex_enter(mntvnode_lock);
- while (udf_node-i_flags IN_SYNCED) {
- cv_timedwait(udf_node-ump-dirtynodes_cv, mntvnode_lock,
- hz/16);
- }
- mutex_exit(mntvnode_lock);
/* TODO extended attributes and streamdir */
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Thu Jun 18 15:15:10 UTC 2009
Modified Files:
src/sys/fs/udf: udf_vnops.c
Log Message:
Pass-on credentials to size reversal on aborted write due to error. It could
be that in the future this credentials need to be changed to allways-allow
since its an reverting-on-error behaviour.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/fs/udf/udf_vnops.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/fs/udf/udf_vnops.c
diff -u src/sys/fs/udf/udf_vnops.c:1.41 src/sys/fs/udf/udf_vnops.c:1.42
--- src/sys/fs/udf/udf_vnops.c:1.41 Thu May 7 19:30:30 2009
+++ src/sys/fs/udf/udf_vnops.c Thu Jun 18 15:15:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.41 2009/05/07 19:30:30 elad Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.42 2009/06/18 15:15:10 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -32,7 +32,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_vnops.c,v 1.41 2009/05/07 19:30:30 elad Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_vnops.c,v 1.42 2009/06/18 15:15:10 reinoud Exp $);
#endif /* not lint */
@@ -383,7 +383,7 @@
if (error) {
/* bring back file size to its former size */
/* take notice of its errors? */
- (void) udf_chsize(vp, (u_quad_t) old_size, NOCRED);
+ (void) udf_chsize(vp, (u_quad_t) old_size, cred);
/* roll back uio */
uio-uio_offset -= resid - uio-uio_resid;
@@ -2155,7 +2155,6 @@
/* - */
-
/* Global vfs vnode data structures for udfs */
int (**udf_vnodeop_p)(void *);
CVS commit: src
Module Name:src Committed By: he Date: Thu Jun 18 15:22:24 UTC 2009 Modified Files: src/common/lib/libc/hash/sha2: sha2.c src/sys/lib/libkern/arch/vax: Makefile.inc Log Message: Back out the addition of memset.c to the vax libkern, and instead do as tsutsui@ suggested, and include sys/param.h in sha2.c instead. On the vax, this causes machine/macros.h to be included, and it contains that machine's memset() macro+inline. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/common/lib/libc/hash/sha2/sha2.c cvs rdiff -u -r1.20 -r1.21 src/sys/lib/libkern/arch/vax/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/hash/sha2/sha2.c diff -u src/common/lib/libc/hash/sha2/sha2.c:1.15 src/common/lib/libc/hash/sha2/sha2.c:1.16 --- src/common/lib/libc/hash/sha2/sha2.c:1.15 Sun Jun 14 14:04:07 2009 +++ src/common/lib/libc/hash/sha2/sha2.c Thu Jun 18 15:22:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $ */ +/* $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $ */ /* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */ /* @@ -41,16 +41,17 @@ #endif #include sys/cdefs.h +#include sys/param.h #if defined(_KERNEL) || defined(_STANDALONE) -__KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $); #include lib/libkern/libkern.h #else #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: sha2.c,v 1.15 2009/06/14 14:04:07 martin Exp $); +__RCSID($NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h Index: src/sys/lib/libkern/arch/vax/Makefile.inc diff -u src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 src/sys/lib/libkern/arch/vax/Makefile.inc:1.21 --- src/sys/lib/libkern/arch/vax/Makefile.inc:1.20 Thu Jun 18 07:56:04 2009 +++ src/sys/lib/libkern/arch/vax/Makefile.inc Thu Jun 18 15:22:24 2009 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.inc,v 1.20 2009/06/18 07:56:04 he Exp $ +# $NetBSD: Makefile.inc,v 1.21 2009/06/18 15:22:24 he Exp $ # # The rest of the lib routines are in machine/macros.h # SRCS+= __assert.c \ blkcpy.S blkset.S bswap16.S bswap32.S bswap64.S \ - __main.c memchr.c memcmp.c memset.c \ + __main.c memchr.c memcmp.c \ random.S \ strcasecmp.c strcat.c strcmp.c strcpy.c strncasecmp.c strncmp.c \ strncpy.c strlen.c strtoul.c \
CVS commit: src/usr.sbin/pwd_mkdb
Module Name:src
Committed By: christos
Date: Thu Jun 18 17:46:24 UTC 2009
Modified Files:
src/usr.sbin/pwd_mkdb: pwd_mkdb.8 pwd_mkdb.c
Log Message:
support reading and writing both version 0 and version 1 databases using
-V version. By default the databases stay in their current version when
rebuilding/updating.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/pwd_mkdb/pwd_mkdb.8
cvs rdiff -u -r1.40 -r1.41 src/usr.sbin/pwd_mkdb/pwd_mkdb.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/pwd_mkdb/pwd_mkdb.8
diff -u src/usr.sbin/pwd_mkdb/pwd_mkdb.8:1.23 src/usr.sbin/pwd_mkdb/pwd_mkdb.8:1.24
--- src/usr.sbin/pwd_mkdb/pwd_mkdb.8:1.23 Sat Sep 23 16:09:41 2006
+++ src/usr.sbin/pwd_mkdb/pwd_mkdb.8 Thu Jun 18 13:46:24 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: pwd_mkdb.8,v 1.23 2006/09/23 20:09:41 wiz Exp $
+.\ $NetBSD: pwd_mkdb.8,v 1.24 2009/06/18 17:46:24 christos Exp $
.\
.\ Copyright (c) 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\
.\ from: @(#)pwd_mkdb.8 8.2 (Berkeley) 4/27/95
.\
-.Dd September 23, 2006
+.Dd June 18, 2009
.Dt PWD_MKDB 8
.Os
.Sh NAME
@@ -37,10 +37,11 @@
.Nd generate the password databases
.Sh SYNOPSIS
.Nm
-.Op Fl BLps
+.Op Fl BLpsv
.Op Fl c Ar cachesize
.Op Fl d Ar directory
.Op Fl u Ar username
+.Op Fl V Ar version
.Ar file
.Sh DESCRIPTION
.Nm
@@ -98,6 +99,30 @@
This option may only be used when the line number and user name in
the password file have not changed, or when adding a new user from
the last line in the password file.
+.It Fl V Ar version
+Upgrade or downgrade databases to the numbered version. Version
+.Dv 0
+is the old format (up to and including
+.Nx 5.0 )
+with the 4 byte time fields and version
+.Dv 1
+is the new format with the 8 byte time fields (greater than
+.Nx 5.0 ).
+.Nx 5.0
+cannot read version
+.Dv 1
+databases.
+All versions above
+.Nx 5.0
+can read and write both version
+.Dv 0
+and version
+.Dv 1
+databases.
+By default the databases stay in the version they were before the command
+was run.
+.It Fl v
+Mention when a version change occurs.
.El
.Pp
The two databases differ in that the secure version contains the user's
Index: src/usr.sbin/pwd_mkdb/pwd_mkdb.c
diff -u src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.40 src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.41
--- src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.40 Sat Apr 18 04:08:36 2009
+++ src/usr.sbin/pwd_mkdb/pwd_mkdb.c Thu Jun 18 13:46:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pwd_mkdb.c,v 1.40 2009/04/18 08:08:36 lukem Exp $ */
+/* $NetBSD: pwd_mkdb.c,v 1.41 2009/06/18 17:46:24 christos Exp $ */
/*
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
Copyright (c) 1991, 1993, 1994\
The Regents of the University of California. All rights reserved.);
__SCCSID(from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94);
-__RCSID($NetBSD: pwd_mkdb.c,v 1.40 2009/04/18 08:08:36 lukem Exp $);
+__RCSID($NetBSD: pwd_mkdb.c,v 1.41 2009/06/18 17:46:24 christos Exp $);
#endif /* not lint */
#if HAVE_NBTOOL_CONFIG_H
@@ -133,7 +133,7 @@
extern const char __yp_token[];
#endif
-HASHINFO openinfo = {
+static HASHINFO openinfo = {
4096, /* bsize */
32, /* ffactor */
256, /* nelem */
@@ -154,24 +154,24 @@
static int lorder = BYTE_ORDER;
static int clean;
-void bailout(void);
+void bailout(void) __attribute__((__noreturn__));
void cp(const char *, const char *, mode_t);
int deldbent(DB *, const char *, int, void *);
void error(const char *);
-int getdbent(DB *, const char *, int, void *, struct passwd **);
+int getdbent(DB *, const char *, int, void *, struct passwd **, uint32_t);
void inconsistancy(void);
void install(const char *, const char *);
int main(int, char **);
void putdbents(DB *, struct passwd *, const char *, int, const char *, int,
- int, int);
+int, int, uint32_t);
void putyptoken(DB *, const char *);
void rm(const char *);
int scan(FILE *, struct passwd *, int *, int *);
-void usage(void);
+void usage(void) __attribute__((__noreturn__));
void wr_error(const char *);
-void checkversion(DB *);
-uint32_t getversion(void);
-void setversion(DB *);
+void checkversion(uint32_t, uint32_t);
+uint32_t getversion(const char *);
+void setversion(DB *, uint32_t);
#define SWAP(sw) \
((sizeof(sw) == 2 ? (typeof(sw))bswap16((uint16_t)sw) : \
@@ -181,7 +181,7 @@
int
main(int argc, char *argv[])
{
- int ch, makeold, tfd, lineno, found, rv, hasyp, secureonly;
+ int ch, makeold, tfd, lineno, found, rv, hasyp, secureonly, verbose;
struct passwd pwd, *tpwd;
char *username;
DB *dp, *edp;
@@ -191,6 +191,8 @@
char buf[MAXPATHLEN];
struct stat st;
u_int cachesize;
+ uint32_t version, req_version;
+ uint32_t sversion, req_sversion;
prefix[0] = '\0';
makeold = 0;
@@ -202,8 +204,10 @@
newuser = 0;
dp = NULL;
cachesize = 0;
+ verbose = 0;
+ req_version =
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: njoly Date: Thu Jun 18 20:36:28 UTC 2009 Modified Files: src/sys/compat/linux/common: linux_sched.c Log Message: In linux_sys_sched_getaffinity(), do not leak memory on error. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/compat/linux/common/linux_sched.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/common/linux_sched.c diff -u src/sys/compat/linux/common/linux_sched.c:1.58 src/sys/compat/linux/common/linux_sched.c:1.59 --- src/sys/compat/linux/common/linux_sched.c:1.58 Sat Oct 25 23:38:28 2008 +++ src/sys/compat/linux/common/linux_sched.c Thu Jun 18 20:36:28 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_sched.c,v 1.58 2008/10/25 23:38:28 christos Exp $ */ +/* $NetBSD: linux_sched.c,v 1.59 2009/06/18 20:36:28 njoly Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.58 2008/10/25 23:38:28 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: linux_sched.c,v 1.59 2009/06/18 20:36:28 njoly Exp $); #include sys/param.h #include sys/mount.h @@ -646,12 +646,11 @@ retp = (int *)data[SCARG(uap, len) - sizeof(ret)]; *retp = ret; - if ((error = copyout(data, SCARG(uap, mask), SCARG(uap, len))) != 0) - return error; + error = copyout(data, SCARG(uap, mask), SCARG(uap, len)); free(data, M_TEMP); - return 0; + return error; }
CVS commit: src/etc/rc.d
Module Name:src
Committed By: christos
Date: Thu Jun 18 22:00:04 UTC 2009
Modified Files:
src/etc/rc.d: sysdb
Log Message:
now that pwd_mkdb does not change the version, warn if we still have version
0 databases.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/etc/rc.d/sysdb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/sysdb
diff -u src/etc/rc.d/sysdb:1.20 src/etc/rc.d/sysdb:1.21
--- src/etc/rc.d/sysdb:1.20 Sun Aug 26 19:55:50 2007
+++ src/etc/rc.d/sysdb Thu Jun 18 18:00:04 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sysdb,v 1.20 2007/08/26 23:55:50 dyoung Exp $
+# $NetBSD: sysdb,v 1.21 2009/06/18 22:00:04 christos Exp $
#
# PROVIDE: sysdb
@@ -68,7 +68,7 @@
build_password()
{
local p=/etc/master.passwd
- check_file $p /etc/spwd.db pwd_mkdb $p
+ check_file $p /etc/spwd.db pwd_mkdb -w $p
}
build_utmp()
CVS commit: src/usr.sbin/pwd_mkdb
Module Name:src
Committed By: christos
Date: Thu Jun 18 22:13:56 UTC 2009
Modified Files:
src/usr.sbin/pwd_mkdb: pwd_mkdb.c
Log Message:
allow overwriting the version record.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.sbin/pwd_mkdb/pwd_mkdb.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/pwd_mkdb/pwd_mkdb.c
diff -u src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.42 src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.43
--- src/usr.sbin/pwd_mkdb/pwd_mkdb.c:1.42 Thu Jun 18 17:59:24 2009
+++ src/usr.sbin/pwd_mkdb/pwd_mkdb.c Thu Jun 18 18:13:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pwd_mkdb.c,v 1.42 2009/06/18 21:59:24 christos Exp $ */
+/* $NetBSD: pwd_mkdb.c,v 1.43 2009/06/18 22:13:56 christos Exp $ */
/*
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
Copyright (c) 1991, 1993, 1994\
The Regents of the University of California. All rights reserved.);
__SCCSID(from: @(#)pwd_mkdb.c 8.5 (Berkeley) 4/20/94);
-__RCSID($NetBSD: pwd_mkdb.c,v 1.42 2009/06/18 21:59:24 christos Exp $);
+__RCSID($NetBSD: pwd_mkdb.c,v 1.43 2009/06/18 22:13:56 christos Exp $);
#endif /* not lint */
#if HAVE_NBTOOL_CONFIG_H
@@ -752,7 +752,7 @@
data.data = db-wversion;
data.size = sizeof(uint32_t);
- if ((*db-db-put)(db-db, key, data, R_NOOVERWRITE) != 0) {
+ if ((*db-db-put)(db-db, key, data, 0) != 0) {
warn(Can't write VERSION record to %s, db-dbname);
bailout();
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Fri Jun 19 01:16:23 UTC 2009 Modified Files: src/sys/dev/usb: files.usb Added Files: src/sys/dev/usb: moscom.c Log Message: port the MOSCHIP MCS7703 driver from openbsd, based on changes between openbsd uvscom and netbsd uvscom as a guide. XXX: it only attaches one of the two ucom's on this device currently. XXX: needs moscom.4. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/dev/usb/files.usb cvs rdiff -u -r0 -r1.1 src/sys/dev/usb/moscom.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/usb/files.usb diff -u src/sys/dev/usb/files.usb:1.90 src/sys/dev/usb/files.usb:1.91 --- src/sys/dev/usb/files.usb:1.90 Fri Oct 10 16:37:16 2008 +++ src/sys/dev/usb/files.usb Fri Jun 19 01:16:23 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.90 2008/10/10 16:37:16 joerg Exp $ +# $NetBSD: files.usb,v 1.91 2009/06/19 01:16:23 mrg Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -251,6 +251,11 @@ attach umct at usbdevif file dev/usb/umct.c umct +# MOSCHIP MCS7xxx serial driver +device moscom: ucombus +attach moscom at usbdevif +file dev/usb/moscom.c moscom + # SUNTAC Slipper U VS-10U driver device uvscom: ucombus attach uvscom at usbdevif Added files: Index: src/sys/dev/usb/moscom.c diff -u /dev/null src/sys/dev/usb/moscom.c:1.1 --- /dev/null Fri Jun 19 01:16:23 2009 +++ src/sys/dev/usb/moscom.c Fri Jun 19 01:16:23 2009 @@ -0,0 +1,460 @@ +/* $NetBSD: moscom.c,v 1.1 2009/06/19 01:16:23 mrg Exp $ */ +/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */ + +/* + * Copyright (c) 2006 Jonathan Gray j...@openbsd.org + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include sys/cdefs.h +__KERNEL_RCSID(0, $NetBSD: moscom.c,v 1.1 2009/06/19 01:16:23 mrg Exp $); + +#include sys/param.h +#include sys/systm.h +#include sys/kernel.h +#include sys/conf.h +#include sys/tty.h +#include sys/device.h + +#include dev/usb/usb.h +#include dev/usb/usbdi.h +#include dev/usb/usbdi_util.h +#include dev/usb/usbdevs.h + +#include dev/usb/usbdevs.h +#include dev/usb/ucomvar.h + +#define MOSCOMBUFSZ 256 +#define MOSCOM_CONFIG_NO 0 +#define MOSCOM_IFACE_NO 0 + +#define MOSCOM_READ 0x0d +#define MOSCOM_WRITE 0x0e +#define MOSCOM_UART_REG 0x0300 +#define MOSCOM_VEND_REG 0x + +#define MOSCOM_TXBUF 0x00 /* Write */ +#define MOSCOM_RXBUF 0x00 /* Read */ +#define MOSCOM_INT 0x01 +#define MOSCOM_FIFO 0x02 /* Write */ +#define MOSCOM_ISR 0x02 /* Read */ +#define MOSCOM_LCR 0x03 +#define MOSCOM_MCR 0x04 +#define MOSCOM_LSR 0x05 +#define MOSCOM_MSR 0x06 +#define MOSCOM_SCRATCH 0x07 +#define MOSCOM_DIV_LO 0x08 +#define MOSCOM_DIV_HI 0x09 +#define MOSCOM_EFR 0x0a +#define MOSCOM_XON1 0x0b +#define MOSCOM_XON2 0x0c +#define MOSCOM_XOFF1 0x0d +#define MOSCOM_XOFF2 0x0e + +#define MOSCOM_BAUDLO 0x00 +#define MOSCOM_BAUDHI 0x01 + +#define MOSCOM_INT_RXEN 0x01 +#define MOSCOM_INT_TXEN 0x02 +#define MOSCOM_INT_RSEN 0x04 +#define MOSCOM_INT_MDMEM 0x08 +#define MOSCOM_INT_SLEEP 0x10 +#define MOSCOM_INT_XOFF 0x20 +#define MOSCOM_INT_RTS 0x40 + +#define MOSCOM_FIFO_EN 0x01 +#define MOSCOM_FIFO_RXCLR 0x02 +#define MOSCOM_FIFO_TXCLR 0x04 +#define MOSCOM_FIFO_DMA_BLK 0x08 +#define MOSCOM_FIFO_TXLVL_MASK 0x30 +#define MOSCOM_FIFO_TXLVL_8 0x00 +#define MOSCOM_FIFO_TXLVL_16 0x10 +#define MOSCOM_FIFO_TXLVL_32 0x20 +#define MOSCOM_FIFO_TXLVL_56 0x30 +#define MOSCOM_FIFO_RXLVL_MASK 0xc0 +#define MOSCOM_FIFO_RXLVL_8 0x00 +#define MOSCOM_FIFO_RXLVL_16 0x40 +#define MOSCOM_FIFO_RXLVL_56 0x80 +#define MOSCOM_FIFO_RXLVL_80 0xc0 + +#define MOSCOM_ISR_MDM 0x00 +#define MOSCOM_ISR_NONE 0x01 +#define MOSCOM_ISR_TX 0x02 +#define MOSCOM_ISR_RX 0x04 +#define MOSCOM_ISR_LINE 0x06 +#define MOSCOM_ISR_RXTIMEOUT 0x0c +#define MOSCOM_ISR_RX_XOFF 0x10 +#define MOSCOM_ISR_RTSCTS 0x20 +#define MOSCOM_ISR_FIFOEN 0xc0 + +#define MOSCOM_LCR_DBITS(x) (x - 5) +#define MOSCOM_LCR_STOP_BITS_1 0x00 +#define MOSCOM_LCR_STOP_BITS_2 0x04 /* 2 if 6-8 bits/char or 1.5 if 5 */ +#define MOSCOM_LCR_PARITY_NONE 0x00 +#define MOSCOM_LCR_PARITY_ODD 0x08 +#define
CVS commit: src/sys/external/bsd/drm/dist
Module Name:src Committed By: mrg Date: Fri Jun 19 03:22:29 UTC 2009 Update of /cvsroot/src/sys/external/bsd/drm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9435 Log Message: import mesa-drm git from version 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. Status: Vendor Tag: mesa-drm Release Tags: git-change-85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c U src/sys/external/bsd/drm/dist/Makefile.am U src/sys/external/bsd/drm/dist/README U src/sys/external/bsd/drm/dist/autogen.sh U src/sys/external/bsd/drm/dist/configure.ac U src/sys/external/bsd/drm/dist/libdrm.pc.in C src/sys/external/bsd/drm/dist/bsd-core/ati_pcigart.c C src/sys/external/bsd/drm/dist/bsd-core/Makefile C src/sys/external/bsd/drm/dist/bsd-core/drm_atomic.h C src/sys/external/bsd/drm/dist/bsd-core/drmP.h C src/sys/external/bsd/drm/dist/bsd-core/drm_agpsupport.c C src/sys/external/bsd/drm/dist/bsd-core/drm_auth.c C src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c U src/sys/external/bsd/drm/dist/bsd-core/drm_context.c C src/sys/external/bsd/drm/dist/bsd-core/drm_dma.c C src/sys/external/bsd/drm/dist/bsd-core/drm_drawable.c C src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c C src/sys/external/bsd/drm/dist/bsd-core/drm_fops.c U src/sys/external/bsd/drm/dist/bsd-core/drm_linux_list.h C src/sys/external/bsd/drm/dist/bsd-core/drm_ioctl.c C src/sys/external/bsd/drm/dist/bsd-core/drm_irq.c C src/sys/external/bsd/drm/dist/bsd-core/drm_lock.c C src/sys/external/bsd/drm/dist/bsd-core/drm_memory.c C src/sys/external/bsd/drm/dist/bsd-core/mga_drv.c C src/sys/external/bsd/drm/dist/bsd-core/drm_pci.c U src/sys/external/bsd/drm/dist/bsd-core/drm_scatter.c C src/sys/external/bsd/drm/dist/bsd-core/drm_sysctl.c C src/sys/external/bsd/drm/dist/bsd-core/drm_vm.c C src/sys/external/bsd/drm/dist/bsd-core/i915_drv.c C src/sys/external/bsd/drm/dist/bsd-core/mach64_drv.c N src/sys/external/bsd/drm/dist/bsd-core/nouveau_drv.c N src/sys/external/bsd/drm/dist/bsd-core/nouveau_sgdma.c C src/sys/external/bsd/drm/dist/bsd-core/r128_drv.c C src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c C src/sys/external/bsd/drm/dist/bsd-core/savage_drv.c C src/sys/external/bsd/drm/dist/bsd-core/sis_drv.c C src/sys/external/bsd/drm/dist/bsd-core/tdfx_drv.c C src/sys/external/bsd/drm/dist/bsd-core/via_drv.c U src/sys/external/bsd/drm/dist/bsd-core/drm/Makefile U src/sys/external/bsd/drm/dist/bsd-core/i915/Makefile U src/sys/external/bsd/drm/dist/bsd-core/mach64/Makefile U src/sys/external/bsd/drm/dist/bsd-core/mga/Makefile U src/sys/external/bsd/drm/dist/bsd-core/sis/Makefile N src/sys/external/bsd/drm/dist/bsd-core/nouveau/Makefile U src/sys/external/bsd/drm/dist/bsd-core/r128/Makefile U src/sys/external/bsd/drm/dist/bsd-core/radeon/Makefile U src/sys/external/bsd/drm/dist/bsd-core/savage/Makefile U src/sys/external/bsd/drm/dist/bsd-core/tdfx/Makefile U src/sys/external/bsd/drm/dist/bsd-core/via/Makefile N src/sys/external/bsd/drm/dist/libdrm/libdrm_lists.h U src/sys/external/bsd/drm/dist/libdrm/ChangeLog U src/sys/external/bsd/drm/dist/libdrm/Makefile.am U src/sys/external/bsd/drm/dist/libdrm/TODO U src/sys/external/bsd/drm/dist/libdrm/xf86drmHash.c U src/sys/external/bsd/drm/dist/libdrm/xf86drm.c U src/sys/external/bsd/drm/dist/libdrm/xf86drm.h N src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.c N src/sys/external/bsd/drm/dist/libdrm/xf86drmMode.h U src/sys/external/bsd/drm/dist/libdrm/xf86drmRandom.c U src/sys/external/bsd/drm/dist/libdrm/xf86drmSL.c U src/sys/external/bsd/drm/dist/libdrm/xf86mm.h N src/sys/external/bsd/drm/dist/libdrm/intel/intel_bufmgr_fake.c N src/sys/external/bsd/drm/dist/libdrm/intel/intel_bufmgr.c N src/sys/external/bsd/drm/dist/libdrm/intel/Makefile.am N src/sys/external/bsd/drm/dist/libdrm/intel/intel_bufmgr_gem.c N src/sys/external/bsd/drm/dist/libdrm/intel/intel_bufmgr.h N src/sys/external/bsd/drm/dist/libdrm/intel/mm.c N src/sys/external/bsd/drm/dist/libdrm/intel/mm.h N src/sys/external/bsd/drm/dist/libdrm/intel/intel_bufmgr_priv.h N src/sys/external/bsd/drm/dist/libdrm/intel/intel_chipset.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_channel.c N src/sys/external/bsd/drm/dist/libdrm/nouveau/Makefile.am N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_bo.c N src/sys/external/bsd/drm/dist/libdrm/nouveau/libdrm_nouveau.pc.in N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_bo.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_channel.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_class.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_device.c N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_device.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.c N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_dma.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_drmif.h N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_fence.c N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_grobj.c N src/sys/external/bsd/drm/dist/libdrm/nouveau/nouveau_grobj.h
CVS commit: src/sys/external/bsd/drm/dist
Module Name:src Committed By: mrg Date: Fri Jun 19 03:38:40 UTC 2009 Update of /cvsroot/src/sys/external/bsd/drm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv7275 Log Message: import the missing file from mesa-drm at git change 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. Status: Vendor Tag: mesa-drm Release Tags: git-change-85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c N src/sys/external/bsd/drm/dist/libdrm_intel.pc.in No conflicts created by this import
CVS commit: src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: mrg
Date: Fri Jun 19 03:52:20 UTC 2009
Added Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_pciids.h
Log Message:
add a freshly generated drm_pciids.h
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h
diff -u /dev/null src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h:1.3
--- /dev/null Fri Jun 19 03:52:20 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_pciids.h Fri Jun 19 03:52:20 2009
@@ -0,0 +1,729 @@
+/*
+ This file is auto-generated from the drm_pciids.txt in the DRM CVS
+ Please contact dri-de...@lists.sf.net to add new cards to this list
+*/
+#define radeon_PCI_IDS \
+ {0x1002, 0x3150, CHIP_RV380|RADEON_IS_MOBILITY, ATI Radeon Mobility X600 M24}, \
+ {0x1002, 0x3152, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Radeon Mobility X300 M24}, \
+ {0x1002, 0x3154, CHIP_RV380|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI FireGL M24 GL}, \
+ {0x1002, 0x3E50, CHIP_RV380|RADEON_NEW_MEMMAP, ATI Radeon RV380 X600}, \
+ {0x1002, 0x3E54, CHIP_RV380|RADEON_NEW_MEMMAP, ATI FireGL V3200 RV380}, \
+ {0x1002, 0x4136, CHIP_RS100|RADEON_IS_IGP, ATI Radeon RS100 IGP 320}, \
+ {0x1002, 0x4137, CHIP_RS200|RADEON_IS_IGP, ATI Radeon RS200 IGP 340}, \
+ {0x1002, 0x4144, CHIP_R300, ATI Radeon AD 9500}, \
+ {0x1002, 0x4145, CHIP_R300, ATI Radeon AE 9700 Pro}, \
+ {0x1002, 0x4146, CHIP_R300, ATI Radeon AF R300 9600TX}, \
+ {0x1002, 0x4147, CHIP_R300, ATI FireGL AG Z1}, \
+ {0x1002, 0x4148, CHIP_R350, ATI Radeon AH 9800 SE}, \
+ {0x1002, 0x4149, CHIP_R350, ATI Radeon AI 9800}, \
+ {0x1002, 0x414A, CHIP_R350, ATI Radeon AJ 9800}, \
+ {0x1002, 0x414B, CHIP_R350, ATI FireGL AK X2}, \
+ {0x1002, 0x4150, CHIP_RV350, ATI Radeon AP 9600}, \
+ {0x1002, 0x4151, CHIP_RV350, ATI Radeon AQ 9600 SE}, \
+ {0x1002, 0x4152, CHIP_RV350, ATI Radeon AR 9600 XT}, \
+ {0x1002, 0x4153, CHIP_RV350, ATI Radeon AS 9550}, \
+ {0x1002, 0x4154, CHIP_RV350, ATI FireGL AT T2}, \
+ {0x1002, 0x4155, CHIP_RV350, ATI Radeon 9650}, \
+ {0x1002, 0x4156, CHIP_RV350, ATI FireGL AV RV360 T2}, \
+ {0x1002, 0x4237, CHIP_RS200|RADEON_IS_IGP, ATI Radeon RS250 IGP}, \
+ {0x1002, 0x4242, CHIP_R200, ATI Radeon BB R200 AIW 8500DV}, \
+ {0x1002, 0x4243, CHIP_R200, ATI Radeon BC R200}, \
+ {0x1002, 0x4336, CHIP_RS100|RADEON_IS_IGP|RADEON_IS_MOBILITY, ATI Radeon RS100 Mobility U1}, \
+ {0x1002, 0x4337, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY, ATI Radeon RS200 Mobility IGP 340M}, \
+ {0x1002, 0x4437, CHIP_RS200|RADEON_IS_IGP|RADEON_IS_MOBILITY, ATI Radeon RS250 Mobility IGP}, \
+ {0x1002, 0x4966, CHIP_RV250, ATI Radeon If RV250 9000}, \
+ {0x1002, 0x4967, CHIP_RV250, ATI Radeon Ig RV250 9000}, \
+ {0x1002, 0x4A48, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JH R420 X800}, \
+ {0x1002, 0x4A49, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JI R420 X800 Pro}, \
+ {0x1002, 0x4A4A, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JJ R420 X800 SE}, \
+ {0x1002, 0x4A4B, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JK R420 X800 XT}, \
+ {0x1002, 0x4A4C, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JL R420 X800}, \
+ {0x1002, 0x4A4D, CHIP_R420|RADEON_NEW_MEMMAP, ATI FireGL JM X3-256}, \
+ {0x1002, 0x4A4E, CHIP_R420|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP, ATI Radeon JN R420 Mobility M18}, \
+ {0x1002, 0x4A4F, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JO R420 X800 SE}, \
+ {0x1002, 0x4A50, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JP R420 X800 XT PE}, \
+ {0x1002, 0x4A54, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon JT R420 AIW X800 VE}, \
+ {0x1002, 0x4B49, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon R481 X850 XT}, \
+ {0x1002, 0x4B4A, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon R481 X850 SE}, \
+ {0x1002, 0x4B4B, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon R481 X850 Pro}, \
+ {0x1002, 0x4B4C, CHIP_R420|RADEON_NEW_MEMMAP, ATI Radeon R481 X850 XT PE}, \
+ {0x1002, 0x4C57, CHIP_RV200|RADEON_IS_MOBILITY, ATI Radeon LW RV200 Mobility 7500 M7}, \
+ {0x1002, 0x4C58, CHIP_RV200|RADEON_IS_MOBILITY, ATI Radeon LX RV200 Mobility FireGL 7800 M7}, \
+ {0x1002, 0x4C59, CHIP_RV100|RADEON_IS_MOBILITY, ATI Radeon LY RV100 Mobility M6}, \
+ {0x1002, 0x4C5A, CHIP_RV100|RADEON_IS_MOBILITY, ATI Radeon LZ RV100 Mobility M6}, \
+ {0x1002, 0x4C64, CHIP_RV250|RADEON_IS_MOBILITY, ATI Radeon Ld RV250 Mobility 9000 M9}, \
+ {0x1002, 0x4C66, CHIP_RV250, ATI Radeon Lf RV250 Mobility 9000 M9 / FireMV 2400 PCI}, \
+ {0x1002, 0x4C67, CHIP_RV250|RADEON_IS_MOBILITY, ATI Radeon Lg RV250 Mobility 9000 M9}, \
+ {0x1002, 0x4E44, CHIP_R300, ATI Radeon ND R300 9700 Pro}, \
+ {0x1002, 0x4E45, CHIP_R300, ATI Radeon NE R300 9500 Pro / 9700}, \
+ {0x1002, 0x4E46, CHIP_R300, ATI Radeon NF R300 9600TX}, \
+ {0x1002, 0x4E47, CHIP_R300, ATI Radeon NG R300 FireGL X1}, \
+ {0x1002, 0x4E48, CHIP_R350, ATI Radeon NH R350 9800 Pro}, \
+ {0x1002, 0x4E49, CHIP_R350, ATI
CVS commit: src/sys/dev/pci/drm
Module Name:src Committed By: mrg Date: Fri Jun 19 03:53:24 UTC 2009 Modified Files: src/sys/dev/pci/drm: files.pcidrm Log Message: add r600_cp.c. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pci/drm/files.pcidrm 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/drm/files.pcidrm diff -u src/sys/dev/pci/drm/files.pcidrm:1.4 src/sys/dev/pci/drm/files.pcidrm:1.5 --- src/sys/dev/pci/drm/files.pcidrm:1.4 Wed May 6 01:34:08 2009 +++ src/sys/dev/pci/drm/files.pcidrm Fri Jun 19 03:53:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: files.pcidrm,v 1.4 2009/05/06 01:34:08 mrg Exp $ +# $NetBSD: files.pcidrm,v 1.5 2009/06/19 03:53:24 mrg Exp $ define drmpci @@ -68,6 +68,7 @@ file external/bsd/drm/dist/bsd-core/radeon_drv.c radeondrm drm_external file external/bsd/drm/dist/shared-core/r300_cmdbuf.c radeondrm drm_external +file external/bsd/drm/dist/shared-core/r600_cp.c radeondrm drm_external file external/bsd/drm/dist/shared-core/radeon_cp.c radeondrm drm_external file external/bsd/drm/dist/shared-core/radeon_irq.c radeondrm drm_external file external/bsd/drm/dist/shared-core/radeon_mem.c radeondrm drm_external
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Fri Jun 19 04:46:14 UTC 2009 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: note mesa-drm has been upgraded to git revision 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. To generate a diff of this commit: cvs rdiff -u -r1.702 -r1.703 src/doc/3RDPARTY cvs rdiff -u -r1.1242 -r1.1243 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.702 src/doc/3RDPARTY:1.703 --- src/doc/3RDPARTY:1.702 Sat Jun 13 12:02:07 2009 +++ src/doc/3RDPARTY Fri Jun 19 04:46:14 2009 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.702 2009/06/13 12:02:07 kardel Exp $ +# $NetBSD: 3RDPARTY,v 1.703 2009/06/19 04:46:14 mrg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -610,7 +610,7 @@ into inetd. The provided libwrap2netbsd script handles just libwrap. Package: mesa-drm -Version: git 2580a065d81be645a14af1e91b8441f7e72fcbe4 +Version: git 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c Current Vers: Maintainer: mesa-...@? Archive Site: git://anongit.freedesktop.org/git/mesa/drm Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1242 src/doc/CHANGES:1.1243 --- src/doc/CHANGES:1.1242 Mon Jun 15 12:58:24 2009 +++ src/doc/CHANGES Fri Jun 19 04:46:14 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1242 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1243 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -301,3 +301,5 @@ ntp: Import ntp-4-2-4p7. [kardel 20090613] ehci(4): Add quirk for SB600/SB700 chipsets to workaround freeze in USB subsystem. [cegger 20090615] + drm(4): Update to mesa-drm 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c. + [mrg 20090619]
CVS commit: src/common/lib/libc/hash/sha2
Module Name:src Committed By: tsutsui Date: Fri Jun 19 05:09:09 UTC 2009 Modified Files: src/common/lib/libc/hash/sha2: sha2.c Log Message: - move #include sys/param.h inside #if defined(_KERNEL) section where it's actually required - add XXX comments that notes sys/param.h is required for vax memset(9) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/common/lib/libc/hash/sha2/sha2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/hash/sha2/sha2.c diff -u src/common/lib/libc/hash/sha2/sha2.c:1.16 src/common/lib/libc/hash/sha2/sha2.c:1.17 --- src/common/lib/libc/hash/sha2/sha2.c:1.16 Thu Jun 18 15:22:24 2009 +++ src/common/lib/libc/hash/sha2/sha2.c Fri Jun 19 05:09:09 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $ */ +/* $NetBSD: sha2.c,v 1.17 2009/06/19 05:09:09 tsutsui Exp $ */ /* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */ /* @@ -41,17 +41,17 @@ #endif #include sys/cdefs.h -#include sys/param.h #if defined(_KERNEL) || defined(_STANDALONE) -__KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $); +__KERNEL_RCSID(0, $NetBSD: sha2.c,v 1.17 2009/06/19 05:09:09 tsutsui Exp $); +#include sys/param.h /* XXX: to pull machine/macros.h for vax memset(9) */ #include lib/libkern/libkern.h #else #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: sha2.c,v 1.16 2009/06/18 15:22:24 he Exp $); +__RCSID($NetBSD: sha2.c,v 1.17 2009/06/19 05:09:09 tsutsui Exp $); #endif /* LIBC_SCCS and not lint */ #include namespace.h
CVS commit: src/usr.sbin/pwd_mkdb
Module Name:src Committed By: wiz Date: Fri Jun 19 05:50:39 UTC 2009 Modified Files: src/usr.sbin/pwd_mkdb: pwd_mkdb.8 Log Message: Sort sections. New sentence, new line. Punctuation fixes. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/pwd_mkdb/pwd_mkdb.8 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/pwd_mkdb/pwd_mkdb.8 diff -u src/usr.sbin/pwd_mkdb/pwd_mkdb.8:1.25 src/usr.sbin/pwd_mkdb/pwd_mkdb.8:1.26 --- src/usr.sbin/pwd_mkdb/pwd_mkdb.8:1.25 Thu Jun 18 21:59:24 2009 +++ src/usr.sbin/pwd_mkdb/pwd_mkdb.8 Fri Jun 19 05:50:39 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: pwd_mkdb.8,v 1.25 2009/06/18 21:59:24 christos Exp $ +.\ $NetBSD: pwd_mkdb.8,v 1.26 2009/06/19 05:50:39 wiz Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -100,14 +100,15 @@ the password file have not changed, or when adding a new user from the last line in the password file. .It Fl V Ar version -Upgrade or downgrade databases to the numbered version. Version +Upgrade or downgrade databases to the numbered version. +Version .Dv 0 is the old format (up to and including .Nx 5.0 ) with the 4 byte time fields and version .Dv 1 is the new format with the 8 byte time fields (greater than -.Nx 5.0 ). +.Nx 5.0 ) . .Nx 5.0 cannot read version .Dv 1 @@ -151,6 +152,27 @@ .It Pa /etc/spwd.db.tmp A temporary file. .El +.Sh SEE ALSO +.Xr chpass 1 , +.Xr passwd 1 , +.Xr pwhash 1 , +.Xr db 3 , +.Xr getpwent 3 , +.Xr pw_mkdb 3 , +.Xr passwd 5 , +.Xr useradd 8 , +.Xr userdel 8 , +.Xr usermod 8 , +.Xr vipw 8 +.Sh COMPATIBILITY +Previous versions of the system had a program similar to +.Nm +which built +.Em dbm +style databases for the password file but depended on the calling programs +to install them. +The program was renamed in order that previous users of the program +not be surprised by the changes in functionality. .Sh BUGS Because of the necessity for atomic update of the password files, .Nm @@ -190,24 +212,3 @@ .Fl u option on a system where multiple users share the same UID can have unexpected results. -.Sh COMPATIBILITY -Previous versions of the system had a program similar to -.Nm -which built -.Em dbm -style databases for the password file but depended on the calling programs -to install them. -The program was renamed in order that previous users of the program -not be surprised by the changes in functionality. -.Sh SEE ALSO -.Xr chpass 1 , -.Xr passwd 1 , -.Xr pwhash 1 , -.Xr db 3 , -.Xr getpwent 3 , -.Xr pw_mkdb 3 , -.Xr passwd 5 , -.Xr useradd 8 , -.Xr userdel 8 , -.Xr usermod 8 , -.Xr vipw 8
