 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosdisk.h,v 1.6 2005/12/11 12:17:48 christos Exp $	*/
+/*	$NetBSD: biosdisk.h,v 1.7 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,14 +20,13 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 int biosdisk_strategy(void *, int, daddr_t, size_t, void *, size_t *);
 int biosdisk_open(struct open_file *, ...);
 int biosdisk_close(struct open_file *);
 int biosdisk_ioctl(struct open_file *, u_long, void *);
 int biosdisk_findpartition(int, u_int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biosmca.h,v 1.2 2008/04/28 20:23:25 martin Exp $	*/
+/*	$NetBSD: biosmca.h,v 1.3 2008/12/14 17:03:43 christos Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,16 +16,16 @@
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-void biosmca __P((void));
+void biosmca(void);
 extern int biosmca_ps2model;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bootmenu.c,v 1.2 2008/12/13 23:30:54 christos Exp $	*/
+/*	$NetBSD: bootmenu.c,v 1.3 2008/12/14 17:03:43 christos Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -59,27 +59,27 @@ atoi(const char *in)
 	ret = 0;
 	c = (char *)in;
 	if (*c == '-')
 		c++;
 	for (; isnum(*c); c++)
 		ret = (ret * 10) + (*c - '0');
 	return (*in == '-') ? -ret : ret;
+}
 /*
  * This function parses a boot.cfg file in the root of the filesystem
  * (if present) and populates the global boot configuration.
+ *
  * The file consists of a number of lines each terminated by \n
  * The lines are in the format keyword=value. There should not be spaces
  * around the = sign.
+ *
  * The recognised keywords are:
  * banner: text displayed instead of the normal welcome text
  * menu: Descriptive text:command to use
  * timeout: Timeout in seconds (overrides that set by installboot)
  * default: the default menu option to use if Return is pressed
  * consdev: the console device to use
  * format: how menu choices are displayed: (a)utomatic, (n)umbers or (l)etters
  * clear: whether to clear the screen or not
+ *
 @@ -95,79 +95,79 @@ atoi(const char *in)
  * default=1
 */
 void
 parsebootconf(const char *conf)
+{
 	char *bc, *c;
 	int cmenu, cbanner, len;
 	int fd, err, off;
 	struct stat st;
 	char *key, *value, *v2;
 	/* Clear bootconf structure */
 	bzero((void *)&bootconf, sizeof(bootconf));
 	/* Set timeout to configured */
 	bootconf.timeout = boot_params.bp_timeout;
 	/* automatically switch between letter and numbers on menu */
 	bootconf.menuformat = MENUFORMAT_AUTO;
 	fd = open(BOOTCONF, 0);
 	if (fd < 0)
 		return;
 	err = fstat(fd, &st);
 	if (err == -1) {
 		close(fd);
 		return;
+	}
 	bc = alloc(st.st_size + 1);
 	if (bc == NULL) {
 		printf("Could not allocate memory for boot configuration\n");
 		return;
+	}
 	off = 0;
 	do {
 		len = read(fd, bc + off, 1024);
 		if (len <= 0)
 			break;
 		off += len;
 	} while (len > 0);
 	bc[off] = '\0';
 	close(fd);
 	/* bc now contains the whole boot.cfg file */
 	cmenu = 0;
 	cbanner = 0;
 	for(c = bc; *c; c++) {
 		key = c;
 		/* Look for = separator between key and value */
 		for (; *c && *c != '='; c++)
 			continue;
 		if (*c == '\0')
 			break; /* break if at end of data */
 		/* zero terminate key which points to keyword */
 		*c++ = 0;
 		value = c;
 		/* Look for end of line (or file) and zero terminate value */
 		for (; *c && *c != '\n'; c++)
 			continue;
 		*c = 0;
 		if (!strncmp(key, "menu", 4)) {
 			/*
 			 * Parse "menu=<description>:<command>".  If the
 			 * description is empty ("menu=:<command>)",
 			 * then re-use the command as the description.
 			 * Note that the command may contain embedded
 			 * colons.
 			 */
 			if (cmenu >= MAXMENU)
 				continue;
 			bootconf.desc[cmenu] = value;
 			for (v2=value; *v2 && *v2 != ':'; v2++)
 				continue;
 @@ -216,33 +216,33 @@ parsebootconf(const char *conf)
 				break;
+			}
 		} else if (!strncmp(key, "clear", 5)) {
 			bootconf.clear = !!atoi(value);
+		}
+	}
 	switch (bootconf.menuformat) {
 	case MENUFORMAT_AUTO:
 		if (cmenu > 9 && bootconf.timeout > 0)
 			bootconf.menuformat = MENUFORMAT_LETTER;
 		else
 			bootconf.menuformat = MENUFORMAT_NUMBER;
 		break;
 	case MENUFORMAT_NUMBER:
 		if (cmenu > 9 && bootconf.timeout > 0)
 			cmenu = 9;
 		break;
+	}
 	bootconf.nummenu = cmenu;
 	if (bootconf.def < 0)
 		bootconf.def = 0;
 	if (bootconf.def >= cmenu)
 		bootconf.def = cmenu - 1;
