wrap function protos in __P()

2 files changed, 58 insertions, 58 deletions

diff --git a/sys/arch/sparc/include/bsd_openprom.h b/sys/arch/sparc/include/bsd_openprom.h
index f9f27546cd2..1879ea5909d 100644
--- a/sys/arch/sparc/include/bsd_openprom.h
+++ b/sys/arch/sparc/include/bsd_openprom.h
@@ -68,15 +68,15 @@
  * and so forth).
  */
 struct v0devops {
-	int	(*v0_open)(char *dev);
-	int	(*v0_close)(int d);
-	int	(*v0_rbdev)(int d, int nblks, int blkno, caddr_t addr);	
-	int	(*v0_wbdev)(int d, int nblks, int blkno, caddr_t addr);	
-	int	(*v0_wnet)(int d, int nbytes, caddr_t addr);
-	int	(*v0_rnet)(int d, int nbytes, caddr_t addr);
-	int	(*v0_rcdev)(int d, int nbytes, int, caddr_t addr);
-	int	(*v0_wcdev)(int d, int nbytes, int, caddr_t addr);
-	int	(*v0_seek)(int d, long offset, int whence);
+	int	(*v0_open) __P((char *dev));
+	int	(*v0_close) __P((int d));
+	int	(*v0_rbdev) __P((int d, int nblks, int blkno, caddr_t addr));
+	int	(*v0_wbdev) __P((int d, int nblks, int blkno, caddr_t addr));
+	int	(*v0_wnet) __P((int d, int nbytes, caddr_t addr));
+	int	(*v0_rnet) __P((int d, int nbytes, caddr_t addr));
+	int	(*v0_rcdev) __P((int d, int nbytes, int, caddr_t addr));
+	int	(*v0_wcdev) __P((int d, int nbytes, int, caddr_t addr));
+	int	(*v0_seek) __P((int d, long offset, int whence));
 };
 
 /*
@@ -94,25 +94,25 @@ struct v2devops {
 	 * Convert an `instance handle' (acquired through v2_open()) to
 	 * a `package handle', a.k.a. a `node'.
 	 */
-	int	(*v2_fd_phandle)(int d);
+	int	(*v2_fd_phandle) __P((int d));
 
 	/* Memory allocation and release. */
-	caddr_t	(*v2_malloc)(caddr_t va, u_int sz);
-	void	(*v2_free)(caddr_t va, u_int sz);
+	caddr_t	(*v2_malloc) __P((caddr_t va, u_int sz));
+	void	(*v2_free) __P((caddr_t va, u_int sz));
 
 	/* Device memory mapper. */
-	caddr_t	(*v2_mmap)(caddr_t va, int asi, u_int pa, u_int sz);
-	void	(*v2_munmap)(caddr_t va, u_int sz);
+	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));
 
 	/* Device open, close, etc. */
-	int	(*v2_open)(char *devpath);
-	void	(*v2_close)(int d);
-	int	(*v2_read)(int d, caddr_t buf, int nbytes);
-	int	(*v2_write)(int d, caddr_t buf, int nbytes);
-	void	(*v2_seek)(int d, int hi, int lo);
-
-	void	(*v2_xxx2)();		/* ??? */
-	void	(*v2_xxx3)();		/* ??? */
+	int	(*v2_open) __P((char *devpath));
+	void	(*v2_close) __P((int d));
+	int	(*v2_read) __P((int d, caddr_t buf, int nbytes));
+	int	(*v2_write) __P((int d, caddr_t buf, int nbytes));
+	void	(*v2_seek) __P((int d, int hi, int lo));
+
+	void	(*v2_xxx2) __P(());		/* ??? */
+	void	(*v2_xxx3) __P(());		/* ??? */
 };
 
 /*
@@ -202,37 +202,37 @@ struct promvec {
 #define	PROMDEV_TTYB	2		/* in/out to ttyb */
 
 	/* Blocking getchar/putchar.  NOT REENTRANT! (grr) */
-	int	(*pv_getchar)(void);
-	void	(*pv_putchar)(int ch);
+	int	(*pv_getchar) __P((void));
+	void	(*pv_putchar) __P((int ch));
 
 	/* Non-blocking variants that return -1 on error. */
-	int	(*pv_nbgetchar)(void);
-	int	(*pv_nbputchar)(int ch);
+	int	(*pv_nbgetchar) __P((void));
+	int	(*pv_nbputchar) __P((int ch));
 
 	/* Put counted string (can be very slow). */
-	void	(*pv_putstr)(char *str, int len);
+	void	(*pv_putstr) __P((char *str, int len));
 
 	/* Miscellany. */
-	void	(*pv_reboot)(char *bootstr);
-	void	(*pv_printf)(const char *fmt, ...);
-	void	(*pv_abort)(void);	/* L1-A abort */
+	void	(*pv_reboot) __P((char *bootstr));
+	void	(*pv_printf) __P((const char *fmt, ...));
+	void	(*pv_abort) __P((void));	/* L1-A abort */
 	int	*pv_ticks;		/* Ticks since last reset */
-	__dead void (*pv_halt)(void);	/* Halt! */
-	void	(**pv_synchook)(void);	/* "sync" command hook */
+	__dead void (*pv_halt) __P((void));	/* Halt! */
+	void	(**pv_synchook) __P((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)(int len, char *str);
-		void	(*v2_eval)(char *str);
+		void	(*v0_eval) __P((int len, char *str));
+		void	(*v2_eval) __P((char *str));
 	} pv_fortheval;
 
 	struct	v0bootargs **pv_v0bootargs;	/* V0: Boot args */
 
 	/* Extract Ethernet address from network device. */
