[src/trunk]: src/sys/arch/i386/stand/boot ANSI, KNF, de-__P, and various cosm...

[junyoung <junyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/67fd72970420
branches:  trunk
changeset: 582073:67fd72970420
user:      junyoung <junyoung%NetBSD.org@localhost>
date:      Wed Jun 15 19:01:19 2005 +0000

description:
ANSI, KNF, de-__P, and various cosmetic changes.

diffstat:

 sys/arch/i386/stand/boot/devopen.c |  36 ++++++++++++++----------------------
 1 files changed, 14 insertions(+), 22 deletions(-)

diffs (75 lines):

diff -r fee2d82c6c51 -r 67fd72970420 sys/arch/i386/stand/boot/devopen.c
--- a/sys/arch/i386/stand/boot/devopen.c        Wed Jun 15 18:49:40 2005 +0000
+++ b/sys/arch/i386/stand/boot/devopen.c        Wed Jun 15 19:01:19 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: devopen.c,v 1.2 2004/03/24 16:54:18 drochner Exp $      */
+/*     $NetBSD: devopen.c,v 1.3 2005/06/15 19:01:19 junyoung Exp $      */
 
 /*
  * Copyright (c) 1996, 1997
@@ -41,22 +41,19 @@
 #include <biosmca.h>
 #endif
 
-static __inline int dev2bios __P((char *, unsigned int, int *));
+static int dev2bios(char *, u_int, int *);
 
-static __inline int
-dev2bios(devname, unit, biosdev)
-       char           *devname;
-       unsigned int    unit;
-       int            *biosdev;
+static int
+dev2bios(char *devname, u_int unit, int *biosdev)
 {
        if (strcmp(devname, "hd") == 0)
                *biosdev = 0x80 + unit;
        else if (strcmp(devname, "fd") == 0)
                *biosdev = 0x00 + unit;
        else
-               return (ENXIO);
+               return ENXIO;
 
-       return (0);
+       return 0;
 }
 
 int
@@ -81,29 +78,24 @@
  * Open the BIOS disk device
  */
 int
-devopen(f, fname, file)
-       struct open_file *f;
-       const char     *fname;
-       char          **file;
+devopen(struct open_file *f, const char *fname, char **file)
 {
-       char           *fsname, *devname;
-       unsigned int    unit, partition;
-       int             biosdev;
-       int             error;
-       struct devsw   *dp;
+       char *fsname, *devname;
+       u_int unit, partition;
+       int biosdev;
+       int error;
 
        if ((error = parsebootfile(fname, &fsname, &devname,
                                   &unit, &partition, (const char **) file))
            || (error = dev2bios(devname, unit, &biosdev)))
-               return (error);
+               return error;
 
-       dp = &devsw[0];         /* must be biosdisk */
-       f->f_dev = dp;
+       f->f_dev = &devsw[0];           /* must be biosdisk */
 
 #ifdef _STANDALONE
        strncpy(bibp.bootpath, *file, sizeof(bibp.bootpath));
        BI_ADD(&bibp, BTINFO_BOOTPATH, sizeof(bibp));
 #endif
 
-       return (biosdiskopen(f, biosdev, partition));
+       return biosdiskopen(f, biosdev, partition);
 }