+}
 /*
  * doboottypemenu will render the menu and parse any user input
  */
 static int
 getchoicefrominput(char *input, int def)
+{
 @@ -257,76 +257,76 @@ getchoicefrominput(char *input, int def)
 	else if (isnum(*input)) {
 		choice = atoi(input) - 1;
 		if (choice < 0 || choice >= bootconf.nummenu)
 			choice = -1;
+	}
 	return choice;
+}
 void
 doboottypemenu(void)
+{
 	int choice;
 	char input[80], *ic, *oc;
 	printf("\n");
 	/* Display menu */
 	if (bootconf.menuformat == MENUFORMAT_LETTER) {
 		for (choice = 0; choice < bootconf.nummenu; choice++)
 			printf("    %c. %s\n", choice + 'A',
 			    bootconf.desc[choice]);
 	} else {
 		/* Can't use %2d format string with libsa */
 		for (choice = 0; choice < bootconf.nummenu; choice++)
 			printf("    %s%d. %s\n",
 			    (choice < 9) ?  " " : "",
 			    choice + 1,
 			    bootconf.desc[choice]);
+	}
 	choice = -1;
 	for(;;) {
 		input[0] = '\0';
 		if (bootconf.timeout < 0) {
 			if (bootconf.menuformat == MENUFORMAT_LETTER)
 				printf("\nOption: [%c]:",
 				    bootconf.def + 'A');
 			else
 				printf("\nOption: [%d]:",
 				    bootconf.def + 1);
 			gets(input);
 			choice = getchoicefrominput(input, bootconf.def);
 		} else if (bootconf.timeout == 0)
 			choice = bootconf.def;
 		else  {
 			printf("\nChoose an option; RETURN for default; "
 			       "SPACE to stop countdown.\n");
 			if (bootconf.menuformat == MENUFORMAT_LETTER)
 				printf("Option %c will be chosen in ",
 				    bootconf.def + 'A');
 			else
 				printf("Option %d will be chosen in ",
 				    bootconf.def + 1);
 			input[0] = awaitkey(bootconf.timeout, 1);
 			input[1] = '\0';
 			choice = getchoicefrominput(input, bootconf.def);
 			/* If invalid key pressed, drop to menu */
 			if (choice == -1)
 				bootconf.timeout = -1;
+		}
 		if (choice < 0)
 			continue;
 		if (!strcmp(bootconf.command[choice], "prompt") &&
 		    ((boot_params.bp_flags & X86_BP_FLAGS_PASSWORD) == 0 ||
 		    check_password((char *)boot_params.bp_password))) {
 			printf("type \"?\" or \"help\" for help.\n");
 			bootmenu(); /* does not return */
 		} else {
 			ic = bootconf.command[choice];
 			/* Split command string at ; into separate commands */
 			do {
 				oc = input;
 				/* Look for ; separator */
 				for (; *ic && *ic != COMMAND_SEPARATOR; ic++)
 					*oc++ = *ic;
 				if (*input == '\0')
 @@ -334,18 +334,18 @@ doboottypemenu(void)
 				/* Strip out any trailing spaces */
 				oc--;
 				for (; *oc ==' ' && oc > input; oc--);
 				*++oc = '\0';
 				if (*ic == COMMAND_SEPARATOR)
 					ic++;
 				/* Stop silly command strings like ;;; */
 				if (*input != '\0')
 					docommand(input);
 				/* Skip leading spaces */
 				for (; *ic == ' '; ic++);
 			} while (*ic);
+		}
+	}
+}
 #endif	/* !SMALL */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: biospci.c,v 1.4 2005/12/11 12:17:48 christos Exp $	 */
+/*	$NetBSD: biospci.c,v 1.5 2008/12/14 17:03:43 christos Exp $	 */
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,81 +24,73 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /*
  * basic PCI functions for libsa needs lowlevel parts from bios_pci.S
  */
 #include <lib/libsa/stand.h>
 #include "pcivar.h"
-extern int pcibios_present __P((int *));
+extern int pcibios_present(int *);
-extern int pcibios_finddev __P((int, int, int, unsigned int *));
+extern int pcibios_finddev(int, int, int, unsigned int *);
-extern int pcibios_cfgread __P((unsigned int, int, int *));
+extern int pcibios_cfgread(unsigned int, int, int *);
-extern int pcibios_cfgwrite __P((unsigned int, int, int));
+extern int pcibios_cfgwrite(unsigned int, int, int);
 #define PCISIG ('P' | ('C' << 8) | ('I' << 16) | (' ' << 24))
 int
-pcicheck()
+pcicheck(void)
+{
 	int             ret, sig;
 	ret = pcibios_present(&sig);
 	if ((ret & 0xff00) || (sig != PCISIG))
-		return (-1);
+		return -1;
-	return (0);
+	return 0;
+}
 int
