From owner-svn-src-all@FreeBSD.ORG Thu Mar 19 12:31:59 2009 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 D8654106566B; Thu, 19 Mar 2009 12:31:59 +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 C6F2E8FC17; Thu, 19 Mar 2009 12:31:59 +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 n2JCVxqD060797; Thu, 19 Mar 2009 12:31:59 GMT (envelope-from nyan@svn.freebsd.org) Received: (from nyan@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2JCVxsN060796; Thu, 19 Mar 2009 12:31:59 GMT (envelope-from nyan@svn.freebsd.org) Message-Id: <200903191231.n2JCVxsN060796@svn.freebsd.org> From: Takahashi Yoshihiro Date: Thu, 19 Mar 2009 12:31:59 +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: r190027 - head/sbin/fdisk_pc98 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: Thu, 19 Mar 2009 12:32:00 -0000 Author: nyan Date: Thu Mar 19 12:31:59 2009 New Revision: 190027 URL: http://svn.freebsd.org/changeset/base/190027 Log: Use the common PC98_SID_ACTIVE define instead of a local define. Modified: head/sbin/fdisk_pc98/fdisk.c Modified: head/sbin/fdisk_pc98/fdisk.c ============================================================================== --- head/sbin/fdisk_pc98/fdisk.c Thu Mar 19 10:42:07 2009 (r190026) +++ head/sbin/fdisk_pc98/fdisk.c Thu Mar 19 12:31:59 2009 (r190027) @@ -84,8 +84,6 @@ struct mboot { static struct mboot mboot; static int fd; -#define ACTIVE 0x80 - static uint dos_cyls; static uint dos_heads; static uint dos_sectors; @@ -520,7 +518,7 @@ change_active(int which) active = -1; for (i = 0; i < NDOSPART; i++) { - if ((partp[i].dp_sid & ACTIVE) == 0) + if ((partp[i].dp_sid & PC98_SID_ACTIVE) == 0) continue; printf("Partition %d is marked active\n", i + 1); if (active == -1) @@ -545,7 +543,7 @@ setactive: active = new; } while (!ok("Are you happy with this choice")); if (active > 0 && active <= 8) - partp[active-1].dp_sid |= ACTIVE; + partp[active-1].dp_sid |= PC98_SID_ACTIVE; } static void