CVS commit: src/usr.bin/calendar/calendars

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 11 09:03:47 UTC 2010

Modified Files:
src/usr.bin/calendar/calendars: calendar.history

Log Message:
fix some typos


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/calendar/calendars/calendar.history

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/calendar/calendars/calendar.history
diff -u src/usr.bin/calendar/calendars/calendar.history:1.23 src/usr.bin/calendar/calendars/calendar.history:1.24
--- src/usr.bin/calendar/calendars/calendar.history:1.23	Mon Aug 27 21:58:16 2007
+++ src/usr.bin/calendar/calendars/calendar.history	Mon Jan 11 09:03:46 2010
@@ -278,7 +278,7 @@
 	1878
 06/16	The Blues Brothers premieres in Chicago, 1980
 06/17	China explodes its first Hydrogen bomb, 1967
-06/19	Lizzie Bordon acquitted, 1893
+06/19	Lizzie Borden acquitted, 1893
 06/20	Victoria crowned, 1837
 06/21	Berlin airlift begins, 1948
 06/23	Slavery abolished in England, 1772
@@ -305,7 +305,7 @@
 07/09	10-hour working day set by law, NH, 1847
 07/10	134 degrees in Death Valley, 1913
 07/13	Women first compete in Olympic games, 1908
-07/16	Detonation of the first atomic bomb at Alamagordo, NM, 1945
+07/16	Detonation of the first atomic bomb at Alamogordo, NM, 1945
 07/17	Disneyland opens, 1955
 07/18	Ty Cobb gets 4000th base hit, 1927
 07/20	Armstrong and Aldrin land on moon, 1969
@@ -381,7 +381,7 @@
 09/09	United Colonies is renamed the United States, 1776
 09/11	Twin Towers fall in terrorist attacks, 2001
 09/12	German paratroopers rescue Mussolini from captivity in Rome, 1943
-09/12	Germany annexes Sudentenland, 1938
+09/12	Germany annexes Sudetenland, 1938
 09/13	136.4 F at el Azizia, Libya, 1922
 09/13	British defeat the French at Abraham near Quebec City, 1788
 09/13	Building of Hadrian's Wall begun, 122

CVS commit: src/usr.sbin/rtsold

[Marc Balmer]

Module Name:src
Committed By:   mbalmer
Date:   Mon Jan 11 09:21:39 UTC 2010

Modified Files:
src/usr.sbin/rtsold: rtsold.8

Log Message:
some wording fixes


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.8
diff -u src/usr.sbin/rtsold/rtsold.8:1.27 src/usr.sbin/rtsold/rtsold.8:1.28
--- src/usr.sbin/rtsold/rtsold.8:1.27	Fri Oct 13 21:07:34 2006
+++ src/usr.sbin/rtsold/rtsold.8	Mon Jan 11 09:21:39 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: rtsold.8,v 1.27 2006/10/13 21:07:34 wiz Exp $
+.\	$NetBSD: rtsold.8,v 1.28 2010/01/11 09:21:39 mbalmer Exp $
 .\	$KAME: rtsold.8,v 1.17 2001/07/09 22:30:37 itojun Exp $
 .\
 .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -28,7 +28,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd October 8, 2006
+.Dd January 11, 2010
 .Dt RTSOLD 8
 .Os
 .\
@@ -81,7 +81,7 @@
 after one of the following events:
 .Bl -bullet
 .It
-Just after invocation of
+Just after invocation of the
 .Nm
 daemon.
 .It
@@ -102,7 +102,7 @@
 daemon cannot get the interface status.
 This feature does not conform to the IPv6 neighbor discovery
 specification, but is provided for mobile stations.
-The default interval for router advertisements, which is on the order of 10
+The default interval for router advertisements, which is in the order of 10
 minutes, is slightly long for mobile stations.
 This feature is provided
 for such stations so that they can find new routers as soon as possible
@@ -149,7 +149,7 @@
 .Nm
 finds multiple interfaces,
 .Nm
-will exit with error.
+will exit with an error.
 .It Fl D
 Enable more debugging (than that offered by the
 .Fl d
@@ -173,6 +173,7 @@
 Moreover, if the option is specified,
 .Nm
 periodically sends Router Solicitation on an interface that does not support
+the
 .Dv SIOCGIFMEDIA
 ioctl.
 .El
@@ -198,7 +199,7 @@
 .Nm
 command is based on the
 .Nm rtsol
-command, which first appeared in WIDE/KAME IPv6 protocol stack kit.
+command, which first appeared in the WIDE/KAME IPv6 protocol stack kit.
 .Nm rtsol
 is now integrated into
 .Nm .

CVS commit: src/sys/dev/ic

[Julian Coleman]

Module Name:src
Committed By:   jdc
Date:   Mon Jan 11 09:30:42 UTC 2010

Modified Files:
src/sys/dev/ic: gem.c

Log Message:
Mask out (disable) gem interrupts on detach.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/dev/ic/gem.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/gem.c
diff -u src/sys/dev/ic/gem.c:1.90 src/sys/dev/ic/gem.c:1.91
--- src/sys/dev/ic/gem.c:1.90	Fri Jan  8 20:02:39 2010
+++ src/sys/dev/ic/gem.c	Mon Jan 11 09:30:41 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: gem.c,v 1.90 2010/01/08 20:02:39 dyoung Exp $ */
+/*	$NetBSD: gem.c,v 1.91 2010/01/11 09:30:41 jdc Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gem.c,v 1.90 2010/01/08 20:02:39 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: gem.c,v 1.91 2010/01/11 09:30:41 jdc Exp $);
 
 #include opt_inet.h
 #include bpfilter.h
@@ -152,6 +152,8 @@
 {
 	int i;
 	struct ifnet *ifp = sc-sc_ethercom.ec_if;
+	bus_space_tag_t t = sc-sc_bustag;
+	bus_space_handle_t h = sc-sc_h1;
 
 	/*
 	 * Free any resources we've allocated during the attach.
@@ -161,6 +163,7 @@
 	case GEM_ATT_BACKEND_2:
 	case GEM_ATT_BACKEND_1:
 	case GEM_ATT_FINISHED:
+		bus_space_write_4(t, h, GEM_INTMASK, ~(uint32_t)0);
 		gem_stop(sc-sc_ethercom.ec_if, 1);
 
 #ifdef GEM_COUNTERS

CVS commit: src/usr.sbin/rtsold

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Jan 11 09:49:19 UTC 2010

Modified Files:
src/usr.sbin/rtsold: rtsold.8

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.8
diff -u src/usr.sbin/rtsold/rtsold.8:1.28 src/usr.sbin/rtsold/rtsold.8:1.29
--- src/usr.sbin/rtsold/rtsold.8:1.28	Mon Jan 11 09:21:39 2010
+++ src/usr.sbin/rtsold/rtsold.8	Mon Jan 11 09:49:19 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: rtsold.8,v 1.28 2010/01/11 09:21:39 mbalmer Exp $
+.\	$NetBSD: rtsold.8,v 1.29 2010/01/11 09:49:19 wiz Exp $
 .\	$KAME: rtsold.8,v 1.17 2001/07/09 22:30:37 itojun Exp $
 .\
 .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -210,7 +210,8 @@
 However,
 .Nm
 assumes such changes will not occur, and always uses the index that
-it got at invocation. As a result,
+it got at invocation.
+As a result,
 .Nm
 may not work if you reinsert a network card.
 In such a case,

CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

[Matthias Scheler]

Module Name:src
Committed By:   tron
Date:   Mon Jan 11 12:10:19 UTC 2010

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_replay.c
zfs_znode.c

Log Message:
Replace VATTR_NULL() with vattr_null(). The ZFS module can be loaded
again now.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.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/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c:1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c:1.4
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c:1.3	Sun Jan 10 01:35:39 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c	Mon Jan 11 12:10:18 2010
@@ -58,7 +58,7 @@
 zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
 	uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
 {
-	VATTR_NULL(vap);
+	vattr_null(vap);
 	vap-va_mask = (uint_t)mask;
 	if (mask  AT_TYPE)
 		vap-va_type = IFTOVT(mode);

Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c:1.4	Thu Oct 29 10:26:17 2009
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c	Mon Jan 11 12:10:18 2010
@@ -1526,7 +1526,7 @@
 	 * Create root znode.  Create minimal znode/vnode/zfsvfs
 	 * to allow zfs_mknode to work.
 	 */
-	VATTR_NULL(vattr);
+	vattr_null(vattr);
 	vattr.va_mask = AT_MODE|AT_UID|AT_GID|AT_TYPE;
 	vattr.va_type = VDIR;
 	vattr.va_mode = S_IFDIR|0755;

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jan 11 12:29:29 UTC 2010

Modified Files:
src/sys/dev/pci: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
 Add partial support for PCH. We have to do more work for PCH. Especially
I don't know what driver i82578 should be attached to. makephy? or atphy?
MII_OUI() says that the PHY is from Attansic (== Atheros). Intel's e1000
driver says that it's close to makphy...

 I can't link up at 1000BaseT yet...


To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_wmvar.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.189 src/sys/dev/pci/if_wm.c:1.190
--- src/sys/dev/pci/if_wm.c:1.189	Thu Jan  7 17:45:58 2010
+++ src/sys/dev/pci/if_wm.c	Mon Jan 11 12:29:28 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.189 2010/01/07 17:45:58 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.190 2010/01/11 12:29:28 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.189 2010/01/07 17:45:58 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.190 2010/01/11 12:29:28 msaitoh Exp $);
 
 #include bpfilter.h
 #include rnd.h