-pcifinddev(vid, did, handle)
+pcifinddev(int vid, int did, pcihdl_t *handle)
 	int             vid, did;
 	pcihdl_t       *handle;
+{
 	int             ret;
 	*handle = 0;
 	ret = pcibios_finddev(vid, did, 0, handle);
 	if (ret)
-		return (-1);
+		return -1;
-	return (0);
+	return 0;
+}
 int
-pcicfgread(handle, off, val)
+pcicfgread(pcihdl_t *handle, int off, int *val)
 	pcihdl_t       *handle;
 	int             off;
 	int            *val;
+{
 	int             ret;
 	ret = pcibios_cfgread(*handle, off, val);
 	if (ret)
-		return (-1);
+		return -1;
-	return (0);
+	return 0;
+}
 int
-pcicfgwrite(handle, off, val)
+pcicfgwrite(pcihdl_t *handle, int off, int val)
 	pcihdl_t       *handle;
 	int             off;
 	int             val;
+{
 	int             ret;
 	ret = pcibios_cfgwrite(*handle, off, val);
 	if (ret)
-		return (-1);
+		return -1;
-	return (0);
+	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bootinfo_memmap.c,v 1.4 2005/12/11 12:17:48 christos Exp $	*/
+/*	$NetBSD: bootinfo_memmap.c,v 1.5 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1999
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,30 +20,30 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <lib/libsa/stand.h>
 #include "libi386.h"
 #include "bootinfo.h"
-extern int getmementry __P((int *, int *));
+extern int getmementry(int *, int *);
 void
-bi_getmemmap()
+bi_getmemmap(void)
+{
 	int buf[5], i, nranges, n;
 	struct btinfo_memmap *bimm;
 	nranges = 0;
 	i = 0;
 	do {
 		if (getmementry(&i, buf))
 			break;
 		nranges++;
 	} while (i);
 	bimm = alloc(sizeof(struct btinfo_memmap)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isapnp.c,v 1.4 2005/12/11 12:17:48 christos Exp $	 */
+/*	$NetBSD: isapnp.c,v 1.5 2008/12/14 17:03:43 christos Exp $	 */
 /*
  * Copyright (c) 1997
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -53,150 +53,145 @@ enum {
 	RESDATA,
 	RESSTAT,
 	SETCSN,
 	SETLDEV
 };
 #define MEMBASE 0x40
 #define IOBASE 0x60
 #define INTBASE 0x70
 #define DMABASE 0x74
 static int      pnpdataport;
 static int
-getiobase(nr)
+getiobase(int nr)
 	int             nr;
+{
 	unsigned short  iobase;
 	outb(PNPADDR, SETLDEV);
 	outb(PNPWDATA, 0);	/* subdev 0 */
 	outb(PNPADDR, IOBASE + nr * 2);
 	iobase = (inb(pnpdataport) << 8);
 	outb(PNPADDR, IOBASE + nr * 2 + 1);
 	iobase |= inb(pnpdataport);
-	return (iobase);
+	return iobase;
+}
 static int
-getdmachan(nr)
+getdmachan(int nr)
 	int             nr;
+{
 	unsigned char   dmachannel;
 	outb(PNPADDR, SETLDEV);
 	outb(PNPWDATA, 0);	/* subdev 0 */
 	outb(PNPADDR, DMABASE + nr);
 	dmachannel = inb(pnpdataport) & 0x07;
-	return (dmachannel);
+	return dmachannel;
+}
 struct cardid {
 	unsigned char   eisaid[4];
 	unsigned int    serial;
 	unsigned char   crc;
 };
 /*
  do isolation, call pnpscanresc() in board config state
  */
 static int
-pnpisol(csn)
+pnpisol(int csn)
 	int             csn;
+{
 	unsigned char   buf[9];
 	int             i, j;
 	struct cardid  *id;
 	unsigned char   crc = 0x6a;
 	/*
 	 * do 72 pairs of reads from ISOL register all but 1 go to sleep
 	 * state (ch. 3.3)
 	 */
 	outb(PNPADDR, ISOL);
 	delay(1000);
 	for (i = 0; i < 9; i++) {
 		for (j = 0; j < 8; j++) {
 			unsigned char   a, b;
 			int             bitset;
 			a = inb(pnpdataport);
 			b = inb(pnpdataport);
 			if ((a == 0x55) && (b == 0xaa))
 				bitset = 1;
 			else if ((a == 0xff) && (b == 0xff))
 				bitset = 0;
 			else
-				return (-1);	/* data port conflict */
+				return -1;	/* data port conflict */
 			buf[i] = (buf[i] >> 1) | (bitset << 7);
 			if (i < 8)	/* calc crc for first 8 bytes (app.
 					 * B.2) */
 				crc = (crc >> 1) |
 				  ((bitset != ((crc & 1) == !(crc & 2))) << 7);
 			delay(250);
+		}
+	}
 	id = (struct cardid *) buf;
 	if (id->crc != crc)
-		return (0);	/* normal end */
+		return 0;	/* normal end */
 	outb(PNPADDR, SETCSN);
 	outb(PNPWDATA, csn);	/* set csn for winning card and put it to
 				 * config state */
-	return ((id->eisaid[0] << 24) | (id->eisaid[1] << 16)
+	return (id->eisaid[0] << 24) | (id->eisaid[1] << 16)
-		| (id->eisaid[2] << 8) | (id->eisaid[3]));
+		| (id->eisaid[2] << 8) | (id->eisaid[3]);
+}
 static void
