date:20190315

CVS commit: src/sys/dev/pci

2019-03-15 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Sat Mar 16 04:41:09 UTC 2019

Modified Files:
src/sys/dev/pci: auvia.c

Log Message:
Fix (probably) typo.  SLINEAR_LE -> ULINEAR_LE.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/auvia.c

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

Modified files:

Index: src/sys/dev/pci/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.80 src/sys/dev/pci/auvia.c:1.81
--- src/sys/dev/pci/auvia.c:1.80	Sun Dec  9 11:14:01 2018
+++ src/sys/dev/pci/auvia.c	Sat Mar 16 04:41:09 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: auvia.c,v 1.80 2018/12/09 11:14:01 jdolecek Exp $	*/
+/*	$NetBSD: auvia.c,v 1.81 2019/03/16 04:41:09 isaki Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.80 2018/12/09 11:14:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.81 2019/03/16 04:41:09 isaki Exp $");
 
 #include 
 #include 
@@ -259,7 +259,7 @@ static const struct audio_format auvia_f
 	 2, AUFMT_STEREO, 0, {8000, 48000}},
 	{NULL, AUMODE_PLAY, AUDIO_ENCODING_ULINEAR_LE, 8, 8,
 	 4, AUFMT_SURROUND4, 0, {8000, 48000}},
-	{NULL, AUMODE_PLAY, AUDIO_ENCODING_SLINEAR_LE, 8, 8,
+	{NULL, AUMODE_PLAY, AUDIO_ENCODING_ULINEAR_LE, 8, 8,
 	 6, AUFMT_DOLBY_5_1, 0, {8000, 48000}},
 };

CVS commit: src/sys/dev/isa

2019-03-15 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Sat Mar 16 04:36:19 UTC 2019

Modified Files:
src/sys/dev/isa: aria.c

Log Message:
Swap wrong ordered halt_input and halt_output (since rev1.1).
But I guess that it didn't lead a big impact.  Because hw_if->close
is called immediately after that in most cases.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/isa/aria.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/isa/aria.c
diff -u src/sys/dev/isa/aria.c:1.37 src/sys/dev/isa/aria.c:1.38
--- src/sys/dev/isa/aria.c:1.37	Sat Oct 27 17:18:23 2012
+++ src/sys/dev/isa/aria.c	Sat Mar 16 04:36:19 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: aria.c,v 1.37 2012/10/27 17:18:23 chs Exp $	*/
+/*	$NetBSD: aria.c,v 1.38 2019/03/16 04:36:19 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996, 1998 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.37 2012/10/27 17:18:23 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aria.c,v 1.38 2019/03/16 04:36:19 isaki Exp $");
 
 #include 
 #include 
@@ -212,8 +212,8 @@ const struct audio_hw_if aria_hw_if = {
 	NULL,
 	aria_start_output,
 	aria_start_input,
-	aria_halt_input,
 	aria_halt_output,
+	aria_halt_input,
 	NULL,
 	aria_getdev,
 	NULL,

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

2019-03-15 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Sat Mar 16 04:31:25 UTC 2019

Modified Files:
src/sys/arch/i386/conf: ALL

Log Message:
Remove duplicated option.


To generate a diff of this commit:
cvs rdiff -u -r1.464 -r1.465 src/sys/arch/i386/conf/ALL

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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.464 src/sys/arch/i386/conf/ALL:1.465
--- src/sys/arch/i386/conf/ALL:1.464	Sun Feb 24 20:56:27 2019
+++ src/sys/arch/i386/conf/ALL	Sat Mar 16 04:31:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.464 2019/02/24 20:56:27 kamil Exp $
+# $NetBSD: ALL,v 1.465 2019/03/16 04:31:25 isaki Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.464 $"
+#ident		"ALL-$Revision: 1.465 $"
 
 maxusers	64		# estimated number of users
 
@@ -110,7 +110,6 @@ options 	BUFQ_PRIOCSCAN
 # Diagnostic/debugging support options
 options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 options 	DEBUG		# expensive debugging checks/support
-options		KUBSAN		# Kernel Undefined Behavior Sanitizer (kUBSan)
 options 	LOCKDEBUG	# expensive locking checks/support
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'

CVS commit: src/sys/dev/pckbport

2019-03-15 Thread Ryo ONODERA

Module Name:src
Committed By:   ryoon
Date:   Sat Mar 16 03:27:15 UTC 2019

Modified Files:
src/sys/dev/pckbport: alps.c

Log Message:
Support more ALPS V2 devices

* The V2 devices found in Toshiba dynabook satellite B551/D and
  dynabook SS RX1/T8E.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pckbport/alps.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/pckbport/alps.c
diff -u src/sys/dev/pckbport/alps.c:1.10 src/sys/dev/pckbport/alps.c:1.11
--- src/sys/dev/pckbport/alps.c:1.10	Tue Jun 19 23:25:59 2018
+++ src/sys/dev/pckbport/alps.c	Sat Mar 16 03:27:15 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: alps.c,v 1.10 2018/06/19 23:25:59 uwe Exp $ */
+/* $NetBSD: alps.c,v 1.11 2019/03/16 03:27:15 ryoon Exp $ */
 
 /*-
  * Copyright (c) 2017 Ryo ONODERA 
@@ -30,7 +30,7 @@
 #include "opt_pms.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: alps.c,v 1.10 2018/06/19 23:25:59 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: alps.c,v 1.11 2019/03/16 03:27:15 ryoon Exp $");
 
 #include 
 #include 
@@ -714,8 +714,10 @@ pms_alps_probe_init(void *opaque)
 		/* V7 device in Toshiba dynabook R63/PS */
 		sc->version = ALPS_PROTO_V7;
 	} else if ((e7sig[0] == 0x73) && (e7sig[1] == 0x02) &&
-		(e7sig[2] == 0x14)) {
-		/* V2 device in NEC VJ22MF-7 (VersaPro JVF-7) */
+		((e7sig[2] == 0x14) || (e7sig[2] == 0x0a))) {
+		/* 0x14: V2 device in NEC VJ22MF-7 (VersaPro JVF-7) */
+		/* 0x0a: V2 devices in Toshiba dynabook satellite B551/D
+			 and dynabook SS RX1 */
 		sc->version = ALPS_PROTO_V2;
 	}