@@ -852,6 +852,18 @@
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82801J_D_BM_LF,
 	  i82801J (LF) LAN Controller,
 	  WM_T_ICH10,		WMP_F_1000T },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_PCH_M_LM,
+	  PCH LAN (82578LM) Controller,
+	  WM_T_PCH,		WMP_F_1000T },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_PCH_M_LC,
+	  PCH LAN (82578LC) Controller,
+	  WM_T_PCH,		WMP_F_1000T },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_PCH_D_DM,
+	  PCH LAN (82578DM) Controller,
+	  WM_T_PCH,		WMP_F_1000T },
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_PCH_D_DC,
+	  PCH LAN (82578DC) Controller,
+	  WM_T_PCH,		WMP_F_1000T },
 	{ 0,			0,
 	  NULL,
 	  0,			0 },
@@ -1104,7 +1116,8 @@
 	} else if (sc-sc_type = WM_T_82571) {
 		sc-sc_flags |= WM_F_PCIE;
 		if ((sc-sc_type != WM_T_ICH8)  (sc-sc_type != WM_T_ICH9)
-			 (sc-sc_type != WM_T_ICH10))
+		 (sc-sc_type != WM_T_ICH10)
+		 (sc-sc_type != WM_T_PCH))
 			sc-sc_flags |= WM_F_EEPROM_SEMAPHORE;
 		aprint_verbose_dev(sc-sc_dev, PCI-Express bus\n);
 	} else {
@@ -1282,6 +1295,7 @@
 	case WM_T_ICH8:
 	case WM_T_ICH9:
 	case WM_T_ICH10:
+	case WM_T_PCH:
 		if (wm_check_mng_mode(sc) != 0)
 			wm_get_hw_control(sc);
 		break;
@@ -1359,6 +1373,7 @@
 		}
 		/* FALLTHROUGH */
 	case WM_T_ICH10:
+	case WM_T_PCH:
 		/* FLASH */
 		sc-sc_flags |= WM_F_EEPROM_FLASH | WM_F_SWFWHW_SYNC;
 		memtype = pci_mapreg_type(pa-pa_pc, pa-pa_tag, WM_ICH8_FLASH);
@@ -1551,7 +1566,8 @@
 	 * media structures accordingly.
 	 */
 	if (sc-sc_type == WM_T_ICH8 || sc-sc_type == WM_T_ICH9
-	|| sc-sc_type == WM_T_ICH10 || sc-sc_type == WM_T_82573
+	|| sc-sc_type == WM_T_ICH10 || sc-sc_type == WM_T_PCH
+	|| sc-sc_type == WM_T_82573
 	|| sc-sc_type == WM_T_82574 || sc-sc_type == WM_T_82583) {
 		/* STATUS_TBIMODE reserved/reused, can't rely on it */
 		wm_gmii_mediainit(sc);
@@ -1598,6 +1614,10 @@
 		/* XXX limited to 9234 */
 		sc-sc_ethercom.ec_capabilities |= ETHERCAP_JUMBO_MTU;
 		break;
+	case WM_T_PCH:
+		/* XXX limited to 4096 */
+		sc-sc_ethercom.ec_capabilities |= ETHERCAP_JUMBO_MTU;
+		break;
 	case WM_T_82542_2_0:
 	case WM_T_82542_2_1:
 	case WM_T_82583:
@@ -2929,6 +2949,7 @@
 		return;
 	}
 
