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

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 23:39:28 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_com.c amlogic_comreg.h

Log Message:
UART TTY support.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_com.c \
src/sys/arch/arm/amlogic/amlogic_comreg.h

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

Modified files:

Index: src/sys/arch/arm/amlogic/amlogic_com.c
diff -u src/sys/arch/arm/amlogic/amlogic_com.c:1.2 src/sys/arch/arm/amlogic/amlogic_com.c:1.3
--- src/sys/arch/arm/amlogic/amlogic_com.c:1.2	Fri Feb 27 17:35:08 2015
+++ src/sys/arch/arm/amlogic/amlogic_com.c	Sun Mar  1 23:39:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_com.c,v 1.2 2015/02/27 17:35:08 jmcneill Exp $ */
+/* $NetBSD: amlogic_com.c,v 1.3 2015/03/01 23:39:28 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,15 +33,22 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: amlogic_com.c,v 1.2 2015/02/27 17:35:08 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: amlogic_com.c,v 1.3 2015/03/01 23:39:28 jmcneill Exp $);
+
+#define AMLOGIC_COM_INTRPOLL
+#define AMLOGIC_COM_INTRPOLL_RATE	10
 
 #include sys/param.h
 #include sys/bus.h
 #include sys/device.h
+#include sys/conf.h
 #include sys/intr.h
 #include sys/systm.h
 #include sys/time.h
 #include sys/termios.h
+#include sys/kauth.h
+#include sys/lwp.h
+#include sys/tty.h
 
 #include dev/cons.h
 
@@ -50,32 +57,80 @@ __KERNEL_RCSID(1, $NetBSD: amlogic_com.
 #include arm/amlogic/amlogic_comreg.h
 #include arm/amlogic/amlogic_comvar.h
 
-static int amlogic_com_match(device_t, cfdata_t, void *);
-static void amlogic_com_attach(device_t, device_t, void *);
+static int	amlogic_com_match(device_t, cfdata_t, void *);
+static void	amlogic_com_attach(device_t, device_t, void *);
+
+static int	amlogic_com_intr(void *);
+
+#ifdef AMLOGIC_COM_INTRPOLL
+static void	amlogic_com_intrpoll(void *);
+#endif
+
+static int	amlogic_com_cngetc(dev_t);
+static void	amlogic_com_cnputc(dev_t, int);
+static void	amlogic_com_cnpollc(dev_t, int);
+
+static void	amlogic_com_start(struct tty *);
+static int	amlogic_com_param(struct tty *, struct termios *);
+
+extern struct cfdriver amlogiccom_cd;
 
 struct amlogic_com_softc {
 	device_t sc_dev;
 	bus_space_tag_t	sc_bst;
 	bus_space_handle_t sc_bsh;
+	void *sc_ih;
+
+	struct tty *sc_tty;
 
 	int sc_ospeed;
 	tcflag_t sc_cflag;
+
+	u_char sc_buf[1024];
+
+#ifdef AMLOGIC_COM_INTRPOLL
+	callout_t sc_intrpoll_ch;
+#endif
 };
 
 static struct amlogic_com_softc amlogic_com_cnsc;
 
 static struct cnm_state amlogic_com_cnm_state;
 
-static int	amlogic_com_cngetc(dev_t);
-static void	amlogic_com_cnputc(dev_t, int);
-static void	amlogic_com_cnpollc(dev_t, int);
-
 struct consdev amlogic_com_consdev = {
 	.cn_getc = amlogic_com_cngetc,
 	.cn_putc = amlogic_com_cnputc,
 	.cn_pollc = amlogic_com_cnpollc,
+	.cn_dev = NODEV,
+	.cn_pri = CN_NORMAL,
 };
 
+static dev_type_open(amlogic_com_open);
+static dev_type_open(amlogic_com_close);
+static dev_type_read(amlogic_com_read);
+static dev_type_write(amlogic_com_write);
+static dev_type_ioctl(amlogic_com_ioctl);
+static dev_type_tty(amlogic_com_tty);
+static dev_type_poll(amlogic_com_poll);
+static dev_type_stop(amlogic_com_stop);
+
+const struct cdevsw amlogiccom_cdevsw = {
+	.d_open = amlogic_com_open,
+	.d_close = amlogic_com_close,
+	.d_read = amlogic_com_read,
+	.d_write = amlogic_com_write,
+	.d_ioctl = amlogic_com_ioctl,
+	.d_stop = amlogic_com_stop,
+	.d_tty = amlogic_com_tty,
+	.d_poll = amlogic_com_poll,
+	.d_mmap = nommap,
+	.d_kqfilter = ttykqfilter,
+	.d_discard = nodiscard,
+	.d_flag = D_TTY
+};
+
+static int amlogic_com_cmajor = -1;
+
 CFATTACH_DECL_NEW(amlogic_com, sizeof(struct amlogic_com_softc),
 	amlogic_com_match, amlogic_com_attach, NULL, NULL);
 
@@ -92,17 +147,82 @@ amlogic_com_attach(device_t parent, devi
 	struct amlogicio_attach_args * const aio = aux;
 	const struct amlogic_locators * const loc = aio-aio_loc;
 	const bus_addr_t iobase = AMLOGIC_CORE_BASE + loc-loc_offset;
+	struct tty *tp;
+	int major, minor;
+	uint32_t misc, control;
 
 	sc-sc_dev = self;
 	sc-sc_bst = aio-aio_core_bst;
-	sc-sc_bsh = aio-aio_bsh;
+	bus_space_subregion(aio-aio_core_bst, aio-aio_bsh,
+	loc-loc_offset, loc-loc_size, sc-sc_bsh);
+
+#ifdef AMLOGIC_COM_INTRPOLL
+	callout_init(sc-sc_intrpoll_ch, CALLOUT_MPSAFE);
+	callout_setfunc(sc-sc_intrpoll_ch, amlogic_com_intrpoll, sc);
+#else
+	sc-sc_ih = intr_establish(loc-loc_intr, IPL_SERIAL,
+	IST_EDGE | IST_MPSAFE, amlogic_com_intr, sc);
+	if (sc-sc_ih == NULL) {
+		aprint_error(: failed to establish interrupt %d\n,
+		loc-loc_intr);
+		return;
+	}
+#endif
+
+	if (amlogic_com_cmajor == -1) {
+		/* allocate a major number */
+		int bmajor = -1, cmajor = -1;
+		int error = devsw_attach(amlogiccom, NULL, bmajor,
+		amlogiccom_cdevsw, cmajor);
+		if (error) {
+			aprint_error(: couldn't

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

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 23:39:28 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_com.c amlogic_comreg.h

Log Message:
UART TTY support.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_com.c \
src/sys/arch/arm/amlogic/amlogic_comreg.h

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

Re: CVS commit: src/usr.bin/sed

2015-03-01 Thread Warner Losh 

 On Mar 1, 2015, at 8:45 AM, Aleksej Saushev a...@inbox.ru wrote:
 
 chris...@astron.com (Christos Zoulas) writes:
 
 In article 20150228215653.f2f0...@cvs.netbsd.org,
 Aleksej Saushev source-changes-d@NetBSD.org wrote:
 -=-=-=-=-=-
 
 Module Name:src
 Committed By:   asau
 Date:   Sat Feb 28 21:56:53 UTC 2015
 
 Modified Files:
 src/usr.bin/sed: compile.c extern.h main.c process.c
 
 Log Message:
 Improve modularity of sed source:
 - move program source input subroutines into compiler part;
 - move data I/O subroutines into processor part.
 
 It there a good reason for that? We try to keep it synced with FreeBSD..
 
 It makes code a lot cleaner and allows embedding it.
 
 If that's problem, I'll submit changes to FreeBSD.

Sounds like a good idea to me…

Warner


signature.asc
Description: Message signed with OpenPGP using GPGMail

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:00:57 UTC 2015

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/dev/usb/ehci.c

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

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:00:57 UTC 2015

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.235 src/sys/dev/usb/ehci.c:1.236
--- src/sys/dev/usb/ehci.c:1.235	Wed Dec 24 14:01:10 2014
+++ src/sys/dev/usb/ehci.c	Sun Mar  1 08:00:57 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.235 2014/12/24 14:01:10 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.236 2015/03/01 08:00:57 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.235 2014/12/24 14:01:10 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.236 2015/03/01 08:00:57 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -1077,11 +1077,11 @@ ehci_idone(struct ehci_xfer *ex)
 	if (status  EHCI_QTD_HALTED) {
 #ifdef EHCI_DEBUG
 		USBHIST_LOG(ehcidebug, halted addr=%d endpt=0x%02x,
-		   xfer-pipe-device-address,
-		   xfer-pipe-endpoint-edesc-bEndpointAddress, 0, 0);
+		xfer-pipe-device-address,
+		xfer-pipe-endpoint-edesc-bEndpointAddress, 0, 0);
 		USBHIST_LOG(ehcidebug, cerr=%d pid=%d stat=%#x,
-		   EHCI_QTD_GET_CERR(status), EHCI_QTD_GET_PID(status),
-		   status, 0);
+		EHCI_QTD_GET_CERR(status), EHCI_QTD_GET_PID(status),
+		status, 0);
 		USBHIST_LOG(ehcidebug,
 		active =%d halted=%d buferr=%d babble=%d,
 		status  EHCI_QTD_ACTIVE ? 1 : 0,
@@ -1671,7 +1671,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
 	USBHIST_LOGN(ehcidebug, 10,
 	addr = 0x%02x  inact = %d  endpt = %d  eps = %d,
 	EHCI_QH_GET_ADDR(endp), EHCI_QH_GET_INACT(endp),
-	EHCI_QH_GET_ENDPT(endp),  EHCI_QH_GET_EPS(endp));
+	EHCI_QH_GET_ENDPT(endp), EHCI_QH_GET_EPS(endp));
 	USBHIST_LOGN(ehcidebug, 10,
 	dtc  = %d hrecl = %d,
 	EHCI_QH_GET_DTC(endp), EHCI_QH_GET_HRECL(endp), 0, 0);

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:17:45 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.31 -r1.234.2.32 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.31 src/sys/dev/usb/ehci.c:1.234.2.32
--- src/sys/dev/usb/ehci.c:1.234.2.31	Sun Feb 22 08:59:17 2015
+++ src/sys/dev/usb/ehci.c	Sun Mar  1 08:17:45 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.31 2015/02/22 08:59:17 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.32 2015/03/01 08:17:45 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.31 2015/02/22 08:59:17 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.32 2015/03/01 08:17:45 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -1180,11 +1180,11 @@ ehci_idone(struct ehci_xfer *ex)
 	if (status  EHCI_QTD_HALTED) {
 #ifdef EHCI_DEBUG
 		USBHIST_LOG(ehcidebug, halted addr=%d endpt=0x%02x,
-		   xfer-ux_pipe-up_dev-ud_addr,
-		   xfer-ux_pipe-up_endpoint-ue_edesc-bEndpointAddress, 0, 0);
-		USBHIST_LOG(ehcidebug, cerr=%d pid=%d stat=%#x,
-		   EHCI_QTD_GET_CERR(status), EHCI_QTD_GET_PID(status),
-		   status, 0);
+		xfer-ux_pipe-up_dev-ud_addr,
+		xfer-ux_pipe-up_endpoint-ue_edesc-bEndpointAddress, 0, 0);
+		USBHIST_LOG(ehcidebug, cerr=%d pid=%d,
+		EHCI_QTD_GET_CERR(status), EHCI_QTD_GET_PID(status),
+		0, 0);
 		USBHIST_LOG(ehcidebug,
 		active =%d halted=%d buferr=%d babble=%d,
 		status  EHCI_QTD_ACTIVE ? 1 : 0,
@@ -1743,7 +1743,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
 	USBHIST_LOGN(ehcidebug, 10,
 	addr = 0x%02x  inact = %d  endpt = %d  eps = %d,
 	EHCI_QH_GET_ADDR(endp), EHCI_QH_GET_INACT(endp),
-	EHCI_QH_GET_ENDPT(endp),  EHCI_QH_GET_EPS(endp));
+	EHCI_QH_GET_ENDPT(endp), EHCI_QH_GET_EPS(endp));
 	USBHIST_LOGN(ehcidebug, 10,
 	dtc  = %d hrecl = %d,
 	EHCI_QH_GET_DTC(endp), EHCI_QH_GET_HRECL(endp), 0, 0);

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:17:45 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.31 -r1.234.2.32 src/sys/dev/usb/ehci.c

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

CVS commit: xsrc/external/mit/xf86-video-ati-kms/include

2015-03-01 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar  1 10:29:27 UTC 2015

Added Files:
xsrc/external/mit/xf86-video-ati-kms/include: config.h

Log Message:
add generated config.h for xf86-video-ati 7.5.0.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xf86-video-ati-kms/include/config.h

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

Added files:

Index: xsrc/external/mit/xf86-video-ati-kms/include/config.h
diff -u /dev/null xsrc/external/mit/xf86-video-ati-kms/include/config.h:1.1
--- /dev/null	Sun Mar  1 10:29:28 2015
+++ xsrc/external/mit/xf86-video-ati-kms/include/config.h	Sun Mar  1 10:29:27 2015
@@ -0,0 +1,121 @@
+/* config.h.  Generated from config.h.in by configure.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+#include xorg-server.h
+
+/* Define to 1 if you have the byteswap.h header file. */
+/* #undef HAVE_BYTESWAP_H */
+
+/* Define to 1 if you have the dlfcn.h header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the glamor.h header file. */
+/* #undef HAVE_GLAMOR_H */
+
+/* Define to 1 if you have the inttypes.h header file. */
+#define HAVE_INTTYPES_H 1
+
+/* libudev support */
+/* #undef HAVE_LIBUDEV */
+
+/* Define to 1 if you have the list.h header file. */
+#define HAVE_LIST_H 1
+
+/* Define to 1 if you have the memory.h header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the stdint.h header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the stdlib.h header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strings.h header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the string.h header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the sys/stat.h header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the sys/types.h header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the unistd.h header file. */
+#define HAVE_UNISTD_H 1
+
+/* xextproto 7.1 available */
+#define HAVE_XEXTPROTO_71 1
+
+/* Have xorg_list API */
+/* #undef HAVE_XORG_LIST */
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR .libs/
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Name of package */
+#define PACKAGE xf86-video-ati
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT https://bugs.freedesktop.org/enter_bug.cgi?product=xorg;
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME xf86-video-ati
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING xf86-video-ati 7.5.0
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME xf86-video-ati
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL 
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION 7.5.0
+
+/* Major version of this package */
+#define PACKAGE_VERSION_MAJOR 7
+
+/* Minor version of this package */
+#define PACKAGE_VERSION_MINOR 5
+
+/* Patch version of this package */
+#define PACKAGE_VERSION_PATCHLEVEL 0
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Enable glamor acceleration */
+/* #undef USE_GLAMOR */
+
+/* Define to use byteswap macros from sys/endian.h */
+#define USE_SYS_ENDIAN_H 1
+
+/* Version number of package */
+#define VERSION 7.5.0
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to 16-bit byteswap macro */
+#define bswap_16 bswap16
+
+/* Define to 32-bit byteswap macro */
+#define bswap_32 bswap32
+
+/* Define to 64-bit byteswap macro */
+#define bswap_64 bswap64

CVS commit: xsrc/external/mit/xf86-video-ati-kms/include

2015-03-01 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar  1 10:29:27 UTC 2015

Added Files:
xsrc/external/mit/xf86-video-ati-kms/include: config.h

Log Message:
add generated config.h for xf86-video-ati 7.5.0.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 xsrc/external/mit/xf86-video-ati-kms/include/config.h

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

CVS commit: src/external/mit/xorg/server/drivers

2015-03-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  1 11:19:08 UTC 2015

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
fix the previous; it had a reversed test and was also missing bsd.own.mk
before checking MK* values.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/external/mit/xorg/server/drivers/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/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.64 src/external/mit/xorg/server/drivers/Makefile:1.65
--- src/external/mit/xorg/server/drivers/Makefile:1.64	Sun Mar  1 07:46:04 2015
+++ src/external/mit/xorg/server/drivers/Makefile	Sun Mar  1 11:19:08 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.64 2015/03/01 07:46:04 mrg Exp $
+#	$NetBSD: Makefile,v 1.65 2015/03/01 11:19:08 mrg Exp $
 
 # xf86-input drivers
 
@@ -19,14 +19,15 @@ SUBDIR+= \
 
 .endif
 
-
 # xf86-video drivers
 
+.include bsd.own.mk
+
 # Set this to no to build the UMS-happy 6.x driver, vs KMS 7.x
-.if ${MKX11RADEONKMS:U} != no
-RADEON_SUBDIR=radeon
-.else
+.if ${MKX11RADEONKMS} != no
 RADEON_SUBDIR=radeon-kms
+.else
+RADEON_SUBDIR=radeon
 .endif
 
 .if ${MACHINE_ARCH} == i386 || \

CVS commit: src/external/mit/xorg/server/drivers

2015-03-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  1 11:19:08 UTC 2015

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
fix the previous; it had a reversed test and was also missing bsd.own.mk
before checking MK* values.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/external/mit/xorg/server/drivers/Makefile

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

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:10:12 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c

Log Message:
Convert to USBHIST


To generate a diff of this commit:
cvs rdiff -u -r1.198.2.5 -r1.198.2.6 src/sys/dev/usb/usb_subr.c

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

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:10:57 UTC 2015

Modified Files:
src/sys/dev/usb: uhci.c

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/dev/usb/uhci.c

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

Modified files:

Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.264 src/sys/dev/usb/uhci.c:1.265
--- src/sys/dev/usb/uhci.c:1.264	Tue Aug  5 06:35:24 2014
+++ src/sys/dev/usb/uhci.c	Sun Mar  1 08:10:57 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.264 2014/08/05 06:35:24 skrll Exp $	*/
+/*	$NetBSD: uhci.c,v 1.265 2015/03/01 08:10:57 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.264 2014/08/05 06:35:24 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.265 2015/03/01 08:10:57 skrll Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -72,7 +72,6 @@ __KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.2
 /*#define UHCI_CTL_LOOP */
 
 
-
 #ifdef UHCI_DEBUG
 uhci_softc_t *thesc;
 #define DPRINTF(x)	if (uhcidebug) printf x

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:10:57 UTC 2015

Modified Files:
src/sys/dev/usb: uhci.c

Log Message:
Whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/dev/usb/uhci.c

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

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:26:55 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.33 -r1.234.2.34 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.33 src/sys/dev/usb/ehci.c:1.234.2.34
--- src/sys/dev/usb/ehci.c:1.234.2.33	Sun Mar  1 08:18:16 2015
+++ src/sys/dev/usb/ehci.c	Sun Mar  1 08:26:55 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.33 2015/03/01 08:18:16 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.34 2015/03/01 08:26:55 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.33 2015/03/01 08:18:16 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.34 2015/03/01 08:26:55 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -2841,7 +2841,7 @@ ehci_alloc_sqtd_chain(struct ehci_pipe *
 		}
 
 		/* Find number of pages we'll be using, insert dma addresses */
-		pages = EHCI_PAGE(curlen + EHCI_PAGE_SIZE -1)  12;
+		pages = EHCI_PAGE(curlen + EHCI_PAGE_SIZE - 1)  12;
 		KASSERT(pages = EHCI_QTD_NBUFFERS);
 		pageoffs = EHCI_PAGE(curoffs);
 		for (i = 0; i  pages; i++) {

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:26:55 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.33 -r1.234.2.34 src/sys/dev/usb/ehci.c

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

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:31:27 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: umass.c

Log Message:
KNF a comment


To generate a diff of this commit:
cvs rdiff -u -r1.149.2.4 -r1.149.2.5 src/sys/dev/usb/umass.c

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

Modified files:

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.149.2.4 src/sys/dev/usb/umass.c:1.149.2.5
--- src/sys/dev/usb/umass.c:1.149.2.4	Sat Dec  6 08:27:23 2014
+++ src/sys/dev/usb/umass.c	Sun Mar  1 08:31:27 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.149.2.4 2014/12/06 08:27:23 skrll Exp $	*/
+/*	$NetBSD: umass.c,v 1.149.2.5 2015/03/01 08:31:27 skrll Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.149.2.4 2014/12/06 08:27:23 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.149.2.5 2015/03/01 08:31:27 skrll Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_usb.h
@@ -586,9 +586,11 @@ umass_attach(device_t parent, device_t s
 			return;
 		}
 	}
-	/* Allocate buffer for data transfer (it's huge), command and
-	   status data here as auto allocation cannot happen in interrupt
-	   context */
+	/*
+	 * Allocate buffer for data transfer (it's huge), command and
+	 * status data here as auto allocation cannot happen in interrupt
+	 * context
+	 */
 	switch (sc-sc_wire) {
 	case UMASS_WPROTO_BBB:
 		sc-data_buffer = usbd_alloc_buffer(

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:31:27 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: umass.c

Log Message:
KNF a comment


To generate a diff of this commit:
cvs rdiff -u -r1.149.2.4 -r1.149.2.5 src/sys/dev/usb/umass.c

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

CVS commit: src/sys/external/bsd/drm2/radeon

2015-03-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  1 10:07:01 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/radeon: radeon_pci.c

Log Message:
fix some comments about the half-working i386 hack.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/radeon/radeon_pci.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/external/bsd/drm2/radeon/radeon_pci.c
diff -u src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.6 src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.7
--- src/sys/external/bsd/drm2/radeon/radeon_pci.c:1.6	Mon Feb 16 12:17:57 2015
+++ src/sys/external/bsd/drm2/radeon/radeon_pci.c	Sun Mar  1 10:07:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeon_pci.c,v 1.6 2015/02/16 12:17:57 mrg Exp $	*/
+/*	$NetBSD: radeon_pci.c,v 1.7 2015/03/01 10:07:01 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeon_pci.c,v 1.6 2015/02/16 12:17:57 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeon_pci.c,v 1.7 2015/03/01 10:07:01 mrg Exp $);
 
 #ifdef _KERNEL_OPT
 #include vga.h
@@ -82,7 +82,7 @@ struct radeon_softc {
 	}sc_task_u;
 	struct drm_device		*sc_drm_dev;
 	struct pci_dev			sc_pci_dev;
-#ifdef __i386__
+#if defined(__i386__)
 #define RADEON_PCI_UGLY_MAP_HACK
 	/* XXX Used to claim the VGA device before attach_real */
 	bus_space_handle_t		sc_temp_memh;
@@ -174,9 +174,10 @@ radeon_attach(device_t parent, device_t 
 #ifdef RADEON_PCI_UGLY_MAP_HACK
 	/*
 	 * XXX
-	 * We map the VGA registers, so that other driver don't
-	 * think they can.  This stops vga@isa or pcdisplay@isa
-	 * attaching, and stealing wsdisplay0.  Yuck.
+	 * We try to map the VGA registers, in case we can prevent vga@isa or
+	 * pcdisplay@isa attaching, and stealing wsdisplay0.  This only works
+	 * with serial console, as actual VGA console has already mapped them.
+	 * The only way to handle that is for vga@isa to not attach.
 	 */
 	int rv = bus_space_map(pa-pa_memt, 0xb, 0x1, 0,
 			   sc-sc_temp_memh);
@@ -204,7 +205,7 @@ radeon_attach_real(device_t self)
 #ifdef RADEON_PCI_UGLY_MAP_HACK
 	/*
 	 * XXX
-	 * Unmap the VGA registers so the DRM code can map them.
+	 * Unmap the VGA registers.
 	 */
 	if (sc-sc_temp_set)
 		bus_space_unmap(pa-pa_memt, sc-sc_temp_memh, 0x1);

CVS commit: src/sys/external/bsd/drm2/radeon

2015-03-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  1 10:07:01 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/radeon: radeon_pci.c

Log Message:
fix some comments about the half-working i386 hack.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/radeon/radeon_pci.c

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

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:03:35 UTC 2015

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Improve debug


To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/dev/usb/ehci.c

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

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:03:35 UTC 2015

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Improve debug


To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.236 src/sys/dev/usb/ehci.c:1.237
--- src/sys/dev/usb/ehci.c:1.236	Sun Mar  1 08:00:57 2015
+++ src/sys/dev/usb/ehci.c	Sun Mar  1 08:03:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.236 2015/03/01 08:00:57 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.237 2015/03/01 08:03:35 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.236 2015/03/01 08:00:57 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.237 2015/03/01 08:03:35 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -562,7 +562,9 @@ ehci_init(ehci_softc_t *sc)
 	usb_syncmem(sqh-dma, sqh-offs, sizeof(sqh-qh),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef EHCI_DEBUG
+	USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
+	USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
 #endif
 
 	/* Point to async list */
@@ -889,6 +891,12 @@ ehci_check_qh_intr(ehci_softc_t *sc, str
 		}
 		USBHIST_LOGN(ehcidebug, 10, ex=%p std=%p still active,
 		ex, ex-sqtdstart, 0, 0);
+#ifdef EHCI_DEBUG
+		USBHIST_LOGN(ehcidebug, 5, --- still active start ---, 0, 0, 0, 0);
+		ehci_dump_sqtds(ex-ex_sqtdstart);
+		USBHIST_LOGN(ehcidebug, 5, --- still active end ---, 0, 0, 0, 0);
+#endif
+
 		return;
 	}
  done:
@@ -1585,7 +1593,7 @@ ehci_dump_sqtds(ehci_soft_qtd_t *sqtd)
 		sqtd-offs + offsetof(ehci_qtd_t, qtd_next),
 		sizeof(sqtd-qtd), BUS_DMASYNC_PREREAD);
 	}
-	if (sqtd)
+	if (!stop)
 		USBHIST_LOG(ehcidebug,
 		dump aborted, too many TDs, 0, 0, 0, 0);
 }

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 09:53:36 UTC 2015

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Fix previous for HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/dev/usb/ehci.c

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

CVS commit: src/sys/dev/usb

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 09:53:36 UTC 2015

Modified Files:
src/sys/dev/usb: ehci.c

Log Message:
Fix previous for HEAD


To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.237 src/sys/dev/usb/ehci.c:1.238
--- src/sys/dev/usb/ehci.c:1.237	Sun Mar  1 08:03:35 2015
+++ src/sys/dev/usb/ehci.c	Sun Mar  1 09:53:36 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.237 2015/03/01 08:03:35 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.238 2015/03/01 09:53:36 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.237 2015/03/01 08:03:35 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.238 2015/03/01 09:53:36 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -893,7 +893,7 @@ ehci_check_qh_intr(ehci_softc_t *sc, str
 		ex, ex-sqtdstart, 0, 0);
 #ifdef EHCI_DEBUG
 		USBHIST_LOGN(ehcidebug, 5, --- still active start ---, 0, 0, 0, 0);
-		ehci_dump_sqtds(ex-ex_sqtdstart);
+		ehci_dump_sqtds(ex-sqtdstart);
 		USBHIST_LOGN(ehcidebug, 5, --- still active end ---, 0, 0, 0, 0);
 #endif

CVS commit: src/usr.bin/midirecord

2015-03-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  1 09:56:54 UTC 2015

Modified Files:
src/usr.bin/midirecord: midirecord.c

Log Message:
be explicit about stdout mode.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/midirecord/midirecord.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/midirecord/midirecord.c
diff -u src/usr.bin/midirecord/midirecord.c:1.6 src/usr.bin/midirecord/midirecord.c:1.7
--- src/usr.bin/midirecord/midirecord.c:1.6	Sat Jan  3 22:57:54 2015
+++ src/usr.bin/midirecord/midirecord.c	Sun Mar  1 09:56:54 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: midirecord.c,v 1.6 2015/01/03 22:57:54 joerg Exp $	*/
+/*	$NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $	*/
 
 /*
  * Copyright (c) 2014 Matthew R. Green
@@ -33,7 +33,7 @@
 #include sys/cdefs.h
 
 #ifndef lint
-__RCSID($NetBSD: midirecord.c,v 1.6 2015/01/03 22:57:54 joerg Exp $);
+__RCSID($NetBSD: midirecord.c,v 1.7 2015/03/01 09:56:54 mrg Exp $);
 #endif
 
 #include sys/param.h
@@ -74,6 +74,7 @@ static struct timeval start_time;
 static int	tempo = 120;
 static unsigned	notes_per_beat = 24;
 static bool ignore_timer_fail = false;
+static bool stdout_mode = false;
 
 static void debug_log(const char *, size_t, const char *, ...)
 __printflike(3, 4);
@@ -191,8 +192,10 @@ main(int argc, char *argv[])
 		outfd = open(*argv, mode, 0666);
 		if (outfd  0)
 			err(1, could not open %s, *argv);
-	} else
+	} else {
+		stdout_mode = true;
 		outfd = STDOUT_FILENO;
+	}
 
 	/* open the raw output file */
 	if (raw_output) {
@@ -711,7 +714,7 @@ rewrite_header(void)
 {
 
 	/* can't do this here! */
-	if (outfd == STDOUT_FILENO)
+	if (stdout_mode)
 		return;
 
 	if (lseek(outfd, (off_t)0, SEEK_SET) == (off_t)-1)
@@ -734,7 +737,7 @@ write_midi_header(void)
 		0, 0, /* ntracks */
 		0, 0, /* notes per beat */
 	};
-	/* XXX only spport one track so far */
+	/* XXX only support one track so far */
 	unsigned ntracks = 1;
 	unsigned char track[] = {
 		'M', 'T', 'r', 'k',

CVS commit: src/usr.bin/midirecord

2015-03-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sun Mar  1 09:56:54 UTC 2015

Modified Files:
src/usr.bin/midirecord: midirecord.c

Log Message:
be explicit about stdout mode.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/midirecord/midirecord.c

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

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:10:12 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: usb_subr.c

Log Message:
Convert to USBHIST


To generate a diff of this commit:
cvs rdiff -u -r1.198.2.5 -r1.198.2.6 src/sys/dev/usb/usb_subr.c

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

Modified files:

Index: src/sys/dev/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.198.2.5 src/sys/dev/usb/usb_subr.c:1.198.2.6
--- src/sys/dev/usb/usb_subr.c:1.198.2.5	Fri Dec  5 09:37:50 2014
+++ src/sys/dev/usb/usb_subr.c	Sun Mar  1 08:10:12 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: usb_subr.c,v 1.198.2.5 2014/12/05 09:37:50 skrll Exp $	*/
+/*	$NetBSD: usb_subr.c,v 1.198.2.6 2015/03/01 08:10:12 skrll Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $	*/
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.198.2.5 2014/12/05 09:37:50 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.198.2.6 2015/03/01 08:10:12 skrll Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_compat_netbsd.h
@@ -59,17 +59,12 @@ __KERNEL_RCSID(0, $NetBSD: usb_subr.c,v
 #include dev/usb/usbdevs.h
 #include dev/usb/usb_quirks.h
 #include dev/usb/usb_verbose.h
+#include dev/usb/usbhist.h
 
 #include locators.h
 
-#ifdef USB_DEBUG
-#define DPRINTF(x)	if (usbdebug) printf x
-#define DPRINTFN(n,x)	if (usbdebug(n)) printf x
-extern int usbdebug;
-#else
-#define DPRINTF(x)
-#define DPRINTFN(n,x)
-#endif
+#define	DPRINTF(FMT,A,B,C,D)	USBHIST_LOG(usbdebug,FMT,A,B,C,D)
+#define	DPRINTFN(N,FMT,A,B,C,D)	USBHIST_LOGN(usbdebug,N,FMT,A,B,C,D)
 
 Static usbd_status usbd_set_config(usbd_device_handle, int);
 Static void usbd_devinfo(usbd_device_handle, int, char *, size_t);
@@ -127,6 +122,8 @@ usbd_get_string_desc(usbd_device_handle 
 	usb_device_request_t req;
 	usbd_status err;
 	int actlen;
+	
+	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
 
 	req.bmRequestType = UT_READ_DEVICE;
 	req.bRequest = UR_GET_DESCRIPTOR;
@@ -148,8 +145,7 @@ usbd_get_string_desc(usbd_device_handle 
 		return err;
 
 	if (actlen != sdesc-bLength) {
-		DPRINTFN(-1, (usbd_get_string_desc: expected %d, got %d\n,
-		sdesc-bLength, actlen));
+		DPRINTF(expected %d, got %d, sdesc-bLength, actlen, 0, 0);
 	}
 
 	*sizep = actlen;
@@ -289,14 +285,15 @@ usbd_reset_port(usbd_device_handle dev, 
 	usbd_status err;
 	int n;
 
+	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
 	req.bmRequestType = UT_WRITE_CLASS_OTHER;
 	req.bRequest = UR_SET_FEATURE;
 	USETW(req.wValue, UHF_PORT_RESET);
 	USETW(req.wIndex, port);
 	USETW(req.wLength, 0);
 	err = usbd_do_request(dev, req, 0);
-	DPRINTFN(1,(usbd_reset_port: port %d reset done, error=%s\n,
-		port, usbd_errstr(err)));
+	DPRINTFN(1, port %d reset done, error=%d, port, err, 0, 0);
 	if (err)
 		return err;
 	n = 10;
@@ -305,8 +302,7 @@ usbd_reset_port(usbd_device_handle dev, 
 		usbd_delay_ms(dev, USB_PORT_RESET_DELAY);
 		err = usbd_get_port_status(dev, port, ps);
 		if (err) {
-			DPRINTF((usbd_reset_port: get status failed %d\n,
- err));
+			DPRINTF(get status failed %d, err, 0, 0, 0);
 			return err;
 		}
 		/* If the device disappeared, just give up. */
@@ -318,8 +314,7 @@ usbd_reset_port(usbd_device_handle dev, 
 	err = usbd_clear_port_feature(dev, port, UHF_C_PORT_RESET);
 #ifdef USB_DEBUG
 	if (err)
-		DPRINTF((usbd_reset_port: clear port feature failed %d\n,
-			 err));
+		DPRINTF(clear port feature failed %d, err, 0, 0, 0);
 #endif
 
 	/* Wait for the device to recover from reset. */
@@ -335,12 +330,14 @@ usbd_find_idesc(usb_config_descriptor_t 
 	usb_interface_descriptor_t *d;
 	int curidx, lastidx, curaidx = 0;
 
+	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
 	for (curidx = lastidx = -1; p  end; ) {
 		d = (usb_interface_descriptor_t *)p;
-		DPRINTFN(4,(usbd_find_idesc: idx=%d(%d) altidx=%d(%d) len=%d 
-			type=%d\n,
-			ifaceidx, curidx, altidx, curaidx,
-			d-bLength, d-bDescriptorType));
+		DPRINTFN(4, idx=%d(%d) altidx=%d(%d), ifaceidx, curidx,
+		altidx, curaidx);
+		DPRINTFN(4, len=%d type=%d, d-bLength, d-bDescriptorType,
+		0, 0);
 		if (d-bLength == 0) /* bad descriptor */
 			break;
 		p += d-bLength;
@@ -399,8 +396,9 @@ usbd_fill_iface_data(usbd_device_handle 
 	char *p, *end;
 	int endpt, nendpt;
 
-	DPRINTFN(4,(usbd_fill_iface_data: ifaceidx=%d altidx=%d\n,
-		ifaceidx, altidx));
+	USBHIST_FUNC(); USBHIST_CALLED(usbdebug);
+
+	DPRINTFN(4, ifaceidx=%d altidx=%d, ifaceidx, altidx, 0, 0);
 	idesc = usbd_find_idesc(dev-ud_cdesc, ifaceidx, altidx);
 	if (idesc == NULL)
 		return USBD_INVAL;
@@ -409,7 +407,7 @@ usbd_fill_iface_data(usbd_device_handle 
 	ifc-ui_index = ifaceidx;
 	ifc-ui_altindex = altidx;
 	nendpt = ifc-ui_idesc-bNumEndpoints;
-	DPRINTFN(4,(usbd_fill_iface_data: found idesc nendpt=%d\n, nendpt));
+	DPRINTFN(4, found idesc nendpt=%d, nendpt, 0, 0, 0);
 	if (nendpt != 0) {
 		ifc-ui_endpoints =

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:18:17 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Improve debug


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.32 -r1.234.2.33 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.32 src/sys/dev/usb/ehci.c:1.234.2.33
--- src/sys/dev/usb/ehci.c:1.234.2.32	Sun Mar  1 08:17:45 2015
+++ src/sys/dev/usb/ehci.c	Sun Mar  1 08:18:16 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.32 2015/03/01 08:17:45 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.33 2015/03/01 08:18:16 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.32 2015/03/01 08:17:45 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.33 2015/03/01 08:18:16 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -563,7 +563,9 @@ ehci_init(ehci_softc_t *sc)
 	usb_syncmem(sqh-dma, sqh-offs, sizeof(sqh-qh),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 #ifdef EHCI_DEBUG
+	USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
 	ehci_dump_sqh(sqh);
+	USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
 #endif
 
 	/* Point to async list */
@@ -892,6 +894,11 @@ ehci_check_qh_intr(ehci_softc_t *sc, str
 		}
 		USBHIST_LOGN(ehcidebug, 10, ex=%p std=%p still active,
 		ex, ex-ex_sqtdstart, 0, 0);
+#ifdef EHCI_DEBUG
+		USBHIST_LOGN(ehcidebug, 5, --- still active start ---, 0, 0, 0, 0);
+		ehci_dump_sqtds(ex-ex_sqtdstart);
+		USBHIST_LOGN(ehcidebug, 5, --- still active end ---, 0, 0, 0, 0);
+#endif
 		return;
 	}
  done:
@@ -1657,7 +1664,7 @@ ehci_dump_sqtds(ehci_soft_qtd_t *sqtd)
 		sqtd-offs + offsetof(ehci_qtd_t, qtd_next),
 		sizeof(sqtd-qtd), BUS_DMASYNC_PREREAD);
 	}
-	if (sqtd)
+	if (!stop)
 		USBHIST_LOG(ehcidebug,
 		dump aborted, too many TDs, 0, 0, 0, 0);
 }

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:18:17 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Improve debug


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.32 -r1.234.2.33 src/sys/dev/usb/ehci.c

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

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:33:16 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: umass.c

Log Message:
Use designated initializers


To generate a diff of this commit:
cvs rdiff -u -r1.149.2.5 -r1.149.2.6 src/sys/dev/usb/umass.c

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

Modified files:

Index: src/sys/dev/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.149.2.5 src/sys/dev/usb/umass.c:1.149.2.6
--- src/sys/dev/usb/umass.c:1.149.2.5	Sun Mar  1 08:31:27 2015
+++ src/sys/dev/usb/umass.c	Sun Mar  1 08:33:15 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.149.2.5 2015/03/01 08:31:27 skrll Exp $	*/
+/*	$NetBSD: umass.c,v 1.149.2.6 2015/03/01 08:33:15 skrll Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.149.2.5 2015/03/01 08:31:27 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.149.2.6 2015/03/01 08:33:15 skrll Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_usb.h
@@ -255,15 +255,15 @@ Static void umass_cbi_state(usbd_xfer_ha
 Static int umass_cbi_adsc(struct umass_softc *, char *, int, int, usbd_xfer_handle);
 
 const struct umass_wire_methods umass_bbb_methods = {
-	umass_bbb_transfer,
-	umass_bbb_reset,
-	umass_bbb_state
+	.wire_xfer = umass_bbb_transfer,
+	.wire_reset = umass_bbb_reset,
+	.wire_state = umass_bbb_state
 };
 
 const struct umass_wire_methods umass_cbi_methods = {
-	umass_cbi_transfer,
-	umass_cbi_reset,
-	umass_cbi_state
+	.wire_xfer = umass_cbi_transfer,
+	.wire_reset = umass_cbi_reset,
+	.wire_state = umass_cbi_state
 };
 
 #ifdef UMASS_DEBUG

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

2015-03-01 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sun Mar  1 08:33:16 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: umass.c

Log Message:
Use designated initializers


To generate a diff of this commit:
cvs rdiff -u -r1.149.2.5 -r1.149.2.6 src/sys/dev/usb/umass.c

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

CVS commit: src/sys/compat/linux/common

2015-03-01 Thread Nicolas Joly 
Module Name:src
Committed By:   njoly
Date:   Sun Mar  1 13:19:39 UTC 2015

Modified Files:
src/sys/compat/linux/common: linux_fcntl.h linux_file.c

Log Message:
Add Linux specific fcntl(2) commands. Support F_DUPFD_CLOEXEC.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/linux/common/linux_fcntl.h
cvs rdiff -u -r1.114 -r1.115 src/sys/compat/linux/common/linux_file.c

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

Modified files:

Index: src/sys/compat/linux/common/linux_fcntl.h
diff -u src/sys/compat/linux/common/linux_fcntl.h:1.16 src/sys/compat/linux/common/linux_fcntl.h:1.17
--- src/sys/compat/linux/common/linux_fcntl.h:1.16	Sun Jun  1 13:42:12 2014
+++ src/sys/compat/linux/common/linux_fcntl.h	Sun Mar  1 13:19:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_fcntl.h,v 1.16 2014/06/01 13:42:12 njoly Exp $	*/
+/*	$NetBSD: linux_fcntl.h,v 1.17 2015/03/01 13:19:39 njoly Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -87,6 +87,16 @@ struct linux_flock64 {
 #error Undefined linux_fcntl.h machine type.
 #endif
 
+/* Linux specific fcntl(2) commands */
+#define	LINUX_F_SPECIFIC_BASE 	1024
+#define	LINUX_F_SETLEASE 	(LINUX_F_SPECIFIC_BASE + 0)
+#define	LINUX_F_GETLEASE 	(LINUX_F_SPECIFIC_BASE + 1)
+#define	LINUX_F_NOTIFY 		(LINUX_F_SPECIFIC_BASE + 2)
+#define	LINUX_F_CANCELLK 	(LINUX_F_SPECIFIC_BASE + 5)
+#define	LINUX_F_DUPFD_CLOEXEC 	(LINUX_F_SPECIFIC_BASE + 6)
+#define	LINUX_F_SETPIPE_SZ 	(LINUX_F_SPECIFIC_BASE + 7)
+#define	LINUX_F_GETPIPE_SZ 	(LINUX_F_SPECIFIC_BASE + 8)
+
 /*
  * We have to have 4 copies of the code that converts linux fcntl() file
  * locking to native form because there are 4 layouts for the structures.

Index: src/sys/compat/linux/common/linux_file.c
diff -u src/sys/compat/linux/common/linux_file.c:1.114 src/sys/compat/linux/common/linux_file.c:1.115
--- src/sys/compat/linux/common/linux_file.c:1.114	Sun Nov  9 17:48:08 2014
+++ src/sys/compat/linux/common/linux_file.c	Sun Mar  1 13:19:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_file.c,v 1.114 2014/11/09 17:48:08 maxv Exp $	*/
+/*	$NetBSD: linux_file.c,v 1.115 2015/03/01 13:19:39 njoly Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_file.c,v 1.114 2014/11/09 17:48:08 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_file.c,v 1.115 2015/03/01 13:19:39 njoly Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -417,6 +417,10 @@ linux_sys_fcntl(struct lwp *l, const str
 		mutex_exit(proc_lock);
 		return 0;
 
+	case LINUX_F_DUPFD_CLOEXEC:
+		cmd = F_DUPFD_CLOEXEC;
+		break;
+
 	default:
 		return EOPNOTSUPP;
 	}

CVS commit: src/sys/compat/linux/common

2015-03-01 Thread Nicolas Joly 
Module Name:src
Committed By:   njoly
Date:   Sun Mar  1 13:19:39 UTC 2015

Modified Files:
src/sys/compat/linux/common: linux_fcntl.h linux_file.c

Log Message:
Add Linux specific fcntl(2) commands. Support F_DUPFD_CLOEXEC.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/linux/common/linux_fcntl.h
cvs rdiff -u -r1.114 -r1.115 src/sys/compat/linux/common/linux_file.c

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

CVS commit: src/sys/uvm

2015-03-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Mar  1 13:43:51 UTC 2015

Modified Files:
src/sys/uvm: uvm_mmap.c

Log Message:
Detect overflow when rounding length parameter and return ENOMEM.
Fixes PR kern/49692.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/uvm/uvm_mmap.c

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

CVS commit: src/sys/uvm

2015-03-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Mar  1 13:43:51 UTC 2015

Modified Files:
src/sys/uvm: uvm_mmap.c

Log Message:
Detect overflow when rounding length parameter and return ENOMEM.
Fixes PR kern/49692.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/uvm/uvm_mmap.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/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.151 src/sys/uvm/uvm_mmap.c:1.152
--- src/sys/uvm/uvm_mmap.c:1.151	Sat Jan 10 23:35:02 2015
+++ src/sys/uvm/uvm_mmap.c	Sun Mar  1 13:43:51 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.151 2015/01/10 23:35:02 chs Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.152 2015/03/01 13:43:51 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.151 2015/01/10 23:35:02 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.152 2015/03/01 13:43:51 mlelstv Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_pax.h
@@ -289,7 +289,7 @@ sys_mmap(struct lwp *l, const struct sys
 	struct proc *p = l-l_proc;
 	vaddr_t addr;
 	off_t pos;
-	vsize_t size, pageoff;
+	vsize_t size, pageoff, newsize;
 	vm_prot_t prot, maxprot;
 	int flags, fd, advice;
 	vaddr_t defaddr;
@@ -338,9 +338,13 @@ sys_mmap(struct lwp *l, const struct sys
 	 */
 
 	pageoff = (pos  PAGE_MASK);
-	pos  -= pageoff;
-	size += pageoff;			/* add offset */
-	size = (vsize_t)round_page(size);	/* round up */
+	pos-= pageoff;
+	newsize = size + pageoff;		/* add offset */
+	newsize = (vsize_t)round_page(newsize);	/* round up */
+
+	if (newsize  size)
+		return (ENOMEM);
+	size = newsize;
 
 	/*
 	 * now check (MAP_FIXED) or get (!MAP_FIXED) the addr

CVS commit: src/sbin/devpubd/hooks

2015-03-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Mar  1 14:21:17 UTC 2015

Modified Files:
src/sbin/devpubd/hooks: 02-wedgenames

Log Message:
safely update existing wedge links


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/devpubd/hooks/02-wedgenames

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

CVS commit: src/sbin/devpubd/hooks

2015-03-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sun Mar  1 14:21:17 UTC 2015

Modified Files:
src/sbin/devpubd/hooks: 02-wedgenames

Log Message:
safely update existing wedge links


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/devpubd/hooks/02-wedgenames

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

Modified files:

Index: src/sbin/devpubd/hooks/02-wedgenames
diff -u src/sbin/devpubd/hooks/02-wedgenames:1.2 src/sbin/devpubd/hooks/02-wedgenames:1.3
--- src/sbin/devpubd/hooks/02-wedgenames:1.2	Sun Feb 15 15:56:30 2015
+++ src/sbin/devpubd/hooks/02-wedgenames	Sun Mar  1 14:21:17 2015
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: 02-wedgenames,v 1.2 2015/02/15 15:56:30 jmcneill Exp $
+# $NetBSD: 02-wedgenames,v 1.3 2015/03/01 14:21:17 mlelstv Exp $
 #
 # Try to maintain symlinks to wedge devices
 #
@@ -52,7 +52,14 @@ add_wedge() {
 		test -d $wedgedir || mkdir -m 755 $wedgedir
 		basedir=$(dirname $wedgedir/$n)
 		test -d $basedir || mkdir -p -m 755 $basedir
-		ln -s /dev/$1 $wedgedir/$n
+		if oldlink=$(readlink $wedgedir/$n); then
+			if [ x$oldlink != /dev/$1 ]; then
+rm -f $wedgedir/$n
+ln -s /dev/$1 $wedgedir/$n
+			fi
+		else
+			ln -s /dev/$1 $wedgedir/$n
+		fi
 		;;
 	esac
 }

CVS commit: src/sys/external/bsd/drm2/include/linux

2015-03-01 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Mon Mar  2 02:26:37 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/include/linux: slab.h

Log Message:
Fix broken error checking in kmalloc_array/kcalloc.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/slab.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/external/bsd/drm2/include/linux/slab.h
diff -u src/sys/external/bsd/drm2/include/linux/slab.h:1.4 src/sys/external/bsd/drm2/include/linux/slab.h:1.5
--- src/sys/external/bsd/drm2/include/linux/slab.h:1.4	Wed Jul 16 20:59:58 2014
+++ src/sys/external/bsd/drm2/include/linux/slab.h	Mon Mar  2 02:26:37 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: slab.h,v 1.4 2014/07/16 20:59:58 riastradh Exp $	*/
+/*	$NetBSD: slab.h,v 1.5 2015/03/02 02:26:37 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -96,16 +96,14 @@ kzalloc(size_t size, gfp_t gfp)
 static inline void *
 kmalloc_array(size_t n, size_t size, gfp_t gfp)
 {
-	KASSERT(size != 0);
-	KASSERT(n = (SIZE_MAX / size));
+	if ((size != 0)  (n  (SIZE_MAX / size)))
+		return NULL;
 	return malloc((n * size), M_TEMP, linux_gfp_to_malloc(gfp));
 }
 
 static inline void *
 kcalloc(size_t n, size_t size, gfp_t gfp)
 {
-	if ((size == 0)  (n  (SIZE_MAX / size)))
-		return NULL;
 	return kmalloc_array(n, size, (gfp | __GFP_ZERO));
 }

CVS commit: src/sys/external/bsd/drm2/include/linux

2015-03-01 Thread Taylor R Campbell 
Module Name:src
Committed By:   riastradh
Date:   Mon Mar  2 02:26:37 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/include/linux: slab.h

Log Message:
Fix broken error checking in kmalloc_array/kcalloc.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/include/linux/slab.h

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

CVS commit: src

2015-03-01 Thread enami tsugutomo 
Module Name:src
Committed By:   enami
Date:   Mon Mar  2 03:17:24 UTC 2015

Modified Files:
src/bin/cp: utils.c
src/bin/mv: mv.c
src/sbin/restore: dirs.c tape.c
src/usr.bin/touch: touch.c

Log Message:
Don't truncate at sub-microsecond while preserving timestamps.

One of motivation of this change is to make the behavior of test(1)
-nt/ot with preserved copy (like cp -p) closer to the NetBSD 6.
Of course whether full timestamps are kept or not depends also on
underlying file system.

The ifdef added in mv(1) since existing ifdefs was our local change
to compile it on solaris (though I couldn't test it):
http://mail-index.netbsd.org/tech-userlevel/2014/11/28/msg008831.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/bin/cp/utils.c
cvs rdiff -u -r1.43 -r1.44 src/bin/mv/mv.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/restore/dirs.c
cvs rdiff -u -r1.67 -r1.68 src/sbin/restore/tape.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/touch/touch.c

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

Modified files:

Index: src/bin/cp/utils.c
diff -u src/bin/cp/utils.c:1.42 src/bin/cp/utils.c:1.43
--- src/bin/cp/utils.c:1.42	Wed Dec 11 06:00:11 2013
+++ src/bin/cp/utils.c	Mon Mar  2 03:17:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: utils.c,v 1.42 2013/12/11 06:00:11 dholland Exp $ */
+/* $NetBSD: utils.c,v 1.43 2015/03/02 03:17:24 enami Exp $ */
 
 /*-
  * Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)utils.c	8.3 (Berkeley) 4/1/94;
 #else
-__RCSID($NetBSD: utils.c,v 1.42 2013/12/11 06:00:11 dholland Exp $);
+__RCSID($NetBSD: utils.c,v 1.43 2015/03/02 03:17:24 enami Exp $);
 #endif
 #endif /* not lint */
 
@@ -62,12 +62,12 @@ __RCSID($NetBSD: utils.c,v 1.42 2013/12
 int
 set_utimes(const char *file, struct stat *fs)
 {
-static struct timeval tv[2];
+struct timespec ts[2];
 
-TIMESPEC_TO_TIMEVAL(tv[0], fs-st_atimespec);
-TIMESPEC_TO_TIMEVAL(tv[1], fs-st_mtimespec);
+ts[0] = fs-st_atimespec;
+ts[1] = fs-st_mtimespec;
 
-if (lutimes(file, tv)) {
+if (lutimens(file, ts)) {
 	warn(lutimes: %s, file);
 	return (1);
 }

Index: src/bin/mv/mv.c
diff -u src/bin/mv/mv.c:1.43 src/bin/mv/mv.c:1.44
--- src/bin/mv/mv.c:1.43	Mon Aug 29 14:46:54 2011
+++ src/bin/mv/mv.c	Mon Mar  2 03:17:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mv.c,v 1.43 2011/08/29 14:46:54 joerg Exp $ */
+/* $NetBSD: mv.c,v 1.44 2015/03/02 03:17:24 enami Exp $ */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -42,7 +42,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
 #if 0
 static char sccsid[] = @(#)mv.c	8.2 (Berkeley) 4/2/94;
 #else
-__RCSID($NetBSD: mv.c,v 1.43 2011/08/29 14:46:54 joerg Exp $);
+__RCSID($NetBSD: mv.c,v 1.44 2015/03/02 03:17:24 enami Exp $);
 #endif
 #endif /* not lint */
 
@@ -255,7 +255,11 @@ do_move(char *from, char *to)
 static int
 fastcopy(char *from, char *to, struct stat *sbp)
 {
+#if defined(__NetBSD__)
+	struct timespec ts[2];
+#else
 	struct timeval tval[2];
+#endif
 	static blksize_t blen;
 	static char *bp;
 	int nread, from_fd, to_fd;
@@ -296,8 +300,13 @@ err:		if (unlink(to))
 
 	(void)close(from_fd);
 #ifdef BSD4_4
+#if defined(__NetBSD__)
+	ts[0] = sbp-st_atimespec;
+	ts[1] = sbp-st_mtimespec;
+#else
 	TIMESPEC_TO_TIMEVAL(tval[0], sbp-st_atimespec);
 	TIMESPEC_TO_TIMEVAL(tval[1], sbp-st_mtimespec);
+#endif
 #else
 	tval[0].tv_sec = sbp-st_atime;
 	tval[1].tv_sec = sbp-st_mtime;
@@ -307,8 +316,12 @@ err:		if (unlink(to))
 #ifdef __SVR4
 	if (utimes(to, tval))
 #else
+#if defined(__NetBSD__)
+	if (futimens(to_fd, ts))
+#else
 	if (futimes(to_fd, tval))
 #endif
+#endif
 		warn(%s: set times, to);
 	if (fchown(to_fd, sbp-st_uid, sbp-st_gid)) {
 		if (errno != EPERM)

Index: src/sbin/restore/dirs.c
diff -u src/sbin/restore/dirs.c:1.50 src/sbin/restore/dirs.c:1.51
--- src/sbin/restore/dirs.c:1.50	Sun Jun  9 17:57:09 2013
+++ src/sbin/restore/dirs.c	Mon Mar  2 03:17:24 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dirs.c,v 1.50 2013/06/09 17:57:09 dholland Exp $	*/
+/*	$NetBSD: dirs.c,v 1.51 2015/03/02 03:17:24 enami Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = @(#)dirs.c	8.7 (Berkeley) 5/1/95;
 #else
-__RCSID($NetBSD: dirs.c,v 1.50 2013/06/09 17:57:09 dholland Exp $);
+__RCSID($NetBSD: dirs.c,v 1.51 2015/03/02 03:17:24 enami Exp $);
 #endif
 #endif /* not lint */
 
@@ -84,8 +84,8 @@ static struct inotab *inotab[HASHSIZE];
  */
 struct modeinfo {
 	ino_t ino;
-	struct timeval ctimep[2];
-	struct timeval mtimep[2];
+	struct timespec ctimep[2];
+	struct timespec mtimep[2];
 	mode_t mode;
 	uid_t uid;
 	gid_t gid;
@@ -625,8 +625,8 @@ setdirmodes(int flags)
 		} else {
 			if (!Nflag) {
 cp = myname(ep);
-(void) utimes(cp, node.ctimep);
-(void) utimes(cp, node.mtimep);
+(void) utimens(cp, node.ctimep);
+(void) utimens(cp, node.mtimep);
 (void) chown(cp, node.uid, node.gid);
 (void) chmod(cp, node.mode);

CVS commit: src

2015-03-01 Thread enami tsugutomo 
Module Name:src
Committed By:   enami
Date:   Mon Mar  2 03:17:24 UTC 2015

Modified Files:
src/bin/cp: utils.c
src/bin/mv: mv.c
src/sbin/restore: dirs.c tape.c
src/usr.bin/touch: touch.c

Log Message:
Don't truncate at sub-microsecond while preserving timestamps.

One of motivation of this change is to make the behavior of test(1)
-nt/ot with preserved copy (like cp -p) closer to the NetBSD 6.
Of course whether full timestamps are kept or not depends also on
underlying file system.

The ifdef added in mv(1) since existing ifdefs was our local change
to compile it on solaris (though I couldn't test it):
http://mail-index.netbsd.org/tech-userlevel/2014/11/28/msg008831.html


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/bin/cp/utils.c
cvs rdiff -u -r1.43 -r1.44 src/bin/mv/mv.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/restore/dirs.c
cvs rdiff -u -r1.67 -r1.68 src/sbin/restore/tape.c
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/touch/touch.c

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

Re: CVS commit: src/usr.bin/sed

2015-03-01 Thread Aleksej Saushev 
chris...@astron.com (Christos Zoulas) writes:

 In article 20150228215653.f2f0...@cvs.netbsd.org,
 Aleksej Saushev source-changes-d@NetBSD.org wrote:
-=-=-=-=-=-

Module Name:  src
Committed By: asau
Date: Sat Feb 28 21:56:53 UTC 2015

Modified Files:
  src/usr.bin/sed: compile.c extern.h main.c process.c

Log Message:
Improve modularity of sed source:
- move program source input subroutines into compiler part;
- move data I/O subroutines into processor part.

 It there a good reason for that? We try to keep it synced with FreeBSD..

It makes code a lot cleaner and allows embedding it.

If that's problem, I'll submit changes to FreeBSD.


-- 
HE CE3OH...

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

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 15:06:09 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_board.c

Log Message:
remove debug printf


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/amlogic_board.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/amlogic/amlogic_board.c
diff -u src/sys/arch/arm/amlogic/amlogic_board.c:1.5 src/sys/arch/arm/amlogic/amlogic_board.c:1.6
--- src/sys/arch/arm/amlogic/amlogic_board.c:1.5	Sat Feb 28 22:53:25 2015
+++ src/sys/arch/arm/amlogic/amlogic_board.c	Sun Mar  1 15:06:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_board.c,v 1.5 2015/02/28 22:53:25 jmcneill Exp $ */
+/* $NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
 #include opt_amlogic.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_board.c,v 1.5 2015/02/28 22:53:25 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_board.c,v 1.6 2015/03/01 15:06:09 jmcneill Exp $);
 
 #define	_ARM32_BUS_DMA_PRIVATE
 #include sys/param.h
@@ -257,8 +257,6 @@ amlogic_usbphy_init(int port)
 
 	ctrl = CBUS_READ(ctrl_reg);
 
-	printf(USBPHY: port %d, ctrl %#x\n, port, ctrl);
-
 	if ((ctrl  PREI_USB_PHY_CTRL_CLK_DET) == 0)
 		printf(WARNING: USB PHY port %d clock not detected\n, port);

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

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 15:06:09 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_board.c

Log Message:
remove debug printf


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/amlogic_board.c

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

CVS commit: src/sys/arch

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 15:07:49 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_reg.h
src/sys/arch/evbarm/amlogic: amlogic_machdep.c amlogic_start.S
src/sys/arch/evbarm/conf: ODROID-C1

Log Message:
ODROID-C1 SMP support.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_reg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/amlogic/amlogic_start.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/ODROID-C1

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/amlogic/amlogic_reg.h
diff -u src/sys/arch/arm/amlogic/amlogic_reg.h:1.3 src/sys/arch/arm/amlogic/amlogic_reg.h:1.4
--- src/sys/arch/arm/amlogic/amlogic_reg.h:1.3	Sat Feb 28 15:20:43 2015
+++ src/sys/arch/arm/amlogic/amlogic_reg.h	Sun Mar  1 15:07:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_reg.h,v 1.3 2015/02/28 15:20:43 jmcneill Exp $ */
+/* $NetBSD: amlogic_reg.h,v 1.4 2015/03/01 15:07:49 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -32,7 +32,7 @@
 #define CONSADDR_VA	(CONSADDR - AMLOGIC_CORE_BASE + AMLOGIC_CORE_VBASE)
 
 #define AMLOGIC_CORE_BASE	0xc000
-#define AMLOGIC_CORE_SIZE	0x1020
+#define AMLOGIC_CORE_SIZE	0x1b00
 #define AMLOGIC_CORE_VBASE	0xe000
 
 #define AMLOGIC_CBUS_OFFSET	0x0110
@@ -50,10 +50,23 @@
 
 #define AMLOGIC_PL310_OFFSET	0x0420
 
+#define AMLOGIC_AOBUS_OFFSET	0x0810
+
 #define AMLOGIC_GPIOAO_OFFSET	0x08100024
 
 #define AMLOGIC_USB0_OFFSET	0x0904
 #define AMLOGIC_USB1_OFFSET	0x090c
 #define AMLOGIC_USB_SIZE	0x4
 
+#define AMLOGIC_CPUCONF_OFFSET	0x1901ff80
+
+#define AMLOGIC_CBUS_CPU_CLK_CNTL_REG	0x419c
+
+#define AMLOGIC_AOBUS_PWR_CTRL0_REG	0xe0
+#define AMLOGIC_AOBUS_PWR_CTRL1_REG	0xe4
+#define AMLOGIC_AOBUS_PWR_MEM_PD0_REG	0xf4
+
+#define AMLOGIC_CPUCONF_CTRL_REG	0x00
+#define AMLOGIC_CPUCONF_CPU_ADDR_REG(n)	(0x04 * (n))
+
 #endif /* _ARM_AMLOGIC_REG_H */

Index: src/sys/arch/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.8 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.9
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.8	Sat Feb 28 18:50:15 2015
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c	Sun Mar  1 15:07:49 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: amlogic_machdep.c,v 1.8 2015/02/28 18:50:15 jmcneill Exp $ */
+/*	$NetBSD: amlogic_machdep.c,v 1.9 2015/03/01 15:07:49 jmcneill Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_machdep.c,v 1.8 2015/02/28 18:50:15 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_machdep.c,v 1.9 2015/03/01 15:07:49 jmcneill Exp $);
 
 #include opt_machdep.h
 #include opt_ddb.h
@@ -134,6 +134,7 @@ __KERNEL_RCSID(0, $NetBSD: amlogic_mach
 #include opt_md.h
 #include opt_amlogic.h
 #include opt_arm_debug.h
+#include opt_multiprocessor.h
 
 #include amlogic_com.h
 #if 0
@@ -328,10 +329,15 @@ initarm(void *arg)
 	amlogic_putchar('!');
 
 #ifdef MULTIPROCESSOR
-	uint32_t scu_cfg = bus_space_read_4(amlogic_bs_tag,
-	amlogic_core0_bsh, ROCKCHIP_SCU_OFFSET + SCU_CFG);
-	arm_cpu_max = (scu_cfg  SCU_CFG_CPUMAX) + 1;
-	membar_producer();
+	const bus_addr_t cbar = armreg_cbar_read();
+	if (cbar) {
+		const bus_space_handle_t scu_bsh =
+		cbar - AMLOGIC_CORE_BASE + AMLOGIC_CORE_VBASE;
+		uint32_t scu_cfg = bus_space_read_4(amlogic_bs_tag, scu_bsh,
+		SCU_CFG);
+		arm_cpu_max = (scu_cfg  SCU_CFG_CPUMAX) + 1;
+		membar_producer();
+	}
 #endif
 
 	/* Heads up ... Setup the CPU / MMU / TLB functions. */
@@ -341,9 +347,6 @@ initarm(void *arg)
 	init_clocks();
 
 	consinit();
-#ifdef MULTIPROCESSOR
-	arm_cpu_max = 1 + __SHIFTOUT(armreg_l2ctrl_read(), L2CTRL_NUMCPU);
-#endif
 
 #if NARML2CC  0
 /*
@@ -573,3 +576,120 @@ amlogic_device_register(device_t self, v
 		prop_dictionary_set_uint32(dict, offset, 0xfff0);
 	}
 }
+
+#if defined(MULTIPROCESSOR)
+void amlogic_mpinit(uint32_t);
+
+static void
+amlogic_mpinit_delay(u_int n)
+{
+	for (volatile int i = 0; i  n; i++)
+		;
+}
+
+static void
+amlogic_mpinit_cpu(int cpu)
+{
+	const bus_addr_t cbar = armreg_cbar_read();
+	bus_space_tag_t bst = amlogic_bs_tag;
+	const bus_space_handle_t scu_bsh =
+	cbar - AMLOGIC_CORE_BASE + AMLOGIC_CORE_VBASE;
+	const bus_space_handle_t ao_bsh =
+	AMLOGIC_CORE_VBASE + AMLOGIC_AOBUS_OFFSET;
+	const bus_space_handle_t cbus_bsh =
+	AMLOGIC_CORE_VBASE + AMLOGIC_CBUS_OFFSET;
+	uint32_t pwr_sts, pwr_cntl0, pwr_cntl1, cpuclk, mempd0;
+
+	pwr_sts = bus_space_read_4(bst, scu_bsh, SCU_CPU_PWR_STS);
+	pwr_sts = ~(3  (8 * cpu));
+	bus_space_write_4(bst, scu_bsh, SCU_CPU_PWR_STS, pwr_sts);
+
+	pwr_cntl0 = bus_space_read_4(bst, ao_bsh, AMLOGIC_AOBUS_PWR_CTRL0_REG);
+

CVS commit: src/sys/arch

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 15:07:49 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_reg.h
src/sys/arch/evbarm/amlogic: amlogic_machdep.c amlogic_start.S
src/sys/arch/evbarm/conf: ODROID-C1

Log Message:
ODROID-C1 SMP support.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/amlogic/amlogic_reg.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/amlogic/amlogic_start.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/ODROID-C1

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

CVS commit: src/sys/arch

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 15:37:26 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_reg.h
src/sys/arch/evbarm/amlogic: amlogic_machdep.c
src/sys/arch/evbarm/conf: ODROID-C1

Log Message:
auto-detect RAM size


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/amlogic_reg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/ODROID-C1

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/amlogic/amlogic_reg.h
diff -u src/sys/arch/arm/amlogic/amlogic_reg.h:1.4 src/sys/arch/arm/amlogic/amlogic_reg.h:1.5
--- src/sys/arch/arm/amlogic/amlogic_reg.h:1.4	Sun Mar  1 15:07:49 2015
+++ src/sys/arch/arm/amlogic/amlogic_reg.h	Sun Mar  1 15:37:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_reg.h,v 1.4 2015/03/01 15:07:49 jmcneill Exp $ */
+/* $NetBSD: amlogic_reg.h,v 1.5 2015/03/01 15:37:26 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -58,6 +58,8 @@
 #define AMLOGIC_USB1_OFFSET	0x090c
 #define AMLOGIC_USB_SIZE	0x4
 
+#define AMLOGIC_SRAM_OFFSET	0x1900
+
 #define AMLOGIC_CPUCONF_OFFSET	0x1901ff80
 
 #define AMLOGIC_CBUS_CPU_CLK_CNTL_REG	0x419c

Index: src/sys/arch/evbarm/amlogic/amlogic_machdep.c
diff -u src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.9 src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.10
--- src/sys/arch/evbarm/amlogic/amlogic_machdep.c:1.9	Sun Mar  1 15:07:49 2015
+++ src/sys/arch/evbarm/amlogic/amlogic_machdep.c	Sun Mar  1 15:37:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: amlogic_machdep.c,v 1.9 2015/03/01 15:07:49 jmcneill Exp $ */
+/*	$NetBSD: amlogic_machdep.c,v 1.10 2015/03/01 15:37:26 jmcneill Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_machdep.c,v 1.9 2015/03/01 15:07:49 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_machdep.c,v 1.10 2015/03/01 15:37:26 jmcneill Exp $);
 
 #include opt_machdep.h
 #include opt_ddb.h
@@ -301,6 +301,14 @@ amlogic_putchar(char c)
 	}
 }
 
+static psize_t
+amlogic_get_ram_size(void)
+{
+	const bus_space_handle_t ao_bsh =
+	AMLOGIC_CORE_VBASE + AMLOGIC_SRAM_OFFSET;
+	return bus_space_read_4(amlogic_bs_tag, ao_bsh, 0)  20;
+}
+
 /*
  * u_int initarm(...)
  *
@@ -386,9 +394,7 @@ initarm(void *arg)
 		KERNEL_BASE, KERNEL_VM_BASE, KERNEL_VM_BASE - KERNEL_BASE, KERNEL_BASE_VOFFSET);
 #endif
 
-#if notyet
 	ram_size = amlogic_get_ram_size();
-#endif
 
 #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 	if (ram_size  KERNEL_VM_BASE - KERNEL_BASE) {

Index: src/sys/arch/evbarm/conf/ODROID-C1
diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.4 src/sys/arch/evbarm/conf/ODROID-C1:1.5
--- src/sys/arch/evbarm/conf/ODROID-C1:1.4	Sun Mar  1 15:07:49 2015
+++ src/sys/arch/evbarm/conf/ODROID-C1	Sun Mar  1 15:37:26 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ODROID-C1,v 1.4 2015/03/01 15:07:49 jmcneill Exp $
+#	$NetBSD: ODROID-C1,v 1.5 2015/03/01 15:37:26 jmcneill Exp $
 #
 #	Odroid-C1 (Amlogic S805) based SBC (Single Board Computer)
 #
@@ -166,7 +166,7 @@ a9tmr0		at armperiph?# Global Timer
 a9wdt0		at armperiph?# Watchdog
 
 # Specify the memory size in megabytes.
-options 	MEMSIZE=1024
+#options 	MEMSIZE=1024
 
 # On-board I/O
 amlogicio0	at mainbus?

CVS commit: src/sys/arch

2015-03-01 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sun Mar  1 15:37:26 UTC 2015

Modified Files:
src/sys/arch/arm/amlogic: amlogic_reg.h
src/sys/arch/evbarm/amlogic: amlogic_machdep.c
src/sys/arch/evbarm/conf: ODROID-C1

Log Message:
auto-detect RAM size


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/amlogic/amlogic_reg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/amlogic/amlogic_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/ODROID-C1

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

CVS commit: src/usr.sbin/cpuctl/arch

2015-03-01 Thread Tobias Nygren 
Module Name:src
Committed By:   tnn
Date:   Sun Mar  1 18:02:42 UTC 2015

Modified Files:
src/usr.sbin/cpuctl/arch: i386-asm.S x86_64-asm.S

Log Message:
xgetbv expects XCR0 to be speficied in %ecx, don't leave %ecx undefined


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/cpuctl/arch/i386-asm.S
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/cpuctl/arch/x86_64-asm.S

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

CVS commit: src/usr.sbin/cpuctl/arch

2015-03-01 Thread Tobias Nygren 
Module Name:src
Committed By:   tnn
Date:   Sun Mar  1 18:02:42 UTC 2015

Modified Files:
src/usr.sbin/cpuctl/arch: i386-asm.S x86_64-asm.S

Log Message:
xgetbv expects XCR0 to be speficied in %ecx, don't leave %ecx undefined


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/cpuctl/arch/i386-asm.S
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/cpuctl/arch/x86_64-asm.S

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/cpuctl/arch/i386-asm.S
diff -u src/usr.sbin/cpuctl/arch/i386-asm.S:1.3 src/usr.sbin/cpuctl/arch/i386-asm.S:1.4
--- src/usr.sbin/cpuctl/arch/i386-asm.S:1.3	Mon Jan  7 23:20:42 2013
+++ src/usr.sbin/cpuctl/arch/i386-asm.S	Sun Mar  1 18:02:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386-asm.S,v 1.3 2013/01/07 23:20:42 dsl Exp $	*/
+/*	$NetBSD: i386-asm.S,v 1.4 2015/03/01 18:02:42 tnn Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2006, 2007 The NetBSD Foundation, Inc.
@@ -49,6 +49,7 @@ ENTRY(x86_cpuid2)
 END(x86_cpuid2)
 
 ENTRY(x86_xgetbv)
+	xorl	%ecx, %ecx
 	xgetbv
 	ret
 END(x86_xgetbv)

Index: src/usr.sbin/cpuctl/arch/x86_64-asm.S
diff -u src/usr.sbin/cpuctl/arch/x86_64-asm.S:1.4 src/usr.sbin/cpuctl/arch/x86_64-asm.S:1.5
--- src/usr.sbin/cpuctl/arch/x86_64-asm.S:1.4	Mon Jan  7 23:20:42 2013
+++ src/usr.sbin/cpuctl/arch/x86_64-asm.S	Sun Mar  1 18:02:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_64-asm.S,v 1.4 2013/01/07 23:20:42 dsl Exp $	*/
+/*	$NetBSD: x86_64-asm.S,v 1.5 2015/03/01 18:02:42 tnn Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -44,6 +44,7 @@ ENTRY(x86_cpuid2)
 	ret
 
 ENTRY(x86_xgetbv)
+	xorl	%ecx, %ecx
 	xgetbv
 	ret

CVS commit: src/crypto/external/bsd/openssh

2015-03-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Mar  1 21:00:40 UTC 2015

Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc

Log Message:
Sync the HAVE's with reality


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/Makefile.inc

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

Modified files:

Index: src/crypto/external/bsd/openssh/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.7 src/crypto/external/bsd/openssh/Makefile.inc:1.8
--- src/crypto/external/bsd/openssh/Makefile.inc:1.7	Fri Jan 16 15:17:49 2015
+++ src/crypto/external/bsd/openssh/Makefile.inc	Sun Mar  1 16:00:40 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.7 2015/01/16 20:17:49 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.8 2015/03/01 21:00:40 christos Exp $
 
 WARNS?=	4
 
@@ -9,7 +9,13 @@ WITH_OPENSSL=1
 
 SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
 
-CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
+CPPFLAGS+=-I${SSHDIST}
+
+CPPFLAGS+=-DHAVE_DLOPEN
+CPPFLAGS+=-DHAVE_HEADER_AD
+CPPFLAGS+=-DHAVE_LOGIN_CAP
+CPPFLAGS+=-DHAVE_STDLIB_H
+
 CPPFLAGS+=-DWITH_SSH1 -DWITH_OPENSSL -DENABLE_PKCS11 -D_OPENBSD_SOURCE
 .if !defined(NOPIC)
 CPPFLAGS+=-DHAVE_DLOPEN

CVS commit: src/crypto/external/bsd/openssh

2015-03-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sun Mar  1 21:00:40 UTC 2015

Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc

Log Message:
Sync the HAVE's with reality


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/Makefile.inc

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