date:20141010

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 06:13:30 UTC 2014

Modified Files:
src/usr.bin/config: gram.y sem.c sem.h

Log Message:
Split plain/interface/devclass attribute initializers.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/config/gram.y
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/config/sem.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/config/sem.h

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/config/gram.y
diff -u src/usr.bin/config/gram.y:1.41 src/usr.bin/config/gram.y:1.42
--- src/usr.bin/config/gram.y:1.41	Thu Oct  9 09:39:24 2014
+++ src/usr.bin/config/gram.y	Fri Oct 10 06:13:30 2014
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: gram.y,v 1.41 2014/10/09 09:39:24 uebayasi Exp $	*/
+/*	$NetBSD: gram.y,v 1.42 2014/10/10 06:13:30 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -356,7 +356,7 @@ define_prefix:
 ;
 
 define_devclass:
-	DEVCLASS WORD			{ (void)defattr($2, NULL, NULL, 1); }
+	DEVCLASS WORD			{ (void)defdevclass($2, NULL, NULL, 1); }
 ;
 
 define_filesystems:
@@ -365,7 +365,7 @@ define_filesystems:
 
 define_attribute:
 	DEFINE WORD interface_opt depend_list
-	{ (void)defattr($2, $3, $4, 0); }
+	{ (void)defattr0($2, $3, $4, 0); }
 ;
 
 define_option:

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.48 src/usr.bin/config/sem.c:1.49
--- src/usr.bin/config/sem.c:1.48	Fri Oct 10 05:27:28 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 06:13:30 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.48 2014/10/10 05:27:28 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.49 2014/10/10 06:13:30 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -204,19 +204,24 @@ setident(const char *i)
  * all locator lists include a dummy head node, which we discard here.
  */
 int