+	/* TBI mode */
 	status = CSR_READ(sc, WMREG_STATUS);
 	if (icr  ICR_LSC) {
 		if (status  STATUS_LU) {
@@ -3056,6 +3077,7 @@
 		break;
 	case WM_T_ICH9:
 	case WM_T_ICH10:
+	case WM_T_PCH:
 		sc-sc_pba = PBA_10K;
 		break;
 	default:
@@ -3123,6 +3145,10 @@
 		delay(5000);
 	}
 
+	if (sc-sc_type == WM_T_PCH) {
+		/* Save K1 */
+	}
+
 	switch (sc-sc_type) {
 	case WM_T_82544: /* XXX check whether WM_F_IOH_VALID is set */
 	case WM_T_82541:
@@ -3161,8 +3187,17 @@
 	case WM_T_ICH8:
 	case WM_T_ICH9:
 	case WM_T_ICH10:
+	case WM_T_PCH:
 		reg = CSR_READ(sc, WMREG_CTRL) | CTRL_RST;
 		if (wm_check_reset_block(sc) == 0) {
+			if (sc-sc_type = WM_T_PCH) {
+uint32_t status;
+
+status = CSR_READ(sc, WMREG_STATUS);
+CSR_WRITE(sc, WMREG_STATUS,
+status  ~STATUS_PHYRA);
+			}
+
 			reg |= CTRL_PHY_RESET;
 			phy_reset = 1;
 		}
@@ -3243,7 +3278,8 @@
 		/* check EECD_EE_AUTORD */
 		wm_get_auto_rd_done(sc);
 		break;
-	case WM_T_ICH10: /*  PCH */
+	case WM_T_ICH10:
+	case WM_T_PCH:
 		wm_lan_init_done(sc);
 		break;
 	default:
@@ -3253,6 +3289,14 @@
 	/* reload sc_ctrl */
 	sc-sc_ctrl = CSR_READ(sc, WMREG_CTRL);
 
+	/*
+	 * For PCH, this write will make sure that any noise will be detected
+	 * as a CRC error and be dropped rather than show up as a bad packet
+	 * to the DMA engine
+	 */
+	if (sc-sc_type == WM_T_PCH)
+		CSR_WRITE(sc, WMREG_CRC_OFFSET, 

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jan 11 12:54:55 UTC 2010

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
fix for i82577


To generate a diff of this commit:
cvs rdiff -u -r1.1009 -r1.1010 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1009 src/sys/dev/pci/pcidevs:1.1010
--- src/sys/dev/pci/pcidevs:1.1009	Thu Jan  7 18:57:10 2010
+++ src/sys/dev/pci/pcidevs	Mon Jan 11 12:54:54 2010
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1009 2010/01/07 18:57:10 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1010 2010/01/11 12:54:54 msaitoh Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2302,8 +2302,8 @@
 product INTEL 82567LM_3		0x10de	i82567LM-3 LAN Controller
 product INTEL 82567LF_3		0x10df	i82567LF-3 LAN Controller
 product INTEL 82575GB_QUAD_COPPER_PM 0x10e2 i82575GB Quad-1000baseT Ethernet (PM)
-product INTEL PCH_M_LM		0x10ea	PCH LAN (82578LM) Controller
-product INTEL PCH_M_LC		0x10eb	PCH LAN (82578LC) Controller
+product INTEL PCH_M_LM		0x10ea	PCH LAN (82577LM) Controller
+product INTEL PCH_M_LC		0x10eb	PCH LAN (82577LC) Controller
 product INTEL PCH_D_DM		0x10ef	PCH LAN (82578DM) Controller
 product INTEL PCH_D_DC		0x10f0	PCH LAN (82578DC) Controller
 product INTEL 82801I_IGP_M_AMT	0x10f5  82801I Mobile (AMT) LAN Controller

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Jan 11 12:55:29 UTC 2010

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1007 -r1.1008 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1006 -r1.1007 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1007 src/sys/dev/pci/pcidevs.h:1.1008
--- src/sys/dev/pci/pcidevs.h:1.1007	Thu Jan  7 18:57:38 2010
+++ src/sys/dev/pci/pcidevs.h	Mon Jan 11 12:55:29 2010
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1007 2010/01/07 18:57:38 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1008 2010/01/11 12:55:29 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1009 2010/01/07 18:57:10 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1010 2010/01/11 12:54:54 msaitoh Exp
  */
 
 /*
@@ -2309,8 +2309,8 @@
 #define	PCI_PRODUCT_INTEL_82567LM_3	0x10de		/* i82567LM-3 LAN Controller */
 #define	PCI_PRODUCT_INTEL_82567LF_3	0x10df		/* i82567LF-3 LAN Controller */
 #define	PCI_PRODUCT_INTEL_82575GB_QUAD_COPPER_PM	0x10e2		/* i82575GB Quad-1000baseT Ethernet (PM) */
-#define	PCI_PRODUCT_INTEL_PCH_M_LM	0x10ea		/* PCH LAN (82578LM) Controller */
-#define	PCI_PRODUCT_INTEL_PCH_M_LC	0x10eb		/* PCH LAN (82578LC) Controller */
+#define	PCI_PRODUCT_INTEL_PCH_M_LM	0x10ea		/* PCH LAN (82577LM) Controller */
+#define	PCI_PRODUCT_INTEL_PCH_M_LC	0x10eb		/* PCH LAN (82577LC) Controller */
 #define	PCI_PRODUCT_INTEL_PCH_D_DM	0x10ef		/* PCH LAN (82578DM) Controller */
 #define	PCI_PRODUCT_INTEL_PCH_D_DC	0x10f0		/* PCH LAN (82578DC) Controller */
 #define	PCI_PRODUCT_INTEL_82801I_IGP_M_AMT	0x10f5		/* 82801I Mobile (AMT) LAN Controller */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1006 src/sys/dev/pci/pcidevs_data.h:1.1007
--- src/sys/dev/pci/pcidevs_data.h:1.1006	Thu Jan  7 18:57:38 2010
+++ src/sys/dev/pci/pcidevs_data.h	Mon Jan 11 12:55:29 2010
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1006 2010/01/07 18:57:38 msaitoh Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1007 2010/01/11 12:55:29 msaitoh Exp $	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1009 2010/01/07 18:57:10 msaitoh Exp
+ *	NetBSD: pcidevs,v 1.1010 2010/01/11 12:54:54 msaitoh Exp
  */
 
 /*
@@ -9194,8 +9194,8 @@
 	Quad-1000baseT\0 /* 1 refs @ 15523 */
 	(PM)\0 /* 1 refs @ 15538 */
 	PCH\0 /* 4 refs @ 15543 */
-	(82578LM)\0 /* 1 refs @ 15547 */
-	(82578LC)\0 /* 1 refs @ 15557 */
+	(82577LM)\0 /* 1 refs @ 15547 */
+	(82577LC)\0 /* 1 refs @ 15557 */
 	(82578DM)\0 /* 1 refs @ 15567 */
 	(82578DC)\0 /* 1 refs @ 15577 */
 	82815\0 /* 10 refs @ 15587 */

CVS commit: src/usr.sbin/rtsold

[Thomas Klausner]

Module Name:src
Committed By:   wiz
Date:   Mon Jan 11 14:30:02 UTC 2010

Modified Files:
src/usr.sbin/rtsold: rtsold.8

Log Message:
Anon tells me it should be on the order of, not in the order of.
Hi marc!


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/usr.sbin/rtsold/rtsold.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/rtsold/rtsold.8
diff -u src/usr.sbin/rtsold/rtsold.8:1.29 src/usr.sbin/rtsold/rtsold.8:1.30
--- src/usr.sbin/rtsold/rtsold.8:1.29	Mon Jan 11 09:49:19 2010
+++ src/usr.sbin/rtsold/rtsold.8	Mon Jan 11 14:30:02 2010
@@ -1,4 +1,4 @@
-.\	$NetBSD: rtsold.8,v 1.29 2010/01/11 09:49:19 wiz Exp $
+.\	$NetBSD: rtsold.8,v 1.30 2010/01/11 14:30:02 wiz Exp $
 .\	$KAME: rtsold.8,v 1.17 2001/07/09 22:30:37 itojun Exp $
 .\
 .\ Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -102,7 +102,7 @@
 daemon cannot get the interface status.
 This feature does not conform to the IPv6 neighbor discovery
 specification, but is provided for mobile stations.
-The default interval for router advertisements, which is in the order of 10
+The default interval for router advertisements, which is on the order of 10
 minutes, is slightly long for mobile stations.
 This feature is provided
 for such stations so that they can find new routers as soon as possible

CVS commit: src/usr.bin/xlint/lint1

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 11 16:28:06 UTC 2010

Modified Files:
src/usr.bin/xlint/lint1: scan.l

Log Message:
fix hex double parsing.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/usr.bin/xlint/lint1/scan.l

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/xlint/lint1/scan.l
diff -u src/usr.bin/xlint/lint1/scan.l:1.46 src/usr.bin/xlint/lint1/scan.l:1.47
--- src/usr.bin/xlint/lint1/scan.l:1.46	Thu Oct 29 10:49:03 2009
+++ src/usr.bin/xlint/lint1/scan.l	Mon Jan 11 11:28:06 2010
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: scan.l,v 1.46 2009/10/29 14:49:03 christos Exp $ */
+/* $NetBSD: scan.l,v 1.47 2010/01/11 16:28:06 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 #if defined(__RCSID)  !defined(lint)
-__RCSID($NetBSD: scan.l,v 1.46 2009/10/29 14:49:03 christos Exp $);
+__RCSID($NetBSD: scan.l,v 1.47 2010/01/11 16:28:06 christos Exp $);
 #endif
 
 #include stdlib.h
@@ -89,6 +89,8 @@
 OD	[0-7]
 HD	[0-9A-Fa-f]
 EX	([eE][+-]?[0-9]+)
+HX	(p[+-]?[0-9A-Fa-f]+)
+TL	([fFlL]?[i]?)
 
 %option nounput
 
@@ -98,10 +100,11 @@
 0{OD}*[lLuU]*			return (icon(8));
 {NZD}{D}*[lLuU]*		return (icon(10));
 0[xX]{HD}+[lLuU]*		return (icon(16));
-{D}+\.{D}*{EX}?[fFlL]?[i]?	|
-{D}+{EX}[fFlL]?[i]?		|
-0[xX]{HD}+p{HD}+[fFlL]?[i]? 	|
-\.{D}+{EX}?[fFlL]?[i]?		return (fcon());
+{D}+\.{D}*{EX}?{TL}	|
+{D}+{EX}{TL}		|
+0[xX]{HD}+\.{HD}*{HX}{TL} |
+0[xX]{HD}+{HX}{TL} 	|
+\.{D}+{EX}?{TL}		return (fcon());
 =return (operator(T_ASSIGN, ASSIGN));
 *=return (operator(T_OPASS, MULASS));
 /=return (operator(T_OPASS, DIVASS));

CVS commit: src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 11 16:28:39 UTC 2010

Modified Files:
src/include: math.h
src/lib/libm: Makefile shlib_version
src/lib/libm/man: exp.3
src/lib/libm/src: math_private.h
Added Files:
src/lib/libm/src: s_exp2.c s_exp2f.c

Log Message:
Add exp2 and exp2m


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/include/math.h
cvs rdiff -u -r1.91 -r1.92 src/lib/libm/Makefile
cvs rdiff -u -r1.10 -r1.11 src/lib/libm/shlib_version
cvs rdiff -u -r1.23 -r1.24 src/lib/libm/man/exp.3
cvs rdiff -u -r1.13 -r1.14 src/lib/libm/src/math_private.h
cvs rdiff -u -r0 -r1.1 src/lib/libm/src/s_exp2.c src/lib/libm/src/s_exp2f.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/math.h
diff -u src/include/math.h:1.49 src/include/math.h:1.50
--- src/include/math.h:1.49	Sun Oct  4 18:59:25 2009
+++ src/include/math.h	Mon Jan 11 11:28:39 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: math.h,v 1.49 2009/10/04 22:59:25 christos Exp $	*/
+/*	$NetBSD: math.h,v 1.50 2010/01/11 16:28:39 christos Exp $	*/
 
 /*
  * 
@@ -194,6 +194,7 @@
 double	tanh(double);
 
 double	exp(double);
+double	exp2(double);
 double	frexp(double, int *);
 double	ldexp(double, int);
 double	log(double);
@@ -282,6 +283,7 @@
 /* 7.12.6 exp / log */
 
 float	expf(float);
+float	exp2f(float);
 float	expm1f(float);
 float	frexpf(float, int *);
 int	ilogbf(float);

Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.91 src/lib/libm/Makefile:1.92
--- src/lib/libm/Makefile:1.91	Fri Oct 23 19:42:52 2009
+++ src/lib/libm/Makefile	Mon Jan 11 11:28:39 2010
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.91 2009/10/23 23:42:52 joerg Exp $
+#  $NetBSD: Makefile,v 1.92 2010/01/11 16:28:39 christos Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -119,7 +119,8 @@
 	k_standard.c k_tan.c k_tanf.c \
 	s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c s_ceil.c \
 	s_ceilf.c s_copysign.c s_copysignf.c s_cos.c s_cosf.c s_erf.c \
-	s_erff.c s_expm1.c s_expm1f.c s_fabsf.c s_finite.c s_finitef.c \
+	s_erff.c s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c \
+	s_finite.c s_finitef.c \
 	s_floor.c s_floorf.c s_frexpf.c s_ilogb.c s_ilogbf.c \
 	s_isinff.c s_isnanf.c s_ldexpf.c s_lib_version.c s_log1p.c \
 	s_log1pf.c s_logb.c s_logbf.c s_matherr.c s_modff.c s_nextafter.c \

Index: src/lib/libm/shlib_version
diff -u src/lib/libm/shlib_version:1.10 src/lib/libm/shlib_version:1.11
--- src/lib/libm/shlib_version:1.10	Sun Oct  4 18:04:30 2009
+++ src/lib/libm/shlib_version	Mon Jan 11 11:28:39 2010
@@ -1,5 +1,5 @@
-#	$NetBSD: shlib_version,v 1.10 2009/10/04 22:04:30 christos Exp $
+#	$NetBSD: shlib_version,v 1.11 2010/01/11 16:28:39 christos Exp $
 #	Remember to update distrib/sets/lists/base/shl.* when changing
 #
 major=0
-minor=7
+minor=8

Index: src/lib/libm/man/exp.3
diff -u src/lib/libm/man/exp.3:1.23 src/lib/libm/man/exp.3:1.24
--- src/lib/libm/man/exp.3:1.23	Thu Jul 21 08:58:22 2005
+++ src/lib/libm/man/exp.3	Mon Jan 11 11:28:39 2010
@@ -26,14 +26,19 @@
 .\ SUCH DAMAGE.
 .\
 .\ from: @(#)exp.3	6.12 (Berkeley) 7/31/91
-.\	$NetBSD: exp.3,v 1.23 2005/07/21 12:58:22 wiz Exp $
+.\ $FreeBSD: src/lib/msun/man/exp.3,v 1.24 2008/01/18 21:43:00 das Exp $
+.\	$NetBSD: exp.3,v 1.24 2010/01/11 16:28:39 christos Exp $
 .\
-.Dd July 21, 2005
+.Dd January 11, 2010
 .Dt EXP 3
 .Os
 .Sh NAME
 .Nm exp ,
 .Nm expf ,
+.\ The sorting error is intentional.  exp and expf should be adjacent.
+.Nm exp2 ,
+.Nm exp2f ,
+.\ .Nm exp2l ,
 .Nm expm1 ,
 .Nm expm1f ,
 .Nm log ,
@@ -56,6 +61,12 @@
 .Ft float
 .Fn expf float x
 .Ft double
+.Fn exp2 double x
+.Ft float
+.Fn exp2f float x
+.\ .Ft long double
+.\ .Fn exp2l long double x
+.Ft double
 .Fn expm1 double x
 .Ft float
 .Fn expm1f float x
@@ -82,12 +93,28 @@
 .Sh DESCRIPTION
 The
 .Fn exp
-function computes the exponential value of the given argument
+and the
+.Fn expf
+functions compute the base
+.Ms e
+exponential value of the given argument
+.Fa x .
+.Pp
+The
+.Fn exp2 ,
+and
+.Fn exp2f
+.\ .Fn exp2f ,
+.\ and
+.\ .Fn exp2l
+functions compute the base 2 exponential of the given argument
 .Fa x .
 .Pp
 The
 .Fn expm1
-function computes the value exp(x)\-1 accurately even for tiny argument
+and the
+.Fn expm1f
+functions computes the value exp(x)\-1 accurately even for tiny argument
 .Fa x .
 .Pp
 The
@@ -117,11 +144,24 @@
 .Pp
 The
 .Fn pow
-computes the value
+and
+.Fn powf
+functions compute the value
 of
 .Ar x
 to the exponent
 .Ar y .
+.Sh ERROR (due to Roundoff etc.)
+The values of
+.Fn exp 0 ,
+.Fn expm1 0 ,
+.Fn exp2 integer ,
+and
+.Fn pow integer integer
+are exact provided that they are representable.
+.\ XXX Is this really true for pow()?
+Otherwise the error in these functions is generally below one
+.Em ulp .
 .Sh RETURN VALUES
 These functions will return the appropriate computation unless an error

CVS commit: src/distrib/sets/lists/base

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 11 16:30:26 UTC 2010

Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi

Log Message:
bump libm for exp2 and exp2f


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/ad.mips64eb \
src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.513 -r1.514 src/distrib/sets/lists/base/shl.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/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.8 src/distrib/sets/lists/base/ad.mips64eb:1.9
--- src/distrib/sets/lists/base/ad.mips64eb:1.8	Sun Dec 27 14:26:04 2009
+++ src/distrib/sets/lists/base/ad.mips64eb	Mon Jan 11 11:30:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.8 2009/12/27 19:26:04 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.9 2010/01/11 16:30:26 christos Exp $
 ./libexec/ld.elf_so-64base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32base-sysutil-bin	compat,pic
 ./usr/lib/64	base-compat-lib		compat
@@ -124,7 +124,7 @@
 ./usr/lib/64/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/64/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libm.so.0base-compat-shlib	compat,pic
-./usr/lib/64/libm.so.0.7			base-compat-shlib	compat,pic
+./usr/lib/64/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libmenu.so.6			base-compat-shlib	compat,pic
@@ -356,7 +356,7 @@
 ./usr/lib/o32/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libm.so.0base-compat-shlib	compat,pic
-./usr/lib/o32/libm.so.0.7			base-compat-shlib	compat,pic
+./usr/lib/o32/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmenu.so.6			base-compat-shlib	compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.8 src/distrib/sets/lists/base/ad.mips64el:1.9
--- src/distrib/sets/lists/base/ad.mips64el:1.8	Sun Dec 27 14:26:04 2009
+++ src/distrib/sets/lists/base/ad.mips64el	Mon Jan 11 11:30:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.8 2009/12/27 19:26:04 christos Exp $
+# $NetBSD: ad.mips64el,v 1.9 2010/01/11 16:30:26 christos Exp $
 ./libexec/ld.elf_so-64base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32base-sysutil-bin	compat,pic
 ./usr/lib/64	base-compat-lib		compat
@@ -124,7 +124,7 @@
 ./usr/lib/64/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/64/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libm.so.0base-compat-shlib	compat,pic
-./usr/lib/64/libm.so.0.7			base-compat-shlib	compat,pic
+./usr/lib/64/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/64/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libmenu.so.6			base-compat-shlib	compat,pic
@@ -356,7 +356,7 @@
 ./usr/lib/o32/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/o32/liblwres.so.5.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libm.so.0base-compat-shlib	compat,pic
-./usr/lib/o32/libm.so.0.7			base-compat-shlib	compat,pic
+./usr/lib/o32/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libmenu.so.6			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.81 src/distrib/sets/lists/base/md.amd64:1.82
--- src/distrib/sets/lists/base/md.amd64:1.81	Sun Dec 27 14:26:04 2009
+++ src/distrib/sets/lists/base/md.amd64	Mon Jan 11 11:30:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.81 2009/12/27 19:26:04 christos Exp $
+# $NetBSD: md.amd64,v 1.82 2010/01/11 16:30:26 christos Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -129,7 +129,7 @@
 ./usr/lib/i386/liblwres.so.5			base-compat-shlib	compat,pic
 ./usr/lib/i386/liblwres.so.5.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libm.so.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libm.so.0.7			base-compat-shlib	compat,pic
+./usr/lib/i386/libm.so.0.8			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmagic.so.3			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmagic.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libmenu.so.6			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/md.sparc64
diff -u 

CVS commit: src/sys/rump/librump/rumpkern

[Arnaud Ysmal]

Module Name:src
Committed By:   stacktic
Date:   Mon Jan 11 19:19:58 UTC 2010

Modified Files:
src/sys/rump/librump/rumpkern: memalloc.c

Log Message:
Fixed typo.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/memalloc.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/rump/librump/rumpkern/memalloc.c
diff -u src/sys/rump/librump/rumpkern/memalloc.c:1.3 src/sys/rump/librump/rumpkern/memalloc.c:1.4
--- src/sys/rump/librump/rumpkern/memalloc.c:1.3	Wed Dec 23 17:16:40 2009
+++ src/sys/rump/librump/rumpkern/memalloc.c	Mon Jan 11 19:19:57 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: memalloc.c,v 1.3 2009/12/23 17:16:40 stacktic Exp $	*/
+/*	$NetBSD: memalloc.c,v 1.4 2010/01/11 19:19:57 stacktic Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD);
+__KERNEL_RCSID(0, $NetBSD: memalloc.c,v 1.4 2010/01/11 19:19:57 stacktic Exp $);
 
 #include sys/param.h
 #include sys/kmem.h

CVS commit: src/external/bsd/fetch/dist/libfetch

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Jan 11 19:40:02 UTC 2010

Update of /cvsroot/src/external/bsd/fetch/dist/libfetch
In directory ivanova.netbsd.org:/tmp/cvs-serv19846

Log Message:
libfetch-2.27:
Fix a bug in the connection caching for FTP.

Status:

Vendor Tag: PKGSRC
Release Tags:   libfetch-2-27

U src/external/bsd/fetch/dist/libfetch/errlist.sh
U src/external/bsd/fetch/dist/libfetch/common.c
U src/external/bsd/fetch/dist/libfetch/common.h
U src/external/bsd/fetch/dist/libfetch/fetch.cat3
U src/external/bsd/fetch/dist/libfetch/fetch.3
U src/external/bsd/fetch/dist/libfetch/fetch.c
U src/external/bsd/fetch/dist/libfetch/ftp.errors
U src/external/bsd/fetch/dist/libfetch/fetch.h
U src/external/bsd/fetch/dist/libfetch/file.c
U src/external/bsd/fetch/dist/libfetch/ftp.c
U src/external/bsd/fetch/dist/libfetch/http.errors
U src/external/bsd/fetch/dist/libfetch/http.c

No conflicts created by this import

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Mon Jan 11 19:52:30 UTC 2010

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c

Log Message:
Mark dmamaps as coherent if the D cache is coherent.


To generate a diff of this commit:
cvs rdiff -u -r1.22.16.8 -r1.22.16.9 src/sys/arch/mips/mips/bus_dma.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/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.8 src/sys/arch/mips/mips/bus_dma.c:1.22.16.9
--- src/sys/arch/mips/mips/bus_dma.c:1.22.16.8	Sun Jan 10 02:48:46 2010
+++ src/sys/arch/mips/mips/bus_dma.c	Mon Jan 11 19:52:30 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.22.16.8 2010/01/10 02:48:46 matt Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.22.16.9 2010/01/11 19:52:30 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.8 2010/01/10 02:48:46 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.9 2010/01/11 19:52:30 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -214,6 +214,11 @@
 	map-dm_mapsize = buflen;
 	map-dm_nsegs = seg + 1;
 	map-_dm_vmspace = vm;
+	/*
+	 * If our cache is coherent, then the map must be coherent too.
+	 */
+	if (mips_cpu_flags  CPU_MIPS_D_CACHE_COHERENT)
+		map-_dm_flags |= _BUS_DMAMAP_COHERENT;
 
 	/* ...so _bus_dmamap_sync() knows we're bouncing */
 	cookie-id_flags |= _BUS_DMA_IS_BOUNCING;
@@ -381,7 +386,9 @@
 		 *
 		 * XXX Check TLB entries for cache-inhibit bits?
 		 */
-		if (MIPS_KSEG1_P(buf))
+		if (mips_cpu_flags  CPU_MIPS_D_CACHE_COHERENT)
+			map-_dm_flags |= _BUS_DMAMAP_COHERENT;
+		else if (MIPS_KSEG1_P(buf))
 			map-_dm_flags |= _BUS_DMAMAP_COHERENT;
 #ifdef _LP64
 		else if (MIPS_XKPHYS_P((vaddr_t)buf)
@@ -441,6 +448,11 @@
 		map-dm_mapsize = m0-m_pkthdr.len;
 		map-dm_nsegs = seg + 1;
 		map-_dm_vmspace = vm;		/* always kernel */
+		/*
+		 * If our cache is coherent, then the map must be coherent too.
+		 */
+		if (mips_cpu_flags  CPU_MIPS_D_CACHE_COHERENT)
+			map-_dm_flags |= _BUS_DMAMAP_COHERENT;
 		return 0;
 	}
 #ifdef _MIPS_NEED_BUS_DMA_BOUNCE
@@ -497,6 +509,11 @@
 		map-dm_mapsize = uio-uio_resid;
 		map-dm_nsegs = seg + 1;
 		map-_dm_vmspace = uio-uio_vmspace;
+		/*
+		 * If our cache is coherent, then the map must be coherent too.
+		 */
+		if (mips_cpu_flags  CPU_MIPS_D_CACHE_COHERENT)
+			map-_dm_flags |= _BUS_DMAMAP_COHERENT;
 		return 0;
 	}
 #ifdef _MIPS_NEED_BUS_DMA_BOUNCE

CVS commit: src

[Joerg Sonnenberger]

Module Name:src
Committed By:   joerg
Date:   Mon Jan 11 20:39:29 UTC 2010

Modified Files:
src/include: stdio.h
src/lib/libc/stdio: fclose.c fgetstr.c fgetwln.c fileext.h findfp.c
freopen.c local.h sscanf.c vsscanf.c vswscanf.c

Log Message:
Use a proper char */size_t pair in __sfileext to keep track of the line
buffer for fgetln and fgetwln. Simplifies code by dropping the INT_MAX
related logic. Drop conditionals around FREELB, free(NULL) is valid.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/include/stdio.h
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/stdio/fclose.c \
src/lib/libc/stdio/sscanf.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/stdio/fgetstr.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/stdio/fgetwln.c
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/stdio/fileext.h \
src/lib/libc/stdio/vswscanf.c
cvs rdiff -u -r1.23 -r1.24 src/lib/libc/stdio/findfp.c \
src/lib/libc/stdio/local.h
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/stdio/freopen.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/stdio/vsscanf.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/include/stdio.h
diff -u src/include/stdio.h:1.74 src/include/stdio.h:1.75
--- src/include/stdio.h:1.74	Mon Jul 13 22:19:24 2009
+++ src/include/stdio.h	Mon Jan 11 20:39:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.74 2009/07/13 22:19:24 roy Exp $	*/
+/*	$NetBSD: stdio.h,v 1.75 2010/01/11 20:39:29 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -133,8 +133,8 @@
 	unsigned char _ubuf[3];	/* guarantee an ungetc() buffer */
 	unsigned char _nbuf[1];	/* guarantee a getc() buffer */
 
-	/* separate buffer for fgetln() when line crosses buffer boundary */
-	struct	__sbuf _lb;	/* buffer for fgetln() */
+	/* Formerly used by fgetln/fgetwln; kept for binary compatibility */
+	struct	__sbuf _lb__unused;
 
 	/* Unix stdio files get aligned to block boundaries on fseek() */
 	int	_blksize;	/* stat.st_blksize (may be != _bf._size) */

Index: src/lib/libc/stdio/fclose.c
diff -u src/lib/libc/stdio/fclose.c:1.16 src/lib/libc/stdio/fclose.c:1.17
--- src/lib/libc/stdio/fclose.c:1.16	Thu Aug  7 16:43:22 2003
+++ src/lib/libc/stdio/fclose.c	Mon Jan 11 20:39:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: fclose.c,v 1.16 2003/08/07 16:43:22 agc Exp $	*/
+/*	$NetBSD: fclose.c,v 1.17 2010/01/11 20:39:29 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = @(#)fclose.c	8.1 (Berkeley) 6/4/93;
 #endif
-__RCSID($NetBSD: fclose.c,v 1.16 2003/08/07 16:43:22 agc Exp $);
+__RCSID($NetBSD: fclose.c,v 1.17 2010/01/11 20:39:29 joerg Exp $);
 #endif /* LIBC_SCCS and not lint */
 
 #include assert.h
@@ -69,8 +69,7 @@
 		free((char *)fp-_bf._base);
 	if (HASUB(fp))
 		FREEUB(fp);
-	if (HASLB(fp))
-		FREELB(fp);
+	FREELB(fp);
 	FUNLOCKFILE(fp);
 	fp-_file = -1;
 	fp-_flags = 0;		/* Release this FILE for reuse. */
Index: src/lib/libc/stdio/sscanf.c
diff -u src/lib/libc/stdio/sscanf.c:1.16 src/lib/libc/stdio/sscanf.c:1.17
--- src/lib/libc/stdio/sscanf.c:1.16	Tue Nov 29 03:12:00 2005
+++ src/lib/libc/stdio/sscanf.c	Mon Jan 11 20:39:29 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: sscanf.c,v 1.16 2005/11/29 03:12:00 christos Exp $	*/
+/*	$NetBSD: sscanf.c,v 1.17 2010/01/11 20:39:29 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = @(#)sscanf.c	8.1 (Berkeley) 6/4/93;
 #else
-__RCSID($NetBSD: sscanf.c,v 1.16 2005/11/29 03:12:00 christos Exp $);
+__RCSID($NetBSD: sscanf.c,v 1.17 2010/01/11 20:39:29 joerg Exp $);
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -80,7 +80,6 @@
 	f._bf._size = f._r = strlen(str);
 	f._read = eofread;
 	_UB(f)._base = NULL;
-	f._lb._base = NULL;
 	va_start(ap, fmt);
 	ret = __svfscanf_unlocked(f, fmt, ap);
 	va_end(ap);

Index: src/lib/libc/stdio/fgetstr.c
diff -u src/lib/libc/stdio/fgetstr.c:1.10 src/lib/libc/stdio/fgetstr.c:1.11
--- src/lib/libc/stdio/fgetstr.c:1.10	Wed Dec  2 09:03:13 2009
+++ src/lib/libc/stdio/fgetstr.c	Mon Jan 11 20:39:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fgetstr.c,v 1.10 2009/12/02 09:03:13 roy Exp $	*/
+/* $NetBSD: fgetstr.c,v 1.11 2010/01/11 20:39:29 joerg Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: fgetstr.c,v 1.10 2009/12/02 09:03:13 roy Exp $);
+__RCSID($NetBSD: fgetstr.c,v 1.11 2010/01/11 20:39:29 joerg Exp $);
 
 #include namespace.h
 
@@ -49,24 +49,12 @@
 char *
 __fgetstr(FILE *__restrict fp, size_t *__restrict lenp, int sep)
 {
-	char *p;
-	size_t size;
 	ssize_t n;
 
 	_DIAGASSERT(fp != NULL);
 	_DIAGASSERT(lenp != NULL);
 
-	p = (char *)fp-_lb._base;
-	size = fp-_lb._size;
-	n = __getdelim(p, size, sep, fp);
-	fp-_lb._base = (unsigned char *)p;
-	/* The struct size variable is only an int .
-	 * This still works when exceeded, but the buffer could be
-	 * realloced needlessly. */
-	if (size  INT_MAX)
-		fp-_lb._size = INT_MAX;

CVS commit: src/lib/libm/src

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 11 23:38:24 UTC 2010

Modified Files:
src/lib/libm/src: s_exp2.c

Log Message:
remove weak reference for now.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/src/s_exp2.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/libm/src/s_exp2.c
diff -u src/lib/libm/src/s_exp2.c:1.1 src/lib/libm/src/s_exp2.c:1.2
--- src/lib/libm/src/s_exp2.c:1.1	Mon Jan 11 11:28:39 2010
+++ src/lib/libm/src/s_exp2.c	Mon Jan 11 18:38:24 2010
@@ -25,7 +25,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: s_exp2.c,v 1.1 2010/01/11 16:28:39 christos Exp $);
+__RCSID($NetBSD: s_exp2.c,v 1.2 2010/01/11 23:38:24 christos Exp $);
 #ifdef __FBSDID
 __FBSDID($FreeBSD: src/lib/msun/src/s_exp2.c,v 1.7 2008/02/22 02:27:34 das Exp $);
 #endif
@@ -394,6 +394,8 @@
 	}
 }
 
