ansify; ok kettenis@

1 files changed, 23 insertions, 63 deletions

diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c
index ce350aabe20..ff9b77271f5 100644
--- a/sys/arch/sparc64/sparc64/autoconf.c
+++ b/sys/arch/sparc64/sparc64/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.120 2014/07/12 18:44:43 tedu Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.121 2014/09/26 09:45:59 stsp Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.51 2001/07/24 19:32:11 eeh Exp $ */
 
 /*
@@ -273,8 +273,7 @@ done:
  * We will try to run out of the prom until we get to cpu_init().
  */
 void
-bootstrap(nctx)
-	int nctx;
+bootstrap(int nctx)
 {
 	extern int end;	/* End of kernel */
 	struct trapvec *romtba;
@@ -588,8 +587,7 @@ bootpath_build()
  */
 
 static void
-bootpath_print(bp)
-	struct bootpath *bp;
+bootpath_print(struct bootpath *bp)
 {
 	printf("bootpath: ");
 	while (bp->name[0]) {
@@ -613,9 +611,7 @@ bootpath_print(bp)
  * device_register(), and use this to recover the bootpath.
  */
 struct bootpath *
-bootpath_store(storep, bp)
-	int storep;
-	struct bootpath *bp;
+bootpath_store(int storep, struct bootpath *bp)
 {
 	static struct bootpath *save;
 	struct bootpath *retval;
@@ -745,8 +741,7 @@ sync_crash()
 }
 
 char *
-clockfreq(freq)
-	long freq;
+clockfreq(long freq)
 {
 	char *p;
 	static char buf[10];
@@ -765,9 +760,7 @@ clockfreq(freq)
 
 /* ARGSUSED */
 static int
-mbprint(aux, name)
-	void *aux;
-	const char *name;
+mbprint(void *aux, const char *name)
 {
 	struct mainbus_attach_args *ma = aux;
 
@@ -783,7 +776,7 @@ mbprint(aux, name)
 int
 findroot()
 {
-	register int node;
+	int node;
 
 	if ((node = rootnode) == 0 && (node = OF_peer(0)) == 0)
 		panic("no PROM root device");
@@ -796,9 +789,7 @@ findroot()
  * Return the node number, or 0 if not found.
  */
 int
-findnode(first, name)
-	int first;
-	register const char *name;
+findnode(int first, const char *name)
 {
 	int node;
 	char buf[32];
@@ -812,12 +803,8 @@ findnode(first, name)
 }
 
 int
-mainbus_match(parent, cf, aux)
-	struct device *parent;
-	void *cf;
-	void *aux;
+mainbus_match(struct device *parent, void *cf, void *aux)
 {
-
 	return (1);
 }
 
@@ -829,9 +816,7 @@ mainbus_match(parent, cf, aux)
  * We also record the `node id' of the default frame buffer, if any.
  */
 static void
-mainbus_attach(parent, dev, aux)
-	struct device *parent, *dev;
-	void *aux;
+mainbus_attach(struct device *parent, struct device *dev, void *aux)
 {
 extern struct sparc_bus_dma_tag mainbus_dma_tag;
 extern bus_space_tag_t mainbus_space_tag;
@@ -1073,12 +1058,7 @@ struct cfattach mainbus_ca = {
 };
 
 int
-getprop(node, name, size, nitem, bufp)
-	int	node;
-	char	*name;
-	size_t	size;
-	int	*nitem;
-	void	**bufp;
+getprop(int node, char *name, size_t size, int *nitem, void **bufp)
 {
 	void	*buf;
 	long	len;
@@ -1110,9 +1090,7 @@ getprop(node, name, size, nitem, bufp)
  * Internal form of proplen().  Returns the property length.
  */
 long
-getproplen(node, name)
-	int node;
-	char *name;
+getproplen(int node, char *name)
 {
 	return (OF_getproplen(node, name));
 }
@@ -1123,9 +1101,7 @@ getproplen(node, name)
  * subsequent calls.
  */
 char *
-getpropstring(node, name)
-	int node;
-	char *name;
+getpropstring(int node, char *name)
 {
 	static char stringbuf[32];
 
@@ -1134,10 +1110,7 @@ getpropstring(node, name)
 
 /* Alternative getpropstring(), where caller provides the buffer */
 char *
-getpropstringA(node, name, buffer)
-	int node;
-	char *name;
-	char *buffer;
+getpropstringA(int node, char *name, char *buffer)
 {
 	int blen;
 
@@ -1153,10 +1126,7 @@ getpropstringA(node, name, buffer)
  * The return value is the property, or the default if there was none.
  */
 int
-getpropint(node, name, deflt)
-	int node;
-	char *name;
-	int deflt;
+getpropint(int node, char *name, int deflt)
 {
 	int intbuf;
 
@@ -1167,9 +1137,7 @@ getpropint(node, name, deflt)
 }
 
 int
-getpropspeed(node, name)
-	int node;
-	char *name;
+getpropspeed(int node, char *name)
 {
 	char buf[128];
 	int i, speed = 0;
@@ -1194,16 +1162,14 @@ getpropspeed(node, name)
  * from the rest of the kernel.
  */
 int
-firstchild(node)
-	int node;
+firstchild(int node)
 {
 
 	return OF_child(node);
 }
 
 int
-nextsibling(node)
-	int node;
+nextsibling(int node)
 {
 
 	return OF_peer(node);
@@ -1230,10 +1196,9 @@ checkstatus(int node)
 	return 1;
 }
 
+/* returns 1 if node has given property */
 int
-node_has_property(node, prop)	/* returns 1 if node has given property */
-	register int node;
-	register const char *prop;
+node_has_property(int node, const char *prop)
 {
 	return (OF_getproplen(node, (caddr_t)prop) != -1);
 }
@@ -1243,8 +1208,7 @@ node_has_property(node, prop)	/* returns 1 if node has given property */
  * variables.  Returns nonzero on error.
  */
 int
-romgetcursoraddr(rowp, colp)
-	int **rowp, **colp;
+romgetcursoraddr(int **rowp, int **colp)
 {
 	cell_t row = 0, col = 0;
 
@@ -1275,9 +1239,7 @@ callrom()
  * find a device matching "name" and unit number
  */
 struct device *
-getdevunit(name, unit)
-	char *name;
-	int unit;
+getdevunit(char *name, int unit)
 {
 	struct device *dev = TAILQ_FIRST(&alldevs);
 	char num[10], fullname[16];
@@ -1456,9 +1418,7 @@ device_register(struct device *dev, void *aux)
 }
 
 void
-nail_bootdev(dev, bp)
-	struct device *dev;
-	struct bootpath *bp;
+nail_bootdev(struct device *dev, struct bootpath *bp)
 {
 
 	if (bp->dev != NULL)