diff options
author | raj <raj@FreeBSD.org> | 2008-12-17 15:58:07 +0000 |
---|---|---|
committer | raj <raj@FreeBSD.org> | 2008-12-17 15:58:07 +0000 |
commit | 8a03e5da476b13f33eaacaeedbe28303867bb30f (patch) | |
tree | 04cced35289668bdf119f5a7ebca32b5efe5bb1d /sys | |
parent | f811858422699f22662c182254dbe7d6c7b6cb87 (diff) | |
download | FreeBSD-src-8a03e5da476b13f33eaacaeedbe28303867bb30f.zip FreeBSD-src-8a03e5da476b13f33eaacaeedbe28303867bb30f.tar.gz |
Improve style(9) in PowerPC U-Boot support lib.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/powerpc/uboot/conf.c | 8 | ||||
-rw-r--r-- | sys/boot/uboot/common/main.c | 1 | ||||
-rw-r--r-- | sys/boot/uboot/lib/devicename.c | 17 |
3 files changed, 14 insertions, 12 deletions
diff --git a/sys/boot/powerpc/uboot/conf.c b/sys/boot/powerpc/uboot/conf.c index 8bc307a..5a9515a 100644 --- a/sys/boot/powerpc/uboot/conf.c +++ b/sys/boot/powerpc/uboot/conf.c @@ -94,8 +94,8 @@ struct netif_driver *netif_drivers[] = { */ struct file_format *file_formats[] = { - &uboot_elf, - NULL + &uboot_elf, + NULL }; /* @@ -104,6 +104,6 @@ struct file_format *file_formats[] = { extern struct console uboot_console; struct console *consoles[] = { - &uboot_console, - NULL + &uboot_console, + NULL }; diff --git a/sys/boot/uboot/common/main.c b/sys/boot/uboot/common/main.c index f7a0745..1ebb097 100644 --- a/sys/boot/uboot/common/main.c +++ b/sys/boot/uboot/common/main.c @@ -216,6 +216,7 @@ COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot); static int command_reboot(int argc, char *argv[]) { + printf("Resetting...\n"); ub_reset(); diff --git a/sys/boot/uboot/lib/devicename.c b/sys/boot/uboot/lib/devicename.c index 3183ae1..5d91550 100644 --- a/sys/boot/uboot/lib/devicename.c +++ b/sys/boot/uboot/lib/devicename.c @@ -35,7 +35,8 @@ __FBSDID("$FreeBSD$"); #include "bootstrap.h" #include "libuboot.h" -static int uboot_parsedev(struct uboot_devdesc **dev, const char *devspec, const char **path); +static int uboot_parsedev(struct uboot_devdesc **dev, const char *devspec, + const char **path); /* * Point (dev) at an allocated device specifier for the device matching the @@ -178,11 +179,11 @@ uboot_parsedev(struct uboot_devdesc **dev, const char *devspec, } else { *dev = idev; } - return(0); + return (0); fail: free(idev); - return(err); + return (err); } @@ -191,7 +192,7 @@ uboot_fmtdev(void *vdev) { struct uboot_devdesc *dev = (struct uboot_devdesc *)vdev; char *cp; - static char buf[128]; /* XXX device length constant? */ + static char buf[128]; switch(dev->d_type) { case DEVT_NONE: @@ -220,12 +221,12 @@ uboot_fmtdev(void *vdev) int uboot_setcurrdev(struct env_var *ev, int flags, const void *value) { - struct uboot_devdesc *ncurr; - int rv; + struct uboot_devdesc *ncurr; + int rv; if ((rv = uboot_parsedev(&ncurr, value, NULL)) != 0) - return(rv); + return (rv); free(ncurr); env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); - return(0); + return (0); } |