d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert prior commit to restore the files mangled by my "fixing" merge

Browse Source 
conflicts for a git rebase I tried to do.
This commit is contained in:
Warner Losh 2017-03-01 02:10:40 +00:00
parent 59b34b3404
commit 43b96a4eb5
5 changed files with 105 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
release/picobsd/tinyware/passwd/extern.h
View File

@ -1,6 +1,6 @@
/*- /*
* Copyright (c) 1982, 1986, 1988, 1993 * Copyright (c) 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -10,7 +10,11 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -26,17 +30,9 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* From: @(#)extern.h 8.1 (Berkeley) 4/2/94
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _NETINET_IP6_IPSEC_H_ int krb_passwd(char *, char *, char *, char *);
#define _NETINET_IP6_IPSEC_H_ int local_passwd(char *);
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

33
release/picobsd/tinyware/passwd/pw_util.h
View File

@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 1987, 1988, 1993 * Copyright (c) 1994
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * 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 * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -26,22 +30,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94 * @(#)pw_util.h 8.2 (Berkeley) 4/1/94
*
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _SYS_DISKPC98_H_ void pw_edit(int);
#define _SYS_DISKPC98_H_ void pw_error(const char *, int, int);
void pw_init(void);
#include <sys/disk/pc98.h> int pw_lock(void);
#include <sys/ioccom.h> int pw_mkdb(const char *);
void pw_prompt(void);
#define DOSMID_386BSD __DOSMID_386BSD int pw_tmp(void);
#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_ */

45
sys/arm/include/_align.h
View File

@ -1,4 +1,5 @@
/*- /*-
* Copyright (c) 2001 David E. O'Brien
* Copyright (c) 1990 The Regents of the University of California. * Copyright (c) 1990 The Regents of the University of California.
* All rights reserved. * All rights reserved.
* *
@ -13,7 +14,11 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -29,35 +34,23 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* from: @(#)isa.h 5.7 (Berkeley) 5/9/91 * from: @(#)param.h 5.8 (Berkeley) 6/28/91
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _PC98_PC98_PC98_H_ #ifndef _ARM_INCLUDE__ALIGN_H_
#define _PC98_PC98_PC98_H_ #define _ARM_INCLUDE__ALIGN_H_
/* /*
* PC98 Bus conventions * Round p (pointer or byte index) up to the hardware-required alignment which
* modified for PC9801 by A.Kojima F.Ukai M.Ishii * is sufficient for any data type, pointer or numeric. The resulting type
* Kyoto University Microcomputer Club (KMC) * 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)
/* #endif /* !_ARM_INCLUDE__ALIGN_H_ */
* 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_ */

91
sys/mips/include/cpuinfo.h
View File

@ -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. * 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 * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
@ -10,7 +15,11 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -26,50 +35,50 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)disklabel.h 8.2 (Berkeley) 7/10/94
* $FreeBSD$ * $FreeBSD$
* @(#)cpu.h 8.4 (Berkeley) 1/4/94
*/ */
#ifndef _SYS_DISK_PC98_H_ #ifndef _CPUINFO_H_
#define _SYS_DISK_PC98_H_ #define _CPUINFO_H_
#define PC98_BBSECTOR 1 /* DOS boot block relative sector number */ /*
#define PC98_PARTOFF 0 * Exported definitions unique to NetBSD/mips cpu support.
#define PC98_PARTSIZE 32 */
#define PC98_NPARTS 16
#define PC98_MAGICOFS 510
#define PC98_MAGIC 0xAA55
#define PC98_MID_BOOTABLE 0x80 #ifdef _KERNEL
#define PC98_MID_MASK 0x7f #ifndef LOCORE
#define PC98_MID_386BSD 0x14
#define PC98_SID_ACTIVE 0x80 struct mips_cpuinfo {
#define PC98_SID_MASK 0x7f u_int8_t cpu_vendor;
#define PC98_SID_386BSD 0x44 u_int8_t cpu_rev;
u_int8_t cpu_impl;
#define __DOSMID_386BSD (PC98_MID_386BSD | PC98_MID_BOOTABLE) u_int8_t tlb_type;
#define __DOSSID_386BSD (PC98_SID_386BSD | PC98_SID_ACTIVE) u_int32_t tlb_pgmask;
#define PC98_PTYP_386BSD (__DOSSID_386BSD << 8 | __DOSMID_386BSD) u_int16_t tlb_nentries;
u_int8_t icache_virtual;
struct pc98_partition { boolean_t cache_coherent_dma;
unsigned char dp_mid; boolean_t userlocal_reg;
unsigned char dp_sid; struct {
unsigned char dp_dum1; u_int32_t ic_size;
unsigned char dp_dum2; u_int8_t ic_linesize;
unsigned char dp_ipl_sct; u_int8_t ic_nways;
unsigned char dp_ipl_head; u_int16_t ic_nsets;
unsigned short dp_ipl_cyl; u_int32_t dc_size;
unsigned char dp_ssect; /* starting sector */ u_int8_t dc_linesize;
unsigned char dp_shd; /* starting head */ u_int8_t dc_nways;
unsigned short dp_scyl; /* starting cylinder */ u_int16_t dc_nsets;
unsigned char dp_esect; /* end sector */ } l1;
unsigned char dp_ehd; /* end head */ struct {
unsigned short dp_ecyl; /* end cylinder */ u_int32_t dc_size;
unsigned char dp_name[16]; 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_ */

23
usr.bin/locate/locate/pathnames.h
View File

@ -1,6 +1,6 @@
/*- /*
* Copyright (c) 1982, 1986, 1988, 1993 * Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved. * The Regents of the University of California. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -10,7 +10,11 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * 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 * may be used to endorse or promote products derived from this software
* without specific prior written permission. * without specific prior written permission.
* *
@ -26,15 +30,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)pathnames.h 8.1 (Berkeley) 6/6/93
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _NETINET_IP_IPSEC_H_ #define _PATH_FCODES "/var/db/locate.database"
#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