+#ifdef notyet
 #if (LDBL_MANT_DIG == 53)
 __weak_reference(exp2, exp2l);
 #endif
+#endif

CVS commit: src/share/man/man4

[Julio M. Merino Vidal]

Module Name:src
Committed By:   jmmv
Date:   Tue Jan 12 00:04:30 UTC 2010

Modified Files:
src/share/man/man4: btbc.4

Log Message:
Drop unnecessary trailing commas.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/btbc.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/btbc.4
diff -u src/share/man/man4/btbc.4:1.3 src/share/man/man4/btbc.4:1.4
--- src/share/man/man4/btbc.4:1.3	Fri Apr 10 15:15:10 2009
+++ src/share/man/man4/btbc.4	Tue Jan 12 00:04:30 2010
@@ -1,4 +1,4 @@
-.\ $NetBSD: btbc.4,v 1.3 2009/04/10 15:15:10 joerg Exp $
+.\ $NetBSD: btbc.4,v 1.4 2010/01/12 00:04:30 jmmv Exp $
 .\
 .\ Copyright (c) 2007 KIYOHARA Takashi
 .\ All rights reserved.
@@ -35,11 +35,11 @@
 .Sh DESCRIPTION
 The
 .Nm
-driver provides support for the AnyCom BlueCard (LSE041, LSE039, LSE139),
+driver provides support for the AnyCom BlueCard (LSE041, LSE039, LSE139)
 to the Bluetooth protocol stack.
 .Sh SEE ALSO
 .Xr bluetooth 4 ,
