From owner-p4-projects  Sun Feb  9  2: 2:30 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2297C37B405; Sun,  9 Feb 2003 02:02:26 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AE02637B401
	for <perforce@freebsd.org>; Sun,  9 Feb 2003 02:02:25 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5B70E43FAF
	for <perforce@freebsd.org>; Sun,  9 Feb 2003 02:02:25 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h19A2Pbv060135
	for <perforce@freebsd.org>; Sun, 9 Feb 2003 02:02:25 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h19A2Opc060126
	for perforce@freebsd.org; Sun, 9 Feb 2003 02:02:24 -0800 (PST)
Date: Sun, 9 Feb 2003 02:02:24 -0800 (PST)
Message-Id: <200302091002.h19A2Opc060126@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
Subject: PERFORCE change 24881 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=24881

Change 24881 by jmallett@jmallett_dalek on 2003/02/09 02:02:10

	Move the FX on-disk structures and non-GEOM-specific definitions
	to <sys/diskfx.h>, for use elsewhere, too.

Affected files ...

.. //depot/projects/mips/sys/geom/geom_fx.c#7 edit
.. //depot/projects/mips/sys/sys/diskfx.h#1 add

Differences ...

==== //depot/projects/mips/sys/geom/geom_fx.c#7 (text+ko) ====

@@ -48,80 +48,12 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #endif
+#include <sys/diskfx.h>
 #include <geom/geom.h>
 #include <geom/geom_slice.h>
 #include <machine/endian.h>
 
 #define FX_CLASS_NAME	"FX"
-#define	FX_LABEL_MAGIC	0xbe5a941
-#define	FX_NPARTS	16
-
-static const char *fx_typename[] = {
-	"Volume Header",
-	"Repl Trks",
-	"Repl Secs",
-	"Raw",
-	"4.2BSD",
-	"SysV",
-	"Volume",
-	"EFS",
-	"LVol",
-	"RLVol",
-	"XFS",
-	"XFSLog",
-	"XLV",
-	"XVM"
-};
-
-struct dparms {
-	u_int8_t	dp_skew;
-	u_int8_t	dp_gap1;
-	u_int8_t	dp_gap2;
-	u_int8_t	dp_spares_cyl;
-	u_int16_t	dp_cyls;
-	u_int16_t	dp_shd0;
-	u_int16_t	dp_trks0;
-	u_int8_t	dp_ctq_depth;
-	u_int8_t	dp_cylshi;
-	u_int16_t	dp_unused;
-	u_int16_t	dp_secs;
-	u_int16_t	dp_secbytes;
-	u_int16_t	dp_interleave;
-	u_int32_t	dp_flags;
-	u_int32_t	dp_datarate;
-	u_int32_t	dp_nretries;
-	u_int32_t	dp_mspw;
-	u_int16_t	dp_xgap1;
-	u_int16_t	dp_xsync;
-	u_int16_t	dp_xrdly;
-	u_int16_t	dp_xgap2;
-	u_int16_t	dp_xrgate;
-	u_int16_t	dp_xwcont;
-} __packed;
-
-struct voldir {
-	char		vd_name[8];
-	int32_t		vd_addr;
-	int32_t		vd_size;
-} __packed;
-
-struct volpart {
-	int32_t		vp_size;
-	int32_t		vp_begin;
-	int32_t		vp_type;
-} __packed;
-
-struct volhdr {
-	u_int32_t	vh_magic;
-	int16_t		vh_root;
-	int16_t		vh_swap;
-	char		vh_kernel[16];
-	struct dparms	vh_dp;
-	struct voldir	vh_dir[15];
-	struct volpart	vh_part[FX_NPARTS];
-	int32_t		vh_csum;
-	int32_t		vh_unused;
-} __packed;
 
 struct g_fx_softc {
 	struct volhdr	sc_volhdr;

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message