CVS commit: src/lib/libc/net
Module Name:src Committed By: dyoung Date: Tue Apr 21 23:27:09 UTC 2009 Modified Files: src/lib/libc/net: getifaddrs.3 Log Message: For non-AF_LINK ifaddrs, ifa_data is NULL. AFAICT, this has always been so. Say so in the documentation. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/net/getifaddrs.3 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/net/getifaddrs.3 diff -u src/lib/libc/net/getifaddrs.3:1.9 src/lib/libc/net/getifaddrs.3:1.10 --- src/lib/libc/net/getifaddrs.3:1.9 Wed Mar 11 13:35:42 2009 +++ src/lib/libc/net/getifaddrs.3 Tue Apr 21 23:27:09 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: getifaddrs.3,v 1.9 2009/03/11 13:35:42 joerg Exp $ +.\" $NetBSD: getifaddrs.3,v 1.10 2009/04/21 23:27:09 dyoung Exp $ .\" BSDI getifaddrs.3,v 2.5 2000/02/23 14:51:59 dab Exp .\" .\" Copyright (c) 1995, 1999 @@ -115,10 +115,7 @@ .Fa struct if_data .Pq as defined in include file Aq Pa net/if.h which contains various interface attributes and statistics. -For all other address families, it contains a pointer to the -.Fa struct ifa_data -.Pq as defined in include file Aq Pa net/if.h -which contains per-address interface statistics. +For all other address families, it is NULL. .Pp The data returned by .Fn getifaddrs
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: nonaka Date: Tue Apr 21 22:47:55 UTC 2009 Modified Files: src/sys/arch/i386/conf: ALL Log Message: Add SD/MMC related devices. To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.197 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.196 src/sys/arch/i386/conf/ALL:1.197 --- src/sys/arch/i386/conf/ALL:1.196 Mon Apr 20 20:49:21 2009 +++ src/sys/arch/i386/conf/ALL Tue Apr 21 22:47:55 2009 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.196 2009/04/20 20:49:21 cegger Exp $ +# $NetBSD: ALL,v 1.197 2009/04/21 22:47:55 nonaka Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.196 $" +#ident "ALL-$Revision: 1.197 $" maxusers 32 # estimated number of users @@ -1246,6 +1246,15 @@ sbp* at ieee1394if? euihi ? euilo ? # SCSI over IEEE1394 +# SD/MMC/SDIO Controller and Device support + +# SD/MMC controller +sdhc* at pci?# SD Host Controller +sdmmc* at sdhc?# SD/MMC bus + +ld* at sdmmc? + + # Audio Devices # PCI audio devices
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: dyoung
Date: Tue Apr 21 22:46:40 UTC 2009
Modified Files:
src/sbin/ifconfig: af_link.c ifconfig.c util.c util.h
Log Message:
To make sure that we always print the active link-layer address in the
'address: ' field, don't treat the first address as the active address,
but search the link-layer addresses for the ones flagged IFLR_ACTIVE,
and print those. Extract a subroutine, print_link_addresses(), for
printing link-layer addresses.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sbin/ifconfig/af_link.c
cvs rdiff -u -r1.217 -r1.218 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.9 -r1.10 src/sbin/ifconfig/util.c
cvs rdiff -u -r1.6 -r1.7 src/sbin/ifconfig/util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_link.c
diff -u src/sbin/ifconfig/af_link.c:1.5 src/sbin/ifconfig/af_link.c:1.6
--- src/sbin/ifconfig/af_link.c:1.5 Tue Apr 21 21:42:35 2009
+++ src/sbin/ifconfig/af_link.c Tue Apr 21 22:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: af_link.c,v 1.5 2009/04/21 21:42:35 dyoung Exp $ */
+/* $NetBSD: af_link.c,v 1.6 2009/04/21 22:46:39 dyoung Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_link.c,v 1.5 2009/04/21 21:42:35 dyoung Exp $");
+__RCSID("$NetBSD: af_link.c,v 1.6 2009/04/21 22:46:39 dyoung Exp $");
#endif /* not lint */
#include
@@ -74,53 +74,7 @@
static void
link_status(prop_dictionary_t env, prop_dictionary_t oenv, bool force)
{
- char hbuf[NI_MAXHOST];
- const char *ifname;
- int s;
- struct ifaddrs *ifa, *ifap;
- const struct sockaddr_dl *sdl;
- struct if_laddrreq iflr;
-
- if ((ifname = getifname(env)) == NULL)
- err(EXIT_FAILURE, "%s: getifname", __func__);
-
- if ((s = getsock(AF_LINK)) == -1)
- err(EXIT_FAILURE, "%s: getsock", __func__);
-
- if (getifaddrs(&ifap) == -1)
- err(EXIT_FAILURE, "%s: getifaddrs", __func__);
-
- memset(&iflr, 0, sizeof(iflr));
-
- strlcpy(iflr.iflr_name, ifname, sizeof(iflr.iflr_name));
-
- for (ifa = ifap; ifa != NULL; ifa = ifa->ifa_next) {
- if (strcmp(ifname, ifa->ifa_name) != 0)
- continue;
- if (ifa->ifa_addr->sa_family != AF_LINK)
- continue;
- if (ifa->ifa_data != NULL)
- continue;
-
- sdl = satocsdl(ifa->ifa_addr);
-
- memcpy(&iflr.addr, ifa->ifa_addr, MIN(ifa->ifa_addr->sa_len,
- sizeof(iflr.addr)));
- iflr.flags = IFLR_PREFIX;
- iflr.prefixlen = sdl->sdl_alen * NBBY;
-
- if (ioctl(s, SIOCGLIFADDR, &iflr) == -1)
- err(EXIT_FAILURE, "%s: ioctl", __func__);
-
- if ((iflr.flags & IFLR_ACTIVE) != 0)
- continue;
-
- if (getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len,
- hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0 &&
- hbuf[0] != '\0')
- printf("\tlink %s\n", hbuf);
- }
- freeifaddrs(ifap);
+ print_link_addresses(env, false);
}
static int
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.217 src/sbin/ifconfig/ifconfig.c:1.218
--- src/sbin/ifconfig/ifconfig.c:1.217 Tue Apr 21 22:13:10 2009
+++ src/sbin/ifconfig/ifconfig.c Tue Apr 21 22:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.217 2009/04/21 22:13:10 dyoung Exp $ */
+/* $NetBSD: ifconfig.c,v 1.218 2009/04/21 22:46:39 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.217 2009/04/21 22:13:10 dyoung Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.218 2009/04/21 22:46:39 dyoung Exp $");
#endif /* not lint */
#include
@@ -1152,7 +1152,6 @@
statistics_func_t *statistics_f;
struct ifdatareq ifdr;
struct ifreq ifr;
- char hbuf[NI_MAXHOST];
char fbuf[BUFSIZ];
int af, s;
const char *ifname;
@@ -1202,11 +1201,7 @@
SIMPLEQ_FOREACH(status_f, &status_funcs, f_next)
(*status_f->f_func)(env, oenv);
- if (sdl != NULL &&
- getnameinfo(sdl, sdl->sa_len,
- hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0 &&
- hbuf[0] != '\0')
- printf("\taddress: %s\n", hbuf);
+ print_link_addresses(env, true);
media_status(env, oenv);
Index: src/sbin/ifconfig/util.c
diff -u src/sbin/ifconfig/util.c:1.9 src/sbin/ifconfig/util.c:1.10
--- src/sbin/ifconfig/util.c:1.9 Sun Jan 18 00:24:29 2009
+++ src/sbin/ifconfig/util.c Tue Apr 21 22:46:39 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.9 2009/01/18 00:24:29 lukem Exp $ */
+/* $NetBSD: util.c,v 1.10 2009/04/21 22:46:39 dyoung Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,12 +27,13 @@
#include
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.9 2009/01/18 00:24:29 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.10 2009/04/21 22:46:39 dyoung Exp $");
#endif /* not lint */
#include
#include
#include
+#include
#include
#include
#include
@@ -40,9 +41,14
CVS commit: src/distrib/sets/lists/man
Module Name:src Committed By: nonaka Date: Tue Apr 21 22:25:05 UTC 2009 Modified Files: src/distrib/sets/lists/man: mi Log Message: Add SD/MMC releated man pages. To generate a diff of this commit: cvs rdiff -u -r1.1132 -r1.1133 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1132 src/distrib/sets/lists/man/mi:1.1133 --- src/distrib/sets/lists/man/mi:1.1132 Mon Apr 20 20:14:21 2009 +++ src/distrib/sets/lists/man/mi Tue Apr 21 22:25:05 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1132 2009/04/20 20:14:21 cegger Exp $ +# $NetBSD: mi,v 1.1133 2009/04/21 22:25:05 nonaka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1348,8 +1348,11 @@ ./usr/share/man/cat4/rum.0 man-sys-catman .cat ./usr/share/man/cat4/satalink.0 man-sys-catman .cat ./usr/share/man/cat4/savagedrm.0 man-sys-catman .cat +./usr/share/man/cat4/sdhc.0 man-sys-catman .cat +./usr/share/man/cat4/sdmmc.0 man-sys-catman .cat ./usr/share/man/cat4/sb.0 man-sys-catman .cat ./usr/share/man/cat4/sbp.0 man-sys-catman .cat +./usr/share/man/cat4/sbt.0 man-sys-catman .cat ./usr/share/man/cat4/sbus.0 man-sys-catman .cat ./usr/share/man/cat4/sc.0 man-sys-catman .cat ./usr/share/man/cat4/scc.0 man-sys-catman .cat @@ -3872,8 +3875,11 @@ ./usr/share/man/html4/rum.html man-sys-htmlman html ./usr/share/man/html4/satalink.html man-sys-htmlman html ./usr/share/man/html4/savagedrm.html man-sys-htmlman html +./usr/share/man/html4/sdhc.html man-sys-htmlman html +./usr/share/man/html4/sdmmc.html man-sys-htmlman html ./usr/share/man/html4/sb.html man-sys-htmlman html ./usr/share/man/html4/sbp.html man-sys-htmlman html +./usr/share/man/html4/sbt.html man-sys-htmlman html ./usr/share/man/html4/sbus.html man-sys-htmlman html ./usr/share/man/html4/sc.html man-sys-htmlman html ./usr/share/man/html4/scc.html man-sys-htmlman html @@ -6308,8 +6314,11 @@ ./usr/share/man/man4/rum.4 man-sys-man .man ./usr/share/man/man4/satalink.4 man-sys-man .man ./usr/share/man/man4/savagedrm.4 man-sys-man .man +./usr/share/man/man4/sdhc.4 man-sys-man .man +./usr/share/man/man4/sdmmc.4 man-sys-man .man ./usr/share/man/man4/sb.4 man-sys-man .man ./usr/share/man/man4/sbp.4 man-sys-man .man +./usr/share/man/man4/sbt.4 man-sys-man .man ./usr/share/man/man4/sbus.4 man-sys-man .man ./usr/share/man/man4/sc.4 man-sys-man .man ./usr/share/man/man4/scc.4 man-sys-man .man
CVS commit: src/share/man/man4
Module Name:src Committed By: nonaka Date: Tue Apr 21 22:21:02 UTC 2009 Modified Files: src/share/man/man4: ld.4 Log Message: Add ld* at sdmmc. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/share/man/man4/ld.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/ld.4 diff -u src/share/man/man4/ld.4:1.16 src/share/man/man4/ld.4:1.17 --- src/share/man/man4/ld.4:1.16 Wed Apr 30 13:10:54 2008 +++ src/share/man/man4/ld.4 Tue Apr 21 22:21:02 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: ld.4,v 1.16 2008/04/30 13:10:54 martin Exp $ +.\" $NetBSD: ld.4,v 1.17 2009/04/21 22:21:02 nonaka Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -40,6 +40,7 @@ .Cd "ld* at icp? unit ?" .Cd "ld* at iop? tid ?" .Cd "ld* at mlx? unit ?" +.Cd "ld* at sdmmc?" .Cd "ld* at twa? unit ?" .Cd "ld* at twe? unit ?" .Cd "ld* at ataraid? vendtype ? unit ?" @@ -69,6 +70,7 @@ .Xr intro 4 , .Xr iop 4 , .Xr mlx 4 , +.Xr sdmmc 4 , .Xr twa 4 , .Xr twe 4 .Sh HISTORY
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: dyoung
Date: Tue Apr 21 22:13:10 UTC 2009
Modified Files:
src/sbin/ifconfig: ifconfig.c
Log Message:
Cosmetic: add some whitespace for my ease of reading.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/sbin/ifconfig/ifconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.216 src/sbin/ifconfig/ifconfig.c:1.217
--- src/sbin/ifconfig/ifconfig.c:1.216 Tue Apr 21 21:57:14 2009
+++ src/sbin/ifconfig/ifconfig.c Tue Apr 21 22:13:10 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.216 2009/04/21 21:57:14 dyoung Exp $ */
+/* $NetBSD: ifconfig.c,v 1.217 2009/04/21 22:13:10 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.216 2009/04/21 21:57:14 dyoung Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.217 2009/04/21 22:13:10 dyoung Exp $");
#endif /* not lint */
#include
@@ -1215,7 +1215,7 @@
estrlcpy(ifdr.ifdr_name, ifname, sizeof(ifdr.ifdr_name));
- if (ioctl(s, zflag ? SIOCZIFDATA:SIOCGIFDATA, &ifdr) == -1)
+ if (ioctl(s, zflag ? SIOCZIFDATA : SIOCGIFDATA, &ifdr) == -1)
err(EXIT_FAILURE, zflag ? "SIOCZIFDATA" : "SIOCGIFDATA");
ifi = &ifdr.ifdr_data;
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: dyoung
Date: Tue Apr 21 21:57:14 UTC 2009
Modified Files:
src/sbin/ifconfig: ifconfig.c
Log Message:
There's no use casting a socket address to sockaddr_dl, only to cast it
back to sockaddr, so don't do it.
To generate a diff of this commit:
cvs rdiff -u -r1.215 -r1.216 src/sbin/ifconfig/ifconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.215 src/sbin/ifconfig/ifconfig.c:1.216
--- src/sbin/ifconfig/ifconfig.c:1.215 Sat Apr 4 17:10:19 2009
+++ src/sbin/ifconfig/ifconfig.c Tue Apr 21 21:57:14 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.215 2009/04/04 17:10:19 plunky Exp $ */
+/* $NetBSD: ifconfig.c,v 1.216 2009/04/21 21:57:14 dyoung Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.215 2009/04/04 17:10:19 plunky Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.216 2009/04/21 21:57:14 dyoung Exp $");
#endif /* not lint */
#include
@@ -126,7 +126,7 @@
static int setifmtu(prop_dictionary_t, prop_dictionary_t);
static int setifnetmask(prop_dictionary_t, prop_dictionary_t);
static int setifprefixlen(prop_dictionary_t, prop_dictionary_t);
-static void status(const struct sockaddr_dl *, prop_dictionary_t,
+static void status(const struct sockaddr *, prop_dictionary_t,
prop_dictionary_t);
static void usage(void);
@@ -724,7 +724,7 @@
{
struct ifaddrs *ifap, *ifa;
struct ifreq ifr;
- const struct sockaddr_dl *sdl = NULL;
+ const struct sockaddr *sdl = NULL;
prop_dictionary_t env, oenv;
int idx;
char *p;
@@ -754,7 +754,7 @@
if (ifname != NULL && strcmp(ifname, ifa->ifa_name) != 0)
continue;
if (ifa->ifa_addr->sa_family == AF_LINK)
- sdl = (const struct sockaddr_dl *) ifa->ifa_addr;
+ sdl = ifa->ifa_addr;
if (p && strcmp(p, ifa->ifa_name) == 0)
continue;
if (!prop_dictionary_set_cstring(env, "if", ifa->ifa_name))
@@ -1144,7 +1144,7 @@
* specified, show it and it only; otherwise, show them all.
*/
void
-status(const struct sockaddr_dl *sdl, prop_dictionary_t env,
+status(const struct sockaddr *sdl, prop_dictionary_t env,
prop_dictionary_t oenv)
{
const struct if_data *ifi;
@@ -1203,7 +1203,7 @@
(*status_f->f_func)(env, oenv);
if (sdl != NULL &&
- getnameinfo((const struct sockaddr *)sdl, sdl->sdl_len,
+ getnameinfo(sdl, sdl->sa_len,
hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0 &&
hbuf[0] != '\0')
printf("\taddress: %s\n", hbuf);
CVS commit: src/share/man/man4
Module Name:src Committed By: pgoyette Date: Tue Apr 21 21:42:53 UTC 2009 Modified Files: src/share/man/man4: Makefile Added Files: src/share/man/man4: sbt.4 sdhc.4 sdmmc.4 Log Message: Add man pages for recently imported SD/MMC drivers. To generate a diff of this commit: cvs rdiff -u -r1.489 -r1.490 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/sbt.4 src/share/man/man4/sdhc.4 \ src/share/man/man4/sdmmc.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/Makefile diff -u src/share/man/man4/Makefile:1.489 src/share/man/man4/Makefile:1.490 --- src/share/man/man4/Makefile:1.489 Mon Apr 20 20:14:21 2009 +++ src/share/man/man4/Makefile Tue Apr 21 21:42:53 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.489 2009/04/20 20:14:21 cegger Exp $ +# $NetBSD: Makefile,v 1.490 2009/04/21 21:42:53 pgoyette Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \ @@ -119,6 +119,9 @@ # machine-independent SPI devices MAN += m25p.4 tm121temp.4 +# machine-independent SD/MMC devices +MAN += sbt.4 sdhc.4 sdmmc.4 + # IPv6/IPsec MAN+= faith.4 gif.4 inet6.4 icmp6.4 ip6.4 ipsec.4 stf.4 Added files: Index: src/share/man/man4/sbt.4 diff -u /dev/null src/share/man/man4/sbt.4:1.1 --- /dev/null Tue Apr 21 21:42:53 2009 +++ src/share/man/man4/sbt.4 Tue Apr 21 21:42:53 2009 @@ -0,0 +1,41 @@ +.\" $NetBSD: sbt.4,v 1.1 2009/04/21 21:42:53 pgoyette Exp $ +.\" $OpenBSD: sbt.4,v 1.1 2007/06/19 11:33:40 uwe Exp $ +.\" +.\" Uwe Stuehler, 2007. Public Domain. +.\" +.Dd April 21, 2009 +.Dt SBT 4 +.Os +.Sh NAME +.Nm sbt +.Nd SDIO Bluetooth adapter +.Sh SYNOPSIS +.Cd "sbt* at sdmmc?" +.Sh DESCRIPTION +The +.Nm +device driver provides support for Type-A and Type-B SDIO Bluetooth +adapters. +.Sh SEE ALSO +.Xr bluetooth 4 , +.Xr intro 4 , +.Xr sdmmc 4 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Nx 6.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Uwe Stuehler +.Aq u...@openbsd.org +for +.Ox +and ported to +.Nx +by +.An NONAKA Kimihiro +.Aq nona...@gmail.com . Index: src/share/man/man4/sdhc.4 diff -u /dev/null src/share/man/man4/sdhc.4:1.1 --- /dev/null Tue Apr 21 21:42:53 2009 +++ src/share/man/man4/sdhc.4 Tue Apr 21 21:42:53 2009 @@ -0,0 +1,40 @@ +.\" $NetBSD: sdhc.4,v 1.1 2009/04/21 21:42:53 pgoyette Exp $ +.\" $OpenBSD: sdhc.4,v 1.4 2009/02/14 18:47:45 deraadt Exp $ +.\" +.\" Theo de Raadt, 2006. Public Domain. +.\" +.Dd April 21, 2009 +.Dt SDHC 4 +.Os +.Sh NAME +.Nm sdhc +.Nd SD Host Controller +.Sh SYNOPSIS +.Cd "sdhc* at pci?" +.Cd "sdmmc* at sdhc?" +.Sh DESCRIPTION +The +.Nm +driver provides support for SD controllers following the +SD Host Controller Standard Simplified Specification. +.Pp +The +.Xr sdmmc 4 +subsystem performs SD/MMC transactions to communicate with +whatever MMC, SD, SDHC, or SDIO devices are inserted into the SD slot. +.Sh SEE ALSO +.Xr intro 4 , +.Xr sdmmc 4 +.Sh HISTORY +The +.Nm +driver was written by +.An Uwe Stuehler +.Aq u...@openbsd.org +for +.Ox +and ported to +.Nx +by +.An NONAKA Kimihiro +.Aq nona...@gmail.com . Index: src/share/man/man4/sdmmc.4 diff -u /dev/null src/share/man/man4/sdmmc.4:1.1 --- /dev/null Tue Apr 21 21:42:53 2009 +++ src/share/man/man4/sdmmc.4 Tue Apr 21 21:42:53 2009 @@ -0,0 +1,52 @@ +.\" $NetBSD: sdmmc.4,v 1.1 2009/04/21 21:42:53 pgoyette Exp $ +.\" $OpenBSD: sdmmc.4,v 1.8 2009/03/25 19:33:06 mk Exp $ +.\" +.\" Theo de Raadt, 2006. Public Domain. +.\" +.Dd April 21, 2009 +.Dt SDMMC 4 +.Os +.Sh NAME +.Nm sdmmc +.Nd SD bus +.Sh SYNOPSIS +.Cd "# zaurus specific" +.Cd "sdmmc* at pxammc?" +.Cd "# all architectures" +.Cd "sdmmc* at sdhc?" +.Cd "ld* at sdmmc?" +.Sh DESCRIPTION +The +.Nm +subsystem provides machine-independent bus support and drivers for +SD/MMC devices. +.Pp +Standard SD/SDHC memory devices will show up as a logical disk, using +.Xr ld 4 . +.Sh SEE ALSO +.Xr intro 4 , +.Xr ld 4 , +.Xr sbt 4 , +.Xr sdhc 4 +.Sh HISTORY +The +.Nm +driver first appeared in +.Nx 6.0 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Uwe Stuehler +.Aq u...@openbsd.org +for +.Ox +and ported to +.Nx +by +.An NONAKA Kimihiro +.Aq nona...@gmail.com +and +.An KIYOHARA Takashi +.Aq kiyoh...@kk.iij4u.or.jp .
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: dyoung
Date: Tue Apr 21 21:42:35 UTC 2009
Modified Files:
src/sbin/ifconfig: af_link.c
Log Message:
Use getnameinfo(3) to render a human-readable link-layer address in the
'address: ' line, just as we do in the 'link xx:xx:...:xx' line.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sbin/ifconfig/af_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_link.c
diff -u src/sbin/ifconfig/af_link.c:1.4 src/sbin/ifconfig/af_link.c:1.5
--- src/sbin/ifconfig/af_link.c:1.4 Tue Apr 21 18:00:25 2009
+++ src/sbin/ifconfig/af_link.c Tue Apr 21 21:42:35 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: af_link.c,v 1.4 2009/04/21 18:00:25 dyoung Exp $ */
+/* $NetBSD: af_link.c,v 1.5 2009/04/21 21:42:35 dyoung Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_link.c,v 1.4 2009/04/21 18:00:25 dyoung Exp $");
+__RCSID("$NetBSD: af_link.c,v 1.5 2009/04/21 21:42:35 dyoung Exp $");
#endif /* not lint */
#include
@@ -74,12 +74,12 @@
static void
link_status(prop_dictionary_t env, prop_dictionary_t oenv, bool force)
{
- const char *delim, *ifname;
- int i, s;
+ char hbuf[NI_MAXHOST];
+ const char *ifname;
+ int s;
struct ifaddrs *ifa, *ifap;
const struct sockaddr_dl *sdl;
struct if_laddrreq iflr;
- const uint8_t *octets;
if ((ifname = getifname(env)) == NULL)
err(EXIT_FAILURE, "%s: getifname", __func__);
@@ -115,15 +115,12 @@
if ((iflr.flags & IFLR_ACTIVE) != 0)
continue;
- octets = (const uint8_t *)&sdl->sdl_data[sdl->sdl_nlen];
-
- delim = "\tlink ";
- for (i = 0; i < sdl->sdl_alen; i++) {
- printf("%s%02" PRIx8, delim, octets[i]);
- delim = ":";
- }
- printf("\n");
+ if (getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len,
+ hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) == 0 &&
+ hbuf[0] != '\0')
+ printf("\tlink %s\n", hbuf);
}
+ freeifaddrs(ifap);
}
static int
CVS commit: src/sys
Module Name:src
Committed By: cegger
Date: Tue Apr 21 21:30:01 UTC 2009
Modified Files:
src/sys/arch/acorn26/acorn26: pmap.c
src/sys/arch/alpha/alpha: pmap.c
src/sys/arch/amiga/amiga: pmap.c
src/sys/arch/arm/arm32: pmap.c
src/sys/arch/atari/atari: pmap.c
src/sys/arch/hppa/hppa: pmap.c
src/sys/arch/ia64/ia64: pmap.c
src/sys/arch/m68k/m68k: pmap_motorola.c
src/sys/arch/mips/mips: pmap.c
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/oea: pmap.c
src/sys/arch/sh3/sh3: pmap.c
src/sys/arch/sparc64/sparc64: pmap.c
src/sys/arch/sun2/sun2: pmap.c
src/sys/arch/sun3/sun3: pmap.c
src/sys/arch/sun3/sun3x: pmap.c
src/sys/arch/usermode/usermode: pmap.c
src/sys/arch/vax/vax: pmap.c
src/sys/arch/x86/x86: bus_dma.c pmap.c
src/sys/uvm: uvm_pmap.h
Log Message:
change pmap flags argument from int to u_int.
discussed with christos@ on source-changes-d@
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/acorn26/acorn26/pmap.c
cvs rdiff -u -r1.238 -r1.239 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amiga/amiga/pmap.c
cvs rdiff -u -r1.197 -r1.198 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/atari/atari/pmap.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ia64/ia64/pmap.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.181 -r1.182 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/powerpc/oea/pmap.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sh3/sh3/pmap.c
cvs rdiff -u -r1.235 -r1.236 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sun2/sun2/pmap.c
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/sun3/sun3/pmap.c
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sun3/sun3x/pmap.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/usermode/usermode/pmap.c
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/vax/vax/pmap.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/x86/x86/bus_dma.c
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.26 -r1.27 src/sys/uvm/uvm_pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/acorn26/acorn26/pmap.c
diff -u src/sys/arch/acorn26/acorn26/pmap.c:1.26 src/sys/arch/acorn26/acorn26/pmap.c:1.27
--- src/sys/arch/acorn26/acorn26/pmap.c:1.26 Wed Mar 18 16:00:08 2009
+++ src/sys/arch/acorn26/acorn26/pmap.c Tue Apr 21 21:29:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.26 2009/03/18 16:00:08 cegger Exp $ */
+/* $NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 Ben Harris
* All rights reserved.
@@ -102,7 +102,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.26 2009/03/18 16:00:08 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.27 2009/04/21 21:29:58 cegger Exp $");
#include /* for cold */
#include
@@ -638,7 +638,7 @@
*/
int
-pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
+pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
UVMHIST_FUNC("pmap_enter");
@@ -647,7 +647,7 @@
}
static int
-pmap_enter1(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags,
+pmap_enter1(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags,
int unmanaged)
{
int ppn, lpn, s;
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.238 src/sys/arch/alpha/alpha/pmap.c:1.239
--- src/sys/arch/alpha/alpha/pmap.c:1.238 Wed Dec 10 11:10:18 2008
+++ src/sys/arch/alpha/alpha/pmap.c Tue Apr 21 21:29:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.238 2008/12/10 11:10:18 pooka Exp $ */
+/* $NetBSD: pmap.c,v 1.239 2009/04/21 21:29:58 cegger Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc.
@@ -140,7 +140,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.238 2008/12/10 11:10:18 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.239 2009/04/21 21:29:58 cegger Exp $");
#include
#include
@@ -1601,7 +1601,7 @@
* insert this page into the given map NOW.
*/
int
-pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, int flags)
+pmap_enter(pmap_t pmap, vaddr_t va, paddr_t pa, vm_prot_t prot, u_int flags)
{
struct vm_page *pg; /* if != NULL, managed page */
pt_entry_t *pte, npte, opte;
Index: src/sys/arch/amiga/amiga/pmap.c
diff -u src/sys/arch/amiga/amiga/pmap.c:1.151 src/sys/arch/amiga/amiga/pmap.c:1.152
--- src/sys/arch/amiga/amiga/pmap.c:1.151 Wed Mar 18 16:00:09 2009
+++ src/sys/arch/amiga/amiga/pmap.c Tue Apr 21 21:29:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.151 2009/03/18 16:00:
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src Committed By: christos Date: Tue Apr 21 18:43:52 UTC 2009 Modified Files: src/external/gpl2/xcvs/dist/src: rcs.c Log Message: remove dup line. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/xcvs/dist/src/rcs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/xcvs/dist/src/rcs.c diff -u src/external/gpl2/xcvs/dist/src/rcs.c:1.3 src/external/gpl2/xcvs/dist/src/rcs.c:1.4 --- src/external/gpl2/xcvs/dist/src/rcs.c:1.3 Tue Apr 21 13:27:50 2009 +++ src/external/gpl2/xcvs/dist/src/rcs.c Tue Apr 21 14:43:52 2009 @@ -3511,7 +3511,6 @@ KEYWORD_INIT (new, KEYWORD_REVISION, "Revision"); KEYWORD_INIT (new, KEYWORD_SOURCE, "Source"); KEYWORD_INIT (new, KEYWORD_STATE, "State"); -KEYWORD_INIT (new, KEYWORD_STATE, "State"); new[KEYWORD_LOCALID].string = NULL; new[KEYWORD_LOCALID].len = 0; new[KEYWORD_LOCALID].expandto = KEYWORD_LOCALID;
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Apr 21 18:38:32 UTC 2009
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: grabmyaddr.c grabmyaddr.h
session.c
Log Message:
Fix strict_address to work again. The lists needs to be initialized
before configuration is read, which happens before my_addr_init() call.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h
cvs rdiff -u -r1.24 -r1.25 src/crypto/dist/ipsec-tools/src/racoon/session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.21 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.22
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.21 Fri Jan 23 08:05:58 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Tue Apr 21 18:38:31 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.21 2009/01/23 08:05:58 tteras Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.22 2009/04/21 18:38:31 tteras Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras .
@@ -288,13 +288,17 @@
return bestmatch_port;
}
-int
-myaddr_init()
+void
+myaddr_init_lists()
{
LIST_INIT(&configured);
LIST_INIT(&opened);
+}
- if (!lcconf->strict_address) {
+int
+myaddr_init()
+{
+if (!lcconf->strict_address) {
lcconf->rtsock = kernel_open_socket();
if (lcconf->rtsock < 0)
return -1;
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h:1.5 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h:1.6
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h:1.5 Tue Dec 23 14:03:12 2008
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.h Tue Apr 21 18:38:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.h,v 1.5 2008/12/23 14:03:12 tteras Exp $ */
+/* $NetBSD: grabmyaddr.h,v 1.6 2009/04/21 18:38:32 tteras Exp $ */
/* Id: grabmyaddr.h,v 1.5 2004/06/11 16:00:16 ludvigm Exp */
@@ -34,6 +34,7 @@
#ifndef _GRABMYADDR_H
#define _GRABMYADDR_H
+extern void myaddr_init_lists __P((void));
extern int myaddr_init __P((void));
extern void myaddr_close __P((void));
Index: src/crypto/dist/ipsec-tools/src/racoon/session.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/session.c:1.24 src/crypto/dist/ipsec-tools/src/racoon/session.c:1.25
--- src/crypto/dist/ipsec-tools/src/racoon/session.c:1.24 Fri Jan 23 08:05:58 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/session.c Tue Apr 21 18:38:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: session.c,v 1.24 2009/01/23 08:05:58 tteras Exp $ */
+/* $NetBSD: session.c,v 1.25 2009/04/21 18:38:32 tteras Exp $ */
/* $KAME: session.c,v 1.32 2003/09/24 02:01:17 jinmei Exp $ */
@@ -193,6 +193,8 @@
errx(1, "could not initialize radius config");
#endif
+ myaddr_init_lists();
+
/*
* in order to prefer the parameters by command line,
* saving some parameters before parsing configuration file.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: dyoung
Date: Tue Apr 21 18:00:25 UTC 2009
Modified Files:
src/sbin/ifconfig: af_link.c
Log Message:
Fix indentation: change spaces to tabs.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sbin/ifconfig/af_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/af_link.c
diff -u src/sbin/ifconfig/af_link.c:1.3 src/sbin/ifconfig/af_link.c:1.4
--- src/sbin/ifconfig/af_link.c:1.3 Wed Jul 2 07:44:14 2008
+++ src/sbin/ifconfig/af_link.c Tue Apr 21 18:00:25 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: af_link.c,v 1.3 2008/07/02 07:44:14 dyoung Exp $ */
+/* $NetBSD: af_link.c,v 1.4 2009/04/21 18:00:25 dyoung Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: af_link.c,v 1.3 2008/07/02 07:44:14 dyoung Exp $");
+__RCSID("$NetBSD: af_link.c,v 1.4 2009/04/21 18:00:25 dyoung Exp $");
#endif /* not lint */
#include
@@ -112,7 +112,7 @@
if (ioctl(s, SIOCGLIFADDR, &iflr) == -1)
err(EXIT_FAILURE, "%s: ioctl", __func__);
-if ((iflr.flags & IFLR_ACTIVE) != 0)
+ if ((iflr.flags & IFLR_ACTIVE) != 0)
continue;
octets = (const uint8_t *)&sdl->sdl_data[sdl->sdl_nlen];
CVS commit: src/external/gpl2/xcvs/dist/src
Module Name:src Committed By: christos Date: Tue Apr 21 17:27:50 UTC 2009 Modified Files: src/external/gpl2/xcvs/dist/src: rcs.c Log Message: Fix LOCALID expansion (from Anon Ymous) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/xcvs/dist/src/rcs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/xcvs/dist/src/rcs.c diff -u src/external/gpl2/xcvs/dist/src/rcs.c:1.2 src/external/gpl2/xcvs/dist/src/rcs.c:1.3 --- src/external/gpl2/xcvs/dist/src/rcs.c:1.2 Wed Apr 8 12:27:51 2009 +++ src/external/gpl2/xcvs/dist/src/rcs.c Tue Apr 21 13:27:50 2009 @@ -3511,6 +3511,11 @@ KEYWORD_INIT (new, KEYWORD_REVISION, "Revision"); KEYWORD_INIT (new, KEYWORD_SOURCE, "Source"); KEYWORD_INIT (new, KEYWORD_STATE, "State"); +KEYWORD_INIT (new, KEYWORD_STATE, "State"); +new[KEYWORD_LOCALID].string = NULL; +new[KEYWORD_LOCALID].len = 0; +new[KEYWORD_LOCALID].expandto = KEYWORD_LOCALID; +new[KEYWORD_LOCALID].expandit = false; return new; }
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: cube
Date: Tue Apr 21 16:36:06 UTC 2009
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.519 -r1.520 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.520 -r1.521 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.519 src/sys/dev/usb/usbdevs.h:1.520
--- src/sys/dev/usb/usbdevs.h:1.519 Tue Apr 21 16:24:37 2009
+++ src/sys/dev/usb/usbdevs.h Tue Apr 21 16:36:06 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.519 2009/04/21 16:24:37 taca Exp $ */
+/* $NetBSD: usbdevs.h,v 1.520 2009/04/21 16:36:06 cube Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.524 2009/04/21 16:23:36 taca Exp
+ * NetBSD: usbdevs,v 1.525 2009/04/21 16:34:41 cube Exp
*/
/*
@@ -947,6 +947,7 @@
/* Dick Smith Electronics (really C-Net) products */
#define USB_PRODUCT_DICKSMITH_RT2573 0x9022 /* RT2573 */
#define USB_PRODUCT_DICKSMITH_CWD854F 0x9032 /* C-Net CWD-854 rev F */
+#define USB_PRODUCT_DICKSMITH_RTL8187 0x9401 /* RTL8187 */
/* Digi International products */
#define USB_PRODUCT_DIGI_ACCELEPORT2 0x0002 /* AccelePort USB 2 */
@@ -1441,6 +1442,7 @@
#define USB_PRODUCT_LOGITEC_LDR_H443U2 0x00b3 /* DVD Multi-plus unit LDR-H443U2 */
#define USB_PRODUCT_LOGITEC_LAN_GTJU2 0x0102 /* LAN-GTJ/U2 */
#define USB_PRODUCT_LOGITEC_LANTX 0x0105 /* LAN-TX */
+#define USB_PRODUCT_LOGITEC_RTL8187 0x010c /* RTL8187 */
/* Logitech products */
#define USB_PRODUCT_LOGITECH_M2452 0x0203 /* M2452 keyboard */
@@ -1671,6 +1673,7 @@
#define USB_PRODUCT_NETGEAR_FA101 0x1020 /* 10/100 Ethernet */
#define USB_PRODUCT_NETGEAR_FA120 0x1040 /* USB 2.0 Fast Ethernet Adapter */
#define USB_PRODUCT_NETGEAR_MA111NA 0x4110 /* 802.11b Adapter */
+#define USB_PRODUCT_NETGEAR_WG111V2 0x6a00 /* WG111v2 */
#define USB_PRODUCT_NETGEAR_XA601 0x8100 /* USB to PL Adapter */
#define USB_PRODUCT_NETGEAR2_MA101 0x4100 /* MA101 */
@@ -1922,6 +1925,7 @@
/* Realtek products */
#define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* RTL8150L USB-Ethernet Bridge */
#define USB_PRODUCT_REALTEK_RTL8151 0x8151 /* RTL8151 PNA */
+#define USB_PRODUCT_REALTEK_RTL8187 0x8187 /* RTL8187 */
/* Research In Motion */
#define USB_PRODUCT_RIM_BLACKBERRY 0x0001 /* BlackBerry */
@@ -2184,6 +2188,7 @@
/* Sphairon Access Systems GmbH products */
#define USB_PRODUCT_SPHAIRON_UB801R 0x0110 /* UB801R */
+#define USB_PRODUCT_SPHAIRON_RTL8187 0x0150 /* RTL8187 */
/* STMicroelectronics products */
#define USB_PRODUCT_STMICRO_COMMUNICATOR 0x7554 /* USB Communicator */
@@ -2216,6 +2221,7 @@
#define USB_PRODUCT_DIAMOND2_PSAPLAY120 0x5003 /* Nike psa[play 120 */
/* Surecom Technology products */
+#define USB_PRODUCT_SURECOM_EP9001G2A 0x11f2 /* EP-9001-g rev 2a */
#define USB_PRODUCT_SURECOM_EP9001G 0x11f3 /* EP-9001-g */
#define USB_PRODUCT_SURECOM_RT2573 0x31f3 /* RT2573 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.520 src/sys/dev/usb/usbdevs_data.h:1.521
--- src/sys/dev/usb/usbdevs_data.h:1.520 Tue Apr 21 16:24:37 2009
+++ src/sys/dev/usb/usbdevs_data.h Tue Apr 21 16:36:06 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.520 2009/04/21 16:24:37 taca Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.521 2009/04/21 16:36:06 cube Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.524 2009/04/21 16:23:36 taca Exp
+ * NetBSD: usbdevs,v 1.525 2009/04/21 16:34:41 cube Exp
*/
/*
@@ -2911,6 +2911,10 @@
"C-Net CWD-854 rev F",
},
{
+ USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_RTL8187,
+ "RTL8187",
+ },
+ {
USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
"AccelePort USB 2",
},
@@ -4235,6 +4239,10 @@
"LAN-TX",
},
{
+ USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_RTL8187,
+ "RTL8187",
+ },
+ {
USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
"M2452 keyboard",
},
@@ -4891,6 +4899,10 @@
"802.11b Adapter",
},
{
+ USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WG111V2,
+ "WG111v2",
+ },
+ {
USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_XA601,
"USB to PL Adapter",
},
@@ -5559,6 +5571,10 @@
"RTL8151 PNA",
},
{
+ USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8187,
+ "RTL8187",
+ },
+ {
USB_VENDOR_RIM, USB_PRODUCT_RIM_BLACKBERRY,
"BlackBerry",
},
@@ -6315,6 +6331,10 @@
"UB801R",
},
{
+ USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_RTL8187,
+ "RTL8187",
+ },
+ {
USB_VENDOR_STMICRO, USB_PRODUCT_STMICRO_COMMUNICATOR,
"USB Communicator",
},
@@ -6383,6 +6403,10 @@
"Nike psa[play 120",
},
{
+ USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_EP9001G2A,
+ "EP
CVS commit: src/sys/dev/usb
Module Name:src Committed By: cube Date: Tue Apr 21 16:34:41 UTC 2009 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add a number of products that use Realtek's RTL8187 802.11 chip. To generate a diff of this commit: cvs rdiff -u -r1.524 -r1.525 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.524 src/sys/dev/usb/usbdevs:1.525 --- src/sys/dev/usb/usbdevs:1.524 Tue Apr 21 16:23:36 2009 +++ src/sys/dev/usb/usbdevs Tue Apr 21 16:34:41 2009 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.524 2009/04/21 16:23:36 taca Exp $ +$NetBSD: usbdevs,v 1.525 2009/04/21 16:34:41 cube Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -940,6 +940,7 @@ /* Dick Smith Electronics (really C-Net) products */ product DICKSMITH RT2573 0x9022 RT2573 product DICKSMITH CWD854F 0x9032 C-Net CWD-854 rev F +product DICKSMITH RTL8187 0x9401 RTL8187 /* Digi International products */ product DIGI ACCELEPORT2 0x0002 AccelePort USB 2 @@ -1434,6 +1435,7 @@ product LOGITEC LDR_H443U2 0x00b3 DVD Multi-plus unit LDR-H443U2 product LOGITEC LAN_GTJU2 0x0102 LAN-GTJ/U2 product LOGITEC LANTX 0x0105 LAN-TX +product LOGITEC RTL8187 0x010c RTL8187 /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard @@ -1664,6 +1666,7 @@ product NETGEAR FA101 0x1020 10/100 Ethernet product NETGEAR FA120 0x1040 USB 2.0 Fast Ethernet Adapter product NETGEAR MA111NA 0x4110 802.11b Adapter +product NETGEAR WG111V2 0x6a00 WG111v2 product NETGEAR XA601 0x8100 USB to PL Adapter product NETGEAR2 MA101 0x4100 MA101 @@ -1915,6 +1918,7 @@ /* Realtek products */ product REALTEK RTL8150L 0x8150 RTL8150L USB-Ethernet Bridge product REALTEK RTL8151 0x8151 RTL8151 PNA +product REALTEK RTL8187 0x8187 RTL8187 /* Research In Motion */ product RIM BLACKBERRY 0x0001 BlackBerry @@ -2177,6 +2181,7 @@ /* Sphairon Access Systems GmbH products */ product SPHAIRON UB801R 0x0110 UB801R +product SPHAIRON RTL8187 0x0150 RTL8187 /* STMicroelectronics products */ product STMICRO COMMUNICATOR 0x7554 USB Communicator @@ -2209,6 +2214,7 @@ product DIAMOND2 PSAPLAY120 0x5003 Nike psa[play 120 /* Surecom Technology products */ +product SURECOM EP9001G2A 0x11f2 EP-9001-g rev 2a product SURECOM EP9001G 0x11f3 EP-9001-g product SURECOM RT2573 0x31f3 RT2573
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: taca
Date: Tue Apr 21 16:26:01 UTC 2009
Modified Files:
src/sys/dev/usb: uftdi.c
Log Message:
Add support for USB serial adapter REX-USB60F which I tested.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/uftdi.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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.39 src/sys/dev/usb/uftdi.c:1.40
--- src/sys/dev/usb/uftdi.c:1.39 Sat Sep 6 21:42:05 2008
+++ src/sys/dev/usb/uftdi.c Tue Apr 21 16:26:01 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.39 2008/09/06 21:42:05 rmind Exp $ */
+/* $NetBSD: uftdi.c,v 1.40 2009/04/21 16:26:01 taca Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.39 2008/09/06 21:42:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.40 2009/04/21 16:26:01 taca Exp $");
#include
#include
@@ -144,6 +144,7 @@
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_635 },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN },
{ USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI },
+ { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60F },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_USBSERIAL },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P1 },
{ USB_VENDOR_SEALEVEL, USB_PRODUCT_SEALEVEL_SEAPORT4P2 },
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: taca
Date: Tue Apr 21 16:24:37 UTC 2009
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.518 -r1.519 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.519 -r1.520 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.518 src/sys/dev/usb/usbdevs.h:1.519
--- src/sys/dev/usb/usbdevs.h:1.518 Sat Feb 14 17:03:33 2009
+++ src/sys/dev/usb/usbdevs.h Tue Apr 21 16:24:37 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.518 2009/02/14 17:03:33 jakllsch Exp $ */
+/* $NetBSD: usbdevs.h,v 1.519 2009/04/21 16:24:37 taca Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.523 2009/02/14 17:01:23 jakllsch Exp
+ * NetBSD: usbdevs,v 1.524 2009/04/21 16:23:36 taca Exp
*/
/*
@@ -1917,6 +1917,7 @@
/* RATOC Systems products */
#define USB_PRODUCT_RATOC_REXUSB60 0xb000 /* USB serial adapter REX-USB60 */
+#define USB_PRODUCT_RATOC_REXUSB60F 0xb020 /* USB serial adapter REX-USB60F */
/* Realtek products */
#define USB_PRODUCT_REALTEK_RTL8150L 0x8150 /* RTL8150L USB-Ethernet Bridge */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.519 src/sys/dev/usb/usbdevs_data.h:1.520
--- src/sys/dev/usb/usbdevs_data.h:1.519 Sat Feb 14 17:03:33 2009
+++ src/sys/dev/usb/usbdevs_data.h Tue Apr 21 16:24:37 2009
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.519 2009/02/14 17:03:33 jakllsch Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.520 2009/04/21 16:24:37 taca Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.523 2009/02/14 17:01:23 jakllsch Exp
+ * NetBSD: usbdevs,v 1.524 2009/04/21 16:23:36 taca Exp
*/
/*
@@ -5547,6 +5547,10 @@
"USB serial adapter REX-USB60",
},
{
+ USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60F,
+ "USB serial adapter REX-USB60F",
+ },
+ {
USB_VENDOR_REALTEK, USB_PRODUCT_REALTEK_RTL8150L,
"RTL8150L USB-Ethernet Bridge",
},
@@ -6835,4 +6839,4 @@
"Prestige",
},
};
-const int usb_nproducts = 1243;
+const int usb_nproducts = 1244;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: taca Date: Tue Apr 21 16:23:36 UTC 2009 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add product id for RATOC USB serial adapter REX-USB60F. To generate a diff of this commit: cvs rdiff -u -r1.523 -r1.524 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.523 src/sys/dev/usb/usbdevs:1.524 --- src/sys/dev/usb/usbdevs:1.523 Sat Feb 14 17:01:23 2009 +++ src/sys/dev/usb/usbdevs Tue Apr 21 16:23:36 2009 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.523 2009/02/14 17:01:23 jakllsch Exp $ +$NetBSD: usbdevs,v 1.524 2009/04/21 16:23:36 taca Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1910,6 +1910,7 @@ /* RATOC Systems products */ product RATOC REXUSB60 0xb000 USB serial adapter REX-USB60 +product RATOC REXUSB60F 0xb020 USB serial adapter REX-USB60F /* Realtek products */ product REALTEK RTL8150L 0x8150 RTL8150L USB-Ethernet Bridge
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: reinoud
Date: Tue Apr 21 16:19:00 UTC 2009
Modified Files:
src/sys/fs/udf: udf_allocation.c
Log Message:
Fix endian related bug when using discs with a meta-data partition on
big-endian machines.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/fs/udf/udf_allocation.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_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.20 src/sys/fs/udf/udf_allocation.c:1.21
--- src/sys/fs/udf/udf_allocation.c:1.20 Wed Mar 25 20:04:52 2009
+++ src/sys/fs/udf/udf_allocation.c Tue Apr 21 16:19:00 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.20 2009/03/25 20:04:52 reinoud Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.21 2009/04/21 16:19:00 reinoud Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.20 2009/03/25 20:04:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_allocation.c,v 1.21 2009/04/21 16:19:00 reinoud Exp $");
#endif /* not lint */
@@ -507,11 +507,8 @@
lb_num = udf_rw32(s_icb_loc.loc.lb_num);
vpart= udf_rw16(s_icb_loc.loc.part_num);
lb_num += (ext_offset + lb_size -1) / lb_size;
- len -= ext_offset;
ext_offset = 0;
- flags = UDF_EXT_FLAGS(s_icb_loc.len);
-
UDF_UNLOCK_NODE(ump->metadata_node, 0);
if (flags != UDF_EXT_ALLOCATED) {
DPRINTF(TRANSLATE, ("Metadata partition translation "
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: tsutsui Date: Tue Apr 21 16:09:22 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.pmax Log Message: +/usr/mdec/bootxx_ffsv2 To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/md.pmax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.pmax diff -u src/distrib/sets/lists/base/md.pmax:1.43 src/distrib/sets/lists/base/md.pmax:1.44 --- src/distrib/sets/lists/base/md.pmax:1.43 Sat Nov 29 17:57:34 2008 +++ src/distrib/sets/lists/base/md.pmax Tue Apr 21 16:09:22 2009 @@ -1,10 +1,11 @@ -# $NetBSD: md.pmax,v 1.43 2008/11/29 17:57:34 tsutsui Exp $ +# $NetBSD: md.pmax,v 1.44 2009/04/21 16:09:22 tsutsui Exp $ ./boot.pmax base-sysutil-bin ./etc/ld.so.confbase-obsolete obsolete ./sbin/ldconfig base-obsolete obsolete ./usr/mdec/boot.pmaxbase-sysutil-bin ./usr/mdec/bootxx_cd9660 base-sysutil-bin ./usr/mdec/bootxx_ffsbase-sysutil-bin +./usr/mdec/bootxx_ffsv2base-sysutil-bin ./usr/mdec/bootxx_lfsbase-sysutil-bin ./usr/mdec/installbootbase-obsolete obsolete ./usr/mdec/netbootbase-sysutil-bin
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Apr 21 16:08:57 UTC 2009 Modified Files: src/distrib/sets/lists/etc: mi src/etc/mtree: special src/etc/rc.d: Makefile ccd cgd lvm mountcritlocal raidframe rndctl root swap1 wdogctl src/usr.sbin/postinstall: postinstall Added Files: src/etc/rc.d: DISKS fsck_root Log Message: Split fsck during boot into two phases. Check the root file system first, mount root and run the various disk providers. Add swap and check the remaining file systems after that. This breaks the dependency cycle for lvm, which needs writeable /dev. Depend on rndctl in cgd. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 src/distrib/sets/lists/etc/mi cvs rdiff -u -r1.127 -r1.128 src/etc/mtree/special cvs rdiff -u -r0 -r1.1 src/etc/rc.d/DISKS src/etc/rc.d/fsck_root cvs rdiff -u -r1.76 -r1.77 src/etc/rc.d/Makefile cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/ccd src/etc/rc.d/cgd cvs rdiff -u -r1.4 -r1.5 src/etc/rc.d/lvm cvs rdiff -u -r1.9 -r1.10 src/etc/rc.d/mountcritlocal src/etc/rc.d/raidframe \ src/etc/rc.d/swap1 cvs rdiff -u -r1.2 -r1.3 src/etc/rc.d/rndctl cvs rdiff -u -r1.3 -r1.4 src/etc/rc.d/root src/etc/rc.d/wdogctl cvs rdiff -u -r1.93 -r1.94 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/etc/mi diff -u src/distrib/sets/lists/etc/mi:1.207 src/distrib/sets/lists/etc/mi:1.208 --- src/distrib/sets/lists/etc/mi:1.207 Mon Feb 2 20:47:20 2009 +++ src/distrib/sets/lists/etc/mi Tue Apr 21 16:08:57 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.207 2009/02/02 20:47:20 joerg Exp $ +# $NetBSD: mi,v 1.208 2009/04/21 16:08:57 joerg Exp $ # # Note: end-user configuration files that are moved to another location # should not be marked "obsolete"; they should just be removed from @@ -159,6 +159,7 @@ ./etc/rc etc-sys-rc ./etc/rc.conf etc-sys-rc ./etc/rc.d/DAEMONetc-sys-rc +./etc/rc.d/DISKSetc-sys-rc ./etc/rc.d/LOGINetc-sys-rc ./etc/rc.d/NETWORKetc-obsolete obsolete ./etc/rc.d/NETWORKINGetc-sys-rc @@ -187,6 +188,7 @@ ./etc/rc.d/envsysetc-sys-rc ./etc/rc.d/fixsbetc-obsolete obsolete ./etc/rc.d/fsck etc-sys-rc +./etc/rc.d/fsck_rootetc-sys-rc ./etc/rc.d/fsck.shetc-obsolete obsolete ./etc/rc.d/ftp_proxyetc-net-rc ./etc/rc.d/ftpd etc-net-rc Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.127 src/etc/mtree/special:1.128 --- src/etc/mtree/special:1.127 Sun Jan 18 08:24:46 2009 +++ src/etc/mtree/special Tue Apr 21 16:08:57 2009 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.127 2009/01/18 08:24:46 taca Exp $ +# $NetBSD: special,v 1.128 2009/04/21 16:08:57 joerg Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -178,6 +178,7 @@ ./etc/rc.conf type=file mode=0644 ./etc/rc.d type=dir mode=0755 ./etc/rc.d/DAEMON type=file mode=0555 +./etc/rc.d/DISKS type=file mode=0555 ./etc/rc.d/LOGIN type=file mode=0555 ./etc/rc.d/NETWORKING type=file mode=0555 ./etc/rc.d/SERVERS type=file mode=0555 @@ -202,6 +203,7 @@ ./etc/rc.d/downinterfaces type=file mode=0555 ./etc/rc.d/envsys type=file mode=0555 ./etc/rc.d/fsck type=file mode=0555 +./etc/rc.d/fsck_root type=file mode=0555 ./etc/rc.d/ftp_proxy type=file mode=0555 ./etc/rc.d/ftpd type=file mode=0555 ./etc/rc.d/hostapd type=file mode=0555 Index: src/etc/rc.d/Makefile diff -u src/etc/rc.d/Makefile:1.76 src/etc/rc.d/Makefile:1.77 --- src/etc/rc.d/Makefile:1.76 Wed Apr 15 22:36:04 2009 +++ src/etc/rc.d/Makefile Tue Apr 21 16:08:57 2009 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2009/04/15 22:36:04 joerg Exp $ +# $NetBSD: Makefile,v 1.77 2009/04/21 16:08:57 joerg Exp $ .include @@ -14,12 +14,12 @@ # src/sbin/rcorder. CONFIGFILES=\ - DAEMON LOGIN NETWORKING SERVERS \ + DAEMON DISKS LOGIN NETWORKING SERVERS \ accounting altqd amd apmd \ bootconf.sh bootparams btattach btconfig btdevctl bthcid \ ccd cgd cleartmp cron \ dhclient dhcpd dhcrelay dmesg downinterfaces envsys \ - fsck ftp_proxy ftpd \ + fsck fsck_root ftp_proxy ftpd \ hostapd httpd \ identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \ irdaattach iscsi_target isdnd \ Index: src/etc/rc.d/ccd diff -u src/etc/rc.d/ccd:1.5 src/etc/rc.d/ccd:1.6 --- src/etc/rc.d/ccd:1.5 Fri Aug 13 18:08:03 2004 +++ src/etc/rc.d/ccd Tue Apr 21 16:08:57 2009 @@ -1,9 +1,10 @@ #!/bin/sh # -# $NetBSD: ccd,v 1.5 2004/08/13 18:08:03 mycroft Exp $ +# $NetBSD: ccd,v 1.6 2009/04/21 16:08:57 joerg Exp $ # -# PROVIDE: disks +# PROVIDE: ccd +# BEFORE: DISKS $_rc_subr_loaded . /etc/rc.subr Index: src/etc/rc.d/cgd diff -u src/etc/rc.d/cgd:1.5 src/etc/rc.d/cgd:1.6 --- src/etc/rc.d/cgd:1.5 Wed Mar 2 19:09:22 2005 +++ src/etc/rc.d/cgd Tue Apr 21 16:08:57 2009 @@ -1,9 +1,11 @@ #!/bin/sh # -# $NetBSD: cgd,v 1.5 2005/03/02 19:09:22 tv Ex
CVS commit: src/sys/arch/pmax/stand
Module Name:src
Committed By: tsutsui
Date: Tue Apr 21 16:08:40 UTC 2009
Modified Files:
src/sys/arch/pmax/stand: Makefile
src/sys/arch/pmax/stand/bootxx_ffs: Makefile
src/sys/arch/pmax/stand/common: conf.c
Added Files:
src/sys/arch/pmax/stand/bootxx_ffsv2: Makefile
Log Message:
Add UFS2 boot support. Tested on gxemul.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/pmax/stand/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/pmax/stand/bootxx_ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/pmax/stand/common/conf.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/pmax/stand/Makefile
diff -u src/sys/arch/pmax/stand/Makefile:1.18 src/sys/arch/pmax/stand/Makefile:1.19
--- src/sys/arch/pmax/stand/Makefile:1.18 Thu Apr 4 22:59:33 2002
+++ src/sys/arch/pmax/stand/Makefile Tue Apr 21 16:08:39 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2002/04/04 22:59:33 lukem Exp $
+# $NetBSD: Makefile,v 1.19 2009/04/21 16:08:39 tsutsui Exp $
# @(#)Makefile 8.3 (Berkeley) 2/16/94
# first stage bootblocks
-SUBDIR+=bootxx_cd9660 bootxx_ffs bootxx_lfs netboot
+SUBDIR+=bootxx_cd9660 bootxx_ffs bootxx_ffsv2 bootxx_lfs netboot
# remove this when netboot is working - we don't go in here
# by default...
Index: src/sys/arch/pmax/stand/bootxx_ffs/Makefile
diff -u src/sys/arch/pmax/stand/bootxx_ffs/Makefile:1.2 src/sys/arch/pmax/stand/bootxx_ffs/Makefile:1.3
--- src/sys/arch/pmax/stand/bootxx_ffs/Makefile:1.2 Sat Feb 1 23:58:48 2003
+++ src/sys/arch/pmax/stand/bootxx_ffs/Makefile Tue Apr 21 16:08:39 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/02/01 23:58:48 simonb Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/21 16:08:39 tsutsui Exp $
PRIMARY_PROG= bootxx_ffs
-CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=ufs \
- -DBOOTXX_FS_NAME='"FFS"'
+CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=ffsv1 \
+ -DBOOTXX_FS_NAME='"FFSv1"'
# Use small daddr_t to avoid code bloat
CPPFLAGS+= -D__daddr_t=int32_t
Index: src/sys/arch/pmax/stand/common/conf.c
diff -u src/sys/arch/pmax/stand/common/conf.c:1.24 src/sys/arch/pmax/stand/common/conf.c:1.25
--- src/sys/arch/pmax/stand/common/conf.c:1.24 Sun Dec 11 12:18:39 2005
+++ src/sys/arch/pmax/stand/common/conf.c Tue Apr 21 16:08:40 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.24 2005/12/11 12:18:39 christos Exp $ */
+/* $NetBSD: conf.c,v 1.25 2009/04/21 16:08:40 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -81,7 +81,8 @@
#ifndef LIBSA_SINGLE_FILESYSTEM
#ifdef LIBSA_NO_FS_CLOSE
-#define ufs_close 0
+#define ffsv1_close 0
+#define ffsv2_close 0
#define lfsv1_close 0
#define lfsv2_close 0
#define cd9660_close 0
@@ -89,7 +90,8 @@
#define nfs_close 0
#endif
#ifdef LIBSA_NO_FS_WRITE
-#define ufs_write 0
+#define ffsv1_write 0
+#define ffsv2_write 0
#define lfsv1_write 0
#define lfsv2_write 0
#define cd9660_write 0
@@ -98,7 +100,8 @@
#endif
struct fs_ops file_system[] = {
- FS_OPS(ufs),
+ FS_OPS(ffsv1),
+ FS_OPS(ffsv2),
FS_OPS(lfsv1),
FS_OPS(lfsv2),
FS_OPS(cd9660),
Added files:
Index: src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile
diff -u /dev/null src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile:1.1
--- /dev/null Tue Apr 21 16:08:40 2009
+++ src/sys/arch/pmax/stand/bootxx_ffsv2/Makefile Tue Apr 21 16:08:39 2009
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2009/04/21 16:08:39 tsutsui Exp $
+
+PRIMARY_PROG= bootxx_ffsv2
+CPPFLAGS+= -DLIBSA_SINGLE_FILESYSTEM=ffsv2 \
+ -DBOOTXX_FS_NAME='"FFSv2"'
+# Use small daddr_t to avoid code bloat
+CPPFLAGS+= -D__daddr_t=int32_t
+
+PRIMARY_MAX_LOAD!= expr 8192 - 512
+
+.include "../Makefile.booters"
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: tsutsui Date: Tue Apr 21 15:18:50 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.landisk Log Message: Add /usr/mdec/bootxx_ffsv2. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/md.landisk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.landisk diff -u src/distrib/sets/lists/base/md.landisk:1.3 src/distrib/sets/lists/base/md.landisk:1.4 --- src/distrib/sets/lists/base/md.landisk:1.3 Sat Nov 29 17:57:33 2008 +++ src/distrib/sets/lists/base/md.landisk Tue Apr 21 15:18:50 2009 @@ -1,4 +1,5 @@ -# $NetBSD: md.landisk,v 1.3 2008/11/29 17:57:33 tsutsui Exp $ +# $NetBSD: md.landisk,v 1.4 2009/04/21 15:18:50 tsutsui Exp $ ./usr/mdec/boot base-sysutil-bin ./usr/mdec/bootxx_ffsv1 base-sysutil-bin +./usr/mdec/bootxx_ffsv2 base-sysutil-bin ./usr/mdec/mbr base-sysutil-bin
CVS commit: src/sys/arch/landisk/stand
Module Name:src
Committed By: tsutsui
Date: Tue Apr 21 15:17:58 UTC 2009
Modified Files:
src/sys/arch/landisk/stand/boot: Makefile.boot conf.c
src/sys/arch/landisk/stand/bootxx: Makefile
Added Files:
src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2: Makefile
Log Message:
Add UFS2 boot support. Tested on lantank.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/stand/boot/Makefile.boot \
src/sys/arch/landisk/stand/boot/conf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/landisk/stand/bootxx/Makefile
cvs rdiff -u -r0 -r1.1 \
src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/landisk/stand/boot/Makefile.boot
diff -u src/sys/arch/landisk/stand/boot/Makefile.boot:1.1 src/sys/arch/landisk/stand/boot/Makefile.boot:1.2
--- src/sys/arch/landisk/stand/boot/Makefile.boot:1.1 Fri Sep 1 21:26:18 2006
+++ src/sys/arch/landisk/stand/boot/Makefile.boot Tue Apr 21 15:17:58 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.1 2006/09/01 21:26:18 uwe Exp $
+# $NetBSD: Makefile.boot,v 1.2 2009/04/21 15:17:58 tsutsui Exp $
PROG?= boot
@@ -17,7 +17,8 @@
LDFLAGS+= -e boot_start
CFLAGS=
-CPPFLAGS= -DSUPPORT_UFS
+CPPFLAGS= -DSUPPORT_FFSv1
+CPPFLAGS+= -DSUPPORT_FFSv2
CPPFLAGS+= -DSUPPORT_DOSFS
CPPFLAGS+= -DDBMONITOR
#CPPFLAGS+= -DDEBUG
Index: src/sys/arch/landisk/stand/boot/conf.c
diff -u src/sys/arch/landisk/stand/boot/conf.c:1.1 src/sys/arch/landisk/stand/boot/conf.c:1.2
--- src/sys/arch/landisk/stand/boot/conf.c:1.1 Fri Sep 1 21:26:18 2006
+++ src/sys/arch/landisk/stand/boot/conf.c Tue Apr 21 15:17:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
+/* $NetBSD: conf.c,v 1.2 2009/04/21 15:17:58 tsutsui Exp $ */
/*
* Copyright (c) 1996
@@ -42,18 +42,20 @@
#include "biosdisk.h"
struct devsw devsw[] = {
-#if defined(SUPPORT_UFS)
-{ "hd", biosdisk_strategy, biosdisk_open, biosdisk_close, biosdisk_ioctl},
-#endif
+ { "hd", biosdisk_strategy, biosdisk_open, biosdisk_close,
+ biosdisk_ioctl},
};
int ndevs = sizeof(devsw) / sizeof(devsw[0]);
struct fs_ops file_system[] = {
-#ifdef SUPPORT_UFS
-{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
+#ifdef SUPPORT_FFSv1
+ FS_OPS(ffsv1),
+#endif
+#ifdef SUPPORT_FFSv2
+ FS_OPS(ffsv2),
#endif
#ifdef SUPPORT_DOSFS
-{ dosfs_open, dosfs_close, dosfs_read, dosfs_write, dosfs_seek, dosfs_stat },
+ FS_OPS(dosfs),
#endif
};
int nfsys = sizeof(file_system) / sizeof(file_system[0]);
Index: src/sys/arch/landisk/stand/bootxx/Makefile
diff -u src/sys/arch/landisk/stand/bootxx/Makefile:1.2 src/sys/arch/landisk/stand/bootxx/Makefile:1.3
--- src/sys/arch/landisk/stand/bootxx/Makefile:1.2 Tue Nov 14 14:09:54 2006
+++ src/sys/arch/landisk/stand/bootxx/Makefile Tue Apr 21 15:17:58 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2006/11/14 14:09:54 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/21 15:17:58 tsutsui Exp $
-SUBDIR= bootxx_ffsv1
+SUBDIR= bootxx_ffsv1 bootxx_ffsv2
LIBOBJ= ${.OBJDIR}
.MAKEOVERRIDES+= LIBOBJ
Added files:
Index: src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile
diff -u /dev/null src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile:1.1
--- /dev/null Tue Apr 21 15:17:59 2009
+++ src/sys/arch/landisk/stand/bootxx/bootxx_ffsv2/Makefile Tue Apr 21 15:17:58 2009
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2009/04/21 15:17:58 tsutsui Exp $
+
+FS= ffsv2
+
+.include "../Makefile.bootxx"
CVS commit: src/sys/arch/i386/i386
Module Name:src
Committed By: elad
Date: Tue Apr 21 14:51:49 UTC 2009
Modified Files:
src/sys/arch/i386/i386: ipkdb_glue.c
Log Message:
Remove extra ')'.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/i386/i386/ipkdb_glue.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/i386/ipkdb_glue.c
diff -u src/sys/arch/i386/i386/ipkdb_glue.c:1.11 src/sys/arch/i386/i386/ipkdb_glue.c:1.12
--- src/sys/arch/i386/i386/ipkdb_glue.c:1.11 Wed Mar 18 10:22:30 2009
+++ src/sys/arch/i386/i386/ipkdb_glue.c Tue Apr 21 14:51:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ipkdb_glue.c,v 1.11 2009/03/18 10:22:30 cegger Exp $ */
+/* $NetBSD: ipkdb_glue.c,v 1.12 2009/04/21 14:51:49 elad Exp $ */
/*
* Copyright (C) 2000 Wolfgang Solfrank.
@@ -31,7 +31,7 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.11 2009/03/18 10:22:30 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.12 2009/04/21 14:51:49 elad Exp $");
#include "opt_ipkdb.h"
@@ -72,7 +72,7 @@
ipkdb_trap(void)
{
ipkdb_mode = IPKDB_CMD_STEP;
- x86_write_eflags(x86_read_eflags() | PSL_T));
+ x86_write_eflags(x86_read_eflags() | PSL_T);
}
int
CVS commit: src/lib/libc/regex
Module Name:src
Committed By: joerg
Date: Tue Apr 21 14:46:02 UTC 2009
Modified Files:
src/lib/libc/regex: re_format.7
Log Message:
Convert to mdoc markup.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/regex/re_format.7
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/regex/re_format.7
diff -u src/lib/libc/regex/re_format.7:1.8 src/lib/libc/regex/re_format.7:1.9
--- src/lib/libc/regex/re_format.7:1.8 Thu Aug 7 16:43:20 2003
+++ src/lib/libc/regex/re_format.7 Tue Apr 21 14:46:02 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: re_format.7,v 1.8 2003/08/07 16:43:20 agc Exp $
+.\" $NetBSD: re_format.7,v 1.9 2009/04/21 14:46:02 joerg Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -65,61 +65,80 @@
.\"
.\" @(#)re_format.7 8.3 (Berkeley) 3/20/94
.\"
-.TH RE_FORMAT 7 "March 20, 1994"
-.SH NAME
-re_format \- POSIX 1003.2 regular expressions
-.SH DESCRIPTION
+.Dd March 20, 1994
+.Dt RE_FORMAT 7
+.Os
+.Sh NAME
+.Nm re_format
+.Nd POSIX 1003.2 regular expressions
+.Sh DESCRIPTION
Regular expressions (``RE''s),
as defined in POSIX 1003.2, come in two forms:
modern REs (roughly those of
-.IR egrep ;
+.Xr egrep 1 ;
1003.2 calls these ``extended'' REs)
and obsolete REs (roughly those of
-.IR ed ;
+.Xr ed 1 ;
1003.2 ``basic'' REs).
Obsolete REs mostly exist for backward compatibility in some old programs;
they will be discussed at the end.
1003.2 leaves some aspects of RE syntax and semantics open;
`\(dg' marks decisions on these aspects that
may not be fully portable to other 1003.2 implementations.
-.PP
-A (modern) RE is one\(dg or more non-empty\(dg \fIbranches\fR,
+.Pp
+A (modern) RE is one\(dg or more non-empty\(dg
+.Em branches ,
separated by `|'.
It matches anything that matches one of the branches.
-.PP
-A branch is one\(dg or more \fIpieces\fR, concatenated.
+.Pp
+A branch is one\(dg or more
+.Em pieces ,
+concatenated.
It matches a match for the first, followed by a match for the second, etc.
-.PP
-A piece is an \fIatom\fR possibly followed
-by a single\(dg `*', `+', `?', or \fIbound\fR.
+.Pp
+A piece is an
+.Em atom
+possibly followed
+by a single\(dg `*', `+', `?', or
+.Em bound .
An atom followed by `*' matches a sequence of 0 or more matches of the atom.
An atom followed by `+' matches a sequence of 1 or more matches of the atom.
An atom followed by `?' matches a sequence of 0 or 1 matches of the atom.
-.PP
-A \fIbound\fR is `{' followed by an unsigned decimal integer,
-possibly followed by `,'
+.Pp
+A
+.Em bound
+is `{' followed by an unsigned decimal integer, possibly followed by `,'
possibly followed by another unsigned decimal integer,
always followed by `}'.
The integers must lie between 0 and RE_DUP_MAX (255\(dg) inclusive,
and if there are two of them, the first may not exceed the second.
-An atom followed by a bound containing one integer \fIi\fR
-and no comma matches
-a sequence of exactly \fIi\fR matches of the atom.
-An atom followed by a bound
-containing one integer \fIi\fR and a comma matches
-a sequence of \fIi\fR or more matches of the atom.
-An atom followed by a bound
-containing two integers \fIi\fR and \fIj\fR matches
-a sequence of \fIi\fR through \fIj\fR (inclusive) matches of the atom.
-.PP
+An atom followed by a bound containing one integer
+.Em i
+and no comma matches a sequence of exactly
+.Em i
+matches of the atom.
+An atom followed by a bound containing one integer
+.Em i
+and a comma matches a sequence of
+.Em i
+or more matches of the atom.
+An atom followed by a bound containing two integers
+.Em i
+and
+.Em j
+matches a sequence of
+.Em i
+through
+.Em j
+(inclusive) matches of the atom.
+.Pp
An atom is a regular expression enclosed in `()' (matching a match for the
-regular expression),
-an empty set of `()' (matching the null string)\(dg,
-a \fIbracket expression\fR (see below), `.'
-(matching any single character), `^' (matching the null string at the
-beginning of a line), `$' (matching the null string at the
-end of a line), a `\e' followed by one of the characters
-`^.[$()|*+?{\e'
+regular expression), an empty set of `()' (matching the null string)\(dg, a
+.Em bracket expression
+(see below), `.' (matching any single character),
+`^' (matching the null string at the beginning of a line),
+`$' (matching the null string at the end of a line),
+a `\e' followed by one of the characters `^.[$()|*+?{\e'
(matching that character taken as an ordinary character),
a `\e' followed by any other character\(dg
(matching that character taken as an ordinary character,
@@ -128,21 +147,24 @@
A `{' followed by a character other than a digit is an ordinary
character, not the beginning of a bound\(dg.
It is illegal to end an RE with `\e'.
-.PP
-A \fIbracket expression\fR is a list of characters enclosed in `[]'.
+.Pp
+A
+.Em bracket expression
+i
CVS commit: [nick-hppapmap] src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Tue Apr 21 13:48:21 UTC 2009 Modified Files: src/sys/arch/hppa/hppa [nick-hppapmap]: pmap.c Log Message: Remove incorrect KASSERT. XXX PVF_KENTER needs work. To generate a diff of this commit: cvs rdiff -u -r1.43.8.45 -r1.43.8.46 src/sys/arch/hppa/hppa/pmap.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/hppa/hppa/pmap.c diff -u src/sys/arch/hppa/hppa/pmap.c:1.43.8.45 src/sys/arch/hppa/hppa/pmap.c:1.43.8.46 --- src/sys/arch/hppa/hppa/pmap.c:1.43.8.45 Fri Apr 10 09:18:36 2009 +++ src/sys/arch/hppa/hppa/pmap.c Tue Apr 21 13:48:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.43.8.45 2009/04/10 09:18:36 skrll Exp $ */ +/* $NetBSD: pmap.c,v 1.43.8.46 2009/04/21 13:48:21 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -64,7 +64,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.43.8.45 2009/04/10 09:18:36 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.43.8.46 2009/04/21 13:48:21 skrll Exp $"); #include #include @@ -1777,7 +1777,6 @@ mutex_enter(&pg->mdpage.pvh_lock); - KASSERT((pg->mdpage.pvh_attrs & PVF_KENTER) == 0); pg->mdpage.pvh_attrs |= PVF_KENTER; if (prot & PMAP_NC) pg->mdpage.pvh_attrs |= PVF_NC;
CVS commit: [nick-hppapmap] src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Tue Apr 21 13:44:41 UTC 2009
Modified Files:
src/sys/arch/hp700/dev [nick-hppapmap]: asp.c
Log Message:
Do the mainbus dance for asp(4) as well.
This allows my 715/50 find its devices.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.64.1 src/sys/arch/hp700/dev/asp.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/hp700/dev/asp.c
diff -u src/sys/arch/hp700/dev/asp.c:1.10 src/sys/arch/hp700/dev/asp.c:1.10.64.1
--- src/sys/arch/hp700/dev/asp.c:1.10 Fri Sep 22 14:08:03 2006
+++ src/sys/arch/hp700/dev/asp.c Tue Apr 21 13:44:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asp.c,v 1.10 2006/09/22 14:08:03 skrll Exp $ */
+/* $NetBSD: asp.c,v 1.10.64.1 2009/04/21 13:44:41 skrll Exp $ */
/* $OpenBSD: asp.c,v 1.5 2000/02/09 05:04:22 mickey Exp $ */
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.10 2006/09/22 14:08:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.10.64.1 2009/04/21 13:44:41 skrll Exp $");
#include
#include
@@ -253,6 +253,16 @@
/* Attach the GSC bus. */
ga.ga_ca = *ca; /* clone from us */
+ if (strcmp(parent->dv_xname, "mainbus0") == 0) {
+ ga.ga_dp.dp_bc[0] = ga.ga_dp.dp_bc[1];
+ ga.ga_dp.dp_bc[1] = ga.ga_dp.dp_bc[2];
+ ga.ga_dp.dp_bc[2] = ga.ga_dp.dp_bc[3];
+ ga.ga_dp.dp_bc[3] = ga.ga_dp.dp_bc[4];
+ ga.ga_dp.dp_bc[4] = ga.ga_dp.dp_bc[5];
+ ga.ga_dp.dp_bc[5] = ga.ga_dp.dp_mod;
+ ga.ga_dp.dp_mod = 0;
+ }
+
ga.ga_name = "gsc";
ga.ga_int_reg = &sc->sc_int_reg;
ga.ga_fix_args = asp_fix_args;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Tue Apr 21 13:16:36 UTC 2009
Modified Files:
src/sys/dev/pci: if_age.c
Log Message:
Fix wrong arguments of bus_dmamem_free(9).
XXX: not all resouces are freed properly on error path in age_dma_alloc().
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/if_age.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_age.c
diff -u src/sys/dev/pci/if_age.c:1.25 src/sys/dev/pci/if_age.c:1.26
--- src/sys/dev/pci/if_age.c:1.25 Tue Mar 3 23:28:44 2009
+++ src/sys/dev/pci/if_age.c Tue Apr 21 13:16:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.25 2009/03/03 23:28:44 cegger Exp $ */
+/* $NetBSD: if_age.c,v 1.26 2009/04/21 13:16:36 tsutsui Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.25 2009/03/03 23:28:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.26 2009/04/21 13:16:36 tsutsui Exp $");
#include "bpfilter.h"
#include "vlan.h"
@@ -736,7 +736,7 @@
printf("%s: could not load DMA'able memory for Tx ring, "
"error = %i\n", device_xname(sc->sc_dev), error);
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)&sc->age_rdata.age_tx_ring, 1);
+ &sc->age_rdata.age_tx_ring_seg, 1);
return error;
}
@@ -778,7 +778,7 @@
printf("%s: could not load DMA'able memory for Rx ring, "
"error = %i.\n", device_xname(sc->sc_dev), error);
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)sc->age_rdata.age_rx_ring, 1);
+ &sc->age_rdata.age_rx_ring_seg, 1);
return error;
}
@@ -821,7 +821,7 @@
printf("%s: could not load DMA'able memory for Rx return ring, "
"error = %i\n", device_xname(sc->sc_dev), error);
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)&sc->age_rdata.age_rr_ring, 1);
+ &sc->age_rdata.age_rr_ring_seg, 1);
return error;
}
@@ -865,7 +865,7 @@
printf("%s: could not load DMA'able memory for CMB block, "
"error = %i\n", device_xname(sc->sc_dev), error);
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)&sc->age_rdata.age_cmb_block, 1);
+ &sc->age_rdata.age_cmb_block_seg, 1);
return error;
}
@@ -909,7 +909,7 @@
printf("%s: could not load DMA'able memory for SMB block, "
"error = %i\n", device_xname(sc->sc_dev), error);
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)&sc->age_rdata.age_smb_block, 1);
+ &sc->age_rdata.age_smb_block_seg, 1);
return error;
}
@@ -992,7 +992,7 @@
if (sc->age_cdata.age_tx_ring_map != NULL &&
sc->age_rdata.age_tx_ring != NULL)
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)sc->age_rdata.age_tx_ring, 1);
+ &sc->age_rdata.age_tx_ring_seg, 1);
sc->age_rdata.age_tx_ring = NULL;
sc->age_cdata.age_tx_ring_map = NULL;
@@ -1002,7 +1002,7 @@
if (sc->age_cdata.age_rx_ring_map != NULL &&
sc->age_rdata.age_rx_ring != NULL)
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)sc->age_rdata.age_rx_ring, 1);
+ &sc->age_rdata.age_rx_ring_seg, 1);
sc->age_rdata.age_rx_ring = NULL;
sc->age_cdata.age_rx_ring_map = NULL;
@@ -1012,7 +1012,7 @@
if (sc->age_cdata.age_rr_ring_map != NULL &&
sc->age_rdata.age_rr_ring != NULL)
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)sc->age_rdata.age_rr_ring, 1);
+ &sc->age_rdata.age_rr_ring_seg, 1);
sc->age_rdata.age_rr_ring = NULL;
sc->age_cdata.age_rr_ring_map = NULL;
@@ -1022,7 +1022,7 @@
if (sc->age_cdata.age_cmb_block_map != NULL &&
sc->age_rdata.age_cmb_block != NULL)
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)sc->age_rdata.age_cmb_block, 1);
+ &sc->age_rdata.age_cmb_block_seg, 1);
sc->age_rdata.age_cmb_block = NULL;
sc->age_cdata.age_cmb_block_map = NULL;
@@ -1032,7 +1032,7 @@
if (sc->age_cdata.age_smb_block_map != NULL &&
sc->age_rdata.age_smb_block != NULL)
bus_dmamem_free(sc->sc_dmat,
- (bus_dma_segment_t *)sc->age_rdata.age_smb_block, 1);
+ &sc->age_rdata.age_smb_block_seg, 1);
sc->age_rdata.age_smb_block = NULL;
sc->age_cdata.age_smb_block_map = NULL;
}
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Tue Apr 21 13:07:44 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Add [name date] to zaudio(4) entries. To generate a diff of this commit: cvs rdiff -u -r1.1214 -r1.1215 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.1214 src/doc/CHANGES:1.1215 --- src/doc/CHANGES:1.1214 Tue Apr 21 13:04:57 2009 +++ src/doc/CHANGES Tue Apr 21 13:07:44 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1214 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1215 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -160,7 +160,7 @@ later chips. [tsutsui 20090307] crash(8): Add a new utility to diagnose kernel crashes. Based upon the in-kernel debugger (ddb). [ad 20090307] - zaudio(4): Add only playback support. + zaudio(4): Add only playback support. [nonaka 20090313] sgimips: Add TCPv4/UDPv4 RX hardware checksum support for mec(4) Ethernet on O2. [tsutsui 20090316] am-utils: Import latest from head; adds udf support amd -uu @@ -179,7 +179,7 @@ DHCID, NSEC3, NSEC3PARAM, HIP and DLV, various new API functions. [christos 20090412] dhcpcd(8): Import dhcpcd-4.0.13 [roy 20090417] - zaudio(4): Add recoding support. + zaudio(4): Add recoding support. [nonaka 20090418] ale(4): Add a driver for Attensic/Atheros L1E Gigabit Ethernet. From OpenBSD and improvements from Kevin Lahey. [cegger 20090420]
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Apr 21 13:07:16 UTC 2009 Modified Files: src/share/man/man4: age.4 Log Message: Use Ao/Ac instead of \*[Lt]/\*[Gt]. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/age.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/age.4 diff -u src/share/man/man4/age.4:1.2 src/share/man/man4/age.4:1.3 --- src/share/man/man4/age.4:1.2 Fri Jan 16 23:27:49 2009 +++ src/share/man/man4/age.4 Tue Apr 21 13:07:16 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: age.4,v 1.2 2009/01/16 23:27:49 wiz Exp $ +.\" $NetBSD: age.4,v 1.3 2009/04/21 13:07:16 wiz Exp $ .\" $OpenBSD: age.4,v 1.2 2009/01/16 06:03:44 jmc Exp $ .\" .\" Copyright (c) 2009 Kevin Lo @@ -53,7 +53,7 @@ For more information on configuring this device, see .Xr ifconfig 8 . To view a list of media types and options supported by the card, try -.Ic ifconfig \*[Lt]device\*[Gt] media . +.Ic ifconfig Ao Ic device Ac Ic media . For example, .Ic ifconfig age0 media . .Sh SEE ALSO
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Tue Apr 21 13:04:57 UTC 2009 Modified Files: src/doc: CHANGES Log Message: - add some man page suffix - uppercase API To generate a diff of this commit: cvs rdiff -u -r1.1213 -r1.1214 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.1213 src/doc/CHANGES:1.1214 --- src/doc/CHANGES:1.1213 Tue Apr 21 13:01:47 2009 +++ src/doc/CHANGES Tue Apr 21 13:04:57 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1213 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1214 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -167,7 +167,7 @@ [christos 20090320] kmem_alloc(9): Add more extensive runtime debugging facilities. [ad 20090329] - cvs: Import 1.12.13 [christos 20090408] + cvs(1): Import 1.12.13 [christos 20090408] mtree(8): Add -S option to sort entries. [apb 20090408] bind: Update to 9.6.1-P1. Full NSEC3 support, automatic zone re-signing, new update-policy methods tcp-self and 6to4-self, @@ -176,9 +176,9 @@ support. [christos 20090412] libbind: Update to 6.0-rc1. Use md5 for randomid instead of sequential id, add suppport for DS, SSHFP, RRSIG, NSEC, DNSKEY, - DHCID, NSEC3, NSEC3PARAM, HIP and DLV, various new api + DHCID, NSEC3, NSEC3PARAM, HIP and DLV, various new API functions. [christos 20090412] - dhcpcd: Import dhcpcd-4.0.13 [roy 20090417] + dhcpcd(8): Import dhcpcd-4.0.13 [roy 20090417] zaudio(4): Add recoding support. ale(4): Add a driver for Attensic/Atheros L1E Gigabit Ethernet. From OpenBSD and improvements from Kevin Lahey.
CVS commit: src/doc
Module Name:src
Committed By: tsutsui
Date: Tue Apr 21 13:01:47 UTC 2009
Modified Files:
src/doc: CHANGES
Log Message:
Fix indent of bind entries for changes page on www.
To generate a diff of this commit:
cvs rdiff -u -r1.1212 -r1.1213 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.1212 src/doc/CHANGES:1.1213
--- src/doc/CHANGES:1.1212 Tue Apr 21 03:15:01 2009
+++ src/doc/CHANGES Tue Apr 21 13:01:47 2009
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1212 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1213 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -170,14 +170,14 @@
cvs: Import 1.12.13 [christos 20090408]
mtree(8): Add -S option to sort entries. [apb 20090408]
bind: Update to 9.6.1-P1. Full NSEC3 support, automatic zone
- re-signing, new update-policy methods tcp-self and 6to4-self,
- unbundle libbind, change the default pid file location from
- /var/run to /var/run/{named,lwresd} for improved chroot/setuid
- support. [christos 20090412]
+ re-signing, new update-policy methods tcp-self and 6to4-self,
+ unbundle libbind, change the default pid file location from
+ /var/run to /var/run/{named,lwresd} for improved chroot/setuid
+ support. [christos 20090412]
libbind: Update to 6.0-rc1. Use md5 for randomid instead of
- sequential id, add suppport for DS, SSHFP, RRSIG, NSEC, DNSKEY,
- DHCID, NSEC3, NSEC3PARAM, HIP and DLV, various new api functions.
- [christos 20090412]
+ sequential id, add suppport for DS, SSHFP, RRSIG, NSEC, DNSKEY,
+ DHCID, NSEC3, NSEC3PARAM, HIP and DLV, various new api
+ functions. [christos 20090412]
dhcpcd: Import dhcpcd-4.0.13 [roy 20090417]
zaudio(4): Add recoding support.
ale(4): Add a driver for Attensic/Atheros L1E Gigabit Ethernet.
CVS commit: src/sys/arch/sh3/include
Module Name:src Committed By: nonaka Date: Tue Apr 21 12:57:41 UTC 2009 Modified Files: src/sys/arch/sh3/include: cputypes.h Log Message: Add SH7706 To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sh3/include/cputypes.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/include/cputypes.h diff -u src/sys/arch/sh3/include/cputypes.h:1.11 src/sys/arch/sh3/include/cputypes.h:1.12 --- src/sys/arch/sh3/include/cputypes.h:1.11 Mon Apr 28 20:23:35 2008 +++ src/sys/arch/sh3/include/cputypes.h Tue Apr 21 12:57:41 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cputypes.h,v 1.11 2008/04/28 20:23:35 martin Exp $ */ +/* $NetBSD: cputypes.h,v 1.12 2009/04/21 12:57:41 nonaka Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -48,13 +48,14 @@ #define CPU_PRODUCT_7708R 3 #define CPU_PRODUCT_7709 4 #define CPU_PRODUCT_7709A 5 +#define CPU_PRODUCT_7706 6 /* SH4 series */ -#define CPU_PRODUCT_7750 6 -#define CPU_PRODUCT_7750S 7 -#define CPU_PRODUCT_7750R 8 -#define CPU_PRODUCT_7751 9 -#define CPU_PRODUCT_7751R 10 +#define CPU_PRODUCT_7750 7 +#define CPU_PRODUCT_7750S 8 +#define CPU_PRODUCT_7750R 9 +#define CPU_PRODUCT_7751 10 +#define CPU_PRODUCT_7751R 11 #ifndef _LOCORE
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Tue Apr 21 08:20:20 UTC 2009 Modified Files: src/share/man/man4: ale.4 Log Message: Fix Dd string. Use Ao/Ac instead of \*[Lt]/\*[Gt]. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/ale.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/ale.4 diff -u src/share/man/man4/ale.4:1.1 src/share/man/man4/ale.4:1.2 --- src/share/man/man4/ale.4:1.1 Mon Apr 20 20:14:21 2009 +++ src/share/man/man4/ale.4 Tue Apr 21 08:20:19 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: ale.4,v 1.1 2009/04/20 20:14:21 cegger Exp $ +.\" $NetBSD: ale.4,v 1.2 2009/04/21 08:20:19 wiz Exp $ .\" $OpenBSD: ale.4,v 1.2 2009/02/25 03:15:50 deraadt Exp $ .\" .\" Copyright (c) 2009 Kevin Lo @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd April 20 2009 $ +.Dd April 20, 2009 .Dt ALE 4 .Os .Sh NAME @@ -54,7 +54,7 @@ For more information on configuring this device, see .Xr ifconfig 8 . To view a list of media types and options supported by the card, try -.Ic ifconfig \*[Lt]device\*[Gt] media . +.Ic ifconfig Ao Ic device Ac Ic media . For example, .Ic ifconfig ale0 media . .Sh SEE ALSO