CVS commit: src/sys/dev/pci

2019-03-15 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Fri Mar 15 22:09:21 UTC 2019

Modified Files:
src/sys/dev/pci: radeonfbreg.h

Log Message:
moar registers


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/radeonfbreg.h

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

Modified files:

Index: src/sys/dev/pci/radeonfbreg.h
diff -u src/sys/dev/pci/radeonfbreg.h:1.6 src/sys/dev/pci/radeonfbreg.h:1.7
--- src/sys/dev/pci/radeonfbreg.h:1.6	Wed Aug 23 19:21:14 2017
+++ src/sys/dev/pci/radeonfbreg.h	Fri Mar 15 22:09:21 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: radeonfbreg.h,v 1.6 2017/08/23 19:21:14 macallan Exp $	*/
+/*	$NetBSD: radeonfbreg.h,v 1.7 2019/03/15 22:09:21 macallan Exp $	*/
 
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_reg.h,v 1.31 2003/11/10 18:41:23 tsi Exp $ */
 /*
@@ -218,6 +218,7 @@
 #	define RADEON_BUS_MSTR_RD_MULT	 (1 << 20)
 #	define RADEON_BUS_MSTR_RD_LINE	 (1 << 21)
 #	define RADEON_BUS_RETRY_WS_SHIFT	16
+#   define RADEON_BUS_BIOS_DIS_ROM   (1 << 12)
 #define RADEON_BUS_CNTL10x0034
 #   define RADEON_BUS_WAIT_ON_LOCK_EN(1 << 4)
 
@@ -1270,6 +1271,10 @@
 #define RADEON_VID_BUFFER_CONTROL   0x0900
 #define RADEON_VIDEOMUX_CNTL0x0190
 #define RADEON_VIPH_CONTROL 0x0c40 /* ? */
+#   define RADEON_VIP_BUSY 0
+#   define RADEON_VIP_IDLE 1
+#   define RADEON_VIP_RESET 2
+#   define RADEON_VIPH_EN   (1 << 21)
 
 #define RADEON_WAIT_UNTIL   0x1720
 #   define RADEON_WAIT_CRTC_PFLIP   (1 << 0)
@@ -2141,7 +2146,10 @@
 #   define RADEON_VF_NUM_VERTICES_SHIFT   16
 
 #define RADEON_SE_PORT_DATA0			0x2000
- 
+#define RADEON_SEPROM_CNTL1			0x01c0
+#   define RADEON_SCK_PRESCALE_SHIFT	24
+#   define RADEON_SCK_PRESCALE_MASK	(0xff << 24)
+
 #define R200_SE_VAP_CNTL			0x2080
 #   define R200_VAP_TCL_ENABLE		0x0001
 #   define R200_VAP_SINGLE_BUF_STATE_ENABLE	0x0010
@@ -2611,6 +2619,9 @@
 #define R200_SE_VTX_STATE_CNTL			0x2180
 #   define R200_UPDATE_USER_COLOR_0_ENA_MASK (1<<16)
 
+#define R300_CRTC_TILE_X0_Y0	0x0350
+#define R300_CRTC2_TILE_X0_Y0	0x0358
+
 /* Registers for CP and Microcode Engine */
 #define RADEON_CP_ME_RAM_ADDR   0x07d4
 #define RADEON_CP_ME_RAM_RADDR  0x07d8

CVS commit: [netbsd-8] src/doc

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:51:53 UTC 2019

Modified Files:
src/doc [netbsd-8]: CHANGES-8.1

Log Message:
Tickets #1214 - #1217


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-8.1

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

Modified files:

