From owner-svn-src-all@FreeBSD.ORG Wed Dec 17 15:58:08 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D9031065670; Wed, 17 Dec 2008 15:58:08 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B4BC8FC17; Wed, 17 Dec 2008 15:58:08 +0000 (UTC) (envelope-from raj@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBHFw8vf008178; Wed, 17 Dec 2008 15:58:08 GMT (envelope-from raj@svn.freebsd.org) Received: (from raj@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBHFw7Cj008175; Wed, 17 Dec 2008 15:58:07 GMT (envelope-from raj@svn.freebsd.org) Message-Id: <200812171558.mBHFw7Cj008175@svn.freebsd.org> From: Rafal Jaworowski Date: Wed, 17 Dec 2008 15:58:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r186231 - in head/sys/boot: powerpc/uboot uboot/common uboot/lib X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Dec 2008 15:58:08 -0000 Author: raj Date: Wed Dec 17 15:58:07 2008 New Revision: 186231 URL: http://svn.freebsd.org/changeset/base/186231 Log: Improve style(9) in PowerPC U-Boot support lib. Modified: head/sys/boot/powerpc/uboot/conf.c head/sys/boot/uboot/common/main.c head/sys/boot/uboot/lib/devicename.c Modified: head/sys/boot/powerpc/uboot/conf.c ============================================================================== --- head/sys/boot/powerpc/uboot/conf.c Wed Dec 17 15:54:25 2008 (r186230) +++ head/sys/boot/powerpc/uboot/conf.c Wed Dec 17 15:58:07 2008 (r186231) @@ -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 }; Modified: head/sys/boot/uboot/common/main.c ============================================================================== --- head/sys/boot/uboot/common/main.c Wed Dec 17 15:54:25 2008 (r186230) +++ head/sys/boot/uboot/common/main.c Wed Dec 17 15:58:07 2008 (r186231) @@ -216,6 +216,7 @@ COMMAND_SET(reboot, "reboot", "reboot th static int command_reboot(int argc, char *argv[]) { + printf("Resetting...\n"); ub_reset(); Modified: head/sys/boot/uboot/lib/devicename.c ============================================================================== --- head/sys/boot/uboot/lib/devicename.c Wed Dec 17 15:54:25 2008 (r186230) +++ head/sys/boot/uboot/lib/devicename.c Wed Dec 17 15:58:07 2008 (r186231) @@ -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 **de } 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); }