-pnpisolreset()
+pnpisolreset(void)
+{
 	outb(PNPADDR, WAKE);
 	outb(PNPWDATA, 0);	/* put all remaining cards to isolation state */
+}
 /*
  send initiation sequence (app. B.1)
  */
 static void
-pnpinit()
+pnpinit(void)
+{
 	int             i;
 	unsigned char   key = 0x6a;
 	outb(PNPADDR, 0);
 	outb(PNPADDR, 0);
 	for (i = 0; i < 32; i++) {
 		outb(PNPADDR, key);
 		key = (key >> 1) |
 			(((key & 1) == !(key & 2)) << 7);
+	}
+}
 int
-isapnp_finddev(id, iobase, dmachan)
+isapnp_finddev(int id, int *iobase, int *dmachan)
 	int             id;
 	int            *iobase, *dmachan;
+{
 	int             csn;
 	outb(PNPADDR, CONTROL);
 	outb(PNPWDATA, 2);	/* XXX force wait for key */
 	/* scan all allowed data ports (ch. 3.1) */
 	for (pnpdataport = PNPRDATAMIN; pnpdataport <= PNPRDATAMAX;
 	     pnpdataport += 4) {
 		int             res, found = 0;
 		pnpinit();	/* initiation sequence */
 @@ -218,19 +213,19 @@ isapnp_finddev(id, iobase, dmachan)
 				if (iobase)
 					*iobase = getiobase(0);
 				if (dmachan)
 					*dmachan = getdmachan(0);
 				found = 1;
+			}
 			pnpisolreset();
 		} while ((res != 0) && (res != -1));
 		outb(PNPADDR, CONTROL);
 		outb(PNPWDATA, 2);	/* return to wait for key */
 		if (csn > 1)	/* at least 1 board found */
-			return (!found);
+			return !found;
 		/* if no board found, try next dataport */
+	}
-	return (-1);		/* nothing found */
+	return -1;		/* nothing found */
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parseutils.c,v 1.4 2008/12/09 15:38:52 christos Exp $	*/
+/*	$NetBSD: parseutils.c,v 1.5 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1996, 1997
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996, 1997
  * 	Perry E. Metzger.  All rights reserved.
  * Copyright (c) 1997
  *	Jason R. Thorpe.  All rights reserved
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -38,111 +38,105 @@
  */
 #include <lib/libkern/libkern.h>
 #include <lib/libsa/stand.h>
 #include <sys/boot_flag.h>
 #include "libi386.h"
 /*
  * chops the head from the arguments and returns the arguments if any,
  * or possibly an empty string.
  */
 char *
-gettrailer(arg)
+gettrailer(char *arg)
 	char *arg;
+{
 	char *options;
 	if ((options = strchr(arg, ' ')) == NULL)
-		return ("");
+		return "";
 	else
 		*options++ = '\0';
 	/* trim leading blanks */
 	while (*options && *options == ' ')
 		options++;
-	return (options);
+	return options;
+}
 int
-parseopts(opts, howto)
+parseopts(const char *opts, int *howto)
 	const char *opts;
 	int *howto;
+{
 	int r, tmpopt = 0;
 	opts++; 	/* skip - */
 	while (*opts) {
 		r = 0;
 		BOOT_FLAG(*opts, r);
 		if (r == 0) {
 			printf("-%c: unknown flag\n", *opts);
 			command_help(NULL);
-			return(0);
+			return 0;
+		}
 		tmpopt |= r;
 		opts++;
 		if (*opts == ' ' || *opts == '\t') {
 			do
 				opts++;		/* skip whitespace */
 			while (*opts == ' ' || *opts == '\t');
 			if (*opts == '-')
 				opts++;		/* skip - */
 			else if (*opts != '\0') {
 				printf("invalid arguments\n");
 				command_help(NULL);
-				return(0);
+				return 0;
+			}
+		}
+	}
 	*howto = tmpopt;
-	return(1);
+	return 1;
+}
 int
-parseboot(arg, filename, howto)
+parseboot(char *arg, char **filename, int *howto)
 	char *arg;
 	char **filename;
 	int *howto;
