CVS commit: src/sys/dev/usb

2016-10-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sat Oct  1 07:21:45 UTC 2016

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

Log Message:
mcs is a 16bit value.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/if_run.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/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.16 src/sys/dev/usb/if_run.c:1.17
--- src/sys/dev/usb/if_run.c:1.16	Fri Sep 16 09:25:30 2016
+++ src/sys/dev/usb/if_run.c	Sat Oct  1 07:21:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.16 2016/09/16 09:25:30 mlelstv Exp $	*/
+/*	$NetBSD: if_run.c,v 1.17 2016/10/01 07:21:45 mlelstv Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.16 2016/09/16 09:25:30 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.17 2016/10/01 07:21:45 mlelstv Exp $");
 
 #include 
 #include 
@@ -2418,8 +2418,8 @@ run_tx(struct run_softc *sc, struct mbuf
 	struct run_tx_data *data;
 	struct rt2870_txd *txd;
 	struct rt2860_txwi *txwi;
-	uint16_t dur;
-	uint8_t type, mcs, tid, qid, qos = 0;
+	uint16_t dur, mcs;
+	uint8_t type, tid, qid, qos = 0;
 	int error, hasqos, ridx, ctl_ridx, xferlen, txwisize;
 	uint8_t pad;

CVS commit: src/sys/dev/usb

2016-10-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sat Oct  1 07:23:40 UTC 2016

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

Log Message:
Use splusb() like the other drivers instead of splnet().


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/if_run.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/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.17 src/sys/dev/usb/if_run.c:1.18
--- src/sys/dev/usb/if_run.c:1.17	Sat Oct  1 07:21:45 2016
+++ src/sys/dev/usb/if_run.c	Sat Oct  1 07:23:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.17 2016/10/01 07:21:45 mlelstv Exp $	*/
+/*	$NetBSD: if_run.c,v 1.18 2016/10/01 07:23:40 mlelstv Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.17 2016/10/01 07:21:45 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.18 2016/10/01 07:23:40 mlelstv Exp $");
 
 #include 
 #include 
@@ -749,7 +749,7 @@ run_detach(device_t self, int flags)
 
 	pmf_device_deregister(self);
 
-	s = splnet();
+	s = splusb();
 
 	sc->sc_flags |= RUN_DETACHING;

CVS commit: src/sys/dev/usb

2016-10-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sat Oct  1 11:07:30 UTC 2016

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

Log Message:
Use pointer passed as argument. This is not really a change as
data->xfer is supposed to be the same.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/if_run.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/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.18 src/sys/dev/usb/if_run.c:1.19
--- src/sys/dev/usb/if_run.c:1.18	Sat Oct  1 07:23:40 2016
+++ src/sys/dev/usb/if_run.c	Sat Oct  1 11:07:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.18 2016/10/01 07:23:40 mlelstv Exp $	*/
+/*	$NetBSD: if_run.c,v 1.19 2016/10/01 11:07:30 mlelstv Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.18 2016/10/01 07:23:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.19 2016/10/01 11:07:30 mlelstv Exp $");
 
 #include 
 #include 
@@ -2374,7 +2374,7 @@ run_rxeof(struct usbd_xfer *xfer, void *
 skip:	/* setup a new transfer */
 	usbd_setup_xfer(xfer, data, data->buf, RUN_MAX_RXSZ,
 	USBD_SHORT_XFER_OK, USBD_NO_TIMEOUT, run_rxeof);
-	(void)usbd_transfer(data->xfer);
+	(void)usbd_transfer(xfer);
 }
 
 static void

CVS commit: src/sys/dev/usb

2016-10-01 Thread Michael van Elst 
Module Name:src
Committed By:   mlelstv
Date:   Sat Oct  1 11:09:12 UTC 2016

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