Index: src/doc/CHANGES-8.1
diff -u src/doc/CHANGES-8.1:1.1.2.117 src/doc/CHANGES-8.1:1.1.2.118
--- src/doc/CHANGES-8.1:1.1.2.117	Wed Mar 13 10:53:16 2019
+++ src/doc/CHANGES-8.1	Fri Mar 15 14:51:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.1,v 1.1.2.117 2019/03/13 10:53:16 msaitoh Exp $
+# $NetBSD: CHANGES-8.1,v 1.1.2.118 2019/03/15 14:51:53 martin Exp $
 
 A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1
 release:
@@ -2710,3 +2710,26 @@ sys/arch/mvme68k/dev/pcctwo_68k.c		1.11
 
 	Fix small (but fatal) oversight in device/softc split.
 	[martin, ticket #1213]
+
+lib/libcurses/get_wch.c1.21
+lib/libcurses/getch.c1.71
+
+	Rename global variable "state" to "_cursesi_state".
+	[rin, ticket #1214]
+
+sys/net/route.c	1.217
+
+	Add missing ifa_release on error paths.
+	[ozaki-r, ticket #1215]
+
+sys/net/if_ipsec.c1.21
+
+	Fix ipsecif(4) memory leak in some ioctl cases.
+	[knakahara, ticket #1216]
+
+sys/dev/pci/mpii.c1.22
+
+	Fix mpii(4) to adhere to physio diagnostic invariant that
+	fully processed data must not post an error.
+	[kardel, ticket #1217]
+

CVS commit: [netbsd-8] src/sys/dev/pci

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:50:36 UTC 2019

Modified Files:
src/sys/dev/pci [netbsd-8]: mpii.c

Log Message:
Pull up following revision(s) (requested by kardel in ticket #1217):

sys/dev/pci/mpii.c: revision 1.22

PR/54045

fix mpii to adhere to physio diagnostic invariant that
fully processed data must not post an error:

1) verify expected scspi state via KASSERT() instead of just
setting the variables.
2) set xs->resid only in known good conditions
3) insure setting errors in all error paths and refrain
from clearing xs->resid in error paths.

While there do some cosmectic clean up:
1) extend and relocate some debug output
2) mpii HBAs can also manage non-disk devices like tapes etc,
so log that physical "devices" instead of physical "disks" are
attached or detached.

Tested with NEOSeries FlexStor II and luckily a broken tape drive 8-(

mpii0 at pci1 dev 0 function 0: vendor 1000 product 00ab (rev. 0x01)
mpii0: interrupting at irq 11
mpii0: HBA 9400-8i8e, firmware 3.0.4.0, MPI 2.6
mpii0: physical device inserted in slot 9
mpii0: physical device inserted in slot 13
mpii0: physical device inserted in slot 16
st0 at scsibus0 target 9 lun 0:  tape removable
st0: density code 92, variable blocks, write-enabled
ch0 at scsibus0 target 9 lun 1:  changer removable
ch0: 23 slots, 2 drives, 1 picker, 1 portal
st0: tagged queueing
ch0: tagged queueing
st1 at scsibus0 target 13 lun 0:  tape removable
st1: density code 92, variable blocks, write-enabled
st1: tagged queueing
ses0 at scsibus0 target 16 lun 0:  enclosure
services fixed

Note: pullup-8


To generate a diff of this commit:
cvs rdiff -u -r1.8.10.4 -r1.8.10.5 src/sys/dev/pci/mpii.c

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

Modified files:

Index: src/sys/dev/pci/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.8.10.4 src/sys/dev/pci/mpii.c:1.8.10.5
--- src/sys/dev/pci/mpii.c:1.8.10.4	Mon Jan  7 13:49:39 2019
+++ src/sys/dev/pci/mpii.c	Fri Mar 15 14:50:36 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.8.10.4 2019/01/07 13:49:39 martin Exp $ */
+/* $NetBSD: mpii.c,v 1.8.10.5 2019/03/15 14:50:36 martin Exp $ */
 /*	OpenBSD: mpii.c,v 1.115 2012/04/11 13:29:14 naddy Exp 	*/
 /*
  * Copyright (c) 2010 Mike Belopuhov 
@@ -20,7 +20,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.4 2019/01/07 13:49:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.8.10.5 2019/03/15 14:50:36 martin Exp $");
 
 #include "bio.h"
 
@@ -1920,7 +1920,7 @@ mpii_event_sas(struct mpii_softc *sc, st
 free(dev, M_DEVBUF);
 break;
 			}
-			printf("%s: physical disk inserted in slot %d\n",
+			printf("%s: physical device inserted in slot %d\n",
 			DEVNAME(sc), dev->slot);
 			mutex_exit(>sc_devs_mtx);
 			break;
@@ -1994,7 +1994,7 @@ mpii_event_sas_work(struct work *wq, voi
 }
 
 printf(
-"%s: physical disk removed from slot %d\n",
+"%s: physical device removed from slot %d\n",
 DEVNAME(sc), dev->slot);
 mpii_remove_dev(sc, dev);
 mutex_exit(>sc_devs_mtx);
@@ -3021,8 +3021,8 @@ mpii_scsipi_request(struct scsipi_channe
 		scsipi_done(xs);
 		return;
 	}
-	DNPRINTF(MPII_D_CMD, "%s: ccb_smid: %d xs->xs_control: 0x%x\n",
-	DEVNAME(sc), ccb->ccb_smid, xs->xs_control);
+	DNPRINTF(MPII_D_CMD, "%s: ccb_smid: %d xs->cmd->opcode: 0x%02x xs->xs_control: 0x%x\n",
+	DEVNAME(sc), ccb->ccb_smid, xs->cmd->opcode, xs->xs_control);
 
 	ccb->ccb_cookie = xs;
 	ccb->ccb_done = mpii_scsi_cmd_done;
@@ -3220,13 +3220,14 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 
 		bus_dmamap_unload(sc->sc_dmat, dmap);
 	}
-
-	xs->error = XS_NOERROR;
-	xs->resid = 0;
-
+	
+	KASSERT(xs->error == XS_NOERROR);
+	KASSERT(xs->resid == xs->datalen);
+	KASSERT(xs->status == SCSI_OK);
+	
 	if (ccb->ccb_rcb == NULL) {
 		/* no scsi error, we're ok so drop out early */
-		xs->status = SCSI_OK;
+		xs->resid = 0;
 		goto done;
 	}
 
@@ -3276,9 +3277,11 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 	case MPII_IOCSTATUS_SCSI_RECOVERED_ERROR:
 		switch (sie->scsi_status) {
 		case MPII_SCSIIO_STATUS_GOOD:
+			xs->resid = 0;
 			break;
 
 		case MPII_SCSIIO_STATUS_CHECK_COND:
+			xs->resid = 0;
 			xs->error = XS_SENSE;
 			break;
 
@@ -3317,12 +3320,14 @@ mpii_scsi_cmd_done(struct mpii_ccb *ccb)
 	if (sie->scsi_state & MPII_SCSIIO_STATE_AUTOSENSE_VALID)
 		memcpy(>sense, sense, sizeof(xs->sense));
 
-	DNPRINTF(MPII_D_CMD, "%s:  xs err: %d status: %#x\n", DEVNAME(sc),
-	xs->error, xs->status);
-
 	mpii_push_reply(sc, ccb->ccb_rcb);
-done:
+
+ done:
 	mpii_put_ccb(sc, ccb);
+
+	DNPRINTF(MPII_D_CMD, "%s: xs err: %d status: %#x len: %d resid: %d\n",
+		 DEVNAME(sc), xs->error, xs->status, xs->datalen, xs->resid);
+
 	scsipi_done(xs);
 }

CVS commit: [netbsd-8] src/sys/net

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:47:22 UTC 2019

Modified Files:
src/sys/net [netbsd-8]: if_ipsec.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1216):

