date:20151220

CVS commit: src/distrib/common

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 22:42:04 UTC 2015

Modified Files:
src/distrib/common: Makefile.bootcd

Log Message:
Use MKREPRO_TIMESTAMP


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/common/Makefile.bootcd

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

Modified files:

Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.33 src/distrib/common/Makefile.bootcd:1.34
--- src/distrib/common/Makefile.bootcd:1.33	Tue Nov 24 19:50:57 2015
+++ src/distrib/common/Makefile.bootcd	Sun Dec 20 17:42:04 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.33 2015/11/25 00:50:57 christos Exp $
+#	$NetBSD: Makefile.bootcd,v 1.34 2015/12/20 22:42:04 christos Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -74,8 +74,8 @@ _CDMAKEFSOPTIONS=	rockridge,label=${ISO_
 _CDMAKEFSOPTIONS=	rockridge,label=${ISO_VOLID},publisher=${PUBLISHER}
 .endif
 
-.if ${MKREPRO:Uno} == "yes"
-TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/param.h
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
 .endif
 
 .if ${MKUNPRIVED} == "no"
@@ -285,7 +285,7 @@ image:
 .endif
 	if [ -s ${WORKSPEC} ]; then specarg="-F ${WORKSPEC}"; fi;	\
 	${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 $${specarg} 	\
-		${TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+		${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
 
 .if ${CDRELEASE} == false
 release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post

CVS commit: src/usr.bin/make

2015-12-20 Thread Simon J. Gerraty

Module Name:src
Committed By:   sjg
Date:   Sun Dec 20 22:44:10 UTC 2015

Modified Files:
src/usr.bin/make: suff.c

Log Message:
Suff_ClearSuffixes() needs to re-initialize suffNull,
otherwise its children retain old suffixes.
Have Suff_Init() call Suff_ClearSuffixes() for consistency.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/usr.bin/make/suff.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/make/suff.c
diff -u src/usr.bin/make/suff.c:1.74 src/usr.bin/make/suff.c:1.75
--- src/usr.bin/make/suff.c:1.74	Sun Oct 11 04:51:24 2015
+++ src/usr.bin/make/suff.c	Sun Dec 20 22:44:10 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -553,7 +553,20 @@ Suff_ClearSuffixes(void)
 #endif
 sufflist = Lst_Init(FALSE);
 sNum = 0;
-suffNull = emptySuff;
+if (suffNull)
+	SuffFree(suffNull);
+emptySuff = suffNull = bmake_malloc(sizeof(Suff));
+
+suffNull->name =   	bmake_strdup("");
+suffNull->nameLen = 0;
+suffNull->searchPath =  Lst_Init(FALSE);
+Dir_Concat(suffNull->searchPath, dirSearchPath);
+suffNull->children =Lst_Init(FALSE);
+suffNull->parents =	Lst_Init(FALSE);
+suffNull->ref =	Lst_Init(FALSE);
+suffNull->sNum =   	sNum++;
+suffNull->flags =  	SUFF_NULL;
+suffNull->refCount =1;
 }
 
 /*-
@@ -2524,32 +2537,18 @@ Suff_SetNull(char *name)
 void
 Suff_Init(void)
 {
-sufflist = Lst_Init(FALSE);
 #ifdef CLEANUP
 suffClean = Lst_Init(FALSE);
 #endif
 srclist = Lst_Init(FALSE);
 transforms = Lst_Init(FALSE);
 
-sNum = 0;
 /*
  * Create null suffix for single-suffix rules (POSIX). The thing doesn't
  * actually go on the suffix list or everyone will think that's its
  * suffix.
  */
-emptySuff = suffNull = bmake_malloc(sizeof(Suff));
-
-suffNull->name =   	bmake_strdup("");
-suffNull->nameLen = 0;
-suffNull->searchPath =  Lst_Init(FALSE);
-Dir_Concat(suffNull->searchPath, dirSearchPath);
-suffNull->children =Lst_Init(FALSE);
-suffNull->parents =	Lst_Init(FALSE);
-suffNull->ref =	Lst_Init(FALSE);
-suffNull->sNum =   	sNum++;
-suffNull->flags =  	SUFF_NULL;
-suffNull->refCount =1;
-
+Suff_ClearSuffixes();
 }

CVS commit: src/sys/arch

2015-12-20 Thread Marty Fouts

Module Name:src
Committed By:   marty
Date:   Mon Dec 21 04:58:50 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: exynos_chipid.c exynos_combiner.c
exynos_gpio.c exynos_i2c.c exynos_pinctrl.c exynos_rtc.c
exynos_soc.c exynos_usb.c exynos_wdt.c files.exynos
src/sys/arch/evbarm/conf: EXYNOS
src/sys/arch/evbarm/exynos: exynos_machdep.c
Removed Files:
src/sys/arch/arm/samsung: exynos4_loc.c exynos4_reg.h exynos5_loc.c
exynos_dma.c exynos_io.c exynos_io.h exynos_space.c

Log Message:
XU4 FDT final checkpoint

step N of N: get rid of baggage by removing whole files.  What's left is in
approximately the same shape as when the FDT update started, that is mostly
broken. What's missing is most of the 76 devices recognized in the dtd. In
other words, This is barely the start of a port.

Next up, gpio then i2c, followed either by straightening out usb or getting
the sdhc driver to work -- both probably require getting the interrupt
combiner to work first. A large chunk of work is left to do on the clocks.
I barely got them attaching to fdt and didn't do anything to take advantage
of the information in the dtd.

None of the other existing drivers, such as they are, properly request gpios,
i2c or clocks, and, of course power domains are off the table.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r0 src/sys/arch/arm/samsung/exynos4_loc.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/arm/samsung/exynos4_reg.h \
src/sys/arch/arm/samsung/exynos5_loc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos_chipid.c \
src/sys/arch/arm/samsung/exynos_combiner.c \
src/sys/arch/arm/samsung/exynos_rtc.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/samsung/exynos_dma.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/samsung/exynos_gpio.c \
src/sys/arch/arm/samsung/exynos_usb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/samsung/exynos_i2c.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/arm/samsung/exynos_io.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/arm/samsung/exynos_io.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos_pinctrl.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/samsung/exynos_soc.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/samsung/exynos_space.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/samsung/exynos_wdt.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/EXYNOS
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/exynos/exynos_machdep.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/samsung/exynos_chipid.c
diff -u src/sys/arch/arm/samsung/exynos_chipid.c:1.1 src/sys/arch/arm/samsung/exynos_chipid.c:1.2
--- src/sys/arch/arm/samsung/exynos_chipid.c:1.1	Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_chipid.c	Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_chipid.c,v 1.1 2015/12/21 00:52:50 marty Exp $ */
+/*	$NetBSD: exynos_chipid.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
 
 /*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "gpio.h"
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exynos_chipid.c,v 1.1 2015/12/21 00:52:50 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_chipid.c,v 1.2 2015/12/21 04:58:50 marty Exp $");
 
 #include 
 #include 
@@ -47,7 +47,6 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_chipi
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
Index: src/sys/arch/arm/samsung/exynos_combiner.c
diff -u src/sys/arch/arm/samsung/exynos_combiner.c:1.1 src/sys/arch/arm/samsung/exynos_combiner.c:1.2
--- src/sys/arch/arm/samsung/exynos_combiner.c:1.1	Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_combiner.c	Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_combiner.c,v 1.1 2015/12/21 00:52:50 marty Exp $ */
+/*	$NetBSD: exynos_combiner.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
 
 /*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "gpio.h"
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.1 2015/12/21 00:52:50 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.2 2015/12/21 04:58:50 marty Exp $");
 
 #include 
 #include 
@@ -46,7 +46,6 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_combi
 #include 
 
 #include 
-#include 
 #include 
 
 #include 
Index: src/sys/arch/arm/samsung/exynos_rtc.c
diff -u src/sys/arch/arm/samsung/exynos_rtc.c:1.1 src/sys/arch/arm/samsung/exynos_rtc.c:1.2
--- src/sys/arch/arm/samsung/exynos_rtc.c:1.1	Mon Dec 21 00:52:50 2015
+++ src/sys/arch/arm/samsung/exynos_rtc.c	Mon Dec 21 04:58:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_rtc.c,v 1.1 2015/12/21 00:52:50 marty Exp $ */
+/*	$NetBSD: exynos_rtc.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
 
 /*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "gpio.h"
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exynos_rtc.c,v 1.1 2015/12/21 00:52:50

CVS commit: src/usr.sbin/makefs

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 21 00:58:08 UTC 2015

Modified Files:
src/usr.sbin/makefs: ffs.c
src/usr.sbin/makefs/ffs: mkfs.c newfs_extern.h

Log Message:
more deterministic ffs for reproducible builds.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/usr.sbin/makefs/ffs.c
cvs rdiff -u -r1.32 -r1.33 src/usr.sbin/makefs/ffs/mkfs.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makefs/ffs/newfs_extern.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.sbin/makefs/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.65 src/usr.sbin/makefs/ffs.c:1.66
--- src/usr.sbin/makefs/ffs.c:1.65	Sun Dec 20 17:54:44 2015
+++ src/usr.sbin/makefs/ffs.c	Sun Dec 20 19:58:08 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.c,v 1.65 2015/12/20 22:54:44 christos Exp $	*/
+/*	$NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.65 2015/12/20 22:54:44 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $");
 #endif	/* !__lint */
 
 #include 
@@ -466,6 +466,7 @@ ffs_create_image(const char *image, fsin
 	char	*buf;
 	int	i, bufsize;
 	off_t	bufrem;
+	time_t	tstamp;
 	int	oflags = O_RDWR | O_CREAT;
 
 	assert (image != NULL);
@@ -530,7 +531,15 @@ ffs_create_image(const char *image, fsin
 		/* make the file system */
 	if (debug & DEBUG_FS_CREATE_IMAGE)
 		printf("calling mkfs(\"%s\", ...)\n", image);
-	fs = ffs_mkfs(image, fsopts);
+
+	if (stampst.st_ino == 1)
+		tstamp = stampst.st_ctime;
+	else
+		tstamp = start_time.tv_sec;
+
+	srandom(tstamp);
+
+	fs = ffs_mkfs(image, fsopts, tstamp);
 	fsopts->superblock = (void *)fs;
 	if (debug & DEBUG_FS_CREATE_IMAGE) {
 		time_t t;
@@ -,7 +1120,6 @@ ffs_write_inode(union dinode *dp, uint32
 	initediblk < ufs_rw32(cgp->cg_niblk, fsopts->needswap)) {
 		memset(buf, 0, fs->fs_bsize);
 		dip = (struct ufs2_dinode *)buf;
-		srandom(time(NULL));
 		for (i = 0; i < FFS_INOPB(fs); i++) {
 			dip->di_gen = random() / 2 + 1;
 			dip++;

Index: src/usr.sbin/makefs/ffs/mkfs.c
diff -u src/usr.sbin/makefs/ffs/mkfs.c:1.32 src/usr.sbin/makefs/ffs/mkfs.c:1.33
--- src/usr.sbin/makefs/ffs/mkfs.c:1.32	Sat Oct 19 13:16:37 2013
+++ src/usr.sbin/makefs/ffs/mkfs.c	Sun Dec 20 19:58:08 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: mkfs.c,v 1.32 2013/10/19 17:16:37 christos Exp $	*/
+/*	$NetBSD: mkfs.c,v 1.33 2015/12/21 00:58:08 christos Exp $	*/
 
 /*
  * Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -48,7 +48,7 @@
 static char sccsid[] = "@(#)mkfs.c	8.11 (Berkeley) 5/3/95";
 #else
 #ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.32 2013/10/19 17:16:37 christos Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.33 2015/12/21 00:58:08 christos Exp $");
 #endif
 #endif
 #endif /* not lint */
@@ -122,7 +122,7 @@ static int avgfilesize;	   /* expect
 static int avgfpdir;	   /* expected number of files per directory */
 
 struct fs *
-ffs_mkfs(const char *fsys, const fsinfo_t *fsopts)
+ffs_mkfs(const char *fsys, const fsinfo_t *fsopts, time_t tstamp)
 {
 	int fragsperinode, optimalfpg, origdensity, minfpg, lastminfpg;
 	int32_t cylno, i, csfrags;
@@ -445,7 +445,7 @@ ffs_mkfs(const char *fsys, const fsinfo_
 	sblock.fs_state = 0;
 	sblock.fs_clean = FS_ISCLEAN;
 	sblock.fs_ronly = 0;
-	sblock.fs_id[0] = start_time.tv_sec;
+	sblock.fs_id[0] = tstamp;
 	sblock.fs_id[1] = random();
 	sblock.fs_fsmnt[0] = '\0';
 	csfrags = howmany(sblock.fs_cssize, sblock.fs_fsize);
@@ -461,9 +461,9 @@ ffs_mkfs(const char *fsys, const fsinfo_
 	sblock.fs_cstotal.cs_nifree = sblock.fs_ncg * sblock.fs_ipg - UFS_ROOTINO;
 	sblock.fs_cstotal.cs_ndir = 0;
 	sblock.fs_dsize -= csfrags;
-	sblock.fs_time = start_time.tv_sec;
+	sblock.fs_time = tstamp;
 	if (Oflag <= 1) {
-		sblock.fs_old_time = start_time.tv_sec;
+		sblock.fs_old_time = tstamp;
 		sblock.fs_old_dsize = sblock.fs_dsize;
 		sblock.fs_old_csaddr = sblock.fs_csaddr;
 		sblock.fs_old_cstotal.cs_ndir = sblock.fs_cstotal.cs_ndir;
@@ -515,7 +515,7 @@ ffs_mkfs(const char *fsys, const fsinfo_
 
 	printf("super-block backups (for fsck -b #) at:");
 	for (cylno = 0; cylno < sblock.fs_ncg; cylno++) {
-		initcg(cylno, start_time.tv_sec, fsopts);
+		initcg(cylno, tstamp, fsopts);
 		if (cylno % nprintcols == 0)
 			printf("\n");
 		printf(" %*lld,", printcolwidth,
@@ -528,7 +528,7 @@ ffs_mkfs(const char *fsys, const fsinfo_
 	 * Now construct the initial file system,
 	 * then write out the super-block.
 	 */
-	sblock.fs_time = start_time.tv_sec;
+	sblock.fs_time = tstamp;
 	if (Oflag <= 1) {
 		sblock.fs_old_cstotal.cs_ndir = sblock.fs_cstotal.cs_ndir;
 		sblock.fs_old_cstotal.cs_nbfree = sblock.fs_cstotal.cs_nbfree;

Index: src/usr.sbin/makefs/ffs/newfs_extern.h
diff -u src/usr.sbin/makefs/ffs/newfs_extern.h:1.3 src/usr.sbin/makefs/ffs/newfs_extern.h:1.4
---

CVS commit: src/usr.sbin/makefs

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Mon Dec 21 03:19:17 UTC 2015

Modified Files:
src/usr.sbin/makefs: cd9660.c

Log Message:
Fix some more MKREPRO issues in cdrom creation. Now amd64 passes MKREPRO.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.sbin/makefs/cd9660.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.sbin/makefs/cd9660.c
diff -u src/usr.sbin/makefs/cd9660.c:1.50 src/usr.sbin/makefs/cd9660.c:1.51
--- src/usr.sbin/makefs/cd9660.c:1.50	Tue Nov 24 19:48:49 2015
+++ src/usr.sbin/makefs/cd9660.c	Sun Dec 20 22:19:17 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660.c,v 1.50 2015/11/25 00:48:49 christos Exp $	*/
+/*	$NetBSD: cd9660.c,v 1.51 2015/12/21 03:19:17 christos Exp $	*/
 
 /*
  * Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -103,7 +103,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660.c,v 1.50 2015/11/25 00:48:49 christos Exp $");
+__RCSID("$NetBSD: cd9660.c,v 1.51 2015/12/21 03:19:17 christos Exp $");
 #endif  /* !__lint */
 
 #include 
@@ -483,7 +483,7 @@ cd9660_parse_opts(const char *option, fs
  */
 void
 cd9660_makefs(const char *image, const char *dir, fsnode *root,
-	  fsinfo_t *fsopts)
+fsinfo_t *fsopts)
 {
 	int64_t startoffset;
 	int numDirectories;
@@ -661,7 +661,7 @@ typedef int (*cd9660node_func)(cd9660nod
 static void
 cd9660_finalize_PVD(iso9660_disk *diskStructure)
 {
-	time_t tim;
+	time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL);
 
 	/* root should be a fixed size of 34 bytes since it has no name */
 	memcpy(diskStructure->primaryDescriptor.root_directory_record,
@@ -710,23 +710,23 @@ cd9660_finalize_PVD(iso9660_disk *diskSt
 		diskStructure->primaryDescriptor.bibliographic_file_id, 37);
 
 	/* Setup dates */
-	time();
 	cd9660_time_8426(
 	(unsigned char *)diskStructure->primaryDescriptor.creation_date,
-	tim);
+	tstamp);
 	cd9660_time_8426(
 	(unsigned char *)diskStructure->primaryDescriptor.modification_date,
-	tim);
+	tstamp);
 
-	/*
-	cd9660_set_date(diskStructure->primaryDescriptor.expiration_date, now);
-	*/
+#if 0
+	cd9660_set_date(diskStructure->primaryDescriptor.expiration_date,
+	tstamp);
+#endif
 	memset(diskStructure->primaryDescriptor.expiration_date, '0' ,16);
 	diskStructure->primaryDescriptor.expiration_date[16] = 0;
 
 	cd9660_time_8426(
 	(unsigned char *)diskStructure->primaryDescriptor.effective_date,
-	tim);
+	tstamp);
 }
 
 static void
@@ -821,7 +821,7 @@ cd9660_fill_extended_attribute_record(cd
 static int
 cd9660_translate_node_common(iso9660_disk *diskStructure, cd9660node *newnode)
 {
-	time_t tim;
+	time_t tstamp = stampst.st_ino ? stampst.st_mtime : time(NULL);
 	u_char flag;
 	char temp[ISO_FILENAME_MAXLENGTH_WITH_PADDING];
 
@@ -841,9 +841,8 @@ cd9660_translate_node_common(iso9660_dis
 	/* Set the various dates */
 
 	/* If we want to use the current date and time */
-	time();
 
-	cd9660_time_915(newnode->isoDirRecord->date, tim);
+	cd9660_time_915(newnode->isoDirRecord->date, tstamp);
 
 	cd9660_bothendian_dword(newnode->fileDataLength,
 	newnode->isoDirRecord->size);
@@ -883,7 +882,8 @@ cd9660_translate_node(iso9660_disk *disk
 		return 0;
 
 	/* Finally, overwrite some of the values that are set by default */
-	cd9660_time_915(newnode->isoDirRecord->date, node->inode->st.st_mtime);
+	cd9660_time_915(newnode->isoDirRecord->date,
+	stampst.st_ino ? stampst.st_mtime : node->inode->st.st_mtime);
 
 	return 1;
 }

CVS commit: src/sys/arch

2015-12-20 Thread Marty Fouts

Module Name:src
Committed By:   marty
Date:   Mon Dec 21 00:52:51 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: exynos_i2c.c files.exynos
src/sys/arch/evbarm/conf: EXYNOS
Added Files:
src/sys/arch/arm/samsung: exynos_chipid.c exynos_combiner.c
exynos_rtc.c

Log Message:
XU4 FDT checkpoint

It is rather amazing that XU4 gets as far as it does, given how much of this
code simply doesn't work.  Focusing now on getting everything converted to
FDT. Next up USB and clocks.  After that nuke everything that's not needed
and start the port in earnest.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/samsung/exynos_chipid.c \
src/sys/arch/arm/samsung/exynos_combiner.c \
src/sys/arch/arm/samsung/exynos_rtc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/samsung/exynos_i2c.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/EXYNOS

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/samsung/exynos_i2c.c
diff -u src/sys/arch/arm/samsung/exynos_i2c.c:1.4 src/sys/arch/arm/samsung/exynos_i2c.c:1.5
--- src/sys/arch/arm/samsung/exynos_i2c.c:1.4	Fri Dec 11 04:03:44 2015
+++ src/sys/arch/arm/samsung/exynos_i2c.c	Mon Dec 21 00:52:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_i2c.c,v 1.4 2015/12/11 04:03:44 marty Exp $ */
+/*	$NetBSD: exynos_i2c.c,v 1.5 2015/12/21 00:52:50 marty Exp $ */
 
 /*
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,14 +30,12 @@
  *
  */
 
-
 #include "opt_exynos.h"
 #include "opt_arm_debug.h"
 #include "exynos_iic.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.4 2015/12/11 04:03:44 marty Exp $");
-
+__KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c,v 1.5 2015/12/21 00:52:50 marty Exp $");
 
 #include 
 #include 
@@ -56,342 +54,256 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_i2c.c
 #include 
 #include 
 
+#include 
 
-struct exynos_iic_dev_softc {
-	int			isc_bus;
-	bool			isc_isgpio;
-
-	bus_space_tag_t		isc_bst;
-	bus_space_handle_t	isc_bsh;
-
-	struct exynos_gpio_pinset  isc_pinset;
-	struct exynos_gpio_pindata isc_sda;
-	struct exynos_gpio_pindata isc_slc;
-	bool			isc_sda_is_output;
-
-	kmutex_t		isc_buslock;
-	struct i2c_controller 	isc_i2cbus;
+struct exynos_i2c_softc {
+	device_t		sc_dev;
+	bus_space_tag_t		sc_bst;
+	bus_space_handle_t	sc_bsh;
+	void *			sc_ih;
+	u_int			sc_port;
+
+	struct fdtbus_gpio_pin  sc_sda;
+	struct fdtbus_gpio_pin  sc_slc;
+	bool			sc_sda_is_output;
+	struct i2c_controller 	sc_ic;
+	kmutex_t		sc_lock;
+	kcondvar_t		sc_cv;
+	device_t		sc_i2cdev;
 };
 
+static u_int i2c_port;
 
-#if NEXYNOS_IIC > 0
-static int	exynos_iic_acquire_bus(void *, int);
-static void	exynos_iic_release_bus(void *, int);
-
-static int	exynos_iic_send_start(void *, int);
-static int	exynos_iic_send_stop(void *, int);
-static int	exynos_iic_initiate_xfer(void *, i2c_addr_t, int);
-static int	exynos_iic_read_byte(void *, uint8_t *, int);
-static int	exynos_iic_write_byte(void *, uint8_t , int);
-
-static bool exynos_iic_attach_i2cbus(struct exynos_iic_dev_softc *,
-	struct i2c_controller *, struct exyo_locators const *);
-#endif
-
-
-struct i2c_controller *exynos_i2cbus[EXYNOS_MAX_IIC_BUSSES];
-static int exynos_iic_match(device_t, cfdata_t, void *);
-static void exynos_iic_attach(device_t, device_t, void *);
+static int	exynos_i2c_intr(void *);
 
-struct exynos_iic_softc {
-	device_t		sc_dev;
+static int	exynos_i2c_acquire_bus(void *, int);
+static void	exynos_i2c_release_bus(void *, int);
 
-	struct exynos_iic_dev_softc sc_idevs[EXYNOS_MAX_IIC_BUSSES];
-	struct i2c_controller   sc_i2cbus[EXYNOS_MAX_IIC_BUSSES];
-} exynos_iic_sc;
+static int	exynos_i2c_send_start(void *, int);
+static int	exynos_i2c_send_stop(void *, int);
+static int	exynos_i2c_initiate_xfer(void *, i2c_addr_t, int);
+static int	exynos_i2c_read_byte(void *, uint8_t *, int);
+static int	exynos_i2c_write_byte(void *, uint8_t , int);
 
+static bool exynos_i2c_attach_i2cbus(struct exynos_i2c_softc *,
+ struct i2c_controller *);
 
-CFATTACH_DECL_NEW(exynos_iic, sizeof(struct exynos_iic_softc),
-exynos_iic_match, exynos_iic_attach, NULL, NULL);
+static int exynos_i2c_match(device_t, cfdata_t, void *);
+static void exynos_i2c_attach(device_t, device_t, void *);
 
+CFATTACH_DECL_NEW(exynos_i2c, sizeof(struct exynos_i2c_softc),
+exynos_i2c_match, exynos_i2c_attach, NULL, NULL);
 
 static int
-exynos_iic_match(device_t self, cfdata_t cf, void *aux)
+exynos_i2c_match(device_t self, cfdata_t cf, void *aux)
 {
-#ifdef DIAGNOSTIC
-	struct exyo_attach_args *exyoaa = aux;
-	struct exyo_locators *loc = >exyo_loc;
-#endif
-	int i;
-
-	/* no locators expected */
-	KASSERT(loc->loc_offset == 0);
-	KASSERT(loc->loc_size   == 0);
-	KASSERT(loc->loc_port   == EXYOCF_PORT_DEFAULT);
+	const char * const compatible[] = { "samsung,s3c2440-i2c", NULL };
+	struct fdt_attach_args *

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

2015-12-20 Thread Marty Fouts

Module Name:src
Committed By:   marty
Date:   Mon Dec 21 00:54:35 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: exynos_pinctrl.c exynos_sscom.c mct.c
mct_var.h

Log Message:
XU4 FDT missed files


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos_pinctrl.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/samsung/exynos_sscom.c \
src/sys/arch/arm/samsung/mct.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/samsung/mct_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/samsung/exynos_pinctrl.c
diff -u src/sys/arch/arm/samsung/exynos_pinctrl.c:1.1 src/sys/arch/arm/samsung/exynos_pinctrl.c:1.2
--- src/sys/arch/arm/samsung/exynos_pinctrl.c:1.1	Sat Dec 19 21:42:31 2015
+++ src/sys/arch/arm/samsung/exynos_pinctrl.c	Mon Dec 21 00:54:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_pinctrl.c,v 1.1 2015/12/19 21:42:31 marty Exp $ */
+/*	$NetBSD: exynos_pinctrl.c,v 1.2 2015/12/21 00:54:35 marty Exp $ */
 
 /*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "gpio.h"
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.1 2015/12/19 21:42:31 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.2 2015/12/21 00:54:35 marty Exp $");
 
 #include 
 #include 
@@ -84,7 +84,7 @@ exynos_pinctrl_attach(device_t parent, d
 		return;
 	}
 
-	printf(" pinctl @ 0x%08x\n", (uint)addr);
+	aprint_normal(" pinctl @ 0x%08x", (uint)addr);
 	sc->sc_dev = self;
 	sc->sc_bst = faa->faa_bst;
 	error = bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh);

Index: src/sys/arch/arm/samsung/exynos_sscom.c
diff -u src/sys/arch/arm/samsung/exynos_sscom.c:1.6 src/sys/arch/arm/samsung/exynos_sscom.c:1.7
--- src/sys/arch/arm/samsung/exynos_sscom.c:1.6	Thu Dec 17 22:39:37 2015
+++ src/sys/arch/arm/samsung/exynos_sscom.c	Mon Dec 21 00:54:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_sscom.c,v 1.6 2015/12/17 22:39:37 marty Exp $ */
+/*	$NetBSD: exynos_sscom.c,v 1.7 2015/12/21 00:54:35 marty Exp $ */
 
 /*
  * Copyright (c) 2014 Reinoud Zandijk
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exynos_sscom.c,v 1.6 2015/12/17 22:39:37 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_sscom.c,v 1.7 2015/12/21 00:54:35 marty Exp $");
 
 #include "opt_sscom.h"
 #include "opt_ddb.h"
@@ -190,10 +190,10 @@ sscom_attach(device_t parent, device_t s
 		}
 		sc->sc_ioh = bsh;
 	} else {
-		printf(" (console) ");
+		aprint_normal(" (console) ");
 	}
 
-	printf("\n");
+	aprint_normal("\n");
 
 #if 0
 	void *ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_SERIAL,
Index: src/sys/arch/arm/samsung/mct.c
diff -u src/sys/arch/arm/samsung/mct.c:1.6 src/sys/arch/arm/samsung/mct.c:1.7
--- src/sys/arch/arm/samsung/mct.c:1.6	Fri Dec 11 04:03:44 2015
+++ src/sys/arch/arm/samsung/mct.c	Mon Dec 21 00:54:35 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: mct.c,v 1.6 2015/12/11 04:03:44 marty Exp $	*/
+/*	$NetBSD: mct.c,v 1.7 2015/12/21 00:54:35 marty Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.6 2015/12/11 04:03:44 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.7 2015/12/21 00:54:35 marty Exp $");
 
 #include 
 #include 
@@ -49,6 +49,7 @@ __KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.6 
 #include 
 #include 
 
+#include 
 
 static int  mct_match(device_t, cfdata_t, void *);
 static void mct_attach(device_t, device_t, void *);
@@ -132,52 +133,45 @@ mct_write_global(struct mct_softc *sc, b
 static int
 mct_match(device_t parent, cfdata_t cf, void *aux)
 {
-	/* not used if Generic Timer is Available */
-	if (armreg_pfr1_read() & ARM_PFR1_GTIMER_MASK)
-		return 0;
-
-	/* sanity check, something is mixed up! */
-	if (!device_is_a(parent, "exyo"))
-		return 1;
-
-	/* there can only be one */
-	if (mct_sc.sc_dev != NULL)
-		return 0;
+	const char * const compatible[] = { "samsung,exynos4210-mct",
+	NULL };
 
-	return 1;
+	struct fdt_attach_args * const faa = aux;
+	return of_match_compatible(faa->faa_phandle, compatible);
 }
 
 
 static void
 mct_attach(device_t parent, device_t self, void *aux)
 {
-	struct exyo_attach_args *exyo = (struct exyo_attach_args *) aux;
 	struct mct_softc * const sc = _sc;
-	prop_dictionary_t dict = device_properties(self);
-	char freqbuf[sizeof("XXX SHz")];
-	const char *pin_name;
+//	prop_dictionary_t dict = device_properties(self);
+//	char freqbuf[sizeof("XXX SHz")];
+	struct fdt_attach_args * const faa = aux;
+	bus_addr_t addr;
+	bus_size_t size;
+	int error;
+
+	if (fdtbus_get_reg(faa->faa_phandle, 0, , ) != 0) {
+		aprint_error(": couldn't get registers\n");
+		return;
+	}
 
 	self->dv_private = sc;
 	sc->sc_dev = self;
-	sc->sc_bst = exyo->exyo_core_bst;
-	sc->sc_irq = exyo->exyo_loc.loc_intr;
-
-	bus_space_subregion(sc->sc_bst, exyo->exyo_core_bsh,
-		exyo->exyo_loc.loc_offset, exyo->exyo_loc.loc_size, >sc_bsh);
-
-

CVS commit: src/sys/arch

2015-12-20 Thread Marty Fouts

Module Name:src
Committed By:   marty
Date:   Mon Dec 21 03:34:34 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: exynos5422_clock.c exynos_usb.c files.exynos
src/sys/arch/evbarm/conf: EXYNOS

Log Message:
XU4 FDT Last drivers converted

There is a minimum conversion on the clock driver.

The USB driver needs reordering and is broken, but it was broken before.

Next up: tactical nuclear weapons


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/samsung/exynos5422_clock.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/samsung/exynos_usb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/EXYNOS

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/samsung/exynos5422_clock.c
diff -u src/sys/arch/arm/samsung/exynos5422_clock.c:1.2 src/sys/arch/arm/samsung/exynos5422_clock.c:1.3
--- src/sys/arch/arm/samsung/exynos5422_clock.c:1.2	Sat Dec  5 18:29:22 2015
+++ src/sys/arch/arm/samsung/exynos5422_clock.c	Mon Dec 21 03:34:34 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos5422_clock.c,v 1.2 2015/12/05 18:29:22 jmcneill Exp $ */
+/* $NetBSD: exynos5422_clock.c,v 1.3 2015/12/21 03:34:34 marty Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.2 2015/12/05 18:29:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.3 2015/12/21 03:34:34 marty Exp $");
 
 #include 
 #include 
@@ -45,6 +45,8 @@ __KERNEL_RCSID(0, "$NetBSD: exynos5422_c
 #include 
 #include 
 
+#include 
+
 static struct clk *exynos5422_clock_get(void *, const char *);
 static void	exynos5422_clock_put(void *, struct clk *);
 static u_int	exynos5422_clock_get_rate(void *, struct clk *);
@@ -243,20 +245,35 @@ CFATTACH_DECL_NEW(exynos5422_clock, size
 static int
 exynos5422_clock_match(device_t parent, cfdata_t cf, void *aux)
 {
-	return IS_EXYNOS5422_P();
+	const char * const compatible[] = { "samsung,exynos5422-clock",
+	NULL };
+	struct fdt_attach_args * const faa = aux;
+	return of_match_compatible(faa->faa_phandle, compatible);
 }
 
 static void
 exynos5422_clock_attach(device_t parent, device_t self, void *aux)
 {
 	struct exynos5422_clock_softc * const sc = device_private(self);
-	struct exyo_attach_args * const exyo = aux;
-	const struct exyo_locators *loc = >exyo_loc;
+	struct fdt_attach_args * const faa = aux;
+	bus_addr_t addr;
+	bus_size_t size;
+	int error;
+
+	if (fdtbus_get_reg(faa->faa_phandle, 0, , ) != 0) {
+		aprint_error(": couldn't get registers\n");
+		return;
+	}
 
 	sc->sc_dev = self;
-	sc->sc_bst = exyo->exyo_core_bst;
-	bus_space_subregion(exyo->exyo_core_bst, exyo->exyo_core_bsh,
-	loc->loc_offset, loc->loc_size, >sc_bsh);
+	sc->sc_bst = faa->faa_bst;
+	
+	error = bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh);
+	if (error) {
+		aprint_error(": couldn't map %#llx: %d",
+			 (uint64_t)addr, error);
+		return;
+	}
 
 	aprint_naive("\n");
 	aprint_normal(": Exynos5422 Clock Controller\n");

Index: src/sys/arch/arm/samsung/exynos_usb.c
diff -u src/sys/arch/arm/samsung/exynos_usb.c:1.13 src/sys/arch/arm/samsung/exynos_usb.c:1.14
--- src/sys/arch/arm/samsung/exynos_usb.c:1.13	Tue Sep 30 14:23:41 2014
+++ src/sys/arch/arm/samsung/exynos_usb.c	Mon Dec 21 03:34:34 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_usb.c,v 1.13 2014/09/30 14:23:41 reinoud Exp $	*/
+/*	$NetBSD: exynos_usb.c,v 1.14 2015/12/21 03:34:34 marty Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.13 2014/09/30 14:23:41 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_usb.c,v 1.14 2015/12/21 03:34:34 marty Exp $");
 
 #include 
 #include 
@@ -67,6 +67,8 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_usb.c
 #include 
 #include 
 
+#include 
+
 struct exynos_usb_softc {
 	device_t	 sc_self;
 
@@ -74,6 +76,7 @@ struct exynos_usb_softc {
 	bus_dma_tag_t	 sc_dmat;
 	bus_space_tag_t  sc_bst;
 
+	bus_space_handle_t sc_bsh;
 	bus_space_handle_t sc_ehci_bsh;
 	bus_space_handle_t sc_ohci_bsh;
 	bus_space_handle_t sc_usb2phy_bsh;
@@ -92,7 +95,7 @@ struct exynos_usb_attach_args {
 
 
 /* forwards */
-static int exynos_usb_intr(void *arg);
+//static int exynos_usb_intr(void *arg);
 
 
 static int	exynos_usb_match(device_t, cfdata_t, void *);
@@ -105,11 +108,10 @@ CFATTACH_DECL_NEW(exyo_usb, 0,
 static int
 exynos_usb_match(device_t parent, cfdata_t cf, void *aux)
 {
-	/* there can only be one */
-	if (exynos_usb_sc.sc_self)
-		return 0;
-
-	return 1;
+	const char * const compatible[] = { "samsung,exynos5-dwusb3",
+	NULL };
+	struct fdt_attach_args * const faa = aux;
+	return of_match_compatible(faa->faa_phandle, compatible);
 }
 
 
@@ -117,76 +119,44 @@ static void
 exynos_usb_attach(device_t parent, device_t

CVS commit: src/usr.sbin/makefs

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 22:54:44 UTC 2015

Modified Files:
src/usr.sbin/makefs: ffs.c

Log Message:
Add timestamp support to the ffs image creation; needed for in kernel memory
images MKREPRO.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/usr.sbin/makefs/ffs.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.sbin/makefs/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.64 src/usr.sbin/makefs/ffs.c:1.65
--- src/usr.sbin/makefs/ffs.c:1.64	Mon Jan 12 14:50:25 2015
+++ src/usr.sbin/makefs/ffs.c	Sun Dec 20 17:54:44 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs.c,v 1.64 2015/01/12 19:50:25 christos Exp $	*/
+/*	$NetBSD: ffs.c,v 1.65 2015/12/20 22:54:44 christos Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
 
 #include 
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.64 2015/01/12 19:50:25 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.65 2015/12/20 22:54:44 christos Exp $");
 #endif	/* !__lint */
 
 #include 
@@ -637,19 +637,12 @@ ffs_build_dinode1(struct ufs1_dinode *di
 {
 	size_t slen;
 	void *membuf;
+	struct stat *st = stampst.st_ino == 1 ?  : >inode->st;
 
 	memset(dinp, 0, sizeof(*dinp));
 	dinp->di_mode = cur->inode->st.st_mode;
 	dinp->di_nlink = cur->inode->nlink;
 	dinp->di_size = cur->inode->st.st_size;
-	dinp->di_atime = cur->inode->st.st_atime;
-	dinp->di_mtime = cur->inode->st.st_mtime;
-	dinp->di_ctime = cur->inode->st.st_ctime;
-#if HAVE_STRUCT_STAT_ST_MTIMENSEC
-	dinp->di_atimensec = cur->inode->st.st_atimensec;
-	dinp->di_mtimensec = cur->inode->st.st_mtimensec;
-	dinp->di_ctimensec = cur->inode->st.st_ctimensec;
-#endif
 #if HAVE_STRUCT_STAT_ST_FLAGS
 	dinp->di_flags = cur->inode->st.st_flags;
 #endif
@@ -658,6 +651,15 @@ ffs_build_dinode1(struct ufs1_dinode *di
 #endif
 	dinp->di_uid = cur->inode->st.st_uid;
 	dinp->di_gid = cur->inode->st.st_gid;
+
+	dinp->di_atime = st->st_atime;
+	dinp->di_mtime = st->st_mtime;
+	dinp->di_ctime = st->st_ctime;
+#if HAVE_STRUCT_STAT_ST_MTIMENSEC
+	dinp->di_atimensec = st->st_atimensec;
+	dinp->di_mtimensec = st->st_mtimensec;
+	dinp->di_ctimensec = st->st_ctimensec;
+#endif
 		/* not set: di_db, di_ib, di_blocks, di_spare */
 
 	membuf = NULL;
@@ -685,31 +687,33 @@ ffs_build_dinode2(struct ufs2_dinode *di
 {
 	size_t slen;
 	void *membuf;
+	struct stat *st = stampst.st_ino == 1 ?  : >inode->st;
 
 	memset(dinp, 0, sizeof(*dinp));
 	dinp->di_mode = cur->inode->st.st_mode;
 	dinp->di_nlink = cur->inode->nlink;
 	dinp->di_size = cur->inode->st.st_size;
-	dinp->di_atime = cur->inode->st.st_atime;
-	dinp->di_mtime = cur->inode->st.st_mtime;
-	dinp->di_ctime = cur->inode->st.st_ctime;
-#if HAVE_STRUCT_STAT_ST_MTIMENSEC
-	dinp->di_atimensec = cur->inode->st.st_atimensec;
-	dinp->di_mtimensec = cur->inode->st.st_mtimensec;
-	dinp->di_ctimensec = cur->inode->st.st_ctimensec;
-#endif
 #if HAVE_STRUCT_STAT_ST_FLAGS
 	dinp->di_flags = cur->inode->st.st_flags;
 #endif
 #if HAVE_STRUCT_STAT_ST_GEN
 	dinp->di_gen = cur->inode->st.st_gen;
 #endif
-#if HAVE_STRUCT_STAT_BIRTHTIME
-	dinp->di_birthtime = cur->inode->st.st_birthtime;
-	dinp->di_birthnsec = cur->inode->st.st_birthtimensec;
-#endif
 	dinp->di_uid = cur->inode->st.st_uid;
 	dinp->di_gid = cur->inode->st.st_gid;
+
+	dinp->di_atime = st->st_atime;
+	dinp->di_mtime = st->st_mtime;
+	dinp->di_ctime = st->st_ctime;
+#if HAVE_STRUCT_STAT_ST_MTIMENSEC
+	dinp->di_atimensec = st->st_atimensec;
+	dinp->di_mtimensec = st->st_mtimensec;
+	dinp->di_ctimensec = st->st_ctimensec;
+#endif
+#if HAVE_STRUCT_STAT_BIRTHTIME
+	dinp->di_birthtime = st->st_birthtime;
+	dinp->di_birthnsec = st->st_birthtimensec;
+#endif
 		/* not set: di_db, di_ib, di_blocks, di_spare */
 
 	membuf = NULL;

CVS commit: src/distrib/common

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 22:48:00 UTC 2015

Modified Files:
src/distrib/common: Makefile.image

Log Message:
Add MKREPRO_TIMESTAMP support to the makefs invocation.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/common/Makefile.image

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

Modified files:

Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.38 src/distrib/common/Makefile.image:1.39
--- src/distrib/common/Makefile.image:1.38	Tue Aug 12 07:48:22 2014
+++ src/distrib/common/Makefile.image	Sun Dec 20 17:47:59 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.image,v 1.38 2014/08/12 11:48:22 martin Exp $
+#	$NetBSD: Makefile.image,v 1.39 2015/12/20 22:47:59 christos Exp $
 #
 # Makefile snippet to build a tree from the provided lists,
 # and make an ffs file system image from that tree
@@ -41,6 +41,10 @@ PARSELISTENV+=	TARGETDIR=${.OBJDIR}/${WO
 
 GZIP_FLAGS= -9 ${GZIP_N_FLAG}
 
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+.endif
+
 .if !target(${WORKBUILT})	# {
 ${WORKBUILT}: ${IMAGEDEPENDS} ${WORKSPEC} ${PARSELISTDEP} ${LISTS}
 #	There is a .PHONY ${CRUNCHBIN}, so check if out of date by hand
@@ -93,7 +97,7 @@ ${IMAGE}: ${WORKBUILT}
 	${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
 	rm -f ${.TARGET} ${.TARGET}.tmp; \
 	${TOOL_MAKEFS} -t ffs -B ${IMAGEENDIAN} -s ${IMAGESIZE} -F ${WORKSPEC} \
-	-N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
+	${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
 	-o optimization=space,minfree=0 \
 	${MAKEFS_FLAGS} ${.TARGET}.tmp ${WORKDIR} \
 	&& mv -f ${.TARGET}.tmp ${.TARGET}; \

CVS commit: src/sys/arch

2015-12-20 Thread Kenichi Hashimoto

Module Name:src
Committed By:   hkenken
Date:   Mon Dec 21 04:26:29 UTC 2015

Modified Files:
src/sys/arch/arm/imx: files.imx51 imx51_ipuv3.c imx51_ipuv3var.h
imx51var.h
src/sys/arch/evbarm/conf: NETWALKER files.netwalker
src/sys/arch/evbarm/netwalker: netwalker_backlight.c
netwalker_backlightvar.h netwalker_lcd.c netwalker_machdep.c
Added Files:
src/sys/arch/arm/imx: imx_genfb.c

Log Message:
Rewritten to take advantage of genfb(4).


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/imx/files.imx51
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_ipuv3.c \
src/sys/arch/arm/imx/imx51var.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx51_ipuv3var.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/imx_genfb.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/evbarm/conf/NETWALKER
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/files.netwalker
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/netwalker/netwalker_backlight.c \
src/sys/arch/evbarm/netwalker/netwalker_backlightvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/netwalker/netwalker_lcd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/netwalker/netwalker_machdep.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/imx/files.imx51
diff -u src/sys/arch/arm/imx/files.imx51:1.13 src/sys/arch/arm/imx/files.imx51:1.14
--- src/sys/arch/arm/imx/files.imx51:1.13	Thu May  7 04:13:47 2015
+++ src/sys/arch/arm/imx/files.imx51	Mon Dec 21 04:26:28 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.imx51,v 1.13 2015/05/07 04:13:47 hkenken Exp $
+#	$NetBSD: files.imx51,v 1.14 2015/12/21 04:26:28 hkenken Exp $
 #
 # Configuration info for the Freescale i.MX5x
 #
@@ -76,11 +76,14 @@ file	arch/arm/imx/imx51_iomux.c		imxiomu
 # defparam opt_imx50_epdc.h		EPDC_DEBUG
 
 # IPU v3 controller
-device	ipu : bus_dma_generic, wsemuldisplaydev, rasops16, rasops8, rasops4, rasops_rotation, vcons
-file	arch/arm/imx/imx51_ipuv3.c	ipu	 needs-flag
-defflag	opt_imx51_ipuv3.h		IMXIPUCONSOLE
+device	ipu { }
+file	arch/arm/imx/imx51_ipuv3.c	imx_ipuv3	needs-flag
 defparam opt_imx51_ipuv3.h		IPUV3_DEBUG
 
+# Framebuffer console
+attach	genfb at ipu with imx_genfb
+file	arch/arm/imx/imx_genfb.c	imx_genfb
+
 # iMX M3IF - Multi Master Memory Interface
 # iMX ESDCTL/MDDRC - Enhanced SDRAM/LPDDR memory controller
 # iMX PCMCIA - PCMCIA memory controller

Index: src/sys/arch/arm/imx/imx51_ipuv3.c
diff -u src/sys/arch/arm/imx/imx51_ipuv3.c:1.3 src/sys/arch/arm/imx/imx51_ipuv3.c:1.4
--- src/sys/arch/arm/imx/imx51_ipuv3.c:1.3	Fri Nov  7 11:54:18 2014
+++ src/sys/arch/arm/imx/imx51_ipuv3.c	Mon Dec 21 04:26:28 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx51_ipuv3.c,v 1.3 2014/11/07 11:54:18 hkenken Exp $	*/
+/*	$NetBSD: imx51_ipuv3.c,v 1.4 2015/12/21 04:26:28 hkenken Exp $	*/
 
 /*
  * Copyright (c) 2011, 2012  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,9 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.3 2014/11/07 11:54:18 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.c,v 1.4 2015/12/21 04:26:28 hkenken Exp $");
+
+#include "opt_imx51_ipuv3.h"
 
 #include 
 #include 
@@ -35,17 +37,6 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.
 #include 
 #include 
 #include 			/* for cold */
-#include 
-
-#include 
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
 
 #include 
 #include 
@@ -59,19 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_ipuv3.
 #include 
 
 #include "imxccm.h"	/* if CCM driver is configured into the kernel */
-#include "wsdisplay.h"
-#include "opt_imx51_ipuv3.h"
-
-/*
- * Console variables. These are necessary since console is setup very early,
- * before devices get attached.
- */
-struct {
-	int is_console;
-	struct imx51_wsscreen_descr *descr;
-	struct wsdisplay_accessops *accessops;
-	const struct lcd_panel_geometry *geom;
-} imx51_ipuv3_console;
 
 #define	IPUV3_READ(ipuv3, module, reg)	  \
 	bus_space_read_4((ipuv3)->iot, (ipuv3)->module##_ioh, (reg))
@@ -89,16 +67,8 @@ int ipuv3intr(void *);
 
 static void imx51_ipuv3_initialize(struct imx51_ipuv3_softc *,
 const struct lcd_panel_geometry *);
-#if NWSDISPLAY > 0
-static void imx51_ipuv3_setup_rasops(struct imx51_ipuv3_softc *,
-struct rasops_info *, struct imx51_wsscreen_descr *,
-const struct lcd_panel_geometry *);
-#endif
 static void imx51_ipuv3_set_idma_param(uint32_t *, uint32_t, uint32_t);
 
-static bool imx51_ipuv3_resume(device_t, const pmf_qual_t *);
-static bool imx51_ipuv3_suspend(device_t, const pmf_qual_t *);
-
 #ifdef IPUV3_DEBUG
 static void
 imx51_ipuv3_dump(struct imx51_ipuv3_softc *sc)
@@ -581,34 +551,14 @@ imx51_ipuv3_initialize(struct imx51_ipuv
 	IPUV3_WRITE(sc, cm, IPU_CM_DISP_GEN, reg);
 }
 
-static void
-imx51_ipuv3_init_screen(void *cookie, struct vcons_screen *scr,
-		int existing, long *defattr)
+static int
+imx51_ipuv3_print(void *aux,

CVS commit: src/sys/arch/powerpc/include

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 16:23:14 UTC 2015

Added Files:
src/sys/arch/powerpc/include: fenv.h

Log Message:
Add fenv.h for powerpc (from FreeBSD)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/include/fenv.h

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

Added files:

Index: src/sys/arch/powerpc/include/fenv.h
diff -u /dev/null src/sys/arch/powerpc/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:14 2015
+++ src/sys/arch/powerpc/include/fenv.h	Sun Dec 20 11:23:14 2015
@@ -0,0 +1,278 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:14 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2004-2005 David Schultz 
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD: head/lib/msun/powerpc/fenv.h 226218 2011-10-10 15:43:09Z das $
+ */
+
+#ifndef	_POWERPC_FENV_H_
+#define	_POWERPC_FENV_H_
+
+#include 
+
+#ifndef	__fenv_static
+#define	__fenv_static	static
+#endif
+
+typedef	uint32_t	fenv_t;
+typedef	uint32_t	fexcept_t;
+
+/* Exception flags */
+#define	FE_INEXACT	0x0200
+#define	FE_DIVBYZERO	0x0400
+#define	FE_UNDERFLOW	0x0800
+#define	FE_OVERFLOW	0x1000
+#define	FE_INVALID	0x2000	/* all types of invalid FP ops */
+
+/*
+ * The PowerPC architecture has extra invalid flags that indicate the
+ * specific type of invalid operation occurred.  These flags may be
+ * tested, set, and cleared---but not masked---separately.  All of
+ * these bits are cleared when FE_INVALID is cleared, but only
+ * FE_VXSOFT is set when FE_INVALID is explicitly set in software.
+ */
+#define	FE_VXCVI	0x0100	/* invalid integer convert */
+#define	FE_VXSQRT	0x0200	/* square root of a negative */
+#define	FE_VXSOFT	0x0400	/* software-requested exception */
+#define	FE_VXVC		0x0008	/* ordered comparison involving NaN */
+#define	FE_VXIMZ	0x0010	/* inf * 0 */
+#define	FE_VXZDZ	0x0020	/* 0 / 0 */
+#define	FE_VXIDI	0x0040	/* inf / inf */
+#define	FE_VXISI	0x0080	/* inf - inf */
+#define	FE_VXSNAN	0x0100	/* operation on a signalling NaN */
+#define	FE_ALL_INVALID	(FE_VXCVI | FE_VXSQRT | FE_VXSOFT | FE_VXVC | \
+			 FE_VXIMZ | FE_VXZDZ | FE_VXIDI | FE_VXISI | \
+			 FE_VXSNAN | FE_INVALID)
+#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
+			 FE_ALL_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
+
+/* Rounding modes */
+#define	FE_TONEAREST	0x
+#define	FE_TOWARDZERO	0x0001
+#define	FE_UPWARD	0x0002
+#define	FE_DOWNWARD	0x0003
+#define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
+			 FE_UPWARD | FE_TOWARDZERO)
+
+#ifndef _KERNEL
+__BEGIN_DECLS
+
+/* Default floating-point environment */
+extern const fenv_t	__fe_dfl_env;
+#define	FE_DFL_ENV	(&__fe_dfl_env)
+
+/* We need to be able to map status flag positions to mask flag positions */
+#define	_FPUSW_SHIFT	22
+#define	_ENABLE_MASK	((FE_DIVBYZERO | FE_INEXACT | FE_INVALID | \
+			 FE_OVERFLOW | FE_UNDERFLOW) >> _FPUSW_SHIFT)
+
+#ifndef _SOFT_FLOAT
+#define	__mffs(__env)	__asm __volatile("mffs %0" : "=f" (*(__env)))
+#define	__mtfsf(__env)	__asm __volatile("mtfsf 255,%0" : : "f" (__env))
+#else
+#define	__mffs(__env)
+#define	__mtfsf(__env)
+#endif
+
+union __fpscr {
+	double __d;
+	struct {
+		uint32_t __junk;
+		fenv_t __reg;
+	} __bits;
+};
+
+__fenv_static inline int
+feclearexcept(int __excepts)
+{
+	union __fpscr __r;
+
+	if (__excepts & FE_INVALID)
+		__excepts |= FE_ALL_INVALID;
+	__mffs(&__r.__d);
+	__r.__bits.__reg &= ~__excepts;
+	__mtfsf(__r.__d);
+	return (0);
+}
+
+__fenv_static inline int
+fegetexceptflag(fexcept_t *__flagp, int __excepts)
+{
+	union __fpscr __r;
+
+	__mffs(&__r.__d);
+	*__flagp =

CVS commit: src/sys/arch

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 16:23:39 UTC 2015

Added Files:
src/sys/arch/amigappc/include: fenv.h
src/sys/arch/bebox/include: fenv.h
src/sys/arch/evbppc/include: fenv.h
src/sys/arch/ibmnws/include: fenv.h
src/sys/arch/macppc/include: fenv.h
src/sys/arch/mvmeppc/include: fenv.h
src/sys/arch/ofppc/include: fenv.h
src/sys/arch/prep/include: fenv.h
src/sys/arch/rs6000/include: fenv.h
src/sys/arch/sandpoint/include: fenv.h

Log Message:
new powerpc fenv.h


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/amigappc/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/bebox/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbppc/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/ibmnws/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/macppc/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/mvmeppc/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/ofppc/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/prep/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/rs6000/include/fenv.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/sandpoint/include/fenv.h

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

Added files:

Index: src/sys/arch/amigappc/include/fenv.h
diff -u /dev/null src/sys/arch/amigappc/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/amigappc/include/fenv.h	Sun Dec 20 11:23:38 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:38 christos Exp $	*/
+
+#include 

Index: src/sys/arch/bebox/include/fenv.h
diff -u /dev/null src/sys/arch/bebox/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/bebox/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/evbppc/include/fenv.h
diff -u /dev/null src/sys/arch/evbppc/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/evbppc/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/ibmnws/include/fenv.h
diff -u /dev/null src/sys/arch/ibmnws/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/ibmnws/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/macppc/include/fenv.h
diff -u /dev/null src/sys/arch/macppc/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/macppc/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/mvmeppc/include/fenv.h
diff -u /dev/null src/sys/arch/mvmeppc/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/mvmeppc/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/ofppc/include/fenv.h
diff -u /dev/null src/sys/arch/ofppc/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/ofppc/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/prep/include/fenv.h
diff -u /dev/null src/sys/arch/prep/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/prep/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/rs6000/include/fenv.h
diff -u /dev/null src/sys/arch/rs6000/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/rs6000/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include 

Index: src/sys/arch/sandpoint/include/fenv.h
diff -u /dev/null src/sys/arch/sandpoint/include/fenv.h:1.1
--- /dev/null	Sun Dec 20 11:23:39 2015
+++ src/sys/arch/sandpoint/include/fenv.h	Sun Dec 20 11:23:39 2015
@@ -0,0 +1,3 @@
+/*	$NetBSD: fenv.h,v 1.1 2015/12/20 16:23:39 christos Exp $	*/
+
+#include

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

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 16:22:39 UTC 2015

Modified Files:
src/distrib/sets/lists/comp: ad.powerpc md.amigappc md.bebox md.evbppc
md.ibmnws md.macppc md.mvmeppc md.ofppc md.prep md.rs6000
md.sandpoint

Log Message:
Add fenv for powerpc.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/comp/ad.powerpc
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/comp/md.amigappc \
src/distrib/sets/lists/comp/md.ibmnws
cvs rdiff -u -r1.39 -r1.40 src/distrib/sets/lists/comp/md.bebox
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/comp/md.evbppc
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/comp/md.macppc
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/comp/md.mvmeppc \
src/distrib/sets/lists/comp/md.ofppc
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/comp/md.prep
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/comp/md.rs6000
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/comp/md.sandpoint

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/ad.powerpc
diff -u src/distrib/sets/lists/comp/ad.powerpc:1.81 src/distrib/sets/lists/comp/ad.powerpc:1.82
--- src/distrib/sets/lists/comp/ad.powerpc:1.81	Sun Aug  9 23:21:44 2015
+++ src/distrib/sets/lists/comp/ad.powerpc	Sun Dec 20 11:22:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.81 2015/08/10 03:21:44 mrg Exp $
+# $NetBSD: ad.powerpc,v 1.82 2015/12/20 16:22:39 christos Exp $
 ./usr/bin/elf2aoutcomp-sysutil-bin
 ./usr/bin/psim	comp-debug-bin		gdb
 ./usr/include/altivec.hcomp-obsolete		obsolete
@@ -43,6 +43,7 @@
 ./usr/include/powerpc/elf_machdep.h		comp-c-include
 ./usr/include/powerpc/endian.h			comp-c-include
 ./usr/include/powerpc/endian_machdep.h		comp-c-include
+./usr/include/powerpc/fenv.h			comp-c-include
 ./usr/include/powerpc/float.h			comp-c-include
 ./usr/include/powerpc/fpu.h			comp-c-include
 ./usr/include/powerpc/frame.h			comp-c-include

Index: src/distrib/sets/lists/comp/md.amigappc
diff -u src/distrib/sets/lists/comp/md.amigappc:1.13 src/distrib/sets/lists/comp/md.amigappc:1.14
--- src/distrib/sets/lists/comp/md.amigappc:1.13	Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/comp/md.amigappc	Sun Dec 20 11:22:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.amigappc,v 1.13 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: md.amigappc,v 1.14 2015/12/20 16:22:39 christos Exp $
 ./usr/include/amigappccomp-c-include
 ./usr/include/amigappc/_G_config.h		comp-obsolete		obsolete
 ./usr/include/amigappc/ansi.h			comp-c-include
@@ -15,6 +15,7 @@
 ./usr/include/amigappc/elf_machdep.h		comp-c-include
 ./usr/include/amigappc/endian.h			comp-c-include
 ./usr/include/amigappc/endian_machdep.h		comp-c-include
+./usr/include/amigappc/fenv.h			comp-c-include
 ./usr/include/amigappc/float.h			comp-c-include
 ./usr/include/amigappc/fpu.h			comp-c-include
 ./usr/include/amigappc/frame.h			comp-c-include
Index: src/distrib/sets/lists/comp/md.ibmnws
diff -u src/distrib/sets/lists/comp/md.ibmnws:1.13 src/distrib/sets/lists/comp/md.ibmnws:1.14
--- src/distrib/sets/lists/comp/md.ibmnws:1.13	Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/comp/md.ibmnws	Sun Dec 20 11:22:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.13 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: md.ibmnws,v 1.14 2015/12/20 16:22:39 christos Exp $
 ./usr/include/ibmnwscomp-c-include
 ./usr/include/ibmnws/_G_config.h		comp-obsolete		obsolete
 ./usr/include/ibmnws/ansi.h			comp-c-include
@@ -16,6 +16,7 @@
 ./usr/include/ibmnws/elf_machdep.h		comp-c-include
 ./usr/include/ibmnws/endian.h			comp-c-include
 ./usr/include/ibmnws/endian_machdep.h		comp-c-include
+./usr/include/ibmnws/fenv.h			comp-c-include
 ./usr/include/ibmnws/float.h			comp-c-include
 ./usr/include/ibmnws/fpu.h			comp-c-include
 ./usr/include/ibmnws/frame.h			comp-c-include

Index: src/distrib/sets/lists/comp/md.bebox
diff -u src/distrib/sets/lists/comp/md.bebox:1.39 src/distrib/sets/lists/comp/md.bebox:1.40
--- src/distrib/sets/lists/comp/md.bebox:1.39	Fri Aug 22 06:51:38 2014
+++ src/distrib/sets/lists/comp/md.bebox	Sun Dec 20 11:22:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.39 2014/08/22 10:51:38 apb Exp $
+# $NetBSD: md.bebox,v 1.40 2015/12/20 16:22:39 christos Exp $
 ./usr/include/beboxcomp-c-include
 ./usr/include/bebox/_G_config.h			comp-obsolete		obsolete
 ./usr/include/bebox/ansi.h			comp-c-include
@@ -19,6 +19,7 @@
 ./usr/include/bebox/elf_machdep.h		comp-c-include
 ./usr/include/bebox/endian.h			comp-c-include
 ./usr/include/bebox/endian_machdep.h		comp-c-include
+./usr/include/bebox/fenv.h			comp-c-include
 ./usr/include/bebox/float.h			comp-c-include
 ./usr/include/bebox/fpu.h			comp-c-include
 ./usr/include/bebox/frame.h			comp-c-include

Index: src/distrib/sets/lists/comp/md.evbppc
diff -u src/distrib/sets/lists/comp/md.evbppc:1.15

CVS commit: src/lib/libm

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 16:24:25 UTC 2015

Modified Files:
src/lib/libm: Makefile
Added Files:
src/lib/libm/arch/powerpc: fenv.c

Log Message:
Powerpc fenv.c from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.172 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/powerpc/fenv.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/Makefile
diff -u src/lib/libm/Makefile:1.171 src/lib/libm/Makefile:1.172
--- src/lib/libm/Makefile:1.171	Sat Dec 12 14:05:45 2015
+++ src/lib/libm/Makefile	Sun Dec 20 11:24:25 2015
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.171 2015/12/12 19:05:45 nros Exp $
+#  $NetBSD: Makefile,v 1.172 2015/12/20 16:24:25 christos Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -166,6 +166,11 @@ ARCH_SRCS += s_fma.S s_fmaf.S
 ARCH_SRCS += s_fmax.S s_fmaxf.S
 ARCH_SRCS += s_fmin.S s_fminf.S
 .endif
+.elif (${LIBC_MACHINE_ARCH} == "powerpc")
+.PATH:	${.CURDIR}/arch/powerpc
+
+COMMON_SRCS += fenv.c
+
 .endif
 
 WARNS?=5

Added files:

Index: src/lib/libm/arch/powerpc/fenv.c
diff -u /dev/null src/lib/libm/arch/powerpc/fenv.c:1.1
--- /dev/null	Sun Dec 20 11:24:25 2015
+++ src/lib/libm/arch/powerpc/fenv.c	Sun Dec 20 11:24:25 2015
@@ -0,0 +1,52 @@
+/*	$NetBSD: fenv.c,v 1.1 2015/12/20 16:24:25 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2004 David Schultz 
+ * All rights reserved.
+ *
+ * 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 AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD: head/lib/msun/powerpc/fenv.c 226415 2011-10-16 05:37:56Z das $
+ */
+#include 
+__RCSID("$NetBSD: fenv.c,v 1.1 2015/12/20 16:24:25 christos Exp $");
+
+#define	__fenv_static
+#include "fenv.h"
+
+#if defined(__GNUC_GNU_INLINE__) && !defined(__lint__)
+#error "This file must be compiled with C99 'inline' semantics"
+#endif
+
+const fenv_t __fe_dfl_env = 0x;
+
+extern inline int feclearexcept(int __excepts);
+extern inline int fegetexceptflag(fexcept_t *__flagp, int __excepts);
+extern inline int fesetexceptflag(const fexcept_t *__flagp, int __excepts);
+extern inline int feraiseexcept(int __excepts);
+extern inline int fetestexcept(int __excepts);
+extern inline int fegetround(void);
+extern inline int fesetround(int __round);
+extern inline int fegetenv(fenv_t *__envp);
+extern inline int feholdexcept(fenv_t *__envp);
+extern inline int fesetenv(const fenv_t *__envp);
+extern inline int feupdateenv(const fenv_t *__envp);

CVS commit: src/include

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 16:24:45 UTC 2015

Modified Files:
src/include: fenv.h

Log Message:
Powerpc now has fenv.h


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/include/fenv.h

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

Modified files:

Index: src/include/fenv.h
diff -u src/include/fenv.h:1.13 src/include/fenv.h:1.14
--- src/include/fenv.h:1.13	Sat Dec 27 11:54:02 2014
+++ src/include/fenv.h	Sun Dec 20 11:24:45 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: fenv.h,v 1.13 2014/12/27 16:54:02 martin Exp $	*/
+/*	$NetBSD: fenv.h,v 1.14 2015/12/20 16:24:45 christos Exp $	*/
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #if !defined(__aarch64__) && !defined(__arm__) && !defined(__i386__) \
-&& !defined(__hppa__) \
+&& !defined(__hppa__) && !defined(__powerpc__) \
 && !defined(__or1k__) && !defined(__riscv__) && !defined(__sparc__) \
 && !defined(__x86_64__)
 #error	"fenv.h is currently not supported for this architecture"

CVS commit: src/usr.sbin/makemandb

2015-12-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 20 19:45:29 UTC 2015

Modified Files:
src/usr.sbin/makemandb: apropos.c

Log Message:
if we only asked for stopwords, use the original query.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/makemandb/apropos.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.sbin/makemandb/apropos.c
diff -u src/usr.sbin/makemandb/apropos.c:1.16 src/usr.sbin/makemandb/apropos.c:1.17
--- src/usr.sbin/makemandb/apropos.c:1.16	Tue Apr  2 13:16:50 2013
+++ src/usr.sbin/makemandb/apropos.c	Sun Dec 20 14:45:29 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: apropos.c,v 1.16 2013/04/02 17:16:50 christos Exp $	*/
+/*	$NetBSD: apropos.c,v 1.17 2015/12/20 19:45:29 christos Exp $	*/
 /*-
  * Copyright (c) 2011 Abhinav Upadhyay 
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: apropos.c,v 1.16 2013/04/02 17:16:50 christos Exp $");
+__RCSID("$NetBSD: apropos.c,v 1.17 2015/12/20 19:45:29 christos Exp $");
 
 #include 
 #include 
@@ -188,11 +188,15 @@ main(int argc, char *argv[])
 		concat(, *argv++);
 	/* Eliminate any stopwords from the query */
 	query = remove_stopwords(lower(str));
-	free(str);
 
-	/* if any error occured in remove_stopwords, exit */
+	/*
+	 * If the query consisted only of stopwords and we removed all of
+	 * them, use the original query.
+	 */
 	if (query == NULL)
-		errx(EXIT_FAILURE, "Try using more relevant keywords");
+		query = str;
+	else
+		free(str);
 
 	if ((db = init_db(MANDB_READONLY, MANCONF)) == NULL)
 		exit(EXIT_FAILURE);

CVS commit: src/distrib/common

CVS commit: src/usr.bin/make

CVS commit: src/sys/arch

CVS commit: src/usr.sbin/makefs

CVS commit: src/usr.sbin/makefs

CVS commit: src/sys/arch

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

CVS commit: src/sys/arch

CVS commit: src/usr.sbin/makefs

CVS commit: src/distrib/common

CVS commit: src/sys/arch

CVS commit: src/sys/arch/powerpc/include

CVS commit: src/sys/arch

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

CVS commit: src/lib/libm

CVS commit: src/include

CVS commit: src/usr.sbin/makemandb

17 matches

Site Navigation

Mail list logo

Footer information