-.Xr pcmcia 4 ,
+.Xr pcmcia 4
 .Sh HISTORY
 This
 .Nm

CVS commit: src/external/mit/xorg/lib/dri

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan 12 00:57:45 UTC 2010

Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile

Log Message:
replace LIBS with LIBDPLIBS.  makes these actually link against drm_intel.
should fix a problem reported by s...@.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/dri/i965/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.4 src/external/mit/xorg/lib/dri/i915/Makefile:1.5
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.4	Mon Nov  9 02:38:24 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile	Tue Jan 12 00:57:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/11/09 02:38:24 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/01/12 00:57:45 mrg Exp $
 
 MODULE=	i915
 
@@ -58,6 +58,6 @@
 
 CPPFLAGS+=	 -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
 
-LIBS+=	-ldrm_intel
+LIBDPLIBS+=	drm_intel	${.CURDIR}/../../libdrm_intel
 
 .include ${.CURDIR}/../dri.mk

Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.6 src/external/mit/xorg/lib/dri/i965/Makefile:1.7
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.6	Sun Jan 10 17:35:33 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile	Tue Jan 12 00:57:45 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/10 17:35:33 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/01/12 00:57:45 mrg Exp $
 
 MODULE=	i965
 
@@ -89,6 +89,6 @@
 
 COPTS.brw_draw_upload.c=	-Wno-error
 