Log Message:
Ignore completed transfers when detaching. This avoids a race condition
where the detach code has already freed the xfer structures.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/if_run.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/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.19 src/sys/dev/usb/if_run.c:1.20
--- src/sys/dev/usb/if_run.c:1.19	Sat Oct  1 11:07:30 2016
+++ src/sys/dev/usb/if_run.c	Sat Oct  1 11:09:12 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.19 2016/10/01 11:07:30 mlelstv Exp $	*/
+/*	$NetBSD: if_run.c,v 1.20 2016/10/01 11:09:12 mlelstv Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.19 2016/10/01 11:07:30 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.20 2016/10/01 11:09:12 mlelstv Exp $");
 
 #include 
 #include 
@@ -2335,6 +2335,9 @@ run_rxeof(struct usbd_xfer *xfer, void *
 	uint32_t dmalen;
 	int xferlen;
 
+	if (__predict_false(sc->sc_flags & RUN_DETACHING))
+		return;
+
 	if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
 		DPRINTF(("RX status=%d\n", status));
 		if (status == USBD_STALLED)

CVS commit: src/distrib/notes/common

2016-10-01 Thread Felix Deichmann 
Module Name:src
Committed By:   flxd
Date:   Sat Oct  1 12:32:36 UTC 2016

Modified Files:
src/distrib/notes/common: main

Log Message:
Add myself


To generate a diff of this commit:
cvs rdiff -u -r1.531 -r1.532 src/distrib/notes/common/main

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

Modified files:

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.531 src/distrib/notes/common/main:1.532
--- src/distrib/notes/common/main:1.531	Mon Aug  1 19:06:32 2016
+++ src/distrib/notes/common/main	Sat Oct  1 12:32:35 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.531 2016/08/01 19:06:32 scole Exp $
+.\"	$NetBSD: main,v 1.532 2016/10/01 12:32:35 flxd Exp $
 .\"
 .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -1157,6 +1157,7 @@ If you're one of them, and would like to
 .It Ta Jed Davis Ta Mt j...@netbsd.org
 .It Ta Matt DeBergalis Ta Mt deb...@netbsd.org
 .It Ta Arnaud Degroote Ta Mt degro...@netbsd.org
+.It Ta Felix Deichmann Ta Mt f...@netbsd.org
 .It Ta Rob Deker Ta Mt de...@netbsd.org
 .It Ta Chris G. Demetriou Ta Mt c...@netbsd.org
 .It Ta Tracy Di Marco White Ta Mt genda...@netbsd.org

CVS commit: src/sys/ufs/ffs

2016-10-01 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Oct  1 13:06:20 UTC 2016

Modified Files:
src/sys/ufs/ffs: ffs_wapbl.c

Log Message:
wapbl_remove_log(): add missing break; harmless, fallthrough just printed
extra debug message


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/ufs/ffs/ffs_wapbl.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/ufs/ffs/ffs_wapbl.c
diff -u src/sys/ufs/ffs/ffs_wapbl.c:1.32 src/sys/ufs/ffs/ffs_wapbl.c:1.33
--- src/sys/ufs/ffs/ffs_wapbl.c:1.32	Sat Sep 24 21:00:54 2016
+++ src/sys/ufs/ffs/ffs_wapbl.c	Sat Oct  1 13:06:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_wapbl.c,v 1.32 2016/09/24 21:00:54 jdolecek Exp $	*/
+/*	$NetBSD: ffs_wapbl.c,v 1.33 2016/10/01 13:06:20 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 2003,2006,2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.32 2016/09/24 21:00:54 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_wapbl.c,v 1.33 2016/10/01 13:06:20 jdolecek Exp $");
 
 #define WAPBL_INTERNAL
 
@@ -277,6 +277,7 @@ wapbl_remove_log(struct mount *mp)
 		ip->i_nlink = 0;
 		DIP_ASSIGN(ip, nlink, 0);
 		vput(vp);
+		break;
 
 	case UFS_WAPBL_JOURNALLOC_END_PARTITION:
 		DPRINTF("end-of-partition log\n");

CVS commit: src/sys

2016-10-01 Thread Jaromir Dolecek 
Module Name:src
Committed By:   jdolecek
Date:   Sat Oct  1 13:15:45 UTC 2016

Modified Files:
src/sys/kern: vfs_wapbl.c
src/sys/sys: wapbl.h
src/sys/ufs/ffs: ffs_extern.h ffs_wapbl.c

Log Message:
allocate wapbl dealloc registration structures via pool, so that there is more
flexibility with limit handling


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/kern/vfs_wapbl.c
cvs rdiff -u -r1.17 -r1.18 src/sys/sys/wapbl.h
cvs rdiff -u -r1.82 -r1.83 src/sys/ufs/ffs/ffs_extern.h
cvs rdiff -u -r1.33 -r1.34 src/sys/ufs/ffs/ffs_wapbl.c

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

Modified files:

Index: src/sys/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.80 src/sys/kern/vfs_wapbl.c:1.81
--- src/sys/kern/vfs_wapbl.c:1.80	Thu Sep 22 16:22:29 2016
+++ src/sys/kern/vfs_wapbl.c	Sat Oct  1 13:15:45 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vfs_wapbl.c,v 1.80 2016/09/22 16:22:29 jdolecek Exp $	*/
+/*	$NetBSD: vfs_wapbl.c,v 1.81 2016/10/01 13:15:45 jdolecek Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #define WAPBL_INTERNAL
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.80 2016/09/22 16:22:29 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.81 2016/10/01 13:15:45 jdolecek Exp $");
 
 #include 
 #include 
@@ -206,10 +206,9 @@ struct wapbl {
 	int wl_brperjblock;	/* r Block records per journal block */
 #endif
 
-	daddr_t *wl_deallocblks;/* lm:	address of block */
-	int *wl_dealloclens;	/* lm:	size of block */
-	int wl_dealloccnt;	/* lm:	total count */
-	int wl_dealloclim;	/* l:	max count */
+	SIMPLEQ_HEAD(, wapbl_dealloc) wl_dealloclist;	/* lm:	list head */
+	int wl_dealloccnt;/* lm:	total count */
+	int wl_dealloclim;/* r:	max count */
 
 	/* hashtable of inode numbers for allocated but unlinked inodes */
 	/* synch ??? */
@@ -250,6 +249,7 @@ static inline size_t wapbl_space_used(si
 #ifdef _KERNEL
 
 static struct pool wapbl_entry_pool;
+static struct pool wapbl_dealloc_pool;
 
 #define	WAPBL_INODETRK_SIZE 83
 static int wapbl_ino_pool_refcount;
@@ -330,6 +330,8 @@ wapbl_init(void)
 
 	pool_init(&wapbl_entry_pool, sizeof(struct wapbl_entry), 0, 0, 0,
 	"wapblentrypl", &pool_allocator_kmem, IPL_VM);
+	pool_init(&wapbl_dealloc_pool, sizeof(struct wapbl_dealloc), 0, 0, 0,
+	"wapbldealloc", &pool_allocator_nointr, IPL_NONE);
 
 	wapbl_sysctl_init();
 }
@@ -341,6 +343,7 @@ wapbl_fini(void)
 	if (wapbl_sysctl != NULL)
 		 sysctl_teardown(&wapbl_sysctl);
 
+	pool_destroy(&wapbl_dealloc_pool);
 	pool_destroy(&wapbl_entry_pool);
 
 	return 0;
