From owner-svn-src-head@FreeBSD.ORG Thu Mar 19 13:53:42 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDC6D1065691; Thu, 19 Mar 2009 13:53:42 +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 A102F8FC0C; Thu, 19 Mar 2009 13:53:42 +0000 (UTC) (envelope-from nyan@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 n2JDrgSM063514; Thu, 19 Mar 2009 13:53:42 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JDrggG063511; Thu, 19 Mar 2009 13:53:42 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200903191353.n2JDrggG063511@svn.freebsd.org> From: Takahashi Yoshihiro Date: Thu, 19 Mar 2009 13:53:42 +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: r190046 - in head/sys/boot/pc98: libpc98 loader X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Mar 2009 13:53:43 -0000 Author: nyan Date: Thu Mar 19 13:53:42 2009 New Revision: 190046 URL: http://svn.freebsd.org/changeset/base/190046 Log: Reduce diffs against i386. Modified: head/sys/boot/pc98/libpc98/Makefile head/sys/boot/pc98/loader/Makefile head/sys/boot/pc98/loader/main.c Modified: head/sys/boot/pc98/libpc98/Makefile ============================================================================== --- head/sys/boot/pc98/libpc98/Makefile Thu Mar 19 13:48:43 2009 (r190045) +++ head/sys/boot/pc98/libpc98/Makefile Thu Mar 19 13:53:42 2009 (r190046) @@ -5,8 +5,9 @@ INTERNALLIB= .PATH: ${.CURDIR}/../../i386/libi386 -SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c biospci.c biossmap.c \ - bootinfo.c bootinfo32.c comconsole.c devicename.c elf32_freebsd.c \ +SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \ + biospci.c biossmap.c bootinfo.c bootinfo32.c \ + comconsole.c devicename.c elf32_freebsd.c \ i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ time.c vidconsole.c Modified: head/sys/boot/pc98/loader/Makefile ============================================================================== --- head/sys/boot/pc98/loader/Makefile Thu Mar 19 13:48:43 2009 (r190045) +++ head/sys/boot/pc98/loader/Makefile Thu Mar 19 13:53:42 2009 (r190046) @@ -18,6 +18,7 @@ CFLAGS+= -DLOADER_TFTP_SUPPORT CFLAGS+= -DLOADER_NFS_SUPPORT .endif +# Include bcache code. HAVE_BCACHE= yes # Enable PnP and ISA-PnP code. Modified: head/sys/boot/pc98/loader/main.c ============================================================================== --- head/sys/boot/pc98/loader/main.c Thu Mar 19 13:48:43 2009 (r190045) +++ head/sys/boot/pc98/loader/main.c Thu Mar 19 13:53:42 2009 (r190046) @@ -145,6 +145,14 @@ main(void) bc_add(initial_bootdev); } + archsw.arch_autoload = i386_autoload; + archsw.arch_getdev = i386_getdev; + archsw.arch_copyin = i386_copyin; + archsw.arch_copyout = i386_copyout; + archsw.arch_readin = i386_readin; + archsw.arch_isainb = isa_inb; + archsw.arch_isaoutb = isa_outb; + /* * March through the device switch probing for things. */ @@ -163,14 +171,6 @@ main(void) extract_currdev(); /* set $currdev and $loaddev */ setenv("LINES", "24", 1); /* optional */ - - archsw.arch_autoload = i386_autoload; - archsw.arch_getdev = i386_getdev; - archsw.arch_copyin = i386_copyin; - archsw.arch_copyout = i386_copyout; - archsw.arch_readin = i386_readin; - archsw.arch_isainb = isa_inb; - archsw.arch_isaoutb = isa_outb; interact(); /* doesn't return */ @@ -188,7 +188,8 @@ static void extract_currdev(void) { struct i386_devdesc new_currdev; - int major, biosdev = -1; + int major; + int biosdev = -1; /* Assume we are booting from a BIOS disk by default */ new_currdev.d_dev = &biosdisk;