+defattr0(const char *name, struct loclist *locs, struct attrlist *deps,
+int devclass)
+{
+
+	if (locs != NULL)
+		return defiattr(name, locs, deps, devclass);
+	else if (devclass)
+		return defdevclass(name, locs, deps, devclass);
+	else
+		return defattr(name, locs, deps, devclass);
+}
+
+int
 defattr(const char *name, struct loclist *locs, struct attrlist *deps,
 int devclass)
 {
 	struct attr *a, *dep;
 	struct attrlist *al;
-	struct loclist *ll;
-	int len;
-
-	if (locs != NULL  devclass)
-		panic(defattr(%s): locators and devclass, name);
-
-	if (deps != NULL  devclass)
-		panic(defattr(%s): dependencies and devclass, name);
 
 	/*
 	 * If this attribute depends on any others, make sure none of
@@ -243,41 +248,69 @@ defattr(const char *name, struct loclist
 	a-a_deps = deps;
 	a-a_expanding = 0;
 	TAILQ_INIT(a-a_files);
+	expandattr(a, NULL);
 
-	/* interface attribute initialization */
-	if (locs != NULL) {
-		a-a_iattr = 1;
-		/* unwrap */
-		a-a_locs = locs-ll_next;
-		locs-ll_next = NULL;
-		loclist_destroy(locs);
-		len = 0;
-		for (ll = a-a_locs; ll != NULL; ll = ll-ll_next)
-			len++;
-		a-a_loclen = len;
-	}
-
-	/* device class initialization */
-	if (devclass) {
-		char classenum[256], *cp;
-		int errored = 0;
-
-		(void)snprintf(classenum, sizeof(classenum), DV_%s, name);
-		for (cp = classenum + 3; *cp; cp++) {
-			if (!errored 
-			(!isalnum((unsigned char)*cp) ||
-			  (isalpha((unsigned char)*cp)  !islower((unsigned char)*cp {
-cfgerror(device class names must be 
-lower-case alphanumeric characters);
-errored = 1;
-			}
-			*cp = toupper((unsigned char)*cp);
+	return (0);
+}
+
+/* interface attribute initialization */
+int
+defiattr(const char *name, struct loclist *locs, struct attrlist *deps,
+int devclass)
+{
+	struct attr *a;
+	int len;
+	struct loclist *ll;
+
+	if (devclass)
+		panic(defattr(%s): locators and devclass, name);
+
+	if (defattr(name, locs, deps, devclass) != 0)
+		return (1);
+
+	a = getattr(name);
+	a-a_iattr = 1;
+	/* unwrap */
+	a-a_locs = locs-ll_next;
+	locs-ll_next = NULL;
+	loclist_destroy(locs);
+	len = 0;
+	for (ll = a-a_locs; ll != NULL; ll = ll-ll_next)
+		len++;
+	a-a_loclen = len;
+	if (deps)
+		CFGDBG(2, attr `%s' iface with deps, a-a_name);
+	return (0);
+}
+
+/* device class initialization */
+int
+defdevclass(const char *name, struct loclist *locs, struct attrlist *deps,
+int devclass)
+{
+	struct attr *a;
+	char classenum[256], *cp;
+	int errored = 0;
+
+	if (deps)
+		panic(defattr(%s): dependencies and devclass, name);
+
+	if (defattr(name, locs, deps, devclass) != 0)
+		return (1);
+
+	a = getattr(name);
+	(void)snprintf(classenum, sizeof(classenum), DV_%s, name);
+	for (cp = classenum + 3; *cp; cp++) {
+		if (!errored 
+		(!isalnum((unsigned char)*cp) ||
+		  (isalpha((unsigned char)*cp)  !islower((unsigned char)*cp {
+			cfgerror(device class names must be 
+			lower-case alphanumeric characters);
+			errored = 1;
 		}
-		a-a_devclass = intern(classenum);
+		*cp = toupper((unsigned char)*cp);
 	}
-
-	/* Expand the attribute to check for cycles in

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 06:59:38 UTC 2014

Modified Files:
src/usr.bin/config: sem.c sem.h

Log Message:
Implicitly define empty attribute for device attachment.  Much less
troublesome than device and interface attribute.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/config/sem.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/config/sem.h

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/config/sem.c
diff -u src/usr.bin/config/sem.c:1.49 src/usr.bin/config/sem.c:1.50
--- src/usr.bin/config/sem.c:1.49	Fri Oct 10 06:13:30 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 06:59:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.49 2014/10/10 06:13:30 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.50 2014/10/10 06:59:38 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -236,23 +236,37 @@ defattr(const char *name, struct loclist
 		}
 	}
 
-	a = ecalloc(1, sizeof *a);
-	if (ht_insert(attrtab, name, a)) {
-		free(a);
+	a = mkattr(name);
+	if (a == NULL) {
 		cfgerror(attribute `%s' already defined, name);
 		loclist_destroy(locs);
 		return (1);
 	}
 
-	a-a_name = name;
 	a-a_deps = deps;
-	a-a_expanding = 0;
-	TAILQ_INIT(a-a_files);
 	expandattr(a, NULL);
+	CFGDBG(3, attr `%s' defined, a-a_name);
 
 	return (0);
 }
 
+struct attr *
+mkattr(const char *name)
+{
+	struct attr *a;
+
+	a = ecalloc(1, sizeof *a);
+	if (ht_insert(attrtab, name, a)) {
+		free(a);
+		return NULL;
+	}
+	a-a_name = name;
+	TAILQ_INIT(a-a_files);
+	CFGDBG(3, attr `%s' allocated, name);
+
+	return a;
+}
+
 /* interface attribute initialization */
 int
 defiattr(const char *name, struct loclist *locs, struct attrlist *deps,
@@ -543,6 +557,12 @@ defdevattach(struct deva *deva, struct d
 	deva-d_attrs = attrs;
 	deva-d_atlist = atlist;
 	deva-d_devbase = dev;
+	CFGDBG(3, deva `%s' defined, deva-d_name);
+
+	/*
+	 * Implicit attribute definition.
+	 */
+	refattr(deva-d_name);
 
 	/*
 	 * Turn the `at' list into interface attributes (map each
@@ -644,6 +664,17 @@ getattr(const char *name)
 }
 
 /*
+ * Implicit attribute definition.
+ */
+void
+refattr(const char *name)
+{
+
+	if ((ht_lookup(attrtab, name)) == NULL)
+		(void)mkattr(name);
+}
+
+/*
  * Recursively expand an attribute and its dependencies, checking for
  * cycles, and invoking a callback for each attribute found.
  */

Index: src/usr.bin/config/sem.h
diff -u src/usr.bin/config/sem.h:1.11 src/usr.bin/config/sem.h:1.12
--- src/usr.bin/config/sem.h:1.11	Fri Oct 10 06:13:30 2014
+++ src/usr.bin/config/sem.h	Fri Oct 10 06:59:38 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.h,v 1.11 2014/10/10 06:13:30 uebayasi Exp $	*/
+/*	$NetBSD: sem.h,v 1.12 2014/10/10 06:59:38 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -55,7 +55,9 @@ void		defdevattach(struct deva *, struct
 			 struct attrlist *);
 struct devbase *getdevbase(const char *);
 struct deva*getdevattach(const char *);
+struct attr	*mkattr(const char *);
 struct attr*getattr(const char *);
+void		refattr(const char *);
 void		expandattr(struct attr *, void (*)(struct attr *));
 void		selectattr(struct attr *);
 void		setmajor(struct devbase *, int);

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 07:08:26 UTC 2014

Modified Files:
src/usr.bin/config: main.c sem.c

Log Message:
Implicitly define attribute for filesystem.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.bin/config/main.c
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/config/sem.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/config/main.c
diff -u src/usr.bin/config/main.c:1.58 src/usr.bin/config/main.c:1.59
--- src/usr.bin/config/main.c:1.58	Thu Oct  9 19:20:56 2014
+++ src/usr.bin/config/main.c	Fri Oct 10 07:08:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.58 2014/10/09 19:20:56 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.59 2014/10/10 07:08:26 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -698,6 +698,13 @@ deffilesystem(struct nvlist *fses, struc
 			nv-nv_name);
 
 		add_fs_dependencies(nv, deps);
+
+		/*
+		 * Implicit attribute definition for filesystem.
+		 */
+		const char *n; 
+		n = strtolower(nv-nv_name);
+		refattr(n);
 	}
 }
 

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.50 src/usr.bin/config/sem.c:1.51
--- src/usr.bin/config/sem.c:1.50	Fri Oct 10 06:59:38 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 07:08:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.50 2014/10/10 06:59:38 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.51 2014/10/10 07:08:26 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -560,7 +560,7 @@ defdevattach(struct deva *deva, struct d
 	CFGDBG(3, deva `%s' defined, deva-d_name);
 
 	/*
-	 * Implicit attribute definition.
+	 * Implicit attribute definition for device attachment.
 	 */
 	refattr(deva-d_name);

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

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 07:36:11 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_board.c awin_intr.h awin_io.c
awin_mmc.c awin_reg.h awin_usb.c awin_wdt.c

Log Message:
Work-in-progress support for the AllWinner A31 SoC.


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/allwinner/awin_board.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_intr.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/allwinner/awin_io.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/allwinner/awin_mmc.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/allwinner/awin_usb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_wdt.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/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.20 src/sys/arch/arm/allwinner/awin_board.c:1.21
--- src/sys/arch/arm/allwinner/awin_board.c:1.20	Sat Oct  4 19:38:17 2014
+++ src/sys/arch/arm/allwinner/awin_board.c	Fri Oct 10 07:36:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_board.c,v 1.20 2014/10/04 19:38:17 martin Exp $	*/
+/*	$NetBSD: awin_board.c,v 1.21 2014/10/10 07:36:11 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.20 2014/10/04 19:38:17 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.21 2014/10/10 07:36:11 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -123,8 +123,11 @@ static void
 awin_cpu_clk(void)
 {
 	struct cpu_info * const ci = curcpu();
+	u_int reg = awin_chip_id() == AWIN_CHIP_ID_A31 ?
+  AWIN_A31_CPU_AXI_CFG_REG :
+  AWIN_CPU_AHB_APB0_CFG_REG;
 	const uint32_t cpu0_cfg = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-	AWIN_CCM_OFFSET + AWIN_CPU_AHB_APB0_CFG_REG);
+	AWIN_CCM_OFFSET + reg);
 	const u_int cpu_clk_sel = __SHIFTIN(cpu0_cfg, AWIN_CPU_CLK_SRC_SEL);
 	switch (__SHIFTOUT(cpu_clk_sel, AWIN_CPU_CLK_SRC_SEL)) {
 	case AWIN_CPU_CLK_SRC_SEL_LOSC:
@@ -136,10 +139,18 @@ awin_cpu_clk(void)
 	case AWIN_CPU_CLK_SRC_SEL_PLL1: {
 		const uint32_t pll1_cfg = bus_space_read_4(awin_bs_tag,
 		awin_core_bsh, AWIN_CCM_OFFSET + AWIN_PLL1_CFG_REG);
-		u_int p = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_OUT_EXP_DIVP);
-		u_int n = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_N);
-		u_int k = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_K) + 1;
-		u_int m = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_M) + 1;
+		u_int p, n, k, m;
+		if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+			p = 0;
+			n = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_N) + 1;
+			k = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_K) + 1;
+			m = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_M) + 1;
+		} else {
+			p = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_OUT_EXP_DIVP);
+			n = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_N);
+			k = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_K) + 1;
+			m = __SHIFTOUT(pll1_cfg, AWIN_PLL_CFG_FACTOR_M) + 1;
+		}
 		ci-ci_data.cpu_cc_freq =
 		((uint64_t)AWIN_REF_FREQ * (n ? n : 1) * k / m)  p;
 		break;
@@ -185,11 +196,24 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
 #endif
 
 #ifdef VERBOSE_INIT_ARM
-	uint32_t s0 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-	AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU0_STATUS_REG);
-	uint32_t s1 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-	AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU1_STATUS_REG);
-	printf(%s: cpu status: 0=%#x 1=%#x\n, __func__, s0, s1);
+	if (awin_chip_id() == AWIN_CHIP_ID_A31) {
+		uint32_t s0 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU0_STATUS_REG);
+		uint32_t s1 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU1_STATUS_REG);
+		uint32_t s2 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU2_STATUS_REG);
+		uint32_t s3 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU3_STATUS_REG);
+		printf(%s: cpu status: 0=%#x 1=%#x 2=%#x 3=%#x\n, __func__,
+		s0, s1, s2, s3);
+	} else {
+		uint32_t s0 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+		AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU0_STATUS_REG);
+		uint32_t s1 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+		AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU1_STATUS_REG);
+		printf(%s: cpu status: 0=%#x 1=%#x\n, __func__, s0, s1);
+	}
 #endif
 
 #if !defined(MULTIPROCESSOR)  defined(VERBOSE_INIT_ARM)
@@ -228,16 +252,27 @@ awin_cpu_hatch(struct cpu_info *ci)
 psize_t
 awin_memprobe(void)
 {
-	const uint32_t dcr = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-	AWIN_DRAM_OFFSET + AWIN_DRAM_DCR_REG);
+	psize_t memsize;
 
-	psize_t memsize = (__SHIFTOUT(dcr, AWIN_DRAM_DCR_BUS_WIDTH) + 1)
-	   /

CVS commit: src/sys/arch/evbarm

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 07:37:50 UTC 2014

Modified Files:
src/sys/arch/evbarm/awin: awin_machdep.c
Added Files:
src/sys/arch/evbarm/conf: HUMMINGBIRD_A31

Log Message:
Add Merrii Hummingbird A31 board specific info + kernel config.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/awin/awin_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31

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/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.12 src/sys/arch/evbarm/awin/awin_machdep.c:1.13
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.12	Tue Sep 23 15:02:08 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c	Fri Oct 10 07:37:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_machdep.c,v 1.12 2014/09/23 15:02:08 skrll Exp $ */
+/*	$NetBSD: awin_machdep.c,v 1.13 2014/10/10 07:37:50 jmcneill Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.12 2014/09/23 15:02:08 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.13 2014/10/10 07:37:50 jmcneill Exp $);
 
 #include opt_machdep.h
 #include opt_ddb.h
@@ -600,12 +600,17 @@ awin_device_register(device_t self, void
 			prop_dictionary_set_cstring(dict, usb0drv, PB2);
 		}
 #endif
+#if AWIN_board == AWIN_hummingbird_a31
+		prop_dictionary_set_cstring(dict, usb1drv, PH27);
+		prop_dictionary_set_cstring(dict, usb2drv, PH24);
+#else
 		prop_dictionary_set_cstring(dict, usb2drv, PH3);
 		prop_dictionary_set_cstring(dict, usb0iddet,
 		(cubietruck_p ? PH19 : PH4));
 		prop_dictionary_set_cstring(dict, usb0vbusdet,
 		(cubietruck_p ? PH22 : PH5));
 		prop_dictionary_set_cstring(dict, usb1drv, PH6);
+#endif
 		prop_dictionary_set_cstring(dict, status-led1, PH21);
 		prop_dictionary_set_cstring(dict, status-led2, PH20);
 		if (cubietruck_p) {
@@ -619,6 +624,8 @@ awin_device_register(device_t self, void
 		prop_dictionary_set_cstring(dict, mmc0detect, PH1);
 #elif AWIN_board == AWIN_bpi
 		prop_dictionary_set_cstring(dict, mmc0detect, PH10);
+#elif AWIN_board == AWIN_hummingbird_a31
+		prop_dictionary_set_cstring(dict, mmc0detect, PH8);
 #endif
 		prop_dictionary_set_cstring(dict, audiopactrl, PH15);
 
@@ -647,8 +654,10 @@ awin_device_register(device_t self, void
 		if (aio-aio_loc.loc_port == 0) {
 			prop_dictionary_set_cstring(dict,
 			detect-gpio, mmc0detect);
+#if !(AWIN_board == AWIN_hummingbird_a31)
 			prop_dictionary_set_cstring(dict,
 			led-gpio, status-led2);
+#endif
 		}
 		return;
 	}

Added files:

Index: src/sys/arch/evbarm/conf/HUMMINGBIRD_A31
diff -u /dev/null src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.1
--- /dev/null	Fri Oct 10 07:37:50 2014
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31	Fri Oct 10 07:37:50 2014
@@ -0,0 +1,29 @@
+#	$NetBSD: HUMMINGBIRD_A31,v 1.1 2014/10/10 07:37:50 jmcneill Exp $
+#
+#	HUMMINGBIRD_A31 - Merrii Hummingbird A31
+#
+
+include arch/evbarm/conf/CUBIEBOARD
+
+no makeoptions	BOARDTYPE
+makeoptions	BOARDTYPE=hummingbird_a31
+options 	ALLWINNER_A31
+options 	MEMSIZE=1024
+
+no ahcisata*
+no awe0
+no axp20x0
+
+# TODO
+no awinusb0
+no awinusb1
+no motg0
+no awge0
+
+#
+# not fully working yet
+#
+# options	MULTIPROCESSOR
+# cpu* at mainbus?
+
+options 	VERBOSE_INIT_ARM # verbose bootstraping messages

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 07:48:51 UTC 2014

Modified Files:
src/usr.bin/config: main.c sem.c sem.h

Log Message:
Implicitly define attribute for options.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/usr.bin/config/main.c
cvs rdiff -u -r1.51 -r1.52 src/usr.bin/config/sem.c
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/config/sem.h

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/config/main.c
diff -u src/usr.bin/config/main.c:1.59 src/usr.bin/config/main.c:1.60
--- src/usr.bin/config/main.c:1.59	Fri Oct 10 07:08:26 2014
+++ src/usr.bin/config/main.c	Fri Oct 10 07:48:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.59 2014/10/10 07:08:26 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.60 2014/10/10 07:48:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -875,6 +875,13 @@ defopt(struct dlhash *ht, const char *fn
 olddl = olddl-dl_next;
 			olddl-dl_next = dl;
 		}
+
+		/*
+		 * Implicit attribute definition for option.
+		 */
+		const char *n; 
+		n = strtolower(dl-dl_name);
+		refattr(n);
 	}
 }
 

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.51 src/usr.bin/config/sem.c:1.52
--- src/usr.bin/config/sem.c:1.51	Fri Oct 10 07:08:26 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 07:48:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.51 2014/10/10 07:08:26 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.52 2014/10/10 07:48:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -236,12 +236,13 @@ defattr(const char *name, struct loclist
 		}
 	}
 
-	a = mkattr(name);
-	if (a == NULL) {
+	if (getrefattr(name, a)) {
 		cfgerror(attribute `%s' already defined, name);
 		loclist_destroy(locs);
 		return (1);
 	}
+	if (a == NULL)
+		a = mkattr(name);
 
 	a-a_deps = deps;
 	expandattr(a, NULL);
@@ -674,6 +675,28 @@ refattr(const char *name)
 		(void)mkattr(name);
 }
 
+int
+getrefattr(const char *name, struct attr **ra)
+{
+	struct attr *a;
+
+	a = ht_lookup(attrtab, name);
+	if (a == NULL) {
+		*ra = NULL;
+		return (0);
+	}
+	/*
+	 * Check if the existing attr is only referenced, not really defined.
+	 */
+	if (a-a_deps == NULL 
+	a-a_iattr == 0 
+	a-a_devclass == 0) {
+		*ra = a;
+		return (0);
+	}
+	return (1);
+}
+
 /*
  * Recursively expand an attribute and its dependencies, checking for
  * cycles, and invoking a callback for each attribute found.

Index: src/usr.bin/config/sem.h
diff -u src/usr.bin/config/sem.h:1.12 src/usr.bin/config/sem.h:1.13
--- src/usr.bin/config/sem.h:1.12	Fri Oct 10 06:59:38 2014
+++ src/usr.bin/config/sem.h	Fri Oct 10 07:48:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.h,v 1.12 2014/10/10 06:59:38 uebayasi Exp $	*/
+/*	$NetBSD: sem.h,v 1.13 2014/10/10 07:48:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -58,6 +58,7 @@ struct deva*getdevattach(const char 
 struct attr	*mkattr(const char *);
 struct attr*getattr(const char *);
 void		refattr(const char *);
+int		getrefattr(const char *, struct attr **);
 void		expandattr(struct attr *, void (*)(struct attr *));
 void		selectattr(struct attr *);
 void		setmajor(struct devbase *, int);

CVS commit: src/lib/libm/complex

2014-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 10 08:13:08 UTC 2014

Modified Files:
src/lib/libm/complex: Makefile.inc

Log Message:
Add cimag (apparently accidently dropped in previous revision and reorg)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libm/complex/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/lib/libm/complex/Makefile.inc
diff -u src/lib/libm/complex/Makefile.inc:1.5 src/lib/libm/complex/Makefile.inc:1.6
--- src/lib/libm/complex/Makefile.inc:1.5	Fri Oct 10 00:48:18 2014
+++ src/lib/libm/complex/Makefile.inc	Fri Oct 10 08:13:07 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/10/10 00:48:18 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2014/10/10 08:13:07 martin Exp $
 
 .PATH: ${.CURDIR}/complex
 
 COMPLEX_SRCS = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c catan.c \
 	ccos.c ccosh.c cephes_subr.c cexp.c clog.c conj.c cpow.c cproj.c\
-	creal.c csin.c csinh.c csqrt.c ctan.c ctanh.c
+	cimag.c creal.c csin.c csinh.c csqrt.c ctan.c ctanh.c
 
 .for i in ${COMPLEX_SRCS}
 SRCS+=	$i ${i:S/.c/f.c/} ${i:S/.c/l.c/}

CVS commit: src/sys/conf

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 08:13:52 UTC 2014

Modified Files:
src/sys/conf: Makefile.kern.inc

Log Message:
Fix link echo indent.


To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/conf/Makefile.kern.inc

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

Modified files:

Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.175 src/sys/conf/Makefile.kern.inc:1.176
--- src/sys/conf/Makefile.kern.inc:1.175	Thu Oct  9 16:35:57 2014
+++ src/sys/conf/Makefile.kern.inc	Fri Oct 10 08:13:52 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.kern.inc,v 1.175 2014/10/09 16:35:57 uebayasi Exp $
+#	$NetBSD: Makefile.kern.inc,v 1.176 2014/10/10 08:13:52 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -158,7 +158,7 @@ NORMAL_S?=	@${_MKSHMSG} compile  ${.CUR
 		${CC} ${AFLAGS} ${AFLAGS.${:T}} ${CPPFLAGS} -c $
  
 # link rules: 
-LINK_O?=	@${_MKSHMSG}link ${.CURDIR:T}/${.TARGET}  \
+LINK_O?=	@${_MKSHMSG}link  ${.CURDIR:T}/${.TARGET}  \
 		${_MKSHECHO}\
 		${LD} -r -o ${.TARGET} ${.ALLSRC}  \
 		${LD} -r -o ${.TARGET} ${.ALLSRC}

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 08:14:48 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
Implicitly define attribute for device.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/usr.bin/config/sem.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/config/sem.c
diff -u src/usr.bin/config/sem.c:1.52 src/usr.bin/config/sem.c:1.53
--- src/usr.bin/config/sem.c:1.52	Fri Oct 10 07:48:50 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 08:14:47 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.52 2014/10/10 07:48:50 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.53 2014/10/10 08:14:47 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -442,6 +442,11 @@ defdev(struct devbase *dev, struct locli
 	dev-d_classattr = NULL;		/* for now */
 
 	/*
+	 * Implicit attribute definition for device.
+	 */
+	refattr(dev-d_name);
+
+	/*
 	 * For each interface attribute this device refers to, add this
 	 * device to its reference list.  This makes, e.g., finding all
 	 * scsis easier.

CVS commit: src/sys/conf

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 08:18:04 UTC 2014

Modified Files:
src/sys/conf: files std

Log Message:
Define kern attribute (a.k.a module).  Mark kern_*.c (and some others) as
kern.  Always select kern in sys/conf/std.


To generate a diff of this commit:
cvs rdiff -u -r1.1105 -r1.1106 src/sys/conf/files
cvs rdiff -u -r1.14 -r1.15 src/sys/conf/std

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1105 src/sys/conf/files:1.1106
--- src/sys/conf/files:1.1105	Sun Sep 21 14:31:38 2014
+++ src/sys/conf/files	Fri Oct 10 08:18:04 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1105 2014/09/21 14:31:38 christos Exp $
+#	$NetBSD: files,v 1.1106 2014/10/10 08:18:04 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20140824
@@ -1489,6 +1489,7 @@ include secmodel/files.secmodel
 #
 # kernel sources
 #
+define	kern
 file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
 file	conf/debugsyms.c
 file	dev/auconv.c			auconv | mulaw
@@ -1530,191 +1531,191 @@ file	kern/bufq_readprio.c		bufq_readprio
 file	kern/core_elf32.c		exec_elf32
 file	kern/core_elf64.c		exec_elf64
 file	kern/core_netbsd.c		exec_aout | exec_coff | exec_ecoff
-file	kern/cnmagic.c
+file	kern/cnmagic.c			kern
 file	kern/exec_aout.c		exec_aout
 file	kern/exec_ecoff.c		exec_ecoff
 file	kern/exec_elf32.c		exec_elf32
 file	kern/exec_elf64.c		exec_elf64
 file	kern/exec_script.c		exec_script
-file	kern/exec_subr.c
-file	kern/init_main.c
-file	kern/init_sysctl.c
-file	kern/init_sysctl_base.c
-file	kern/init_sysent.c
-file	kern/kern_acct.c
-file	kern/kern_auth.c
-file	kern/kern_cfglock.c
-file	kern/kern_clock.c
-file	kern/kern_condvar.c
+file	kern/exec_subr.c		kern
+file	kern/init_main.c		kern
+file	kern/init_sysctl.c		kern
+file	kern/init_sysctl_base.c		kern
+file	kern/init_sysent.c		kern
+file	kern/kern_acct.c		kern
+file	kern/kern_auth.c		kern
+file	kern/kern_cfglock.c		kern
+file	kern/kern_clock.c		kern
+file	kern/kern_condvar.c		kern
 file	kern/kern_core.c		coredump
-file	kern/kern_cpu.c
+file	kern/kern_cpu.c			kern
 file	kern/kern_ctf.c			kdtrace_hooks
-file	kern/kern_descrip.c
-file	kern/kern_event.c
-file	kern/kern_exec.c
-file	kern/kern_exit.c
-file	kern/kern_fork.c
-file	kern/kern_idle.c
-file	kern/kern_hook.c
-file	kern/kern_kthread.c
+file	kern/kern_descrip.c			kern
+file	kern/kern_event.c		kern
+file	kern/kern_exec.c		kern
+file	kern/kern_exit.c		kern
+file	kern/kern_fork.c		kern
+file	kern/kern_idle.c		kern
+file	kern/kern_hook.c		kern
+file	kern/kern_kthread.c		kern
 file	kern/kern_ktrace.c		ktrace
 file	kern/kern_ktrace_vfs.c		ktrace
 file	kern/kern_ksyms.c		ksyms | ddb | modular needs-flag
-file	kern/kern_lock.c
-file	kern/kern_lwp.c
-file	kern/kern_malloc.c
-file	kern/kern_module.c
-file	kern/kern_module_vfs.c
-file	kern/kern_mutex.c
-file	kern/kern_mutex_obj.c
+file	kern/kern_lock.c		kern
+file	kern/kern_lwp.c			kern
+file	kern/kern_malloc.c		kern
+file	kern/kern_module.c		kern
+file	kern/kern_module_vfs.c		kern
+file	kern/kern_mutex.c		kern
+file	kern/kern_mutex_obj.c		kern
 file	kern/kern_fileassoc.c		fileassoc
-file	kern/kern_ntptime.c
+file	kern/kern_ntptime.c		kern
 file	kern/kern_pax.c			pax_mprotect | pax_segvguard | pax_aslr
-file	kern/kern_physio.c
-file	kern/kern_pmf.c
-file	kern/kern_proc.c
-file	kern/kern_prot.c
-file	kern/kern_ras.c
-file	kern/kern_rate.c
-file	kern/kern_resource.c
-file	kern/kern_rndpool.c
-file	kern/kern_rndq.c
-file	kern/kern_rndsink.c
-file	kern/kern_runq.c
-file	kern/kern_rwlock.c
-file	kern/kern_rwlock_obj.c
+file	kern/kern_physio.c		kern
+file	kern/kern_pmf.c			kern
+file	kern/kern_proc.c		kern
+file	kern/kern_prot.c		kern
+file	kern/kern_ras.c			kern
+file	kern/kern_rate.c		kern
+file	kern/kern_resource.c		kern
+file	kern/kern_rndpool.c		kern
+file	kern/kern_rndq.c		kern
+file	kern/kern_rndsink.c		kern
+file	kern/kern_runq.c		kern
+file	kern/kern_rwlock.c		kern
+file	kern/kern_rwlock_obj.c		kern
 file	kern/kern_sdt.c			kdtrace_hooks
-file	kern/kern_sig.c
-file	kern/kern_sleepq.c
-file	kern/kern_softint.c
-file	kern/kern_ssp.c
-file	kern/kern_stub.c
-file	kern/kern_subr.c
-file	kern/kern_synch.c
-file	kern/kern_syscall.c
-file	kern/kern_sysctl.c
-file	kern/kern_tc.c
-file	kern/kern_time.c
-file	kern/kern_timeout.c
-file	kern/kern_turnstile.c
-file	kern/kern_todr.c
-file	kern/kern_uidinfo.c
-file	kern/kern_uuid.c
-file	kern/kern_xxx.c
+file	kern/kern_sig.c			kern
+file	kern/kern_sleepq.c		kern
+file	kern/kern_softint.c		kern
+file	kern/kern_ssp.c			kern
+file	kern/kern_stub.c		kern
+file	kern/kern_subr.c		kern
+file	kern/kern_synch.c		kern
+file	kern/kern_syscall.c		kern
+file	kern/kern_sysctl.c		kern
+file	kern/kern_tc.c			kern
+file	kern/kern_time.c		kern
+file	kern/kern_timeout.c		kern
+file	kern/kern_turnstile.c		kern
+file	kern/kern_todr.c		kern
+file	kern/kern_uidinfo.c		kern
+file

CVS commit: src/lib/libm/complex

2014-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 10 08:19:37 UTC 2014

Modified Files:
src/lib/libm/complex: Makefile.inc
Added Files:
src/lib/libm/complex: catanhl.c

Log Message:
Add missing catanh variant (and readd it to the Makefile list)


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/complex/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libm/complex/catanhl.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/libm/complex/Makefile.inc
diff -u src/lib/libm/complex/Makefile.inc:1.6 src/lib/libm/complex/Makefile.inc:1.7
--- src/lib/libm/complex/Makefile.inc:1.6	Fri Oct 10 08:13:07 2014
+++ src/lib/libm/complex/Makefile.inc	Fri Oct 10 08:19:37 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.6 2014/10/10 08:13:07 martin Exp $
+# $NetBSD: Makefile.inc,v 1.7 2014/10/10 08:19:37 martin Exp $
 
 .PATH: ${.CURDIR}/complex
 
 COMPLEX_SRCS = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c catan.c \
 	ccos.c ccosh.c cephes_subr.c cexp.c clog.c conj.c cpow.c cproj.c\
-	cimag.c creal.c csin.c csinh.c csqrt.c ctan.c ctanh.c
+	cimag.c creal.c csin.c csinh.c csqrt.c ctan.c ctanh.c catanh.c
 
 .for i in ${COMPLEX_SRCS}
 SRCS+=	$i ${i:S/.c/f.c/} ${i:S/.c/l.c/}

Added files:

Index: src/lib/libm/complex/catanhl.c
diff -u /dev/null src/lib/libm/complex/catanhl.c:1.1
--- /dev/null	Fri Oct 10 08:19:37 2014
+++ src/lib/libm/complex/catanhl.c	Fri Oct 10 08:19:37 2014
@@ -0,0 +1,42 @@
+/* $NetBSD: catanhl.c,v 1.1 2014/10/10 08:19:37 martin Exp $ */
+
+/*-
+ * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software written by Stephen L. Moshier.
+ * It is redistributed by the NetBSD Foundation by permission of the author.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include ../src/namespace.h
+#include complex.h
+
+long double complex
+catanh(long double complex z)
+{
+	long double complex w;
+
+	w = -1.0 * I * catanl(z * I);
+	return w;
+}

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 08:24:54 UTC 2014

Modified Files:
src/sys/conf: files std
src/sys/uvm: files.uvm

Log Message:
Define uvm attribute and mark files.


To generate a diff of this commit:
cvs rdiff -u -r1.1106 -r1.1107 src/sys/conf/files
cvs rdiff -u -r1.15 -r1.16 src/sys/conf/std
cvs rdiff -u -r1.20 -r1.21 src/sys/uvm/files.uvm

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1106 src/sys/conf/files:1.1107
--- src/sys/conf/files:1.1106	Fri Oct 10 08:18:04 2014
+++ src/sys/conf/files	Fri Oct 10 08:24:54 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1106 2014/10/10 08:18:04 uebayasi Exp $
+#	$NetBSD: files,v 1.1107 2014/10/10 08:24:54 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20140824
@@ -1489,7 +1489,7 @@ include secmodel/files.secmodel
 #
 # kernel sources
 #
-define	kern
+define	kern:	uvm
 file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
 file	conf/debugsyms.c
 file	dev/auconv.c			auconv | mulaw

Index: src/sys/conf/std
diff -u src/sys/conf/std:1.15 src/sys/conf/std:1.16
--- src/sys/conf/std:1.15	Fri Oct 10 08:18:04 2014
+++ src/sys/conf/std	Fri Oct 10 08:24:54 2014
@@ -1,10 +1,11 @@
-# $NetBSD: std,v 1.15 2014/10/10 08:18:04 uebayasi Exp $
+# $NetBSD: std,v 1.16 2014/10/10 08:24:54 uebayasi Exp $
 #
 # standard MI 'options'
 #
 # this file is for options which can't be off-by-default for some reasons.
 # it's commonly used is NOT a good reason to enable options here.
 
+options	UVM
 options	KERN
 
 # the following options are on-by-default to keep

Index: src/sys/uvm/files.uvm
diff -u src/sys/uvm/files.uvm:1.20 src/sys/uvm/files.uvm:1.21
--- src/sys/uvm/files.uvm:1.20	Tue May 17 05:32:31 2011
+++ src/sys/uvm/files.uvm	Fri Oct 10 08:24:54 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.uvm,v 1.20 2011/05/17 05:32:31 mrg Exp $
+#	$NetBSD: files.uvm,v 1.21 2014/10/10 08:24:54 uebayasi Exp $
 
 #
 # UVM options
@@ -13,35 +13,36 @@ defflagPDPOLICY_CLOCKPRO
 defparam			USER_VA0_DISABLE_DEFAULT
 defflag opt_uvm_page_trkown.h	UVM_PAGE_TRKOWN
 
-file	uvm/uvm_amap.c
-file	uvm/uvm_anon.c
-file	uvm/uvm_aobj.c
-file	uvm/uvm_bio.c
+define	uvm
+file	uvm/uvm_amap.c			uvm
+file	uvm/uvm_anon.c			uvm
+file	uvm/uvm_aobj.c			uvm
+file	uvm/uvm_bio.c			uvm
 file	uvm/uvm_coredump.c		coredump
-file	uvm/uvm_device.c
-file	uvm/uvm_emap.c
-file	uvm/uvm_fault.c
-file	uvm/uvm_glue.c
-file	uvm/uvm_init.c
-file	uvm/uvm_io.c
-file	uvm/uvm_km.c
+file	uvm/uvm_device.c		uvm
+file	uvm/uvm_emap.c			uvm
+file	uvm/uvm_fault.c			uvm
+file	uvm/uvm_glue.c			uvm
+file	uvm/uvm_init.c			uvm
+file	uvm/uvm_io.c			uvm
+file	uvm/uvm_km.c			uvm
 file	uvm/uvm_kmguard.c		debug
-file	uvm/uvm_loan.c
-file	uvm/uvm_map.c
-file	uvm/uvm_meter.c
-file	uvm/uvm_mmap.c
-file	uvm/uvm_mremap.c
-file	uvm/uvm_object.c
-file	uvm/uvm_page.c
-file	uvm/uvm_pager.c
-file	uvm/uvm_pdaemon.c
+file	uvm/uvm_loan.c			uvm
+file	uvm/uvm_map.c			uvm
+file	uvm/uvm_meter.c			uvm
+file	uvm/uvm_mmap.c			uvm
+file	uvm/uvm_mremap.c		uvm
+file	uvm/uvm_object.c		uvm
+file	uvm/uvm_page.c			uvm
+file	uvm/uvm_pager.c			uvm
+file	uvm/uvm_pdaemon.c		uvm
 file	uvm/uvm_pdpolicy_clock.c	!pdpolicy_clockpro
 file	uvm/uvm_pdpolicy_clockpro.c	pdpolicy_clockpro
-file	uvm/uvm_pglist.c
-file	uvm/uvm_readahead.c
-file	uvm/uvm_stat.c  
+file	uvm/uvm_pglist.c		uvm
+file	uvm/uvm_readahead.c		uvm
+file	uvm/uvm_stat.c	uvm
 file	uvm/uvm_swap.c			vmswap
 file	uvm/uvm_swapstub.c		!vmswap
-file	uvm/uvm_unix.c
-file	uvm/uvm_user.c
-file	uvm/uvm_vnode.c
+file	uvm/uvm_unix.c			uvm
+file	uvm/uvm_user.c			uvm
+file	uvm/uvm_vnode.c			uvm

CVS commit: src/lib/libm/complex

2014-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 10 08:34:30 UTC 2014

Modified Files:
src/lib/libm/complex: catanhl.c

Log Message:
copypasto


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/complex/catanhl.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/libm/complex/catanhl.c
diff -u src/lib/libm/complex/catanhl.c:1.1 src/lib/libm/complex/catanhl.c:1.2
--- src/lib/libm/complex/catanhl.c:1.1	Fri Oct 10 08:19:37 2014
+++ src/lib/libm/complex/catanhl.c	Fri Oct 10 08:34:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: catanhl.c,v 1.1 2014/10/10 08:19:37 martin Exp $ */
+/* $NetBSD: catanhl.c,v 1.2 2014/10/10 08:34:30 martin Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include complex.h
 
 long double complex
-catanh(long double complex z)
+catanhl(long double complex z)
 {
 	long double complex w;

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 09:01:01 UTC 2014

Modified Files:
src/sys/conf: files
src/sys/uvm: files.uvm

Log Message:
Use opt_*.h to not polute CPPFLAGS.

Attribute dependency is not yet.  Revert a definition.


To generate a diff of this commit:
cvs rdiff -u -r1.1107 -r1.1108 src/sys/conf/files
cvs rdiff -u -r1.21 -r1.22 src/sys/uvm/files.uvm

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1107 src/sys/conf/files:1.1108
--- src/sys/conf/files:1.1107	Fri Oct 10 08:24:54 2014
+++ src/sys/conf/files	Fri Oct 10 09:01:01 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1107 2014/10/10 08:24:54 uebayasi Exp $
+#	$NetBSD: files,v 1.1108 2014/10/10 09:01:01 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20140824
@@ -1489,7 +1489,8 @@ include secmodel/files.secmodel
 #
 # kernel sources
 #
-define	kern:	uvm
+define	kern
+defflag	opt_kern.h			KERN
 file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
 file	conf/debugsyms.c
 file	dev/auconv.c			auconv | mulaw

Index: src/sys/uvm/files.uvm
diff -u src/sys/uvm/files.uvm:1.21 src/sys/uvm/files.uvm:1.22
--- src/sys/uvm/files.uvm:1.21	Fri Oct 10 08:24:54 2014
+++ src/sys/uvm/files.uvm	Fri Oct 10 09:01:01 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.uvm,v 1.21 2014/10/10 08:24:54 uebayasi Exp $
+#	$NetBSD: files.uvm,v 1.22 2014/10/10 09:01:01 uebayasi Exp $
 
 #
 # UVM options
@@ -14,6 +14,7 @@ defparam			USER_VA0_DISABLE_DEFAULT
 defflag opt_uvm_page_trkown.h	UVM_PAGE_TRKOWN
 
 define	uvm
+defflag	opt_uvm.h			UVM
 file	uvm/uvm_amap.c			uvm
 file	uvm/uvm_anon.c			uvm
 file	uvm/uvm_aobj.c			uvm

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 09:13:22 UTC 2014

Modified Files:
src/sys/arch/amd64/conf: files.amd64
src/sys/arch/x86/conf: files.x86
src/sys/conf: files std

Log Message:
Define machdep attribute and mark files (in amd64 and x86).


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.1108 -r1.1109 src/sys/conf/files
cvs rdiff -u -r1.16 -r1.17 src/sys/conf/std

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

Modified files:

Index: src/sys/arch/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.83 src/sys/arch/amd64/conf/files.amd64:1.84
--- src/sys/arch/amd64/conf/files.amd64:1.83	Thu Feb 20 03:48:06 2014
+++ src/sys/arch/amd64/conf/files.amd64	Fri Oct 10 09:13:21 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amd64,v 1.83 2014/02/20 03:48:06 pgoyette Exp $
+#	$NetBSD: files.amd64,v 1.84 2014/10/10 09:13:21 uebayasi Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -27,25 +27,25 @@ defparam opt_physmem.h	PHYSMEM_MAX_ADDR 
 defflag			USER_LDT
 defflag eisa.h EISA
 
-file	arch/amd64/amd64/amd64func.S
-file	arch/amd64/amd64/autoconf.c
-file	arch/amd64/amd64/busfunc.S
+file	arch/amd64/amd64/amd64func.S		machdep
+file	arch/amd64/amd64/autoconf.c		machdep
+file	arch/amd64/amd64/busfunc.S		machdep
 file	arch/amd64/amd64/cpu_in_cksum.S		(inet | inet6)  cpu_in_cksum
-file	arch/amd64/amd64/cpufunc.S
+file	arch/amd64/amd64/cpufunc.S		machdep
 file	arch/amd64/amd64/db_disasm.c		ddb
 file	arch/amd64/amd64/db_interface.c		ddb
 file	arch/amd64/amd64/db_machdep.c		ddb
 file	arch/amd64/amd64/kobj_machdep.c		modular
 file	arch/amd64/amd64/kgdb_machdep.c		kgdb
 file	kern/subr_disk_mbr.c			disk
-file	arch/amd64/amd64/gdt.c
-file	arch/amd64/amd64/machdep.c
-file	arch/amd64/amd64/process_machdep.c
-file	arch/amd64/amd64/trap.c
-file	arch/x86/x86/fpu.c
-file	arch/x86/x86/convert_xmm_s87.c
-file	arch/amd64/amd64/lock_stubs.S
-file	dev/cons.c
+file	arch/amd64/amd64/gdt.c			machdep
+file	arch/amd64/amd64/machdep.c		machdep
+file	arch/amd64/amd64/process_machdep.c	machdep
+file	arch/amd64/amd64/trap.c			machdep
+file	arch/x86/x86/fpu.c			machdep
+file	arch/x86/x86/convert_xmm_s87.c		machdep
+file	arch/amd64/amd64/lock_stubs.S		machdep
+file	dev/cons.cmachdep
 
 file	arch/amd64/amd64/mptramp.Smultiprocessor
 

Index: src/sys/arch/x86/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.81 src/sys/arch/x86/conf/files.x86:1.82
--- src/sys/arch/x86/conf/files.x86:1.81	Tue Mar 18 18:20:41 2014
+++ src/sys/arch/x86/conf/files.x86	Fri Oct 10 09:13:21 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.x86,v 1.81 2014/03/18 18:20:41 riastradh Exp $
+#	$NetBSD: files.x86,v 1.82 2014/10/10 09:13:21 uebayasi Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -66,34 +66,34 @@ attach	vmt at cpufeaturebus
 file	arch/x86/x86/vmt.c		vmt
 
 file	arch/x86/x86/apic.c		ioapic | lapic
-file	arch/x86/x86/bus_dma.c
-file	arch/x86/x86/bus_space.c
-file	arch/x86/x86/consinit.c
+file	arch/x86/x86/bus_dma.c		machdep
+file	arch/x86/x86/bus_space.c	machdep
+file	arch/x86/x86/consinit.c		machdep
 file	arch/x86/x86/core_machdep.c	coredump
-file	arch/x86/x86/cpu_topology.c
+file	arch/x86/x86/cpu_topology.c	machdep
 file	arch/x86/x86/db_memrw.c		ddb | kgdb
 file	arch/x86/x86/db_trace.c		ddb
-file	arch/x86/x86/errata.c
-file	arch/x86/x86/genfb_machdep.c
-file	arch/x86/x86/identcpu.c
-file	arch/x86/x86/i8259.c
-file	arch/x86/x86/intr.c
-file	arch/x86/x86/nmi.c
-file	arch/x86/x86/idt.c
-file	arch/x86/x86/ipi.c
+file	arch/x86/x86/errata.c		machdep
+file	arch/x86/x86/genfb_machdep.c	machdep
+file	arch/x86/x86/identcpu.c		machdep
+file	arch/x86/x86/i8259.c		machdep
+file	arch/x86/x86/intr.c		machdep
+file	arch/x86/x86/nmi.c		machdep
+file	arch/x86/x86/idt.c		machdep
+file	arch/x86/x86/ipi.c		machdep
 file	arch/x86/x86/mtrr_i686.c	mtrr
-file 	arch/x86/x86/patch.c
-file	arch/x86/x86/platform.c
-file 	arch/x86/x86/pmap.c
-file 	arch/x86/x86/pmap_tlb.c
+file 	arch/x86/x86/patch.c		machdep
+file	arch/x86/x86/platform.c		machdep
+file 	arch/x86/x86/pmap.c		machdep
+file 	arch/x86/x86/pmap_tlb.c		machdep
 file	arch/x86/x86/procfs_machdep.c	procfs
-file	arch/x86/x86/sys_machdep.c
-file	arch/x86/x86/syscall.c
-file	arch/x86/x86/tsc.c
-file	arch/x86/x86/vm_machdep.c
-file	arch/x86/x86/x86_autoconf.c
-file	arch/x86/x86/x86_userconf.c		userconf
-file	arch/x86/x86/x86_machdep.c
+file	arch/x86/x86/sys_machdep.c	machdep
+file	arch/x86/x86/syscall.c		machdep
+file	arch/x86/x86/tsc.c		machdep
+file	arch/x86/x86/vm_machdep.c	machdep
+file	arch/x86/x86/x86_autoconf.c	machdep
+file	arch/x86/x86/x86_userconf.c	userconf
+file	arch/x86/x86/x86_machdep.c	machdep
 
 file	arch/x86/x86/cpu_ucode.c	cpu_ucode needs-flag
 file

CVS commit: src/sys/conf

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 09:31:40 UTC 2014

Modified Files:
src/sys/conf: files std

Log Message:
Use option dependency to always select KERN (and its dependencies).


To generate a diff of this commit:
cvs rdiff -u -r1.1109 -r1.1110 src/sys/conf/files
cvs rdiff -u -r1.17 -r1.18 src/sys/conf/std

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1109 src/sys/conf/files:1.1110
--- src/sys/conf/files:1.1109	Fri Oct 10 09:13:21 2014
+++ src/sys/conf/files	Fri Oct 10 09:31:40 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1109 2014/10/10 09:13:21 uebayasi Exp $
+#	$NetBSD: files,v 1.1110 2014/10/10 09:31:40 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20140824
@@ -1493,7 +1493,7 @@ include secmodel/files.secmodel
 # kernel sources
 #
 define	kern
-defflag	opt_kern.h			KERN
+defflag	opt_kern.h			KERN:	MACHDEP, UVM
 file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
 file	conf/debugsyms.c
 file	dev/auconv.c			auconv | mulaw

Index: src/sys/conf/std
diff -u src/sys/conf/std:1.17 src/sys/conf/std:1.18
--- src/sys/conf/std:1.17	Fri Oct 10 09:13:21 2014
+++ src/sys/conf/std	Fri Oct 10 09:31:40 2014
@@ -1,12 +1,10 @@
-# $NetBSD: std,v 1.17 2014/10/10 09:13:21 uebayasi Exp $
+# $NetBSD: std,v 1.18 2014/10/10 09:31:40 uebayasi Exp $
 #
 # standard MI 'options'
 #
 # this file is for options which can't be off-by-default for some reasons.
 # it's commonly used is NOT a good reason to enable options here.
 
-options	MACHDEP
-options	UVM
 options	KERN
 
 # the following options are on-by-default to keep

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 10:16:19 UTC 2014

Modified Files:
src/usr.bin/config: sem.c

Log Message:
If an attribute is selected, select its dependencies too.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/config/sem.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/config/sem.c
diff -u src/usr.bin/config/sem.c:1.53 src/usr.bin/config/sem.c:1.54
--- src/usr.bin/config/sem.c:1.53	Fri Oct 10 08:14:47 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 10:16:19 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.53 2014/10/10 08:14:47 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.54 2014/10/10 10:16:19 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -1861,7 +1861,13 @@ split(const char *name, size_t nlen, cha
 void
 selectattr(struct attr *a)
 {
+	struct attrlist *al;
+	struct attr *dep;
 
+	for (al = a-a_deps; al != NULL; al = al-al_next) {
+		dep = al-al_this;
+		selectattr(dep);
+	}
 	(void)ht_insert(selecttab, a-a_name, __UNCONST(a-a_name));
 	CFGDBG(3, attr selected `%s', a-a_name);
 }

CVS commit: src

2014-10-10 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Fri Oct 10 10:10:41 UTC 2014

Modified Files:
src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc
ad.riscv md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc
ad.riscv md.amd64 md.sparc64 shl.mi
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile

Log Message:
bump libstdc++ minor due to new complex etc functions enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.21 -r1.22 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.248 -r1.249 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.236 -r1.237 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.717 -r1.718 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/ad.riscv
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/debug/shl.mi
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile

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/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.8 src/distrib/sets/lists/base/ad.aarch64:1.9
--- src/distrib/sets/lists/base/ad.aarch64:1.8	Fri Oct 10 00:49:14 2014
+++ src/distrib/sets/lists/base/ad.aarch64	Fri Oct 10 10:10:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.8 2014/10/10 00:49:14 christos Exp $
+# $NetBSD: ad.aarch64,v 1.9 2014/10/10 10:10:40 mrg Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-npf-shlib		compat
 ./lib/eabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -300,7 +300,7 @@
 ./usr/lib/eabi/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx
 ./usr/lib/eabi/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx,libstdcxx
 ./usr/lib/eabi/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx,libstdcxx
-./usr/lib/eabi/libstdc++.so.7.2			base-compat-shlib	gcc=48,compat,pic,cxx,libstdcxx
+./usr/lib/eabi/libstdc++.so.7.3			base-compat-shlib	gcc=48,compat,pic,cxx,libstdcxx
 ./usr/lib/eabi/libtermcap.so.0			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libtermcap.so.0.6			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libterminfo.so.1			base-compat-shlib	compat,pic
@@ -614,7 +614,7 @@
 ./usr/lib/eabihf/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx
 ./usr/lib/eabihf/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx,libstdcxx
 ./usr/lib/eabihf/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx,libstdcxx
-./usr/lib/eabihf/libstdc++.so.7.2			base-compat-shlib	gcc=48,compat,pic,cxx,libstdcxx
+./usr/lib/eabihf/libstdc++.so.7.3			base-compat-shlib	gcc=48,compat,pic,cxx,libstdcxx
 ./usr/lib/eabihf/libtermcap.so.0			base-compat-shlib	compat,pic
 ./usr/lib/eabihf/libtermcap.so.0.6			base-compat-shlib	compat,pic
 ./usr/lib/eabihf/libterminfo.so.1			base-compat-shlib	compat,pic
@@ -926,7 +926,7 @@
 ./usr/lib/oabi/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx,libstdcxx
 ./usr/lib/oabi/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx,libstdcxx
-./usr/lib/oabi/libstdc++.so.7.2			base-compat-shlib	gcc=48,compat,pic,cxx,libstdcxx
+./usr/lib/oabi/libstdc++.so.7.3			base-compat-shlib	gcc=48,compat,pic,cxx,libstdcxx
 ./usr/lib/oabi/libtermcap.so.0			base-compat-shlib	compat,pic
 ./usr/lib/oabi/libtermcap.so.0.6		base-compat-shlib	compat,pic
 ./usr/lib/oabi/libterminfo.so.1			base-compat-shlib	compat,pic

Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.57 src/distrib/sets/lists/base/ad.arm:1.58
--- src/distrib/sets/lists/base/ad.arm:1.57	Fri Oct 10 00:49:14 2014
+++ src/distrib/sets/lists/base/ad.arm	Fri Oct 10 10:10:40 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.57 2014/10/10 00:49:14 christos Exp $
+# $NetBSD: ad.arm,v 1.58 2014/10/10 10:10:40 mrg Exp $
 ./lib/oabi	base-compat-shlib	compat
 ./lib/oabi/npf	base-npf-shlib		compat
 ./lib/oabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -307,7 +307,7 @@
 ./usr/lib/oabi/libstdc++.so.7			base-compat-shlib	compat,pic,cxx,gcccmds,libstdcxx
 ./usr/lib/oabi/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx,libstdcxx
 ./usr/lib/oabi/libstdc++.so.7.1

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 10:22:49 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
If an option is selected, select the matching (lowercased) attribute.  Handle
dependencies too.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/config/main.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/config/main.c
diff -u src/usr.bin/config/main.c:1.60 src/usr.bin/config/main.c:1.61
--- src/usr.bin/config/main.c:1.60	Fri Oct 10 07:48:50 2014
+++ src/usr.bin/config/main.c	Fri Oct 10 10:22:49 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.60 2014/10/10 07:48:50 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.61 2014/10/10 10:22:49 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -531,6 +531,8 @@ dependopts_one(const char *name)
 	if (fs != NULL) {
 		do_depends(fs-nv_ptr);
 	}
+
+	CFGDBG(3, depend `%s' searched, name);
 }
 
 static void
@@ -549,16 +551,25 @@ do_depend(struct nvlist *nv)
 	struct attr *a;
 
 	if (nv != NULL  (nv-nv_flags  NV_DEPENDED) == 0) {
+		const char *n = strtolower(nv-nv_name);
+
 		nv-nv_flags |= NV_DEPENDED;
 		/*
 		 * If the dependency is an attribute, then just add
 		 * it to the selecttab.
 		 */
+		CFGDBG(3, depend attr `%s', nv-nv_name);
+		/* XXX Do uppercased attribute names exist? */
 		if ((a = ht_lookup(attrtab, nv-nv_name)) != NULL) {
 			if (a-a_iattr)
 panic(do_depend(%s): dep `%s' is an iattr,
 nv-nv_name, a-a_name);
 			expandattr(a, selectattr);
+		} else if ((a = ht_lookup(attrtab, n)) != NULL) {
+			if (a-a_iattr)
+panic(do_depend(%s): dep `%s' is an iattr,
+n, a-a_name);
+			expandattr(a, selectattr);
 		} else {
 			if (ht_lookup(opttab, nv-nv_name) == NULL)
 addoption(nv-nv_name, NULL);
@@ -975,6 +986,13 @@ addoption(const char *name, const char *
 	n = strtolower(name);
 	(void)ht_insert(selecttab, n, (void *)__UNCONST(n));
 	CFGDBG(3, option selected `%s', n);
+
+	/*
+	 * Select attribute if one exists.
+	 */
+	struct attr *a;
+	if ((a = ht_lookup(attrtab, n)) != NULL)
+		selectattr(a);
 }
 
 void

CVS commit: src/sys/conf

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 10:25:00 UTC 2014

Modified Files:
src/sys/conf: files

Log Message:
Now that attribute dependency works, prefer it to options dependency (personal
preference).  Use it for kern, depending on machdep and uvm.


To generate a diff of this commit:
cvs rdiff -u -r1.1110 -r1. src/sys/conf/files

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1110 src/sys/conf/files:1.
--- src/sys/conf/files:1.1110	Fri Oct 10 09:31:40 2014
+++ src/sys/conf/files	Fri Oct 10 10:25:00 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1110 2014/10/10 09:31:40 uebayasi Exp $
+#	$NetBSD: files,v 1. 2014/10/10 10:25:00 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20140824
@@ -1492,8 +1492,8 @@ include secmodel/files.secmodel
 #
 # kernel sources
 #
-define	kern
-defflag	opt_kern.h			KERN:	MACHDEP, UVM
+define	kern:	machdep, uvm
+defflag	opt_kern.h			KERN
 file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
 file	conf/debugsyms.c
 file	dev/auconv.c			auconv | mulaw

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 10:46:06 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Select attributes for filesystem options too.


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/usr.bin/config/main.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/config/main.c
diff -u src/usr.bin/config/main.c:1.61 src/usr.bin/config/main.c:1.62
--- src/usr.bin/config/main.c:1.61	Fri Oct 10 10:22:49 2014
+++ src/usr.bin/config/main.c	Fri Oct 10 10:46:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.61 2014/10/10 10:22:49 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.62 2014/10/10 10:46:05 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -1033,6 +1033,13 @@ addfsoption(const char *name)
 	/* Add to select table. */
 	(void)ht_insert(selecttab, n, __UNCONST(n));
 	CFGDBG(3, fs selected `%s', name);
+
+	/*
+	 * Select attribute if one exists.
+	 */
+	struct attr *a;
+	if ((a = ht_lookup(attrtab, n)) != NULL)
+		selectattr(a);
 }
 
 void

CVS commit: src/sys/dev/pci

2014-10-10 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Fri Oct 10 11:04:21 UTC 2014

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

Log Message:
- Support DH89XXCC devices.
- Add extra delay for 82580 and newer devices except DH89XXCC SGMII device.
  Same as FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/sys/dev/pci/if_wm.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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.303 src/sys/dev/pci/if_wm.c:1.304
--- src/sys/dev/pci/if_wm.c:1.303	Tue Oct  7 08:45:02 2014
+++ src/sys/dev/pci/if_wm.c	Fri Oct 10 11:04:21 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.303 2014/10/07 08:45:02 ozaki-r Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.304 2014/10/10 11:04:21 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.303 2014/10/07 08:45:02 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.304 2014/10/10 11:04:21 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -272,6 +272,7 @@ struct wm_softc {
 	int sc_bus_speed;		/* PCI/PCIX bus speed */
 	int sc_pcixe_capoff;		/* PCI[Xe] capability reg offset */
 
+	uint16_t sc_pcidevid;		/* PCI device ID */
 	wm_chip_type sc_type;		/* MAC type */
 	int sc_rev;			/* MAC revision */
 	wm_phy_type sc_phytype;		/* PHY type */
@@ -1122,9 +1123,26 @@ static const struct wm_product {
 	  82580 quad-1000BaseX Ethernet,
 	  WM_T_82580,		WMP_F_FIBER },
 
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_DH89XXCC_SGMII,
+	  DH89XXCC Gigabit Ethernet (SGMII),
+	  WM_T_82580,		WMP_F_COPPER },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_DH89XXCC_SERDES,
+	  DH89XXCC Gigabit Ethernet (SERDES),
+	  WM_T_82580,		WMP_F_SERDES },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_DH89XXCC_BPLANE,
+	  DH89XXCC 1000BASE-KX Ethernet,
+	  WM_T_82580,		WMP_F_SERDES },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_DH89XXCC_SFP,
+	  DH89XXCC Gigabit Ethernet (SFP),
+	  WM_T_82580,		WMP_F_SERDES },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_COPPER,
 	  I350 Gigabit Network Connection,
 	  WM_T_I350,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_FIBER,
 	  I350 Gigabit Fiber Network Connection,
 	  WM_T_I350,		WMP_F_FIBER },
@@ -1350,6 +1368,7 @@ wm_attach(device_t parent, device_t self
 	else
 		sc-sc_dmat = pa-pa_dmat;
 
+	sc-sc_pcidevid = PCI_PRODUCT(pa-pa_id);
 	sc-sc_rev = PCI_REVISION(pci_conf_read(pc, pa-pa_tag, PCI_CLASS_REG));
 	pci_aprint_devinfo_fancy(pa, Ethernet controller, wmp-wmp_name, 1);
 
@@ -3423,6 +3442,16 @@ wm_reset(struct wm_softc *sc)
 		delay(20*1000);
 		wm_put_swfwhw_semaphore(sc);
 		break;
+	case WM_T_82580:
+	case WM_T_I350:
+	case WM_T_I354:
+	case WM_T_I210:
+	case WM_T_I211:
+		CSR_WRITE(sc, WMREG_CTRL, CSR_READ(sc, WMREG_CTRL) | CTRL_RST);
+		if (sc-sc_pcidevid != PCI_PRODUCT_INTEL_DH89XXCC_SGMII)
+			CSR_WRITE_FLUSH(sc);
+		delay(5000);
+		break;
 	case WM_T_82542_2_0:
 	case WM_T_82542_2_1:
 	case WM_T_82543:
@@ -3435,12 +3464,7 @@ wm_reset(struct wm_softc *sc)
 	case WM_T_82574:
 	case WM_T_82575:
 	case WM_T_82576:
-	case WM_T_82580:
 	case WM_T_82583:
-	case WM_T_I350:
-	case WM_T_I354:
-	case WM_T_I210:
-	case WM_T_I211:
 	default:
 		/* Everything else can safely use the documented method. */
 		CSR_WRITE(sc, WMREG_CTRL, CSR_READ(sc, WMREG_CTRL) | CTRL_RST);

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 11:09:50 UTC 2014

Modified Files:
src/usr.bin/config: gram.y sem.c sem.h

Log Message:
Allow dependency on undefined attributes, so that attribute definitions can
be written out-of-order, like:

# b is not defined yet
define  a: b
filea.c a

# b is defined here
define  b
fineb.c


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/config/gram.y
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/config/sem.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/config/sem.h

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/config/gram.y
diff -u src/usr.bin/config/gram.y:1.42 src/usr.bin/config/gram.y:1.43
--- src/usr.bin/config/gram.y:1.42	Fri Oct 10 06:13:30 2014
+++ src/usr.bin/config/gram.y	Fri Oct 10 11:09:50 2014
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: gram.y,v 1.42 2014/10/10 06:13:30 uebayasi Exp $	*/
+/*	$NetBSD: gram.y,v 1.43 2014/10/10 11:09:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -587,7 +587,7 @@ depends:
 
 /* one depend item (which is an attribute) */
 depend:
-	WORD{ $$ = getattr($1); }
+	WORD{ $$ = refattr($1); }
 ;
 
 /* list of option depends, may be empty */

Index: src/usr.bin/config/sem.c
diff -u src/usr.bin/config/sem.c:1.54 src/usr.bin/config/sem.c:1.55
--- src/usr.bin/config/sem.c:1.54	Fri Oct 10 10:16:19 2014
+++ src/usr.bin/config/sem.c	Fri Oct 10 11:09:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.c,v 1.54 2014/10/10 10:16:19 uebayasi Exp $	*/
+/*	$NetBSD: sem.c,v 1.55 2014/10/10 11:09:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -672,12 +672,14 @@ getattr(const char *name)
 /*
  * Implicit attribute definition.
  */
-void
+struct attr *
 refattr(const char *name)
 {
+	struct attr *a;
 
-	if ((ht_lookup(attrtab, name)) == NULL)
-		(void)mkattr(name);
+	if ((a = ht_lookup(attrtab, name)) == NULL)
+		a = mkattr(name);
+	return a;
 }
 
 int

Index: src/usr.bin/config/sem.h
diff -u src/usr.bin/config/sem.h:1.13 src/usr.bin/config/sem.h:1.14
--- src/usr.bin/config/sem.h:1.13	Fri Oct 10 07:48:50 2014
+++ src/usr.bin/config/sem.h	Fri Oct 10 11:09:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: sem.h,v 1.13 2014/10/10 07:48:50 uebayasi Exp $	*/
+/*	$NetBSD: sem.h,v 1.14 2014/10/10 11:09:50 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -57,7 +57,7 @@ struct devbase *getdevbase(const char *)
 struct deva*getdevattach(const char *);
 struct attr	*mkattr(const char *);
 struct attr*getattr(const char *);
-void		refattr(const char *);
+struct attr*refattr(const char *);
 int		getrefattr(const char *, struct attr **);
 void		expandattr(struct attr *, void (*)(struct attr *));
 void		selectattr(struct attr *);

CVS commit: src/distrib/sets/lists/comp

2014-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 10 11:36:01 UTC 2014

Modified Files:
src/distrib/sets/lists/comp: mi

Log Message:
Two more files missed in last addition


To generate a diff of this commit:
cvs rdiff -u -r1.1915 -r1.1916 src/distrib/sets/lists/comp/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/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1915 src/distrib/sets/lists/comp/mi:1.1916
--- src/distrib/sets/lists/comp/mi:1.1915	Fri Oct 10 08:31:49 2014
+++ src/distrib/sets/lists/comp/mi	Fri Oct 10 11:36:00 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1915 2014/10/10 08:31:49 martin Exp $
+#	$NetBSD: mi,v 1.1916 2014/10/10 11:36:00 martin Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -12594,11 +12594,13 @@
 ./usr/share/man/html3/casinl.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/casinh.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/casinhf.html		comp-c-htmlman		complex,html
+./usr/share/man/html3/casinhl.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/catan.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/catanf.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/catanl.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/catanh.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/catanhf.html		comp-c-htmlman		complex,html
+./usr/share/man/html3/catanhl.html		comp-c-htmlman		complex,html
 ./usr/share/man/html3/catclose.html		comp-c-htmlman		html
 ./usr/share/man/html3/catgets.html		comp-c-htmlman		html
 ./usr/share/man/html3/catopen.html		comp-c-htmlman		html

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 11:38:42 UTC 2014

Added Files:
src/usr.bin/config: TODO

Log Message:
Put TODO ideas (to keep your fun).


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/usr.bin/config/TODO

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

Added files:

Index: src/usr.bin/config/TODO
diff -u /dev/null src/usr.bin/config/TODO:1.1
--- /dev/null	Fri Oct 10 11:38:42 2014
+++ src/usr.bin/config/TODO	Fri Oct 10 11:38:42 2014
@@ -0,0 +1,35 @@
+o Emit everything (ioconf.*, Makefile, ...) per-attribute.
+
+o Generate modular(9) related information.  Especially module dependency.
+
+o Rename interface attribute to bus.
+
+  Instead of
+
+	define	audiobus {}
+	attach	audio at audiobus
+
+  Do like this
+
+	defbus	audiobus {}
+	attach	audio at audiobus
+
+o Sort objects in more reasonable order.
+
+  Put machdep.ko in the lowest address.  uvm.ko and kern.ko follow.
+
+  Kill alphabetical sort (${OBJS:O} in sys/conf/Makefile.inc.kern.
+
+  Use ldscript.  Do like this
+
+	.text :
+	AT (ADDR(.text)  0x0fff)
+	{
+	  *(.text.machdep.locore.entry)
+	  *(.text.machdep.locore)
+	  *(.text.machdep)
+	  *(.text)
+	  *(.text.*)
+	  :
+
+  Kill linker definitions in sys/conf/Makefile.inc.kern.

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 11:49:15 UTC 2014

Modified Files:
src/usr.bin/config: config.1

Log Message:
Document -M.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/config/config.1

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/config/config.1
diff -u src/usr.bin/config/config.1:1.15 src/usr.bin/config/config.1:1.16
--- src/usr.bin/config/config.1:1.15	Mon May  5 20:52:45 2014
+++ src/usr.bin/config/config.1	Fri Oct 10 11:49:15 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: config.1,v 1.15 2014/05/05 20:52:45 wiz Exp $
+.\	$NetBSD: config.1,v 1.16 2014/10/10 11:49:15 uebayasi Exp $
 .\
 .\ Copyright (c) 1980, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ from: @(#)config.8	8.2 (Berkeley) 4/19/94
 .\
-.Dd May 5, 2014
+.Dd Oct 10, 2014
 .Dt CONFIG 1
 .Os
 .Sh NAME
@@ -37,7 +37,7 @@
 .Nd build kernel compilation directories
 .Sh SYNOPSIS
 .Nm
-.Op Fl Ppv
+.Op Fl MPpv
 .Op Fl b Ar builddir
 .Op Fl D Ar var=value
 .Op Fl s Ar srcdir
@@ -121,6 +121,12 @@ Generate a lint configuration.
 See section
 .Sx LINT CONFIGURATION
 for details.
+.It Fl M
+Do modular build (experimental).
+Instead of linking all object files (*.o) at once, collect related object
+files into an intermedia relocatable object (*.ko), then link those *.ko
+files into the final kernel.
+This changes the order of objects in the kernel binary.
 .It Fl P
 Pack locators to save space in the resulting kernel binary.
 The amount of space saved that way is so small that this option should

CVS commit: src/usr.bin/config

2014-10-10 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Fri Oct 10 11:58:59 UTC 2014

Modified Files:
src/usr.bin/config: config.1

Log Message:
Fix two typos.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/config/config.1

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/config/config.1
diff -u src/usr.bin/config/config.1:1.16 src/usr.bin/config/config.1:1.17
--- src/usr.bin/config/config.1:1.16	Fri Oct 10 11:49:15 2014
+++ src/usr.bin/config/config.1	Fri Oct 10 11:58:59 2014
@@ -1,4 +1,4 @@
-.\	$NetBSD: config.1,v 1.16 2014/10/10 11:49:15 uebayasi Exp $
+.\	$NetBSD: config.1,v 1.17 2014/10/10 11:58:59 wiz Exp $
 .\
 .\ Copyright (c) 1980, 1991, 1993
 .\	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\
 .\ from: @(#)config.8	8.2 (Berkeley) 4/19/94
 .\
-.Dd Oct 10, 2014
+.Dd October 10, 2014
 .Dt CONFIG 1
 .Os
 .Sh NAME
@@ -124,7 +124,7 @@ for details.
 .It Fl M
 Do modular build (experimental).
 Instead of linking all object files (*.o) at once, collect related object
-files into an intermedia relocatable object (*.ko), then link those *.ko
+files into an intermediate relocatable object (*.ko), then link those *.ko
 files into the final kernel.
 This changes the order of objects in the kernel binary.
 .It Fl P

CVS commit: src

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 12:10:03 UTC 2014

Modified Files:
src/sys/conf: files
src/usr.bin/config: defs.h

Log Message:
Bump config(1) version.

config(1) still keeps backward-compatibility; it is more permissive than
before.  The tree, however, needs the updated config(1), mainly to strictly
define attribute (module) ownership and dependencies.


To generate a diff of this commit:
cvs rdiff -u -r1. -r1.1112 src/sys/conf/files
cvs rdiff -u -r1.54 -r1.55 src/usr.bin/config/defs.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/conf/files
diff -u src/sys/conf/files:1. src/sys/conf/files:1.1112
--- src/sys/conf/files:1.	Fri Oct 10 10:25:00 2014
+++ src/sys/conf/files	Fri Oct 10 12:10:02 2014
@@ -1,7 +1,7 @@
-#	$NetBSD: files,v 1. 2014/10/10 10:25:00 uebayasi Exp $
+#	$NetBSD: files,v 1.1112 2014/10/10 12:10:02 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
-version 	20140824
+version 	20141010
 
 #
 # device classes

Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.54 src/usr.bin/config/defs.h:1.55
--- src/usr.bin/config/defs.h:1.54	Fri Oct 10 05:27:28 2014
+++ src/usr.bin/config/defs.h	Fri Oct 10 12:10:02 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.54 2014/10/10 05:27:28 uebayasi Exp $	*/
+/*	$NetBSD: defs.h,v 1.55 2014/10/10 12:10:02 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@ extern const char *progname;
  * The next two lines define the current version of the config(1) binary,
  * and the minimum version of the configuration files it supports.
  */
-#define CONFIG_VERSION		20140824
+#define CONFIG_VERSION		20141010
 #define CONFIG_MINVERSION	0
 
 /*

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 12:20:13 UTC 2014

Modified Files:
src/sys/conf: files
src/sys/ufs: files.ufs

Log Message:
To make sure that I'm not doing wrong, try to define ffs/ufs/vfs dependencies
a little more strictly.


To generate a diff of this commit:
cvs rdiff -u -r1.1112 -r1.1113 src/sys/conf/files
cvs rdiff -u -r1.36 -r1.37 src/sys/ufs/files.ufs

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1112 src/sys/conf/files:1.1113
--- src/sys/conf/files:1.1112	Fri Oct 10 12:10:02 2014
+++ src/sys/conf/files	Fri Oct 10 12:20:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1112 2014/10/10 12:10:02 uebayasi Exp $
+#	$NetBSD: files,v 1.1113 2014/10/10 12:20:13 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20141010
@@ -1688,38 +1688,40 @@ file	kern/uipc_socket.c		kern
 file	kern/uipc_socket2.c		kern
 file	kern/uipc_syscalls.c		kern
 file	kern/uipc_usrreq.c		kern
-file	kern/vfs_bio.c			kern
-file	kern/vfs_cache.c		kern
-file	kern/vfs_cwd.c			kern
-file	kern/vfs_dirhash.c		kern
-file	kern/vfs_getcwd.c		kern
-file	kern/vfs_hooks.c		kern
-file	kern/vfs_init.c			kern
-file	kern/vfs_lockf.c		kern
-file	kern/vfs_lookup.c		kern
-file	kern/vfs_mount.c		kern
-file	kern/vfs_quotactl.c		kern
-file	kern/vfs_subr.c			kern
-file	kern/vfs_syscalls.c		kern
-file	kern/vfs_trans.c		kern
-file	kern/vfs_vnode.c		kern
-file	kern/vfs_vnops.c		kern
+
+define	vfs: kern
+file	kern/vfs_bio.c			vfs
+file	kern/vfs_cache.c		vfs
+file	kern/vfs_cwd.c			vfs
+file	kern/vfs_dirhash.c		vfs
+file	kern/vfs_getcwd.c		vfs
+file	kern/vfs_hooks.c		vfs
+file	kern/vfs_init.c			vfs
+file	kern/vfs_lockf.c		vfs
+file	kern/vfs_lookup.c		vfs
+file	kern/vfs_mount.c		vfs
+file	kern/vfs_quotactl.c		vfs
+file	kern/vfs_subr.c			vfs
+file	kern/vfs_syscalls.c		vfs
+file	kern/vfs_trans.c		vfs
+file	kern/vfs_vnode.c		vfs
+file	kern/vfs_vnops.c		vfs
 file	kern/vfs_wapbl.c		wapbl
-file	kern/vfs_xattr.c		kern
-file	kern/vnode_if.c			kern
-file	miscfs/deadfs/dead_vfsops.c	kern
-file	miscfs/deadfs/dead_vnops.c	kern
-file	miscfs/fifofs/fifo_vnops.c	kern
-file	miscfs/genfs/genfs_io.c		kern
-file	miscfs/genfs/genfs_rename.c	kern
-file	miscfs/genfs/genfs_vfsops.c	kern
-file	miscfs/genfs/genfs_vnops.c	kern
+file	kern/vfs_xattr.c		vfs
+file	kern/vnode_if.c			vfs
+file	miscfs/deadfs/dead_vfsops.c	vfs
+file	miscfs/deadfs/dead_vnops.c	vfs
+file	miscfs/fifofs/fifo_vnops.c	vfs
+file	miscfs/genfs/genfs_io.c		vfs
+file	miscfs/genfs/genfs_rename.c	vfs
+file	miscfs/genfs/genfs_vfsops.c	vfs
+file	miscfs/genfs/genfs_vnops.c	vfs
 file	miscfs/genfs/layer_subr.c	nullfs | overlay | umapfs
 file	miscfs/genfs/layer_vfsops.c	nullfs | overlay | umapfs
 file	miscfs/genfs/layer_vnops.c	nullfs | overlay | umapfs
-file	miscfs/specfs/spec_vnops.c	kern
-file	miscfs/syncfs/sync_subr.c	kern
-file	miscfs/syncfs/sync_vnops.c	kern
+file	miscfs/specfs/spec_vnops.c	vfs
+file	miscfs/syncfs/sync_subr.c	vfs
+file	miscfs/syncfs/sync_vnops.c	vfs
 
 file	net/bpf.c			bpfilter
 file	net/bpf_filter.c		bpf_filter

Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.36 src/sys/ufs/files.ufs:1.37
--- src/sys/ufs/files.ufs:1.36	Fri May 16 09:34:03 2014
+++ src/sys/ufs/files.ufs	Fri Oct 10 12:20:13 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.ufs,v 1.36 2014/05/16 09:34:03 dholland Exp $
+#	$NetBSD: files.ufs,v 1.37 2014/10/10 12:20:13 uebayasi Exp $
 
 deffs	FFS
 deffs	EXT2FS
@@ -15,6 +15,7 @@ defflag	opt_lfs.h			LFS_EI LFS_KERNEL_RF
 	LFS_EXTATTR LFS_EXTATTR_AUTOSTART
 	LFS_QUOTA LFS_QUOTA2
 
+define	ext2fs:	vfs, ffs
 file	ufs/ext2fs/ext2fs_alloc.c	ext2fs
 file	ufs/ext2fs/ext2fs_balloc.c	ext2fs
 file	ufs/ext2fs/ext2fs_bmap.c	ext2fs
@@ -27,6 +28,7 @@ file	ufs/ext2fs/ext2fs_subr.c	ext2fs
 file	ufs/ext2fs/ext2fs_vfsops.c	ext2fs
 file	ufs/ext2fs/ext2fs_vnops.c	ext2fs
 
+define	chfs: vfs, ffs
 file	ufs/chfs/ebh.c			chfs
 file	ufs/chfs/chfs_ihash.c		chfs
 file	ufs/chfs/chfs_scan.c		chfs
@@ -45,19 +47,21 @@ file	ufs/chfs/chfs_subr.c		chfs
 file	ufs/chfs/chfs_vfsops.c		chfs
 file	ufs/chfs/chfs_readinode.c	chfs
 
-file	ufs/ffs/ffs_alloc.c		ffs | mfs | ext2fs | chfs
-file	ufs/ffs/ffs_balloc.c		ffs | mfs | ext2fs | chfs
+define	ffs: vfs, ufs
+file	ufs/ffs/ffs_alloc.c		ffs
+file	ufs/ffs/ffs_balloc.c		ffs
 file	ufs/ffs/ffs_bswap.c		(ffs | mfs)  ffs_ei
-file	ufs/ffs/ffs_inode.c		ffs | mfs | ext2fs | chfs
-file	ufs/ffs/ffs_snapshot.c		ffs | mfs | ext2fs | chfs
-file	ufs/ffs/ffs_subr.c		ffs | mfs | ext2fs | chfs
-file	ufs/ffs/ffs_tables.c		ffs | mfs | ext2fs | chfs
-file	ufs/ffs/ffs_vfsops.c		ffs | mfs | ext2fs | chfs
-file	ufs/ffs/ffs_vnops.c		ffs | mfs | ext2fs | chfs
+file	ufs/ffs/ffs_inode.c		ffs
+file	ufs/ffs/ffs_snapshot.c		ffs
+file	ufs/ffs/ffs_subr.c		ffs
+file	ufs/ffs/ffs_tables.c		ffs
+file	ufs/ffs/ffs_vfsops.c		ffs
+file	ufs/ffs/ffs_vnops.c		ffs
 file	ufs/ffs/ffs_wapbl.c		ffs  wapbl
 file

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 12:29:28 UTC 2014

Modified Files:
src/sys/conf: files
Added Files:
src/sys/dev: files.audio

Log Message:
Move audio related definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.1113 -r1.1114 src/sys/conf/files
cvs rdiff -u -r0 -r1.1 src/sys/dev/files.audio

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1113 src/sys/conf/files:1.1114
--- src/sys/conf/files:1.1113	Fri Oct 10 12:20:13 2014
+++ src/sys/conf/files	Fri Oct 10 12:29:28 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1113 2014/10/10 12:20:13 uebayasi Exp $
+#	$NetBSD: files,v 1.1114 2014/10/10 12:29:28 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20141010
@@ -317,22 +317,7 @@ define 	pckbport	{[slot = -1]}
 define	pckbport_machdep_cnattach
 define	firmload
 
-# audio device attributes
-#
-define	mulaw
-define	auconv
-define	aurateconv
-
-# audio and midi devices, attaches to audio hardware driver
-#
-device	audio: audiodev
-attach	audio at audiobus
-device	midi
-attach	midi at midibus
-
-# console bell via audio device
-#
-define	audiobell
+include dev/files.audio
 
 # Base verbose vendor/product printing support
 file	dev/dev_verbose.c
@@ -1496,10 +1481,6 @@ define	kern:	machdep, uvm
 defflag	opt_kern.h			KERN
 file	compat/common/compat_mod.c	compat_netbsd | compat_netbsd32
 file	conf/debugsyms.c
-file	dev/auconv.c			auconv | mulaw
-file	dev/audio.c			audio | midi | midibus	needs-flag
-file	dev/audiobell.c			audiobell
-file	dev/aurateconv.c		aurateconv		needs-flag
 file	dev/bio.c			bio			needs-flag
 file	dev/ccd.c			ccd
 file	dev/cgd.c			cgd
@@ -1517,11 +1498,7 @@ file	dev/fss.c			fss
 file	dev/keylock.c			keylock
 file	dev/lockstat.c			lockstat		needs-flag
 file	dev/md.c			md
-file	dev/midi.c			midi | midibus		needs-flag
-file	dev/midictl.c			midisyn
-file	dev/midisyn.c			midisyn
 file	dev/mm.c
-file	dev/mulaw.c			mulaw			needs-flag
 file	dev/nullcons_subr.c		nullcons		needs-flag
 file	dev/radio.c			radio			needs-flag
 file	dev/rndpseudo.c			rnd			needs-flag
@@ -1554,7 +1531,7 @@ file	kern/kern_condvar.c		kern
 file	kern/kern_core.c		coredump
 file	kern/kern_cpu.c			kern
 file	kern/kern_ctf.c			kdtrace_hooks
-file	kern/kern_descrip.c			kern
+file	kern/kern_descrip.c		kern
 file	kern/kern_event.c		kern
 file	kern/kern_exec.c		kern
 file	kern/kern_exit.c		kern

Added files:

Index: src/sys/dev/files.audio
diff -u /dev/null src/sys/dev/files.audio:1.1
--- /dev/null	Fri Oct 10 12:29:28 2014
+++ src/sys/dev/files.audio	Fri Oct 10 12:29:28 2014
@@ -0,0 +1,27 @@
+#	$NetBSD: files.audio,v 1.1 2014/10/10 12:29:28 uebayasi Exp $
+
+# audio device attributes
+#
+define	mulaw
+define	auconv
+define	aurateconv
+
+# audio and midi devices, attaches to audio hardware driver
+#
+device	audio: audiodev
+attach	audio at audiobus
+device	midi
+attach	midi at midibus
+
+# console bell via audio device
+#
+define	audiobell
+
+file	dev/auconv.c			auconv | mulaw
+file	dev/audio.c			audio | midi | midibus	needs-flag
+file	dev/audiobell.c			audiobell
+file	dev/aurateconv.c		aurateconv		needs-flag
+file	dev/midi.c			midi | midibus		needs-flag
+file	dev/midictl.c			midisyn
+file	dev/midisyn.c			midisyn
+file	dev/mulaw.c			mulaw			needs-flag

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 12:39:53 UTC 2014

Modified Files:
src/sys/conf: files
Added Files:
src/sys/dev/ic: files.athn

Log Message:
Move athn definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.1114 -r1.1115 src/sys/conf/files
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/files.athn

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1114 src/sys/conf/files:1.1115
--- src/sys/conf/files:1.1114	Fri Oct 10 12:29:28 2014
+++ src/sys/conf/files	Fri Oct 10 12:39:53 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1114 2014/10/10 12:29:28 uebayasi Exp $
+#	$NetBSD: files,v 1.1115 2014/10/10 12:39:53 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20141010
@@ -1823,14 +1823,7 @@ include dev/nor/files.nor
 #
 include dev/iscsi/files.iscsi
 
-# Atheros AR9k (802.11a/g/n) driver
-defflag opt_athn.h	ATHN_DEBUG
-device	athn: arp, ether, ifnet, wlan
-file	dev/ic/athn.c			athn
-file	dev/ic/arn5008.c		athn
-file	dev/ic/arn5416.c		athn
-file	dev/ic/arn9003.c		athn
-file	dev/ic/arn9280.c		athn
-file	dev/ic/arn9285.c		athn
-file	dev/ic/arn9287.c		athn
-file	dev/ic/arn9380.c		athn
+#
+# athn
+#
+include dev/ic/files.athn

Added files:

Index: src/sys/dev/ic/files.athn
diff -u /dev/null src/sys/dev/ic/files.athn:1.1
--- /dev/null	Fri Oct 10 12:39:53 2014
+++ src/sys/dev/ic/files.athn	Fri Oct 10 12:39:53 2014
@@ -0,0 +1,13 @@
+#	$NetBSD: files.athn,v 1.1 2014/10/10 12:39:53 uebayasi Exp $
+
+# Atheros AR9k (802.11a/g/n) driver
+defflag opt_athn.h	ATHN_DEBUG
+device	athn: arp, ether, ifnet, wlan
+file	dev/ic/athn.c			athn
+file	dev/ic/arn5008.c		athn
+file	dev/ic/arn5416.c		athn
+file	dev/ic/arn9003.c		athn
+file	dev/ic/arn9280.c		athn
+file	dev/ic/arn9285.c		athn
+file	dev/ic/arn9287.c		athn
+file	dev/ic/arn9380.c		athn

CVS commit: src/lib/libm/complex

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 12:43:16 UTC 2014

Modified Files:
src/lib/libm/complex: catanhl.c

Log Message:
use long constant


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libm/complex/catanhl.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/libm/complex/catanhl.c
diff -u src/lib/libm/complex/catanhl.c:1.2 src/lib/libm/complex/catanhl.c:1.3
--- src/lib/libm/complex/catanhl.c:1.2	Fri Oct 10 04:34:30 2014
+++ src/lib/libm/complex/catanhl.c	Fri Oct 10 08:43:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: catanhl.c,v 1.2 2014/10/10 08:34:30 martin Exp $ */
+/* $NetBSD: catanhl.c,v 1.3 2014/10/10 12:43:15 christos Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,6 +37,6 @@ catanhl(long double complex z)
 {
 	long double complex w;
 
-	w = -1.0 * I * catanl(z * I);
+	w = -1.0L * I * catanl(z * I);
 	return w;
 }

CVS commit: src/lib/libm/complex

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 12:43:07 UTC 2014

Modified Files:
src/lib/libm/complex: Makefile.inc

Log Message:
whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/complex/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/lib/libm/complex/Makefile.inc
diff -u src/lib/libm/complex/Makefile.inc:1.7 src/lib/libm/complex/Makefile.inc:1.8
--- src/lib/libm/complex/Makefile.inc:1.7	Fri Oct 10 04:19:37 2014
+++ src/lib/libm/complex/Makefile.inc	Fri Oct 10 08:43:07 2014
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.7 2014/10/10 08:19:37 martin Exp $
+# $NetBSD: Makefile.inc,v 1.8 2014/10/10 12:43:07 christos Exp $
 
 .PATH: ${.CURDIR}/complex
 
 COMPLEX_SRCS = cabs.c cacos.c cacosh.c carg.c casin.c casinh.c catan.c \
-	ccos.c ccosh.c cephes_subr.c cexp.c clog.c conj.c cpow.c cproj.c\
+	ccos.c ccosh.c cephes_subr.c cexp.c clog.c conj.c cpow.c cproj.c \
 	cimag.c creal.c csin.c csinh.c csqrt.c ctan.c ctanh.c catanh.c
 
 .for i in ${COMPLEX_SRCS}

CVS commit: src/sys/conf

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 12:46:32 UTC 2014

Modified Files:
src/sys/conf: files std

Log Message:
Define net attribute.  Always select it for now.


To generate a diff of this commit:
cvs rdiff -u -r1.1115 -r1.1116 src/sys/conf/files
cvs rdiff -u -r1.18 -r1.19 src/sys/conf/std

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1115 src/sys/conf/files:1.1116
--- src/sys/conf/files:1.1115	Fri Oct 10 12:39:53 2014
+++ src/sys/conf/files	Fri Oct 10 12:46:32 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1115 2014/10/10 12:39:53 uebayasi Exp $
+#	$NetBSD: files,v 1.1116 2014/10/10 12:46:32 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20141010
@@ -1700,11 +1700,13 @@ file	miscfs/specfs/spec_vnops.c	vfs
 file	miscfs/syncfs/sync_subr.c	vfs
 file	miscfs/syncfs/sync_vnops.c	vfs
 
+# XXX CLEANUP
+define	net
 file	net/bpf.c			bpfilter
 file	net/bpf_filter.c		bpf_filter
-file	net/bpf_stub.c
+file	net/bpf_stub.c			net
 file	net/bsd-comp.c			ppp  ppp_bsdcomp
-file	net/if.c
+file	net/if.c			net
 file	net/if_arcsubr.c		arcnet			needs-flag
 file	net/if_atmsubr.c		atm
 file	net/if_bridge.c			bridge			needs-flag
@@ -1720,7 +1722,7 @@ file	net/if_gre.c			gre			needs-flag
 file	net/if_hippisubr.c		hippi			needs-flag
 file	net/if_ieee1394subr.c		ieee1394
 file	net/if_loop.c			loop
-file	net/if_media.c
+file	net/if_media.c			net
 file	net/if_mpls.c			ifmpls			needs-flag
 file	net/if_ppp.c			ppp			needs-flag
 file	net/if_srt.c			srt
@@ -1733,17 +1735,17 @@ file	net/if_tap.c			tap
 file	net/if_tun.c			tun
 file	net/if_vlan.c			vlan			needs-flag
 file	net/if_pppoe.c			pppoe			needs-flag
-file	net/pfil.c
+file	net/pfil.c			net
 file	net/ppp-deflate.c		ppp  ppp_deflate
 file	net/ppp_tty.c			ppp
-file	net/pktqueue.c
-file	net/net_stats.c
-file	net/radix.c
-file	net/raw_cb.c
-file	net/raw_usrreq.c
-file	net/route.c
-file	net/rtbl.c
-file	net/rtsock.c
+file	net/pktqueue.c			net
+file	net/net_stats.c			net
+file	net/radix.c			net
+file	net/raw_cb.c			net
+file	net/raw_usrreq.c		net
+file	net/route.c			net
+file	net/rtbl.c			net
+file	net/rtsock.c			net
 file	net/slcompress.c		sl | ppp | strip | (irip  irip_vj)
 file	net/zlib.c			(ppp  ppp_deflate) | opencrypto | vnd_compression | kdtrace_hooks
 file	netinet/accf_data.c		accf_data

Index: src/sys/conf/std
diff -u src/sys/conf/std:1.18 src/sys/conf/std:1.19
--- src/sys/conf/std:1.18	Fri Oct 10 09:31:40 2014
+++ src/sys/conf/std	Fri Oct 10 12:46:32 2014
@@ -1,10 +1,14 @@
-# $NetBSD: std,v 1.18 2014/10/10 09:31:40 uebayasi Exp $
+# $NetBSD: std,v 1.19 2014/10/10 12:46:32 uebayasi Exp $
 #
 # standard MI 'options'
 #
 # this file is for options which can't be off-by-default for some reasons.
 # it's commonly used is NOT a good reason to enable options here.
 
+#
+# Always include kern attribute (module).  Other attributes don't need to
+# depend on kern.
+#
 options	KERN
 
 # the following options are on-by-default to keep
@@ -18,6 +22,8 @@ options	COREDUMP	# allow processes to co
 options	AIO		# POSIX asynchronous I/O
 options	MQUEUE		# POSIX message queues
 
+options	NET		# XXX Clean up dependency
+
 #
 # Security model.
 #

CVS commit: src/lib/libm/complex

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 14:06:40 UTC 2014

Modified Files:
src/lib/libm/complex: cephes_subrl.c

Log Message:
try to make vax work.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/complex/cephes_subrl.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/libm/complex/cephes_subrl.c
diff -u src/lib/libm/complex/cephes_subrl.c:1.1 src/lib/libm/complex/cephes_subrl.c:1.2
--- src/lib/libm/complex/cephes_subrl.c:1.1	Thu Oct  9 20:48:18 2014
+++ src/lib/libm/complex/cephes_subrl.c	Fri Oct 10 10:06:40 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cephes_subrl.c,v 1.1 2014/10/10 00:48:18 christos Exp $ */
+/* $NetBSD: cephes_subrl.c,v 1.2 2014/10/10 14:06:40 christos Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -58,8 +58,13 @@ _cchshl(long double x, long double *c, l
 /* extended precision value of PI: */
 static const long double DP1 = 3.14159265358979323829596852490908531763125L;
 static const long double DP2 = 1.6667485837041756656403424829301998703007e-19L;
+#ifndef __vax__
 static const long double DP3 = 1.8830410776607851167459095484560349402753e-39L;
 #define MACHEPL 1.1e-38L
+#else
+static const long double DP3 = 0L;
+#define MACHEPL 1.1e-19L
+#endif
 
 long double
 _redupil(long double x)

CVS commit: src/sys/dev/pci

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 14:23:06 UTC 2014

Modified Files:
src/sys/dev/pci: if_msk.c if_skreg.h

Log Message:
PR/49270: Hauke Fath: Samsung NC10 Marvell Yukon ethernet not supported


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/if_msk.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/if_skreg.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/if_msk.c
diff -u src/sys/dev/pci/if_msk.c:1.46 src/sys/dev/pci/if_msk.c:1.47
--- src/sys/dev/pci/if_msk.c:1.46	Sun Aug 10 12:44:36 2014
+++ src/sys/dev/pci/if_msk.c	Fri Oct 10 10:23:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.46 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $ */
 /*	$OpenBSD: if_msk.c,v 1.42 2007/01/17 02:43:02 krw Exp $	*/
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_msk.c,v 1.46 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_msk.c,v 1.47 2014/10/10 14:23:06 christos Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -165,6 +165,7 @@ static const struct msk_product {
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8036 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8038 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8039 },
+	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8040 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8050 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8052 },
 	{ PCI_VENDOR_MARVELL,		PCI_PRODUCT_MARVELL_YUKON_8053 },
@@ -948,6 +949,7 @@ msk_probe(device_t parent, cfdata_t matc
 	case SK_YUKON_EC_U:
 	case SK_YUKON_EC:
 	case SK_YUKON_FE:
+	case SK_YUKON_FE_P:
 		return (1);
 	}
 

Index: src/sys/dev/pci/if_skreg.h
diff -u src/sys/dev/pci/if_skreg.h:1.14 src/sys/dev/pci/if_skreg.h:1.15
--- src/sys/dev/pci/if_skreg.h:1.14	Sun May 29 09:31:30 2011
+++ src/sys/dev/pci/if_skreg.h	Fri Oct 10 10:23:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.14 2011/05/29 13:31:30 phx Exp $ */
+/* $NetBSD: if_skreg.h,v 1.15 2014/10/10 14:23:06 christos Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -390,6 +390,7 @@
 #define SK_YUKON_EC_U		0xB4
 #define SK_YUKON_EC		0xB6
 #define SK_YUKON_FE		0xB7
+#define SK_YUKON_FE_P		0xB8
 #define SK_YUKON_FAMILY(x) ((x)  0xB0)
 
 #define SK_IS_GENESIS(sc) \
@@ -397,7 +398,7 @@
 #define SK_IS_YUKON(sc) \
 ((sc)-sk_type = SK_YUKON  (sc)-sk_type = SK_YUKON_LP)
 #define SK_IS_YUKON2(sc) \
-((sc)-sk_type = SK_YUKON_XL  (sc)-sk_type = SK_YUKON_FE)
+((sc)-sk_type = SK_YUKON_XL  (sc)-sk_type = SK_YUKON_FE_P)
 
 /* Known revisions in SK_CONFIG */
 #define SK_YUKON_LITE_REV_A0	0x0 /* invented, see test in skc_attach */

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 15:35:08 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Revert a mistakenly added, superflous attribute match test that caused some
valid options to get lost.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/usr.bin/config/main.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/config/main.c
diff -u src/usr.bin/config/main.c:1.62 src/usr.bin/config/main.c:1.63
--- src/usr.bin/config/main.c:1.62	Fri Oct 10 10:46:05 2014
+++ src/usr.bin/config/main.c	Fri Oct 10 15:35:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.62 2014/10/10 10:46:05 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.63 2014/10/10 15:35:08 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -559,17 +559,11 @@ do_depend(struct nvlist *nv)
 		 * it to the selecttab.
 		 */
 		CFGDBG(3, depend attr `%s', nv-nv_name);
-		/* XXX Do uppercased attribute names exist? */
 		if ((a = ht_lookup(attrtab, nv-nv_name)) != NULL) {
 			if (a-a_iattr)
 panic(do_depend(%s): dep `%s' is an iattr,
 nv-nv_name, a-a_name);
 			expandattr(a, selectattr);
-		} else if ((a = ht_lookup(attrtab, n)) != NULL) {
-			if (a-a_iattr)
-panic(do_depend(%s): dep `%s' is an iattr,
-n, a-a_name);
-			expandattr(a, selectattr);
 		} else {
 			if (ht_lookup(opttab, nv-nv_name) == NULL)
 addoption(nv-nv_name, NULL);

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 16:17:27 UTC 2014

Modified Files:
src/usr.bin/config: main.c

Log Message:
Remove an unsed var.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/usr.bin/config/main.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/config/main.c
diff -u src/usr.bin/config/main.c:1.63 src/usr.bin/config/main.c:1.64
--- src/usr.bin/config/main.c:1.63	Fri Oct 10 15:35:08 2014
+++ src/usr.bin/config/main.c	Fri Oct 10 16:17:27 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.63 2014/10/10 15:35:08 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.64 2014/10/10 16:17:27 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -551,8 +551,6 @@ do_depend(struct nvlist *nv)
 	struct attr *a;
 
 	if (nv != NULL  (nv-nv_flags  NV_DEPENDED) == 0) {
-		const char *n = strtolower(nv-nv_name);
-
 		nv-nv_flags |= NV_DEPENDED;
 		/*
 		 * If the dependency is an attribute, then just add

CVS commit: src/sys/compat/freebsd

2014-10-10 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Fri Oct 10 16:29:56 UTC 2014

Modified Files:
src/sys/compat/freebsd: freebsd_sysctl.c

Log Message:
I'm not sure reading from an unsanitized userland pointer is a good idea.
Some users might be tempted to give 0x01, in which case the kernel will
crash.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/compat/freebsd/freebsd_sysctl.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/freebsd/freebsd_sysctl.c
diff -u src/sys/compat/freebsd/freebsd_sysctl.c:1.16 src/sys/compat/freebsd/freebsd_sysctl.c:1.17
--- src/sys/compat/freebsd/freebsd_sysctl.c:1.16	Tue Feb 25 18:30:09 2014
+++ src/sys/compat/freebsd/freebsd_sysctl.c	Fri Oct 10 16:29:56 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: freebsd_sysctl.c,v 1.16 2014/02/25 18:30:09 pooka Exp $	*/
+/*	$NetBSD: freebsd_sysctl.c,v 1.17 2014/10/10 16:29:56 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.16 2014/02/25 18:30:09 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: freebsd_sysctl.c,v 1.17 2014/10/10 16:29:56 maxv Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -90,7 +90,7 @@ freebsd_sys_sysctl(struct lwp *l, const 
 	} */
 	int error;
 	int name[CTL_MAXNAME];
-	size_t newlen, *oldlenp;
+	size_t newlen, *oldlenp, oldlen;
 	u_int namelen;
 	void *new, *old;
 
@@ -141,9 +141,14 @@ freebsd_sys_sysctl(struct lwp *l, const 
 
 		old = SCARG(uap, old);
 		oldlenp = SCARG(uap, oldlenp);
-		if (old == NULL || oldlenp == NULL || *oldlenp  sizeof(int))
+		if (old == NULL || oldlenp == NULL)
 			return(EINVAL);
 
+		if ((error = copyin(oldlenp, oldlen, sizeof(oldlen
+			return (error);
+		if (oldlen  sizeof(int))
+			return (EINVAL);
+
 		if ((locnew =
 		 (char *) malloc(newlen + 1, M_TEMP, M_WAITOK)) == NULL)
 			return(ENOMEM);
@@ -163,11 +168,11 @@ freebsd_sys_sysctl(struct lwp *l, const 
 
 		oidlen *= sizeof(int);
 		error = copyout(oid, SCARG(uap, old),
-MIN(oidlen, *SCARG(uap, oldlenp)));
+MIN(oidlen, oldlen));
 		if (error)
 			return(error);
 		ktrmibio(-1, UIO_READ, SCARG(uap, old),
-		MIN(oidlen, *SCARG(uap, oldlenp)),  0);
+		MIN(oidlen, oldlen),  0);
 
 		error = copyout(oidlen, SCARG(uap, oldlenp), sizeof(u_int));

CVS commit: src/sys/external/isc/atheros_hal/conf

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 17:09:18 UTC 2014

Modified Files:
src/sys/external/isc/atheros_hal/conf: files.ath_hal

Log Message:
Sanitize athhal definitions.  Depend on ath.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/isc/atheros_hal/conf/files.ath_hal

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/isc/atheros_hal/conf/files.ath_hal
diff -u src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.4 src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.5
--- src/sys/external/isc/atheros_hal/conf/files.ath_hal:1.4	Sat Mar  5 14:42:11 2011
+++ src/sys/external/isc/atheros_hal/conf/files.ath_hal	Fri Oct 10 17:09:18 2014
@@ -1,18 +1,18 @@
-#	$NetBSD: files.ath_hal,v 1.4 2011/03/05 14:42:11 cegger Exp $
+#	$NetBSD: files.ath_hal,v 1.5 2014/10/10 17:09:18 uebayasi Exp $
 
 defflag opt_athhal.h	ATHHAL_ASSERT ATHHAL_DEBUG ATHHAL_DEBUG_ALQ
 defflag opt_athhal.h	ATHHAL_WRITE_EEPROM ATHHAL_WRITE_REGDOMAIN
 
-define athhal_eeprom_v1
-define athhal_eeprom_v3
-define athhal_eeprom_v14
-define athhal_eeprom_v4k
+define athhal_eeprom_v1: ath
+define athhal_eeprom_v3: ath
+define athhal_eeprom_v14: ath
+define athhal_eeprom_v4k: ath
 
 file	external/isc/atheros_hal/dist/ah.c		ath
-file	external/isc/atheros_hal/dist/ah_eeprom_v1.c	ath  athhal_eeprom_v1
-file	external/isc/atheros_hal/dist/ah_eeprom_v3.c	ath  athhal_eeprom_v3
-file	external/isc/atheros_hal/dist/ah_eeprom_v14.c	ath  athhal_eeprom_v14
-file	external/isc/atheros_hal/dist/ah_eeprom_v4k.c	ath  athhal_eeprom_v4k
+file	external/isc/atheros_hal/dist/ah_eeprom_v1.c	athhal_eeprom_v1
+file	external/isc/atheros_hal/dist/ah_eeprom_v3.c	athhal_eeprom_v3
+file	external/isc/atheros_hal/dist/ah_eeprom_v14.c	athhal_eeprom_v14
+file	external/isc/atheros_hal/dist/ah_eeprom_v4k.c	athhal_eeprom_v4k
 file	external/isc/atheros_hal/dist/ah_regdomain.c	ath
 
 # Atheros HAL's OS dependant code
@@ -24,31 +24,33 @@ file	external/isc/atheros_hal/ic/ah_osde
 #
 defflag opt_athhal.h	ATHHAL_AR5210: athhal_eeprom_v1
 
-file	external/isc/atheros_hal/dist/ar5210/ar5210_attach.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_beacon.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_interrupts.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_keycache.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_misc.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_phy.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_power.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_recv.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_reset.c	ath  athhal_ar5210
-file	external/isc/atheros_hal/dist/ar5210/ar5210_xmit.c	ath  athhal_ar5210
+define	athhal_ar5210: ath
+file	external/isc/atheros_hal/dist/ar5210/ar5210_attach.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_beacon.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_interrupts.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_keycache.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_misc.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_phy.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_power.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_recv.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_reset.c	athhal_ar5210
+file	external/isc/atheros_hal/dist/ar5210/ar5210_xmit.c	athhal_ar5210
 
 # Atheros AR5211 family
 #
 defflag opt_athhal.h	ATHHAL_AR5211: athhal_eeprom_v3
 
-file	external/isc/atheros_hal/dist/ar5211/ar5211_attach.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_beacon.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_interrupts.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_keycache.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_misc.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_phy.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_power.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_recv.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_reset.c	ath  athhal_ar5211
-file	external/isc/atheros_hal/dist/ar5211/ar5211_xmit.c	ath  athhal_ar5211
+define	athhal_ar5211: ath
+file	external/isc/atheros_hal/dist/ar5211/ar5211_attach.c	athhal_ar5211
+file	external/isc/atheros_hal/dist/ar5211/ar5211_beacon.c	athhal_ar5211
+file	external/isc/atheros_hal/dist/ar5211/ar5211_interrupts.c	athhal_ar5211
+file	external/isc/atheros_hal/dist/ar5211/ar5211_keycache.c	athhal_ar5211
+file	external/isc/atheros_hal/dist/ar5211/ar5211_misc.c	athhal_ar5211
+file	external/isc/atheros_hal/dist/ar5211/ar5211_phy.c

CVS commit: src/sys

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 17:21:20 UTC 2014

Modified Files:
src/sys/conf: files
src/sys/dev: files.audio

Log Message:
Normalize audio related definitions.


To generate a diff of this commit:
cvs rdiff -u -r1.1116 -r1.1117 src/sys/conf/files
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/files.audio

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

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1116 src/sys/conf/files:1.1117
--- src/sys/conf/files:1.1116	Fri Oct 10 12:46:32 2014
+++ src/sys/conf/files	Fri Oct 10 17:21:20 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1116 2014/10/10 12:46:32 uebayasi Exp $
+#	$NetBSD: files,v 1.1117 2014/10/10 17:21:20 uebayasi Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20141010
@@ -297,9 +297,6 @@ include conf/majors
 
 # generic attributes
 #
-define	audiobus	{ }
-define	midibus		{ }
-define	midisyn
 define	videobus	{ }
 define	ata	{[channel = -1]}
 define	sata

Index: src/sys/dev/files.audio
diff -u src/sys/dev/files.audio:1.1 src/sys/dev/files.audio:1.2
--- src/sys/dev/files.audio:1.1	Fri Oct 10 12:29:28 2014
+++ src/sys/dev/files.audio	Fri Oct 10 17:21:20 2014
@@ -1,8 +1,12 @@
-#	$NetBSD: files.audio,v 1.1 2014/10/10 12:29:28 uebayasi Exp $
+#	$NetBSD: files.audio,v 1.2 2014/10/10 17:21:20 uebayasi Exp $
+
+define	audiobus	{ }
+define	midibus		{ }
+define	midisyn
 
 # audio device attributes
 #
-define	mulaw
+define	mulaw: auconv
 define	auconv
 define	aurateconv
 
@@ -10,18 +14,18 @@ define	aurateconv
 #
 device	audio: audiodev
 attach	audio at audiobus
-device	midi
+device	midi: audio
 attach	midi at midibus
 
 # console bell via audio device
 #
 define	audiobell
 
-file	dev/auconv.c			auconv | mulaw
-file	dev/audio.c			audio | midi | midibus	needs-flag
+file	dev/auconv.c			auconv
+file	dev/audio.c			audio			needs-flag
 file	dev/audiobell.c			audiobell
 file	dev/aurateconv.c		aurateconv		needs-flag
-file	dev/midi.c			midi | midibus		needs-flag
+file	dev/midi.c			midi			needs-flag
 file	dev/midictl.c			midisyn
 file	dev/midisyn.c			midisyn
 file	dev/mulaw.c			mulaw			needs-flag

CVS commit: src/sys/dev/usb

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 17:31:12 UTC 2014

Modified Files:
src/sys/dev/usb: files.usb

Log Message:
Make usb_dma  usbverbose independent attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/usb/files.usb

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/files.usb
diff -u src/sys/dev/usb/files.usb:1.134 src/sys/dev/usb/files.usb:1.135
--- src/sys/dev/usb/files.usb:1.134	Fri Sep 12 16:40:38 2014
+++ src/sys/dev/usb/files.usb	Fri Oct 10 17:31:12 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.usb,v 1.134 2014/09/12 16:40:38 skrll Exp $
+#	$NetBSD: files.usb,v 1.135 2014/10/10 17:31:12 uebayasi Exp $
 #
 # Config file and device description for machine-independent USB code.
 # Included by ports that need it.  Ports that use it must provide
@@ -102,10 +102,14 @@ attach	usb at usbus
 file	dev/usb/usb.c			usb			needs-flag
 file	dev/usb/usbdi.c			usb
 file	dev/usb/usbdi_util.c		usb
-file	dev/usb/usb_mem.c		usb  usb_dma
 file	dev/usb/usb_subr.c		usb
 file	dev/usb/usb_quirks.c		usb
-file	dev/usb/usb_verbose.c		usb  usbverbose
+
+define	usb_dma: usb
+file	dev/usb/usb_mem.c		usb_dma
+
+define	usbverbose: usb
+file	dev/usb/usb_verbose.c		usbverbose
 
 # Hub driver
 device	uhub: usbdevif, usbifif

CVS commit: src/sys/dev/pci

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 17:38:44 UTC 2014

Modified Files:
src/sys/dev/pci: files.agp

Log Message:
Normalize.


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

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/files.agp
diff -u src/sys/dev/pci/files.agp:1.6 src/sys/dev/pci/files.agp:1.7
--- src/sys/dev/pci/files.agp:1.6	Sat Aug  4 09:34:43 2007
+++ src/sys/dev/pci/files.agp	Fri Oct 10 17:38:44 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.agp,v 1.6 2007/08/04 09:34:43 kiyohara Exp $
+#	$NetBSD: files.agp,v 1.7 2014/10/10 17:38:44 uebayasi Exp $
 
 define	agpbus { }
 
@@ -8,26 +8,26 @@ file	dev/pci/agp.c		agp			needs-flag
 
 file	dev/pci/agpbusprint.c	agpbus
 
-define	agp_ali
-file	dev/pci/agp_ali.c	agp_ali  agp		needs-flag
+define	agp_ali: agp
+file	dev/pci/agp_ali.c	agp_ali			needs-flag
 
-define	agp_amd
-file	dev/pci/agp_amd.c	agp_amd  agp		needs-flag
+define	agp_amd: agp
+file	dev/pci/agp_amd.c	agp_amd			needs-flag
 
-define	agp_apple
-file	dev/pci/agp_apple.c	agp_apple  agp		needs-flag
+define	agp_apple: agp
+file	dev/pci/agp_apple.c	agp_apple		needs-flag
 
-define	agp_i810
-file	dev/pci/agp_i810.c	agp_i810  agp		needs-flag
+define	agp_i810: agp
+file	dev/pci/agp_i810.c	agp_i810		needs-flag
 
-define	agp_intel
-file	dev/pci/agp_intel.c	agp_intel  agp		needs-flag
+define	agp_intel: agp
+file	dev/pci/agp_intel.c	agp_intel		needs-flag
 
-define	agp_sis
-file	dev/pci/agp_sis.c	agp_sis  agp		needs-flag
+define	agp_sis: agp
+file	dev/pci/agp_sis.c	agp_sis			needs-flag
 
-define	agp_via
-file	dev/pci/agp_via.c	agp_via  agp		needs-flag
+define	agp_via: agp
+file	dev/pci/agp_via.c	agp_via			needs-flag
 
-define	agp_amd64
-file	dev/pci/agp_amd64.c	agp_amd64  agp		needs-flag
+define	agp_amd64: agp
+file	dev/pci/agp_amd64.c	agp_amd64		needs-flag

CVS commit: src/sys/dev/ic

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 17:41:05 UTC 2014

Modified Files:
src/sys/dev/ic: rtl8169.c rtl81x9reg.h rtl81x9var.h

Log Message:
PR/49259: J. Lorec: Add support for Realtek 8111G chipset into re(4)


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/rtl81x9reg.h
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ic/rtl81x9var.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/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.140 src/sys/dev/ic/rtl8169.c:1.141
--- src/sys/dev/ic/rtl8169.c:1.140	Sun Aug 10 12:44:35 2014
+++ src/sys/dev/ic/rtl8169.c	Fri Oct 10 13:41:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl8169.c,v 1.140 2014/08/10 16:44:35 tls Exp $	*/
+/*	$NetBSD: rtl8169.c,v 1.141 2014/10/10 17:41:05 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtl8169.c,v 1.140 2014/08/10 16:44:35 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtl8169.c,v 1.141 2014/10/10 17:41:05 christos Exp $);
 /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
 
 /*
@@ -611,6 +611,14 @@ re_attach(struct rtk_softc *sc)
 			sc-sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
 			RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO;
 			break;
+		case RTK_HWREV_8168G:
+		case RTK_HWREV_8168G_SPIN1:
+		case RTK_HWREV_8168G_SPIN2:
+		case RTK_HWREV_8168G_SPIN4:
+			sc-sc_quirk |= RTKQ_DESCV2 | RTKQ_NOEECMD |
+			RTKQ_MACSTAT | RTKQ_CMDSTOP | RTKQ_NOJUMBO | 
+			RTKQ_RXDV_GATED;
+			break;
 		case RTK_HWREV_8100E:
 		case RTK_HWREV_8100E_SPIN2:
 		case RTK_HWREV_8101E:
@@ -1834,6 +1842,11 @@ re_init(struct ifnet *ifp)
 	CSR_WRITE_4(sc, RTK_TXLIST_ADDR_LO,
 	RE_ADDR_LO(sc-re_ldata.re_tx_list_map-dm_segs[0].ds_addr));
 
+	if (sc-sc_quirk  RTKQ_RXDV_GATED) {
+		CSR_WRITE_4(sc, RTK_MISC,
+		CSR_READ_4(sc, RTK_MISC)  ~RTK_MISC_RXDV_GATED_EN);
+	}
+		
 	/*
 	 * Enable transmit and receive.
 	 */

Index: src/sys/dev/ic/rtl81x9reg.h
diff -u src/sys/dev/ic/rtl81x9reg.h:1.45 src/sys/dev/ic/rtl81x9reg.h:1.46
--- src/sys/dev/ic/rtl81x9reg.h:1.45	Fri Dec 13 15:52:48 2013
+++ src/sys/dev/ic/rtl81x9reg.h	Fri Oct 10 13:41:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl81x9reg.h,v 1.45 2013/12/13 20:52:48 jakllsch Exp $	*/
+/*	$NetBSD: rtl81x9reg.h,v 1.46 2014/10/10 17:41:05 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -136,6 +136,7 @@
 #define RTK_DBG_REG		0x00D1
 #define RTK_MAXRXPKTLEN		0x00DA	/* 16 bits, chip multiplies by 8 */
 #define RTK_IM			0x00E2
+#define RTK_MISC		0x00F0
 
 /*
  * TX config register bits
@@ -165,6 +166,11 @@
 #define RTK_HWREV_8168E		0x2C00
 #define RTK_HWREV_8168E_VL	0x2C80
 #define RTK_HWREV_8168_SPIN1	0x3000
+#define RTK_HWREV_8168G		0x4c00
+#define RTK_HWREV_8168G_SPIN1	0x4c10
+#define RTK_HWREV_8168G_SPIN2	0x5090
+#define RTK_HWREV_8168G_SPIN4	0x5c80
+#define RTK_HWREV_8168GU	0x5080
 #define RTK_HWREV_8100E		0x3080
 #define RTK_HWREV_8101E		0x3400
 #define RTK_HWREV_8102E		0x3480
@@ -214,6 +220,14 @@
 #define RTK_TXTH_256		8	/* (x) * 32 bytes */
 #define RTK_TXTH_1536		48
 
+/* MISC register */
+#define	RTK_MISC_TXPLA_RST	__BIT(29)
+#define	RTK_MISC_DISABLE_LAN_EN	__BIT(23)	/* Enable GPIO pin */
+#define	RTK_MISC_PWM_EN		__BIT(22)
+#define	RTK_MISC_RXDV_GATED_EN	__BIT(19)
+#define	RTK_MISC_EARLY_TALLY_EN	__BIT(16)
+
+
 /*
  * Interrupt status register bits.
  */

Index: src/sys/dev/ic/rtl81x9var.h
diff -u src/sys/dev/ic/rtl81x9var.h:1.53 src/sys/dev/ic/rtl81x9var.h:1.54
--- src/sys/dev/ic/rtl81x9var.h:1.53	Thu Feb  2 14:43:03 2012
+++ src/sys/dev/ic/rtl81x9var.h	Fri Oct 10 13:41:05 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtl81x9var.h,v 1.53 2012/02/02 19:43:03 tls Exp $	*/
+/*	$NetBSD: rtl81x9var.h,v 1.54 2014/10/10 17:41:05 christos Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -192,6 +192,7 @@ struct rtk_softc {
 #define RTKQ_MACSTAT		0x0100	/* set MACSTAT_DIS on init */
 #define RTKQ_CMDSTOP		0x0200	/* set STOPREQ on stop */
 #define RTKQ_PHYWAKE_PM		0x0400	/* wake PHY from power down */
+#define RTKQ_RXDV_GATED		0x0800
 
 	bus_dma_tag_t		sc_dmat;

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

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 17:44:17 UTC 2014

Modified Files:
src/sys/arch/x86/conf: files.x86

Log Message:
Normalize: acpicpu depends on acpi.


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/x86/conf/files.x86

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/conf/files.x86
diff -u src/sys/arch/x86/conf/files.x86:1.82 src/sys/arch/x86/conf/files.x86:1.83
--- src/sys/arch/x86/conf/files.x86:1.82	Fri Oct 10 09:13:21 2014
+++ src/sys/arch/x86/conf/files.x86	Fri Oct 10 17:44:17 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.x86,v 1.82 2014/10/10 09:13:21 uebayasi Exp $
+#	$NetBSD: files.x86,v 1.83 2014/10/10 17:44:17 uebayasi Exp $
 
 # options for MP configuration through the MP spec
 defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
@@ -28,13 +28,13 @@ device	cpu: cpufeaturebus
 attach	cpu at cpubus
 file 	arch/x86/x86/cpu.c 		cpu
 
-device	acpicpu
+device	acpicpu: acpi
 attach	acpicpu at cpufeaturebus
-file	dev/acpi/acpi_cpu.c		acpi  acpicpu
-file	dev/acpi/acpi_cpu_cstate.c	acpi  acpicpu
-file	dev/acpi/acpi_cpu_pstate.c	acpi  acpicpu
-file	dev/acpi/acpi_cpu_tstate.c	acpi  acpicpu
-file	arch/x86/acpi/acpi_cpu_md.c	acpi  acpicpu
+file	dev/acpi/acpi_cpu.c		acpicpu
+file	dev/acpi/acpi_cpu_cstate.c	acpicpu
+file	dev/acpi/acpi_cpu_pstate.c	acpicpu
+file	dev/acpi/acpi_cpu_tstate.c	acpicpu
+file	arch/x86/acpi/acpi_cpu_md.c	acpicpu
 
 device	coretemp: sysmon_envsys
 attach	coretemp at cpufeaturebus

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

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 17:48:30 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_gpio.c files.awin

Log Message:
add an option for awin_gpio to ignore firmware pin reservations


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/allwinner/files.awin

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/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.9 src/sys/arch/arm/allwinner/awin_gpio.c:1.10
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.9	Sun Aug 24 12:42:03 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c	Fri Oct 10 17:48:30 2014
@@ -31,10 +31,11 @@
 #include gpio.h
 
 #include opt_arm_debug.h
+#include opt_allwinner.h
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.9 2014/08/24 12:42:03 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.10 2014/10/10 17:48:30 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -382,6 +383,7 @@ awin_gpio_init(void)
 		grp-grp_cfg.pul[1] = bus_space_read_4(sc-sc_bst,
 		grp-grp_bsh, AWIN_PIO_PUL1_REG);
 
+#if !defined(AWIN_GPIO_IGNORE_FW)
 		for (uint32_t j = 0, mask = 1;
 		 (mask  grp-grp_pin_mask) != 0;
 		 j++, mask = 1) {
@@ -390,6 +392,8 @@ awin_gpio_init(void)
 grp-grp_pin_inuse_mask |= mask;
 			}
 		}
+#endif
+
 #ifdef VERBOSE_INIT_ARM
 		printf( P%c=%d, 'A' + i,
 		popcount32(grp-grp_pin_mask  ~grp-grp_pin_inuse_mask));

Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.14 src/sys/arch/arm/allwinner/files.awin:1.15
--- src/sys/arch/arm/allwinner/files.awin:1.14	Sat Sep 13 17:48:52 2014
+++ src/sys/arch/arm/allwinner/files.awin	Fri Oct 10 17:48:30 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.awin,v 1.14 2014/09/13 17:48:52 jmcneill Exp $
+#	$NetBSD: files.awin,v 1.15 2014/10/10 17:48:30 jmcneill Exp $
 #
 # Configuration info for Allwinner ARM Peripherals
 #
@@ -26,6 +26,7 @@ defflag opt_allwinner.hAWINETH_COUNT
 defflag opt_allwinner.hALLWINNER_A10
 defflag opt_allwinner.hALLWINNER_A20
 defflag opt_allwinner.hALLWINNER_A31
+defflag opt_allwinner.hAWIN_GPIO_IGNORE_FW
 
 # SoC I/O attach point
 device	awinio { [port=-1] } : bus_space_generic

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

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 17:49:55 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_mmc.c

Log Message:
correct a typo in sd clk reg offsets for mmc0 and dont bother with pll6_enable


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/allwinner/awin_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/allwinner/awin_mmc.c
diff -u src/sys/arch/arm/allwinner/awin_mmc.c:1.12 src/sys/arch/arm/allwinner/awin_mmc.c:1.13
--- src/sys/arch/arm/allwinner/awin_mmc.c:1.12	Fri Oct 10 07:36:11 2014
+++ src/sys/arch/arm/allwinner/awin_mmc.c	Fri Oct 10 17:49:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_mmc.c,v 1.12 2014/10/10 07:36:11 jmcneill Exp $ */
+/* $NetBSD: awin_mmc.c,v 1.13 2014/10/10 17:49:55 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
 #include locators.h
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_mmc.c,v 1.12 2014/10/10 07:36:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_mmc.c,v 1.13 2014/10/10 17:49:55 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -184,7 +184,7 @@ awin_mmc_probe_clocks(struct awin_mmc_so
 	sc-sc_mod_clk = sc-sc_pll_freq / (div + 1);
 
 	bus_space_write_4(aio-aio_core_bst, aio-aio_ccm_bsh,
-	AWIN_SD0_CLK_REG + (sc-sc_mmc_number * 8),
+	AWIN_SD0_CLK_REG + (sc-sc_mmc_number * 4),
 	AWIN_PLL_CFG_ENABLE | AWIN_PLL_CFG_PLL6 | div);
 
 #ifdef AWIN_MMC_DEBUG
@@ -254,7 +254,7 @@ awin_mmc_attach(device_t parent, device_
 	bus_space_subregion(sc-sc_bst, aio-aio_core_bsh,
 	loc-loc_offset, loc-loc_size, sc-sc_bsh);
 	bus_space_subregion(sc-sc_bst, aio-aio_ccm_bsh,
-	AWIN_SD0_CLK_REG + (loc-loc_port * 8), 0, sc-sc_clk_bsh);
+	AWIN_SD0_CLK_REG + (loc-loc_port * 4), 0, sc-sc_clk_bsh);
 
 	sc-sc_use_dma = true;
 	prop_dictionary_get_bool(cfg, dma, sc-sc_use_dma);
@@ -262,7 +262,6 @@ awin_mmc_attach(device_t parent, device_
 	aprint_naive(\n);
 	aprint_normal(: SD3.0 (%s)\n, sc-sc_use_dma ? DMA : PIO);
 
-	awin_pll6_enable();
 	awin_mmc_probe_clocks(sc, aio);
 
 	if (prop_dictionary_get_cstring_nocopy(cfg, detect-gpio, pin_name)) {

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

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 17:49:12 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: HUMMINGBIRD_A31

Log Message:
add AWIN_GPIO_IGNORE_FW, remove no motg0


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31

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/evbarm/conf/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.1 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.2
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.1	Fri Oct 10 07:37:50 2014
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31	Fri Oct 10 17:49:12 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: HUMMINGBIRD_A31,v 1.1 2014/10/10 07:37:50 jmcneill Exp $
+#	$NetBSD: HUMMINGBIRD_A31,v 1.2 2014/10/10 17:49:12 jmcneill Exp $
 #
 #	HUMMINGBIRD_A31 - Merrii Hummingbird A31
 #
@@ -9,6 +9,7 @@ no makeoptions	BOARDTYPE
 makeoptions	BOARDTYPE=hummingbird_a31
 options 	ALLWINNER_A31
 options 	MEMSIZE=1024
+options 	AWIN_GPIO_IGNORE_FW
 
 no ahcisata*
 no awe0
@@ -17,7 +18,6 @@ no axp20x0
 # TODO
 no awinusb0
 no awinusb1
-no motg0
 no awge0
 
 #

CVS commit: src/sys/dev/wscons

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Fri Oct 10 17:53:08 UTC 2014

Modified Files:
src/sys/dev/wscons: files.wscons

Log Message:
Normalize wscons devices (except leaving one strange definition).


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/wscons/files.wscons

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/wscons/files.wscons
diff -u src/sys/dev/wscons/files.wscons:1.47 src/sys/dev/wscons/files.wscons:1.48
--- src/sys/dev/wscons/files.wscons:1.47	Thu Oct  4 19:09:20 2012
+++ src/sys/dev/wscons/files.wscons	Fri Oct 10 17:53:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.wscons,v 1.47 2012/10/04 19:09:20 macallan Exp $
+# $NetBSD: files.wscons,v 1.48 2014/10/10 17:53:08 uebayasi Exp $
 
 #
 # Workstation Console glue; attaches frame buffer to emulator  keyboard,
@@ -36,25 +36,29 @@ defparam opt_wsdisplay_compat.h	WSCOMPAT
 defparam opt_wsdisplay_compat.h WSDISPLAY_SCROLLBACK_LINES=100
 
 # this loses, but there's no way to define attributes which have attributes
-device	wsdisplay #tty?
+device	wsdisplay: wsevent	# tty?
 attach	wsdisplay at wsemuldisplaydev with wsdisplay_emul
 attach	wsdisplay at wsdisplaydev with wsdisplay_noemul
-device	wskbd
+device	wskbd: wsevent
 attach	wskbd at wskbddev
-device	wsmouse
+device	wsmouse: wsevent
 attach	wsmouse at wsmousedev
 
 file	dev/wscons/wsdisplay.c		wsdisplay		needs-flag
-file	dev/wscons/wsdisplay_compat_usl.c wsdisplay  wsdisplay_compat_usl
+define	wsdisplay_compat_usl: wsdisplay
+file	dev/wscons/wsdisplay_compat_usl.c	wsdisplay_compat_usl
 file	dev/wscons/wsdisplay_util.c	wsdisplay
 file	dev/wscons/wsemulconf.c		wsdisplay
 file	dev/wscons/wsemul_dumb.c	wsdisplay  !wsemul_no_dumb
-file	dev/wscons/wsemul_sun.c		wsdisplay  wsemul_sun
-file	dev/wscons/wsemul_vt100.c	wsdisplay  wsemul_vt100
-file	dev/wscons/wsemul_vt100_subr.c	wsdisplay  wsemul_vt100
-file	dev/wscons/wsemul_vt100_chars.c	wsdisplay  wsemul_vt100
-file	dev/wscons/wsemul_vt100_keys.c	wsdisplay  wsemul_vt100
-file	dev/wscons/wsevent.c		wsdisplay | wskbd | wsmouse | wsmux
+define	wsemul_sun: wsdisplay
+file	dev/wscons/wsemul_sun.c		wsemul_sun
+define	wsemul_vt100: wsdisplay
+file	dev/wscons/wsemul_vt100.c	wsemul_vt100
+file	dev/wscons/wsemul_vt100_subr.c	wsemul_vt100
+file	dev/wscons/wsemul_vt100_chars.c	wsemul_vt100
+file	dev/wscons/wsemul_vt100_keys.c	wsemul_vt100
+define	wsevent
+file	dev/wscons/wsevent.c
 file	dev/wscons/wskbd.c		wskbd			needs-flag
 file	dev/wscons/wskbdutil.c		wskbd			needs-flag
 file	dev/wscons/wsmouse.c		wsmouse			needs-flag
@@ -65,7 +69,7 @@ include dev/rcons/files.rcons
 file	dev/wscons/wscons_rinit.c	wsrasteremulops
 file	dev/wscons/wscons_rops.c	wsrasteremulops
 
-defpseudo	wsmux
+defpseudo	wsmux: wsevent
 file	dev/wscons/wsmux.c		wsmux			needs-flag
 
 define	tpcalib

CVS commit: [netbsd-7] src/doc

2014-10-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 10 18:17:03 UTC 2014

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

Log Message:
ticket 116


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.47 -r1.1.2.48 src/doc/CHANGES-7.0

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.0
diff -u src/doc/CHANGES-7.0:1.1.2.47 src/doc/CHANGES-7.0:1.1.2.48
--- src/doc/CHANGES-7.0:1.1.2.47	Mon Oct  6 13:11:04 2014
+++ src/doc/CHANGES-7.0	Fri Oct 10 18:17:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.47 2014/10/06 13:11:04 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.48 2014/10/10 18:17:03 snj Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -1082,3 +1082,19 @@ external/mit/xorg/lib/libxcb/xcb.mk		1.3
 	Fix SHLIB_MAJOR to match xorg and fix linking against libxcb-sync.
 	[skrll, ticket #131]
 
+sys/arch/amd64/conf/GENERIC			patch
+sys/arch/amd64/conf/XEN3_DOM0			patch
+sys/arch/amd64/conf/XEN3_DOMU			patch
+sys/arch/cobalt/conf/GENERIC			patch
+sys/arch/i386/conf/GENERIC			patch
+sys/arch/i386/conf/XEN3_DOM0			patch
+sys/arch/i386/conf/XEN3_DOMU			patch
+sys/arch/mvmeppc/conf/GENERIC			patch
+sys/arch/shark/conf/GENERIC			patch
+sys/arch/sparc64/conf/GENERIC			patch
+sys/arch/sparc64/conf/GENERIC.DEBUG		patch
+sys/arch/zaurus/conf/GENERIC			patch
+
+	Disable DIAGNOSTIC and/or DEBUG.
+	[bouyer/martin, ticket #116]
+

CVS commit: [netbsd-7] src/sys/arch

2014-10-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Fri Oct 10 18:16:37 UTC 2014

Modified Files:
src/sys/arch/amd64/conf [netbsd-7]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/cobalt/conf [netbsd-7]: GENERIC
src/sys/arch/i386/conf [netbsd-7]: GENERIC XEN3_DOM0 XEN3_DOMU
src/sys/arch/mvmeppc/conf [netbsd-7]: GENERIC
src/sys/arch/shark/conf [netbsd-7]: GENERIC
src/sys/arch/sparc64/conf [netbsd-7]: GENERIC GENERIC.DEBUG
src/sys/arch/zaurus/conf [netbsd-7]: GENERIC

Log Message:
Apply patch (requested by bouyer/martin in ticket #116):
Disable DIAGNOSTIC and/or DEBUG.


To generate a diff of this commit:
cvs rdiff -u -r1.392 -r1.392.2.1 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.103 -r1.103.2.1 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.54 -r1.54.2.1 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.143 -r1.143.2.1 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.1107 -r1.1107.2.1 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.85 -r1.85.2.1 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.59 -r1.59.2.1 src/sys/arch/i386/conf/XEN3_DOMU
cvs rdiff -u -r1.22 -r1.22.6.1 src/sys/arch/mvmeppc/conf/GENERIC
cvs rdiff -u -r1.115 -r1.115.2.1 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.171 -r1.171.4.1 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.2 -r1.2.16.1 src/sys/arch/sparc64/conf/GENERIC.DEBUG
cvs rdiff -u -r1.57 -r1.57.2.1 src/sys/arch/zaurus/conf/GENERIC

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

Modified files:

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.392 src/sys/arch/amd64/conf/GENERIC:1.392.2.1
--- src/sys/arch/amd64/conf/GENERIC:1.392	Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/GENERIC	Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: GENERIC,v 1.392.2.1 2014/10/10 18:16:36 snj Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	arch/amd64/conf/std.amd64
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		GENERIC-$Revision: 1.392 $
+#ident 		GENERIC-$Revision: 1.392.2.1 $
 
 maxusers	64		# estimated number of users
 
@@ -86,7 +86,7 @@ vmt0		at cpu0		# VMware Tools
 options 	BUFQ_PRIOCSCAN
 
 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# inexpensive kernel consistency checks
+#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 # XXX to be commented out on release branch
 #options 	DEBUG		# expensive debugging checks/support
 #options 	LOCKDEBUG	# expensive locking checks/support

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.103 src/sys/arch/amd64/conf/XEN3_DOM0:1.103.2.1
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.103	Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.103 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: XEN3_DOM0,v 1.103.2.1 2014/10/10 18:16:36 snj Exp $
 
 include 	arch/amd64/conf/std.xen
 
@@ -47,9 +47,9 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 options 	BUFQ_PRIOCSCAN
 
 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# inexpensive kernel consistency checks
+#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 #options 	DEBUG		# expensive debugging checks/support
-options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
+#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB

Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.54 src/sys/arch/amd64/conf/XEN3_DOMU:1.54.2.1
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.54	Fri Jul 25 15:01:14 2014
+++ src/sys/arch/amd64/conf/XEN3_DOMU	Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.54 2014/07/25 15:01:14 dholland Exp $
+# $NetBSD: XEN3_DOMU,v 1.54.2.1 2014/10/10 18:16:36 snj Exp $
 
 include 	arch/amd64/conf/std.xen
 
@@ -41,9 +41,9 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 options 	BUFQ_PRIOCSCAN
 
 # Diagnostic/debugging support options
-options 	DIAGNOSTIC	# inexpensive kernel consistency checks
+#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
 #options 	DEBUG		# expensive debugging checks/support
-options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
+#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
 options 	DDB		# in-kernel debugger
 options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.143 src/sys/arch/cobalt/conf/GENERIC:1.143.2.1
--- src/sys/arch/cobalt/conf/GENERIC:1.143	Sun Jul 20 10:06:10 2014
+++ src/sys/arch/cobalt/conf/GENERIC	Fri Oct 10 18:16:36 2014
@@ -1,4 +1,4

CVS import: src/external/bsd/file/dist

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 20:08:24 UTC 2014

Update of /cvsroot/src/external/bsd/file/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv5930

Log Message:
import file-5.20; bug fixes and better image magic descriptions.

Status:

Vendor Tag: CHRISTOS
Release Tags:   FILE5_20

C src/external/bsd/file/dist/Makefile.in
U src/external/bsd/file/dist/Makefile.am
C src/external/bsd/file/dist/configure
U src/external/bsd/file/dist/acinclude.m4
C src/external/bsd/file/dist/configure.ac
U src/external/bsd/file/dist/aclocal.m4
C src/external/bsd/file/dist/config.h.in
U src/external/bsd/file/dist/AUTHORS
U src/external/bsd/file/dist/COPYING
U src/external/bsd/file/dist/ChangeLog
U src/external/bsd/file/dist/INSTALL
U src/external/bsd/file/dist/NEWS
U src/external/bsd/file/dist/README
U src/external/bsd/file/dist/TODO
U src/external/bsd/file/dist/compile
U src/external/bsd/file/dist/config.guess
U src/external/bsd/file/dist/config.sub
U src/external/bsd/file/dist/depcomp
U src/external/bsd/file/dist/install-sh
U src/external/bsd/file/dist/missing
U src/external/bsd/file/dist/ltmain.sh
U src/external/bsd/file/dist/MAINT
U src/external/bsd/file/dist/m4/lt~obsolete.m4
U src/external/bsd/file/dist/m4/libtool.m4
U src/external/bsd/file/dist/m4/ltoptions.m4
U src/external/bsd/file/dist/m4/ltsugar.m4
U src/external/bsd/file/dist/m4/ltversion.m4
U src/external/bsd/file/dist/src/getopt_long.c
C src/external/bsd/file/dist/src/Makefile.in
U src/external/bsd/file/dist/src/Makefile.am
U src/external/bsd/file/dist/src/ctime_r.c
U src/external/bsd/file/dist/src/getline.c
U src/external/bsd/file/dist/src/strcasestr.c
U src/external/bsd/file/dist/src/strlcat.c
U src/external/bsd/file/dist/src/fmtcheck.c
U src/external/bsd/file/dist/src/asctime_r.c
U src/external/bsd/file/dist/src/mygetopt.h
U src/external/bsd/file/dist/src/vasprintf.c
U src/external/bsd/file/dist/src/pread.c
U src/external/bsd/file/dist/src/strlcpy.c
U src/external/bsd/file/dist/src/asprintf.c
C src/external/bsd/file/dist/src/magic.h
C src/external/bsd/file/dist/src/magic.c
C src/external/bsd/file/dist/src/apprentice.c
C src/external/bsd/file/dist/src/softmagic.c
U src/external/bsd/file/dist/src/ascmagic.c
C src/external/bsd/file/dist/src/encoding.c
U src/external/bsd/file/dist/src/compress.c
U src/external/bsd/file/dist/src/is_tar.c
U src/external/bsd/file/dist/src/readelf.c
U src/external/bsd/file/dist/src/print.c
U src/external/bsd/file/dist/src/fsmagic.c
C src/external/bsd/file/dist/src/funcs.c
C src/external/bsd/file/dist/src/file.h
U src/external/bsd/file/dist/src/readelf.h
U src/external/bsd/file/dist/src/tar.h
U src/external/bsd/file/dist/src/apptype.c
U src/external/bsd/file/dist/src/file_opts.h
U src/external/bsd/file/dist/src/elfclass.h
C src/external/bsd/file/dist/src/cdf.c
U src/external/bsd/file/dist/src/cdf_time.c
C src/external/bsd/file/dist/src/readcdf.c
U src/external/bsd/file/dist/src/cdf.h
C src/external/bsd/file/dist/src/file.c
U src/external/bsd/file/dist/src/magic.h.in
C src/external/bsd/file/dist/magic/Makefile.in
C src/external/bsd/file/dist/magic/Makefile.am
U src/external/bsd/file/dist/magic/Header
U src/external/bsd/file/dist/magic/Localstuff
U src/external/bsd/file/dist/magic/magdir/adventure
U src/external/bsd/file/dist/magic/magdir/acorn
U src/external/bsd/file/dist/magic/magdir/adi
U src/external/bsd/file/dist/magic/magdir/animation
U src/external/bsd/file/dist/magic/magdir/allegro
U src/external/bsd/file/dist/magic/magdir/alliant
U src/external/bsd/file/dist/magic/magdir/amanda
U src/external/bsd/file/dist/magic/magdir/amigaos
U src/external/bsd/file/dist/magic/magdir/android
U src/external/bsd/file/dist/magic/magdir/apple
U src/external/bsd/file/dist/magic/magdir/aout
U src/external/bsd/file/dist/magic/magdir/apl
U src/external/bsd/file/dist/magic/magdir/assembler
U src/external/bsd/file/dist/magic/magdir/applix
C src/external/bsd/file/dist/magic/magdir/archive
U src/external/bsd/file/dist/magic/magdir/blackberry
U src/external/bsd/file/dist/magic/magdir/asterix
U src/external/bsd/file/dist/magic/magdir/att3b
U src/external/bsd/file/dist/magic/magdir/audio
U src/external/bsd/file/dist/magic/magdir/basis
U src/external/bsd/file/dist/magic/magdir/bflt
U src/external/bsd/file/dist/magic/magdir/blender
U src/external/bsd/file/dist/magic/magdir/communications
U src/external/bsd/file/dist/magic/magdir/blcr
U src/external/bsd/file/dist/magic/magdir/btsnoop
U src/external/bsd/file/dist/magic/magdir/blit
U src/external/bsd/file/dist/magic/magdir/bout
U src/external/bsd/file/dist/magic/magdir/bsdi
U src/external/bsd/file/dist/magic/magdir/bsi
U src/external/bsd/file/dist/magic/magdir/efi
U src/external/bsd/file/dist/magic/magdir/c-lang
U src/external/bsd/file/dist/magic/magdir/c64
U src/external/bsd/file/dist/magic/magdir/cad
U src/external/bsd/file/dist/magic/magdir/cafebabe
U src/external/bsd/file/dist/magic/magdir/cddb
U src/external/bsd/file/dist/magic/magdir/chord
U

CVS commit: src/external/bsd/file/dist

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 20:15:02 UTC 2014

Modified Files:
src/external/bsd/file/dist: config.h.in configure configure.ac
src/external/bsd/file/dist/doc: file.1 libmagic.3 magic.5
src/external/bsd/file/dist/magic: Makefile.am Makefile.in
src/external/bsd/file/dist/magic/magdir: archive elf filesystems
src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c
encoding.c file.c file.h funcs.c magic.c readcdf.c softmagic.c
Removed Files:
src/external/bsd/file/dist/magic/magdir: rinex

Log Message:
welcome to file-5.20


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/config.h.in \
src/external/bsd/file/dist/configure.ac
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/configure
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/doc/file.1
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/file/dist/doc/libmagic.3 \
src/external/bsd/file/dist/doc/magic.5
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/Makefile.am
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/Makefile.in
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/magic/magdir/archive
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/magic/magdir/elf
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/magic/magdir/filesystems
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/magic/magdir/rinex
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/file/dist/src/Makefile.in \
src/external/bsd/file/dist/src/cdf.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/apprentice.c \
src/external/bsd/file/dist/src/file.h \
src/external/bsd/file/dist/src/softmagic.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/dist/src/encoding.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/file.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/funcs.c \
src/external/bsd/file/dist/src/magic.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/file/dist/src/readcdf.c

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

Modified files:

Index: src/external/bsd/file/dist/config.h.in
diff -u src/external/bsd/file/dist/config.h.in:1.8 src/external/bsd/file/dist/config.h.in:1.9
--- src/external/bsd/file/dist/config.h.in:1.8	Thu Jun 12 22:08:06 2014
+++ src/external/bsd/file/dist/config.h.in	Fri Oct 10 16:15:01 2014
@@ -44,6 +44,9 @@
 /* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
+/* Define to 1 if you have the `freelocale' function. */
+#undef HAVE_FREELOCALE
+
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #undef HAVE_FSEEKO
 
@@ -95,6 +98,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #undef HAVE_MMAP
 
+/* Define to 1 if you have the `newlocale' function. */
+#undef HAVE_NEWLOCALE
+
 /* Define to 1 if you have the `pread' function. */
 #undef HAVE_PREAD
 
@@ -182,6 +188,9 @@
 /* Define to 1 if you have the unistd.h header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `uselocale' function. */
+#undef HAVE_USELOCALE
+
 /* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
Index: src/external/bsd/file/dist/configure.ac
diff -u src/external/bsd/file/dist/configure.ac:1.8 src/external/bsd/file/dist/configure.ac:1.9
--- src/external/bsd/file/dist/configure.ac:1.8	Thu Jun 12 22:08:06 2014
+++ src/external/bsd/file/dist/configure.ac	Fri Oct 10 16:15:01 2014
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([file],[5.19],[chris...@astron.com])
+AC_INIT([file],[5.20],[chris...@astron.com])
 AM_INIT_AUTOMAKE([subdir-objects foreign])
 AM_MAINTAINER_MODE(disable)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -139,7 +139,7 @@ else
 fi])
 
 dnl Checks for functions
-AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof)
+AC_CHECK_FUNCS(strerror strndup strtoul mkstemp mkostemp utimes utime wcwidth strtof newlocale uselocale freelocale)
 
 dnl Provide implementation of some required functions if necessary
 AC_REPLACE_FUNCS(getopt_long asprintf vasprintf strlcpy strlcat getline ctime_r asctime_r pread strcasestr fmtcheck)

Index: src/external/bsd/file/dist/configure
diff -u src/external/bsd/file/dist/configure:1.11 src/external/bsd/file/dist/configure:1.12
--- src/external/bsd/file/dist/configure:1.11	Thu Jun 12 22:08:06 2014
+++ src/external/bsd/file/dist/configure	Fri Oct 10 16:15:01 2014
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file 5.19.
+# Generated by GNU Autoconf 2.69 for file 5.20.
 #
 # Report bugs to chris...@astron.com.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.19'
-PACKAGE_STRING='file 5.19'
+PACKAGE_VERSION='5.20'
+PACKAGE_STRING='file

CVS commit: src/doc

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 20:16:32 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new file.


To generate a diff of this commit:
cvs rdiff -u -r1.1156 -r1.1157 src/doc/3RDPARTY
cvs rdiff -u -r1.1990 -r1.1991 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1156 src/doc/3RDPARTY:1.1157
--- src/doc/3RDPARTY:1.1156	Tue Oct  7 17:52:41 2014
+++ src/doc/3RDPARTY	Fri Oct 10 16:16:32 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1156 2014/10/07 21:52:41 christos Exp $
+#	$NetBSD: 3RDPARTY,v 1.1157 2014/10/10 20:16:32 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -369,8 +369,8 @@ Notes:
 Please use expat as the vendor tag for CVS imports.
 
 Package:	file
-Version:	5.19
-Current Vers:	5.19
+Version:	5.20
+Current Vers:	5.20
 Maintainer:	Christos Zoulas chris...@zoulas.com
 Archive Site:	ftp://ftp.astron.com/pub/file/
 Home Page:	http://www.darwinsys.com/file/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1990 src/doc/CHANGES:1.1991
--- src/doc/CHANGES:1.1990	Tue Oct  7 17:52:41 2014
+++ src/doc/CHANGES	Fri Oct 10 16:16:32 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1990 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1991 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -59,4 +59,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	zoneinfo: Import tzdata2014h. [apb 20141004]
 	dhcpcd(8): Import dhcpcd-6.5.0. [roy 20141006]
 	libc: Update to tzcode2014h. [christos 20141007]
-
+	file(1): Upgraded to 5.20. [christos 20141010]

CVS commit: src/tools/gcc

2014-10-10 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Fri Oct 10 20:23:22 UTC 2014

Modified Files:
src/tools/gcc: Makefile

Log Message:
add --enable-libstdcxx-time=rt for the GCC 4.8 build.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/tools/gcc/Makefile

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

Modified files:

Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.71 src/tools/gcc/Makefile:1.72
--- src/tools/gcc/Makefile:1.71	Wed Sep  3 19:25:29 2014
+++ src/tools/gcc/Makefile	Fri Oct 10 20:23:22 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.71 2014/09/03 19:25:29 matt Exp $
+#	$NetBSD: Makefile,v 1.72 2014/10/10 20:23:22 mrg Exp $
 
 .include bsd.own.mk
 
@@ -49,6 +49,10 @@ COMMON_CONFIGURE_ARGS+=	--with-arch=${GC
 COMMON_CONFIGURE_ARGS+=	--with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
 .endif
 
+.if ${HAVE_GCC} == 48
+COMMON_CONFIGURE_ARGS+= --enable-libstdcxx-time=rt
+.endif
+
 CONFIGURE_ARGS=	${COMMON_CONFIGURE_ARGS}
 CONFIGURE_ARGS+= \
 		--with-sysroot=${DESTDIR} \

CVS commit: src/external/bsd/file/include

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Fri Oct 10 20:57:48 UTC 2014

Modified Files:
src/external/bsd/file/include: config.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/file/include/config.h

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

Modified files:

Index: src/external/bsd/file/include/config.h
diff -u src/external/bsd/file/include/config.h:1.6 src/external/bsd/file/include/config.h:1.7
--- src/external/bsd/file/include/config.h:1.6	Sun Dec  1 15:15:42 2013
+++ src/external/bsd/file/include/config.h	Fri Oct 10 16:57:48 2014
@@ -39,9 +39,15 @@
 /* Define to 1 if you have the fcntl.h header file. */
 #define HAVE_FCNTL_H 1
 
+/* Define to 1 if you have the `fmtcheck' function. */
+#define HAVE_FMTCHECK 1
+
 /* Define to 1 if you have the `fork' function. */
 #define HAVE_FORK 1
 
+/* Define to 1 if you have the `freelocale' function. */
+#define HAVE_FREELOCALE 1
+
 /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
 #define HAVE_FSEEKO 1
 
@@ -57,6 +63,9 @@
 /* Define to 1 if you have the `getpagesize' function. */
 #define HAVE_GETPAGESIZE 1
 
+/* Define to 1 if the system has the type `intptr_t'. */
+#define HAVE_INTPTR_T 1
+
 /* Define to 1 if you have the inttypes.h header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -82,7 +91,7 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
+#define HAVE_MKOSTEMP 1
 
 /* Define to 1 if you have the `mkstemp' function. */
 #define HAVE_MKSTEMP 1
@@ -90,6 +99,9 @@
 /* Define to 1 if you have a working `mmap' system call. */
 #define HAVE_MMAP 1
 
+/* Define to 1 if you have the `newlocale' function. */
+#define HAVE_NEWLOCALE 1
+
 /* Define to 1 if you have the `pread' function. */
 #define HAVE_PREAD 1
 
@@ -102,6 +114,9 @@
 /* Define to 1 if you have the stdlib.h header file. */
 #define HAVE_STDLIB_H 1
 
+/* Define to 1 if you have the `strcasestr' function. */
+#define HAVE_STRCASESTR 1
+
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
@@ -168,9 +183,15 @@
 /* HAVE_TZNAME */
 #define HAVE_TZNAME 1
 
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
 /* Define to 1 if you have the unistd.h header file. */
 #define HAVE_UNISTD_H 1
 
+/* Define to 1 if you have the `uselocale' function. */
+/* #undef HAVE_USELOCALE */
+
 /* Define to 1 if you have the `utime' function. */
 #define HAVE_UTIME 1
 
@@ -223,9 +244,6 @@
sysmacros.h. */
 /* #undef MAJOR_IN_SYSMACROS */
 
-/* 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 file
 
@@ -236,7 +254,7 @@
 #define PACKAGE_NAME file
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING file 5.14
+#define PACKAGE_STRING file 5.20
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME file
@@ -245,9 +263,7 @@
 #define PACKAGE_URL 
 
 /* Define to the version of this package. */
-#if 0
-#define PACKAGE_VERSION 5.14
-#endif
+#define PACKAGE_VERSION 5.20
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -276,11 +292,8 @@
 # define __EXTENSIONS__ 1
 #endif
 
-
-#if 0
 /* Version number of package */
-#define VERSION 5.14
-#endif
+#define VERSION 5.20
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -344,6 +357,10 @@
such a type exists and the standard includes do not define it. */
 /* #undef int64_t */
 
+/* Define to the type of a signed integer type wide enough to hold a pointer,
+   if such a type exists, and if the system does not define it. */
+/* #undef intptr_t */
+
 /* Define to a type if wchar.h does not define. */
 /* #undef mbstate_t */
 
@@ -372,5 +389,9 @@
such a type exists and the standard includes do not define it. */
 /* #undef uint8_t */
 
+/* Define to the type of an unsigned integer type wide enough to hold a
+   pointer, if such a type exists, and if the system does not define it. */
+/* #undef uintptr_t */
+
 /* Define as `fork' if `vfork' does not work. */
 /* #undef vfork */

CVS commit: src/lib/libm

2014-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 10 20:58:09 UTC 2014

Modified Files:
src/lib/libm/arch/vax: n_atan2.S n_cabs.S
src/lib/libm/noieee_src: n_atan2.c n_cosh.c n_exp.c n_log.c n_pow.c
n_sincos.c n_sinh.c

Log Message:
Add a few missing weak aliases


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libm/arch/vax/n_atan2.S
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/arch/vax/n_cabs.S
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/noieee_src/n_atan2.c \
src/lib/libm/noieee_src/n_sincos.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libm/noieee_src/n_cosh.c \
src/lib/libm/noieee_src/n_exp.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/noieee_src/n_log.c \
src/lib/libm/noieee_src/n_sinh.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libm/noieee_src/n_pow.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/libm/arch/vax/n_atan2.S
diff -u src/lib/libm/arch/vax/n_atan2.S:1.8 src/lib/libm/arch/vax/n_atan2.S:1.9
--- src/lib/libm/arch/vax/n_atan2.S:1.8	Thu Mar 20 18:49:39 2008
+++ src/lib/libm/arch/vax/n_atan2.S	Fri Oct 10 20:58:09 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: n_atan2.S,v 1.8 2008/03/20 18:49:39 mhitch Exp $	*/
+/*	$NetBSD: n_atan2.S,v 1.9 2014/10/10 20:58:09 martin Exp $	*/
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -84,6 +84,7 @@ ENTRY(_atan2f, 0)
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(atan2, _atan2)
+WEAK_ALIAS(_atan2l, _atan2)
 #endif
 
 ENTRY(_atan2, 0x0fc0)

Index: src/lib/libm/arch/vax/n_cabs.S
diff -u src/lib/libm/arch/vax/n_cabs.S:1.6 src/lib/libm/arch/vax/n_cabs.S:1.7
--- src/lib/libm/arch/vax/n_cabs.S:1.6	Thu Mar 20 16:41:26 2008
+++ src/lib/libm/arch/vax/n_cabs.S	Fri Oct 10 20:58:09 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: n_cabs.S,v 1.6 2008/03/20 16:41:26 mhitch Exp $	*/
+/*	$NetBSD: n_cabs.S,v 1.7 2014/10/10 20:58:09 martin Exp $	*/
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -55,6 +55,8 @@ ENTRY(_hypotf, 0)
 
 #ifdef WEAK_ALIAS
 WEAK_ALIAS(hypot, _hypot)
+WEAK_ALIAS(hypotl, _hypot)
+WEAK_ALIAS(_hypotl, _hypot)
 #endif
 
 ALTENTRY(cabs)

Index: src/lib/libm/noieee_src/n_atan2.c
diff -u src/lib/libm/noieee_src/n_atan2.c:1.6 src/lib/libm/noieee_src/n_atan2.c:1.7
--- src/lib/libm/noieee_src/n_atan2.c:1.6	Thu Aug  7 16:44:50 2003
+++ src/lib/libm/noieee_src/n_atan2.c	Fri Oct 10 20:58:09 2014
@@ -1,4 +1,4 @@
-/*  $NetBSD: n_atan2.c,v 1.6 2003/08/07 16:44:50 agc Exp $*/
+/*  $NetBSD: n_atan2.c,v 1.7 2014/10/10 20:58:09 martin Exp $*/
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -170,6 +170,10 @@ ic(a11,1.6438029044759730479E-2  ,  
 #define	a12	vccast(a12)
 #endif
 
+#ifdef __weak_alias
+__weak_alias(_atan2l, atan2);
+#endif
+
 double
 atan2(double y, double x)
 {
Index: src/lib/libm/noieee_src/n_sincos.c
diff -u src/lib/libm/noieee_src/n_sincos.c:1.6 src/lib/libm/noieee_src/n_sincos.c:1.7
--- src/lib/libm/noieee_src/n_sincos.c:1.6	Thu Aug  7 16:44:52 2003
+++ src/lib/libm/noieee_src/n_sincos.c	Fri Oct 10 20:58:09 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: n_sincos.c,v 1.6 2003/08/07 16:44:52 agc Exp $	*/
+/*	$NetBSD: n_sincos.c,v 1.7 2014/10/10 20:58:09 martin Exp $	*/
 /*
  * Copyright (c) 1987, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -38,6 +38,11 @@ static char sccsid[] = @(#)sincos.c	8.1
 #include mathimpl.h
 #include trig.h
 
+#ifdef __weak_alias
+__weak_alias(_sinl, sin);
+__weak_alias(_cosl, cos);
+#endif
+
 double
 sin(double x)
 {

Index: src/lib/libm/noieee_src/n_cosh.c
diff -u src/lib/libm/noieee_src/n_cosh.c:1.8 src/lib/libm/noieee_src/n_cosh.c:1.9
--- src/lib/libm/noieee_src/n_cosh.c:1.8	Thu Mar 20 16:41:26 2008
+++ src/lib/libm/noieee_src/n_cosh.c	Fri Oct 10 20:58:09 2014
@@ -1,4 +1,4 @@
-/*  $NetBSD: n_cosh.c,v 1.8 2008/03/20 16:41:26 mhitch Exp $ */
+/*  $NetBSD: n_cosh.c,v 1.9 2014/10/10 20:58:09 martin Exp $ */
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -87,6 +87,7 @@ static char sccsid[] = @(#)cosh.c	8.1 (
 
 #ifdef __weak_alias
 __weak_alias(cosh, _cosh);
+__weak_alias(_coshl, _cosh);
 __weak_alias(coshf, _coshf);
 #endif
 
Index: src/lib/libm/noieee_src/n_exp.c
diff -u src/lib/libm/noieee_src/n_exp.c:1.8 src/lib/libm/noieee_src/n_exp.c:1.9
--- src/lib/libm/noieee_src/n_exp.c:1.8	Thu Mar 20 16:41:26 2008
+++ src/lib/libm/noieee_src/n_exp.c	Fri Oct 10 20:58:09 2014
@@ -1,4 +1,4 @@
-/*  $NetBSD: n_exp.c,v 1.8 2008/03/20 16:41:26 mhitch Exp $ */
+/*  $NetBSD: n_exp.c,v 1.9 2014/10/10 20:58:09 martin Exp $ */
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -82,6 +82,7 @@ static char sccsid[] = @(#)exp.c	8.1 (B
 
 #ifdef __weak_alias
 __weak_alias(exp, _exp);
+__weak_alias(_expl,

CVS commit: src/lib/libm/arch/vax

2014-10-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Fri Oct 10 22:06:33 UTC 2014

Modified Files:
src/lib/libm/arch/vax: n_sincos.S

Log Message:
More aliases


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/libm/arch/vax/n_sincos.S

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

Modified files:

Index: src/lib/libm/arch/vax/n_sincos.S
diff -u src/lib/libm/arch/vax/n_sincos.S:1.8 src/lib/libm/arch/vax/n_sincos.S:1.9
--- src/lib/libm/arch/vax/n_sincos.S:1.8	Thu Aug  7 16:44:45 2003
+++ src/lib/libm/arch/vax/n_sincos.S	Fri Oct 10 22:06:33 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: n_sincos.S,v 1.8 2003/08/07 16:44:45 agc Exp $	*/
+/*	$NetBSD: n_sincos.S,v 1.9 2014/10/10 22:06:33 martin Exp $	*/
 /*
  * Copyright (c) 1985, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -52,6 +52,10 @@ ENTRY(sinf, 0)
 	cvtdf	%r0,%r0
 	ret
 
+#ifdef WEAK_ALIAS
+WEAK_ALIAS(_sinl, sin)
+#endif
+
 ENTRY(sin, 0xfc0)
 	movq	4(%ap),%r0
 	bicw3	$0x807f,%r0,%r2
@@ -87,6 +91,10 @@ ENTRY(cosf, 0)
 	cvtdf	%r0,%r0
 	ret
 
+#ifdef WEAK_ALIAS
+WEAK_ALIAS(_cosl, cos)
+#endif
+
 ENTRY(cos, 0x0fc0)
 	movq	4(%ap),%r0
 	bicw3	$0x7f,%r0,%r2

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

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 23:50:43 UTC 2014

Modified Files:
src/sys/arch/arm/allwinner: awin_board.c awin_reg.h awin_var.h

Log Message:
add some extra A31 registers


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/allwinner/awin_board.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/allwinner/awin_var.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/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.21 src/sys/arch/arm/allwinner/awin_board.c:1.22
--- src/sys/arch/arm/allwinner/awin_board.c:1.21	Fri Oct 10 07:36:11 2014
+++ src/sys/arch/arm/allwinner/awin_board.c	Fri Oct 10 23:50:43 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_board.c,v 1.21 2014/10/10 07:36:11 jmcneill Exp $	*/
+/*	$NetBSD: awin_board.c,v 1.22 2014/10/10 23:50:43 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.21 2014/10/10 07:36:11 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.22 2014/10/10 23:50:43 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -175,7 +175,7 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
 	error = bus_space_map(awin_bs_tag, AWIN_CORE_PBASE,
 	AWIN_CORE_SIZE, 0, awin_core_bsh);
 	if (error)
-		panic(%s: failed to map a[12]0 %s registers: %d,
+		panic(%s: failed to map awin %s registers: %d,
 		__func__, io, error);
 	KASSERT(awin_core_bsh == iobase);
 
@@ -197,16 +197,15 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
 
 #ifdef VERBOSE_INIT_ARM
 	if (awin_chip_id() == AWIN_CHIP_ID_A31) {
-		uint32_t s0 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU0_STATUS_REG);
-		uint32_t s1 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU1_STATUS_REG);
-		uint32_t s2 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU2_STATUS_REG);
-		uint32_t s3 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
-		AWIN_A31_CPUCFG_OFFSET + AWIN_A31_CPUCFG_CPU3_STATUS_REG);
+		uint32_t s[4];
+		unsigned int cpuno;
+		for (cpuno = 0; cpuno  4; cpuno++) {
+			s[cpuno] = bus_space_read_4(awin_bs_tag, awin_core_bsh,
+			AWIN_A31_CPUCFG_OFFSET +
+			AWIN_A31_CPUCFG_STATUS_REG(cpuno));
+		}
 		printf(%s: cpu status: 0=%#x 1=%#x 2=%#x 3=%#x\n, __func__,
-		s0, s1, s2, s3);
+		s[0], s[1], s[2], s[3]);
 	} else {
 		uint32_t s0 = bus_space_read_4(awin_bs_tag, awin_core_bsh,
 		AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU0_STATUS_REG);

Index: src/sys/arch/arm/allwinner/awin_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.27 src/sys/arch/arm/allwinner/awin_reg.h:1.28
--- src/sys/arch/arm/allwinner/awin_reg.h:1.27	Fri Oct 10 07:36:11 2014
+++ src/sys/arch/arm/allwinner/awin_reg.h	Fri Oct 10 23:50:43 2014
@@ -169,6 +169,12 @@
 #define AWIN_SRAM_VER_BOOT_SEL_PAD_STA	__BIT(8)
 #define AWIN_SRAM_VER_BITS		__BITS(7,0)
 
+#define AWIN_SRAM_VER_KEY_A10		0x1623
+#define AWIN_SRAM_VER_KEY_A13		0x1625
+#define AWIN_SRAM_VER_KEY_A31		0x1633
+#define AWIN_SRAM_VER_KEY_A23		0x1650
+#define AWIN_SRAM_VER_KEY_A20		0x1651
+
 /* A10/A20 DRAM Controller */
 #define AWIN_DRAM_CCR_REG		0x
 #define AWIN_DRAM_DCR_REG		0x0004
@@ -1694,11 +1700,27 @@ struct awin_mmc_idma_descriptor {
 #define AWIN_A31_USB1_OFFSET		0x0001a000	/* EHCI0/OHCI0 */
 #define AWIN_A31_USB2_OFFSET		0x0001b000	/* EHCI1/OHCI1 */
 #define AWIN_A31_USB3_OFFSET		0x0001b000	/* OHCI2 */
+#define AWIN_A31_PRCM_OFFSET		0x00301400	/* PRCM */
+#define AWIN_A31_CPUCFG_OFFSET		0x00301C00
 
-#define AWIN_A31_CPUCFG_OFFSET		0x00031C00
+#define AWIN_A31_PRCM_PWROFF_GATING_REG		0x100
+#define AWIN_A31_PRCM_CPUX_PWR_CLAMP_REG	0x0140
+#define AWIN_A31_PRCM_CPU1_PWR_CLAMP_REG	0x0144
+#define AWIN_A31_PRCM_CPU2_PWR_CLAMP_REG	0x0148
+#define AWIN_A31_PRCM_CPU3_PWR_CLAMP_REG	0x014C
+
+#define AWIN_A31_CPUCFG_CPU0_RST_CTRL_REG	0x0040
+#define AWIN_A31_CPUCFG_CPU0_PWR_CLAMP_STATUS_REG 0x0064
+#define AWIN_A31_CPUCFG_RST_CTRL_REG(n)		(0x0040 + (n * 0x40))
+#define AWIN_A31_CPUCFG_CTRL_REG(n)		(0x0044 + (n * 0x40))
+#define AWIN_A31_CPUCFG_STATUS_REG(n)		(0x0048 + (n * 0x40))
+#define AWIN_A31_CPUCFG_PWR_CLAMP_STATUS_REG(n)	(0x0064 + (n * 0x40))
 
 #define AWIN_A31_CPU_AXI_CFG_REG		0x0050
 
+#define AWIN_A31_CPUCFG_RST_CTRL_CORE_RESET __BIT(1)
+#define AWIN_A31_CPUCFG_RST_CTRL_CPU_RESET __BIT(0)
+
 #define AWIN_A31_AHB_GATING0_USB_OHCI2	__BIT(31)
 #define AWIN_A31_AHB_GATING0_USB_OHCI1	__BIT(30)
 #define AWIN_A31_AHB_GATING0_USB_OHCI0	__BIT(29)
@@ -1716,11 +1738,6 @@ struct awin_mmc_idma_descriptor {
 #define AWIN_A31_USB_CLK_PHY1_ENABLE	__BIT(1)
 #define AWIN_A31_USB_CLK_PHY0_ENABLE	__BIT(0)
 
-#define

CVS commit: src/sys/arch/evbarm/awin

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Fri Oct 10 23:51:28 UTC 2014

Modified Files:
src/sys/arch/evbarm/awin: awin_start.S

Log Message:
A31 SMP support


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/awin/awin_start.S

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/evbarm/awin/awin_start.S
diff -u src/sys/arch/evbarm/awin/awin_start.S:1.2 src/sys/arch/evbarm/awin/awin_start.S:1.3
--- src/sys/arch/evbarm/awin/awin_start.S:1.2	Thu Sep 25 07:59:29 2014
+++ src/sys/arch/evbarm/awin/awin_start.S	Fri Oct 10 23:51:28 2014
@@ -41,7 +41,7 @@
 #include arm/allwinner/awin_reg.h
 #include evbarm/awin/platform.h  
 
-RCSID($NetBSD: awin_start.S,v 1.2 2014/09/25 07:59:29 matt Exp $)
+RCSID($NetBSD: awin_start.S,v 1.3 2014/10/10 23:51:28 jmcneill Exp $)
 
 #if defined(VERBOSE_INIT_ARM)
 #define	XPUTC(n)	mov r0, n; bl xputc
@@ -150,7 +150,29 @@ _C_LABEL(awin_start):
 	XPUTC2(#60)
 	// Make sure the cache is flushed out to RAM for the other CPUs
 	bl	_C_LABEL(armv7_dcache_wbinv_all)
-	bl	a20_mpinit
+
+	// Read SoC ID
+	movw	r5, #:lower16:(AWIN_CORE_PBASE+AWIN_SRAM_OFFSET)
+	movt	r5, #:upper16:(AWIN_CORE_PBASE+AWIN_SRAM_OFFSET)
+	ldr	r1, [r5, #AWIN_SRAM_VER_REG]
+	orr	r1, r1, AWIN_SRAM_VER_R_EN
+	str	r1, [r5, #AWIN_SRAM_VER_REG]
+	dsb
+	ldr	r1, [r5, #AWIN_SRAM_VER_REG]
+	lsr	r1, r1, #16
+
+	// MP init based on SoC ID
+#if defined(ALLWINNER_A20)
+	movw	r0, #AWIN_SRAM_VER_KEY_A20
+	cmp	r1, r0
+	bleq	a20_mpinit
+#endif
+#if defined(ALLWINNER_A31)
+	movw	r0, #AWIN_SRAM_VER_KEY_A31
+	cmp	r1, r0
+	bleq	a31_mpinit
+#endif
+
 	XPUTC2(#62)
 #endif /* MULTIPROCESSOR */
 	XPUTC2(#13)
@@ -178,6 +200,10 @@ a20_mpinit:
 	movw	r5, #:lower16:(AWIN_CORE_PBASE+AWIN_CPUCFG_OFFSET)
 	movt	r5, #:upper16:(AWIN_CORE_PBASE+AWIN_CPUCFG_OFFSET)
 
+	XPUTC2(#65)
+	XPUTC2(#50)
+	XPUTC2(#48)
+
 #ifdef __ARMEB__
 	setend	le			// everything here is little-endian
 #endif
@@ -258,6 +284,144 @@ ASEND(a20_mpinit)
 #ifndef KERNEL_BASES_EQUAL
 	.popsection
 #endif
+
+#ifndef KERNEL_BASES_EQUAL
+	.pushsection .text,ax,%progbits
+#endif
+a31_mpinit:
+	mov	r4, lr			// because we call gtmr_bootdelay
+	movw	r5, #:lower16:(AWIN_CORE_PBASE+AWIN_A31_CPUCFG_OFFSET)
+	movt	r5, #:upper16:(AWIN_CORE_PBASE+AWIN_A31_CPUCFG_OFFSET)
+	movw	r6, #:lower16:(AWIN_CORE_PBASE+AWIN_A31_PRCM_OFFSET)
+	movt	r6, #:upper16:(AWIN_CORE_PBASE+AWIN_A31_PRCM_OFFSET)
+
+	XPUTC2(#65)
+	XPUTC2(#51)
+	XPUTC2(#49)
+
+#ifdef __ARMEB__
+	setend	le			// everything here is little-endian
+#endif
+
+	mov	r12, #1			// CPU number
+
+a31_mpinit_cpu:
+
+	XPUTC2(r12)
+
+	/* Set where the other CPU(s) are going to execute */
+	movw	r1, #:lower16:cortex_mpstart
+	movt	r1, #:upper16:cortex_mpstart
+	str	r1, [r5, #AWIN_CPUCFG_PRIVATE_REG]
+	dsb
+
+	/* Assert CPU core reset */
+	mov	r1, #0
+	mov	r2, #0x40
+	mul	r7, r12, r2
+	add	r7, r7, #AWIN_A31_CPUCFG_CPU0_RST_CTRL_REG
+	str	r1, [r5, r7]
+	dsb
+
+	/* Ensure CPUX reset also invalidates its L1 caches */
+	ldr	r1, [r5, #AWIN_CPUCFG_GENCTRL_REG] 
+	mov	r0, #1
+	lsl	r0, r0, r12
+	bic	r1, r1, r0
+	str	r1, [r5, #AWIN_CPUCFG_GENCTRL_REG]
+	dsb
+
+	/* Release power clamp */
+	mov	r1, #0xe7
+	mov	r2, #0x4
+	mul	r7, r12, r2
+	add	r7, r7, #AWIN_A31_PRCM_CPUX_PWR_CLAMP_REG
+	str	r1, [r6, r7]
+	dsb
+
+	mov	r2, #0x40
+	mul	r7, r12, r2
+	add	r7, r7, #AWIN_A31_CPUCFG_CPU0_PWR_CLAMP_STATUS_REG
+1:
+	ldr	r1, [r5, r7]
+	cmp	r1, #0xe7
+	bne	1b
+
+	/* We need to wait (at least) 10ms */
+	mov	r0, #0x3b000			// 10.06ms
+	bl	_C_LABEL(gtmr_bootdelay)	// endian-neutral
+
+	/* Restore power clamp */
+	mov	r1, #0
+	mov	r2, #0x4
+	mul	r7, r12, r2
+	add	r7, r7, #AWIN_A31_PRCM_CPUX_PWR_CLAMP_REG
+	str	r1, [r6, r7]
+	dsb
+
+	mov	r2, #0x40
+	mul	r7, r12, r2
+	add	r7, r7, #AWIN_A31_CPUCFG_CPU0_PWR_CLAMP_STATUS_REG
+1:
+	ldr	r1, [r5, r7]
+	cmp	r1, #0
+	bne	1b
+
+	/* We need to wait (at least) 10ms */
+	mov	r0, #0x3b000			// 10.06ms
+	bl	_C_LABEL(gtmr_bootdelay)	// endian-neutral
+	
+	/* Clear power-off gating */
+	ldr	r1, [r6, #AWIN_A31_PRCM_PWROFF_GATING_REG] 
+	mov	r0, #1
+	lsl	r0, r0, r12
+	bic	r1, r1, r0
+	str	r1, [r6, #AWIN_A31_PRCM_PWROFF_GATING_REG]
+	dsb
+
+	/* We need to wait (at least) 10ms */
+	mov	r0, #0x3b000			// 10.06ms
+	bl	_C_LABEL(gtmr_bootdelay)	// endian-neutral
+	
+	/* Bring CPUX out of reset */
+	mov	r1, #(AWIN_A31_CPUCFG_RST_CTRL_CPU_RESET|AWIN_A31_CPUCFG_RST_CTRL_CORE_RESET)
+	mov	r2, #0x40
+	mul	r7, r12, r2
+	add	r7, r7, #AWIN_A31_CPUCFG_CPU0_RST_CTRL_REG
+	str	r1, [r5, r7]
+	dsb
+
+	/* If there is another CPU, start it */
+	add	r12, r12, #1
+	cmp	r12, #3
+	ble	a31_mpinit_cpu
+
+#ifdef __ARMEB__
+	setend	be// we're done with little endian
+#endif
+
+	//
+	// Wait up a second for CPU1-3 to hatch. 
+	//
+	movw	r6, #:lower16:arm_cpu_hatched
+	movt	r6, #:upper16:arm_cpu_hatched
+	mov	r5, #200			// 200 x 5ms
+
+1:	dmb	// memory barrier
+	ldr	r0, [r6]			// load hatched
+	tst	r0, #0xe			// our bits set

CVS commit: src/lib/libm/complex

2014-10-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Oct 11 00:43:51 UTC 2014

Modified Files:
src/lib/libm/complex: csqrtl.c

Log Message:
namespace protection


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libm/complex/csqrtl.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/libm/complex/csqrtl.c
diff -u src/lib/libm/complex/csqrtl.c:1.1 src/lib/libm/complex/csqrtl.c:1.2
--- src/lib/libm/complex/csqrtl.c:1.1	Thu Oct  9 20:48:18 2014
+++ src/lib/libm/complex/csqrtl.c	Fri Oct 10 20:43:51 2014
@@ -28,9 +28,10 @@
 #if 0
 __FBSDID($FreeBSD: head/lib/msun/src/s_csqrtl.c 181402 2008-08-08 00:15:16Z das $);
 #else
-__RCSID($NetBSD: csqrtl.c,v 1.1 2014/10/10 00:48:18 christos Exp $);
+__RCSID($NetBSD: csqrtl.c,v 1.2 2014/10/11 00:43:51 christos Exp $);
 #endif
 
+#include ../src/namespace.h
 #include complex.h
 #include float.h
 #include math.h

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

2014-10-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Oct 11 00:52:44 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: HUMMINGBIRD_A31

Log Message:
dont pull in CUBIEBOARD kernel config since this is quite a bit different from 
the A10/A20 boards


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31

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/evbarm/conf/HUMMINGBIRD_A31
diff -u src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.2 src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.3
--- src/sys/arch/evbarm/conf/HUMMINGBIRD_A31:1.2	Fri Oct 10 17:49:12 2014
+++ src/sys/arch/evbarm/conf/HUMMINGBIRD_A31	Sat Oct 11 00:52:44 2014
@@ -1,29 +1,267 @@
-#	$NetBSD: HUMMINGBIRD_A31,v 1.2 2014/10/10 17:49:12 jmcneill Exp $
+#	$NetBSD: HUMMINGBIRD_A31,v 1.3 2014/10/11 00:52:44 jmcneill Exp $
 #
 #	HUMMINGBIRD_A31 - Merrii Hummingbird A31
 #
 
-include arch/evbarm/conf/CUBIEBOARD
+include	arch/evbarm/conf/std.awin
+
+# estimated number of users
+
+maxusers	32
+
+# Standard system options
+
+options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options 	NTP		# NTP phase/frequency locked loop
+
+# CPU options
 
 no makeoptions	BOARDTYPE
 makeoptions	BOARDTYPE=hummingbird_a31
+#options 	UVMHIST,UVMHIST_PRINT
+options 	CPU_CORTEXA7
 options 	ALLWINNER_A31
-options 	MEMSIZE=1024
+options 	PMAPCOUNTERS
+options 	AWIN_CONSOLE_EARLY
 options 	AWIN_GPIO_IGNORE_FW
 
-no ahcisata*
-no awe0
-no axp20x0
-
-# TODO
-no awinusb0
-no awinusb1
-no awge0
+# Architecture options
 
-#
-# not fully working yet
-#
-# options	MULTIPROCESSOR
-# cpu* at mainbus?
+# File systems
+
+file-system	FFS		# UFS
+#file-system	LFS		# log-structured file system
+file-system	MFS		# memory file system
+file-system	NFS		# Network file system
+#file-system 	ADOSFS		# AmigaDOS-compatible file system
+#file-system 	EXT2FS		# second extended file system (linux)
+#file-system	CD9660		# ISO 9660 + Rock Ridge file system
+file-system	MSDOSFS		# MS-DOS file system
+#file-system	FDESC		# /dev/fd
+file-system	KERNFS		# /kern
+#file-system	NULLFS		# loopback file system
+file-system	PROCFS		# /proc
+#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g  sshfs)
+#file-system	UMAPFS		# NULLFS + uid and gid remapping
+#file-system	UNION		# union file system
+file-system	TMPFS		# memory file system
+file-system	PTYFS		# /dev/pts/N support
+
+# File system options
+#options 	QUOTA		# legacy UFS quotas
+#options 	QUOTA2		# new, in-filesystem UFS quotas
+#options 	FFS_EI		# FFS Endian Independent support
+#options 	NFSSERVER
+options 	WAPBL		# File system journaling support
+#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+
+# Networking options
+
+#options 	GATEWAY		# packet forwarding
+options 	INET		# IP + ICMP + TCP + UDP
+options 	INET6		# IPV6
+#options 	IPSEC		# IP security
+#options 	IPSEC_DEBUG	# debug for IP security
+#options 	MROUTING	# IP multicast routing
+#options 	PIM		# Protocol Independent Multicast
+#options 	NETATALK	# AppleTalk networking
+#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
+#options 	PPP_DEFLATE	# Deflate compression support for PPP
+#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
+#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
+
+options 	NFS_BOOT_BOOTP
+options 	NFS_BOOT_DHCP
+#options		NFS_BOOT_BOOTSTATIC
+#options		NFS_BOOTSTATIC_MYIP=\192.168.1.4\
+#options		NFS_BOOTSTATIC_GWIP=\192.168.1.1\
+#options		NFS_BOOTSTATIC_MASK=\255.255.255.0\
+#options		NFS_BOOTSTATIC_SERVADDR=\192.168.1.1\
+#options		NFS_BOOTSTATIC_SERVER=\192.168.1.1:/nfs/sdp2430\
+
+options		NFS_BOOT_RWSIZE=1024
+
+# Compatibility options
+
+options		COMPAT_NETBSD32	# allow running arm (e.g. non-earm) binaries
+#options 	COMPAT_43	# 4.3BSD compatibility.
+#options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_10	# NetBSD 1.0,
+#options 	COMPAT_11	# NetBSD 1.1,
+#options 	COMPAT_12	# NetBSD 1.2,
+#options 	COMPAT_13	# NetBSD 1.3,
+#options 	COMPAT_14	# NetBSD 1.4,
+#options 	COMPAT_15	# NetBSD 1.5,
+#options 	COMPAT_16	# NetBSD 1.6,
+#options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0,
+options 	COMPAT_40	# NetBSD 4.0,
+options 	COMPAT_50	# NetBSD 5.0,
+options 	COMPAT_60	# NetBSD 6.0, and
+options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
+#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
+#options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+
+# Shared memory options
+
+options 	SYSVMSG		# System V-like message queues
+options 	SYSVSEM		# System V-like semaphores
+options 	SYSVSHM		# System V-like memory sharing
+
+# Device options
+
+#options 	MEMORY_DISK_HOOKS	# boottime setup of ramdisk
+#options 	MEMORY_DISK_ROOT_SIZE=8192	# Size in blocks
+#options 	MEMORY_DISK_DYNAMIC
+#options 	MINIROOTSIZE=1000	# Size in blocks
+#options 	MEMORY_DISK_IS_ROOT	# use memory disk as root
+
+# Wedge support
+options

CVS commit: src/usr.bin/config

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Sat Oct 11 03:17:40 UTC 2014

Modified Files:
src/usr.bin/config: defs.h main.c util.c

Log Message:
Enable debug for tools.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/usr.bin/config/defs.h
cvs rdiff -u -r1.64 -r1.65 src/usr.bin/config/main.c
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/config/util.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/config/defs.h
diff -u src/usr.bin/config/defs.h:1.55 src/usr.bin/config/defs.h:1.56
--- src/usr.bin/config/defs.h:1.55	Fri Oct 10 12:10:02 2014
+++ src/usr.bin/config/defs.h	Sat Oct 11 03:17:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.55 2014/10/10 12:10:02 uebayasi Exp $	*/
+/*	$NetBSD: defs.h,v 1.56 2014/10/11 03:17:40 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -631,15 +631,11 @@ int	onlist(struct nvlist *, void *);
 void	prefix_push(const char *);
 void	prefix_pop(void);
 char	*sourcepath(const char *);
-#ifndef MAKE_BOOTSTRAP
 extern	int dflag;
 #define	CFGDBG(n, ...) \
 	do { if ((dflag) = (n)) cfgdbg(__VA_ARGS__); } while (0)
 void	cfgdbg(const char *, ...)			/* debug info */
  __printflike(1, 2);
-#else
-#define	CFGDBG(n, ...) /* */
-#endif
 void	cfgwarn(const char *, ...)			/* immediate warns */
  __printflike(1, 2);
 void	cfgxwarn(const char *, int, const char *, ...)	/* delayed warns */

Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.64 src/usr.bin/config/main.c:1.65
--- src/usr.bin/config/main.c:1.64	Fri Oct 10 16:17:27 2014
+++ src/usr.bin/config/main.c	Sat Oct 11 03:17:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.64 2014/10/10 16:17:27 uebayasi Exp $	*/
+/*	$NetBSD: main.c,v 1.65 2014/10/11 03:17:40 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -92,8 +92,8 @@ int	yyparse(void);
 
 #ifndef MAKE_BOOTSTRAP
 extern int yydebug;
-int	dflag;
 #endif
+int	dflag;
 
 static struct dlhash *obsopttab;
 static struct hashtab *mkopttab;
@@ -164,12 +164,12 @@ main(int argc, char **argv)
 	while ((ch = getopt(argc, argv, D:LMPU:dgpvb:s:x)) != -1) {
 		switch (ch) {
 
-#ifndef MAKE_BOOTSTRAP
 		case 'd':
+#ifndef MAKE_BOOTSTRAP
 			yydebug = 1;
+#endif
 			dflag++;
 			break;
-#endif
 
 		case 'M':
 			usekobjs = 1;

Index: src/usr.bin/config/util.c
diff -u src/usr.bin/config/util.c:1.17 src/usr.bin/config/util.c:1.18
--- src/usr.bin/config/util.c:1.17	Thu Oct  9 06:45:31 2014
+++ src/usr.bin/config/util.c	Sat Oct 11 03:17:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: util.c,v 1.17 2014/10/09 06:45:31 uebayasi Exp $	*/
+/*	$NetBSD: util.c,v 1.18 2014/10/11 03:17:40 uebayasi Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -57,10 +57,8 @@
 
 static void cfgvxerror(const char *, int, const char *, va_list)
 	 __printflike(3, 0);
-#ifndef MAKE_BOOTSTRAP
 static void cfgvxdbg(const char *, int, const char *, va_list)
 	 __printflike(3, 0);
-#endif
 static void cfgvxwarn(const char *, int, const char *, va_list)
 	 __printflike(3, 0);
 static void cfgvxmsg(const char *, int, const char *, const char *, va_list)
@@ -417,7 +415,6 @@ condexpr_destroy(struct condexpr *expr)
  * Diagnostic messages
  */
 
-#ifndef MAKE_BOOTSTRAP
 void
 cfgdbg(const char *fmt, ...)
 {
@@ -428,7 +425,6 @@ cfgdbg(const char *fmt, ...)
 	cfgvxdbg(yyfile, currentline(), fmt, ap);
 	va_end(ap);
 }
-#endif
 
 void
 cfgwarn(const char *fmt, ...)
@@ -451,13 +447,11 @@ cfgxwarn(const char *file, int line, con
 	va_end(ap);
 }
 
-#ifndef MAKE_BOOTSTRAP
 static void
 cfgvxdbg(const char *file, int line, const char *fmt, va_list ap)
 {
 	cfgvxmsg(file, line, debug: , fmt, ap);
 }
-#endif
 
 static void
 cfgvxwarn(const char *file, int line, const char *fmt, va_list ap)

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

2014-10-10 Thread Masao Uebayashi

Module Name:src
Committed By:   uebayasi
Date:   Sat Oct 11 03:24:19 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: BEAGLEBOARDXM

Log Message:
Don't enable wscons options w/o related devices.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/BEAGLEBOARDXM

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/evbarm/conf/BEAGLEBOARDXM
diff -u src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.18 src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.19
--- src/sys/arch/evbarm/conf/BEAGLEBOARDXM:1.18	Sat Aug 30 15:21:17 2014
+++ src/sys/arch/evbarm/conf/BEAGLEBOARDXM	Sat Oct 11 03:24:19 2014
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: BEAGLEBOARDXM,v 1.18 2014/08/30 15:21:17 kiyohara Exp $
+#	$NetBSD: BEAGLEBOARDXM,v 1.19 2014/10/11 03:24:19 uebayasi Exp $
 #
 #	BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel
 #
@@ -230,15 +230,15 @@ omapwdt32k*	at obio2 addr 0x4903 siz
 
 # various options for wscons - we try to look as much like a standard
 # sun console as possible
-options 	WSEMUL_VT100		# sun terminal emulation
-options 	WS_DEFAULT_FG=WSCOL_BLACK
-options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options		WS_KERNEL_FG=WSCOL_GREEN
-options		WS_KERNEL_BG=WSCOL_LIGHT_WHITE
-options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
-options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
-options 	WSDISPLAY_DEFAULTSCREENS=4
-options		FONT_QVSS8x15
+#options 	WSEMUL_VT100		# sun terminal emulation
+#options 	WS_DEFAULT_FG=WSCOL_BLACK
+#options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+#options		WS_KERNEL_FG=WSCOL_GREEN
+#options		WS_KERNEL_BG=WSCOL_LIGHT_WHITE
+#options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
+#options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
+#options 	WSDISPLAY_DEFAULTSCREENS=4
+#options		FONT_QVSS8x15
 #options 	FONT_GALLANT12x22	# the console font
 
 pseudo-device	wsmux			# mouse  keyboard multiplexor

CVS commit: src/lib/libperfuse

2014-10-10 Thread Emmanuel Dreyfus

Module Name:src
Committed By:   manu
Date:   Sat Oct 11 04:19:38 UTC 2014

Modified Files:
src/lib/libperfuse: ops.c

Log Message:
Report allocated bytes on FS correctly, instead of using file size
(which is wrong for sparse files)


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/lib/libperfuse/ops.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.75 src/lib/libperfuse/ops.c:1.76
--- src/lib/libperfuse/ops.c:1.75	Tue Sep 30 00:06:19 2014
+++ src/lib/libperfuse/ops.c	Sat Oct 11 04:19:38 2014
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.75 2014/09/30 00:06:19 manu Exp $ */
+/*  $NetBSD: ops.c,v 1.76 2014/10/11 04:19:38 manu Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -321,7 +321,7 @@ fuse_attr_to_vap(struct perfuse_state *p
 	vap-va_gen = 0; 
 	vap-va_flags = 0;
 	vap-va_rdev = fa-rdev;
-	vap-va_bytes = fa-size;
+	vap-va_bytes = fa-blocks * S_BLKSIZE;
 	vap-va_filerev = (u_quad_t)PUFFS_VNOVAL;
 	vap-va_vaflags = 0;

CVS commit: src/sys/arch/hp300/stand/mkboot

2014-10-10 Thread David A. Holland

Module Name:src
Committed By:   dholland
Date:   Sat Oct 11 05:33:25 UTC 2014

Modified Files:
src/sys/arch/hp300/stand/mkboot: mkboot.c

Log Message:
PR 49245: Fix broken RCSID (Kamil Rytarowski)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/mkboot/mkboot.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/hp300/stand/mkboot/mkboot.c
diff -u src/sys/arch/hp300/stand/mkboot/mkboot.c:1.10 src/sys/arch/hp300/stand/mkboot/mkboot.c:1.11
--- src/sys/arch/hp300/stand/mkboot/mkboot.c:1.10	Sun Jun 18 05:53:51 2006
+++ src/sys/arch/hp300/stand/mkboot/mkboot.c	Sat Oct 11 05:33:25 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkboot.c,v 1.10 2006/06/18 05:53:51 gdamore Exp $
+/*	$NetBSD: mkboot.c,v 1.11 2014/10/11 05:33:25 dholland Exp $	*/
 
 /*
  * Copyright (c) 1990, 1993
@@ -47,7 +47,7 @@ __COPYRIGHT(
 #ifdef notdef
 static char sccsid[] = @(#)mkboot.c	7.2 (Berkeley) 12/16/90;
 #endif
-__RCSID($NetBSD: mkboot.c,v 1.10 2006/06/18 05:53:51 gdamore Exp $);
+__RCSID($NetBSD: mkboot.c,v 1.11 2014/10/11 05:33:25 dholland Exp $);
 #endif /* not lint */
 
 #include sys/param.h

66 matches

Mail list logo