From owner-svn-src-user@FreeBSD.ORG  Mon Dec 14 11:08:22 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 20CDB10656B8;
	Mon, 14 Dec 2009 11:08:22 +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 1067C8FC26;
	Mon, 14 Dec 2009 11:08:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBEB8LXq024481;
	Mon, 14 Dec 2009 11:08:21 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBEB8L75024479;
	Mon, 14 Dec 2009 11:08:21 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200912141108.nBEB8L75024479@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Mon, 14 Dec 2009 11:08:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200505 - user/nyan/pc98/sys/boot/pc98/boot2
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Dec 2009 11:08:22 -0000

Author: nyan
Date: Mon Dec 14 11:08:21 2009
New Revision: 200505
URL: http://svn.freebsd.org/changeset/base/200505

Log:
  Initialize machine type by dummy parameter if SET_MACHINE_TYPE is not set.

Modified:
  user/nyan/pc98/sys/boot/pc98/boot2/boot1.S

Modified: user/nyan/pc98/sys/boot/pc98/boot2/boot1.S
==============================================================================
--- user/nyan/pc98/sys/boot/pc98/boot2/boot1.S	Mon Dec 14 10:48:19 2009	(r200504)
+++ user/nyan/pc98/sys/boot/pc98/boot2/boot1.S	Mon Dec 14 11:08:21 2009	(r200505)
@@ -105,9 +105,12 @@ main:		cld
 		and $0x00ffffff,%eax
 		mov %eax,%es:(EPSON_ID)
 
-#ifdef SET_MACHINE_TYPE
 		/* Set machine type to PC98_SYSTEM_PARAMETER */
+#ifdef SET_MACHINE_TYPE
 		call set_machine_type
+#else
+		mov $M_NEC_PC98+M_NOT_H98,%eax
+		mov %eax,%es:(PC98_MACHINE_TYPE)
 #endif
 
 		/* Setup graphic screen */
@@ -319,6 +322,7 @@ set_machine_type:
 		mov %dx,%ds
 //		mov $MEM_SYS,%ax
 //		mov %ax,%es
+
 		/* Wait V-SYNC */
 vsync.1:	inb $0x60,%al
 		test $0x20,%al