From owner-svn-src-all@FreeBSD.ORG Sun Sep 23 08:46:45 2012 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 A7BCA106566C; Sun, 23 Sep 2012 08:46:45 +0000 (UTC) (envelope-from nyan@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 425468FC15; Sun, 23 Sep 2012 08:46:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8N8kj7K057262; Sun, 23 Sep 2012 08:46:45 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8N8kjg4057260; Sun, 23 Sep 2012 08:46:45 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <201209230846.q8N8kjg4057260@svn.freebsd.org> From: Takahashi Yoshihiro Date: Sun, 23 Sep 2012 08:46:45 +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: r240852 - head/sys/boot/pc98/loader 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: Sun, 23 Sep 2012 08:46:45 -0000 Author: nyan Date: Sun Sep 23 08:46:44 2012 New Revision: 240852 URL: http://svn.freebsd.org/changeset/base/240852 Log: Cosmetic changes. Modified: head/sys/boot/pc98/loader/main.c Modified: head/sys/boot/pc98/loader/main.c ============================================================================== --- head/sys/boot/pc98/loader/main.c Sun Sep 23 08:44:12 2012 (r240851) +++ head/sys/boot/pc98/loader/main.c Sun Sep 23 08:46:44 2012 (r240852) @@ -207,9 +207,9 @@ main(void) static void extract_currdev(void) { - struct i386_devdesc new_currdev; - int major; - int biosdev = -1; + struct i386_devdesc new_currdev; + int major; + int biosdev = -1; /* Assume we are booting from a BIOS disk by default */ new_currdev.d_dev = &biosdisk; @@ -255,7 +255,7 @@ extract_currdev(void) } } new_currdev.d_type = new_currdev.d_dev->dv_type; - + /* * If we are booting off of a BIOS disk and we didn't succeed in determining * which one we booted off of, just use disk0: as a reasonable default. @@ -266,6 +266,7 @@ extract_currdev(void) "Guessed BIOS device 0x%x not found by probes, defaulting to disk0:\n", biosdev); new_currdev.d_unit = 0; } + env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&new_currdev), i386_setcurrdev, env_nounset); env_setenv("loaddev", EV_VOLATILE, i386_fmtdev(&new_currdev), env_noset, @@ -307,7 +308,7 @@ command_heap(int argc, char *argv[]) } /* ISA bus access functions for PnP, derived from */ -static int +static int isa_inb(int port) { u_char data; @@ -335,4 +336,3 @@ isa_outb(int port, int value) __asm __volatile("outb %0,%%dx" : : "a" (al), "d" (port)); } } -