Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)

- Fix for possible unset uid/gid in toproto - Fix for default mtree style - Update libelf - Importing libexecinfo - Resynchronize GCC, mpc, gmp, mpfr - build.sh: Replace params with show-params. This has been done as the make target has been renamed in the same way, while a new target named params has been added. This new target generates a file containing all the parameters, instead of printing it on the console. - Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org) get getservbyport() out of the inner loop Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
2013-12-06 12:04:52 +01:00
parent ff10274392
commit 84d9c625bf
4655 changed files with 379317 additions and 151059 deletions
--- a/sys/dev/Makefile
+++ b/sys/dev/Makefile
@@ -7,7 +7,7 @@ SUBDIR=	apm ata bluetooth dec dm dmover dtv filemon hpc \
 	i2c i2o ic ieee1394 ir isa \
 	microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
 	sun tc usb vme wscons
-.endif
+.endif # defined(__MINIX)

 .include <bsd.own.mk>

@@ -23,6 +23,6 @@ INCS=	biovar.h ccdvar.h cgdvar.h fssvar.h keylock.h kttcpio.h lockstat.h \
 	md.h vndvar.h
 .else
 INCS=	vndvar.h
-.endif
+.endif # !defined(__MINIX)

 .include <bsd.kinc.mk>
--- a/sys/dev/i2c/i2c_io.h
+++ b/sys/dev/i2c/i2c_io.h
@@ -98,8 +98,13 @@ typedef struct i2c_ioctl_exec {
 	void *iie_buf;			/* pointer to data buffer */
 	size_t iie_buflen;		/* length of data buffer */
 } i2c_ioctl_exec_t;
+#if defined(__minix)
 #define	I2C_EXEC_MAX_CMDLEN	128
 #define	I2C_EXEC_MAX_BUFLEN	128
+#else
+#define	I2C_EXEC_MAX_CMDLEN	32
+#define	I2C_EXEC_MAX_BUFLEN	32
+#endif /* defined(__minix) */

 #define	I2C_IOCTL_EXEC		 _IOW('I', 0, i2c_ioctl_exec_t)

--- a/sys/dev/ic/comreg.h
+++ b/sys/dev/ic/comreg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: comreg.h,v 1.17 2011/05/28 19:30:19 matt Exp $	*/
+/*	$NetBSD: comreg.h,v 1.22 2013/10/03 13:23:03 kiyohara Exp $	*/

 /*-
 * Copyright (c) 1991 The Regents of the University of California.
@@ -61,13 +61,18 @@
 #define	IIR_TXRDY	0x2	/* Transmitter ready */
 #define	IIR_MLSC	0x0	/* Modem status */
 #define	IIR_NOPEND	0x1	/* No pending interrupts */
+#define	IIR_64B_FIFO	0x20	/* 64byte FIFO Enabled (16750) */
 #define	IIR_FIFO_MASK	0xc0	/* set if FIFOs are enabled */
+#ifdef COM_16750
+#define IIR_BUSY	0x7	/* Busy indicator */
+#endif

 /* fifo control register */
 #define	FIFO_ENABLE	0x01	/* Turn the FIFO on */
 #define	FIFO_RCV_RST	0x02	/* Reset RX FIFO */
 #define	FIFO_XMT_RST	0x04	/* Reset TX FIFO */
 #define	FIFO_DMA_MODE	0x08
+#define	FIFO_64B_ENABLE	0x20	/* 64byte FIFO Enable (16750) */
 #define	FIFO_TRIGGER_1	0x00	/* Trigger RXRDY intr on 1 character */
 #define	FIFO_TRIGGER_4	0x40	/* ibid 4 */
 #define	FIFO_TRIGGER_8	0x80	/* ibid 8 */
@@ -107,6 +112,7 @@
 #define MCR_PRESCALE	0x80	/* 16650/16950: Baud rate prescaler select */
 #define MCR_TCR_TLR	0x40	/* OMAP: enables access to the TCR & TLR regs */
 #define MCR_XONENABLE	0x20	/* OMAP XON_EN */
+#define MCR_AFE		0x20	/* tl16c750: Flow Control Enable */
 #define	MCR_LOOPBACK	0x10	/* Loop test: echos from TX to RX */
 #define	MCR_IENABLE	0x08	/* Out2: enables UART interrupts */
 #define	MCR_DRS		0x04	/* Out1: resets some internal modems */
--- a/sys/dev/ic/ns16550reg.h
+++ b/sys/dev/ic/ns16550reg.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ns16550reg.h,v 1.7 2005/12/11 12:21:28 christos Exp $	*/
+/*	$NetBSD: ns16550reg.h,v 1.10 2013/10/03 13:23:03 kiyohara Exp $	*/

 /*-
 * Copyright (c) 1991 The Regents of the University of California.
@@ -47,3 +47,11 @@
 #define	com_lsr		5	/* line status register (R/W) */
 #define	com_msr		6	/* modem status register (R/W) */
 #define	com_scratch	7	/* scratch register (R/W) */
+
+/*
+ * Additional register present in NS16750 
+ */
+#ifdef COM_16750
+#define com_usr		31	/* status register (R) */
+#endif
+
--- a/sys/dev/videomode/edid.c
+++ b/sys/dev/videomode/edid.c
@@ -35,19 +35,19 @@
 __KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.12 2013/02/08 16:35:10 skrll Exp $");

 #include <sys/param.h>
-#ifdef __minix
+#if defined(__minix)
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #ifndef aprint_debug
 #define aprint_debug if (0) printf
 #endif /* !aprint_debug */