+{
 	char *opts = NULL;
 	*filename = 0;
 	*howto = 0;
 	/* if there were no arguments */
 	if (!*arg)
-		return(1);
+		return 1;
 	/* format is... */
 	/* [[xxNx:]filename] [-adqsv] */
 	/* check for just args */
 	if (arg[0] == '-')
 		opts = arg;
 	else {
 		/* there's a file name */
 		*filename = arg;
 		opts = gettrailer(arg);
 		if (!*opts)
 			opts = NULL;
 		else if (*opts != '-') {
 			printf("invalid arguments\n");
 			command_help(NULL);
-			return(0);
+			return 0;
+		}
+	}
 	/* at this point, we have dealt with filenames. */
 	/* now, deal with options */
 	if (opts) {
 		if (parseopts(opts, howto) == 0)
-			return(0);
+			return 0;
+	}
-	return(1);
+	return 1;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isapnpvar.h,v 1.3 2005/12/11 12:17:48 christos Exp $	*/
+/*	$NetBSD: isapnpvar.h,v 1.4 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1997
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,14 +16,14 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
-int isapnp_finddev __P((int, int*, int*));
+int isapnp_finddev(int, int*, int*);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pcivar.h,v 1.3 2005/12/11 12:17:48 christos Exp $	*/
+/*	$NetBSD: pcivar.h,v 1.4 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,17 +19,17 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 typedef unsigned int pcihdl_t;
-int pcicheck __P((void));
+int pcicheck(void);
-int pcifinddev __P((int, int, pcihdl_t*));
+int pcifinddev(int, int, pcihdl_t*);
-int pcicfgread __P((pcihdl_t*, int, int*));
+int pcicfgread(pcihdl_t*, int, int*);
-int pcicfgwrite __P((pcihdl_t*, int, int));
+int pcicfgwrite(pcihdl_t*, int, int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: comio_direct.c,v 1.8 2005/11/11 22:25:09 dsl Exp $	*/
+/*	$NetBSD: comio_direct.c,v 1.9 2008/12/14 17:03:43 christos Exp $	*/
 /*-
  * Copyright (c) 1993, 1994, 1995, 1996, 1997
  *	Charles M. Hannum.  All rights reserved.
+ *
  * Taken from sys/dev/isa/com.c and integrated into standalone boot
  * programs by Martin Husemann.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -93,27 +93,27 @@ comspeed(long speed)
+{
 	int x, err;
 	if (speed <= 0)
 		speed = 9600;
 	x = divrnd((COM_FREQ / 16), speed);
 	if (x <= 0)
 		return RATE_9600;
 	err = divrnd((COM_FREQ / 16) * 1000, speed * x) - 1000;
 	if (err < 0)
 		err = -err;
 	if (err > COM_TOLERANCE)
 		return RATE_9600;
-	return (x);
+	return x;
+}
 /*
  * get a character
  */
 int
 comgetc_d(int combase)
+{
 	u_char stat, c;
 	if (serbuf_read != serbuf_write) {
 		c = serbuf[serbuf_read++];
 		if (serbuf_read >= SERBUFSIZE)
 @@ -122,27 +122,27 @@ comgetc_d(int combase)
+	}
 	for (;;) {
 		while (!ISSET(stat = inb(combase + com_lsr), LSR_RXRDY))
+			;
 		c = inb(combase + com_data);
 		inb(combase + com_iir);
 		if (c != XOFF) {
 			stopped = 0;
 			break;	/* got a real char, deliver it... */
+		}
 		stopped = 1;
+	}
-	return (c);
+	return c;
+}
 /*
  * output a character, return nonzero on success
  */
 int
 computc_d(int c, int combase)
+{
 	u_char stat;
 	int timo;
 	/* check for old XOFF */
 	while (stopped)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: getextmemx.c,v 1.8 2007/12/25 18:33:34 perry Exp $	*/
+/*	$NetBSD: getextmemx.c,v 1.9 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1997, 1999
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,32 +25,32 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /*
  * Try 2 more fancy BIOS calls to get the size of extended
  * memory besides the classical int15/88, take maximum.
  * needs lowlevel parts from biosmemx.S and biosmem.S
  */
 #include <lib/libsa/stand.h>
 #include "libi386.h"
-extern int getextmem2 __P((int *));
+extern int getextmem2(int *);
-extern int getmementry __P((int *, int *));
+extern int getmementry(int *, int *);
-extern int getextmemps2 __P((void *));
+extern int getextmemps2(void *);
 int
-getextmemx()
+getextmemx(void)
+{
 	int buf[5], i;
 	int extmem = getextmem1();
 #ifdef SUPPORT_PS2
 	struct {
 		uint16_t len;
 		uint32_t dta[8];
 		/* pad to 64 bytes - without this, machine would reset */
 		uint8_t __pad[30];
 	} __packed bufps2;
 #endif
 #ifdef DEBUG_MEMSIZE
 @@ -83,15 +83,15 @@ getextmemx()
 	} while (i);
 #ifdef SUPPORT_PS2
 	/* use local memory information from RETURN MEMORY-MAP INFORMATION */
 	if (!getextmemps2((void *) &bufps2)) {
 		int help = bufps2.dta[0];
 		if (help == 15 * 1024)
 			help += bufps2.dta[1];
 		if (extmem < help)
 			extmem = help;
+	}
 #endif
-	return (extmem);
+	return extmem;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dosfile.c,v 1.13 2006/05/10 06:24:02 skrll Exp $	 */
+/*	$NetBSD: dosfile.c,v 1.14 2008/12/14 17:03:43 christos Exp $	 */
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,91 +27,85 @@
  */
 /*
  * DOS filesystem for libsa
  * standalone - uses no device, works only with DOS running
  * needs lowlevel parts from dos_file.S
  */
 #include <lib/libsa/stand.h>
 #include "diskbuf.h"
 #include "dosfile.h"
-extern int dosopen __P((const char *));
+extern int dosopen(const char *);
-extern void dosclose __P((int));
+extern void dosclose(int);
-extern int dosread __P((int, char *, int));
+extern int dosread(int, char *, int);
-extern int dosseek __P((int, int, int));
+extern int dosseek(int, int, int);
 struct dosfile {
 	int doshandle, off;
 };
 extern int doserrno;	/* in dos_file.S */
-static int dos2errno __P((void));
+static int dos2errno(void);
 static int
-dos2errno()
+dos2errno(void)
+{
 	int err;
 	switch (doserrno) {
 	    case 1:
 	    case 4:
 	    case 12:
 	    default:
 		err = EIO;
 	    case 2:
 	    case 3:
 		err = ENOENT;
 	    case 5:
 		err = EPERM;
 	    case 6:
 		err = EINVAL;
+	}
-	return (err);
+	return err;
+}
 int
-dos_open(path, f)
+dos_open(const char *path, struct open_file *f)
 	const char           *path;
 	struct open_file *f;
+{
 	struct dosfile *df;
 	df = (struct dosfile *) alloc(sizeof(*df));
 	if (!df)
-		return (-1);
+		return -1;
 	df->off = 0;
 	df->doshandle = dosopen(path);
 	if (df->doshandle < 0) {
 #ifdef DEBUG
 		printf("DOS error %d\n", doserrno);
 #endif
 		dealloc(df, sizeof(*df));
-		return (dos2errno());
+		return dos2errno();
+	}
 	f->f_fsdata = (void *) df;
-	return (0);
+	return 0;
+}
 int
-dos_read(f, addr, size, resid)
+dos_read(struct open_file *f, void *addr, size_t size, size_t *resid)
 	struct open_file *f;
 	void           *addr;
 	size_t         size;
 	size_t         *resid;	/* out */
+{
 	struct dosfile *df;
 	int             got;
 	static int      tc = 0;
 	df = (struct dosfile *) f->f_fsdata;
 	if (!(tc++ % 4))
 		twiddle();
 	if ((unsigned long) addr >= 0x10000) {
 		u_int           lsize = size;
 @@ -122,101 +116,91 @@ dos_read(f, addr, size, resid)
 			tsize = lsize;
 			if (tsize > DISKBUFSIZE)
 				tsize = DISKBUFSIZE;
 			alloc_diskbuf(dos_read);
 			tgot = dosread(df->doshandle, diskbufp, tsize);
 			if (tgot < 0) {
 #ifdef DEBUG
 				printf("DOS error %d\n", doserrno);
 #endif
-				return (dos2errno());
+				return dos2errno();
+			}
 			memcpy(p, diskbufp, tgot);
 			p += tgot;
 			lsize -= tgot;
 			if (tgot != tsize)
 				break;	/* EOF */
+		}
 		got = size - lsize;
 	} else {
 		got = dosread(df->doshandle, addr, size);
 		if (got < 0) {
 #ifdef DEBUG
 			printf("DOS error %d\n", doserrno);
 #endif
-			return (dos2errno());
+			return dos2errno();
+		}
+	}
 	df->off += got;
 	size -= got;
 	if (resid)
 		*resid = size;
-	return (0);
+	return 0;
+}
 int
-dos_close(f)
+dos_close(struct open_file *f)
 	struct open_file *f;
+{
 	struct dosfile *df;
 	df = (struct dosfile *) f->f_fsdata;
 	dosclose(df->doshandle);
 	if (df)
 		dealloc(df, sizeof(*df));
-	return (0);
+	return 0;
+}
 int
-dos_write(f, start, size, resid)
+dos_write(struct open_file *f, void *start, size_t size, size_t *resid)
 	struct open_file *f;
 	void           *start;
 	size_t          size;
 	size_t         *resid;	/* out */
+{
-	return (EROFS);
+	return EROFS;
+}
 int
-dos_stat(f, sb)
+dos_stat(struct open_file *f, struct stat *sb)
 	struct open_file *f;
 	struct stat    *sb;
+{
 	struct dosfile *df;
 	df = (struct dosfile *) f->f_fsdata;
 	sb->st_mode = 0444;
 	sb->st_nlink = 1;
 	sb->st_uid = 0;
 	sb->st_gid = 0;
 	sb->st_size = -1;
-	return (0);
+	return 0;
+}
 off_t
-dos_seek(f, offset, where)
+dos_seek(struct open_file *f, off_t offset, int where)
 	struct open_file *f;
 	off_t           offset;
 	int             where;
+{
 	struct dosfile *df;
 	int             doswhence, res;
 #ifdef DOS_CHECK
 	int             checkoffs;
 #endif
 	df = (struct dosfile *) f->f_fsdata;
 	switch (where) {
 	case SEEK_SET:
 		doswhence = 0;
 #ifdef DOS_CHECK
 		checkoffs = offset;	/* don't trust DOS */
 @@ -226,31 +210,31 @@ dos_seek(f, offset, where)
 		doswhence = 1;
 #ifdef DOS_CHECK
 		checkoffs = df->off + offset;
 #endif
 		break;
 	case SEEK_END:
 		doswhence = 2;
 #ifdef DOS_CHECK
 		checkoffs = -1;	/* we dont know len */
 #endif
 		break;
 	default:
 		errno = EOFFSET;
-		return (-1);
+		return -1;
+	}
 	res = dosseek(df->doshandle, offset, doswhence);
 	if (res == -1) {
 		errno = dos2errno();
-		return (-1);
+		return -1;
+	}
 #ifdef DOS_CHECK
 	if ((checkoffs != -1) && (res != checkoffs)) {
 		printf("dosfile: unexpected seek result (%d+%d(%d)=%d)\n",
 		       df->off, offset, where, res);
 		errno = EOFFSET;
-		return (-1);
+		return -1;
+	}
 #endif
 	df->off = res;
-	return (res);
+	return res;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: exec.c,v 1.35 2008/11/25 13:23:54 ad Exp $	 */
+/*	$NetBSD: exec.c,v 1.36 2008/12/14 17:03:43 christos Exp $	 */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -326,32 +326,32 @@ module_path(boot_module_t *bm)
 			name = name_buf;
 			break;
+		}
+	}
  	if (name[0] == '/')
 		snprintf(buf, sizeof(buf), "%s", name);
 	else
 		snprintf(buf, sizeof(buf), "%s/%s/%s.kmod",
 		    module_base, name, name);
 	return buf;