-LIBS+=	-ldrm_intel
+LIBDPLIBS+=	drm_intel	${.CURDIR}/../../libdrm_intel
 
 .include ${.CURDIR}/../dri.mk

CVS commit: xsrc/external/mit/libpciaccess/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Jan 12 03:05:32 UTC 2010

Modified Files:
xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c

Log Message:
in pci_device_netbsd_probe() probe the expansion ROM and size.
if it's there, set priv-rom_base and device-rom_size.

originally from mhitch, and it's basically the same code as present in
both freebsd_pci.c and openbsd_pci.c.

add a comment about needing to avoid the default bios mapping if this
card is not the console.

mmap() with MAP_SHARED, since the kernel forces this anyway, and it is
again the same in both freebsd_pci.c and openbsd_pci.c.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.5 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.6
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.5	Wed Dec 23 22:21:01 2009
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c	Tue Jan 12 03:05:31 2010
@@ -354,6 +354,23 @@
 		}
 	}
 
+	/* Probe expansion ROM if present */
+	err = pci_read(domain, bus, dev, func, PCI_MAPREG_ROM, reg);
+	if (err)
+		return err;
+	if (reg != 0) {
+		err = pci_write(domain, bus, dev, func, PCI_MAPREG_ROM,
+		(uint32_t)(~PCI_MAPREG_ROM_ENABLE));
+		if (err)
+			return err;
+		pci_read(domain, bus, dev, func, PCI_MAPREG_ROM, size);
+		pci_write(domain, bus, dev, func, PCI_MAPREG_ROM, reg);
+		if ((reg  PCI_MAPREG_MEM_ADDR_MASK) != 0) {
+			priv-rom_base = reg  PCI_MAPREG_MEM_ADDR_MASK;
+			device-rom_size = -(size  PCI_MAPREG_MEM_ADDR_MASK);
+		}
+	}
+
 	return 0;
 }
 
