CVS commit: src/sbin/atactl

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Mon Sep 21 06:05:00 UTC 2015

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
add smart IDs 210, 246, 247 and 248 (Micron):
+   { 210,  "Successful RAIN Recovery Count", NULL },
+   { 246,  "Total Host Sector Writes", NULL },
+   { 247,  "Contact Factory (Micron)", NULL },
+   { 248,  "Contact Factory (Micron)", NULL },

(eek i hope 247 and 248 don't move.)


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sbin/atactl/atactl.c

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

Modified files:

Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.74 src/sbin/atactl/atactl.c:1.75
--- src/sbin/atactl/atactl.c:1.74	Wed Oct 15 06:54:04 2014
+++ src/sbin/atactl/atactl.c	Mon Sep 21 06:05:00 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: atactl.c,v 1.74 2014/10/15 06:54:04 mrg Exp $	*/
+/*	$NetBSD: atactl.c,v 1.75 2015/09/21 06:05:00 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: atactl.c,v 1.74 2014/10/15 06:54:04 mrg Exp $");
+__RCSID("$NetBSD: atactl.c,v 1.75 2015/09/21 06:05:00 mrg Exp $");
 #endif
 
 
@@ -315,6 +315,7 @@ static const struct {
 	{ 207,		"Spin high current", NULL },
 	{ 208,		"Spin buzz", NULL },
 	{ 209,		"Offline seek performance", NULL },
+	{ 210,		"Successful RAIN Recovery Count", NULL },
 	{ 220,		"Disk shift", NULL },
 	{ 221,		"G-Sense error rate", NULL },
 	{ 222,		"Loaded hours", NULL },
@@ -331,6 +332,9 @@ static const struct {
 	{ 240,		"Head flying hours", NULL },
 	{ 241,		"Total LBAs Written", NULL },
 	{ 242,		"Total LBAs Read", NULL },
+	{ 246,		"Total Host Sector Writes", NULL },
+	{ 247,		"Contact Factory (Micron)", NULL },
+	{ 248,		"Contact Factory (Micron)", NULL },
 	{ 250,		"Read error retry rate", NULL },
 	{ 254,		"Free Fall Sensor", NULL },
 	{   0,		"Unknown", NULL },

CVS commit: [nick-nhusb] src/sys/arch

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Sep 21 07:14:16 UTC 2015

Modified Files:
src/sys/arch/amd64/conf [nick-nhusb]: GENERIC
src/sys/arch/i386/conf [nick-nhusb]: GENERIC

Log Message:
Enable xhci(4)


To generate a diff of this commit:
cvs rdiff -u -r1.404.2.2 -r1.404.2.3 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1118.2.2 -r1.1118.2.3 src/sys/arch/i386/conf/GENERIC

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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.404.2.2 src/sys/arch/amd64/conf/GENERIC:1.404.2.3
--- src/sys/arch/amd64/conf/GENERIC:1.404.2.2	Sat Jun  6 14:39:54 2015
+++ src/sys/arch/amd64/conf/GENERIC	Mon Sep 21 07:14:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.404.2.2 2015/06/06 14:39:54 skrll Exp $
+# $NetBSD: GENERIC,v 1.404.2.3 2015/09/21 07:14:16 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.404.2.2 $"
+#ident 		"GENERIC-$Revision: 1.404.2.3 $"
 
 maxusers	64		# estimated number of users
 
@@ -844,7 +844,7 @@ urlphy* at mii? phy ?			# Realtek RTL815
 # USB Controller and Devices
 
 # PCI USB controllers
-# xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
+xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
 	# xhci is at best experimental
 ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
 ohci*	at pci?	dev ? function ?	# Open Host Controller
@@ -862,7 +862,7 @@ uhci*	at cardbus? function ?		# Universa
 slhci*	at pcmcia? function ?		# ScanLogic SL811HS
 
 # USB bus support
-# usb*	at xhci?
+usb*	at xhci?
 usb*	at ehci?
 usb*	at ohci?
 usb*	at uhci?

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1118.2.2 src/sys/arch/i386/conf/GENERIC:1.1118.2.3
--- src/sys/arch/i386/conf/GENERIC:1.1118.2.2	Sat Jun  6 14:40:00 2015
+++ src/sys/arch/i386/conf/GENERIC	Mon Sep 21 07:14:16 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1118.2.2 2015/06/06 14:40:00 skrll Exp $
+# $NetBSD: GENERIC,v 1.1118.2.3 2015/09/21 07:14:16 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1118.2.2 $"
+#ident 		"GENERIC-$Revision: 1.1118.2.3 $"
 
 maxusers	64		# estimated number of users
 
@@ -1144,7 +1144,7 @@ urlphy* at mii? phy ?			# Realtek RTL815
 # USB Controller and Devices
 
 # PCI USB controllers
-# xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
+xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
 	# xhci is at best experimental
 ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
 gcscehci* at pci? dev ? function ?	# Enhanced Host Controller (Geode CSC)
@@ -1163,7 +1163,7 @@ uhci*	at cardbus? function ?		# Universa
 slhci*	at pcmcia? function ?		# ScanLogic SL811HS
 
 # USB bus support
-# usb*	at xhci?
+usb*	at xhci?
 usb*	at ehci?
 usb*	at gcscehci?
 usb*	at ohci?

CVS commit: src/usr.sbin/memswitch

[Tetsuya Isaki]

Module Name:src
Committed By:   isaki
Date:   Mon Sep 21 08:04:43 UTC 2015

Modified Files:
src/usr.sbin/memswitch: properties.c

Log Message:
Fix typo.  display.contrast is 0-15, not 0-1.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/memswitch/properties.c

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

Modified files:

Index: src/usr.sbin/memswitch/properties.c
diff -u src/usr.sbin/memswitch/properties.c:1.4 src/usr.sbin/memswitch/properties.c:1.5
--- src/usr.sbin/memswitch/properties.c:1.4	Mon Apr 28 20:24:17 2008
+++ src/usr.sbin/memswitch/properties.c	Mon Sep 21 08:04:43 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: properties.c,v 1.4 2008/04/28 20:24:17 martin Exp $	*/
+/*	$NetBSD: properties.c,v 1.5 2015/09/21 08:04:43 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@ struct property properties[] = {
 	{
 		"display", "contrast",
 		40, 1, 0, {byte:{[0] 0}}, 0, {byte:{[0] 0}}, {byte:{[0] 14}},
-		parse_uchar, 0, 1,
+		parse_uchar, 0, 15,
 		print_uchar,
 		fill_uchar, flush_uchar,
 		" Display contrast (0-15).\n"

CVS commit: src/share/man/man7

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Sep 22 00:10:12 UTC 2015

Modified Files:
src/share/man/man7: module.7

Log Message:
Tweaks from Michael McConville - thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/module.7

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

Modified files:

Index: src/share/man/man7/module.7
diff -u src/share/man/man7/module.7:1.3 src/share/man/man7/module.7:1.4
--- src/share/man/man7/module.7:1.3	Thu Jun 30 20:09:15 2011
+++ src/share/man/man7/module.7	Tue Sep 22 00:10:12 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: module.7,v 1.3 2011/06/30 20:09:15 wiz Exp $
+.\" $NetBSD: module.7,v 1.4 2015/09/22 00:10:12 pgoyette Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -35,11 +35,11 @@
 .Sh DESCRIPTION
 Kernel modules allow the system administrator to
 dynamically add and remove functionality from a running system.
-This ability also helps software developers to develop
+This also helps software developers add
 new parts of the kernel without constantly rebooting to
 test their changes.
 .Pp
-Additionally, the kernel may automatically load software modules as
+The kernel may automatically load software modules as
 needed to perform requested operations.
 For example, an
 .Dq xyzfs
@@ -80,11 +80,11 @@ One potential problem specific to block 
 is that the device nodes must exist for the devices to be accessed.
 These need to be created manually, after the driver module has been
 successfully loaded.
-The majority of the device driver modules however does not
+Most device driver modules do not
 need any manual intervention to function properly.
 .Ss Execution Interpreters
 Execution Interpreters can be loaded to provide support for executing
-binaries not normally supported by kernel.
+binaries not normally supported by the kernel.
 This also allows loading
 support for executing foreign system binaries.
 Execution Interpreters may require that an appropriate
@@ -99,16 +99,15 @@ An example of a "miscellaneous module" m
 card-specific VGA drivers or alternate terminal emulations in
 an appropriately layered console driver.
 .Ss Security-Model modules
-Alternate system security models may loaded using the
-.Nm
-facility.
+Alternate system security models also may be loaded using
+.Nm .
 .Sh EXAMPLES
 The common build tool of
 .Nx ,
 .Dq build.sh ,
 automatically compiles and installs all
 modules during a full system build and install.
-Sometimes it is however useful to update only modules.
+However, sometimes it is useful to update only modules.
 The following example demonstrates one way to do this.
 It is assumed that the source code is under
 .Pa /usr/src ,
@@ -187,13 +186,14 @@ It may be a good practice to maintain a 
 in the root file system for recovery purposes.
 .Sh SECURITY CONSIDERATIONS
 A module becomes part of the kernel once loaded.
-Compared to userland programs, all errors in the code can be fatal.
+Unlike in userland programs, fatal errors in kernel modules
+may crash the operating system.
 There is no memory protection between modules and the rest of the kernel.
 Hence, a potential attacker with access to the
 .Xr modctl 2
-system call can acquire complete and total control over the system.
+system call can acquire total control over the system.
 .Pp
-To avoid associated security risks, new modules can only be loaded when
+To avoid such security risks, new modules can only be loaded when
 .Pa securelevel
 is less than or equal to zero, or if the kernel was built with
 .Cd options INSECURE .

CVS commit: src/sys/arch/arm/omap

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Sep 21 13:32:48 UTC 2015

Modified Files:
src/sys/arch/arm/omap: omapl1x_emac.c

Log Message:
Deal with unused variables


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/omap/omapl1x_emac.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/arm/omap/omapl1x_emac.c
diff -u src/sys/arch/arm/omap/omapl1x_emac.c:1.1 src/sys/arch/arm/omap/omapl1x_emac.c:1.2
--- src/sys/arch/arm/omap/omapl1x_emac.c:1.1	Wed Oct  2 16:48:26 2013
+++ src/sys/arch/arm/omap/omapl1x_emac.c	Mon Sep 21 13:32:48 2015
@@ -30,7 +30,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_emac.c,v 1.1 2013/10/02 16:48:26 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_emac.c,v 1.2 2015/09/21 13:32:48 skrll Exp $");
 
 #include "opt_omapl1x.h"
 
@@ -621,7 +621,7 @@ emac_rx_desc_process (struct emac_softc 
 	bus_addr_t desc_offset;
 	struct mbuf *mb;
 	bus_addr_t desc_base;
-	u_int buf_len, off;
+	u_int buf_len;
 
 	if ((entry = SIMPLEQ_FIRST(>inuse_head)) == NULL) {
 		return ENOENT;
@@ -646,7 +646,7 @@ emac_rx_desc_process (struct emac_softc 
 			 "Received packet spanning multiple buffers\n");
 	}
 
-	off = __SHIFTOUT(desc->len, (uint32_t)__BITS(26, 16));
+	//off = __SHIFTOUT(desc->len, (uint32_t)__BITS(26, 16));
 	buf_len = __SHIFTOUT(desc->mode, (uint32_t)__BITS(10,  0));
 
 	if (desc->mode & PASSCRC)
@@ -782,7 +782,6 @@ emac_soft_intr (void *arg)
 	struct emac_softc * const sc = arg;
 	struct ifnet * const ifp = >sc_if;
 	u_int soft_flags = atomic_swap_uint(>sc_soft_flags, 0);
-	u_int tx_pkts_freed, rx_pkts_freed;
 
 	if (soft_flags & SOFT_RESET) {
 		int s = splnet();
@@ -797,15 +796,13 @@ emac_soft_intr (void *arg)
 
 	/* We are working on channel 0 */
 	if (mask & TX0PEND) {
-		tx_pkts_freed = emac_free_descs(sc, >tx_chan,
-		EMAC_TX_DESC_FREE);
+		emac_free_descs(sc, >tx_chan, EMAC_TX_DESC_FREE);
 	}
 
 	EMAC_WRITE(sc, MACEOIVECTOR, C0TXDONE);
 
 	if (mask & RX0PEND) {
-		rx_pkts_freed = emac_free_descs(sc, >rx_chan,
-		EMAC_RX_DESC_FREE);
+		emac_free_descs(sc, >rx_chan, EMAC_RX_DESC_FREE);
 	}
 
 	EMAC_WRITE(sc, MACEOIVECTOR, C0RXDONE);

CVS commit: src/sys/netinet

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Sep 21 13:32:26 UTC 2015

Modified Files:
src/sys/netinet: in_selsrc.c

Log Message:
Make this compile again


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/in_selsrc.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/netinet/in_selsrc.c
diff -u src/sys/netinet/in_selsrc.c:1.15 src/sys/netinet/in_selsrc.c:1.16
--- src/sys/netinet/in_selsrc.c:1.15	Mon Aug 31 08:02:44 2015
+++ src/sys/netinet/in_selsrc.c	Mon Sep 21 13:32:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: in_selsrc.c,v 1.15 2015/08/31 08:02:44 ozaki-r Exp $	*/
+/*	$NetBSD: in_selsrc.c,v 1.16 2015/09/21 13:32:26 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2005 David Young.  All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.15 2015/08/31 08:02:44 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.16 2015/09/21 13:32:26 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -312,7 +312,7 @@ in_getifa(struct ifaddr *ifa, const stru
 
 	ifp = ifa->ifa_ifp;
 	KASSERT(ifp->if_afdata[AF_INET] != NULL);
-	isc = ifp->if_afdata[AF_INET]->ii_selsrc;
+	isc = ((struct in_ifinfo *)(ifp)->if_afdata[AF_INET])->ii_selsrc;
 	if (isc != NULL && isc->isc_selsrc != NULL &&
 	isc->isc_selsrc->iss_score_src[0] != NULL)
 		iss = isc->isc_selsrc;

CVS commit: src/sys

[NONAKA Kimihiro]

Module Name:src
Committed By:   nonaka
Date:   Mon Sep 21 12:32:06 UTC 2015

Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: GENERIC
src/sys/dev/acpi: files.acpi
Added Files:
src/sys/dev/acpi: valz_acpi.c

Log Message:
PR/50261: Added newer Toshiba hotkeys support.


To generate a diff of this commit:
cvs rdiff -u -r1.416 -r1.417 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1126 -r1.1127 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r0 -r1.5 src/sys/dev/acpi/valz_acpi.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/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.416 src/sys/arch/amd64/conf/GENERIC:1.417
--- src/sys/arch/amd64/conf/GENERIC:1.416	Thu Aug 27 14:04:07 2015
+++ src/sys/arch/amd64/conf/GENERIC	Mon Sep 21 12:32:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.416 2015/08/27 14:04:07 nonaka Exp $
+# $NetBSD: GENERIC,v 1.417 2015/09/21 12:32:06 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.416 $"
+#ident 		"GENERIC-$Revision: 1.417 $"
 
 maxusers	64		# estimated number of users
 
@@ -325,6 +325,7 @@ wsmouse*	at spic?		# mouse
 thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
 #tpm*		at acpi?		# ACPI TPM (Experimental)
 ug*		at acpi?		# Abit uGuru Hardware monitor
+valz*		at acpi?		# Toshiba Dynabook hotkeys
 wb*		at acpi?		# Winbond W83L518D SD/MMC reader
 sdmmc*		at wb?			# SD/MMC bus
 wmidell*	at acpiwmibus?		# Dell WMI mappings

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1126 src/sys/arch/i386/conf/GENERIC:1.1127
--- src/sys/arch/i386/conf/GENERIC:1.1126	Thu Aug 27 14:04:07 2015
+++ src/sys/arch/i386/conf/GENERIC	Mon Sep 21 12:32:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1126 2015/08/27 14:04:07 nonaka Exp $
+# $NetBSD: GENERIC,v 1.1127 2015/09/21 12:32:06 nonaka Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1126 $"
+#ident 		"GENERIC-$Revision: 1.1127 $"
 
 maxusers	64		# estimated number of users
 
@@ -375,6 +375,7 @@ thinkpad*	at acpi?		# IBM/Lenovo Thinkpa
 #tpm*		at acpi?		# ACPI TPM (Experimental)
 ug*		at acpi?		# Abit uGuru Hardware monitor
 vald*		at acpi?		# Toshiba Libretto hotkeys
+valz*		at acpi?		# Toshiba Dynabook hotkeys
 wb*		at acpi?		# Winbond W83L518D SD/MMC reader
 sdmmc*		at wb?			# SD/MMC bus
 wmidell*	at acpiwmibus?		# Dell WMI mappings

Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.95 src/sys/dev/acpi/files.acpi:1.96
--- src/sys/dev/acpi/files.acpi:1.95	Sun Sep 14 19:54:05 2014
+++ src/sys/dev/acpi/files.acpi	Mon Sep 21 12:32:06 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpi,v 1.95 2014/09/14 19:54:05 mrg Exp $
+#	$NetBSD: files.acpi,v 1.96 2015/09/21 12:32:06 nonaka Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
@@ -169,6 +169,11 @@ device	vald
 attach	vald at acpinodebus with vald_acpi
 file	dev/acpi/vald_acpi.c		vald_acpi
 
+# Toshiba Dynabook hotkeys
+device	valz
+attach	valz at acpinodebus with valz_acpi
+file	dev/acpi/valz_acpi.c		valz_acpi
+
 # Sony SPIC (jog dial etc.)
 attach	spic at acpinodebus with spic_acpi
 file	dev/acpi/spic_acpi.c		spic_acpi

Added files:

Index: src/sys/dev/acpi/valz_acpi.c
diff -u /dev/null src/sys/dev/acpi/valz_acpi.c:1.5
--- /dev/null	Mon Sep 21 12:32:06 2015
+++ src/sys/dev/acpi/valz_acpi.c	Mon Sep 21 12:32:06 2015
@@ -0,0 +1,643 @@
+/*	$NetBSD: valz_acpi.c,v 1.5 2015/09/21 12:32:06 nonaka Exp $	*/
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Masanori Kanaoka.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES 

CVS commit: src/sys/arch/mips/atheros/dev

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Sep 21 10:10:19 UTC 2015

Modified Files:
src/sys/arch/mips/atheros/dev: ehci_arbus.c

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/atheros/dev/ehci_arbus.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/atheros/dev/ehci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.4 src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.5
--- src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.4	Fri Sep 11 06:55:45 2015
+++ src/sys/arch/mips/atheros/dev/ehci_arbus.c	Mon Sep 21 10:10:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci_arbus.c,v 1.4 2015/09/11 06:55:45 skrll Exp $	*/
+/*	$NetBSD: ehci_arbus.c,v 1.5 2015/09/21 10:10:19 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.4 2015/09/11 06:55:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.5 2015/09/21 10:10:19 skrll Exp $");
 
 #include "locators.h"
 
@@ -66,7 +66,7 @@ static void	ehci_arbus_attach(device_t, 
 CFATTACH_DECL_NEW(ehci_arbus, sizeof (ehci_softc_t),
 ehci_arbus_match, ehci_arbus_attach, NULL, NULL);
 
-static void ehci_arbus_init(struct ehci_soft *);
+static void ehci_arbus_init(struct ehci_softc *);
 
 int
 ehci_arbus_match(device_t parent, cfdata_t cf, void *aux)

CVS commit: othersrc/external/bsd/arfe

[David Young]

Module Name:othersrc
Committed By:   dyoung
Date:   Tue Sep 22 01:12:09 UTC 2015

Modified Files:
othersrc/external/bsd/arfe/dt: Makefile README dt.c hex.c hex.h ipv4.c
ipv4.h macaddr.c
othersrc/external/bsd/arfe/it: Makefile README
othersrc/external/bsd/arfe/tt: Makefile README
Added Files:
othersrc/external/bsd/arfe/dt: core.c core.h
othersrc/external/bsd/arfe/it: it.c
othersrc/external/bsd/arfe/tt: tt.c
Removed Files:
othersrc/external/bsd/arfe/dt: dt.h

Log Message:
Give dt, it, and tt custom main() routines instead of using a bunch
of conditionals.  Put the core algorithms and data structures into
core.[ch].  Retire dt.h (it became core.h).  Update Makefiles to suit
and alphabetize SRCS.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/arfe/dt/Makefile \
othersrc/external/bsd/arfe/dt/hex.c othersrc/external/bsd/arfe/dt/hex.h \
othersrc/external/bsd/arfe/dt/ipv4.c othersrc/external/bsd/arfe/dt/ipv4.h
cvs rdiff -u -r1.8 -r1.9 othersrc/external/bsd/arfe/dt/README
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/dt/core.c \
othersrc/external/bsd/arfe/dt/core.h
cvs rdiff -u -r1.12 -r1.13 othersrc/external/bsd/arfe/dt/dt.c
cvs rdiff -u -r1.4 -r0 othersrc/external/bsd/arfe/dt/dt.h
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/arfe/dt/macaddr.c
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/arfe/it/Makefile
cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/arfe/it/README
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/it/it.c
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/tt/Makefile
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/arfe/tt/README
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/tt/tt.c

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

Modified files:

Index: othersrc/external/bsd/arfe/dt/Makefile
diff -u othersrc/external/bsd/arfe/dt/Makefile:1.4 othersrc/external/bsd/arfe/dt/Makefile:1.5
--- othersrc/external/bsd/arfe/dt/Makefile:1.4	Fri Sep 11 01:50:42 2015
+++ othersrc/external/bsd/arfe/dt/Makefile	Tue Sep 22 01:12:09 2015
@@ -1,9 +1,9 @@
-# $ARFE: Makefile 239 2015-09-10 22:49:40Z dyoung $
+# $ARFE: Makefile 250 2015-09-22 01:04:13Z dyoung $
 NOMAN=
 .include 
 
 PROG=dt
-SRCS+=dt.c hex.c ipv4.c macaddr.c
+SRCS+=core.c dt.c hex.c ipv4.c macaddr.c
 #CPPFLAGS+=-DHB_DEBUG
 CPPFLAGS+=-DHB_ASSERT
 DBG+=-g -O3
Index: othersrc/external/bsd/arfe/dt/hex.c
diff -u othersrc/external/bsd/arfe/dt/hex.c:1.4 othersrc/external/bsd/arfe/dt/hex.c:1.5
--- othersrc/external/bsd/arfe/dt/hex.c:1.4	Mon Sep 14 02:58:17 2015
+++ othersrc/external/bsd/arfe/dt/hex.c	Tue Sep 22 01:12:09 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: hex.c,v 1.4 2015/09/14 02:58:17 dyoung Exp $ */
-/* $ARFE: hex.c 245 2015-09-11 02:13:21Z dyoung $ */
+/* $NetBSD: hex.c,v 1.5 2015/09/22 01:12:09 dyoung Exp $ */
+/* $ARFE: hex.c 251 2015-09-22 01:09:13Z dyoung $ */
 
 /*-
  * Copyright (c) 2014,2015 David Young 
@@ -30,7 +30,7 @@
 #include 
 #include 
 
-#include "dt.h"
+#include "core.h"
 #include "hex.h"
 
 typedef enum hex_op {
Index: othersrc/external/bsd/arfe/dt/hex.h
diff -u othersrc/external/bsd/arfe/dt/hex.h:1.4 othersrc/external/bsd/arfe/dt/hex.h:1.5
--- othersrc/external/bsd/arfe/dt/hex.h:1.4	Mon Sep 14 02:58:17 2015
+++ othersrc/external/bsd/arfe/dt/hex.h	Tue Sep 22 01:12:09 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: hex.h,v 1.4 2015/09/14 02:58:17 dyoung Exp $ */
-/* $ARFE: hex.h 245 2015-09-11 02:13:21Z dyoung $ */
+/* $NetBSD: hex.h,v 1.5 2015/09/22 01:12:09 dyoung Exp $ */
+/* $ARFE: hex.h 251 2015-09-22 01:09:13Z dyoung $ */
 
 /*-
  * Copyright (c) 2014,2015 David Young 
Index: othersrc/external/bsd/arfe/dt/ipv4.c
diff -u othersrc/external/bsd/arfe/dt/ipv4.c:1.4 othersrc/external/bsd/arfe/dt/ipv4.c:1.5
--- othersrc/external/bsd/arfe/dt/ipv4.c:1.4	Mon Sep 14 02:58:17 2015
+++ othersrc/external/bsd/arfe/dt/ipv4.c	Tue Sep 22 01:12:09 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: ipv4.c,v 1.4 2015/09/14 02:58:17 dyoung Exp $ */
-/* $ARFE: ipv4.c 247 2015-09-14 02:52:57Z dyoung $ */
+/* $NetBSD: ipv4.c,v 1.5 2015/09/22 01:12:09 dyoung Exp $ */
+/* $ARFE: ipv4.c 251 2015-09-22 01:09:13Z dyoung $ */
 
 /*-
  * Copyright (c) 2014,2015 David Young 
@@ -33,7 +33,7 @@
 
 #include 	/* for __predict_true() */
 
-#include "dt.h"
+#include "core.h"
 #include "ipv4.h"
 
 typedef enum ipv4_op {
Index: othersrc/external/bsd/arfe/dt/ipv4.h
diff -u othersrc/external/bsd/arfe/dt/ipv4.h:1.4 othersrc/external/bsd/arfe/dt/ipv4.h:1.5
--- othersrc/external/bsd/arfe/dt/ipv4.h:1.4	Mon Sep 14 02:58:17 2015
+++ othersrc/external/bsd/arfe/dt/ipv4.h	Tue Sep 22 01:12:09 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: ipv4.h,v 1.4 2015/09/14 02:58:17 dyoung Exp $ */
-/* $ARFE: ipv4.h 245 2015-09-11 02:13:21Z dyoung $ */
+/* $NetBSD: ipv4.h,v 1.5 2015/09/22 01:12:09 dyoung Exp $ */
+/* $ARFE: ipv4.h 251 2015-09-22 01:09:13Z dyoung $ */
 
 /*-
  * 

CVS commit: src/sys/arch/sandpoint/conf

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Sep 21 23:34:21 UTC 2015

Modified Files:
src/sys/arch/sandpoint/conf: KUROBOX

Log Message:
Remove erroneously entered debug options.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sandpoint/conf/KUROBOX

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/sandpoint/conf/KUROBOX
diff -u src/sys/arch/sandpoint/conf/KUROBOX:1.6 src/sys/arch/sandpoint/conf/KUROBOX:1.7
--- src/sys/arch/sandpoint/conf/KUROBOX:1.6	Mon Sep 21 23:31:41 2015
+++ src/sys/arch/sandpoint/conf/KUROBOX	Mon Sep 21 23:34:21 2015
@@ -1,17 +1,10 @@
-#	$NetBSD: KUROBOX,v 1.6 2015/09/21 23:31:41 phx Exp $
+#	$NetBSD: KUROBOX,v 1.7 2015/09/21 23:34:21 phx Exp $
 #
 # KuroBox/LinkStation support
 #
 
 include "arch/sandpoint/conf/GENERIC"
 
-options 	DIAGNOSTIC  # cheap kernel consistency checks
-options 	DEBUG   # expensive debugging checks/support
-makeoptions	DEBUG="-g"
-
-options		NOR_DEBUG
-options		NOR_VERBOSE
-
 no com0
 no satmgr0
 com0	at eumb? unit 1			# console at 0x4600

CVS commit: src/sys/arch/sandpoint/conf

[Frank Wille]

Module Name:src
Committed By:   phx
Date:   Mon Sep 21 23:31:41 UTC 2015

Modified Files:
src/sys/arch/sandpoint/conf: GENERIC KUROBOX

Log Message:
double vlan pseudo-device removed


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/conf/KUROBOX

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/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.89 src/sys/arch/sandpoint/conf/GENERIC:1.90
--- src/sys/arch/sandpoint/conf/GENERIC:1.89	Mon Sep  7 23:01:08 2015
+++ src/sys/arch/sandpoint/conf/GENERIC	Mon Sep 21 23:31:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.89 2015/09/07 23:01:08 phx Exp $
+# $NetBSD: GENERIC,v 1.90 2015/09/21 23:31:41 phx Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@ include 	"arch/sandpoint/conf/std.sandpo
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.89 $"
+#ident 		"GENERIC-$Revision: 1.90 $"
 
 maxusers	32
 
@@ -323,7 +323,6 @@ pseudo-device	bpfilter		# packet filter
 #pseudo-device	pf			# PF packet filter
 #pseudo-device	pflog			# PF log if
 #pseudo-device	sl			# Serial Line IP
-#pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	tun			# network tunneling over tty
 #pseudo-device	tap			# virtual Ethernet
 #pseudo-device	gre			# generic L3 over IP tunnel

Index: src/sys/arch/sandpoint/conf/KUROBOX
diff -u src/sys/arch/sandpoint/conf/KUROBOX:1.5 src/sys/arch/sandpoint/conf/KUROBOX:1.6
--- src/sys/arch/sandpoint/conf/KUROBOX:1.5	Sat May 12 10:27:17 2012
+++ src/sys/arch/sandpoint/conf/KUROBOX	Mon Sep 21 23:31:41 2015
@@ -1,10 +1,17 @@
-#	$NetBSD: KUROBOX,v 1.5 2012/05/12 10:27:17 nisimura Exp $
+#	$NetBSD: KUROBOX,v 1.6 2015/09/21 23:31:41 phx Exp $
 #
 # KuroBox/LinkStation support
 #
 
 include "arch/sandpoint/conf/GENERIC"
 
+options 	DIAGNOSTIC  # cheap kernel consistency checks
+options 	DEBUG   # expensive debugging checks/support
+makeoptions	DEBUG="-g"
+
+options		NOR_DEBUG
+options		NOR_VERBOSE
+
 no com0
 no satmgr0
 com0	at eumb? unit 1			# console at 0x4600

CVS commit: src/sys/arch/arm/at91

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Sep 21 13:31:30 UTC 2015

Modified Files:
src/sys/arch/arm/at91: at91dbgu.c at91emac.c

Log Message:
Deal with unused variable warnings


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/at91/at91dbgu.c \
src/sys/arch/arm/at91/at91emac.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/arm/at91/at91dbgu.c
diff -u src/sys/arch/arm/at91/at91dbgu.c:1.14 src/sys/arch/arm/at91/at91dbgu.c:1.15
--- src/sys/arch/arm/at91/at91dbgu.c:1.14	Mon Apr 13 21:18:40 2015
+++ src/sys/arch/arm/at91/at91dbgu.c	Mon Sep 21 13:31:30 2015
@@ -1,5 +1,5 @@
-/*	$Id: at91dbgu.c,v 1.14 2015/04/13 21:18:40 riastradh Exp $	*/
-/*	$NetBSD: at91dbgu.c,v 1.14 2015/04/13 21:18:40 riastradh Exp $ */
+/*	$Id: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $	*/
+/*	$NetBSD: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $ */
 
 /*
  *
@@ -83,7 +83,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.14 2015/04/13 21:18:40 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.15 2015/09/21 13:31:30 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -910,7 +910,7 @@ at91dbgu_cn_getc(dev_t dev)
 	if (!db_active)
 #endif
 	{
-		int cn_trapped = 0; /* unused */
+		int cn_trapped __unused = 0;
 
 		cn_check_magic(dev, c, at91dbgu_cnm_state);
 	}
Index: src/sys/arch/arm/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.14 src/sys/arch/arm/at91/at91emac.c:1.15
--- src/sys/arch/arm/at91/at91emac.c:1.14	Wed May 20 09:17:17 2015
+++ src/sys/arch/arm/at91/at91emac.c	Mon Sep 21 13:31:30 2015
@@ -1,5 +1,5 @@
-/*	$Id: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $	*/
-/*	$NetBSD: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $	*/
+/*	$Id: at91emac.c,v 1.15 2015/09/21 13:31:30 skrll Exp $	*/
+/*	$NetBSD: at91emac.c,v 1.15 2015/09/21 13:31:30 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.14 2015/05/20 09:17:17 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91emac.c,v 1.15 2015/09/21 13:31:30 skrll Exp $");
 
 #include 
 #include 
@@ -224,7 +224,7 @@ emac_intr(void *arg)
 {
 	struct emac_softc *sc = (struct emac_softc *)arg;
 	struct ifnet * ifp = >sc_ec.ec_if;
-	uint32_t imr, isr, rsr, ctl;
+	uint32_t imr, isr, ctl;
 	int bi;
 
 	imr = ~EMAC_READ(ETH_IMR);
@@ -234,7 +234,10 @@ emac_intr(void *arg)
 	}
 
 	isr = EMAC_READ(ETH_ISR) & imr;
-	rsr = EMAC_READ(ETH_RSR);		// get receive status register
+#ifdef EMAC_DEBUG 
+	uint32_t rsr = 
+#endif
+	EMAC_READ(ETH_RSR);		// get receive status register
 
 	DPRINTFN(2, ("%s: isr=0x%08X rsr=0x%08X imr=0x%08X\n", __FUNCTION__, isr, rsr, imr));
 
@@ -519,9 +522,9 @@ emac_mediastatus(struct ifnet *ifp, stru
 int
 emac_mii_readreg(device_t self, int phy, int reg)
 {
-	struct emac_softc *sc;
-
-	sc = device_private(self);
+#ifndef EMAC_FAST
+	struct emac_softc *sc = device_private(self);
+#endif
 
 	EMAC_WRITE(ETH_MAN, (ETH_MAN_HIGH | ETH_MAN_RW_RD
 			 | ((phy << ETH_MAN_PHYA_SHIFT) & ETH_MAN_PHYA)
@@ -534,9 +537,9 @@ emac_mii_readreg(device_t self, int phy,
 void
 emac_mii_writereg(device_t self, int phy, int reg, int val)
 {
-	struct emac_softc *sc;
-
-	sc = device_private(self);
+#ifndef EMAC_FAST
+	struct emac_softc *sc = device_private(self);
+#endif
 
 	EMAC_WRITE(ETH_MAN, (ETH_MAN_HIGH | ETH_MAN_RW_WR
 			 | ((phy << ETH_MAN_PHYA_SHIFT) & ETH_MAN_PHYA)

CVS commit: [nick-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Sep 21 14:35:02 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdevs

Log Message:
Sync with HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.684.2.2 -r1.684.2.3 src/sys/dev/usb/usbdevs

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

Modified files:

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.684.2.2 src/sys/dev/usb/usbdevs:1.684.2.3
--- src/sys/dev/usb/usbdevs:1.684.2.2	Sat Jun  6 14:40:14 2015
+++ src/sys/dev/usb/usbdevs	Mon Sep 21 14:35:02 2015
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.684.2.2 2015/06/06 14:40:14 skrll Exp $
+$NetBSD: usbdevs,v 1.684.2.3 2015/09/21 14:35:02 skrll Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -591,7 +591,6 @@ vendor NETGEAR4		0x9846	Netgear
 vendor xxFTDI		0x9e88  FTDI
 vendor CACE		0xcace	CACE Technologies
 vendor COMPARE		0xcdab	Compare
-vendor EMPIA		0xeb1a	eMPIA Technology
 vendor DATAAPEX		0xdaae	DataApex
 vendor EVOLUTION	0xdeee	Evolution Robotics
 vendor EMPIA		0xeb1a	eMPIA Technology
@@ -914,7 +913,9 @@ product ASUSTEK RT3070		0x1784	RT3070
 product ASUSTEK USBN10		0x1786	USB-N10
 product ASUSTEK RT3070_1	0x1790	RT3070
 product ASUSTEK RTL8192SU_1	0x1791	RTL8192SU
+product ASUSTEK USBN53		0x179d	USB-N53
 product ASUSTEK RTL8192CU	0x17ab	RTL8192CU
+product ASUSTEK USBN66		0x17ad	USB-N66
 product ASUSTEK USBN10NANO	0x17ba	USB-N10 Nano
 product ASUSTEK RTL8192CU_3	0x17c0	RTL8192CU_3
 product ASUSTEK MYPAL_A730	0x4202	MyPal A730
@@ -1215,7 +1216,7 @@ product COREGA RT2870_1		0x002f	RT2870
 product COREGA RT2870_2		0x003c	RT2870
 product COREGA RT2870_3		0x003f	RT2870
 product COREGA RT3070		0x0041	RT3070
-product COREGA RTL8192SU	0x0047	RTL8192SU
+product COREGA CGWLUSBNM	0x0047	CG-WLUSBNM
 product COREGA RTL8192CU	0x0056	RTL8192CU
 product COREGA CGWLUSB300GNM	0x0042	CG-WLUSB300GNM
 product COREGA WLUSB_11_STICK	0x7613	WLAN USB Stick 11
@@ -1353,12 +1354,13 @@ product DLINK DWLAG122		0x3a04	DWL-AG122
 product DLINK DWLAG122_NF	0x3a05	DWL-AG122
 product DLINK DWLG122		0x3c00	AirPlus G Wireless USB Adapter
 /* product DLINK RT2570		0x3c00	RT2570 */
-product DLINK2 DWLG122C1	0x3c03	DWL-G122 rev C1
-product DLINK2 WUA1340		0x3c04	WUA-1340
 product DLINK DUBE100B1		0x3c05	DUB-E100 rev B1
-product DLINK2 DWA111		0x3c06	DWA-111
 product DLINK RT2870		0x3c09	RT2870
 product DLINK RT3072		0x3c0a	RT3072
+product DLINK DWA140B3		0x3c15	DWA-140 rev B3
+product DLINK DWA160B2		0x3c1a	DWA-160 rev B2
+product DLINK DWA127		0x3c1b	DWA-127
+product DLINK DWA162		0x3c1f	DWA-162 Wireless Adapter
 product DLINK DSB650C		0x4000	10Mbps ethernet adapter
 product DLINK DSB650TX1		0x4001	10/100 ethernet adapter
 product DLINK DSB650TX		0x4002	10/100 ethernet adapter
@@ -1979,8 +1981,9 @@ product LACIE HD		0xa601	Hard Disk
 product LACIE CDRW		0xa602	CD R/W
 
 /* Lenovo products */
-product LENOVO ETHERNET		0x7203	USB 2.0 Ethernet
 product LENOVO AX88179		0x304b	AX88179 USB 3.0 gigabit ethernet controller
+product LENOVO COMPACTKBDWTP	0x6047	ThinkPad Compact USB keyboard with TrackPoint
+product LENOVO ETHERNET		0x7203	USB 2.0 Ethernet
 
 /* Lexar products */
 product LEXAR JUMPSHOT		0x0001	jumpSHOT CompactFlash Reader
@@ -2027,6 +2030,7 @@ product LOGITEC RT2870_2	0x0163	RT2870
 product LOGITEC RT2870_3	0x0164	RT2870
 product LOGITEC LANW300NU2	0x0166	LAN-W300N/U2
 product LOGITEC RT3020		0x0168	RT3020
+product LOGITEC LANW300NU2S	0x0169	LAN-W300N/U2S
 product LOGITEC LAN_W450ANU2E	0x016b	LAN-W450ANU2E
 product LOGITEC LAN_W300ANU2	0x0170	LAN-W300AN/U2
 
@@ -2476,6 +2480,7 @@ product PANASONIC KXLRW32AN	0x0d09	CD-R 
 product PANASONIC KXLCB20AN	0x0d0a	CD-R Drive KXL-CB20AN
 product PANASONIC KXLCB35AN	0x0d0e	DVD-ROM & CD-R/RW
 product PANASONIC SDCAAE	0x1b00	MultiMediaCard Adapter
+product PANASONIC DMCFS45	0x2372	Lumix Camera DMC-FS45
 product PANASONIC TYTP50P6S	0x3900	TY-TP50P6-S 50in Touch Panel
 
 /* PARA Industrial products */
@@ -2677,7 +2682,9 @@ product RALINK RT3071		0x3071	RT3071
 product RALINK RT3072		0x3072	RT3072
 product RALINK RT3370		0x3370	RT3370
 product RALINK RT3572		0x3572	RT3572
+product RALINK RT3573		0x3573	RT3573
 product RALINK RT5370		0x5370	RT5370
+product RALINK RT5572		0x5572	RT5572
 product RALINK MT7610U		0x7610	MT7610U
 product RALINK RT8070		0x8070	RT8070
 product RALINK RT2570_3		0x9020	RT2570
@@ -2976,6 +2983,7 @@ product SITECOMEU WL353		0x0045	WL-353
 product SITECOMEU RT3072_3	0x0047	RT3072
 product SITECOMEU RT3072_4	0x0048	RT3072
 product SITECOMEU WL349V1	0x004b	WL-349 v1
+product SITECOMEU RT3072_6	0x004d	RT3072
 product SITECOMEU WL349V4	0x0050	WL-349 v4
 product SITECOMEU RT3070_1	0x0051	RT3070
 product SITECOMEU RTL8188CU	0x0052	RTL8188CU
@@ -3428,7 +3436,6 @@ product ZYDAS ZD1211B_2		0xb215	ZD1211B
 /* ZyXEL Communication Co. products */
 product ZYXEL OMNI56K		0x1500	Omni 56K Plus
 product ZYXEL 980N		0x2011	Scorpion-980N keyboard
-product ZYXEL 

CVS commit: src

[Antti Kantee]

Module Name:src
Committed By:   pooka
Date:   Mon Sep 21 21:50:16 UTC 2015

Modified Files:
src/lib/librumpuser: rumpuser_port.h
src/tools/compat: compat_defs.h
src/usr.bin/make: make.h

Log Message:
Add more compat defs for code compiled for !NetBSD targets.

At least GNU Hurd lacks MAXHOSTNAMELEN/MAXPATHLEN/PATH_MAX, so make sure
those have some arbitrary semi-sane values.

from Robert Millan in PR misc/50166, with some modifications from myself


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/lib/librumpuser/rumpuser_port.h
cvs rdiff -u -r1.102 -r1.103 src/tools/compat/compat_defs.h
cvs rdiff -u -r1.95 -r1.96 src/usr.bin/make/make.h

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_port.h
diff -u src/lib/librumpuser/rumpuser_port.h:1.45 src/lib/librumpuser/rumpuser_port.h:1.46
--- src/lib/librumpuser/rumpuser_port.h:1.45	Sun Aug 16 11:37:39 2015
+++ src/lib/librumpuser/rumpuser_port.h	Mon Sep 21 21:50:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpuser_port.h,v 1.45 2015/08/16 11:37:39 pooka Exp $	*/
+/*	$NetBSD: rumpuser_port.h,v 1.46 2015/09/21 21:50:16 pooka Exp $	*/
 
 #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
 #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_
@@ -314,4 +314,16 @@ do {		\
 #define setprogname(a)
 #endif
 
+/* at least GNU Hurd does not specify various common hardcoded constants */
+#include 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN	4096
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX	MAXPATHLEN
+#endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN	256
+#endif
+
 #endif /* _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ */

Index: src/tools/compat/compat_defs.h
diff -u src/tools/compat/compat_defs.h:1.102 src/tools/compat/compat_defs.h:1.103
--- src/tools/compat/compat_defs.h:1.102	Sun Jul 26 14:01:53 2015
+++ src/tools/compat/compat_defs.h	Mon Sep 21 21:50:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_defs.h,v 1.102 2015/07/26 14:01:53 kamil Exp $	*/
+/*	$NetBSD: compat_defs.h,v 1.103 2015/09/21 21:50:16 pooka Exp $	*/
 
 #ifndef	__NETBSD_COMPAT_DEFS_H__
 #define	__NETBSD_COMPAT_DEFS_H__
@@ -910,6 +910,13 @@ void *setmode(const char *);
 #define LLONG_MIN ((long long)(~LLONG_MAX))
 #endif
 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN	4096
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX	MAXPATHLEN
+#endif
+
 /*  */
 
 /* The host's _PATH_BSHELL might be broken, so override it. */
@@ -1149,6 +1156,9 @@ __GEN_ENDIAN_DEC(64, le)
 #ifndef MAXPHYS
 #define MAXPHYS (64 * 1024)
 #endif
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN	256
+#endif
 
 /* XXX needed by makefs; this should be done in a better way */
 #undef btodb

Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.95 src/usr.bin/make/make.h:1.96
--- src/usr.bin/make/make.h:1.95	Sun Sep  7 20:55:34 2014
+++ src/usr.bin/make/make.h	Mon Sep 21 21:50:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: make.h,v 1.95 2014/09/07 20:55:34 joerg Exp $	*/
+/*	$NetBSD: make.h,v 1.96 2015/09/21 21:50:16 pooka Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -503,4 +503,13 @@ int str2Lst_Append(Lst, char *, const ch
 #define MAX(a, b) ((a > b) ? a : b)
 #endif
 
+/* At least GNU/Hurd systems lack hardcoded MAXPATHLEN/PATH_MAX */
+#include 
+#ifndef MAXPATHLEN
+#define MAXPATHLEN	4096
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX	MAXPATHLEN
+#endif
+
 #endif /* _MAKE_H_ */