sys/net/if_ipsec.c: revision 1.21

Fix ipsecif(4) memory leak in some ioctl cases.


To generate a diff of this commit:
cvs rdiff -u -r1.3.2.10 -r1.3.2.11 src/sys/net/if_ipsec.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/net/if_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.3.2.10 src/sys/net/if_ipsec.c:1.3.2.11
--- src/sys/net/if_ipsec.c:1.3.2.10	Sun Oct 21 11:55:54 2018
+++ src/sys/net/if_ipsec.c	Fri Mar 15 14:47:22 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ipsec.c,v 1.3.2.10 2018/10/21 11:55:54 martin Exp $  */
+/*	$NetBSD: if_ipsec.c,v 1.3.2.11 2019/03/15 14:47:22 martin Exp $  */
 
 /*
  * Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.10 2018/10/21 11:55:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.11 2019/03/15 14:47:22 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1104,6 +1104,7 @@ if_ipsec_delete_tunnel(struct ifnet *ifp
 		mutex_exit(>ipsec_lock);
 		encap_lock_exit();
 		kmem_free(nvar, sizeof(*nvar));
+		kmem_free(nullvar, sizeof(*nullvar));
 		return;
 	}
 
@@ -1191,6 +1192,8 @@ if_ipsec_ensure_flags(struct ifnet *ifp,
 		/* nothing to do */
 		mutex_exit(>ipsec_lock);
 		encap_lock_exit();
+		kmem_free(nvar, sizeof(*nvar));
+		kmem_free(nullvar, sizeof(*nullvar));
 		return 0;
 	}

CVS commit: [netbsd-8] src/sys/net

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:44:05 UTC 2019

Modified Files:
src/sys/net [netbsd-8]: route.c

Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #1215):

sys/net/route.c: revision 1.217

Add missing ifa_release on error paths