-#else /* !__minix */
+#else
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#endif /* !__minix */
+#endif /* !defined(__minix) */
 #include <dev/videomode/videomode.h>
 #include <dev/videomode/ediddevs.h>
 #include <dev/videomode/edidreg.h>
--- a/sys/dev/videomode/pickmode.c
+++ b/sys/dev/videomode/pickmode.c
@@ -33,11 +33,11 @@ __KERNEL_RCSID(0, "$NetBSD: pickmode.c,v 1.4 2011/04/09 20:53:39 christos Exp $"

 #include <sys/param.h>
 #include <dev/videomode/videomode.h>
-#ifndef __minix
+#if !defined(__minix)
 #include "opt_videomode.h"
 #else
 #include <minix/sysutil.h>
-#endif
+#endif /* !defined(__minix) */
 #ifndef abs
 #define abs(x) (((x) < 0) ? -(x) : (x))
 #endif
--- a/sys/dev/videomode/vesagtf.c
+++ b/sys/dev/videomode/vesagtf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vesagtf.c,v 1.1 2006/05/11 01:49:53 gdamore Exp $ */
+/* $NetBSD: vesagtf.c,v 1.2 2013/09/15 15:56:07 martin Exp $ */

 /*-
 * Copyright (c) 2006 Itronix Inc.
@@ -153,7 +153,7 @@
 #ifdef	_KERNEL
 #include <sys/cdefs.h>

-__KERNEL_RCSID(0, "$NetBSD: vesagtf.c,v 1.1 2006/05/11 01:49:53 gdamore Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vesagtf.c,v 1.2 2013/09/15 15:56:07 martin Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -226,12 +226,12 @@ vesagtf_mode_params(unsigned h_pixels, unsigned v_lines, unsigned freq,
    unsigned interlace;
    uint64_t h_period_est;
    unsigned vsync_plus_bp;
-    unsigned v_back_porch;
+    unsigned v_back_porch __unused;
    unsigned total_v_lines;
    uint64_t v_field_est;
    uint64_t h_period;
    unsigned v_field_rate;
-    unsigned v_frame_rate;
+    unsigned v_frame_rate __unused;
    unsigned left_margin;
    unsigned right_margin;
    unsigned total_active_pixels;
@@ -660,7 +660,7 @@ vesagtf_mode(unsigned x, unsigned y, unsigned refresh, struct videomode *vmp)

 /* print_xf86_mode() - print the XFree86 modeline, given mode timings. */

-#ifndef __minix
+#if !defined(__minix)
 #ifndef _KERNEL
 void
 print_xf86_mode (struct videomode *vmp)
@@ -701,4 +701,4 @@ main (int argc, char *argv[])
    
 }
 #endif
-#endif /* !__minix */
+#endif /* !defined(__minix) */
--- a/sys/dev/vndvar.h
+++ b/sys/dev/vndvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vndvar.h,v 1.31 2011/06/29 09:12:42 hannken Exp $	*/
+/*	$NetBSD: vndvar.h,v 1.33 2013/06/03 16:42:32 christos Exp $	*/

 /*-
 * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -70,9 +70,9 @@
 #ifndef _SYS_DEV_VNDVAR_H_
 #define _SYS_DEV_VNDVAR_H_

-#ifndef __minix
+#if !defined(__minix)
 #include <sys/pool.h>
-#endif
+#endif /* defined(__minix) */

 /*
 * Vnode disk pseudo-geometry information.
@@ -88,16 +88,16 @@ struct vndgeom {
 * Ioctl definitions for file (vnode) disk pseudo-device.
 */
 struct vnd_ioctl {
-#ifndef __minix
+#if !defined(__minix)
 	char		*vnd_file;	/* pathname of file to mount */
 #else
 	int		vnd_fildes;	/* file descriptor of file to mount */
-#endif
+#endif /* !defined(__minix)*/
 	int		vnd_flags;	/* flags; see below */
 	struct vndgeom	vnd_geom;	/* geometry to emulate */
-#ifndef __minix
+#if !defined(__minix)
 	unsigned int	vnd_osize;	/* (returned) size of disk */
-#endif
+#endif /* !defined(__minix)*/
 	uint64_t	vnd_size;	/* (returned) size of disk */
 };

@@ -106,7 +106,7 @@ struct vnd_ioctl {
 #define	VNDIOF_READONLY	0x02		/* as read-only device */
 #define	VNDIOF_FORCE	0x04		/* force close */

-#ifndef __minix
+#if !defined(__minix)
 #ifdef _KERNEL

 struct vnode;
@@ -117,11 +117,12 @@ struct vnode;
 struct vnd_softc {
 	device_t         sc_dev;
 	int		 sc_flags;	/* flags */
-	size_t		 sc_size;	/* size of vnd */
+	uint64_t	 sc_size;	/* size of vnd */
 	struct vnode	*sc_vp;		/* vnode */
 	kauth_cred_t	 sc_cred;	/* credentials */
 	int		 sc_maxactive;	/* max # of active requests */
 	struct bufq_state *sc_tab;	/* transfer queue */
+	int		 sc_pending;	/* number of pending transfers */
 	int		 sc_active;	/* number of active transfers */
 	struct disk	 sc_dkdev;	/* generic disk device info */
 	struct vndgeom	 sc_geom;	/* virtual geometry */
@@ -160,7 +161,7 @@ struct vnd_comp_header
 	u_int32_t block_size;
 	u_int32_t num_blocks;
 };
-#endif
+#endif /* !defined(__minix) */

 /*
 * A simple structure for describing which vnd units are in use.