summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/sparc64/include')
-rw-r--r--sys/arch/sparc64/include/autoconf.h46
-rw-r--r--sys/arch/sparc64/include/bsd_openprom.h102
-rw-r--r--sys/arch/sparc64/include/bus.h376
-rw-r--r--sys/arch/sparc64/include/cpu.h84
-rw-r--r--sys/arch/sparc64/include/ctlreg.h34
-rw-r--r--sys/arch/sparc64/include/db_machdep.h24
-rw-r--r--sys/arch/sparc64/include/eeprom.h4
-rw-r--r--sys/arch/sparc64/include/float.h4
-rw-r--r--sys/arch/sparc64/include/intr.h6
-rw-r--r--sys/arch/sparc64/include/netbsd_machdep.h4
-rw-r--r--sys/arch/sparc64/include/param.h10
-rw-r--r--sys/arch/sparc64/include/pmap.h20
-rw-r--r--sys/arch/sparc64/include/psl.h26
-rw-r--r--sys/arch/sparc64/include/pte.h6
-rw-r--r--sys/arch/sparc64/include/sparc64.h34
-rw-r--r--sys/arch/sparc64/include/vmparam.h6
-rw-r--r--sys/arch/sparc64/include/z8530var.h14
17 files changed, 400 insertions, 400 deletions
diff --git a/sys/arch/sparc64/include/autoconf.h b/sys/arch/sparc64/include/autoconf.h
index b9166043b06..cdf099f0dfc 100644
--- a/sys/arch/sparc64/include/autoconf.h
+++ b/sys/arch/sparc64/include/autoconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.h,v 1.5 2001/09/26 20:21:04 jason Exp $ */
+/* $OpenBSD: autoconf.h,v 1.6 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: autoconf.h,v 1.10 2001/07/24 19:32:11 eeh Exp $ */
/*-
@@ -127,16 +127,16 @@ struct mainbus_attach_args {
/*
* length; the others convert or make some other guarantee.
*/
-long getproplen __P((int node, char *name));
-int getprop __P((int, char *, size_t, int *, void **));
-char *getpropstring __P((int node, char *name));
-int getpropint __P((int node, char *name, int deflt));
+long getproplen(int node, char *name);
+int getprop(int, char *, size_t, int *, void **);
+char *getpropstring(int node, char *name);
+int getpropint(int node, char *name, int deflt);
/* Frequently used options node */
extern int optionsnode;
/* new interfaces: */
-char *getpropstringA __P((int, char *, char *));
+char *getpropstringA(int, char *, char *);
/*
* The matchbyname function is useful in drivers that are matched
@@ -146,13 +146,13 @@ char *getpropstringA __P((int, char *, char *));
*/
struct device;
struct cfdata;
-int matchbyname __P((struct device *, struct cfdata *cf, void *aux));
+int matchbyname(struct device *, struct cfdata *cf, void *aux);
/*
* `clockfreq' produces a printable representation of a clock frequency
* (this is just a frill).
*/
-char *clockfreq __P((long freq));
+char *clockfreq(long freq);
/* Openprom V2 style boot path */
struct bootpath {
@@ -161,24 +161,24 @@ struct bootpath {
int val[3]; /* up to three optional values */
struct device *dev; /* device that recognised this component */
};
-struct bootpath *bootpath_store __P((int, struct bootpath *));
-int sd_crazymap __P((int));
+struct bootpath *bootpath_store(int, struct bootpath *);
+int sd_crazymap(int);
/* Parse a disk string into a dev_t, return device struct pointer */
-struct device *parsedisk __P((char *, int, int, dev_t *));
+struct device *parsedisk(char *, int, int, dev_t *);
/* Establish a mountroot_hook, for benefit of floppy drive, mostly. */
-void mountroot_hook_establish __P((void (*) __P((struct device *)),
+void mountroot_hook_establish __P((void (*)(struct device *),
struct device *));
-void bootstrap __P((int));
-int firstchild __P((int));
-int nextsibling __P((int));
-void callrom __P((void));
-struct device *getdevunit __P((char *, int));
-void *findzs __P((int));
-int romgetcursoraddr __P((int **, int **));
-int findroot __P((void));
-int findnode __P((int, const char *));
-int node_has_property __P((int, const char *));
-void device_register __P((struct device *, void *));
+void bootstrap(int);
+int firstchild(int);
+int nextsibling(int);
+void callrom(void);
+struct device *getdevunit(char *, int);
+void *findzs(int);
+int romgetcursoraddr(int **, int **);
+int findroot(void);
+int findnode(int, const char *);
+int node_has_property(int, const char *);
+void device_register(struct device *, void *);
diff --git a/sys/arch/sparc64/include/bsd_openprom.h b/sys/arch/sparc64/include/bsd_openprom.h
index efa04c81661..19ee5997afc 100644
--- a/sys/arch/sparc64/include/bsd_openprom.h
+++ b/sys/arch/sparc64/include/bsd_openprom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bsd_openprom.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */
+/* $OpenBSD: bsd_openprom.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: bsd_openprom.h,v 1.2 2000/03/13 23:52:34 soren Exp $ */
/*
@@ -75,15 +75,15 @@
* and so forth).
*/
struct v0devops {
- int (*v0_open) __P((char *dev));
- int (*v0_close) __P((int d));
- int (*v0_rbdev) __P((int d, int nblks, int blkno, void *addr));
- int (*v0_wbdev) __P((int d, int nblks, int blkno, void *addr));
- int (*v0_wnet) __P((int d, int nbytes, void *addr));
- int (*v0_rnet) __P((int d, int nbytes, void *addr));
- int (*v0_rcdev) __P((int d, int nbytes, int, void *addr));
- int (*v0_wcdev) __P((int d, int nbytes, int, void *addr));
- int (*v0_seek) __P((int d, long offset, int whence));
+ int (*v0_open)(char *dev);
+ int (*v0_close)(int d);
+ int (*v0_rbdev)(int d, int nblks, int blkno, void *addr);
+ int (*v0_wbdev)(int d, int nblks, int blkno, void *addr);
+ int (*v0_wnet)(int d, int nbytes, void *addr);
+ int (*v0_rnet)(int d, int nbytes, void *addr);
+ int (*v0_rcdev)(int d, int nbytes, int, void *addr);
+ int (*v0_wcdev)(int d, int nbytes, int, void *addr);
+ int (*v0_seek)(int d, long offset, int whence);
};
/*
@@ -101,25 +101,25 @@ struct v2devops {
* Convert an `instance handle' (acquired through v2_open()) to
* a `package handle', a.k.a. a `node'.
*/
- int (*v2_fd_phandle) __P((int d));
+ int (*v2_fd_phandle)(int d);
/* Memory allocation and release. */
- void *(*v2_malloc) __P((caddr_t va, u_int sz));
- void (*v2_free) __P((caddr_t va, u_int sz));
+ void *(*v2_malloc)(caddr_t va, u_int sz);
+ void (*v2_free)(caddr_t va, u_int sz);
/* Device memory mapper. */
- caddr_t (*v2_mmap) __P((caddr_t va, int asi, u_int pa, u_int sz));
- void (*v2_munmap) __P((caddr_t va, u_int sz));
+ caddr_t (*v2_mmap)(caddr_t va, int asi, u_int pa, u_int sz);
+ void (*v2_munmap)(caddr_t va, u_int sz);
/* Device open, close, etc. */
- int (*v2_open) __P((char *devpath));
- void (*v2_close) __P((int d));
- int (*v2_read) __P((int d, void *buf, int nbytes));
- int (*v2_write) __P((int d, void *buf, int nbytes));
- void (*v2_seek) __P((int d, int hi, int lo));
-
- void (*v2_chain) __P((void)); /* ??? */
- void (*v2_release) __P((void)); /* ??? */
+ int (*v2_open)(char *devpath);
+ void (*v2_close)(int d);
+ int (*v2_read)(int d, void *buf, int nbytes);
+ int (*v2_write)(int d, void *buf, int nbytes);
+ void (*v2_seek)(int d, int hi, int lo);
+
+ void (*v2_chain)(void); /* ??? */
+ void (*v2_release)(void); /* ??? */
};
/*
@@ -209,37 +209,37 @@ struct promvec {
#define PROMDEV_TTYB 2 /* in/out to ttyb */
/* Blocking getchar/putchar. NOT REENTRANT! (grr) */
- int (*pv_getchar) __P((void));
- void (*pv_putchar) __P((int ch));
+ int (*pv_getchar)(void);
+ void (*pv_putchar)(int ch);
/* Non-blocking variants that return -1 on error. */
- int (*pv_nbgetchar) __P((void));
- int (*pv_nbputchar) __P((int ch));
+ int (*pv_nbgetchar)(void);
+ int (*pv_nbputchar)(int ch);
/* Put counted string (can be very slow). */
- void (*pv_putstr) __P((char *str, int len));
+ void (*pv_putstr)(char *str, int len);
/* Miscellany. */
- void (*pv_reboot) __P((char *bootstr));
- void (*pv_printf) __P((const char *fmt, ...));
- void (*pv_abort) __P((void)); /* L1-A abort */
+ void (*pv_reboot)(char *bootstr);
+ void (*pv_printf)(const char *fmt, ...);
+ void (*pv_abort)(void); /* L1-A abort */
int *pv_ticks; /* Ticks since last reset */
- void (*pv_halt) __P((void)) __attribute__((noreturn));/* Halt! */
- void (**pv_synchook) __P((void)); /* "sync" command hook */
+ void (*pv_halt)(void) __attribute__((noreturn));/* Halt! */
+ void (**pv_synchook)(void); /* "sync" command hook */
/*
* This eval's a FORTH string. Unfortunately, its interface
* changed between V0 and V2, which gave us much pain.
*/
union {
- void (*v0_eval) __P((int len, char *str));
- void (*v2_eval) __P((char *str));
+ void (*v0_eval)(int len, char *str);
+ void (*v2_eval)(char *str);
} pv_fortheval;
struct v0bootargs **pv_v0bootargs; /* V0: Boot args */
/* Extract Ethernet address from network device. */
- u_int (*pv_enaddr) __P((int d, char *enaddr));
+ u_int (*pv_enaddr)(int d, char *enaddr);
struct v2bootargs pv_v2bootargs; /* V2: Boot args + std in/out */
struct v2devops pv_v2devops; /* V2: device operations */
@@ -257,17 +257,17 @@ struct promvec {
* all memory references go to the PROM, so the PROM can do it
* easily.
*/
- void (*pv_setctxt) __P((int ctxt, caddr_t va, int pmeg));
+ void (*pv_setctxt)(int ctxt, caddr_t va, int pmeg);
#if defined(SUN4M) && defined(notyet)
/*
* The following are V3 ROM functions to handle MP machines in the
* Sun4m series. They have undefined results when run on a uniprocessor!
*/
- int (*pv_v3cpustart) __P((u_int module, u_int ctxtbl,
- int context, caddr_t pc));
- int (*pv_v3cpustop) __P((u_int module));
- int (*pv_v3cpuidle) __P((u_int module));
- int (*pv_v3cpuresume) __P((u_int module));
+ int (*pv_v3cpustart)(u_int module, u_int ctxtbl,
+ int context, caddr_t pc);
+ int (*pv_v3cpustop)(u_int module);
+ int (*pv_v3cpuidle)(u_int module);
+ int (*pv_v3cpuresume)(u_int module);
#endif
};
@@ -305,24 +305,24 @@ struct nodeops {
/*
* Tree traversal.
*/
- int (*no_nextnode) __P((int node)); /* next(node) */
- int (*no_child) __P((int node)); /* first child */
+ int (*no_nextnode)(int node); /* next(node) */
+ int (*no_child)(int node); /* first child */
/*
* Property functions. Proper use of getprop requires calling
* proplen first to make sure it fits. Kind of a pain, but no
* doubt more convenient for the PROM coder.
*/
- int (*no_proplen) __P((int node, caddr_t name));
- int (*no_getprop) __P((int node, caddr_t name, caddr_t val));
- int (*no_setprop) __P((int node, caddr_t name, caddr_t val,
- int len));
- caddr_t (*no_nextprop) __P((int node, caddr_t name));
+ int (*no_proplen)(int node, caddr_t name);
+ int (*no_getprop)(int node, caddr_t name, caddr_t val);
+ int (*no_setprop)(int node, caddr_t name, caddr_t val,
+ int len);
+ caddr_t (*no_nextprop)(int node, caddr_t name);
};
-void romhalt __P((void))
+void romhalt(void)
__attribute__((__noreturn__));
-void romboot __P((char *))
+void romboot(char *)
__attribute__((__noreturn__));
extern struct promvec *promvec;
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h
index 52ff2080760..692c7a43217 100644
--- a/sys/arch/sparc64/include/bus.h
+++ b/sys/arch/sparc64/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.10 2002/03/07 18:08:08 jason Exp $ */
+/* $OpenBSD: bus.h,v 1.11 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */
/*-
@@ -131,35 +131,35 @@ struct sparc_bus_space_tag {
bus_space_tag_t parent;
int type;
- int (*sparc_bus_alloc) __P((bus_space_tag_t,
+ int (*sparc_bus_alloc)(bus_space_tag_t,
bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t,
- int, bus_addr_t *, bus_space_handle_t *));
+ int, bus_addr_t *, bus_space_handle_t *);
- void (*sparc_bus_free) __P((bus_space_tag_t,
- bus_space_handle_t, bus_size_t));
+ void (*sparc_bus_free)(bus_space_tag_t,
+ bus_space_handle_t, bus_size_t);
- int (*sparc_bus_map) __P((bus_space_tag_t,
+ int (*sparc_bus_map)(bus_space_tag_t,
bus_type_t, bus_addr_t, bus_size_t,
- int, vaddr_t, bus_space_handle_t *));
+ int, vaddr_t, bus_space_handle_t *);
- int (*sparc_bus_unmap) __P((bus_space_tag_t,
- bus_space_handle_t, bus_size_t));
+ int (*sparc_bus_unmap)(bus_space_tag_t,
+ bus_space_handle_t, bus_size_t);
- int (*sparc_bus_subregion) __P((bus_space_tag_t,
+ int (*sparc_bus_subregion)(bus_space_tag_t,
bus_space_handle_t, bus_size_t,
- bus_size_t, bus_space_handle_t *));
+ bus_size_t, bus_space_handle_t *);
- void (*sparc_bus_barrier) __P((bus_space_tag_t,
+ void (*sparc_bus_barrier)(bus_space_tag_t,
bus_space_handle_t, bus_size_t,
- bus_size_t, int));
+ bus_size_t, int);
- paddr_t (*sparc_bus_mmap) __P((bus_space_tag_t,
- bus_addr_t, off_t, int, int));
+ paddr_t (*sparc_bus_mmap)(bus_space_tag_t,
+ bus_addr_t, off_t, int, int);
void *(*sparc_intr_establish) __P((bus_space_tag_t,
int, int, int,
- int (*) __P((void *)), void *));
+ int (*)(void *), void *));
};
@@ -167,7 +167,7 @@ struct sparc_bus_space_tag {
/*
* The following macro could be used to generate the bus_space*() functions
* but it uses a gcc extension and is ANSI-only.
-#define PROTO_bus_space_xxx __P((bus_space_tag_t t, ...))
+#define PROTO_bus_space_xxx(bus_space_tag_t t, ...)
#define RETURNTYPE_bus_space_xxx void *
#define BUSFUN(name, returntype, t, args...) \
__inline__ RETURNTYPE_##name \
@@ -183,7 +183,7 @@ struct sparc_bus_space_tag {
/*
* Bus space function prototypes.
*/
-static int bus_space_alloc __P((
+static int bus_space_alloc(
bus_space_tag_t,
bus_addr_t, /* reg start */
bus_addr_t, /* reg end */
@@ -192,54 +192,54 @@ static int bus_space_alloc __P((
bus_size_t, /* boundary */
int, /* flags */
bus_addr_t *,
- bus_space_handle_t *));
-static void bus_space_free __P((
+ bus_space_handle_t *);
+static void bus_space_free(
bus_space_tag_t,
bus_space_handle_t,
- bus_size_t));
-static int bus_space_map __P((
+ bus_size_t);
+static int bus_space_map(
bus_space_tag_t,
bus_addr_t,
bus_size_t,
int, /*flags*/
- bus_space_handle_t *));
-static int bus_space_map2 __P((
+ bus_space_handle_t *);
+static int bus_space_map2(
bus_space_tag_t,
bus_type_t,
bus_addr_t,
bus_size_t,
int, /*flags*/
vaddr_t, /*preferred vaddr*/
- bus_space_handle_t *));
-static int bus_space_unmap __P((
+ bus_space_handle_t *);
+static int bus_space_unmap(
bus_space_tag_t,
bus_space_handle_t,
- bus_size_t));
-static int bus_space_subregion __P((
+ bus_size_t);
+static int bus_space_subregion(
bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_size_t,
- bus_space_handle_t *));
-static void bus_space_barrier __P((
+ bus_space_handle_t *);
+static void bus_space_barrier(
bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_size_t,
- int));
-static paddr_t bus_space_mmap __P((
+ int);
+static paddr_t bus_space_mmap(
bus_space_tag_t,
bus_addr_t, /*addr*/
off_t, /*offset*/
int, /*prot*/
- int)); /*flags*/
+ int); /*flags*/
static void *bus_intr_establish __P((
bus_space_tag_t,
int, /*bus-specific intr*/
int, /*device class level,
see machine/intr.h*/
int, /*flags*/
- int (*) __P((void *)), /*handler*/
+ int (*)(void *), /*handler*/
void *)); /*handler arg*/
@@ -334,7 +334,7 @@ bus_intr_establish(t, p, l, f, h, a)
int p;
int l;
int f;
- int (*h)__P((void *));
+ int (*h)(void *);
void *a;
{
_BS_CALL(t, sparc_intr_establish)(t, p, l, f, h, a);
@@ -355,7 +355,7 @@ bus_space_barrier(t, h, o, s, f)
/* XXXX Things get complicated if we use unmapped register accesses. */
#define bus_space_vaddr(t, h) (vaddr_t)(h)
#else
-void * bus_space_vaddr __P((bus_space_tag_t space, bus_space_handle_t handle));
+void * bus_space_vaddr(bus_space_tag_t space, bus_space_handle_t handle);
#endif
/* flags for bus space map functions */
@@ -390,13 +390,13 @@ int bus_space_probe __P((
bus_size_t, /* probe size */
size_t, /* offset */
int, /* flags */
- int (*) __P((void *, void *)), /* callback function */
+ int (*)(void *, void *), /* callback function */
void *)); /* callback arg */
/*
- * u_intN_t bus_space_read_N __P((bus_space_tag_t tag,
- * bus_space_handle_t bsh, bus_size_t offset));
+ * u_intN_t bus_space_read_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset);
*
* Read a 1, 2, 4, or 8 byte quantity from bus space
* described by tag/handle/offset.
@@ -451,9 +451,9 @@ int bus_space_probe __P((
__bv; })
#endif
/*
- * void bus_space_read_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle/offset and copy into buffer provided.
@@ -488,9 +488,9 @@ int bus_space_probe __P((
} while (0)
/*
- * void bus_space_write_N __P((bus_space_tag_t tag,
+ * void bus_space_write_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t value));
+ * u_intN_t value);
*
* Write the 1, 2, 4, or 8 byte value `value' to bus space
* described by tag/handle/offset.
@@ -537,9 +537,9 @@ int bus_space_probe __P((
((void)(stxa((h) + (o), bus_type_asi[(t)->type], (v)))); })
#endif
/*
- * void bus_space_write_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer
* provided to bus space described by tag/handle/offset.
@@ -574,9 +574,9 @@ int bus_space_probe __P((
} while (0)
/*
- * void bus_space_set_multi_N __P((bus_space_tag_t tag,
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -607,31 +607,31 @@ int bus_space_probe __P((
} while (0)
/*
- * void bus_space_read_region_N __P((bus_space_tag_t tag,
+ * void bus_space_read_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t off,
- * u_intN_t *addr, bus_size_t count));
+ * u_intN_t *addr, bus_size_t count);
*
*/
-static void bus_space_read_region_1 __P((bus_space_tag_t,
+static void bus_space_read_region_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int8_t *,
- bus_size_t));
-static void bus_space_read_region_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_read_region_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int16_t *,
- bus_size_t));
-static void bus_space_read_region_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_read_region_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int32_t *,
- bus_size_t));
-static void bus_space_read_region_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_read_region_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int64_t *,
- bus_size_t));
+ bus_size_t);
static __inline__ void
bus_space_read_region_1(t, h, o, a, c)
@@ -675,31 +675,31 @@ bus_space_read_region_8(t, h, o, a, c)
}
/*
- * void bus_space_write_region_N __P((bus_space_tag_t tag,
+ * void bus_space_write_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t off,
- * u_intN_t *addr, bus_size_t count));
+ * u_intN_t *addr, bus_size_t count);
*
*/
-static void bus_space_write_region_1 __P((bus_space_tag_t,
+static void bus_space_write_region_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int8_t *,
- bus_size_t));
-static void bus_space_write_region_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_write_region_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int16_t *,
- bus_size_t));
-static void bus_space_write_region_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_write_region_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int32_t *,
- bus_size_t));
-static void bus_space_write_region_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_write_region_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int64_t *,
- bus_size_t));
+ bus_size_t);
static __inline__ void
bus_space_write_region_1(t, h, o, a, c)
bus_space_tag_t t;
@@ -746,31 +746,31 @@ bus_space_write_region_8(t, h, o, a, c)
/*
- * void bus_space_set_region_N __P((bus_space_tag_t tag,
+ * void bus_space_set_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t off,
- * u_intN_t *addr, bus_size_t count));
+ * u_intN_t *addr, bus_size_t count);
*
*/
-static void bus_space_set_region_1 __P((bus_space_tag_t,
+static void bus_space_set_region_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int8_t,
- bus_size_t));
-static void bus_space_set_region_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_set_region_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int16_t,
- bus_size_t));
-static void bus_space_set_region_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_set_region_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int32_t,
- bus_size_t));
-static void bus_space_set_region_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_set_region_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int64_t,
- bus_size_t));
+ bus_size_t);
static __inline__ void
bus_space_set_region_1(t, h, o, v, c)
@@ -818,38 +818,38 @@ bus_space_set_region_8(t, h, o, v, c)
/*
- * void bus_space_copy_region_N __P((bus_space_tag_t tag,
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
* bus_space_handle_t bsh1, bus_size_t off1,
* bus_space_handle_t bsh2, bus_size_t off2,
- * bus_size_t count));
+ * bus_size_t count);
*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
*/
-static void bus_space_copy_region_1 __P((bus_space_tag_t,
+static void bus_space_copy_region_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
-static void bus_space_copy_region_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_copy_region_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
-static void bus_space_copy_region_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_copy_region_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
-static void bus_space_copy_region_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_copy_region_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
+ bus_size_t);
static __inline__ void
@@ -897,8 +897,8 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
}
/*
- * u_intN_t bus_space_read_stream_N __P((bus_space_tag_t tag,
- * bus_space_handle_t bsh, bus_size_t offset));
+ * u_intN_t bus_space_read_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset);
*
* Read a 1, 2, 4, or 8 byte quantity from bus space
* described by tag/handle/offset.
@@ -953,9 +953,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
__bv; })
#endif
/*
- * void bus_space_read_multi_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_read_multi_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t *addr, size_t count));
+ * u_intN_t *addr, size_t count);
*
* Read `count' 1, 2, 4, or 8 byte quantities from bus space
* described by tag/handle/offset and copy into buffer provided.
@@ -990,9 +990,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
} while (0)
/*
- * void bus_space_write_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_write_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * u_intN_t value));
+ * u_intN_t value);
*
* Write the 1, 2, 4, or 8 byte value `value' to bus space
* described by tag/handle/offset.
@@ -1039,9 +1039,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
((void)(stxa((h) + (o), bus_stream_asi[(t)->type], (v)))); })
#endif
/*
- * void bus_space_write_multi_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_write_multi_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset,
- * const u_intN_t *addr, size_t count));
+ * const u_intN_t *addr, size_t count);
*
* Write `count' 1, 2, 4, or 8 byte quantities from the buffer
* provided to bus space described by tag/handle/offset.
@@ -1076,9 +1076,9 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
} while (0)
/*
- * void bus_space_set_multi_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_set_multi_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
- * size_t count));
+ * size_t count);
*
* Write the 1, 2, 4, or 8 byte value `val' to bus space described
* by tag/handle/offset `count' times.
@@ -1109,31 +1109,31 @@ bus_space_copy_region_8(t, h1, o1, h2, o2, c)
} while (0)
/*
- * void bus_space_read_region_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_read_region_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t off,
- * u_intN_t *addr, bus_size_t count));
+ * u_intN_t *addr, bus_size_t count);
*
*/
-static void bus_space_read_region_stream_1 __P((bus_space_tag_t,
+static void bus_space_read_region_stream_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int8_t *,
- bus_size_t));
-static void bus_space_read_region_stream_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_read_region_stream_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int16_t *,
- bus_size_t));
-static void bus_space_read_region_stream_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_read_region_stream_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int32_t *,
- bus_size_t));
-static void bus_space_read_region_stream_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_read_region_stream_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
u_int64_t *,
- bus_size_t));
+ bus_size_t);
static __inline__ void
bus_space_read_region_stream_1(t, h, o, a, c)
@@ -1177,31 +1177,31 @@ bus_space_read_region_stream_8(t, h, o, a, c)
}
/*
- * void bus_space_write_region_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_write_region_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t off,
- * u_intN_t *addr, bus_size_t count));
+ * u_intN_t *addr, bus_size_t count);
*
*/
-static void bus_space_write_region_stream_1 __P((bus_space_tag_t,
+static void bus_space_write_region_stream_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int8_t *,
- bus_size_t));
-static void bus_space_write_region_stream_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_write_region_stream_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int16_t *,
- bus_size_t));
-static void bus_space_write_region_stream_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_write_region_stream_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int32_t *,
- bus_size_t));
-static void bus_space_write_region_stream_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_write_region_stream_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int64_t *,
- bus_size_t));
+ bus_size_t);
static __inline__ void
bus_space_write_region_stream_1(t, h, o, a, c)
bus_space_tag_t t;
@@ -1248,31 +1248,31 @@ bus_space_write_region_stream_8(t, h, o, a, c)
/*
- * void bus_space_set_region_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_set_region_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh, bus_size_t off,
- * u_intN_t *addr, bus_size_t count));
+ * u_intN_t *addr, bus_size_t count);
*
*/
-static void bus_space_set_region_stream_1 __P((bus_space_tag_t,
+static void bus_space_set_region_stream_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int8_t,
- bus_size_t));
-static void bus_space_set_region_stream_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_set_region_stream_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int16_t,
- bus_size_t));
-static void bus_space_set_region_stream_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_set_region_stream_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int32_t,
- bus_size_t));
-static void bus_space_set_region_stream_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_set_region_stream_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
const u_int64_t,
- bus_size_t));
+ bus_size_t);
static __inline__ void
bus_space_set_region_stream_1(t, h, o, v, c)
@@ -1320,38 +1320,38 @@ bus_space_set_region_stream_8(t, h, o, v, c)
/*
- * void bus_space_copy_region_stream_N __P((bus_space_tag_t tag,
+ * void bus_space_copy_region_stream_N(bus_space_tag_t tag,
* bus_space_handle_t bsh1, bus_size_t off1,
* bus_space_handle_t bsh2, bus_size_t off2,
- * bus_size_t count));
+ * bus_size_t count);
*
* Copy `count' 1, 2, 4, or 8 byte values from bus space starting
* at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
*/
-static void bus_space_copy_region_stream_1 __P((bus_space_tag_t,
+static void bus_space_copy_region_stream_1(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
-static void bus_space_copy_region_stream_2 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_copy_region_stream_2(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
-static void bus_space_copy_region_stream_4 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_copy_region_stream_4(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
-static void bus_space_copy_region_stream_8 __P((bus_space_tag_t,
+ bus_size_t);
+static void bus_space_copy_region_stream_8(bus_space_tag_t,
bus_space_handle_t,
bus_size_t,
bus_space_handle_t,
bus_size_t,
- bus_size_t));
+ bus_size_t);
static __inline__ void
@@ -1477,33 +1477,33 @@ struct sparc_bus_dma_tag {
/*
* DMA mapping methods.
*/
- int (*_dmamap_create) __P((bus_dma_tag_t, bus_size_t, int,
- bus_size_t, bus_size_t, int, bus_dmamap_t *));
- void (*_dmamap_destroy) __P((bus_dma_tag_t, bus_dmamap_t));
- int (*_dmamap_load) __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
- int (*_dmamap_load_mbuf) __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
- int (*_dmamap_load_uio) __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
- int (*_dmamap_load_raw) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
- void (*_dmamap_unload) __P((bus_dma_tag_t, bus_dmamap_t));
- void (*_dmamap_sync) __P((bus_dma_tag_t, bus_dmamap_t,
- bus_addr_t, bus_size_t, int));
+ int (*_dmamap_create)(bus_dma_tag_t, bus_size_t, int,
+ bus_size_t, bus_size_t, int, bus_dmamap_t *);
+ void (*_dmamap_destroy)(bus_dma_tag_t, bus_dmamap_t);
+ int (*_dmamap_load)(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+ int (*_dmamap_load_mbuf)(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+ int (*_dmamap_load_uio)(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+ int (*_dmamap_load_raw)(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+ void (*_dmamap_unload)(bus_dma_tag_t, bus_dmamap_t);
+ void (*_dmamap_sync)(bus_dma_tag_t, bus_dmamap_t,
+ bus_addr_t, bus_size_t, int);
/*
* DMA memory utility functions.
*/
- int (*_dmamem_alloc) __P((bus_dma_tag_t, bus_size_t, bus_size_t,
- bus_size_t, bus_dma_segment_t *, int, int *, int));
- void (*_dmamem_free) __P((bus_dma_tag_t,
- bus_dma_segment_t *, int));
- int (*_dmamem_map) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, size_t, caddr_t *, int));
- void (*_dmamem_unmap) __P((bus_dma_tag_t, caddr_t, size_t));
- paddr_t (*_dmamem_mmap) __P((bus_dma_tag_t, bus_dma_segment_t *,
- int, off_t, int, int));
+ int (*_dmamem_alloc)(bus_dma_tag_t, bus_size_t, bus_size_t,
+ bus_size_t, bus_dma_segment_t *, int, int *, int);
+ void (*_dmamem_free)(bus_dma_tag_t,
+ bus_dma_segment_t *, int);
+ int (*_dmamem_map)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, size_t, caddr_t *, int);
+ void (*_dmamem_unmap)(bus_dma_tag_t, caddr_t, size_t);
+ paddr_t (*_dmamem_mmap)(bus_dma_tag_t, bus_dma_segment_t *,
+ int, off_t, int, int);
};
#define bus_dmamap_create(t, s, n, m, b, f, p) \
@@ -1570,37 +1570,37 @@ struct sparc_bus_dmamap {
};
#ifdef _SPARC_BUS_DMA_PRIVATE
-int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t,
- bus_size_t, int, bus_dmamap_t *));
-void _bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t));
-int _bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *,
- bus_size_t, struct proc *, int));
-int _bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t,
- struct mbuf *, int));
-int _bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t,
- struct uio *, int));
-int _bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t,
- bus_dma_segment_t *, int, bus_size_t, int));
-void _bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t));
-void _bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
- bus_size_t, int));
-
-int _bus_dmamem_alloc __P((bus_dma_tag_t tag, bus_size_t size,
+int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
+ bus_size_t, int, bus_dmamap_t *);
+void _bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
+int _bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *,
+ bus_size_t, struct proc *, int);
+int _bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t,
+ struct mbuf *, int);
+int _bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t,
+ struct uio *, int);
+int _bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t,
+ bus_dma_segment_t *, int, bus_size_t, int);
+void _bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t);
+void _bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
+ bus_size_t, int);
+
+int _bus_dmamem_alloc(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
- bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags));
-void _bus_dmamem_free __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs));
-int _bus_dmamem_map __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, size_t size, caddr_t *kvap, int flags));
-void _bus_dmamem_unmap __P((bus_dma_tag_t tag, caddr_t kva,
- size_t size));
-paddr_t _bus_dmamem_mmap __P((bus_dma_tag_t tag, bus_dma_segment_t *segs,
- int nsegs, off_t off, int prot, int flags));
-
-int _bus_dmamem_alloc_range __P((bus_dma_tag_t tag, bus_size_t size,
+ bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags);
+void _bus_dmamem_free(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs);
+int _bus_dmamem_map(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, size_t size, caddr_t *kvap, int flags);
+void _bus_dmamem_unmap(bus_dma_tag_t tag, caddr_t kva,
+ size_t size);
+paddr_t _bus_dmamem_mmap(bus_dma_tag_t tag, bus_dma_segment_t *segs,
+ int nsegs, off_t off, int prot, int flags);
+
+int _bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
- vaddr_t low, vaddr_t high));
+ vaddr_t low, vaddr_t high);
#endif /* _SPARC_BUS_DMA_PRIVATE */
#endif /* _SPARC_BUS_H_ */
diff --git a/sys/arch/sparc64/include/cpu.h b/sys/arch/sparc64/include/cpu.h
index 9f346a0c390..5f4d634f812 100644
--- a/sys/arch/sparc64/include/cpu.h
+++ b/sys/arch/sparc64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.7 2002/02/01 21:48:23 jason Exp $ */
+/* $OpenBSD: cpu.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: cpu.h,v 1.28 2001/06/14 22:56:58 thorpej Exp $ */
/*
@@ -131,7 +131,7 @@ struct cpu_info {
u_long ci_simple_locks;/* # of simple locks held */
/* Spinning up the CPU */
- void (*ci_spinup) __P((void)); /* spinup routine */
+ void (*ci_spinup)(void); /* spinup routine */
void *ci_initstack;
paddr_t ci_paddr; /* Phys addr of this structure. */
};
@@ -196,8 +196,8 @@ extern struct intrhand soft01intr, soft01net, soft01clock;
#define setsoftint() send_softint(-1, IPL_SOFTINT, &soft01intr)
#define setsoftnet() send_softint(-1, IPL_SOFTNET, &soft01net)
#else
-void setsoftint __P((void));
-void setsoftnet __P((void));
+void setsoftint(void);
+void setsoftnet(void);
#endif
int want_ast;
@@ -237,7 +237,7 @@ int foundfpu; /* true => we have an FPU */
* argument, or with a pointer to a clockframe if ih_arg is NULL.
*/
struct intrhand {
- int (*ih_fun) __P((void *));
+ int (*ih_fun)(void *);
void *ih_arg;
short ih_number; /* interrupt number */
/* the H/W provides */
@@ -250,70 +250,70 @@ struct intrhand {
extern struct intrhand *intrhand[];
extern struct intrhand *intrlev[MAXINTNUM];
-void intr_establish __P((int level, struct intrhand *));
+void intr_establish(int level, struct intrhand *);
/* cpu.c */
-paddr_t cpu_alloc __P((void));
-u_int64_t cpu_init __P((paddr_t, int));
+paddr_t cpu_alloc(void);
+u_int64_t cpu_init(paddr_t, int);
/* disksubr.c */
struct dkbad;
-int isbad __P((struct dkbad *bt, int, int, int));
+int isbad(struct dkbad *bt, int, int, int);
/* machdep.c */
-int ldcontrolb __P((caddr_t));
-void dumpconf __P((void));
-caddr_t reserve_dumppages __P((caddr_t));
+int ldcontrolb(caddr_t);
+void dumpconf(void);
+caddr_t reserve_dumppages(caddr_t);
/* clock.c */
struct timeval;
-int tickintr __P((void *)); /* level 10 (tick) interrupt code */
-int clockintr __P((void *));/* level 10 (clock) interrupt code */
-int statintr __P((void *)); /* level 14 (statclock) interrupt code */
+int tickintr(void *); /* level 10 (tick) interrupt code */
+int clockintr(void *);/* level 10 (clock) interrupt code */
+int statintr(void *); /* level 14 (statclock) interrupt code */
/* locore.s */
struct fpstate64;
-void savefpstate __P((struct fpstate64 *));
-void loadfpstate __P((struct fpstate64 *));
-u_int64_t probeget __P((paddr_t, int, int));
-int probeset __P((paddr_t, int, int, u_int64_t));
+void savefpstate(struct fpstate64 *);
+void loadfpstate(struct fpstate64 *);
+u_int64_t probeget(paddr_t, int, int);
+int probeset(paddr_t, int, int, u_int64_t);
#if 0
-void write_all_windows __P((void));
-void write_user_windows __P((void));
+void write_all_windows(void);
+void write_user_windows(void);
#else
#define write_all_windows() __asm __volatile("flushw" : : )
#define write_user_windows() __asm __volatile("flushw" : : )
#endif
-void proc_trampoline __P((void));
+void proc_trampoline(void);
struct pcb;
-void snapshot __P((struct pcb *));
-struct frame *getfp __P((void));
-int xldcontrolb __P((caddr_t, struct pcb *));
-void copywords __P((const void *, void *, size_t));
-void qcopy __P((const void *, void *, size_t));
-void qzero __P((void *, size_t));
-void switchtoctx __P((int));
+void snapshot(struct pcb *);
+struct frame *getfp(void);
+int xldcontrolb(caddr_t, struct pcb *);
+void copywords(const void *, void *, size_t);
+void qcopy(const void *, void *, size_t);
+void qzero(void *, size_t);
+void switchtoctx(int);
/* locore2.c */
-void remrq __P((struct proc *));
+void remrq(struct proc *);
/* trap.c */
-void kill_user_windows __P((struct proc *));
-int rwindow_save __P((struct proc *));
+void kill_user_windows(struct proc *);
+int rwindow_save(struct proc *);
/* amd7930intr.s */
-void amd7930_trap __P((void));
+void amd7930_trap(void);
/* cons.c */
-int cnrom __P((void));
+int cnrom(void);
/* zs.c */
void zsconsole __P((struct tty *, int, int, void (**)(struct tty *, int)));
#ifdef KGDB
-void zs_kgdb_init __P((void));
+void zs_kgdb_init(void);
#endif
/* fb.c */
-void fb_unblank __P((void));
+void fb_unblank(void);
/* kgdb_stub.c */
#ifdef KGDB
void kgdb_attach __P((int (*)(void *), void (*)(void *, int), void *));
-void kgdb_connect __P((int));
-void kgdb_panic __P((void));
+void kgdb_connect(int);
+void kgdb_panic(void);
#endif
/* emul.c */
-int fixalign __P((struct proc *, struct trapframe64 *));
-int emulinstr __P((vaddr_t, struct trapframe64 *));
+int fixalign(struct proc *, struct trapframe64 *);
+int emulinstr(vaddr_t, struct trapframe64 *);
/*
*
@@ -334,8 +334,8 @@ struct trapvec {
};
extern struct trapvec *trapbase; /* the 256 vectors */
-extern void wzero __P((void *, u_int));
-extern void wcopy __P((const void *, void *, u_int));
+extern void wzero(void *, u_int);
+extern void wcopy(const void *, void *, u_int);
#endif /* _KERNEL */
#endif /* _CPU_H_ */
diff --git a/sys/arch/sparc64/include/ctlreg.h b/sys/arch/sparc64/include/ctlreg.h
index fcc82e12124..c743d2ae71d 100644
--- a/sys/arch/sparc64/include/ctlreg.h
+++ b/sys/arch/sparc64/include/ctlreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ctlreg.h,v 1.3 2001/09/20 21:08:50 jason Exp $ */
+/* $OpenBSD: ctlreg.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: ctlreg.h,v 1.28 2001/08/06 23:55:34 eeh Exp $ */
/*
@@ -443,24 +443,24 @@
* D$ so we need to flush the D$ to make sure we don't get data pollution.
*/
-static __inline__ u_char lduba __P((paddr_t loc, int asi));
-static __inline__ u_short lduha __P((paddr_t loc, int asi));
-static __inline__ u_int lda __P((paddr_t loc, int asi));
-static __inline__ int ldswa __P((paddr_t loc, int asi));
-static __inline__ u_int64_t ldxa __P((paddr_t loc, int asi));
-static __inline__ u_int64_t ldda __P((paddr_t loc, int asi));
+static __inline__ u_char lduba(paddr_t loc, int asi);
+static __inline__ u_short lduha(paddr_t loc, int asi);
+static __inline__ u_int lda(paddr_t loc, int asi);
+static __inline__ int ldswa(paddr_t loc, int asi);
+static __inline__ u_int64_t ldxa(paddr_t loc, int asi);
+static __inline__ u_int64_t ldda(paddr_t loc, int asi);
-static __inline__ void stba __P((paddr_t loc, int asi, u_char value));
-static __inline__ void stha __P((paddr_t loc, int asi, u_short value));
-static __inline__ void sta __P((paddr_t loc, int asi, u_int value));
-static __inline__ void stxa __P((paddr_t loc, int asi, u_int64_t value));
-static __inline__ void stda __P((paddr_t loc, int asi, u_int64_t value));
+static __inline__ void stba(paddr_t loc, int asi, u_char value);
+static __inline__ void stha(paddr_t loc, int asi, u_short value);
+static __inline__ void sta(paddr_t loc, int asi, u_int value);
+static __inline__ void stxa(paddr_t loc, int asi, u_int64_t value);
+static __inline__ void stda(paddr_t loc, int asi, u_int64_t value);
#if 0
-static __inline__ unsigned int casa __P((paddr_t loc, int asi,
- unsigned int value, unsigned int oldvalue));
-static __inline__ u_int64_t casxa __P((paddr_t loc, int asi,
- u_int64_t value, u_int64_t oldvalue));
+static __inline__ unsigned int casa(paddr_t loc, int asi,
+ unsigned int value, unsigned int oldvalue);
+static __inline__ u_int64_t casxa(paddr_t loc, int asi,
+ u_int64_t value, u_int64_t oldvalue);
#endif
#ifdef __arch64__
@@ -1120,5 +1120,5 @@ casxa(paddr_t loc, int asi, u_int64_t value, u_int64_t oldvalue)
})
#endif
-extern void next_tick __P((long));
+extern void next_tick(long);
#endif
diff --git a/sys/arch/sparc64/include/db_machdep.h b/sys/arch/sparc64/include/db_machdep.h
index 6bbbf6af44d..80c00ed7571 100644
--- a/sys/arch/sparc64/include/db_machdep.h
+++ b/sys/arch/sparc64/include/db_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_machdep.h,v 1.5 2001/11/06 19:53:16 miod Exp $ */
+/* $OpenBSD: db_machdep.h,v 1.6 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: db_machdep.h,v 1.12 2001/07/07 15:16:13 eeh Exp $ */
/*
@@ -111,15 +111,15 @@ db_regs_t ddb_regs; /* register state */
*/
#define SOFTWARE_SSTEP
-boolean_t db_inst_trap_return __P((int inst));
-boolean_t db_inst_return __P((int inst));
-boolean_t db_inst_call __P((int inst));
-boolean_t db_inst_branch __P((int inst));
-int db_inst_load __P((int inst));
-int db_inst_store __P((int inst));
-boolean_t db_inst_unconditional_flow_transfer __P((int inst));
-db_addr_t db_branch_taken __P((int inst, db_addr_t pc, db_regs_t *regs));
-void db_machine_init __P((void));
+boolean_t db_inst_trap_return(int inst);
+boolean_t db_inst_return(int inst);
+boolean_t db_inst_call(int inst);
+boolean_t db_inst_branch(int inst);
+int db_inst_load(int inst);
+int db_inst_store(int inst);
+boolean_t db_inst_unconditional_flow_transfer(int inst);
+db_addr_t db_branch_taken(int inst, db_addr_t pc, db_regs_t *regs);
+void db_machine_init(void);
#define inst_trap_return(ins) db_inst_trap_return(ins)
#define inst_return(ins) db_inst_return(ins)
@@ -138,8 +138,8 @@ void db_machine_init __P((void));
#define DB_MACHINE_COMMANDS
-void db_machine_init __P((void));
-int kdb_trap __P((int, struct trapframe64 *));
+void db_machine_init(void);
+int kdb_trap(int, struct trapframe64 *);
/*
* We will use elf symbols in DDB when they work.
diff --git a/sys/arch/sparc64/include/eeprom.h b/sys/arch/sparc64/include/eeprom.h
index c921013370e..ae4bcf1d4a6 100644
--- a/sys/arch/sparc64/include/eeprom.h
+++ b/sys/arch/sparc64/include/eeprom.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: eeprom.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */
+/* $OpenBSD: eeprom.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: eeprom.h,v 1.2 1999/12/30 16:25:17 eeh Exp $ */
/*
@@ -179,6 +179,6 @@ struct eeprom {
#ifdef _KERNEL
extern char *eeprom_va;
-int eeprom_uio __P((struct uio *));
+int eeprom_uio(struct uio *);
#endif /* _KERNEL */
diff --git a/sys/arch/sparc64/include/float.h b/sys/arch/sparc64/include/float.h
index 47c5db6209e..ba7396ae0ad 100644
--- a/sys/arch/sparc64/include/float.h
+++ b/sys/arch/sparc64/include/float.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: float.h,v 1.2 2001/09/28 15:18:52 jason Exp $ */
+/* $OpenBSD: float.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: float.h,v 1.3 2001/09/21 20:48:02 eeh Exp $ */
/*
@@ -51,7 +51,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
-int __flt_rounds __P((void));
+int __flt_rounds(void);
__END_DECLS
#define FLT_RADIX 2 /* b */
diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h
index bfc6617b869..4ea39b564b4 100644
--- a/sys/arch/sparc64/include/intr.h
+++ b/sys/arch/sparc64/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.1 2001/08/18 04:16:40 jason Exp $ */
+/* $OpenBSD: intr.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */
/*-
@@ -58,7 +58,7 @@ void *
softintr_establish __P((int level, void (*fun)(void *), void *arg));
void
-softintr_disestablish __P((void *cookie));
+softintr_disestablish(void *cookie);
void
-softintr_schedule __P((void *cookie));
+softintr_schedule(void *cookie);
diff --git a/sys/arch/sparc64/include/netbsd_machdep.h b/sys/arch/sparc64/include/netbsd_machdep.h
index 1081611f25b..234d2521062 100644
--- a/sys/arch/sparc64/include/netbsd_machdep.h
+++ b/sys/arch/sparc64/include/netbsd_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_machdep.h,v 1.1 2001/09/06 10:45:41 art Exp $ */
+/* $OpenBSD: netbsd_machdep.h,v 1.2 2002/03/14 01:26:45 millert Exp $ */
#ifndef _NETBSD_MACHDEP_H
#define _NETBSD_MACHDEP_H
@@ -16,7 +16,7 @@ struct netbsd_sigcontext {
};
#ifdef _KERNEL
-void netbsd_sendsig __P((sig_t, int, int, u_long, int, union sigval));
+void netbsd_sendsig(sig_t, int, int, u_long, int, union sigval);
#endif
#endif /* _NETBSD_MACHDEP_H */
diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 492c7b33bac..6f516d5d467 100644
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.7 2002/02/19 05:22:57 jason Exp $ */
+/* $OpenBSD: param.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */
/*
@@ -263,12 +263,12 @@ extern struct map *dvmamap;
#define rctov(n) (ctob(((n)-1))+dvma_base)
#define vtorc(v) ((btoc((v)-dvma_base))+1)
-extern caddr_t kdvma_mapin __P((caddr_t, int, int));
-extern caddr_t dvma_malloc __P((size_t, void *, int));
-extern void dvma_free __P((caddr_t, size_t, void *));
+extern caddr_t kdvma_mapin(caddr_t, int, int);
+extern caddr_t dvma_malloc(size_t, void *, int);
+extern void dvma_free(caddr_t, size_t, void *);
#endif
-extern void delay __P((unsigned int));
+extern void delay(unsigned int);
#define DELAY(n) delay(n)
extern int cputyp;
diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index 81e368c8e8c..250d5ffe4ea 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -156,31 +156,31 @@ typedef struct pmap *pmap_t;
extern struct pmap kernel_pmap_;
#define pmap_kernel() (&kernel_pmap_)
-int pmap_count_res __P((pmap_t pmap));
-/* int pmap_change_wiring __P((pmap_t pm, vaddr_t va, boolean_t wired)); */
+int pmap_count_res(pmap_t pmap);
+/* int pmap_change_wiring(pmap_t pm, vaddr_t va, boolean_t wired); */
#define pmap_resident_count(pm) pmap_count_res((pm))
#define pmap_from_phys_address(x,f) ((x)&~PGOFSET)
#define pmap_phys_address(x) (x)
#define pmap_update(pm) /* nothing (yet) */
-void pmap_bootstrap __P((u_long kernelstart, u_long kernelend, u_int numctx));
+void pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int numctx);
/* make sure all page mappings are modulo 16K to prevent d$ aliasing */
#define PMAP_PREFER(pa, va) (*(va)+=(((*(va))^(pa))&(1<<(PGSHIFT+1))))
#define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */
/* SPARC specific? */
-void pmap_redzone __P((void));
-int pmap_dumpsize __P((void));
-int pmap_dumpmmu __P((int (*)__P((dev_t, daddr_t, caddr_t, size_t)),
+void pmap_redzone(void);
+int pmap_dumpsize(void);
+int pmap_dumpmmu __P((int (*)(dev_t, daddr_t, caddr_t, size_t),
daddr_t));
-int pmap_pa_exists __P((paddr_t));
+int pmap_pa_exists(paddr_t);
struct proc;
-void switchexit __P((struct proc *));
+void switchexit(struct proc *);
/* SPARC64 specific */
-int ctx_alloc __P((struct pmap*));
-void ctx_free __P((struct pmap*));
+int ctx_alloc(struct pmap*);
+void ctx_free(struct pmap*);
#endif /* _KERNEL */
diff --git a/sys/arch/sparc64/include/psl.h b/sys/arch/sparc64/include/psl.h
index 0bad01843ec..392e4d4a738 100644
--- a/sys/arch/sparc64/include/psl.h
+++ b/sys/arch/sparc64/include/psl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psl.h,v 1.2 2001/08/18 19:46:04 art Exp $ */
+/* $OpenBSD: psl.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: psl.h,v 1.20 2001/04/13 23:30:05 thorpej Exp $ */
/*
@@ -253,14 +253,14 @@
#if defined(_KERNEL) && !defined(_LOCORE)
extern u_int64_t ver; /* Copy of v9 version register. We need to read this only once, in locore.s. */
-static __inline int getpstate __P((void));
-static __inline void setpstate __P((int));
-static __inline int getcwp __P((void));
-static __inline void setcwp __P((int));
+static __inline int getpstate(void);
+static __inline void setpstate(int);
+static __inline int getcwp(void);
+static __inline void setcwp(int);
#ifndef SPLDEBUG
-static __inline void splx __P((int));
+static __inline void splx(int);
#endif
-static __inline u_int64_t getver __P((void));
+static __inline u_int64_t getver(void);
/*
* GCC pseudo-functions for manipulating privileged registers
@@ -306,11 +306,11 @@ static __inline u_int64_t getver()
*/
#ifdef SPLDEBUG
-void prom_printf __P((const char *fmt, ...));
+void prom_printf(const char *fmt, ...);
extern int printspl;
#define SPLPRINT(x) if(printspl) { int i=10000000; prom_printf x ; while(i--); }
#define SPL(name, newpil) \
-static __inline int name##X __P((const char*, int)); \
+static __inline int name##X(const char*, int); \
static __inline int name##X(const char* file, int line) \
{ \
int oldpil; \
@@ -321,7 +321,7 @@ static __inline int name##X(const char* file, int line) \
}
/* A non-priority-decreasing version of SPL */
#define SPLHOLD(name, newpil) \
-static __inline int name##X __P((const char*, int)); \
+static __inline int name##X(const char*, int); \
static __inline int name##X(const char* file, int line) \
{ \
int oldpil; \
@@ -336,7 +336,7 @@ static __inline int name##X(const char* file, int line) \
#else
#define SPLPRINT(x)
#define SPL(name, newpil) \
-static __inline int name __P((void)); \
+static __inline int name(void); \
static __inline int name() \
{ \
int oldpil; \
@@ -346,7 +346,7 @@ static __inline int name() \
}
/* A non-priority-decreasing version of SPL */
#define SPLHOLD(name, newpil) \
-static __inline int name __P((void)); \
+static __inline int name(void); \
static __inline int name() \
{ \
int oldpil; \
@@ -446,7 +446,7 @@ static __inline void splx(newpil)
#define splhigh() splhighX(__FILE__, __LINE__)
#define splx(x) splxX((x),__FILE__, __LINE__)
-static __inline void splxX __P((int, const char*, int));
+static __inline void splxX(int, const char*, int);
static __inline void splxX(newpil, file, line)
int newpil, line;
const char* file;
diff --git a/sys/arch/sparc64/include/pte.h b/sys/arch/sparc64/include/pte.h
index 99215cc82d0..a85a5fd35cb 100644
--- a/sys/arch/sparc64/include/pte.h
+++ b/sys/arch/sparc64/include/pte.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pte.h,v 1.2 2001/08/20 20:23:52 jason Exp $ */
+/* $OpenBSD: pte.h,v 1.3 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: pte.h,v 1.7 2001/07/31 06:55:46 eeh Exp $ */
/*
@@ -121,8 +121,8 @@ struct sun4u_tte {
typedef struct sun4u_tte pte_t;
/* Assembly routine to flush a mapping */
-extern void tlb_flush_pte __P((vaddr_t addr, int ctx));
-extern void tlb_flush_ctx __P((int ctx));
+extern void tlb_flush_pte(vaddr_t addr, int ctx);
+extern void tlb_flush_ctx(int ctx);
#endif /* _LOCORE */
diff --git a/sys/arch/sparc64/include/sparc64.h b/sys/arch/sparc64/include/sparc64.h
index 8d09eebce45..d5169df257a 100644
--- a/sys/arch/sparc64/include/sparc64.h
+++ b/sys/arch/sparc64/include/sparc64.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sparc64.h,v 1.3 2001/09/26 17:32:19 deraadt Exp $ */
+/* $OpenBSD: sparc64.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: sparc64.h,v 1.3 2000/10/20 05:47:03 mrg Exp $ */
/*
@@ -39,17 +39,17 @@ struct mem_region {
u_int64_t size;
};
-int prom_set_trap_table __P((vaddr_t tba));
-paddr_t prom_vtop __P((vaddr_t vaddr));
-vaddr_t prom_claim_virt __P((vaddr_t vaddr, int len));
-vaddr_t prom_alloc_virt __P((int len, int align));
-int prom_free_virt __P((vaddr_t vaddr, int len));
-int prom_unmap_virt __P((vaddr_t vaddr, int len));
-int prom_map_phys __P((paddr_t paddr, off_t size, vaddr_t vaddr, int mode));
-paddr_t prom_alloc_phys __P((int len, int align));
-paddr_t prom_claim_phys __P((paddr_t phys, int len));
-int prom_free_phys __P((paddr_t paddr, int len));
-paddr_t prom_get_msgbuf __P((int len, int align));
+int prom_set_trap_table(vaddr_t tba);
+paddr_t prom_vtop(vaddr_t vaddr);
+vaddr_t prom_claim_virt(vaddr_t vaddr, int len);
+vaddr_t prom_alloc_virt(int len, int align);
+int prom_free_virt(vaddr_t vaddr, int len);
+int prom_unmap_virt(vaddr_t vaddr, int len);
+int prom_map_phys(paddr_t paddr, off_t size, vaddr_t vaddr, int mode);
+paddr_t prom_alloc_phys(int len, int align);
+paddr_t prom_claim_phys(paddr_t phys, int len);
+int prom_free_phys(paddr_t paddr, int len);
+paddr_t prom_get_msgbuf(int len, int align);
/*
* Compatibility stuff.
@@ -62,15 +62,15 @@ paddr_t prom_get_msgbuf __P((int len, int align));
*
* Not sure whether boot itself should be implementation dependent instead. XXX
*/
-void ppc_exit __P((void)) __attribute__((__noreturn__));
-void ppc_boot __P((char *bootspec)) __attribute__((__noreturn__));
+void ppc_exit(void) __attribute__((__noreturn__));
+void ppc_boot(char *bootspec) __attribute__((__noreturn__));
-int dk_match __P((char *name));
+int dk_match(char *name);
-void ofrootfound __P((void));
+void ofrootfound(void);
/*
* Debug
*/
-void prom_printf __P((const char *, ...));
+void prom_printf(const char *, ...);
#endif /* _MACHINE_SPARC64_H_ */
diff --git a/sys/arch/sparc64/include/vmparam.h b/sys/arch/sparc64/include/vmparam.h
index 8889e84b2ce..3a940230deb 100644
--- a/sys/arch/sparc64/include/vmparam.h
+++ b/sys/arch/sparc64/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.7 2002/02/17 22:59:53 maja Exp $ */
+/* $OpenBSD: vmparam.h,v 1.8 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: vmparam.h,v 1.18 2001/05/01 02:19:19 thorpej Exp $ */
/*
@@ -172,7 +172,7 @@ struct pmap_physseg {
#if defined (_KERNEL) && !defined(_LOCORE)
struct vm_map;
-vaddr_t dvma_mapin __P((struct vm_map *, vaddr_t, int, int));
-void dvma_mapout __P((vaddr_t, vaddr_t, int));
+vaddr_t dvma_mapin(struct vm_map *, vaddr_t, int, int);
+void dvma_mapout(vaddr_t, vaddr_t, int);
#endif
#endif
diff --git a/sys/arch/sparc64/include/z8530var.h b/sys/arch/sparc64/include/z8530var.h
index 402212b0eb5..3f2a2672d26 100644
--- a/sys/arch/sparc64/include/z8530var.h
+++ b/sys/arch/sparc64/include/z8530var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530var.h,v 1.3 2001/08/21 21:42:30 jason Exp $ */
+/* $OpenBSD: z8530var.h,v 1.4 2002/03/14 01:26:45 millert Exp $ */
/* $NetBSD: z8530var.h,v 1.4 2000/11/08 23:41:42 eeh Exp $ */
/*
@@ -86,13 +86,13 @@ struct zsc_softc {
* about the function call overhead where ZS_DELAY does nothing.
*/
-u_char zs_read_reg __P((struct zs_chanstate *cs, u_char reg));
-u_char zs_read_csr __P((struct zs_chanstate *cs));
-u_char zs_read_data __P((struct zs_chanstate *cs));
+u_char zs_read_reg(struct zs_chanstate *cs, u_char reg);
+u_char zs_read_csr(struct zs_chanstate *cs);
+u_char zs_read_data(struct zs_chanstate *cs);
-void zs_write_reg __P((struct zs_chanstate *cs, u_char reg, u_char val));
-void zs_write_csr __P((struct zs_chanstate *cs, u_char val));
-void zs_write_data __P((struct zs_chanstate *cs, u_char val));
+void zs_write_reg(struct zs_chanstate *cs, u_char reg, u_char val);
+void zs_write_csr(struct zs_chanstate *cs, u_char val);
+void zs_write_data(struct zs_chanstate *cs, u_char val);
/* The sparc has splzs() in psl.h */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 10:02:40 +0000