From owner-svn-src-head@FreeBSD.ORG Wed Mar 11 13:15: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 E4CC21065762; Wed, 11 Mar 2009 13:15: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 D07518FC27; Wed, 11 Mar 2009 13:15: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 n2BDFgfL096648; Wed, 11 Mar 2009 13:15:42 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2BDFgMM096646; Wed, 11 Mar 2009 13:15:42 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200903111315.n2BDFgMM096646@svn.freebsd.org> From: Takahashi Yoshihiro Date: Wed, 11 Mar 2009 13:15: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: r189695 - in head/sys: geom/part sys 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: Wed, 11 Mar 2009 13:15:44 -0000 Author: nyan Date: Wed Mar 11 13:15:42 2009 New Revision: 189695 URL: http://svn.freebsd.org/changeset/base/189695 Log: Move the PC98_[MS]ID_* defines from g_part_pc98.c to diskpc98.h. Reviewed by: marcel Modified: head/sys/geom/part/g_part_pc98.c head/sys/sys/diskpc98.h Modified: head/sys/geom/part/g_part_pc98.c ============================================================================== --- head/sys/geom/part/g_part_pc98.c Wed Mar 11 12:55:12 2009 (r189694) +++ head/sys/geom/part/g_part_pc98.c Wed Mar 11 13:15:42 2009 (r189695) @@ -45,14 +45,6 @@ __FBSDID("$FreeBSD$"); #include "g_part_if.h" -#define PC98_MID_BOOTABLE 0x80 -#define PC98_MID_MASK 0x7f -#define PC98_MID_386BSD 0x14 - -#define PC98_SID_ACTIVE 0x80 -#define PC98_SID_MASK 0x7f -#define PC98_SID_386BSD 0x44 - #define SECSIZE 512 struct g_part_pc98_table { Modified: head/sys/sys/diskpc98.h ============================================================================== --- head/sys/sys/diskpc98.h Wed Mar 11 12:55:12 2009 (r189694) +++ head/sys/sys/diskpc98.h Wed Mar 11 13:15:42 2009 (r189695) @@ -42,9 +42,17 @@ #define DOSMAGICOFFSET 510 #define DOSMAGIC 0xAA55 -#define DOSMID_386BSD (0x14|0x80) /* 386BSD | bootable */ -#define DOSSID_386BSD (0x44|0x80) /* 386BSD | active */ -#define DOSPTYP_386BSD (DOSSID_386BSD << 8 | DOSMID_386BSD) +#define PC98_MID_BOOTABLE 0x80 +#define PC98_MID_MASK 0x7f +#define PC98_MID_386BSD 0x14 + +#define PC98_SID_ACTIVE 0x80 +#define PC98_SID_MASK 0x7f +#define PC98_SID_386BSD 0x44 + +#define DOSMID_386BSD (PC98_MID_386BSD | PC98_MID_BOOTABLE) +#define DOSSID_386BSD (PC98_SID_386BSD | PC98_SID_ACTIVE) +#define DOSPTYP_386BSD (DOSSID_386BSD << 8 | DOSMID_386BSD) struct pc98_partition { unsigned char dp_mid;