@@ -379,6 +396,10 @@
 
 if (priv-rom_base == 0) {
 #if defined(__amd64__) || defined(__i386__)
+	/*
+	 * We need a way to detect when this isn't the console and reject
+	 * this request outright.
+	 */
 	rom_base = 0xc;
 	rom_size = 0x1;
 	pci_rom = 0;
@@ -419,7 +440,7 @@
 if (memfd == -1)
 	return errno;
 
-bios = mmap(NULL, rom_size, PROT_READ, 0, memfd, (off_t)rom_base);
+bios = mmap(NULL, rom_size, PROT_READ, MAP_SHARED, memfd, (off_t)rom_base);
 if (bios == MAP_FAILED) {
 	int serrno = errno;
 	close(memfd);

CVS commit: src/etc

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Tue Jan 12 04:44:06 UTC 2010

Modified Files:
src/etc: Makefile

Log Message:
Fix previous: use correct mode as well as owner/group.
My bad. PR misc/41544.


To generate a diff of this commit:
cvs rdiff -u -r1.377 -r1.378 src/etc/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.377 src/etc/Makefile:1.378
--- src/etc/Makefile:1.377	Sun Jan 10 06:13:25 2010
+++ src/etc/Makefile	Tue Jan 12 04:44:06 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.377 2010/01/10 06:13:25 dholland Exp $
+#	$NetBSD: Makefile,v 1.378 2010/01/12 04:44:06 dholland Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -307,7 +307,7 @@
 		${BINOWN} operator	664	/etc/dumpdates  \
 		${BINOWN} operator	600	/etc/skeykeys \
 		root wheel		600	/var/at/at.deny \
-		root wheel		664	/var/db/locate.database \
+		root wheel		644	/var/db/locate.database \
 		${BINOWN} ${BINGRP}	600	/var/log/authlog \
 		root wheel		600	/var/log/cron \
 		${BINOWN} ${UTMPGRP}	664	/var/log/lastlog \

CVS commit: [matt-nb5-mips64] src/sys/arch/mips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jan 12 05:52:09 UTC 2010

Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: bus_dma.h
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c

Log Message:
Rework bounce buffers so that it can also deal with non-coherent buffers.


To generate a diff of this commit:
cvs rdiff -u -r1.9.18.1 -r1.9.18.2 src/sys/arch/mips/include/bus_dma.h
cvs rdiff -u -r1.22.16.9 -r1.22.16.10 src/sys/arch/mips/mips/bus_dma.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/mips/include/bus_dma.h
diff -u src/sys/arch/mips/include/bus_dma.h:1.9.18.1 src/sys/arch/mips/include/bus_dma.h:1.9.18.2
--- src/sys/arch/mips/include/bus_dma.h:1.9.18.1	Sun Jan 10 02:48:46 2010
+++ src/sys/arch/mips/include/bus_dma.h	Tue Jan 12 05:52:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.h,v 1.9.18.1 2010/01/10 02:48:46 matt Exp $ */
+/* $NetBSD: bus_dma.h,v 1.9.18.2 2010/01/12 05:52:09 matt Exp $ */
 
 /*-
  * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -259,8 +259,17 @@
 	 * DMA map syncs.  Note that origibuflen is only used
 	 * for ID_BUFTYPE_LINEAR.
 	 */
-	void	*id_origbuf;		/* pointer to orig buffer if
-	   bouncing */
+	union {
+		void	*un_origbuf;		/* pointer to orig buffer if
+		   bouncing */
+		char	*un_linearbuf;
+		struct mbuf	*un_mbuf;
+		struct uio	*un_uio;
+	} id_origbuf_un;
+#define	id_origbuf		id_origbuf_un.un_origbuf
+#define	id_origlinearbuf	id_origbuf_un.un_linearbuf
+#define	id_origmbuf		id_origbuf_un.un_mbuf
+#define	id_origuio		id_origbuf_un.un_uio
 	bus_size_t id_origbuflen;	/* ...and size */
 	int	id_buftype;		/* type of buffer */
 

Index: src/sys/arch/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.9 src/sys/arch/mips/mips/bus_dma.c:1.22.16.10
--- src/sys/arch/mips/mips/bus_dma.c:1.22.16.9	Mon Jan 11 19:52:30 2010
+++ src/sys/arch/mips/mips/bus_dma.c	Tue Jan 12 05:52:09 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.22.16.9 2010/01/11 19:52:30 matt Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.22.16.10 2010/01/12 05:52:09 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.9 2010/01/11 19:52:30 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.10 2010/01/12 05:52:09 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -579,9 +579,8 @@
 bus_size_t len, int ops)
 {
 	bus_size_t minlen;
-	bus_addr_t addr;  
-	int i, useindex;
 
+#ifdef DIAGNOSTIC
 	/*
 	 * Mixing PRE and POST operations is not allowed.
 	 */
@@ -589,7 +588,6 @@
 	(ops  (BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE)) != 0)
 		panic(_bus_dmamap_sync: mix PRE and POST);
 
-#ifdef DIAGNOSTIC
 	if (offset = map-dm_mapsize)
 		panic(_bus_dmamap_sync: bad offset %PRIxPADDR 
 			 (map size is %PRIxPSIZE),
@@ -615,117 +613,27 @@
 	 *
 	 *	POSTWRITE -- Nothing.
 	 */
-
 #ifdef _MIPS_NEED_BUS_DMA_BOUNCE
-	struct mips_bus_dma_cookie * cookie = map-_dm_cookie;
-	if (cookie != NULL  (cookie-id_flags  _BUS_DMA_IS_BOUNCING)) {
+	struct mips_bus_dma_cookie * const cookie = map-_dm_cookie;
+	if (cookie != NULL  (cookie-id_flags  _BUS_DMA_IS_BOUNCING)
+	 (ops  BUS_DMASYNC_PREWRITE)) {
+		/*
+		 * Copy the caller's buffer to the bounce buffer.
+		 */
 		switch (cookie-id_buftype) {
 		case _BUS_DMA_BUFTYPE_LINEAR:
-			/*
-			 * Nothing to do for pre-read or post-write.
-			 */
-			if (ops  BUS_DMASYNC_PREWRITE) {
-/* 
- * Copy the caller's buffer to the bounce
- * buffer.
- */ 
-memcpy((char *)cookie-id_bouncebuf + offset,
-(char *)cookie-id_origbuf + offset, len);
-			}
-			if (ops  BUS_DMASYNC_POSTREAD) {
-/*
- * Copy the bounce buffer to the caller's
- * buffer.
- */
-memcpy((char *)cookie-id_origbuf + offset,
-(char *)cookie-id_bouncebuf + offset, len);
-			}
-
+			memcpy((char *)cookie-id_bouncebuf + offset,
+			cookie-id_origlinearbuf + offset, len);
 			break;
-
 		case _BUS_DMA_BUFTYPE_MBUF:
-		{
-			struct mbuf *m, *m0 = cookie-id_origbuf;
-			bus_size_t moff;
-
-			/*
-			 * Nothing to do for pre-read.
-			 */
-
-			if (ops  BUS_DMASYNC_PREWRITE) {
-/*
- * Copy the caller's buffer to the bounce
- * buffer.
- */
-m_copydata(m0, offset, len,
-(char *)cookie-id_bouncebuf + offset);
-			}
-
-			if (ops  BUS_DMASYNC_POSTREAD) {
-/*
- * Copy the bounce buffer to the caller's
- * buffer.
- */
-for (moff = offset, m = m0;
- m != NULL  len != 0;
- m = m-m_next) {
-	/* Find the beginning mbuf. */
-	if (moff = m-m_len) {
-		moff -= m-m_len;
-		continue;
-	}
-
-	/*
-	 * Now at the first mbuf to sync; nail
-	 * each one until we have exhausted the
-	 * length.
-	 */
-	minlen = len  m-m_len - moff 

CVS commit: [matt-nb5-mips64] src/sys/arch/mips/mips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Tue Jan 12 06:38:20 UTC 2010

Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: bus_dma.c

Log Message:
Add some evcnts for bounce buffers


To generate a diff of this commit:
cvs rdiff -u -r1.22.16.10 -r1.22.16.11 src/sys/arch/mips/mips/bus_dma.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/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.22.16.10 src/sys/arch/mips/mips/bus_dma.c:1.22.16.11
--- src/sys/arch/mips/mips/bus_dma.c:1.22.16.10	Tue Jan 12 05:52:09 2010
+++ src/sys/arch/mips/mips/bus_dma.c	Tue Jan 12 06:38:20 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.22.16.10 2010/01/12 05:52:09 matt Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.22.16.11 2010/01/12 06:38:20 matt Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 
 #include sys/cdefs.h			/* RCS ID  Copyright macro defns */
 
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.10 2010/01/12 05:52:09 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.22.16.11 2010/01/12 06:38:20 matt Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -41,6 +41,7 @@
 #include sys/malloc.h
 #include sys/proc.h
 #include sys/mbuf.h
+#include sys/evcnt.h
 
 #include uvm/uvm_extern.h
 
@@ -58,6 +59,40 @@
 const struct mips_bus_dmamem_ops mips_bus_dmamem_ops = _BUS_DMAMEM_OPS_INITIALIZER;
 const struct mips_bus_dmatag_ops mips_bus_dmatag_ops = _BUS_DMATAG_OPS_INITIALIZER;
 
+static struct evcnt bus_dma_creates =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, creates);
+static struct evcnt bus_dma_bounced_creates =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced creates);
+static struct evcnt bus_dma_loads =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, loads);
+static struct evcnt bus_dma_bounced_loads =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced loads);
+static struct evcnt bus_dma_read_bounces =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, read bounces);
+static struct evcnt bus_dma_write_bounces =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, write bounces);
+static struct evcnt bus_dma_bounced_unloads =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced unloads);
+static struct evcnt bus_dma_unloads =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, unloads);
+static struct evcnt bus_dma_bounced_destroys =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, bounced destroys);
+static struct evcnt bus_dma_destroys =
+	EVCNT_INITIALIZER(EVCNT_TYPE_MISC, NULL, busdma, destroys);
+
+EVCNT_ATTACH_STATIC(bus_dma_creates);
+EVCNT_ATTACH_STATIC(bus_dma_bounced_creates);
+EVCNT_ATTACH_STATIC(bus_dma_loads);
+EVCNT_ATTACH_STATIC(bus_dma_bounced_loads);
+EVCNT_ATTACH_STATIC(bus_dma_read_bounces);
+EVCNT_ATTACH_STATIC(bus_dma_write_bounces);
+EVCNT_ATTACH_STATIC(bus_dma_unloads);
+EVCNT_ATTACH_STATIC(bus_dma_bounced_unloads);
+EVCNT_ATTACH_STATIC(bus_dma_destroys);
+EVCNT_ATTACH_STATIC(bus_dma_bounced_destroys);
+
+#define	STAT_INCR(x)	(bus_dma_ ## x.ev_count++)
+
 paddr_t kvtophys(vaddr_t);	/* XXX */
 
 /*
@@ -211,6 +246,7 @@
 	if (error)
 		return (error);
 
+	STAT_INCR(bounced_loads);
 	map-dm_mapsize = buflen;
 	map-dm_nsegs = seg + 1;
 	map-_dm_vmspace = vm;
@@ -222,7 +258,7 @@
 
 	/* ...so _bus_dmamap_sync() knows we're bouncing */
 	cookie-id_flags |= _BUS_DMA_IS_BOUNCING;
-	return (error);
+	return 0;
 }
 #endif /* _MIPS_NEED_BUS_DMA_BOUNCE */
 
@@ -292,8 +328,10 @@
 	if (map-_dm_bounce_thresh != 0)
 		cookieflags |= _BUS_DMA_MIGHT_NEED_BOUNCE;
 
-	if ((cookieflags  _BUS_DMA_MIGHT_NEED_BOUNCE) == 0)
+	if ((cookieflags  _BUS_DMA_MIGHT_NEED_BOUNCE) == 0) {
+		STAT_INCR(creates);
 		return 0;
+	}
 
 	cookiesize = sizeof(struct mips_bus_dma_cookie) +
 	(sizeof(bus_dma_segment_t) * map-_dm_segcnt);
@@ -308,11 +346,14 @@
 	cookie = (struct mips_bus_dma_cookie *)cookiestore;
 	cookie-id_flags = cookieflags;
 	map-_dm_cookie = cookie;
+	STAT_INCR(bounced_creates);
 
 	error = _bus_dma_alloc_bouncebuf(t, map, size, flags);
  out:
 	if (error)
 		_bus_dmamap_destroy(t, map);
+#else
+	STAT_INCR(creates);
 #endif /* _MIPS_NEED_BUS_DMA_BOUNCE */
 
 	return (error);
@@ -333,12 +374,18 @@
 	 * Free any bounce pages this map might hold.
 	 */
 	if (cookie != NULL) {
+		if (cookie-id_flags  _BUS_DMA_IS_BOUNCING)
+			STAT_INCR(bounced_unloads);
+		map-dm_nsegs = 0;
 		if (cookie-id_flags  _BUS_DMA_HAS_BOUNCE)
 			_bus_dma_free_bouncebuf(t, map);
+		STAT_INCR(bounced_destroys);
 		free(cookie, M_DMAMAP);
-	}
+	} else
 #endif
-
+	STAT_INCR(destroys);
+	if (map-dm_nsegs  0)
+		STAT_INCR(unloads);
 	free(map, M_DMAMAP);
 }
 
@@ -356,6 +403,19 @@
 	int seg, error;
 	struct vmspace *vm;
 
