svn commit: r189695 - in head/sys: geom/part sys

[Takahashi Yoshihiro]

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;