CVS commit: src/external/bsd/ntp/bin/ntptrace
Module Name:src Committed By: njoly Date: Wed Nov 14 08:26:29 UTC 2012 Modified Files: src/external/bsd/ntp/bin/ntptrace: ntptrace.8 Log Message: Use mdoc macro for literal block display. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ntp/bin/ntptrace/ntptrace.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/ntp/bin/ntptrace/ntptrace.8 diff -u src/external/bsd/ntp/bin/ntptrace/ntptrace.8:1.1 src/external/bsd/ntp/bin/ntptrace/ntptrace.8:1.2 --- src/external/bsd/ntp/bin/ntptrace/ntptrace.8:1.1 Sat Aug 28 15:42:45 2010 +++ src/external/bsd/ntp/bin/ntptrace/ntptrace.8 Wed Nov 14 08:26:29 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: ntptrace.8,v 1.1 2010/08/28 15:42:45 kardel Exp $ +.\ $NetBSD: ntptrace.8,v 1.2 2012/11/14 08:26:29 njoly Exp $ .\ Converted from HTML to mandoc by ntp-html2mdoc.pl .\ .Dd March 29, 2000 @@ -21,13 +21,12 @@ their master time source. If given no ar .Pa localhost . Here is an example of the output from .Nm : -.Pp -.nf +.Bd -literal % ntptrace localhost: stratum 4, offset 0.0019529, synch distance 0.144135 server2ozo.com: stratum 2, offset 0.0124263, synch distance 0.115784 usndh.edu: stratum 1, offset 0.0019298, synch distance 0.011993, refid 'WWVB' -.fi +.Ed .Pp On each line, the fields are (left to right): the host name, the host stratum, the time offset between that host and the local host (as measured by
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Wed Nov 14 09:22:58 UTC 2012
Modified Files:
src/lib/librumpuser: rumpuser.c
Log Message:
Check return value of ftruncate(). Some versions of gcc give
warnings if I don't.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/librumpuser/rumpuser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.21 src/lib/librumpuser/rumpuser.c:1.22
--- src/lib/librumpuser/rumpuser.c:1.21 Wed Oct 10 11:15:57 2012
+++ src/lib/librumpuser/rumpuser.c Wed Nov 14 09:22:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.21 2012/10/10 11:15:57 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.22 2012/11/14 09:22:58 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.21 2012/10/10 11:15:57 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.22 2012/11/14 09:22:58 pooka Exp $);
#endif /* !lint */
#include sys/ioctl.h
@@ -284,8 +284,12 @@ rumpuser_filemmap(int fd, off_t offset,
void *rv;
int mmflags, prot;
- if (flags RUMPUSER_FILEMMAP_TRUNCATE)
- ftruncate(fd, offset + len);
+ if (flags RUMPUSER_FILEMMAP_TRUNCATE) {
+ if (ftruncate(fd, offset + len) == -1) {
+ seterror(errno);
+ return NULL;
+ }
+ }
mmflags = MAP_FILE;
if (flags RUMPUSER_FILEMMAP_SHARED)
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: rkujawa
Date: Wed Nov 14 13:36:03 UTC 2012
Modified Files:
src/sys/arch/amiga/dev: rtc.h
Log Message:
Nuke unused clock struct, was used by a2kbbc before conversion to MI msm6242b
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/dev/rtc.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/amiga/dev/rtc.h
diff -u src/sys/arch/amiga/dev/rtc.h:1.9 src/sys/arch/amiga/dev/rtc.h:1.10
--- src/sys/arch/amiga/dev/rtc.h:1.9 Tue May 14 00:08:22 2002
+++ src/sys/arch/amiga/dev/rtc.h Wed Nov 14 13:36:02 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.h,v 1.9 2002/05/14 00:08:22 matt Exp $ */
+/* $NetBSD: rtc.h,v 1.10 2012/11/14 13:36:02 rkujawa Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -29,7 +29,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * information on A2000 clock from Harald Backert.
* information on A3000 clock from Holger Emden.
*/
#ifndef _RTCVAR_H_
@@ -41,35 +40,6 @@
extern int (*ugettod)(struct timeval *);
extern int (*usettod)(struct timeval *);
-struct rtclock2000 {
- u_int :28, second2:4; /* lower digit */
- u_int :28, second1:4; /* upper digit */
- u_int :28, minute2:4; /* lower digit */
- u_int :28, minute1:4; /* upper digit */
- u_int :28, hour2:4; /* lower digit */
- u_int :28, hour1:4; /* upper digit */
- u_int :28, day2:4; /* lower digit */
- u_int :28, day1:4; /* upper digit */
- u_int :28, month2:4; /* lower digit */
- u_int :28, month1:4; /* upper digit */
- u_int :28, year2:4; /* lower digit */
- u_int :28, year1:4; /* upper digit */
- u_int :28, weekday:4; /* weekday */
- u_int :28, control1:4; /* control-byte 1 */
- u_int :28, control2:4; /* control-byte 2 */
- u_int :28, control3:4; /* control-byte 3 */
-};
-
-/*
- * commands written to control1, HOLD before reading the clock,
- * FREE after done reading.
- */
-
-#define A2CONTROL1_HOLD (10)
-#define A2CONTROL1_BUSY (11)
-#define A2CONTROL3_24HMODE (12)
-#define A2HOUR1_PM (12)
-
struct rtclock3000 {
u_int :28, second2:4; /* 0x03 lower digit */
u_int :28, second1:4; /* 0x07 upper digit */
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Wed Nov 14 13:53:23 UTC 2012
Modified Files:
src/sys/dev/usb: uhub.c
Log Message:
Fix function name in DPRINTF
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/usb/uhub.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/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.118 src/sys/dev/usb/uhub.c:1.119
--- src/sys/dev/usb/uhub.c:1.118 Sun Sep 9 20:23:38 2012
+++ src/sys/dev/usb/uhub.c Wed Nov 14 13:53:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.118 2012/09/09 20:23:38 gsutre Exp $ */
+/* $NetBSD: uhub.c,v 1.119 2012/11/14 13:53:23 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.118 2012/09/09 20:23:38 gsutre Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhub.c,v 1.119 2012/11/14 13:53:23 skrll Exp $);
#include opt_usb.h
@@ -189,7 +189,7 @@ uhub_attach(device_t parent, device_t se
USETW2(req.wValue, UDESC_HUB, 0);
USETW(req.wIndex, 0);
USETW(req.wLength, USB_HUB_DESCRIPTOR_SIZE);
- DPRINTFN(1,(usb_init_hub: getting hub descriptor\n));
+ DPRINTFN(1,(%s: getting hub descriptor\n, __func__));
err = usbd_do_request(dev, req, hubdesc);
nports = hubdesc.bNbrPorts;
if (!err nports 7) {
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: rkujawa
Date: Wed Nov 14 17:15:26 UTC 2012
Modified Files:
src/sys/dev/ic: msm6242b.c
Log Message:
Add kernel RCS ID, clean up.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/msm6242b.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/msm6242b.c
diff -u src/sys/dev/ic/msm6242b.c:1.1 src/sys/dev/ic/msm6242b.c:1.2
--- src/sys/dev/ic/msm6242b.c:1.1 Wed Nov 14 01:52:48 2012
+++ src/sys/dev/ic/msm6242b.c Wed Nov 14 17:15:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: msm6242b.c,v 1.1 2012/11/14 01:52:48 rkujawa Exp $ */
+/* $NetBSD: msm6242b.c,v 1.2 2012/11/14 17:15:25 rkujawa Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,6 +30,12 @@
*/
#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: msm6242b.c,v 1.2 2012/11/14 17:15:25 rkujawa Exp $);
+
+/*
+ * Driver for OKI MSM6242B Real Time Clock. Somewhat based on an ancient, amiga
+ * specifc a2kbbc driver (which was turned into frontend to this driver).
+ */
#include sys/param.h
#include sys/device.h
@@ -76,8 +82,7 @@ msm6242b_attach(struct msm6242b_softc *s
#ifdef MSM6242B_DEBUG
aprint_normal_dev(sc-sc_dev, the time is %d %d %d %d %d %d\n,
dt.dt_year, dt.dt_mon, dt.dt_day, dt.dt_hour, dt.dt_min, dt.dt_sec);
-#endif
-/* MSM6242B_DEBUG */
+#endif /* MSM6242B_DEBUG */
todr_attach(handle);
}
@@ -109,7 +114,7 @@ msm6242b_gettime_ymdhms(todr_chip_handle
#ifdef MSM6242B_DEBUG
aprint_normal_dev(sc-sc_dev, the time is %d %d %d %d %d %d\n,
dt-dt_year, dt-dt_mon, dt-dt_day, dt-dt_hour, dt-dt_min, dt-dt_sec);
-#endif
+#endif /* MSM6242B_DEBUG */
/* handle 12h mode */
if ((msm6242b_read(sc, MSM6242B_CONTROL_F)
@@ -147,12 +152,16 @@ msm6242b_hold(struct msm6242b_softc *sc)
msm6242b_set(sc, MSM6242B_CONTROL_D, MSM6242B_CONTROL_D_HOLD);
if (msm6242b_read(sc, MSM6242B_CONTROL_D)
MSM6242B_CONTROL_D_BUSY) {
+#ifdef MSM6242B_DEBUG
aprint_normal_dev(sc-sc_dev, gotta idle\n);
+#endif /* MSM6242B_DEBUG */
msm6242b_unset(sc, MSM6242B_CONTROL_D,
MSM6242B_CONTROL_D_HOLD);
delay(70);
} else {
+#ifdef MSM6242B_DEBUG
aprint_normal_dev(sc-sc_dev, not busy\n);
+#endif /* MSM6242B_DEBUG */
break;
}
}
CVS commit: src/sys/net80211
Module Name:src
Committed By: matt
Date: Wed Nov 14 18:34:05 UTC 2012
Modified Files:
src/sys/net80211: ieee80211_netbsd.c
Log Message:
Set max_linkhdr when attaching so when bridging/forwarding ethernet drivers
have a chance to reserve enough space to insert a max-sized 802.11 header.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/net80211/ieee80211_netbsd.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/net80211/ieee80211_netbsd.c
diff -u src/sys/net80211/ieee80211_netbsd.c:1.21 src/sys/net80211/ieee80211_netbsd.c:1.22
--- src/sys/net80211/ieee80211_netbsd.c:1.21 Sat Jun 2 21:36:47 2012
+++ src/sys/net80211/ieee80211_netbsd.c Wed Nov 14 18:34:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee80211_netbsd.c,v 1.21 2012/06/02 21:36:47 dsl Exp $ */
+/* $NetBSD: ieee80211_netbsd.c,v 1.22 2012/11/14 18:34:05 matt Exp $ */
/*-
* Copyright (c) 2003-2005 Sam Leffler, Errno Consulting
* All rights reserved.
@@ -30,7 +30,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/sys/net80211/ieee80211_freebsd.c,v 1.8 2005/08/08 18:46:35 sam Exp $);
#else
-__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.21 2012/06/02 21:36:47 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: ieee80211_netbsd.c,v 1.22 2012/11/14 18:34:05 matt Exp $);
#endif
/*
@@ -81,6 +81,10 @@ ieee80211_init0(void)
{
ieee80211_setup_func * const *ieee80211_setup, f;
+ if (max_linkhdr ALIGN(sizeof(struct ieee80211_qosframe_addr4))) {
+ max_linkhdr = ALIGN(sizeof(struct ieee80211_qosframe_addr4));
+ }
+
__link_set_foreach(ieee80211_setup, ieee80211_funcs) {
f = (void*)*ieee80211_setup;
(*f)();
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:34:55 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: asia northamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/northamerica patch Import tzdata2012i from ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz . Changes from tzdata2012h to tzdata2012i: Cuba switches from DST on 4 Nov 2012 at 01:00. [apb, ticket #1465] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.11 -r1.486.2.9.2.12 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.1.2.6 -r1.1.1.40.2.1.2.7 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.37.2.3.2.5 -r1.1.1.37.2.3.2.6 \ src/share/zoneinfo/northamerica 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.486.2.9.2.11 src/doc/3RDPARTY:1.486.2.9.2.12 --- src/doc/3RDPARTY:1.486.2.9.2.11 Wed Oct 31 16:38:22 2012 +++ src/doc/3RDPARTY Wed Nov 14 19:34:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.11 2012/10/31 16:38:22 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.12 2012/11/14 19:34:54 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012h -Current Vers: tzcode2012h / tzdata2012h +Version: tzcode2004a / tzdata2012i +Current Vers: tzcode2012i / tzdata2012i Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.40.2.1.2.6 src/share/zoneinfo/asia:1.1.1.40.2.1.2.7 --- src/share/zoneinfo/asia:1.1.1.40.2.1.2.6 Wed Oct 31 16:38:23 2012 +++ src/share/zoneinfo/asia Wed Nov 14 19:34:54 2012 @@ -1204,7 +1204,7 @@ Rule Zion 2012 only - Sep 23 2:00 0 S # past, approved sending the proposed June 2011 changes to the Time # Decree Law back to the Knesset for second and third (final) votes # before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before Februray 2013. +# changes are not yet law, they are expected to be so before February 2013. # # As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. # DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the Index: src/share/zoneinfo/northamerica diff -u src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.5 src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.6 --- src/share/zoneinfo/northamerica:1.1.1.37.2.3.2.5 Sat Sep 15 09:03:53 2012 +++ src/share/zoneinfo/northamerica Wed Nov 14 19:34:54 2012 @@ -2797,6 +2797,13 @@ Zone America/Costa_Rica -5:36:20 - LMT 1 # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html # /a +# From Steffen Thorsen (2012-11-03): +# Radio Reloj and many other sources report that Cuba is changing back +# to standard time on 2012-11-04: +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre +# From Paul Eggert (2012-11-03): +# For now, assume the future rule is first Sunday in November. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -2834,7 +2841,7 @@ Rule Cuba 2009 2010 - Mar Sun=8 0:00s 1 Rule Cuba 2011 only - Mar Sun=15 0:00s 1:00 D Rule Cuba 2011 only - Nov 13 0:00s 0 S Rule Cuba 2012 only - Apr 1 0:00s 1:00 D -Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2012 max - Nov Sun=1 0:00s 0 S Rule Cuba 2013 max - Mar Sun=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-4] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:35:31 UTC 2012 Modified Files: src/doc [netbsd-4]: 3RDPARTY src/share/zoneinfo [netbsd-4]: asia northamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/asia patch share/zoneinfo/northamerica patch Import tzdata2012i from ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz . Changes from tzdata2012h to tzdata2012i: Cuba switches from DST on 4 Nov 2012 at 01:00. [apb, ticket #1465] To generate a diff of this commit: cvs rdiff -u -r1.486.2.20 -r1.486.2.21 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.40.2.7 -r1.1.1.40.2.8 src/share/zoneinfo/asia cvs rdiff -u -r1.1.1.37.2.8 -r1.1.1.37.2.9 src/share/zoneinfo/northamerica 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.486.2.20 src/doc/3RDPARTY:1.486.2.21 --- src/doc/3RDPARTY:1.486.2.20 Wed Oct 31 16:40:14 2012 +++ src/doc/3RDPARTY Wed Nov 14 19:35:30 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.20 2012/10/31 16:40:14 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.21 2012/11/14 19:35:30 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012h -Current Vers: tzcode2012h / tzdata2012h +Version: tzcode2004a / tzdata2012i +Current Vers: tzcode2012i / tzdata2012i Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.40.2.7 src/share/zoneinfo/asia:1.1.1.40.2.8 --- src/share/zoneinfo/asia:1.1.1.40.2.7 Wed Oct 31 16:40:14 2012 +++ src/share/zoneinfo/asia Wed Nov 14 19:35:31 2012 @@ -1204,7 +1204,7 @@ Rule Zion 2012 only - Sep 23 2:00 0 S # past, approved sending the proposed June 2011 changes to the Time # Decree Law back to the Knesset for second and third (final) votes # before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before Februray 2013. +# changes are not yet law, they are expected to be so before February 2013. # # As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. # DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the Index: src/share/zoneinfo/northamerica diff -u src/share/zoneinfo/northamerica:1.1.1.37.2.8 src/share/zoneinfo/northamerica:1.1.1.37.2.9 --- src/share/zoneinfo/northamerica:1.1.1.37.2.8 Sat Sep 15 09:04:08 2012 +++ src/share/zoneinfo/northamerica Wed Nov 14 19:35:31 2012 @@ -2797,6 +2797,13 @@ Zone America/Costa_Rica -5:36:20 - LMT 1 # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html # /a +# From Steffen Thorsen (2012-11-03): +# Radio Reloj and many other sources report that Cuba is changing back +# to standard time on 2012-11-04: +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre +# From Paul Eggert (2012-11-03): +# For now, assume the future rule is first Sunday in November. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Cuba 1928 only - Jun 10 0:00 1:00 D Rule Cuba 1928 only - Oct 10 0:00 0 S @@ -2834,7 +2841,7 @@ Rule Cuba 2009 2010 - Mar Sun=8 0:00s 1 Rule Cuba 2011 only - Mar Sun=15 0:00s 1:00 D Rule Cuba 2011 only - Nov 13 0:00s 0 S Rule Cuba 2012 only - Apr 1 0:00s 1:00 D -Rule Cuba 2012 max - Oct lastSun 0:00s 0 S +Rule Cuba 2012 max - Nov Sun=1 0:00s 0 S Rule Cuba 2013 max - Mar Sun=8 0:00s 1:00 D # Zone NAME GMTOFF RULES FORMAT [UNTIL]
CVS commit: [netbsd-4] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:53:30 UTC 2012 Modified Files: src/doc [netbsd-4]: 3RDPARTY src/share/zoneinfo [netbsd-4]: africa asia australasia europe northamerica southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch Import tzdata2012j from ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Changes from tzdata2012i to tzdata2012j: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Various fixes to documentation and commentary. [apb, ticket #1469] To generate a diff of this commit: cvs rdiff -u -r1.486.2.21 -r1.486.2.22 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.6 -r1.1.1.21.2.7 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.40.2.8 -r1.1.1.40.2.9 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.10 -r1.11.2.11 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.34.2.6 -r1.1.1.34.2.7 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.37.2.9 -r1.1.1.37.2.10 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.7 -r1.1.1.35.2.8 src/share/zoneinfo/southamerica 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.486.2.21 src/doc/3RDPARTY:1.486.2.22 --- src/doc/3RDPARTY:1.486.2.21 Wed Nov 14 19:35:30 2012 +++ src/doc/3RDPARTY Wed Nov 14 19:53:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.21 2012/11/14 19:35:30 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.22 2012/11/14 19:53:27 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012i -Current Vers: tzcode2012i / tzdata2012i +Version: tzcode2004a / tzdata2012j +Current Vers: tzcode2012j / tzdata2012j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.21.2.6 src/share/zoneinfo/africa:1.1.1.21.2.7 --- src/share/zoneinfo/africa:1.1.1.21.2.6 Sat Sep 15 09:04:07 2012 +++ src/share/zoneinfo/africa Wed Nov 14 19:53:28 2012 @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@elsie.nci.nih.gov for general use in the future). +# t...@iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -424,6 +424,20 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -438,17 +452,21 @@ Rule Libya 1986 only - Apr 4 0:00 1:00 Rule Libya 1986 only - Oct 3 0:00 0 - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S Rule Libya 1987 1989 - Oct 1 0:00 0 - +Rule Libya 1997 only - Apr 4 0:00 1:00 S +Rule Libya 1997 only - Oct 4 0:00 0 - +Rule Libya 2013 max - Mar lastFri 1:00 1:00 S +Rule Libya 2013 max - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 -# The following entries are from Shanks Pottenger; +# The 1996 and 1997 entries are from Shanks Pottenger; # the IATA SSIM data contain some obvious errors. 2:00 - EET 1996 Sep 30 - 1:00 - CET 1997 Apr 4 - 1:00 1:00 CEST 1997 Oct 4 - 2:00 - EET + 1:00 Libya CE%sT 1997 Oct 4 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.40.2.8 src/share/zoneinfo/asia:1.1.1.40.2.9 --- src/share/zoneinfo/asia:1.1.1.40.2.8 Wed Nov 14 19:35:31 2012 +++
CVS commit: [netbsd-4-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 19:54:49 UTC 2012 Modified Files: src/doc [netbsd-4-0]: 3RDPARTY src/share/zoneinfo [netbsd-4-0]: africa asia australasia europe northamerica southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch Import tzdata2012j from ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Changes from tzdata2012i to tzdata2012j: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Various fixes to documentation and commentary. [apb, ticket #1469] To generate a diff of this commit: cvs rdiff -u -r1.486.2.9.2.12 -r1.486.2.9.2.13 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.21.2.3.2.3 -r1.1.1.21.2.3.2.4 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.40.2.1.2.7 -r1.1.1.40.2.1.2.8 src/share/zoneinfo/asia cvs rdiff -u -r1.11.2.4.2.6 -r1.11.2.4.2.7 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.34.2.2.2.4 -r1.1.1.34.2.2.2.5 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.37.2.3.2.6 -r1.1.1.37.2.3.2.7 \ src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.35.2.2.2.5 -r1.1.1.35.2.2.2.6 \ src/share/zoneinfo/southamerica 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.486.2.9.2.12 src/doc/3RDPARTY:1.486.2.9.2.13 --- src/doc/3RDPARTY:1.486.2.9.2.12 Wed Nov 14 19:34:54 2012 +++ src/doc/3RDPARTY Wed Nov 14 19:54:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.486.2.9.2.12 2012/11/14 19:34:54 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.486.2.9.2.13 2012/11/14 19:54:47 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -845,8 +845,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012i -Current Vers: tzcode2012i / tzdata2012i +Version: tzcode2004a / tzdata2012j +Current Vers: tzcode2012j / tzdata2012j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.21.2.3.2.3 src/share/zoneinfo/africa:1.1.1.21.2.3.2.4 --- src/share/zoneinfo/africa:1.1.1.21.2.3.2.3 Sat Sep 15 09:03:52 2012 +++ src/share/zoneinfo/africa Wed Nov 14 19:54:47 2012 @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@elsie.nci.nih.gov for general use in the future). +# t...@iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -424,6 +424,20 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -438,17 +452,21 @@ Rule Libya 1986 only - Apr 4 0:00 1:00 Rule Libya 1986 only - Oct 3 0:00 0 - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S Rule Libya 1987 1989 - Oct 1 0:00 0 - +Rule Libya 1997 only - Apr 4 0:00 1:00 S +Rule Libya 1997 only - Oct 4 0:00 0 - +Rule Libya 2013 max - Mar lastFri 1:00 1:00 S +Rule Libya 2013 max - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 -# The following entries are from Shanks Pottenger; +# The 1996 and 1997 entries are from Shanks Pottenger; # the IATA SSIM data contain some obvious errors. 2:00 - EET 1996 Sep 30 - 1:00 - CET 1997 Apr 4 - 1:00 1:00 CEST 1997 Oct 4 - 2:00 - EET + 1:00 Libya CE%sT 1997 Oct 4 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.40.2.1.2.7
CVS commit: [netbsd-5] src
Module Name:src Committed By: riz Date: Wed Nov 14 20:01:01 UTC 2012 Modified Files: src/doc [netbsd-5]: 3RDPARTY src/share/zoneinfo [netbsd-5]: africa asia australasia europe northamerica southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch Import tzdata2012j from ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Changes from tzdata2012i to tzdata2012j: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Various fixes to documentation and commentary. [apb, ticket #1818] To generate a diff of this commit: cvs rdiff -u -r1.647.2.22 -r1.647.2.23 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.2.2 -r1.1.1.27.2.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.2.6 -r1.1.1.44.2.7 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.5 -r1.17.2.6 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.2.3 -r1.1.1.38.2.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.2.5 -r1.1.1.42.2.6 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.2.4 -r1.1.1.42.2.5 src/share/zoneinfo/southamerica 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.647.2.22 src/doc/3RDPARTY:1.647.2.23 --- src/doc/3RDPARTY:1.647.2.22 Tue Nov 6 20:16:54 2012 +++ src/doc/3RDPARTY Wed Nov 14 20:01:00 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.22 2012/11/06 20:16:54 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.23 2012/11/14 20:01:00 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012i -Current Vers: tzcode2012i / tzdata2012i +Version: tzcode2004a / tzdata2012j +Current Vers: tzcode2012j / tzdata2012j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.2.2 src/share/zoneinfo/africa:1.1.1.27.2.3 --- src/share/zoneinfo/africa:1.1.1.27.2.2 Sat Sep 15 09:26:42 2012 +++ src/share/zoneinfo/africa Wed Nov 14 20:01:00 2012 @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@elsie.nci.nih.gov for general use in the future). +# t...@iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -424,6 +424,20 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -438,17 +452,21 @@ Rule Libya 1986 only - Apr 4 0:00 1:00 Rule Libya 1986 only - Oct 3 0:00 0 - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S Rule Libya 1987 1989 - Oct 1 0:00 0 - +Rule Libya 1997 only - Apr 4 0:00 1:00 S +Rule Libya 1997 only - Oct 4 0:00 0 - +Rule Libya 2013 max - Mar lastFri 1:00 1:00 S +Rule Libya 2013 max - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 -# The following entries are from Shanks Pottenger; +# The 1996 and 1997 entries are from Shanks Pottenger; # the IATA SSIM data contain some obvious errors. 2:00 - EET 1996 Sep 30 - 1:00 - CET 1997 Apr 4 - 1:00 1:00 CEST 1997 Oct 4 - 2:00 - EET + 1:00 Libya CE%sT 1997 Oct 4 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.2.6 src/share/zoneinfo/asia:1.1.1.44.2.7 --- src/share/zoneinfo/asia:1.1.1.44.2.6 Tue Nov 6 20:16:55 2012 +++
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:01:16 UTC 2012 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: TIcket 1818 To generate a diff of this commit: cvs rdiff -u -r1.1.2.197 -r1.1.2.198 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.197 src/doc/CHANGES-5.2:1.1.2.198 --- src/doc/CHANGES-5.2:1.1.2.197 Thu Nov 8 20:14:46 2012 +++ src/doc/CHANGES-5.2 Wed Nov 14 20:01:16 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.197 2012/11/08 20:14:46 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.198 2012/11/14 20:01:16 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8778,3 +8778,19 @@ usr.sbin/wakeonlan/wakeonlan.c 1.1 Rename wake(8) to wakeonlan(8). Approved by core@. [uebayasi, ticket #1817] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch + + Import tzdata2012j from + ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz + Changes from tzdata2012i to tzdata2012j: + Libya moved to CET this weekend, but with DST planned next year. + (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) + Various fixes to documentation and commentary. +[apb, ticket #1818] +
CVS commit: [netbsd-5-0] src
Module Name:src Committed By: riz Date: Wed Nov 14 20:02:00 UTC 2012 Modified Files: src/doc [netbsd-5-0]: 3RDPARTY src/share/zoneinfo [netbsd-5-0]: africa asia australasia europe northamerica southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch Import tzdata2012j from ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Changes from tzdata2012i to tzdata2012j: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Various fixes to documentation and commentary. [apb, ticket #1818] To generate a diff of this commit: cvs rdiff -u -r1.647.2.6.2.12 -r1.647.2.6.2.13 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.6.2 -r1.1.1.27.6.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.6.6 -r1.1.1.44.6.7 src/share/zoneinfo/asia cvs rdiff -u -r1.17.6.5 -r1.17.6.6 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.6.3 -r1.1.1.38.6.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.6.5 -r1.1.1.42.6.6 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.6.4 -r1.1.1.42.6.5 src/share/zoneinfo/southamerica 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.647.2.6.2.12 src/doc/3RDPARTY:1.647.2.6.2.13 --- src/doc/3RDPARTY:1.647.2.6.2.12 Tue Nov 6 20:26:39 2012 +++ src/doc/3RDPARTY Wed Nov 14 20:01:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.6.2.12 2012/11/06 20:26:39 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.6.2.13 2012/11/14 20:01:58 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012i -Current Vers: tzcode2012i / tzdata2012i +Version: tzcode2004a / tzdata2012j +Current Vers: tzcode2012j / tzdata2012j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.6.2 src/share/zoneinfo/africa:1.1.1.27.6.3 --- src/share/zoneinfo/africa:1.1.1.27.6.2 Sat Sep 15 09:26:28 2012 +++ src/share/zoneinfo/africa Wed Nov 14 20:01:58 2012 @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@elsie.nci.nih.gov for general use in the future). +# t...@iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -424,6 +424,20 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -438,17 +452,21 @@ Rule Libya 1986 only - Apr 4 0:00 1:00 Rule Libya 1986 only - Oct 3 0:00 0 - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S Rule Libya 1987 1989 - Oct 1 0:00 0 - +Rule Libya 1997 only - Apr 4 0:00 1:00 S +Rule Libya 1997 only - Oct 4 0:00 0 - +Rule Libya 2013 max - Mar lastFri 1:00 1:00 S +Rule Libya 2013 max - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 -# The following entries are from Shanks Pottenger; +# The 1996 and 1997 entries are from Shanks Pottenger; # the IATA SSIM data contain some obvious errors. 2:00 - EET 1996 Sep 30 - 1:00 - CET 1997 Apr 4 - 1:00 1:00 CEST 1997 Oct 4 - 2:00 - EET + 1:00 Libya CE%sT 1997 Oct 4 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.6.6 src/share/zoneinfo/asia:1.1.1.44.6.7 --- src/share/zoneinfo/asia:1.1.1.44.6.6
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:02:20 UTC 2012 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: Ticket 1818 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-5.0.3 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-5.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.89 src/doc/CHANGES-5.0.3:1.1.2.90 --- src/doc/CHANGES-5.0.3:1.1.2.89 Tue Nov 6 20:26:54 2012 +++ src/doc/CHANGES-5.0.3 Wed Nov 14 20:02:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.89 2012/11/06 20:26:54 riz Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.90 2012/11/14 20:02:19 riz Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5180,3 +5180,19 @@ share/zoneinfo/northamerica patch Cuba switches from DST on 4 Nov 2012 at 01:00. [apb, ticket #1813] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch + + Import tzdata2012j from + ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz + Changes from tzdata2012i to tzdata2012j: + Libya moved to CET this weekend, but with DST planned next year. + (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) + Various fixes to documentation and commentary. +[apb, ticket #1818] +
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: riz Date: Wed Nov 14 20:03:30 UTC 2012 Modified Files: src/doc [netbsd-5-1]: 3RDPARTY src/share/zoneinfo [netbsd-5-1]: africa asia australasia europe northamerica southamerica Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/northamerica patch share/zoneinfo/southamerica patch Import tzdata2012j from ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz Changes from tzdata2012i to tzdata2012j: Libya moved to CET this weekend, but with DST planned next year. (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) Various fixes to documentation and commentary. [apb, ticket #1818] To generate a diff of this commit: cvs rdiff -u -r1.647.2.12.2.8 -r1.647.2.12.2.9 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.10.2 -r1.1.1.27.10.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.10.6 -r1.1.1.44.10.7 src/share/zoneinfo/asia cvs rdiff -u -r1.17.10.5 -r1.17.10.6 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.10.3 -r1.1.1.38.10.4 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.42.10.5 -r1.1.1.42.10.6 src/share/zoneinfo/northamerica cvs rdiff -u -r1.1.1.42.10.4 -r1.1.1.42.10.5 src/share/zoneinfo/southamerica 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.647.2.12.2.8 src/doc/3RDPARTY:1.647.2.12.2.9 --- src/doc/3RDPARTY:1.647.2.12.2.8 Tue Nov 6 20:27:30 2012 +++ src/doc/3RDPARTY Wed Nov 14 20:03:28 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.12.2.8 2012/11/06 20:27:30 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.12.2.9 2012/11/14 20:03:28 riz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2012i -Current Vers: tzcode2012i / tzdata2012i +Version: tzcode2004a / tzdata2012j +Current Vers: tzcode2012j / tzdata2012j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.10.2 src/share/zoneinfo/africa:1.1.1.27.10.3 --- src/share/zoneinfo/africa:1.1.1.27.10.2 Sat Sep 15 09:26:52 2012 +++ src/share/zoneinfo/africa Wed Nov 14 20:03:28 2012 @@ -4,7 +4,7 @@ # This data is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@elsie.nci.nih.gov for general use in the future). +# t...@iana.org for general use in the future). # From Paul Eggert (2006-03-22): # @@ -424,6 +424,20 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # Libya +# From Even Scharning (2012-11-10): +# Libya set their time one hour back at 02:00 on Saturday November 10. +# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/ +# Here is an official source [in Arabic]: http://ls.ly/fb6Yc +# +# Steffen Thorsen forwarded a translation (2012-11-10) in +# http://mm.icann.org/pipermail/tz/2012-November/018451.html +# +# From Tim Parenti (2012-11-11): +# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1. +# The DST rules planned for 2013 and onward roughly mirror those of Europe +# (either two days before them or five days after them, so as to fall on +# lastFri instead of lastSun). + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - @@ -438,17 +452,21 @@ Rule Libya 1986 only - Apr 4 0:00 1:00 Rule Libya 1986 only - Oct 3 0:00 0 - Rule Libya 1987 1989 - Apr 1 0:00 1:00 S Rule Libya 1987 1989 - Oct 1 0:00 0 - +Rule Libya 1997 only - Apr 4 0:00 1:00 S +Rule Libya 1997 only - Oct 4 0:00 0 - +Rule Libya 2013 max - Mar lastFri 1:00 1:00 S +Rule Libya 2013 max - Oct lastFri 2:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 2:00 - EET 1982 1:00 Libya CE%sT 1990 May 4 -# The following entries are from Shanks Pottenger; +# The 1996 and 1997 entries are from Shanks Pottenger; # the IATA SSIM data contain some obvious errors. 2:00 - EET 1996 Sep 30 - 1:00 - CET 1997 Apr 4 - 1:00 1:00 CEST 1997 Oct 4 - 2:00 - EET + 1:00 Libya CE%sT 1997 Oct 4 + 2:00 - EET 2012 Nov 10 2:00 + 1:00 Libya CE%sT # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] Index: src/share/zoneinfo/asia diff -u src/share/zoneinfo/asia:1.1.1.44.10.6 src/share/zoneinfo/asia:1.1.1.44.10.7 ---
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:04:02 UTC 2012 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: Ticket 1818 To generate a diff of this commit: cvs rdiff -u -r1.1.2.31 -r1.1.2.32 src/doc/CHANGES-5.1.3 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-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.31 src/doc/CHANGES-5.1.3:1.1.2.32 --- src/doc/CHANGES-5.1.3:1.1.2.31 Tue Nov 6 20:28:35 2012 +++ src/doc/CHANGES-5.1.3 Wed Nov 14 20:04:02 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.31 2012/11/06 20:28:35 riz Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.32 2012/11/14 20:04:02 riz Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2272,3 +2272,19 @@ share/zoneinfo/northamerica patch Cuba switches from DST on 4 Nov 2012 at 01:00. [apb, ticket #1813] +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch + + Import tzdata2012j from + ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz + Changes from tzdata2012i to tzdata2012j: + Libya moved to CET this weekend, but with DST planned next year. + (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) + Various fixes to documentation and commentary. +[apb, ticket #1818] +
CVS commit: [netbsd-4-0] src/sys
Module Name:src
Committed By: riz
Date: Wed Nov 14 20:15:37 UTC 2012
Modified Files:
src/sys/kern [netbsd-4-0]: vfs_lookup.c
src/sys/miscfs/genfs [netbsd-4-0]: layer_vnops.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1466):
sys/kern/vfs_lookup.c: revision 1.195
sys/miscfs/genfs/layer_vnops.c: revision 1.51
In layer_lookup(), clear *vpp before returning EROFS, as otherwise a
stale value can be returned and this causes a diagnostic panic in
namei.
In relookup(), clear *vpp before calling VOP_LOOKUP, as is done in
lookup_once(), as an additional precautionary measure.
(in theory both of these fixes are not required together)
Should fix PR 47040.
To generate a diff of this commit:
cvs rdiff -u -r1.72.2.3 -r1.72.2.3.6.1 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.28.2.2 -r1.28.2.2.6.1 src/sys/miscfs/genfs/layer_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/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.72.2.3 src/sys/kern/vfs_lookup.c:1.72.2.3.6.1
--- src/sys/kern/vfs_lookup.c:1.72.2.3 Sat Feb 17 23:27:47 2007
+++ src/sys/kern/vfs_lookup.c Wed Nov 14 20:15:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.72.2.3 2007/02/17 23:27:47 tron Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.72.2.3.6.1 2012/11/14 20:15:36 riz Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.72.2.3 2007/02/17 23:27:47 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.72.2.3.6.1 2012/11/14 20:15:36 riz Exp $);
#include opt_ktrace.h
#include opt_systrace.h
@@ -941,6 +941,7 @@ relookup(struct vnode *dvp, struct vnode
/*
* We now have a segment name to search for, and a directory to search.
*/
+ *vpp = NULL;
if ((error = VOP_LOOKUP(dvp, vpp, cnp)) != 0) {
#ifdef DIAGNOSTIC
if (*vpp != NULL)
Index: src/sys/miscfs/genfs/layer_vnops.c
diff -u src/sys/miscfs/genfs/layer_vnops.c:1.28.2.2 src/sys/miscfs/genfs/layer_vnops.c:1.28.2.2.6.1
--- src/sys/miscfs/genfs/layer_vnops.c:1.28.2.2 Mon Apr 16 20:01:13 2007
+++ src/sys/miscfs/genfs/layer_vnops.c Wed Nov 14 20:15:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $ */
+/* $NetBSD: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $ */
/*
* Copyright (c) 1999 National Aeronautics Space Administration
@@ -67,8 +67,8 @@
*
* Ancestors:
* @(#)lofs_vnops.c 1.2 (Berkeley) 6/18/92
- * $Id: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $
- * $Id: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $
+ * $Id: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $
+ * $Id: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $
* ...and...
* @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project
*/
@@ -233,7 +233,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.28.2.2 2007/04/16 20:01:13 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.28.2.2.6.1 2012/11/14 20:15:37 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -436,8 +436,10 @@ layer_lookup(v)
dvp = ap-a_dvp;
if ((flags ISLASTCN) (dvp-v_mount-mnt_flag MNT_RDONLY)
- (cnp-cn_nameiop == DELETE || cnp-cn_nameiop == RENAME))
+ (cnp-cn_nameiop == DELETE || cnp-cn_nameiop == RENAME)) {
+ *ap-a_vpp = NULL;
return (EROFS);
+ }
ldvp = LAYERVPTOLOWERVP(dvp);
ap-a_dvp = ldvp;
CVS commit: [netbsd-4] src/sys/dev/pcmcia
Module Name:src
Committed By: riz
Date: Wed Nov 14 20:18:57 UTC 2012
Modified Files:
src/sys/dev/pcmcia [netbsd-4]: if_ne_pcmcia.c pcmciadevs
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1467):
sys/dev/pcmcia/pcmciadevs: revision 1.225
sys/dev/pcmcia/if_ne_pcmcia.c: revision 1.155
add Corega LAPCCTXD FastEthernet
added Corega LAPCCTXT FastEthernet
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.149.2.1 src/sys/dev/pcmcia/if_ne_pcmcia.c
cvs rdiff -u -r1.220 -r1.220.2.1 src/sys/dev/pcmcia/pcmciadevs
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/pcmcia/if_ne_pcmcia.c
diff -u src/sys/dev/pcmcia/if_ne_pcmcia.c:1.149 src/sys/dev/pcmcia/if_ne_pcmcia.c:1.149.2.1
--- src/sys/dev/pcmcia/if_ne_pcmcia.c:1.149 Thu Nov 16 01:33:20 2006
+++ src/sys/dev/pcmcia/if_ne_pcmcia.c Wed Nov 14 20:18:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $ */
+/* $NetBSD: if_ne_pcmcia.c,v 1.149.2.1 2012/11/14 20:18:56 riz Exp $ */
/*
* Copyright (c) 1997 Marc Horowitz. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_ne_pcmcia.c,v 1.149 2006/11/16 01:33:20 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_ne_pcmcia.c,v 1.149.2.1 2012/11/14 20:18:56 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -336,6 +336,10 @@ static const struct ne2000dev {
PCMCIA_CIS_COREGA_FETHER_II_PCC_TXD,
0, -1, { 0x00, 0x90, 0x99 }, NE2000DVF_AX88190 },
+{ PCMCIA_VENDOR_INVALID, PCMCIA_PRODUCT_INVALID,
+ PCMCIA_CIS_COREGA_LAPCCTXD,
+ 0, -1, { 0x00, 0x90, 0x99 }, 0 },
+
{ PCMCIA_VENDOR_COMPEX, PCMCIA_PRODUCT_COMPEX_LINKPORT_ENET_B,
PCMCIA_CIS_INVALID,
0, 0x01c0, { 0xff, 0xff, 0xff }, 0 },
Index: src/sys/dev/pcmcia/pcmciadevs
diff -u src/sys/dev/pcmcia/pcmciadevs:1.220 src/sys/dev/pcmcia/pcmciadevs:1.220.2.1
--- src/sys/dev/pcmcia/pcmciadevs:1.220 Thu Nov 16 00:52:48 2006
+++ src/sys/dev/pcmcia/pcmciadevs Wed Nov 14 20:18:56 2012
@@ -1,4 +1,4 @@
-$NetBSD: pcmciadevs,v 1.220 2006/11/16 00:52:48 christos Exp $
+$NetBSD: pcmciadevs,v 1.220.2.1 2012/11/14 20:18:56 riz Exp $
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
/*-
@@ -473,6 +473,7 @@ product COREGA FAST_ETHER_PCC_TX { core
product COREGA FETHER_PCC_TXD { coregaspK.K., coregaspFEtherspPCC-TXD, NULL, NULL } Corega FEther PCC-TXD
product COREGA FETHER_PCC_TXF { corega, FEtherspPCC-TXF, NULL, NULL } Corega FEther PCC-TXF
product COREGA FETHER_II_PCC_TXD { coregaspK.K., coregaspFEtherIIspPCC-TXD, NULL, NULL } Corega FEtherII PCC-TXD
+product COREGA LAPCCTXD { coregaspK.K., (CG-LAPCCTXD), (HardwareFirmwareVer.), NULL } Corega LAPCCTXD
product COREGA WIRELESS_LAN_PCC_11 { coregaspK.K., WirelessspLANspPCC-11, NULL, NULL } Corega Wireless LAN PCC-11
product COREGA WIRELESS_LAN_PCCA_11 { coregaspK.K., WirelessspLANspPCCA-11, NULL, NULL } Corega Wireless LAN PCCA-11
product COREGA WIRELESS_LAN_PCCB_11 { corega_K.K., Wireless_LAN_PCCB-11, NULL, NULL } Corega Wireless LAN PCCB-11
CVS commit: [netbsd-4] src/sys/dev/pcmcia
Module Name:src
Committed By: riz
Date: Wed Nov 14 20:19:24 UTC 2012
Modified Files:
src/sys/dev/pcmcia [netbsd-4]: pcmciadevs.h pcmciadevs_data.h
Log Message:
Regen for ticket 1467.
To generate a diff of this commit:
cvs rdiff -u -r1.223 -r1.223.2.1 src/sys/dev/pcmcia/pcmciadevs.h \
src/sys/dev/pcmcia/pcmciadevs_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/pcmcia/pcmciadevs.h
diff -u src/sys/dev/pcmcia/pcmciadevs.h:1.223 src/sys/dev/pcmcia/pcmciadevs.h:1.223.2.1
--- src/sys/dev/pcmcia/pcmciadevs.h:1.223 Thu Nov 16 00:53:31 2006
+++ src/sys/dev/pcmcia/pcmciadevs.h Wed Nov 14 20:19:23 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: pcmciadevs.h,v 1.223 2006/11/16 00:53:31 christos Exp $ */
+/* $NetBSD: pcmciadevs.h,v 1.223.2.1 2012/11/14 20:19:23 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcmciadevs,v 1.220 2006/11/16 00:52:48 christos Exp
+ * NetBSD
*/
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
@@ -665,6 +665,8 @@
#define PCMCIA_PRODUCT_COREGA_FETHER_PCC_TXF -1
#define PCMCIA_CIS_COREGA_FETHER_II_PCC_TXD { corega K.K., corega FEtherII PCC-TXD, NULL, NULL }
#define PCMCIA_PRODUCT_COREGA_FETHER_II_PCC_TXD -1
+#define PCMCIA_CIS_COREGA_LAPCCTXD { corega K.K., (CG-LAPCCTXD), (HardwareFirmwareVer.), NULL }
+#define PCMCIA_PRODUCT_COREGA_LAPCCTXD -1
#define PCMCIA_CIS_COREGA_WIRELESS_LAN_PCC_11 { corega K.K., Wireless LAN PCC-11, NULL, NULL }
#define PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCC_11 -1
#define PCMCIA_CIS_COREGA_WIRELESS_LAN_PCCA_11 { corega K.K., Wireless LAN PCCA-11, NULL, NULL }
Index: src/sys/dev/pcmcia/pcmciadevs_data.h
diff -u src/sys/dev/pcmcia/pcmciadevs_data.h:1.223 src/sys/dev/pcmcia/pcmciadevs_data.h:1.223.2.1
--- src/sys/dev/pcmcia/pcmciadevs_data.h:1.223 Thu Nov 16 00:53:31 2006
+++ src/sys/dev/pcmcia/pcmciadevs_data.h Wed Nov 14 20:19:24 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: pcmciadevs_data.h,v 1.223 2006/11/16 00:53:31 christos Exp $ */
+/* $NetBSD: pcmciadevs_data.h,v 1.223.2.1 2012/11/14 20:19:24 riz Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcmciadevs,v 1.220 2006/11/16 00:52:48 christos Exp
+ * NetBSD
*/
/* $FreeBSD: src/sys/dev/pccard/pccarddevs,v 1.20 2001/11/19 05:02:55 imp Exp $*/
@@ -1359,6 +1359,13 @@ struct pcmcia_knowndev pcmcia_knowndevs[
Corega FEtherII PCC-TXD, }
,
{
+ PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_COREGA_LAPCCTXD,
+ PCMCIA_CIS_COREGA_LAPCCTXD,
+ 0,
+ Corega K.K.,
+ Corega LAPCCTXD, }
+ ,
+ {
PCMCIA_VENDOR_UNKNOWN, PCMCIA_PRODUCT_COREGA_WIRELESS_LAN_PCC_11,
PCMCIA_CIS_COREGA_WIRELESS_LAN_PCC_11,
0,
CVS commit: [netbsd-4] src/usr.bin/tput
Module Name:src Committed By: riz Date: Wed Nov 14 20:25:31 UTC 2012 Modified Files: src/usr.bin/tput [netbsd-4]: tput.c Log Message: usr.bin/tput/tput.c patch Fix tput support for setaf terminfo sequence. PR#39883. [jnemeth, ticket #1468] To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.6.1 src/usr.bin/tput/tput.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/tput/tput.c diff -u src/usr.bin/tput/tput.c:1.17 src/usr.bin/tput/tput.c:1.17.6.1 --- src/usr.bin/tput/tput.c:1.17 Sat Jul 30 14:43:13 2005 +++ src/usr.bin/tput/tput.c Wed Nov 14 20:25:31 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: tput.c,v 1.17 2005/07/30 14:43:13 christos Exp $ */ +/* $NetBSD: tput.c,v 1.17.6.1 2012/11/14 20:25:31 riz Exp $ */ /*- * Copyright (c) 1980, 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19 #if 0 static char sccsid[] = @(#)tput.c 8.3 (Berkeley) 4/28/95; #endif -__RCSID($NetBSD: tput.c,v 1.17 2005/07/30 14:43:13 christos Exp $); +__RCSID($NetBSD: tput.c,v 1.17.6.1 2012/11/14 20:25:31 riz Exp $); #endif /* not lint */ #include termios.h @@ -105,7 +105,10 @@ main(int argc, char **argv) break; } cptr = buf; - if (tgetstr(p, cptr)) + if (strlen(p) 2) + errx(2, this program only supports termcap + capabilities, not terminfo); + else if (tgetstr(p, cptr)) argv = process(p, buf, argv); else if ((n = tgetnum(p)) != -1) (void)printf(%d\n, n);
CVS commit: [netbsd-4] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:26:27 UTC 2012 Modified Files: src/doc [netbsd-4]: CHANGES-4.1 Log Message: Tickets 1465-1469. To generate a diff of this commit: cvs rdiff -u -r1.1.2.256 -r1.1.2.257 src/doc/CHANGES-4.1 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-4.1 diff -u src/doc/CHANGES-4.1:1.1.2.256 src/doc/CHANGES-4.1:1.1.2.257 --- src/doc/CHANGES-4.1:1.1.2.256 Wed Oct 31 16:40:56 2012 +++ src/doc/CHANGES-4.1 Wed Nov 14 20:26:26 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.1,v 1.1.2.256 2012/10/31 16:40:56 riz Exp $ +# $NetBSD: CHANGES-4.1,v 1.1.2.257 2012/11/14 20:26:26 riz Exp $ A complete list of changes from the NetBSD 4.0 release to the NetBSD 4.1 release: @@ -4811,3 +4811,49 @@ share/zoneinfo/southamerica patch Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) [apb, ticket #1464] +doc/3RDPARTY patch +share/zoneinfo/asiapatch +share/zoneinfo/northamerica patch + +Import tzdata2012i from +ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz . +Changes from tzdata2012h to tzdata2012i: +Cuba switches from DST on 4 Nov 2012 at 01:00. +[apb, ticket #1465] + +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch + + Import tzdata2012j from + ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz + Changes from tzdata2012i to tzdata2012j: + Libya moved to CET this weekend, but with DST planned next year. + (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) + Various fixes to documentation and commentary. +[apb, ticket #1469] + +sys/kern/vfs_lookup.c1.195 via patch +sys/miscfs/genfs/layer_vnops.c 1.51 via patch + + Don't panic when renaming a mount point with a layerfs on it. + PR#47040. + [dholland, ticket #1466] + +sys/dev/pcmcia/if_ne_pcmcia.c 1.155 +sys/dev/pcmcia/pcmciadevs 1.225 +sys/dev/pcmcia/pcmciadevs.h regen +sys/dev/pcmcia/pcmciadevs_data.h regen + + Added Corega LAPCCTXT FastEthernet. + [jnemeth, ticket #1467] + +usr.bin/tput/tput.cpatch + + Fix tput support for setaf terminfo sequence. PR#39883. + [jnemeth, ticket #1468] +
CVS commit: [netbsd-4-0] src/doc
Module Name:src Committed By: riz Date: Wed Nov 14 20:26:55 UTC 2012 Modified Files: src/doc [netbsd-4-0]: CHANGES-4.0.2 Log Message: Tickets 1465, 1466, 1469. To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-4.0.2 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-4.0.2 diff -u src/doc/CHANGES-4.0.2:1.1.2.114 src/doc/CHANGES-4.0.2:1.1.2.115 --- src/doc/CHANGES-4.0.2:1.1.2.114 Wed Oct 31 16:39:29 2012 +++ src/doc/CHANGES-4.0.2 Wed Nov 14 20:26:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-4.0.2,v 1.1.2.114 2012/10/31 16:39:29 riz Exp $ +# $NetBSD: CHANGES-4.0.2,v 1.1.2.115 2012/11/14 20:26:54 riz Exp $ A complete list of changes from the NetBSD 4.0.1 release to the NetBSD 4.0.2 release: @@ -1523,3 +1523,36 @@ share/zoneinfo/southamerica patch Jordan stays on DST this winter. (Thanks to Steffen Thorsen.) [apb, ticket #1464] +doc/3RDPARTY patch +share/zoneinfo/asiapatch +share/zoneinfo/northamerica patch + +Import tzdata2012i from +ftp://ftp.iana.org/tz/releases/tzdata2012i.tar.gz . +Changes from tzdata2012h to tzdata2012i: +Cuba switches from DST on 4 Nov 2012 at 01:00. +[apb, ticket #1465] + +doc/3RDPARTY patch +share/zoneinfo/africapatch +share/zoneinfo/asiapatch +share/zoneinfo/australasia patch +share/zoneinfo/europepatch +share/zoneinfo/northamerica patch +share/zoneinfo/southamerica patch + + Import tzdata2012j from + ftp://ftp.iana.org/tz/releases/tzdata2012j.tar.gz + Changes from tzdata2012i to tzdata2012j: + Libya moved to CET this weekend, but with DST planned next year. + (Thanks to Even Scharning, Steffen Thorsen, and Tim Parenti.) + Various fixes to documentation and commentary. +[apb, ticket #1469] + +sys/kern/vfs_lookup.c1.195 via patch +sys/miscfs/genfs/layer_vnops.c 1.51 via patch + + Don't panic when renaming a mount point with a layerfs on it. + PR#47040. + [dholland, ticket #1466] +
CVS commit: src/usr.sbin/puffs/rump_syspuffs
Module Name:src Committed By: njoly Date: Wed Nov 14 23:11:28 UTC 2012 Modified Files: src/usr.sbin/puffs/rump_syspuffs: rump_syspuffs.8 Log Message: Fix mandoc(1) output, use right arrow special character. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.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/puffs/rump_syspuffs/rump_syspuffs.8 diff -u src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8:1.3 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8:1.4 --- src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8:1.3 Tue Jun 9 14:27:17 2009 +++ src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.8 Wed Nov 14 23:11:27 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: rump_syspuffs.8,v 1.3 2009/06/09 14:27:17 pooka Exp $ +.\ $NetBSD: rump_syspuffs.8,v 1.4 2012/11/14 23:11:27 njoly Exp $ .\ .\ Copyright (c) 2008 Antti Kantee. All rights reserved. .\ @@ -46,8 +46,8 @@ puffs code in userspace as well. Therefore the approximate callgraph looks a little like the following, where k and u denote code running in the kernel space and userspace, respectively: -puffs vfs (k) \(-\*[Gt] libpuffs (u) \(-\*[Gt] p2k (u) \(-\*[Gt] puffs vfs (u) \(-\*[Gt] -libpuffs (u) \(-\*[Gt] file server (u). +puffs vfs (k) \(- libpuffs (u) \(- p2k (u) \(- puffs vfs (u) \(- +libpuffs (u) \(- file server (u). The response path is the same, but in reverse. .Pp In its current state,
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Wed Nov 14 23:16:18 UTC 2012 Modified Files: src/share/man/man4: msm6242b.4 Log Message: s/msm6242/msm6242b/ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/msm6242b.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/msm6242b.4 diff -u src/share/man/man4/msm6242b.4:1.2 src/share/man/man4/msm6242b.4:1.3 --- src/share/man/man4/msm6242b.4:1.2 Wed Nov 14 07:49:34 2012 +++ src/share/man/man4/msm6242b.4 Wed Nov 14 23:16:18 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: msm6242b.4,v 1.2 2012/11/14 07:49:34 wiz Exp $ +.\ $NetBSD: msm6242b.4,v 1.3 2012/11/14 23:16:18 rkujawa Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,22 +28,22 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .Dd November 14, 2012 -.Dt MSM6242 4 +.Dt MSM6242B 4 .Os .Sh NAME -.Nm msm6242 +.Nm msm6242b .Nd -.Tn OKI MSM6242 time-of-day clock driver +.Tn OKI MSM6242B time-of-day clock driver .Sh SYNOPSIS -.In dev/ic/msm6242reg.h -.In dev/ic/msm6242var.h -.Cd define msm6242 -.Cd file dev/ic/msm6242.cmsm6242 +.In dev/ic/msm6242breg.h +.In dev/ic/msm6242bvar.h +.Cd define msm6242b +.Cd file dev/ic/msm6242b.cmsm6242b .Sh DESCRIPTION The .Nm driver provides access to the -.Tn OKI MSM6242 +.Tn OKI MSM6242B time-of-day clock chip. Access methods to retrieve and set date and time are provided through the
CVS commit: src/lib/libpthread
Module Name:src
Committed By: christos
Date: Wed Nov 14 23:25:05 UTC 2012
Modified Files:
src/lib/libpthread: pthread.c
Log Message:
add argsused
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/lib/libpthread/pthread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpthread/pthread.c
diff -u src/lib/libpthread/pthread.c:1.140 src/lib/libpthread/pthread.c:1.141
--- src/lib/libpthread/pthread.c:1.140 Tue Nov 6 04:03:03 2012
+++ src/lib/libpthread/pthread.c Wed Nov 14 18:25:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pthread.c,v 1.140 2012/11/06 09:03:03 apb Exp $ */
+/* $NetBSD: pthread.c,v 1.141 2012/11/14 23:25:05 christos Exp $ */
/*-
* Copyright (c) 2001, 2002, 2003, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: pthread.c,v 1.140 2012/11/06 09:03:03 apb Exp $);
+__RCSID($NetBSD: pthread.c,v 1.141 2012/11/14 23:25:05 christos Exp $);
#define __EXPOSE_STACK 1
@@ -1303,6 +1303,7 @@ pthread__initmain(pthread_t *newt)
}
static signed int
+/*ARGSUSED*/
pthread__cmp(void *ctx, const void *n1, const void *n2)
{
const uintptr_t p1 = (const uintptr_t)n1;
CVS commit: src/lib/libc/stdio
Module Name:src
Committed By: christos
Date: Thu Nov 15 03:50:36 UTC 2012
Modified Files:
src/lib/libc/stdio: flags.c fopen.3
Log Message:
Add 'x' to the mode bits to specify O_EXCL, like glibc.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/stdio/flags.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/stdio/fopen.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/stdio/flags.c
diff -u src/lib/libc/stdio/flags.c:1.16 src/lib/libc/stdio/flags.c:1.17
--- src/lib/libc/stdio/flags.c:1.16 Thu Mar 15 14:22:30 2012
+++ src/lib/libc/stdio/flags.c Wed Nov 14 22:50:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: flags.c,v 1.16 2012/03/15 18:22:30 christos Exp $ */
+/* $NetBSD: flags.c,v 1.17 2012/11/15 03:50:36 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)flags.c 8.1 (Berkeley) 6/4/93;
#else
-__RCSID($NetBSD: flags.c,v 1.16 2012/03/15 18:22:30 christos Exp $);
+__RCSID($NetBSD: flags.c,v 1.17 2012/11/15 03:50:36 christos Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
@@ -90,6 +90,7 @@ __sflags(const char *mode, int *optr)
* [rwa]\+ or [rwa]b\+ means read and write
* f means open only plain files,
* e means set close on exec.
+ * x means exclusive open.
*/
for (; *mode; mode++)
switch (*mode) {
@@ -103,6 +104,9 @@ __sflags(const char *mode, int *optr)
case 'e':
o |= O_CLOEXEC;
break;
+ case 'x':
+ o |= O_EXCL;
+ break;
case 'b':
break;
default: /* We could produce a warning here */
Index: src/lib/libc/stdio/fopen.3
diff -u src/lib/libc/stdio/fopen.3:1.28 src/lib/libc/stdio/fopen.3:1.29
--- src/lib/libc/stdio/fopen.3:1.28 Mon Jul 2 16:02:43 2012
+++ src/lib/libc/stdio/fopen.3 Wed Nov 14 22:50:36 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: fopen.3,v 1.28 2012/07/02 20:02:43 wiz Exp $
+.\ $NetBSD: fopen.3,v 1.29 2012/11/15 03:50:36 christos Exp $
.\
.\ Copyright (c) 1990, 1991, 1993
.\ The Regents of the University of California. All rights reserved.
@@ -33,7 +33,7 @@
.\
.\ @(#)fopen.3 8.1 (Berkeley) 6/4/93
.\
-.Dd July 18, 2011
+.Dd November 14, 2012
.Dt FOPEN 3
.Os
.Sh NAME
@@ -117,6 +117,12 @@ will fail.
This is a non
.St -ansiC
extension.
+.It Sq x
+The letter
+.Sq x
+in the mode turns on exclusive open mode to the file (
+.Dv O_EXCL )
+which means that the file will not be created if it already exists.
.El
.Pp
Any created files will have mode
CVS commit: src/sys/dev/isa
Module Name:src Committed By: msaitoh Date: Thu Nov 15 04:45:01 UTC 2012 Modified Files: src/sys/dev/isa: itesio_isa.c itesio_isavar.h Log Message: Add support for ITE8720F by Nat Sloss. PR#47169. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/dev/isa/itesio_isa.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/isa/itesio_isavar.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/isa/itesio_isa.c diff -u src/sys/dev/isa/itesio_isa.c:1.23 src/sys/dev/isa/itesio_isa.c:1.24 --- src/sys/dev/isa/itesio_isa.c:1.23 Fri Jul 29 20:58:47 2011 +++ src/sys/dev/isa/itesio_isa.c Thu Nov 15 04:45:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: itesio_isa.c,v 1.23 2011/07/29 20:58:47 jmcneill Exp $ */ +/* $NetBSD: itesio_isa.c,v 1.24 2012/11/15 04:45:01 msaitoh Exp $ */ /* Derived from $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */ /* @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: itesio_isa.c,v 1.23 2011/07/29 20:58:47 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: itesio_isa.c,v 1.24 2012/11/15 04:45:01 msaitoh Exp $); #include sys/param.h #include sys/kernel.h @@ -140,6 +140,7 @@ itesio_isa_match(device_t parent, cfdata case ITESIO_ID8712: case ITESIO_ID8716: case ITESIO_ID8718: + case ITESIO_ID8720: case ITESIO_ID8721: case ITESIO_ID8726: ia-ia_nio = 1; Index: src/sys/dev/isa/itesio_isavar.h diff -u src/sys/dev/isa/itesio_isavar.h:1.8 src/sys/dev/isa/itesio_isavar.h:1.9 --- src/sys/dev/isa/itesio_isavar.h:1.8 Fri Aug 13 19:28:26 2010 +++ src/sys/dev/isa/itesio_isavar.h Thu Nov 15 04:45:01 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: itesio_isavar.h,v 1.8 2010/08/13 19:28:26 jakllsch Exp $ */ +/* $NetBSD: itesio_isavar.h,v 1.9 2012/11/15 04:45:01 msaitoh Exp $ */ /* $OpenBSD: itvar.h,v 1.2 2003/11/05 20:57:10 grange Exp $ */ /* @@ -61,6 +61,7 @@ #define ITESIO_ID8712 0x8712 #define ITESIO_ID8716 0x8716 #define ITESIO_ID8718 0x8718 +#define ITESIO_ID8720 0x8720 #define ITESIO_ID8721 0x8721 #define ITESIO_ID8726 0x8726
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Thu Nov 15 06:14:54 UTC 2012
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Change style a bit.
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.237 src/sys/dev/pci/if_wm.c:1.238
--- src/sys/dev/pci/if_wm.c:1.237 Wed Nov 7 08:17:18 2012
+++ src/sys/dev/pci/if_wm.c Thu Nov 15 06:14:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.237 2012/11/07 08:17:18 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.238 2012/11/15 06:14:54 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.237 2012/11/07 08:17:18 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.238 2012/11/15 06:14:54 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -4025,7 +4025,8 @@ wm_reset(struct wm_softc *sc)
CSR_WRITE(sc, WMREG_CTRL, sc-sc_ctrl);
while (timeout--) {
- if ((CSR_READ(sc, WMREG_STATUS) STATUS_GIO_M_ENA) == 0)
+ if ((CSR_READ(sc, WMREG_STATUS) STATUS_GIO_M_ENA)
+ == 0)
break;
delay(100);
}
@@ -4457,16 +4458,16 @@ wm_init(struct ifnet *ifp)
} else {
CSR_WRITE(sc, WMREG_RDH, 0);
CSR_WRITE(sc, WMREG_RDT, 0);
- CSR_WRITE(sc, WMREG_RDTR, 375 | RDTR_FPD); /* ITR/4 */
- CSR_WRITE(sc, WMREG_RADV, 375); /* MUST be same */
+ CSR_WRITE(sc, WMREG_RDTR, 375 | RDTR_FPD); /* ITR/4 */
+ CSR_WRITE(sc, WMREG_RADV, 375); /* MUST be same */
}
}
for (i = 0; i WM_NRXDESC; i++) {
rxs = sc-sc_rxsoft[i];
if (rxs-rxs_mbuf == NULL) {
if ((error = wm_add_rxbuf(sc, i)) != 0) {
-log(LOG_ERR, %s: unable to allocate or map rx
-buffer %d, error = %d\n,
+log(LOG_ERR, %s: unable to allocate or map
+rx buffer %d, error = %d\n,
device_xname(sc-sc_dev), i, error);
/*
* XXX Should attempt to run with fewer receive
@@ -6705,9 +6706,9 @@ wm_gmii_bm_readreg(device_t self, int ph
wm_gmii_i82544_writereg(self, phy, 0x1f,
reg);
else
- wm_gmii_i82544_writereg(self, phy, GG82563_PHY_PAGE_SELECT,
+ wm_gmii_i82544_writereg(self, phy,
+ GG82563_PHY_PAGE_SELECT,
reg GG82563_PAGE_SHIFT);
-
}
rv = wm_gmii_i82544_readreg(self, phy, reg GG82563_MAX_REG_ADDRESS);
@@ -6740,9 +6741,9 @@ wm_gmii_bm_writereg(device_t self, int p
wm_gmii_i82544_writereg(self, phy, 0x1f,
reg);
else
- wm_gmii_i82544_writereg(self, phy, GG82563_PHY_PAGE_SELECT,
+ wm_gmii_i82544_writereg(self, phy,
+ GG82563_PHY_PAGE_SELECT,
reg GG82563_PAGE_SHIFT);
-
}
wm_gmii_i82544_writereg(self, phy, reg GG82563_MAX_REG_ADDRESS, val);
@@ -7315,7 +7316,10 @@ wm_read_eeprom_ich8(struct wm_softc *sc,
return error;
}
- /* Adjust offset appropriately if we're on bank 1 - adjust for word size */
+ /*
+ * Adjust offset appropriately if we're on bank 1 - adjust for word
+ * size
+ */
bank_offset = flash_bank * (sc-sc_ich8_flash_bank_size * 2);
error = wm_get_swfwhw_semaphore(sc);
@@ -7330,8 +7334,8 @@ wm_read_eeprom_ich8(struct wm_softc *sc,
act_offset = bank_offset + ((offset + i) * 2);
error = wm_read_ich8_word(sc, act_offset, word);
if (error) {
- aprint_error_dev(sc-sc_dev, %s: failed to read NVM\n,
- __func__);
+ aprint_error_dev(sc-sc_dev,
+ %s: failed to read NVM\n, __func__);
break;
}
data[i] = word;