+	if (map-dm_nsegs  0) {
+#ifdef _MIPS_NEED_BUS_DMA_BOUNCE
+		struct mips_bus_dma_cookie *cookie = map-_dm_cookie;
+		if (cookie != NULL) {
+			if (cookie-id_flags  _BUS_DMA_IS_BOUNCING) {
+

CVS commit: src/usr.bin/ftp

[Luke Mewburn]

Module Name:src
Committed By:   lukem
Date:   Tue Jan 12 06:50:05 UTC 2010

Modified Files:
src/usr.bin/ftp: cmds.c

Log Message:
rename argument from bool to val


To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/usr.bin/ftp/cmds.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/ftp/cmds.c
diff -u src/usr.bin/ftp/cmds.c:1.130 src/usr.bin/ftp/cmds.c:1.131
--- src/usr.bin/ftp/cmds.c:1.130	Mon Jul 13 19:05:41 2009
+++ src/usr.bin/ftp/cmds.c	Tue Jan 12 06:50:04 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmds.c,v 1.130 2009/07/13 19:05:41 roy Exp $	*/
+/*	$NetBSD: cmds.c,v 1.131 2010/01/12 06:50:04 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
 #if 0
 static char sccsid[] = @(#)cmds.c	8.6 (Berkeley) 10/9/94;
 #else
-__RCSID($NetBSD: cmds.c,v 1.130 2009/07/13 19:05:41 roy Exp $);
+__RCSID($NetBSD: cmds.c,v 1.131 2010/01/12 06:50:04 lukem Exp $);
 #endif
 #endif /* not lint */
 
@@ -779,10 +779,10 @@
 }
 
 const char *
-onoff(int bool)
+onoff(int val)
 {
 
-	return (bool ? on : off);
+	return (val ? on : off);
 }
 
 /*

CVS commit: othersrc/usr.bin/tnftp/src

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 06:55:47 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp/src: cmds.c

Log Message:
rename argument bool to val


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 othersrc/usr.bin/tnftp/src/cmds.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/src/cmds.c
diff -u othersrc/usr.bin/tnftp/src/cmds.c:1.16 othersrc/usr.bin/tnftp/src/cmds.c:1.17
--- othersrc/usr.bin/tnftp/src/cmds.c:1.16	Sun Nov 15 10:12:37 2009
+++ othersrc/usr.bin/tnftp/src/cmds.c	Tue Jan 12 06:55:47 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmds.c,v 1.16 2009/11/15 10:12:37 lukem Exp $	*/
+/*	$NetBSD: cmds.c,v 1.17 2010/01/12 06:55:47 lukem Exp $	*/
 /*	from	NetBSD: cmds.c,v 1.130 2009/07/13 19:05:41 roy Exp	*/
 
 /*-
@@ -786,10 +786,10 @@
 }
 
 const char *
-onoff(int bool)
+onoff(int val)
 {
 
-	return (bool ? on : off);
+	return (val ? on : off);
 }
 
 /*

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 06:57:31 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
tnftp 20100108:
* Use sysconf(_SC_ARG_MAX) if ARG_MAX isn't defined.
* Fix LIBADD for libedit.
* Fix make dist.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.21 othersrc/usr.bin/tnftp/configure.ac:1.22
--- othersrc/usr.bin/tnftp/configure.ac:1.21	Wed Dec 30 00:03:25 2009
+++ othersrc/usr.bin/tnftp/configure.ac	Tue Jan 12 06:57:31 2010
@@ -1,15 +1,15 @@
-#   $NetBSD: configure.ac,v 1.21 2009/12/30 00:03:25 lukem Exp $
+#   $NetBSD: configure.ac,v 1.22 2010/01/12 06:57:31 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([tnftp], [20091122], [lu...@netbsd.org])
+AC_INIT([tnftp], [20100108], [lu...@netbsd.org])
 AC_PREREQ([2.61])
 
 AC_COPYRIGHT([
-Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
+Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.21 $])
+AC_REVISION([$Revision: 1.22 $])
 
 AS_SHELL_SANITIZE
 

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 06:58:57 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog

Log Message:
release as tnftp 20100108
onoff() rename bool argument


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 othersrc/usr.bin/tnftp/ChangeLog

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.57 othersrc/usr.bin/tnftp/ChangeLog:1.58
--- othersrc/usr.bin/tnftp/ChangeLog:1.57	Tue Jan  5 09:15:33 2010
+++ othersrc/usr.bin/tnftp/ChangeLog	Tue Jan 12 06:58:57 2010
@@ -1,11 +1,17 @@
-$NetBSD: ChangeLog,v 1.57 2010/01/05 09:15:33 lukem Exp $
+$NetBSD: ChangeLog,v 1.58 2010/01/12 06:58:57 lukem Exp $
+
+Tue Jan 12 06:58:15 UTC 2010	lukem
+
+	* Release as tnftp 20100108
+
+	* Rename onoff() argument bool to val.
 
 Tue Jan  5 09:12:01 UTC 2010	lukem
 
 	* If ARG_MAX isn't defined, use the result from sysconf(_SC_ARG_MAX).
 	  Fixes build when using newer glibc.
 
-	* Add libnetbsd.la to the LIBADD.
+	* Add libnetbsd.la to the LIBADD for libedit.
 	  Fix provided by Adam Sampson.
 
 Mon Jan  4 06:28:07 UTC 2010	lukem

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 07:01:01 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: COPYING

Log Message:
crank copyright years


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 othersrc/usr.bin/tnftp/COPYING

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/COPYING
diff -u othersrc/usr.bin/tnftp/COPYING:1.6 othersrc/usr.bin/tnftp/COPYING:1.7
--- othersrc/usr.bin/tnftp/COPYING:1.6	Fri May 11 04:35:47 2007
+++ othersrc/usr.bin/tnftp/COPYING	Tue Jan 12 07:01:01 2010
@@ -1,6 +1,6 @@
-$NetBSD: COPYING,v 1.6 2007/05/11 04:35:47 lukem Exp $
+$NetBSD: COPYING,v 1.7 2010/01/12 07:01:01 lukem Exp $
 
-Copyright (c) 2001-2007 The NetBSD Foundation, Inc.
+Copyright (c) 2001-2010 The NetBSD Foundation, Inc.
 All rights reserved.
 
 This code is derived from software contributed to The NetBSD Foundation

CVS commit: othersrc/usr.bin/tnftp

[Luke Mewburn]

Module Name:othersrc
Committed By:   lukem
Date:   Tue Jan 12 07:01:24 UTC 2010

Modified Files:
othersrc/usr.bin/tnftp: configure

Log Message:
regen for tnftp 20100108


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 othersrc/usr.bin/tnftp/configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.35 othersrc/usr.bin/tnftp/configure:1.36
--- othersrc/usr.bin/tnftp/configure:1.35	Wed Dec 30 00:07:00 2009
+++ othersrc/usr.bin/tnftp/configure	Tue Jan 12 07:01:24 2010
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.ac Revision: 1.21 .
+# From configure.ac Revision: 1.22 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for tnftp 20091122.
+# Generated by GNU Autoconf 2.64 for tnftp 20100108.
 #
 # Report bugs to lu...@netbsd.org.
 #
@@ -13,7 +13,7 @@
 # gives unlimited permission to copy, distribute and modify it.
 #
 #
-# Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
+# Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 ##  ##
@@ -709,8 +709,8 @@
 # Identity of this package.
 PACKAGE_NAME='tnftp'
 PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20091122'
-PACKAGE_STRING='tnftp 20091122'
+PACKAGE_VERSION='20100108'
+PACKAGE_STRING='tnftp 20100108'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1444,7 +1444,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat _ACEOF
-\`configure' configures tnftp 20091122 to adapt to many kinds of systems.
+\`configure' configures tnftp 20100108 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1514,7 +1514,7 @@
 
 if test -n $ac_init_help; then
   case $ac_init_help in
- short | recursive ) echo Configuration of tnftp 20091122:;;
+ short | recursive ) echo Configuration of tnftp 20100108:;;
esac
   cat \_ACEOF
 
@@ -1630,7 +1630,7 @@
 test -n $ac_init_help  exit $ac_status
 if $ac_init_version; then
   cat \_ACEOF
-tnftp configure 20091122
+tnftp configure 20100108
 generated by GNU Autoconf 2.64
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1638,7 +1638,7 @@
 gives unlimited permission to copy, distribute and modify it.
 
 
-Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
+Copyright (c) 1999-2010 The NetBSD Foundation, Inc.
 All rights reserved.
 
 _ACEOF
@@ -2413,7 +2413,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tnftp $as_me 20091122, which was
+It was created by tnftp $as_me 20100108, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   $ $0 $@
@@ -3368,7 +3368,7 @@
 
 # Define the identity of the package.
  PACKAGE='tnftp'
- VERSION='20091122'
+ VERSION='20100108'
 
 
 cat confdefs.h _ACEOF
@@ -22496,7 +22496,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log=
-This file was extended by tnftp $as_me 20091122, which was
+This file was extended by tnftp $as_me 20100108, which was
 generated by GNU Autoconf 2.64.  Invocation command line was
 
   CONFIG_FILES= $CONFIG_FILES
@@ -22560,7 +22560,7 @@
 _ACEOF
 cat $CONFIG_STATUS _ACEOF || ac_write_fail=1
 ac_cs_version=\\
-tnftp config.status 20091122
+tnftp config.status 20100108
 configured by $0, generated by GNU Autoconf 2.64,
   with options \\`$as_echo $ac_configure_args | sed 's/^ //; s/[\\\`\$]//g'`\\