summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/hppa/include/ansi.h8
-rw-r--r--sys/arch/hppa/include/asm.h14
-rw-r--r--sys/arch/hppa/include/float.h8
-rw-r--r--sys/arch/hppa/include/nvm.h8
-rw-r--r--sys/arch/hppa/include/pdc.h34
-rw-r--r--sys/arch/hppa/include/pmap.h15
-rw-r--r--sys/arch/hppa/include/pte.h8
-rw-r--r--sys/arch/hppa/include/som.h8
-rw-r--r--sys/arch/hppa/include/stdarg.h8
-rw-r--r--sys/arch/hppa/include/types.h10
10 files changed, 56 insertions, 65 deletions
diff --git a/sys/arch/hppa/include/ansi.h b/sys/arch/hppa/include/ansi.h
index 6fb7f322615..ac8010a0aee 100644
--- a/sys/arch/hppa/include/ansi.h
+++ b/sys/arch/hppa/include/ansi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ansi.h,v 1.2 1998/07/13 18:51:47 mickey Exp $ */
+/* $OpenBSD: ansi.h,v 1.3 1998/11/23 03:28:22 mickey Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,8 @@
* @(#)ansi.h 8.2 (Berkeley) 1/4/94
*/
-#ifndef _ANSI_H_
-#define _ANSI_H_
+#ifndef _MACHINE_ANSI_H_
+#define _MACHINE_ANSI_H_
/*
* Types which are fundamental to the implementation and may appear in
@@ -73,4 +73,4 @@
#define _BSD_WCHAR_T_ int /* wchar_t */
#define _BSD_RUNE_T_ int /* rune_t */
-#endif /* _ANSI_H_ */
+#endif /* _MACHINE_ANSI_H_ */
diff --git a/sys/arch/hppa/include/asm.h b/sys/arch/hppa/include/asm.h
index ecb52da9d7f..db42d32ea91 100644
--- a/sys/arch/hppa/include/asm.h
+++ b/sys/arch/hppa/include/asm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm.h,v 1.3 1998/08/29 01:11:05 mickey Exp $ */
+/* $OpenBSD: asm.h,v 1.4 1998/11/23 03:28:22 mickey Exp $ */
/*
* Copyright (c) 1990,1991,1994 The University of Utah and
@@ -22,19 +22,13 @@
* Utah $Hdr: asm.h 1.8 94/12/14$
*/
-#ifndef _HPPA_ASM_H_
-#define _HPPA_ASM_H_
+#ifndef _MACHINE_ASM_H_
+#define _MACHINE_ASM_H_
/*
* hppa assembler definitions
*/
-/*
- * Roundup() - rounds up x to next multiple of y
- */
-
-#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
-
/*
* Hardware General Registers
*/
@@ -344,4 +338,4 @@ tf4 .reg %fr8
.exit !\
.procend
-#endif /* _HPPA_ASM_H_ */
+#endif /* _MACHINE_ASM_H_ */
diff --git a/sys/arch/hppa/include/float.h b/sys/arch/hppa/include/float.h
index 1958af3d72b..9fe89871665 100644
--- a/sys/arch/hppa/include/float.h
+++ b/sys/arch/hppa/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.1 1998/08/28 20:47:57 mickey Exp $ */
+/* $OpenBSD: float.h,v 1.2 1998/11/23 03:28:22 mickey Exp $ */
/*
* Copyright (c) 1989 Regents of the University of California.
@@ -35,8 +35,8 @@
* @(#)float.h 7.1 (Berkeley) 5/8/90
*/
-#ifndef _HPPA_FLOAT_H_
-#define _HPPA_FLOAT_H_
+#ifndef _MACHINE_FLOAT_H_
+#define _MACHINE_FLOAT_H_
#include <sys/cdefs.h>
@@ -73,4 +73,4 @@
#define LDBL_MAX 1.1897314953572317650857593266280070162E4932L
#define LDBL_MAX_10_EXP 4932
-#endif /* _HPPA_FLOAT_H_ */
+#endif /* _MACHINE_FLOAT_H_ */
diff --git a/sys/arch/hppa/include/nvm.h b/sys/arch/hppa/include/nvm.h
index a0712807762..e689c019b44 100644
--- a/sys/arch/hppa/include/nvm.h
+++ b/sys/arch/hppa/include/nvm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: nvm.h,v 1.1 1998/06/23 19:45:24 mickey Exp $ */
+/* $OpenBSD: nvm.h,v 1.2 1998/11/23 03:28:22 mickey Exp $ */
/*
* Copyright (c) 1990, 1994 The University of Utah and
@@ -24,8 +24,8 @@
* Author: Jeff Forys, University of Utah CSL
*/
-#ifndef _NVM_
-#define _NVM_
+#ifndef _MACHINE_NVM_H_
+#define _MACHINE_NVM_H_
/*
* The PDC provides access to Non-Volatile Memory (NVM). If this
@@ -71,4 +71,4 @@ struct bootdata {
unsigned int device; /* boot device */
};
-#endif /* _NVM_ */
+#endif /* _MACHINE_NVM_H_ */
diff --git a/sys/arch/hppa/include/pdc.h b/sys/arch/hppa/include/pdc.h
index 51842fc3717..43cc49204b2 100644
--- a/sys/arch/hppa/include/pdc.h
+++ b/sys/arch/hppa/include/pdc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pdc.h,v 1.5 1998/08/29 01:33:31 mickey Exp $ */
+/* $OpenBSD: pdc.h,v 1.6 1998/11/23 03:28:22 mickey Exp $ */
/*
* Copyright (c) 1990 mt Xinu, Inc. All rights reserved.
@@ -26,8 +26,8 @@
* Utah $Hdr: pdc.h 1.12 94/12/14$
*/
-#ifndef _HPPA_PDC_H_
-#define _HPPA_PDC_H_
+#ifndef _MACHINE_PDC_H_
+#define _MACHINE_PDC_H_
/*
* Definitions for interaction with "Processor Dependent Code",
@@ -251,7 +251,7 @@ typedef int (*iodcio_t) __P((struct iomod *, int, ...));
struct pdc_pim { /* PDC_PIM */
u_int count; /* actual (HPMC, LPMC) or total (SIZE) count */
u_int archsize; /* size of architected regions (see "pim.h") */
- double filler[15];
+ u_int filler[30];
};
struct pdc_model { /* PDC_MODEL */
@@ -260,12 +260,12 @@ struct pdc_model { /* PDC_MODEL */
u_int hw_id; /* unique processor hardware identifier */
u_int boot_id; /* same as hw_id */
u_int sw_id; /* software security and licensing */
- u_int sw_cap; /* O/S capabilities of processor */
+ u_int sw_cap; /* OS capabilities of processor */
u_int arch_rev; /* architecture revision */
u_int pot_key; /* potential key */
u_int curr_key; /* current key */
int filler1;
- double filler2[11];
+ u_int filler2[22];
};
struct cache_cf { /* PDC_CACHE (for "struct pdc_cache") */
@@ -325,37 +325,37 @@ struct pdc_cache { /* PDC_CACHE */
u_int dt_off_stride; /* offset incr per off_count iteration (flush)*/
u_int dt_off_count; /* number of dt_loop iterations/space (flush) */
u_int dt_loop; /* number of PDTLBE's per off_stride (flush) */
- double filler;
+ u_int filler[2];
};
struct pdc_hpa { /* PDC_HPA */
struct iomod *hpa; /* HPA of processor */
int filler1;
- double filler2[15];
+ u_int filler2[30];
};
struct pdc_coproc { /* PDC_COPROC */
u_int ccr_enable; /* same format as CCR (CR 10) */
- int ccr_present; /* which co-proc's are present (bitset) */
- double filler2[15];
+ u_int ccr_present; /* which co-proc's are present (bitset) */
+ u_int filler2[30];
};
struct pdc_tod { /* PDC_TOD, PDC_TOD_READ */
u_int sec; /* elapsed time since 00:00:00 GMT, 1/1/70 */
u_int usec; /* accurate to microseconds */
- double filler2[15];
+ u_int filler2[30];
};
struct pdc_instr { /* PDC_INSTR */
u_int instr; /* instruction that invokes PDC mchk entry pt */
int filler1;
- double filler2[15];
+ u_int filler2[30];
};
struct pdc_iodc_read { /* PDC_IODC, PDC_IODC_READ */
int size; /* number of bytes in selected entry point */
int filler1;
- double filler2[15];
+ u_int filler2[30];
};
struct pdc_iodc_minit { /* PDC_IODC, PDC_IODC_NINIT or PDC_IODC_DINIT */
@@ -363,7 +363,7 @@ struct pdc_iodc_minit { /* PDC_IODC, PDC_IODC_NINIT or PDC_IODC_DINIT */
u_int max_spa; /* size of SPA (in bytes) > max_mem+map_mem */
u_int max_mem; /* size of "implemented" memory (in bytes) */
u_int map_mem; /* size of "mapable-only" memory (in bytes) */
- double filler[14];
+ u_int filler[28];
};
struct btlb_info { /* for "struct pdc_btlb" (PDC_BTLB) */
@@ -390,7 +390,7 @@ struct pdc_hwtlb { /* PDC_TLB */
struct pdc_memmap { /* PDC_MEMMAP */
u_int hpa; /* HPA for module */
u_int morepages; /* additional IO pages */
- double filler[15];
+ u_int filler[30];
};
/*
@@ -519,7 +519,7 @@ struct iodc_data {
iodc_spa_enb:1, /* 1:has an spa */
iodc_spa_shift:5, /* power of two # bytes in SPA space */
iodc_more: 1, /* iodc_data is: 0:8-byte, 1:16-byte */
- iodc_word: 1, /* io_dc_data is: 0:byte, 1:word */
+ iodc_word: 1, /* iodc_data is: 0:byte, 1:word */
iodc_pf: 1, /* 1:supports powerfail */
iodc_type: 5; /* see below */
u_int iodc_sv_rev: 4, /* software version revision number */
@@ -560,4 +560,4 @@ void pdccnpollc __P((dev_t, int));
#endif /* !(_LOCORE) */
-#endif /* _HPPA_PDC_H_ */
+#endif /* _MACHINE_PDC_H_ */
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index 1ff71b856ea..f3aa126db36 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.3 1998/09/12 03:14:49 mickey Exp $ */
+/* $OpenBSD: pmap.h,v 1.4 1998/11/23 03:28:22 mickey Exp $ */
/*
* Copyright 1996 1995 by Open Software Foundation, Inc.
@@ -48,8 +48,8 @@
* Pmap header for hppa.
*/
-#ifndef _HPPA_PMAP_H_
-#define _HPPA_PMAP_H_
+#ifndef _MACHINE_PMAP_H_
+#define _MACHINE_PMAP_H_
#include <machine/pte.h>
@@ -167,12 +167,7 @@ pmap_prot(struct pmap *pmap, int prot)
return (pmap == kernel_pmap? kern_prot: user_prot)[prot];
}
-/*
- * prototypes.
- */
-vm_offset_t kvtophys __P((vm_offset_t addr));
-vm_offset_t pmap_map __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_prot_t));
-void pmap_bootstrap __P((vm_offset_t *, vm_offset_t *));
+void pmap_bootstrap __P((vm_offset_t *, vm_offset_t *));
#endif /* _KERNEL */
-#endif /* _HPPA_PMAP_H_ */
+#endif /* _MACHINE_PMAP_H_ */
diff --git a/sys/arch/hppa/include/pte.h b/sys/arch/hppa/include/pte.h
index 1297e5c3d27..ad7810589d6 100644
--- a/sys/arch/hppa/include/pte.h
+++ b/sys/arch/hppa/include/pte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte.h,v 1.2 1998/08/29 01:27:35 mickey Exp $ */
+/* $OpenBSD: pte.h,v 1.3 1998/11/23 03:28:23 mickey Exp $ */
/*
* Copyright 1996 1995 by Open Software Foundation, Inc.
@@ -24,8 +24,8 @@
* pmk1.1
*/
-#ifndef _HPPA_PTE_H_
-#define _HPPA_PTE_H_
+#ifndef _MACHINE_PTE_H_
+#define _MACHINE_PTE_H_
/* TLB access/protection values */
@@ -106,4 +106,4 @@ extern struct tlbd_stats dtlb_stats;
#endif /* TLB_STATS && !_LOCORE */
-#endif /* _HPPA_PTE_H_ */
+#endif /* _MACHINE_PTE_H_ */
diff --git a/sys/arch/hppa/include/som.h b/sys/arch/hppa/include/som.h
index 76b81058a28..c29499b6951 100644
--- a/sys/arch/hppa/include/som.h
+++ b/sys/arch/hppa/include/som.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: som.h,v 1.1 1998/07/14 17:14:19 mickey Exp $ */
+/* $OpenBSD: som.h,v 1.2 1998/11/23 03:28:23 mickey Exp $ */
/*
* Copyright (c) 1998 Michael Shalayeff
@@ -30,8 +30,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _HPPA_SOM_H_
-#define _HPPA_SOM_H_
+#ifndef _MACHINE_SOM_H_
+#define _MACHINE_SOM_H_
/*
* system_id values
@@ -49,4 +49,4 @@
(fh)->a_magic != SOM_SHARE_MAGIC && \
(fh)->a_magic != SOM_DEMAND_MAGIC)
-#endif /* _HPPA_SOM_H_ */
+#endif /* _MACHINE_SOM_H_ */
diff --git a/sys/arch/hppa/include/stdarg.h b/sys/arch/hppa/include/stdarg.h
index 2a66770cb08..fc4cfda185c 100644
--- a/sys/arch/hppa/include/stdarg.h
+++ b/sys/arch/hppa/include/stdarg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: stdarg.h,v 1.1 1998/06/23 19:45:27 mickey Exp $ */
+/* $OpenBSD: stdarg.h,v 1.2 1998/11/23 03:28:23 mickey Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,8 +35,8 @@
* @(#)stdarg.h 8.1 (Berkeley) 6/10/93
*/
-#ifndef _HPPA_STDARG_H_
-#define _HPPA_STDARG_H_
+#ifndef _MACHINE_STDARG_H_
+#define _MACHINE_STDARG_H_
typedef double *va_list;
@@ -56,4 +56,4 @@ typedef double *va_list;
#define va_end(ap)
-#endif /* !_HPPA_STDARG_H */
+#endif /* !_MACHINE_STDARG_H */
diff --git a/sys/arch/hppa/include/types.h b/sys/arch/hppa/include/types.h
index cf0872f8be5..47c6501317d 100644
--- a/sys/arch/hppa/include/types.h
+++ b/sys/arch/hppa/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.1 1998/06/23 19:45:28 mickey Exp $ */
+/* $OpenBSD: types.h,v 1.2 1998/11/23 03:28:23 mickey Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -35,8 +35,8 @@
* @(#)types.h 8.3 (Berkeley) 1/5/94
*/
-#ifndef _HPPA_TYPES_H_
-#define _HPPA_TYPES_H_
+#ifndef _MACHINE_TYPES_H_
+#define _MACHINE_TYPES_H_
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
typedef struct _physadr {
@@ -53,6 +53,8 @@ typedef struct label_t {
#endif
+typedef unsigned long hppa_hpa_t;
+typedef unsigned long hppa_spa_t;
typedef unsigned int pa_space_t;
typedef unsigned long vm_size_t;
typedef unsigned long vm_offset_t;
@@ -82,4 +84,4 @@ typedef unsigned long u_int64_t;
typedef int32_t register_t;
-#endif /* _HPPA_TYPES_H_ */
+#endif /* _MACHINE_TYPES_H_ */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 07:12:31 +0000