+}
 static int
 module_open(boot_module_t *bm, int mode)
+{
 	int fd;
 	const char *path;
 	/* check the expanded path first */
 	path = module_path(bm);
 	fd = open(path, mode);
 	if (fd == -1) {
 		printf("WARNING: couldn't open %s\n", path);
 		/* now attempt the raw path provided */
 		fd = open(bm->bm_path, mode);
 		if (fd == -1)
 			printf("WARNING: couldn't open %s\n", bm->bm_path);
+	}
 	return fd;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: menuutils.c,v 1.1 1997/09/17 17:13:02 drochner Exp $	*/
+/*	$NetBSD: menuutils.c,v 1.2 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1996, 1997
  * 	Matthias Drochner.  All rights reserved.
  * Copyright (c) 1996, 1997
  * 	Perry E. Metzger.  All rights reserved.
  * Copyright (c) 1997
  *	Jason R. Thorpe.  All rights reserved
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -33,47 +33,46 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <lib/libkern/libkern.h>
 #include <lib/libsa/stand.h>
 #include "libi386.h"
 void
-docommand(arg)
+docommand(char *arg)
 	char *arg;
+{
 	char *options;
 	int i;
 	options = gettrailer(arg);
 	for (i = 0; commands[i].c_name != NULL; i++) {
 		if (strcmp(arg, commands[i].c_name) == 0) {
 			(*commands[i].c_fn)(options);
 			return;
+		}
+	}
 	printf("unknown command\n");
 	command_help(NULL);
+}
 void
-bootmenu()
+bootmenu(void)
+{
 	char input[80];
 	for (;;) {
 		char *c = input;
 		input[0] = '\0';
 		printf("> ");
 		gets(input);
 		/*
 		 * Skip leading whitespace.
 		 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: printmemlist.c,v 1.1 1999/12/21 14:22:55 drochner Exp $	*/
+/*	$NetBSD: printmemlist.c,v 1.2 2008/12/14 17:03:43 christos Exp $	*/
 /*
  * Copyright (c) 1999
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -18,37 +18,37 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <lib/libsa/stand.h>
 #include "libi386.h"
-extern int getmementry __P((int *, int *));
+extern int getmementry(int *, int *);
 static char *memtypes[] = {
 	"available",
 	"reserved",
 	"ACPI reclaimable",
 	"ACPI NVS"
 };
 void
-printmemlist()
+printmemlist(void)
+{
         int buf[5], i;
 	char *type;
         i = 0;
         do {
                 if (getmementry(&i, buf))
                         break;
 		if (buf[4] < 1 || buf[4] > 4)
 			type = "invalid entry";
 		else
 			type = memtypes[buf[4] - 1];
 		printf("%x:%x/%x:%x: %s\n", buf[1], buf[0], buf[3], buf[2],

 @@ -1,3 +1,3 @@
-/*	$NetBSD: isadmavar.h,v 1.1.1.1 1997/03/14 02:40:33 perry Exp $	*/
+/*	$NetBSD: isadmavar.h,v 1.2 2008/12/14 17:03:43 christos Exp $	*/
-void isa_dmacascade __P((int));
+void isa_dmacascade(int);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pread.c,v 1.6 2005/12/11 12:17:48 christos Exp $	 */
+/*	$NetBSD: pread.c,v 1.7 2008/12/14 17:03:43 christos Exp $	 */
 /*
  * Copyright (c) 1996
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -30,44 +30,41 @@
 #include <lib/libsa/stand.h>
 #include "libi386.h"
 #ifdef SAVE_MEMORY
 #define BUFSIZE (1*1024)
 #else
 #define BUFSIZE (4*1024)
 #endif
 static char     *buf;
 ssize_t
-pread(fd, dest, size)
+pread(int fd, void *dest, size_t size)
 	int	fd;
 	void	*dest;
 	size_t	size;
+{
 	int             rsize;
 	if (!buf)
 		buf = alloc(BUFSIZE);
 	rsize = size;
 	while (rsize > 0) {
 		int             count, got;
 		count = (rsize < BUFSIZE ? rsize : BUFSIZE);
 		got = read(fd, buf, count);
 		if (got < 0)
-			return (-1);
+			return -1;
 		/* put to physical space */
 		vpbcopy(buf, dest, got);
 		dest += got;
 		rsize -= got;
 		if (got < count)
 			break;	/* EOF */
+	}
-	return (size - rsize);
+	return size - rsize;
+}

 @@ -1,43 +1,42 @@