-	u_int	(*pv_enaddr)(int d, char *enaddr);
+	u_int	(*pv_enaddr) __P((int d, char *enaddr));
 
 	struct	v2bootargs pv_v2bootargs;	/* V2: Boot args + std in/out */
 	struct	v2devops pv_v2devops;	/* V2: device operations */
@@ -250,14 +250,14 @@ struct promvec {
 	 * all memory references go to the PROM, so the PROM can do it
 	 * easily.
 	 */
-	void	(*pv_setctxt)(int ctxt, caddr_t va, int pmeg);
+	void	(*pv_setctxt) __P((int ctxt, caddr_t va, int pmeg));
 
 	/* OpenPROM V3 SMP cpu-control directives. */
-	int     (*pv_cpustart)(int cpu_node, caddr_t ctxttbl_paddr,
-			       int ctxt, caddr_t pc);
-	int     (*pv_cpustop)(int cpu_node);
-	int     (*pv_cpuidle)(int cpu_node);
-	int     (*pv_cpuresume)(int cpu_node);
+	int     (*pv_cpustart) __P((int cpu_node, caddr_t ctxttbl_paddr,
+			       int ctxt, caddr_t pc));
+	int     (*pv_cpustop) __P((int cpu_node));
+	int     (*pv_cpuidle) __P((int cpu_node));
+	int     (*pv_cpuresume) __P((int cpu_node));
 };
 
 /*
@@ -294,16 +294,16 @@ struct nodeops {
 	/*
 	 * Tree traversal.
 	 */
-	int	(*no_nextnode)(int node);	/* next(node) */
-	int	(*no_child)(int node);	/* first child */
+	int	(*no_nextnode) __P((int node));	/* next(node) */
+	int	(*no_child) __P((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)(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);
+	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));
 };
diff --git a/sys/arch/sparc/include/oldmon.h b/sys/arch/sparc/include/oldmon.h
index b7b176f1bc9..02cbf052656 100644
--- a/sys/arch/sparc/include/oldmon.h
+++ b/sys/arch/sparc/include/oldmon.h
@@ -129,10 +129,10 @@ struct om_vector {
  	u_long	*memorySize;		/* Usable memory in bytes */
 
 	/* Single-character input and output */
-	int	(*getChar)(void);	/* Get char from input source */
-	void	(*putChar)(int);	/* Put char to output sink */
-	int	(*mayGet)(void);	/* Maybe get char, or -1 */
-	int	(*mayPut)(int);		/* Maybe put char, or -1 */
+	int	(*getChar) __P((void));	/* Get char from input source */
+	void	(*putChar) __P((int));	/* Put char to output sink */
+	int	(*mayGet) __P((void));	/* Maybe get char, or -1 */
+	int	(*mayPut) __P((int));	/* Maybe put char, or -1 */
 	u_char	*echo;			/* Should getchar echo? */
 	u_char	*inSource;		/* Input source selector */
 	u_char	*outSink;		/* Output sink selector */
@@ -157,10 +157,10 @@ struct om_vector {
 	int	(*fbWriteChar)();	/* Write a character to FB */
 	int	*fbAddr;		/* Address of frame buffer */
 	char	**font;			/* Font table for FB */
-	void	(*fbWriteStr)(char *, int); /* Quickly write string to FB */
+	void	(*fbWriteStr) __P((char *, int)); /* Quickly write string to FB */
 
 	/* Reboot interface routine -- resets and reboots system. */
-	void	(*reBoot)(char *);	/* e.g. reBoot("xy()vmunix") */
+	void	(*reBoot) __P((char *));	/* e.g. reBoot("xy()vmunix") */
 
 	/* Line input and parsing */
 	u_char	*lineBuf;		/* The line input buffer */
@@ -182,7 +182,7 @@ struct om_vector {
 
 	/* Non-maskable interrupt  (nmi) information */ 
 	int	(*nmiAddr)();		/* Addr for level 7 vector */
-	void	(*abortEntry)(void);	/* Entry for keyboard abort */
+	void	(*abortEntry) __P((void));	/* Entry for keyboard abort */
 	int	*nmiClock;		/* Counts up in msec */
 
 	/* Frame buffer type: see <machine/fbio.h> */
@@ -200,7 +200,7 @@ struct om_vector {
 	long	*resetMap;		/* pgmap entry for resetaddr */
 					/* Really struct pgmapent *  */
 
-	__dead void (*exitToMon)(void);	/* Exit from user program */
+	__dead void (*exitToMon) __P((void));	/* Exit from user program */
 	u_char	**memorybitmap;		/* V1: &{0 or &bits} */
 	void	(*setcxsegmap)();	/* Set seg in any context */
 	void	(**vector_cmd)();	/* V2: Handler for 'v' cmd */
@@ -288,11 +288,11 @@ struct saioreq {
  */
 struct saif {
 	/* transmit packet, returns zero on success. */
-	int	(*sif_xmit)(void *devdata, char *buf, int len);
+	int	(*sif_xmit) __P((void *devdata, char *buf, int len));
 	/* wait for packet, zero if none arrived */
-	int	(*sif_poll)(void *devdata, char *buf);
+	int	(*sif_poll) __P((void *devdata, char *buf));
 	/* reset interface, set addresses, etc. */
-	int	(*sif_reset)(void *devdata, struct saioreq *sip);
+	int	(*sif_reset) __P((void *devdata, struct saioreq *sip));
 	/* Later (sun4 only) proms have more stuff here. */
 };
 #endif /* MACHINE_OLDMON_H */