To generate a diff of this commit:
cvs rdiff -u -r1.194.6.12 -r1.194.6.13 src/sys/net/route.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/net/route.c
diff -u src/sys/net/route.c:1.194.6.12 src/sys/net/route.c:1.194.6.13
--- src/sys/net/route.c:1.194.6.12	Tue Nov  6 14:38:58 2018
+++ src/sys/net/route.c	Fri Mar 15 14:44:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: route.c,v 1.194.6.12 2018/11/06 14:38:58 martin Exp $	*/
+/*	$NetBSD: route.c,v 1.194.6.13 2019/03/15 14:44:05 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.194.6.12 2018/11/06 14:38:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: route.c,v 1.194.6.13 2019/03/15 14:44:05 martin Exp $");
 
 #include 
 #ifdef RTFLUSH_DEBUG
@@ -1504,6 +1504,8 @@ rt_update(struct rtentry *rt, struct rt_
 		}
 		if (new_ifa == NULL)
 			ifa_release(ifa, _ifa);
+		/* To avoid ifa_release below */
+		ifa = NULL;
 	}
 	ifa_release(new_ifa, _new_ifa);
 	if (new_ifp && rt->rt_ifp != new_ifp && !if_is_deactivated(new_ifp)) {
@@ -1525,6 +1527,7 @@ rt_update(struct rtentry *rt, struct rt_
 	(void)ifp_changed; /* XXX gcc */
 #endif
 out:
+	ifa_release(ifa, _ifa);
 	if_put(new_ifp, _new_ifp);
 	if_put(ifp, _ifp);

CVS commit: [netbsd-7] src/doc

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:37:33 UTC 2019

Modified Files:
src/doc [netbsd-7]: CHANGES-7.3

Log Message:
Ticket #1686


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.3

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

Modified files:

Index: src/doc/CHANGES-7.3
diff -u src/doc/CHANGES-7.3:1.1.2.43 src/doc/CHANGES-7.3:1.1.2.44
--- src/doc/CHANGES-7.3:1.1.2.43	Wed Mar 13 12:34:15 2019
+++ src/doc/CHANGES-7.3	Fri Mar 15 14:37:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.3,v 1.1.2.43 2019/03/13 12:34:15 msaitoh Exp $
+# $NetBSD: CHANGES-7.3,v 1.1.2.44 2019/03/15 14:37:33 martin Exp $
 
 A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3
 release:
@@ -493,3 +493,10 @@ sys/arch/mvme68k/dev/pcctwo_68k.c		1.11
 
 	Fix small (but fatal) oversight in device/softc split.
 	[martin, ticket #1685]
+
+lib/libcurses/get_wch.c1.21
+lib/libcurses/getch.c1.71
+
+	Rename global variable "state" to "_cursesi_state".
+	[rin, ticket #1686]
+

CVS commit: [netbsd-8] src/lib/libcurses

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:30:19 UTC 2019

Modified Files:
src/lib/libcurses [netbsd-8]: get_wch.c getch.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #1214):

lib/libcurses/get_wch.c: revision 1.21
lib/libcurses/getch.c: revision 1.71

Rename global variable "state" to "_cursesi_state".

Until now, if application happens to have a global variable of the same
name, it was overridden by curses routines. This is the scenario in
which aspell crashes when linked to our curses, reported in pkg/44005.

We need to wipe out global/static variables like "_cursesi_state" or
"wstate" for thread safety. But it would be a future task...

XXX pullup to netbsd-8 and netbsd-7


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.3 -r1.14.4.4 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.65.4.3 -r1.65.4.4 src/lib/libcurses/getch.c

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

Modified files:

Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.14.4.3 src/lib/libcurses/get_wch.c:1.14.4.4
--- src/lib/libcurses/get_wch.c:1.14.4.3	Wed Oct  3 17:49:06 2018
+++ src/lib/libcurses/get_wch.c	Fri Mar 15 14:30:19 2019
@@ -1,4 +1,4 @@
-/*   $NetBSD: get_wch.c,v 1.14.4.3 2018/10/03 17:49:06 martin Exp $ */
+/*   $NetBSD: get_wch.c,v 1.14.4.4 2019/03/15 14:30:19 martin Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.14.4.3 2018/10/03 17:49:06 martin Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.14.4.4 2019/03/15 14:30:19 martin Exp $");
 #endif		  /* not lint */
 
 #include 
@@ -49,9 +49,9 @@ __RCSID("$NetBSD: get_wch.c,v 1.14.4.3 2
 #include "keymap.h"
 
 #ifdef HAVE_WCHAR
-static short   wstate;		  /* state of the wcinkey function */
+static short   wstate;		/* state of the wcinkey function */
 #endif /* HAVE_WCHAR */
-extern short state;		/* storage declared in getch.c */
+extern short _cursesi_state;	/* storage declared in getch.c */
 
 /* prototypes for private functions */
 #ifdef HAVE_WCHAR
@@ -223,7 +223,7 @@ inkey(wchar_t *wc, int to, int delay)
 *wc = inbuf[*start];
 *working = *start = (*start +1) % MAX_CBUF_SIZE;
 if (*start == *end) {
-	state = wstate = INKEY_NORM;
+	_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>NORM, "
@@ -231,7 +231,7 @@ inkey(wchar_t *wc, int to, int delay)
 	*start, *working, *end);
 #endif /* DEBUG */
 } else {
-	state = wstate = INKEY_BACKOUT;
+	_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>BACKOUT, "
@@ -290,7 +290,7 @@ inkey(wchar_t *wc, int to, int delay)
 
 if (*start == *end) {
 	/* only one char processed */
-	state = wstate = INKEY_NORM;
+	_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>NORM, "
@@ -300,7 +300,7 @@ inkey(wchar_t *wc, int to, int delay)
 } else {
 	/* otherwise we must have more than
 	 * one char to backout */
-	state = wstate = INKEY_BACKOUT;
+	_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>BACKOUT, "
@@ -388,7 +388,7 @@ inkey(wchar_t *wc, int to, int delay)
 			}
 
 			if (*start == *end) {	/* only one char processed */
-state = wstate = INKEY_NORM;
+_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 __CTRACE(__CTRACE_INPUT,
 "inkey: Empty cbuf=>NORM, "
@@ -398,7 +398,7 @@ inkey(wchar_t *wc, int to, int delay)
 			} else {
 /* otherwise we must have more than one
  * char to backout */
-state = wstate = INKEY_BACKOUT;
+_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 __CTRACE(__CTRACE_INPUT,
 "inkey: Non-empty cbuf=>BACKOUT, "
@@ -423,7 +423,7 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
 if (*start == *end) {
 	/* if it is go back to normal */
-	state = wstate = INKEY_NORM;
+	_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"[inkey]=>NORM, start(%d), "
@@ -432,7 +432,7 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
 } else {
 	/* otherwise go to backout state */
-	state = wstate = INKEY_BACKOUT;
+	_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"[inkey]=>BACKOUT, start(%d), "

Index: src/lib/libcurses/getch.c
diff -u src/lib/libcurses/getch.c:1.65.4.3 src/lib/libcurses/getch.c:1.65.4.4
--- src/lib/libcurses/getch.c:1.65.4.3	Wed Oct  3 17:49:06 2018
+++ src/lib/libcurses/getch.c	Fri Mar 15 14:30:19 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: getch.c,v 1.65.4.3 2018/10/03 17:49:06 martin Exp $	*/
+/*	$NetBSD: getch.c,v 1.65.4.4 2019/03/15 14:30:19

CVS commit: [netbsd-7] src/lib/libcurses

2019-03-15 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Mar 15 14:36:22 UTC 2019

Modified Files:
src/lib/libcurses [netbsd-7]: get_wch.c getch.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #1686):

lib/libcurses/get_wch.c: revision 1.21
lib/libcurses/getch.c: revision 1.71

Rename global variable "state" to "_cursesi_state".

Until now, if application happens to have a global variable of the same
name, it was overridden by curses routines. This is the scenario in
which aspell crashes when linked to our curses, reported in pkg/44005.

We need to wipe out global/static variables like "_cursesi_state" or
"wstate" for thread safety. But it would be a future task...

XXX pullup to netbsd-8 and netbsd-7


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.10.1 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.59 -r1.59.10.1 src/lib/libcurses/getch.c

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

Modified files:

Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.10 src/lib/libcurses/get_wch.c:1.10.10.1
--- src/lib/libcurses/get_wch.c:1.10	Fri Jun 29 10:40:29 2012
+++ src/lib/libcurses/get_wch.c	Fri Mar 15 14:36:22 2019
@@ -1,4 +1,4 @@
-/*   $NetBSD: get_wch.c,v 1.10 2012/06/29 10:40:29 blymn Exp $ */
+/*   $NetBSD: get_wch.c,v 1.10.10.1 2019/03/15 14:36:22 martin Exp $ */
 
 /*
  * Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.10 2012/06/29 10:40:29 blymn Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.10.10.1 2019/03/15 14:36:22 martin Exp $");
 #endif		  /* not lint */
 
 #include 
@@ -48,9 +48,9 @@ __RCSID("$NetBSD: get_wch.c,v 1.10 2012/
 #include "keymap.h"
 
 #ifdef HAVE_WCHAR
-static short   wstate;		  /* state of the wcinkey function */
+static short   wstate;		/* state of the wcinkey function */
 #endif /* HAVE_WCHAR */
-extern short state;		/* storage declared in getch.c */
+extern short _cursesi_state;	/* storage declared in getch.c */
 
 /* prototypes for private functions */
 #ifdef HAVE_WCHAR
@@ -222,7 +222,7 @@ inkey(wchar_t *wc, int to, int delay)
 *working = *start
 	= ( *start + 1 ) % MAX_CBUF_SIZE;
 if (*start == *end) {
-	state = wstate = INKEY_NORM;
+	_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>NORM, "
@@ -230,7 +230,7 @@ inkey(wchar_t *wc, int to, int delay)
 	*start, *working, *end);
 #endif /* DEBUG */
 } else {
-	state = wstate = INKEY_BACKOUT;
+	_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>BACKOUT, "
@@ -289,7 +289,7 @@ inkey(wchar_t *wc, int to, int delay)
 }
 
 if (*start == *end) {	/* only one char processed */
-	state = wstate = INKEY_NORM;
+	_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>NORM, "
@@ -298,7 +298,7 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
 } else {
 	/* otherwise we must have more than one char to backout */
-	state = wstate = INKEY_BACKOUT;
+	_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"inkey: WCASSEMBLING=>BACKOUT, "
@@ -385,7 +385,7 @@ inkey(wchar_t *wc, int to, int delay)
 			}
 
 			if (*start == *end) {	/* only one char processed */
-state = wstate = INKEY_NORM;
+_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 __CTRACE(__CTRACE_INPUT,
 "inkey: Empty cbuf=>NORM, "
@@ -394,7 +394,7 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
 			} else {
 /* otherwise we must have more than one char to backout */
-state = wstate = INKEY_BACKOUT;
+_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 __CTRACE(__CTRACE_INPUT,
 "inkey: Non-empty cbuf=>BACKOUT, "
@@ -418,7 +418,7 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
 if (*start == *end) {
 	/* if it is go back to normal */
-	state = wstate = INKEY_NORM;
+	_cursesi_state = wstate = INKEY_NORM;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"[inkey]=>NORM, start(%d), "
@@ -427,7 +427,7 @@ inkey(wchar_t *wc, int to, int delay)
 #endif /* DEBUG */
 } else {
 	/* otherwise go to backout state */
-	state = wstate = INKEY_BACKOUT;
+	_cursesi_state = wstate = INKEY_BACKOUT;
 #ifdef DEBUG
 	__CTRACE(__CTRACE_INPUT,
 	"[inkey]=>BACKOUT, start(%d), "

Index: src/lib/libcurses/getch.c
diff -u src/lib/libcurses/getch.c:1.59 src/lib/libcurses/getch.c:1.59.10.1
--- src/lib/libcurses/getch.c:1.59	Sat Apr 21 12:27:28 2012
+++ src/lib/libcurses/getch.c	Fri Mar 15 14:36:22 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: getch.c,v 1.59 2012/04/21 12:27:28 roy Exp $	*/
+/*	$NetBSD: getch.c,v 1.59.10.1 2019/03/15 14:36:22 martin Exp $	*/
 
 /*
  *

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

2019-03-15 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Mar 15 11:45:17 UTC 2019

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

Log Message:
Fix SCF_RSP_R1B test


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/mesongx_mmc.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/mesongx_mmc.c
diff -u src/sys/arch/arm/amlogic/mesongx_mmc.c:1.2 src/sys/arch/arm/amlogic/mesongx_mmc.c:1.3
--- src/sys/arch/arm/amlogic/mesongx_mmc.c:1.2	Sun Mar  3 12:54:58 2019
+++ src/sys/arch/arm/amlogic/mesongx_mmc.c	Fri Mar 15 11:45:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mesongx_mmc.c,v 1.2 2019/03/03 12:54:58 jmcneill Exp $ */
+/* $NetBSD: mesongx_mmc.c,v 1.3 2019/03/15 11:45:17 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.2 2019/03/03 12:54:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesongx_mmc.c,v 1.3 2019/03/15 11:45:17 jmcneill Exp $");
 
 #include 
 #include 
@@ -957,7 +957,7 @@ mesongx_mmc_exec_command(sdmmc_chipset_h
 			cmdflags |= MESONGX_MMC_FLAGS_RESP_128;
 		if ((cmd->c_flags & SCF_RSP_CRC) == 0)
 			cmdflags |= MESONGX_MMC_FLAGS_RESP_NOCRC;
-		if (__SHIFTOUT(cmd->c_flags, SCF_RSP_MASK) == SCF_RSP_R1B)
+		if ((cmd->c_flags & SCF_RSP_MASK) == SCF_RSP_R1B)
 			cmdflags |= MESONGX_MMC_FLAGS_R1B;
 	}

CVS commit: xsrc/external/mit

2019-03-15 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Fri Mar 15 07:58:54 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/mesa/drivers/dri/common:
xmlconfig.c
xsrc/external/mit/MesaLib/dist/src/util: u_process.c

Log Message:
spell it defined(__NetBSD__) so it actually matches and we skip this
pragma warning during the build:

Warning: Per application configuration won't work with your OS version.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/mesa/drivers/dri/common/xmlconfig.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/util/u_process.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/MesaLib.old/dist/src/mesa/drivers/dri/common/xmlconfig.c
diff -u xsrc/external/mit/MesaLib.old/dist/src/mesa/drivers/dri/common/xmlconfig.c:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/mesa/drivers/dri/common/xmlconfig.c:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/mesa/drivers/dri/common/xmlconfig.c:1.1.1.1	Fri Mar  8 10:19:21 2019
+++ xsrc/external/mit/MesaLib.old/dist/src/mesa/drivers/dri/common/xmlconfig.c	Fri Mar 15 07:58:54 2019
@@ -90,7 +90,7 @@ static const char *__getProgramName () {
 #endif
 
 #if !defined(GET_PROGRAM_NAME)
-#if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__) || defined(ANDROID)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__UCLIBC__) || defined(ANDROID)
 /* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.
  * Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's
  * used as a last resort, if there is no documented facility available. */

Index: xsrc/external/mit/MesaLib/dist/src/util/u_process.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_process.c:1.1.1.1 xsrc/external/mit/MesaLib/dist/src/util/u_process.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/util/u_process.c:1.1.1.1	Sun Mar 10 03:42:34 2019
+++ xsrc/external/mit/MesaLib/dist/src/util/u_process.c	Fri Mar 15 07:58:54 2019
@@ -97,7 +97,7 @@ __getProgramName()
 #endif
 
 #if !defined(GET_PROGRAM_NAME)
-#if defined(__OpenBSD__) || defined(NetBSD) || defined(__UCLIBC__) || defined(ANDROID)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__UCLIBC__) || defined(ANDROID)
 /* This is a hack. It's said to work on OpenBSD, NetBSD and GNU.
  * Rogelio M.Serrano Jr. reported it's also working with UCLIBC. It's
  * used as a last resort, if there is no documented facility available. */

CVS commit: src/distrib/sets/lists

2019-03-15 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Fri Mar 15 07:03:36 UTC 2019

Modified Files:
src/distrib/sets/lists/xdebug: shl.mi
src/distrib/sets/lists/xserver: mi

Log Message:
properly mark libmesa_dri.so obsolete in mesa18 x86 builds.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/xserver/mi

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

Modified files:

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.45 src/distrib/sets/lists/xdebug/shl.mi:1.46
--- src/distrib/sets/lists/xdebug/shl.mi:1.45	Fri Mar 15 04:26:13 2019
+++ src/distrib/sets/lists/xdebug/shl.mi	Fri Mar 15 07:03:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.45 2019/03/15 04:26:13 mrg Exp $
+# $NetBSD: shl.mi,v 1.46 2019/03/15 07:03:36 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	-unknown-		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	obsolete		xorg,obsolete
@@ -106,10 +106,12 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug	-unknown-		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug	-unknown-	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	obsolete,machine=amd64,mesa_ver=18
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	obsolete,machine=i386,mesa_ver=18
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	obsolete	obsolete,!machine=i386,!machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=amd64,mesa_ver=10
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	-unknown-	xorg,debug,machine=i386,mesa_ver=10
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug	obsolete	obsolete,xorg,debug,!machine=i386,!machine=amd64
-./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	obsolete	obsolete,xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/dri/libswrast_dri.so.0.debug	obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	-unknown-	xorg,debug,machine=amd64
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	-unknown-	xorg,debug,machine=i386
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/swrast_dri.so.0.debug	-unknown-	xorg,debug

Index: src/distrib/sets/lists/xserver/mi
diff -u src/distrib/sets/lists/xserver/mi:1.39 src/distrib/sets/lists/xserver/mi:1.40
--- src/distrib/sets/lists/xserver/mi:1.39	Fri Mar 15 04:26:13 2019
+++ src/distrib/sets/lists/xserver/mi	Fri Mar 15 07:03:36 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.39 2019/03/15 04:26:13 mrg Exp $
+# $NetBSD: mi,v 1.40 2019/03/15 07:03:36 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -9,10 +9,14 @@
 ./usr/X11R7/lib/modules/dri/gallium_dri.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0		-unknown-	xorg
-./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,machine=amd64,mesa_ver=18
+./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	obsolete,machine=i386,mesa_ver=18
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	xorg,machine=amd64,mesa_ver=10
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so		-unknown-	xorg,machine=i386,mesa_ver=10
-./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,xorg,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,!machine=amd64,!machine=i386
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,machine=amd64,mesa_ver=18
+./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	obsolete,machine=i386,mesa_ver=18
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=amd64,mesa_ver=10
 ./usr/X11R7/lib/modules/dri/libmesa_dri.so.0		-unknown-	xorg,machine=i386,mesa_ver=10
 ./usr/X11R7/lib/modules/dri/swrast_dri.so		-unknown-	xorg

CVS commit: src/sys/dev/pci

CVS commit: src/sys/dev/isa

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

CVS commit: src/sys/dev/pckbport

CVS commit: src/sys/dev/pci

CVS commit: [netbsd-8] src/doc

CVS commit: [netbsd-8] src/sys/dev/pci

CVS commit: [netbsd-8] src/sys/net

CVS commit: [netbsd-8] src/sys/net

CVS commit: [netbsd-7] src/doc

CVS commit: [netbsd-8] src/lib/libcurses

CVS commit: [netbsd-7] src/lib/libcurses

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

CVS commit: xsrc/external/mit

CVS commit: src/distrib/sets/lists

15 matches

Site Navigation

Mail list logo

Footer information