Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Mar 2017 02:10:40 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r314449 - in head: release/picobsd/tinyware/passwd sys/arm/include sys/mips/include usr.bin/locate/locate
Message-ID:  <201703010210.v212AeEg063663@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Wed Mar  1 02:10:40 2017
New Revision: 314449
URL: https://svnweb.freebsd.org/changeset/base/314449

Log:
  Revert prior commit to restore the files mangled by my "fixing" merge
  conflicts for a git rebase I tried to do.

Modified:
  head/release/picobsd/tinyware/passwd/extern.h
  head/release/picobsd/tinyware/passwd/pw_util.h
  head/sys/arm/include/_align.h
  head/sys/mips/include/cpuinfo.h
  head/usr.bin/locate/locate/pathnames.h

Modified: head/release/picobsd/tinyware/passwd/extern.h
==============================================================================
--- head/release/picobsd/tinyware/passwd/extern.h	Wed Mar  1 02:07:51 2017	(r314448)
+++ head/release/picobsd/tinyware/passwd/extern.h	Wed Mar  1 02:10:40 2017	(r314449)
@@ -1,6 +1,6 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 1993
- *      The Regents of the University of California.  All rights reserved.
+/*
+ * Copyright (c) 1994
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,11 @@
  * 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.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -26,17 +30,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ *	From: @(#)extern.h	8.1 (Berkeley) 4/2/94
  * $FreeBSD$
  */
 
-#ifndef _NETINET_IP6_IPSEC_H_
-#define _NETINET_IP6_IPSEC_H_
-
-int	ip6_ipsec_filtertunnel(struct mbuf *);
-int	ip6_ipsec_fwd(struct mbuf *);
-int	ip6_ipsec_input(struct mbuf *, int);
-int	ip6_ipsec_output(struct mbuf **, struct inpcb *, int *);
-#if 0
-int	ip6_ipsec_mtu(struct mbuf *);
-#endif
-#endif
+int	krb_passwd(char *, char *, char *, char *);
+int	local_passwd(char *);

Modified: head/release/picobsd/tinyware/passwd/pw_util.h
==============================================================================
--- head/release/picobsd/tinyware/passwd/pw_util.h	Wed Mar  1 02:07:51 2017	(r314448)
+++ head/release/picobsd/tinyware/passwd/pw_util.h	Wed Mar  1 02:10:40 2017	(r314449)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1987, 1988, 1993
+ * Copyright (c) 1994
  *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,11 @@
  * 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.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -26,22 +30,15 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