-/*	$NetBSD: getsecs.c,v 1.2 1999/04/14 11:17:05 drochner Exp $	*/
+/*	$NetBSD: getsecs.c,v 1.3 2008/12/14 17:03:43 christos Exp $	*/
 /* extracted from netbsd:sys/arch/i386/netboot/misc.c */
 #include <sys/types.h>
 #include <lib/libsa/stand.h>
 #include "libi386.h"
-extern int biosgetrtc __P((u_long*));
+extern int biosgetrtc(u_long*);
-static inline u_long bcd2dec __P((u_long));
+static inline u_long bcd2dec(u_long);
 static inline u_long
-bcd2dec(arg)
+bcd2dec(u_long arg)
 	u_long arg;
+{
-	return ((arg >> 4) * 10 + (arg & 0x0f));
+	return (arg >> 4) * 10 + (arg & 0x0f);
+}
 time_t
-getsecs() {
+getsecs(void) {
 	/*
 	 * Return the current time in seconds
 	 */
 	u_long t;
 	time_t sec;
 	if (biosgetrtc(&t))
 		panic("RTC invalid");
 	sec = bcd2dec(t & 0xff);
 	sec *= 60;
 	t >>= 8;
 	sec += bcd2dec(t & 0xff);
 	sec *= 60;
 	t >>= 8;
 	sec += bcd2dec(t & 0xff);
-	return (sec);
+	return sec;
+}

 @@ -1,44 +1,43 @@
-/*	$NetBSD: isadma.c,v 1.1.1.1 1997/03/14 02:40:32 perry Exp $	*/
+/*	$NetBSD: isadma.c,v 1.2 2008/12/14 17:03:43 christos Exp $	*/
 /* from: NetBSD:dev/isa/isadma.c */
 #include <sys/types.h>
 #include <machine/pio.h>
 #include <lib/libsa/stand.h>
 #include "isadmavar.h"
 #define	IO_DMA1		0x000		/* 8237A DMA Controller #1 */
 #define	IO_DMA2		0x0C0		/* 8237A DMA Controller #2 */
 #define	DMA37MD_CASCADE	0xc0	/* cascade mode */
 #define	DMA1_SMSK	(IO_DMA1 + 1*10)	/* single mask register */
 #define	DMA1_MODE	(IO_DMA1 + 1*11)	/* mode register */
 #define	DMA2_SMSK	(IO_DMA2 + 2*10)	/* single mask register */
 #define	DMA2_MODE	(IO_DMA2 + 2*11)	/* mode register */
 /*
  * isa_dmacascade(): program 8237 DMA controller channel to accept
  * external dma control by a board.
  */
 void
-isa_dmacascade(chan)
+isa_dmacascade(int chan)
 	int chan;
+{
 #ifdef ISADMA_DEBUG
 	if (chan < 0 || chan > 7)
 		panic("isa_dmacascade: impossible request");
 #endif
 	/* set dma channel mode, and set dma channel mode */
 	if ((chan & 4) == 0) {
 		outb(DMA1_MODE, chan | DMA37MD_CASCADE);
 		outb(DMA1_SMSK, chan);
 	} else {
 		chan &= 3;
 		outb(DMA2_MODE, chan | DMA37MD_CASCADE);
 		outb(DMA2_SMSK, chan);
+	}
+}