Date: Sun, 22 Mar 2009 10:55:07 +0000 (UTC) From: Takahashi Yoshihiro <nyan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r190260 - in stable/7/sys: . boot/pc98/libpc98 contrib/pf dev/ath/ath_hal dev/cxgb Message-ID: <200903221055.n2MAt7j9066805@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nyan Date: Sun Mar 22 10:55:07 2009 New Revision: 190260 URL: http://svn.freebsd.org/changeset/base/190260 Log: MFC: r190029 Use the common PC98_MID_* defines instead of a magic number. Modified: stable/7/sys/ (props changed) stable/7/sys/boot/pc98/libpc98/biosdisk.c stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/boot/pc98/libpc98/biosdisk.c ============================================================================== --- stable/7/sys/boot/pc98/libpc98/biosdisk.c Sun Mar 22 10:51:40 2009 (r190259) +++ stable/7/sys/boot/pc98/libpc98/biosdisk.c Sun Mar 22 10:55:07 2009 (r190260) @@ -602,9 +602,9 @@ bd_bestslice(struct open_disk *od) dp = &od->od_slicetab[0]; for (i = 0; i < od->od_nslices; i++, dp++) { - switch(dp->dp_mid & 0x7f) { - case DOSMID_386BSD & 0x7f: /* FreeBSD */ - if ((dp->dp_mid & 0x80) && + switch(dp->dp_mid & PC98_MID_MASK) { + case PC98_MID_386BSD: /* FreeBSD */ + if ((dp->dp_mid & PC98_MID_BOOTABLE) && (preflevel > PREF_FBSD_ACT)) { pref = i; preflevel = PREF_FBSD_ACT; @@ -620,7 +620,7 @@ bd_bestslice(struct open_disk *od) case 0x22: case 0x23: case 0x63: - if ((dp->dp_mid & 0x80) && + if ((dp->dp_mid & PC98_MID_BOOTABLE) && (preflevel > PREF_DOS_ACT)) { pref = i; preflevel = PREF_DOS_ACT;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903221055.n2MAt7j9066805>