+ *	@(#)pw_util.h	8.2 (Berkeley) 4/1/94
+ *
  * $FreeBSD$
  */
 
-#ifndef _SYS_DISKPC98_H_
-#define	_SYS_DISKPC98_H_
-
-#include <sys/disk/pc98.h>
-#include <sys/ioccom.h>
-
-#define	DOSMID_386BSD		__DOSMID_386BSD
-#define	DOSSID_386BSD		__DOSSID_386BSD
-
-void pc98_partition_dec(void const *pp, struct pc98_partition *d);
-void pc98_partition_enc(void *pp, struct pc98_partition *d);
-
-#define DIOCSPC98	_IOW('M', 129, u_char[8192])
-
-#endif /* !_SYS_DISKPC98_H_ */
+void	pw_edit(int);
+void	pw_error(const char *, int, int);
+void	pw_init(void);
+int	pw_lock(void);
+int	pw_mkdb(const char *);
+void	pw_prompt(void);
+int	pw_tmp(void);

Modified: head/sys/arm/include/_align.h
==============================================================================
--- head/sys/arm/include/_align.h	Wed Mar  1 02:07:51 2017	(r314448)
+++ head/sys/arm/include/_align.h	Wed Mar  1 02:10:40 2017	(r314449)
@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2001 David E. O'Brien
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
@@ -13,7 +14,11 @@
  * 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.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,35 +34,23 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
+ *	from: @(#)param.h	5.8 (Berkeley) 6/28/91
  * $FreeBSD$
  */
 
-#ifndef _PC98_PC98_PC98_H_
-#define	_PC98_PC98_PC98_H_
+#ifndef _ARM_INCLUDE__ALIGN_H_
+#define	_ARM_INCLUDE__ALIGN_H_
 
 /*
- * PC98 Bus conventions
- * modified for PC9801 by A.Kojima F.Ukai M.Ishii 
- *			Kyoto University Microcomputer Club (KMC)
+ * Round p (pointer or byte index) up to the hardware-required alignment which
+ * is sufficient for any data type, pointer or numeric.  The resulting type
+ * is equivelent to arm's uintptr_t (but is purposely spelled "unsigned" here).
  */
+#if __ARM_ARCH >= 6
+#define	_ALIGNBYTES	(sizeof(int) - 1)
+#else
+#define	_ALIGNBYTES	(sizeof(long long) - 1)
+#endif
+#define	_ALIGN(p)	(((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
 
-/*
- * Input / Output Port Assignments -- PC98 IO address ... very dirty (^_^;
- */
-
-#define	IO_ICU1		0x000		/* 8259A Interrupt Controller #1 */
-#define	IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
-#define	IO_RTC		0x020		/* 4990A RTC */
-#define	IO_SYSPORT	0x031		/* 8255A System Port */
-#define	IO_KBD		0x041		/* 8251A Keyboard */
-#define	IO_COM2		0x0B1		/* 8251A RS232C serial I/O (ext) */
-#define	IO_COM3		0x0B9		/* 8251A RS232C serial I/O (ext) */
-#define	IO_FDPORT	0x0BE		/* FD I/F port (1M<->640K,EMTON) */
-
-/*
- * Input / Output Port Sizes
- */
-#define	IO_KBDSIZE	16		/* 8042 Keyboard controllers */
-
-#endif /* !_PC98_PC98_PC98_H_ */
+#endif /* !_ARM_INCLUDE__ALIGN_H_ */

Modified: head/sys/mips/include/cpuinfo.h
==============================================================================
--- head/sys/mips/include/cpuinfo.h	Wed Mar  1 02:07:51 2017	(r314448)
+++ head/sys/mips/include/cpuinfo.h	Wed Mar  1 02:10:40 2017	(r314449)
@@ -1,7 +1,12 @@
+/*	$NetBSD: cpu.h,v 1.70 2003/01/17 23:36:08 thorpej Exp $	*/
+
 /*-
- * Copyright (c) 1987, 1988, 1993
+ * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
+ * This code is derived from software contributed to Berkeley by
+ * Ralph Campbell and Rick Macklem.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -10,7 +15,11 @@
  * 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.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -26,50 +35,50 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
  * $FreeBSD$
+ *	@(#)cpu.h	8.4 (Berkeley) 1/4/94
+ */
+
+#ifndef _CPUINFO_H_
+#define _CPUINFO_H_
+
+/*
+ * Exported definitions unique to NetBSD/mips cpu support.
  */
 
-#ifndef _SYS_DISK_PC98_H_
-#define	_SYS_DISK_PC98_H_
+#ifdef _KERNEL
+#ifndef LOCORE
 
-#define	PC98_BBSECTOR	1	/* DOS boot block relative sector number */
-#define	PC98_PARTOFF	0
-#define	PC98_PARTSIZE	32
-#define	PC98_NPARTS	16
-#define	PC98_MAGICOFS	510
-#define	PC98_MAGIC	0xAA55
-
-#define	PC98_MID_BOOTABLE	0x80
-#define	PC98_MID_MASK		0x7f
-#define	PC98_MID_386BSD		0x14
-
-#define	PC98_SID_ACTIVE		0x80
-#define	PC98_SID_MASK		0x7f
-#define	PC98_SID_386BSD		0x44
-
-#define	__DOSMID_386BSD		(PC98_MID_386BSD | PC98_MID_BOOTABLE)
-#define	__DOSSID_386BSD		(PC98_SID_386BSD | PC98_SID_ACTIVE)
-#define	PC98_PTYP_386BSD	(__DOSSID_386BSD << 8 | __DOSMID_386BSD)
-
-struct pc98_partition {
-	unsigned char	dp_mid;
-	unsigned char	dp_sid;
-	unsigned char	dp_dum1;
-	unsigned char	dp_dum2;
-	unsigned char	dp_ipl_sct;
-	unsigned char	dp_ipl_head;
-	unsigned short	dp_ipl_cyl;
-	unsigned char	dp_ssect;	/* starting sector */
-	unsigned char	dp_shd;		/* starting head */
-	unsigned short	dp_scyl;	/* starting cylinder */
-	unsigned char	dp_esect;	/* end sector */
-	unsigned char	dp_ehd;		/* end head */
-	unsigned short	dp_ecyl;	/* end cylinder */
-	unsigned char	dp_name[16];
+struct mips_cpuinfo {
+	u_int8_t	cpu_vendor;
+	u_int8_t	cpu_rev;
+	u_int8_t	cpu_impl;
+	u_int8_t	tlb_type;
+	u_int32_t	tlb_pgmask;
+	u_int16_t	tlb_nentries;
+	u_int8_t	icache_virtual;
+	boolean_t	cache_coherent_dma;
+	boolean_t	userlocal_reg;
+	struct {
+		u_int32_t	ic_size;
+		u_int8_t	ic_linesize;
+		u_int8_t	ic_nways;
+		u_int16_t	ic_nsets;
+		u_int32_t	dc_size;
+		u_int8_t	dc_linesize;
+		u_int8_t	dc_nways;
+		u_int16_t	dc_nsets;
+	} l1;
+	struct {
+		u_int32_t	dc_size;
+		u_int8_t	dc_linesize;
+		u_int8_t	dc_nways;
+		u_int16_t	dc_nsets;
+	} l2;
 };
-#ifdef CTASSERT
-CTASSERT(sizeof (struct pc98_partition) == PC98_PARTSIZE);
-#endif
 
-#endif /* !_SYS_DISK_PC98_H_ */
+extern struct mips_cpuinfo cpuinfo;
+
+#endif /* !LOCORE */
+#endif /* _KERNEL */
+#endif /* _CPUINFO_H_ */

Modified: head/usr.bin/locate/locate/pathnames.h
==============================================================================
--- head/usr.bin/locate/locate/pathnames.h	Wed Mar  1 02:07:51 2017	(r314448)
+++ head/usr.bin/locate/locate/pathnames.h	Wed Mar  1 02:10:40 2017	(r314449)
@@ -1,6 +1,6 @@
-/*-
- * Copyright (c) 1982, 1986, 1988, 1993
- *      The Regents of the University of California.  All rights reserved.
+/*
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,11 @@
  * 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.
- * 3. Neither the name of the University nor the names of its contributors
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -26,15 +30,8 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ *	@(#)pathnames.h	8.1 (Berkeley) 6/6/93
  * $FreeBSD$
  */
 
-#ifndef _NETINET_IP_IPSEC_H_
-#define _NETINET_IP_IPSEC_H_
-
-int	ip_ipsec_filtertunnel(struct mbuf *);
-int	ip_ipsec_fwd(struct mbuf *);
-int	ip_ipsec_input(struct mbuf *, int);
-int	ip_ipsec_mtu(struct mbuf *, int);
-int	ip_ipsec_output(struct mbuf **, struct inpcb *, int *);
-#endif
+#define	_PATH_FCODES	"/var/db/locate.database"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703010210.v212AeEg063663>