@@ -509,12 +512,8 @@ wapbl_start(struct wapbl ** wlp, struct 
 
 	/* XXX tie this into resource estimation */
 	wl->wl_dealloclim = wl->wl_bufbytes_max / mp->mnt_stat.f_bsize / 2;
+	SIMPLEQ_INIT(&wl->wl_dealloclist);
 	
-	wl->wl_deallocblks = wapbl_alloc(sizeof(*wl->wl_deallocblks) *
-	wl->wl_dealloclim);
-	wl->wl_dealloclens = wapbl_alloc(sizeof(*wl->wl_dealloclens) *
-	wl->wl_dealloclim);
-
 	wl->wl_buffer = wapbl_alloc(MAXPHYS);
 	wl->wl_buffer_used = 0;
 
@@ -562,10 +561,6 @@ wapbl_start(struct wapbl ** wlp, struct 
 	wapbl_discard(wl);
 	wapbl_free(wl->wl_wc_scratch, wl->wl_wc_header->wc_len);
 	wapbl_free(wl->wl_wc_header, wl->wl_wc_header->wc_len);
-	wapbl_free(wl->wl_deallocblks,
-	sizeof(*wl->wl_deallocblks) * wl->wl_dealloclim);
-	wapbl_free(wl->wl_dealloclens,
-	sizeof(*wl->wl_dealloclens) * wl->wl_dealloclim);
 	wapbl_free(wl->wl_buffer, MAXPHYS);
 	wapbl_inodetrk_free(wl);
 	wapbl_free(wl, sizeof(*wl));
@@ -582,6 +577,7 @@ void
 wapbl_discard(struct wapbl *wl)
 {
 	struct wapbl_entry *we;
+	struct wapbl_dealloc *wd;
 	struct buf *bp;
 	int i;
 
@@ -590,8 +586,7 @@ wapbl_discard(struct wapbl *wl)
 	 * if we want to call flush from inside a transaction
 	 */
 	rw_enter(&wl->wl_rwlock, RW_WRITER);
-	wl->wl_flush(wl->wl_mount, wl->wl_deallocblks, wl->wl_dealloclens,
-	wl->wl_dealloccnt);
+	wl->wl_flush(wl->wl_mount, SIMPLEQ_FIRST(&wl->wl_dealloclist));
 
 #ifdef WAPBL_DEBUG_PRINT
 	{
@@ -693,7 +688,12 @@ wapbl_discard(struct wapbl *wl)
 	}
 
 	/* Discard list of deallocs */
-	wl->wl_dealloccnt = 0;
+	while ((wd = SIMPLEQ_FIRST(&wl->wl_dealloclist)) != NULL) {
+		SIMPLEQ_REMOVE_HEAD(&wl->wl_dealloclist, wd_entries);
+		pool_put(&wapbl_dealloc_pool, wd);
+		wl->wl_dealloccnt--;
+	}
+
 	/* XXX should we clear wl_reserved_bytes? */
 
 	KASSERT(wl->wl_bufbytes == 0);
@@ -702,6 +702,8 @@ wapbl_discard(struct wapbl *wl)
 	KASSERT(LIST_EMPTY(&wl->wl_bufs));
 	KASSERT(SIMPLEQ_EMPTY(&wl->wl_entries));
 	KASSERT(wl->wl_inohashcnt == 0);
+	KASSERT(SIMPLEQ_EMPTY(&wl->wl_dealloclist));
+	KASSERT(wl->wl_dealloccnt == 0);
 
 	rw_exit(&wl->wl_rwlock);
 }
@@ -736,13 +738,11 @@ wapbl_stop(struct wapbl *wl, int force)
 	KASSERT(wl->wl_dealloccnt == 0);
 	KASSERT(SIMPLEQ_EMPTY(&wl->wl_entries));
 	KASSERT(wl->wl_inohashcnt == 0);
+	KASSERT(SIMPLEQ_EMPTY(&wl->wl_deallo

CVS commit: src/sys/dev/ic

2016-10-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Oct  1 13:46:52 UTC 2016

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

Log Message:
remove unused variable.


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/ic/sl811hs.c

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

Modified files:

Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.96 src/sys/dev/ic/sl811hs.c:1.97
--- src/sys/dev/ic/sl811hs.c:1.96	Sat Sep 24 11:06:29 2016
+++ src/sys/dev/ic/sl811hs.c	Sat Oct  1 09:46:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: sl811hs.c,v 1.96 2016/09/24 15:06:29 skrll Exp $	*/
+/*	$NetBSD: sl811hs.c,v 1.97 2016/10/01 13:46:52 christos Exp $	*/
 
 /*
  * Not (c) 2007 Matthew Orgass
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.96 2016/09/24 15:06:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.97 2016/10/01 13:46:52 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_slhci.h"
@@ -185,12 +185,6 @@ static const uint8_t slhci_tregs[2][4] =
 #endif
 static const struct timeval reserved_warn_rate = SLHCI_OVERTIME_WARNING_RATE;
 
-/* Rate for overflow warnings */
-#ifndef SLHCI_OVERFLOW_WARNING_RATE
-#define SLHCI_OVERFLOW_WARNING_RATE { 60, 0 } /* 60 seconds */
-#endif
-static const struct timeval overflow_warn_rate = SLHCI_OVERFLOW_WARNING_RATE;
-
 /*
  * For EOF, the spec says 42 bit times, plus (I think) a possible hub skew of
  * 20 bit times.  By default leave 66 bit times to start the transfer beyond

CVS commit: src/sys/arch/sparc/stand

2016-10-01 Thread Christos Zoulas 
Module Name:src
Committed By:   christos
Date:   Sat Oct  1 13:57:44 UTC 2016

Modified Files:
src/sys/arch/sparc/stand: Makefile.buildboot Makefile.inc
src/sys/arch/sparc/stand/bootblk: Makefile
src/sys/arch/sparc/stand/ofwboot: Makefile

Log Message:
deal with PIE and SSP


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sparc/stand/Makefile.buildboot
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/stand/Makefile.inc
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sparc/stand/bootblk/Makefile
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sparc/stand/ofwboot/Makefile

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

Modified files:

Index: src/sys/arch/sparc/stand/Makefile.buildboot
diff -u src/sys/arch/sparc/stand/Makefile.buildboot:1.31 src/sys/arch/sparc/stand/Makefile.buildboot:1.32
--- src/sys/arch/sparc/stand/Makefile.buildboot:1.31	Thu Mar 10 04:00:24 2016
+++ src/sys/arch/sparc/stand/Makefile.buildboot	Sat Oct  1 09:57:44 2016
@@ -1,8 +1,12 @@
-#	$NetBSD: Makefile.buildboot,v 1.31 2016/03/10 09:00:24 martin Exp $
+#	$NetBSD: Makefile.buildboot,v 1.32 2016/10/01 13:57:44 christos Exp $
 #
 # This file is for the sparc `boot' and `bootxx' only; it does not
 # currently play well on a 64-bit system.
 
+NOSSP=		# defined
+NOPIE=		# defined
+NOMAN=		# defined
+
 S=	${.CURDIR}/../../../..
 
 .PATH: ${.CURDIR}/../common ${.CURDIR}/../../sparc
@@ -10,7 +14,6 @@ S=	${.CURDIR}/../../../..
 COMMONSOURCE=	srt0.S promdev.c dvma.c promlib.c isfloppy.c
 
 SRCS=		${COMMONSOURCE} ${PROGSOURCE}
-NOMAN=		# defined
 BINMODE=	444
 
 .include 

Index: src/sys/arch/sparc/stand/Makefile.inc
diff -u src/sys/arch/sparc/stand/Makefile.inc:1.13 src/sys/arch/sparc/stand/Makefile.inc:1.14
--- src/sys/arch/sparc/stand/Makefile.inc:1.13	Thu May 19 11:41:18 2016
+++ src/sys/arch/sparc/stand/Makefile.inc	Sat Oct  1 09:57:44 2016
@@ -1,9 +1,8 @@
-#	$NetBSD: Makefile.inc,v 1.13 2016/05/19 15:41:18 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.14 2016/10/01 13:57:44 christos Exp $
 
-.ifndef __INCLUDED_STAND_MAKEFILE_INC
-__INCLUDED_STAND_MAKEFILE_INC=
-
-.include 
+NOSSP=		# defined
+NOPIE=		# defined
+NOMAN=		# defined
 
 BINDIR=		/usr/mdec
 NOPIE=		yes
@@ -14,5 +13,3 @@ CFLAGS+=	-ffreestanding ${${ACTIVE_CC} =
 .if ${MACHINE} == "sparc64"
 CPPFLAGS+=	-DSUN4U
 .endif
-
-.endif

Index: src/sys/arch/sparc/stand/bootblk/Makefile
diff -u src/sys/arch/sparc/stand/bootblk/Makefile:1.15 src/sys/arch/sparc/stand/bootblk/Makefile:1.16
--- src/sys/arch/sparc/stand/bootblk/Makefile:1.15	Tue Mar  4 12:57:56 2014
+++ src/sys/arch/sparc/stand/bootblk/Makefile	Sat Oct  1 09:57:44 2016
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.15 2014/03/04 17:57:56 joerg Exp $
+#	$NetBSD: Makefile,v 1.16 2016/10/01 13:57:44 christos Exp $
+
+.include	
 
 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..

Index: src/sys/arch/sparc/stand/ofwboot/Makefile
diff -u src/sys/arch/sparc/stand/ofwboot/Makefile:1.36 src/sys/arch/sparc/stand/ofwboot/Makefile:1.37
--- src/sys/arch/sparc/stand/ofwboot/Makefile:1.36	Mon Oct 26 03:11:33 2015
+++ src/sys/arch/sparc/stand/ofwboot/Makefile	Sat Oct  1 09:57:44 2016
@@ -1,4 +1,6 @@
-#	$NetBSD: Makefile,v 1.36 2015/10/26 07:11:33 mrg Exp $
+#	$NetBSD: Makefile,v 1.37 2016/10/01 13:57:44 christos Exp $
+
+.include 
 
 CURDIR=	${.CURDIR}
 S=	${CURDIR}/../../../..

CVS commit: src/sbin/ifconfig

2016-10-01 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sat Oct  1 15:10:59 UTC 2016

Modified Files:
src/sbin/ifconfig: af_inet.c af_inet6.c

Log Message:
Modernise the output for the address to address/prefix instead
of differring outputs for INET and INET6.
The hex string of the INET netmask was particulary hard to read.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/ifconfig/af_inet.c
cvs rdiff -u -r1.37 -r1.38 src/sbin/ifconfig/af_inet6.c

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

Modified files:

Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.22 src/sbin/ifconfig/af_inet.c:1.23
--- src/sbin/ifconfig/af_inet.c:1.22	Fri Sep 30 16:52:17 2016
+++ src/sbin/ifconfig/af_inet.c	Sat Oct  1 15:10:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: af_inet.c,v 1.22 2016/09/30 16:52:17 roy Exp $	*/
+/*	$NetBSD: af_inet.c,v 1.23 2016/10/01 15:10:58 roy Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.22 2016/09/30 16:52:17 roy Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.23 2016/10/01 15:10:58 roy Exp $");
 #endif /* not lint */
 
 #include  
@@ -64,6 +64,7 @@ static void in_status(prop_dictionary_t,
 static void in_commit_address(prop_dictionary_t, prop_dictionary_t);
 static bool in_addr_tentative(struct ifaddrs *);
 static bool in_addr_tentative_or_detached(struct ifaddrs *);
+static int  in_prefixlen(struct sockaddr *);
 static void in_alias(struct ifaddrs *, prop_dictionary_t, prop_dictionary_t);
 
 static struct afswtch af = {
@@ -73,10 +74,23 @@ static struct afswtch af = {
 	.af_addr_tentative_or_detached = in_addr_tentative_or_detached
 };
 
+static int
+in_prefixlen(struct sockaddr *sa)
+{
+	struct sockaddr_in sin;
+	in_addr_t mask;
+	int cidr;
+
+	memset(&sin, 0, sizeof(sin));
+	memcpy(&sin, sa, sa->sa_len);
+	mask = ntohl(sin.sin_addr.s_addr);
+	cidr = 33 - ffs(mask);
+	return cidr;
+}
+
 static void
 in_alias(struct ifaddrs *ifa, prop_dictionary_t env, prop_dictionary_t oenv)
 {
-	struct sockaddr_in sin;
 	char hbuf[NI_MAXHOST];
 	const int niflag = Nflag ? 0 : NI_NUMERICHOST;
 	char fbuf[1024];
@@ -88,6 +102,7 @@ in_alias(struct ifaddrs *ifa, prop_dicti
 			hbuf, sizeof(hbuf), NULL, 0, niflag))
 		strlcpy(hbuf, "", sizeof(hbuf));	/* some message? */
 	printf("\tinet %s", hbuf);
+	printf("/%d", in_prefixlen(ifa->ifa_netmask));
 
 	if (ifa->ifa_flags & IFF_POINTOPOINT) {
 		if (getnameinfo(ifa->ifa_dstaddr, ifa->ifa_dstaddr->sa_len,
@@ -96,9 +111,6 @@ in_alias(struct ifaddrs *ifa, prop_dicti
 		printf(" -> %s", hbuf);
 	}
 
-	memcpy(&sin, ifa->ifa_netmask, ifa->ifa_netmask->sa_len);
-	printf(" netmask 0x%x", ntohl(sin.sin_addr.s_addr));
-
 	if (ifa->ifa_flags & IFF_BROADCAST) {
 		if (getnameinfo(ifa->ifa_broadaddr, ifa->ifa_broadaddr->sa_len,
 hbuf, sizeof(hbuf), NULL, 0, niflag))

Index: src/sbin/ifconfig/af_inet6.c
diff -u src/sbin/ifconfig/af_inet6.c:1.37 src/sbin/ifconfig/af_inet6.c:1.38
--- src/sbin/ifconfig/af_inet6.c:1.37	Fri Sep 30 16:47:56 2016
+++ src/sbin/ifconfig/af_inet6.c	Sat Oct  1 15:10:58 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: af_inet6.c,v 1.37 2016/09/30 16:47:56 roy Exp $	*/
+/*	$NetBSD: af_inet6.c,v 1.38 2016/10/01 15:10:58 roy Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: af_inet6.c,v 1.37 2016/09/30 16:47:56 roy Exp $");
+__RCSID("$NetBSD: af_inet6.c,v 1.38 2016/10/01 15:10:58 roy Exp $");
 #endif /* not lint */
 
 #include  
@@ -277,6 +277,9 @@ in6_alias(struct ifaddrs *ifa, prop_dict
 	printf("\tinet6 %s", hbuf);
 	inet6_putscopeid(sin6, INET6_IS_ADDR_LINKLOCAL);
 
+	sin6 = (struct sockaddr_in6 *)ifa->ifa_netmask;
+	printf("/%d", prefix(&sin6->sin6_addr, sizeof(struct in6_addr)));
+
 	if (ifa->ifa_flags & IFF_POINTOPOINT) {
 		sin6 = (struct sockaddr_in6 *)ifa->ifa_dstaddr;
 		inet6_getscopeid(sin6, INET6_IS_ADDR_LINKLOCAL);
@@ -287,10 +290,6 @@ in6_alias(struct ifaddrs *ifa, prop_dict
 		printf(" -> %s", hbuf);
 	}
 
-	sin6 = (struct sockaddr_in6 *)ifa->ifa_netmask;
-	printf(" prefixlen %d", prefix(&sin6->sin6_addr,
-	sizeof(struct in6_addr)));
-
 	(void)snprintb(fbuf, sizeof(fbuf), IN6_IFFBITS, ifa->ifa_addrflags);
 	printf(" flags %s", fbuf);

CVS commit: src/sys/dev

2016-10-01 Thread Felix Deichmann 
Module Name:src
Committed By:   flxd
Date:   Sat Oct  1 15:24:35 UTC 2016

Modified Files:
src/sys/dev: DEVNAMES

Log Message:
Add tcu (MI). OK skrll@


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/sys/dev/DEVNAMES

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/DEVNAMES
diff -u src/sys/dev/DEVNAMES:1.298 src/sys/dev/DEVNAMES:1.299
--- src/sys/dev/DEVNAMES:1.298	Sun May  1 10:21:02 2016
+++ src/sys/dev/DEVNAMES	Sat Oct  1 15:24:35 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: DEVNAMES,v 1.298 2016/05/01 10:21:02 nonaka Exp $
+#	$NetBSD: DEVNAMES,v 1.299 2016/10/01 15:24:35 flxd Exp $
 #
 # This file contains all used device names and defined attributes in
 # alphabetical order. New devices added to the system somewhere should first
@@ -1327,6 +1327,7 @@ tcds			alpha
 tcic			i386
 tcom			MI
 tctrl			sparc
+tcu			MI
 tcx			sparc
 tcx			sparc64
 tdvfb			MI

CVS commit: src/tests/net/if

2016-10-01 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sat Oct  1 15:35:22 UTC 2016

Modified Files:
src/tests/net/if: t_ifconfig.sh

Log Message:
Adjust tests to new output. Wait for DaD to finish before pinging.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/net/if/t_ifconfig.sh

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

Modified files:

Index: src/tests/net/if/t_ifconfig.sh
diff -u src/tests/net/if/t_ifconfig.sh:1.12 src/tests/net/if/t_ifconfig.sh:1.13
--- src/tests/net/if/t_ifconfig.sh:1.12	Wed Sep 14 16:18:31 2016
+++ src/tests/net/if/t_ifconfig.sh	Sat Oct  1 15:35:22 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconfig.sh,v 1.12 2016/09/14 16:18:31 christos Exp $
+# $NetBSD: t_ifconfig.sh,v 1.13 2016/10/01 15:35:22 roy Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -233,13 +233,14 @@ ifconfig_parameters_body()
 	atf_check -s ignore -o ignore -e match:'down' rump.ping -c 1 \
 	-w $TIMEOUT -n 192.168.0.2
 	atf_check -s exit:0 rump.ifconfig shmif0 up
+	atf_check -s exit:0 rump.ifconfig -w 10
 	atf_check -s exit:0 -o ignore rump.ping -c 1 -w $TIMEOUT -n 192.168.0.2
 
 	# alias
 	atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1/24 alias
-	atf_check -s exit:0 -o match:'alias 192.168.1.1' rump.ifconfig shmif0
+	atf_check -s exit:0 -o match:'192.168.1.1/24' rump.ifconfig shmif0
 	atf_check -s exit:0 rump.ifconfig shmif0 inet 192.168.1.1/24 -alias
-	atf_check -s exit:0 -o not-match:'192.168.1.1' rump.ifconfig shmif0
+	atf_check -s exit:0 -o not-match:'192.168.1.1/24' rump.ifconfig shmif0
 	atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::1
 	atf_check -s exit:0 rump.ifconfig shmif0 inet6 fc00::2
 	atf_check -s exit:0 -o match:'fc00::1' rump.ifconfig shmif0 inet6

CVS commit: src/sys/netinet

2016-10-01 Thread Roy Marples 
Module Name:src
Committed By:   roy
Date:   Sat Oct  1 17:17:21 UTC 2016

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

Log Message:
Default netmask to /32 for INET on POINTOPOINT links if not specified.


To generate a diff of this commit:
cvs rdiff -u -r1.185 -r1.186 src/sys/netinet/in.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.c
diff -u src/sys/netinet/in.c:1.185 src/sys/netinet/in.c:1.186
--- src/sys/netinet/in.c:1.185	Thu Sep 29 15:18:18 2016
+++ src/sys/netinet/in.c	Sat Oct  1 17:17:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in.c,v 1.185 2016/09/29 15:18:18 roy Exp $	*/
+/*	$NetBSD: in.c,v 1.186 2016/10/01 17:17:20 roy Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.185 2016/09/29 15:18:18 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.186 2016/10/01 17:17:20 roy Exp $");
 
 #include "arp.h"
 
@@ -1122,7 +1122,9 @@ in_ifinit(struct ifnet *ifp, struct in_i
 	in_ifaddlocal(&ia->ia_ifa);
 
 	i = ia->ia_addr.sin_addr.s_addr;
-	if (IN_CLASSA(i))
+	if (ifp->if_flags & IFF_POINTOPOINT)
+		ia->ia_netmask = INADDR_BROADCAST;	/* default to /32 */
+	else if (IN_CLASSA(i))
 		ia->ia_netmask = IN_CLASSA_NET;
 	else if (IN_CLASSB(i))
 		ia->ia_netmask = IN_CLASSB_NET;

CVS commit: src/tests/net/if_tun

2016-10-01 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sat Oct  1 20:18:06 UTC 2016

Modified Files:
src/tests/net/if_tun: t_tun.sh

Log Message:
Compensate for the new world order of ifconfig output format,
and the new default netmask for point to point links.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/if_tun/t_tun.sh

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

Modified files:

Index: src/tests/net/if_tun/t_tun.sh
diff -u src/tests/net/if_tun/t_tun.sh:1.2 src/tests/net/if_tun/t_tun.sh:1.3
--- src/tests/net/if_tun/t_tun.sh:1.2	Mon Sep  5 04:35:46 2016
+++ src/tests/net/if_tun/t_tun.sh	Sat Oct  1 20:18:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_tun.sh,v 1.2 2016/09/05 04:35:46 ozaki-r Exp $
+#	$NetBSD: t_tun.sh,v 1.3 2016/10/01 20:18:06 kre Exp $
 #
 # Copyright (c) 2016 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -110,8 +110,7 @@ tun_setup_body()
 	atf_check -s exit:0 rump.ifconfig tun0 create
 	atf_check -s exit:0 rump.ifconfig tun0 ${IP_LOCAL} ${IP_REMOTE} up
 	atf_check -s exit:0 \
-	-o match:"inet ${IP_LOCAL} -> ${IP_REMOTE} netmask 0xff00" \
-	rump.ifconfig tun0
+	-o match:"inet ${IP_LOCAL}/32 -> ${IP_REMOTE}" rump.ifconfig tun0
 	$DEBUG && rump.netstat -nr -f inet
 	check_route_entry ${IP_REMOTE} ${IP_LOCAL} UH tun0
 
@@ -119,8 +118,7 @@ tun_setup_body()
 	atf_check -s exit:0 rump.ifconfig tun0 create
 	atf_check -s exit:0 rump.ifconfig tun0 ${IP_REMOTE} ${IP_LOCAL} up
 	atf_check -s exit:0 \
-	-o match:"inet ${IP_REMOTE} -> ${IP_LOCAL} netmask 0xff00" \
-	rump.ifconfig tun0
+	-o match:"inet ${IP_REMOTE}/32 -> ${IP_LOCAL}" rump.ifconfig tun0
 	$DEBUG && rump.netstat -nr -f inet
 	check_route_entry ${IP_LOCAL} ${IP_REMOTE} UH tun0
 }

CVS commit: src/sbin/ifconfig

2016-10-01 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sat Oct  1 20:59:49 UTC 2016

Modified Files:
src/sbin/ifconfig: af_inet.c

Log Message:
Return to printing explicit "netmask 0x" in the case that the
mask set is non-contiguous.   We don't prohibit setting such things
(even if they are basically useless) so they can be set by accident.
ifconfig ifN 10.0.0.1 netmask 225.0.0.0
produced
ifN .. inet 10.0.0.1/8
with the previous form (since 225 is 0xE1), now it produces
ifN ... inet 10.0.0.1 netmask 0xe100

If the "netmask" form ever appears in ifconfig output, it (now)
means that the netmask is non-contig, which should make that case
obvious (whther intended, or set by accident)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sbin/ifconfig/af_inet.c

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

Modified files:

Index: src/sbin/ifconfig/af_inet.c
diff -u src/sbin/ifconfig/af_inet.c:1.23 src/sbin/ifconfig/af_inet.c:1.24
--- src/sbin/ifconfig/af_inet.c:1.23	Sat Oct  1 15:10:58 2016
+++ src/sbin/ifconfig/af_inet.c	Sat Oct  1 20:59:49 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: af_inet.c,v 1.23 2016/10/01 15:10:58 roy Exp $	*/
+/*	$NetBSD: af_inet.c,v 1.24 2016/10/01 20:59:49 kre Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -31,7 +31,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: af_inet.c,v 1.23 2016/10/01 15:10:58 roy Exp $");
+__RCSID("$NetBSD: af_inet.c,v 1.24 2016/10/01 20:59:49 kre Exp $");
 #endif /* not lint */
 
 #include  
@@ -64,6 +64,7 @@ static void in_status(prop_dictionary_t,
 static void in_commit_address(prop_dictionary_t, prop_dictionary_t);
 static bool in_addr_tentative(struct ifaddrs *);
 static bool in_addr_tentative_or_detached(struct ifaddrs *);
+static in_addr_t in_netmask(struct sockaddr *);;
 static int  in_prefixlen(struct sockaddr *);
 static void in_alias(struct ifaddrs *, prop_dictionary_t, prop_dictionary_t);
 
@@ -74,17 +75,34 @@ static struct afswtch af = {
 	.af_addr_tentative_or_detached = in_addr_tentative_or_detached
 };
 
+static in_addr_t
+in_netmask(struct sockaddr *sa)
+{
+	struct sockaddr_in sin;
+
+	memset(&sin, 0, sizeof(sin));
+	memcpy(&sin, sa, sa->sa_len);
+	return ntohl(sin.sin_addr.s_addr);
+}
+
 static int
 in_prefixlen(struct sockaddr *sa)
 {
-	struct sockaddr_in sin;
 	in_addr_t mask;
 	int cidr;
 
-	memset(&sin, 0, sizeof(sin));
-	memcpy(&sin, sa, sa->sa_len);
-	mask = ntohl(sin.sin_addr.s_addr);
-	cidr = 33 - ffs(mask);
+	mask = in_netmask(sa);
+	if (mask == 0)			/* mask 0 ==> /0 */
+		return 0;
+
+	cidr = 33 - ffs(mask);		/* 33 - (1 .. 32) -> 32 .. 1 */
+
+	if (cidr < 32) {		/* more than 1 bit in mask */
+		/* check for non-contig netmask */
+		if ((mask ^ (((1 << cidr) - 1) << (32 - cidr))) != 0)
+			return -1;	/* noncontig, no pfxlen */
+	}
+
 	return cidr;
 }
 
@@ -93,6 +111,7 @@ in_alias(struct ifaddrs *ifa, prop_dicti
 {
 	char hbuf[NI_MAXHOST];
 	const int niflag = Nflag ? 0 : NI_NUMERICHOST;
+	int pfxlen;
 	char fbuf[1024];
 
 	if (lflag)
@@ -102,7 +121,9 @@ in_alias(struct ifaddrs *ifa, prop_dicti
 			hbuf, sizeof(hbuf), NULL, 0, niflag))
 		strlcpy(hbuf, "", sizeof(hbuf));	/* some message? */
 	printf("\tinet %s", hbuf);
-	printf("/%d", in_prefixlen(ifa->ifa_netmask));
+	pfxlen = in_prefixlen(ifa->ifa_netmask);
+	if (pfxlen >= 0)
+		printf("/%d", pfxlen);
 
 	if (ifa->ifa_flags & IFF_POINTOPOINT) {
 		if (getnameinfo(ifa->ifa_dstaddr, ifa->ifa_dstaddr->sa_len,
@@ -111,6 +132,9 @@ in_alias(struct ifaddrs *ifa, prop_dicti
 		printf(" -> %s", hbuf);
 	}
 
+	if (pfxlen < 0)
+		printf(" netmask %#x", in_netmask(ifa->ifa_netmask));
+
 	if (ifa->ifa_flags & IFF_BROADCAST) {
 		if (getnameinfo(ifa->ifa_broadaddr, ifa->ifa_broadaddr->sa_len,
 hbuf, sizeof(hbuf), NULL, 0, niflag))

CVS commit: src/sys/arch/x86/pci

2016-10-01 Thread matthew green 
Module Name:src
Committed By:   mrg
Date:   Sat Oct  1 21:51:53 UTC 2016

Modified Files:
src/sys/arch/x86/pci: pchb.c

Log Message:
use 4-byte style accesses, should hopefully fix PR#37787.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/x86/pci/pchb.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/x86/pci/pchb.c
diff -u src/sys/arch/x86/pci/pchb.c:1.34 src/sys/arch/x86/pci/pchb.c:1.35
--- src/sys/arch/x86/pci/pchb.c:1.34	Mon Apr 16 04:57:42 2012
+++ src/sys/arch/x86/pci/pchb.c	Sat Oct  1 21:51:52 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pchb.c,v 1.34 2012/04/16 04:57:42 pgoyette Exp $ */
+/*	$NetBSD: pchb.c,v 1.35 2016/10/01 21:51:52 mrg Exp $ */
 
 /*-
  * Copyright (c) 1996, 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.34 2012/04/16 04:57:42 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.35 2016/10/01 21:51:52 mrg Exp $");
 
 #include 
 #include 
@@ -61,13 +61,13 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.3
 #define	I82443BX_SDRAMC_REG	0x74 /* upper 16 bits */
 
 /* XXX should be in dev/ic/i82424{reg.var}.h */
-#define I82424_CPU_BCTL_REG		0x53
+#define I82424_CPU_BCTL_REG		0x50 /* upper 8 bits */
 #define I82424_PCI_BCTL_REG		0x54
 
-#define I82424_BCTL_CPUMEM_POSTEN	0x01
-#define I82424_BCTL_CPUPCI_POSTEN	0x02
-#define I82424_BCTL_PCIMEM_BURSTEN	0x01
-#define I82424_BCTL_PCI_BURSTEN		0x02
+#define I82424_BCTL_CPUMEM_POSTEN	0x0100
+#define I82424_BCTL_CPUPCI_POSTEN	0x0200
+#define I82424_BCTL_PCIMEM_BURSTEN	0x0100
+#define I82424_BCTL_PCI_BURSTEN		0x0200
 
 static int	pchbmatch(device_t, cfdata_t, void *);
 static void	pchbattach(device_t, device_t, void *);

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

2016-10-01 Thread Maya Rashish 
Module Name:xsrc
Committed By:   maya
Date:   Sat Oct  1 22:02:17 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_utility.c

Log Message:
add const. we aren't modifying the values here.
fixes new xorg-server build error


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c:1.1.1.3 xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c:1.2
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c:1.1.1.3	Mon Jun  3 08:43:21 2013
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c	Sat Oct  1 22:02:17 2016
@@ -850,7 +850,7 @@ SISGetMergedModeDetails(ScrnInfoPtr pScr
  ***/
 
 static void
-sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, char *mystring)
+sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, const char *mystring)
 {
int slen = 0;
sdcbuf->sdc_buffer[0] = 0;

CVS commit: src/tests/net/if

2016-10-01 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sat Oct  1 22:15:04 UTC 2016

Modified Files:
src/tests/net/if: t_ifconfig.sh

Log Message:
Don't expect ping to complain about sending to a local address
assigned to an interface that's down - instead it just attempts
to send, and the interface never responds (as it would if it were
a remote address).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/net/if/t_ifconfig.sh

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

Modified files:

Index: src/tests/net/if/t_ifconfig.sh
diff -u src/tests/net/if/t_ifconfig.sh:1.13 src/tests/net/if/t_ifconfig.sh:1.14
--- src/tests/net/if/t_ifconfig.sh:1.13	Sat Oct  1 15:35:22 2016
+++ src/tests/net/if/t_ifconfig.sh	Sat Oct  1 22:15:04 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconfig.sh,v 1.13 2016/10/01 15:35:22 roy Exp $
+# $NetBSD: t_ifconfig.sh,v 1.14 2016/10/01 22:15:04 kre Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -230,7 +230,7 @@ ifconfig_parameters_body()
 	rump.ifconfig shmif0
 	# down, up
 	atf_check -s exit:0 rump.ifconfig shmif0 down
-	atf_check -s ignore -o ignore -e match:'down' rump.ping -c 1 \
+	atf_check -s not-exit:0 -o ignore -e ignore rump.ping -c 1 \
 	-w $TIMEOUT -n 192.168.0.2
 	atf_check -s exit:0 rump.ifconfig shmif0 up
 	atf_check -s exit:0 rump.ifconfig -w 10

CVS commit: xsrc/external/mit/xorg-server/dist

2016-10-01 Thread Maya Rashish 
Module Name:xsrc
Committed By:   maya
Date:   Sat Oct  1 22:16:25 UTC 2016

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86xv.h
xsrc/external/mit/xorg-server/dist/include: displaymode.h

Log Message:
don't use const char for these types, many drivers write to them.

ok mrg


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xorg-server/dist/include/displaymode.h

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h:1.1.1.4	Wed Aug 10 07:44:34 2016
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86xv.h	Sat Oct  1 22:16:25 2016
@@ -106,7 +106,7 @@ typedef enum {
 
 typedef struct {
 int id;
-const char *name;
+/*const*/ char *name; /* dozens of drivers write to this value */
 unsigned short width, height;
 XvRationalRec rate;
 } XF86VideoEncodingRec, *XF86VideoEncodingPtr;

Index: xsrc/external/mit/xorg-server/dist/include/displaymode.h
diff -u xsrc/external/mit/xorg-server/dist/include/displaymode.h:1.1.1.1 xsrc/external/mit/xorg-server/dist/include/displaymode.h:1.2
--- xsrc/external/mit/xorg-server/dist/include/displaymode.h:1.1.1.1	Wed Aug 10 07:44:32 2016
+++ xsrc/external/mit/xorg-server/dist/include/displaymode.h	Sat Oct  1 22:16:25 2016
@@ -55,7 +55,8 @@ typedef enum {
 typedef struct _DisplayModeRec {
 struct _DisplayModeRec *prev;
 struct _DisplayModeRec *next;
-const char *name;   /* identifier for the mode */
+/* dozens of drivers write to this value */
+/*const*/ char *name;   /* identifier for the mode */
 ModeStatus status;
 int type;

CVS commit: src/tests/net/net

2016-10-01 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sun Oct  2 04:29:25 UTC 2016

Modified Files:
src/tests/net/net: t_ipv6address.sh

Log Message:
More adaptation to new ifconfig output format - prefix length is now
appended to the address, rather than a second parameter, so needs to be
deleted if just the bare address is what we want (which it is here).


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/net/t_ipv6address.sh

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

Modified files:

Index: src/tests/net/net/t_ipv6address.sh
diff -u src/tests/net/net/t_ipv6address.sh:1.7 src/tests/net/net/t_ipv6address.sh:1.8
--- src/tests/net/net/t_ipv6address.sh:1.7	Wed Aug 10 21:33:52 2016
+++ src/tests/net/net/t_ipv6address.sh	Sun Oct  2 04:29:25 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ipv6address.sh,v 1.7 2016/08/10 21:33:52 kre Exp $
+#	$NetBSD: t_ipv6address.sh,v 1.8 2016/10/02 04:29:25 kre Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -202,7 +202,7 @@ get_lladdr()
 {
 	export RUMP_SERVER=${1}
 	rump.ifconfig ${2} inet6 | grep "fe80" \
-	| awk '{print $2}' | sed -e "s/%$2//g"
+	| awk '{print $2}' | sed -e "s/%$2//g" -e 's;/[0-9]*$;;'
 	unset RUMP_SERVER
 
 	return 0

CVS commit: src/tests/net/icmp

2016-10-01 Thread Robert Elz 
Module Name:src
Committed By:   kre
Date:   Sun Oct  2 04:46:07 UTC 2016

Modified Files:
src/tests/net/icmp: t_icmp6_redirect.sh

Log Message:
More adaptation to changed ifconfig output format.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/icmp/t_icmp6_redirect.sh

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

Modified files:

Index: src/tests/net/icmp/t_icmp6_redirect.sh
diff -u src/tests/net/icmp/t_icmp6_redirect.sh:1.2 src/tests/net/icmp/t_icmp6_redirect.sh:1.3
--- src/tests/net/icmp/t_icmp6_redirect.sh:1.2	Wed Aug 10 22:17:44 2016
+++ src/tests/net/icmp/t_icmp6_redirect.sh	Sun Oct  2 04:46:07 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: t_icmp6_redirect.sh,v 1.2 2016/08/10 22:17:44 kre Exp $
+#	$NetBSD: t_icmp6_redirect.sh,v 1.3 2016/10/02 04:46:07 kre Exp $
 #
 # Copyright (c) 2015 Internet Initiative Japan Inc.
 # All rights reserved.
@@ -50,7 +50,8 @@ get_lladdr()
 {
 
 	export RUMP_SERVER=${1}
-	rump.ifconfig ${2} inet6 | awk "/fe80/ {sub(/%$2/, \"\"); print \$2;}"
+	rump.ifconfig ${2} inet6 |
+	awk "/fe80/ {sub(/%$2/, \"\"); sub(/\\/[0-9]*/, \"\"); print \$2;}"
 	unset RUMP_SERVER
 
 	return 0