Module Name: src
Committed By: phx
Date: Sat Sep 12 09:18:42 UTC 2009
Modified Files:
src/sys/arch/amiga/amiga: disksubr.c
src/sys/arch/amiga/include: disklabel.h
src/sys/arch/amigappc/include: disklabel.h
Removed Files:
src/sys/arch/amiga/amiga: adosglue.h
Log Message:
Make disklabel.h from amiga and amigappc include the MI sys/disklabel_rdb.h.
amiga/amiga/adosglue.h was deleted and moved into sys_disklabel_rdb.h, as both
are always needed together (disksubr.c and ofppc/stand/ofwboot/rdb.c).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r0 src/sys/arch/amiga/amiga/adosglue.h
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/amiga/amiga/disksubr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/include/disklabel.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amigappc/include/disklabel.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/amiga/disksubr.c
diff -u src/sys/arch/amiga/amiga/disksubr.c:1.59 src/sys/arch/amiga/amiga/disksubr.c:1.60
--- src/sys/arch/amiga/amiga/disksubr.c:1.59 Mon Mar 16 23:11:10 2009
+++ src/sys/arch/amiga/amiga/disksubr.c Sat Sep 12 09:18:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr.c,v 1.59 2009/03/16 23:11:10 dsl Exp $ */
+/* $NetBSD: disksubr.c,v 1.60 2009/09/12 09:18:42 phx Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -66,14 +66,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.59 2009/03/16 23:11:10 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.60 2009/09/12 09:18:42 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/buf.h>
#include <sys/disklabel.h>
#include <sys/disk.h>
-#include <amiga/amiga/adosglue.h>
/*
* In /usr/src/sys/dev/scsipi/sd.c, routine sdstart() adjusts the
Index: src/sys/arch/amiga/include/disklabel.h
diff -u src/sys/arch/amiga/include/disklabel.h:1.6 src/sys/arch/amiga/include/disklabel.h:1.7
--- src/sys/arch/amiga/include/disklabel.h:1.6 Sun Apr 21 21:13:19 1996
+++ src/sys/arch/amiga/include/disklabel.h Sat Sep 12 09:18:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.6 1996/04/21 21:13:19 veego Exp $ */
+/* $NetBSD: disklabel.h,v 1.7 2009/09/12 09:18:42 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -37,163 +37,12 @@
#define MAXPARTITIONS 16 /* number of partitions */
#define RAW_PART 2 /* raw partition: xx?c */
-/*
- * describes ados Rigid Disk Blocks
- * which are used to partition a drive
- */
-#define RDBNULL ((u_long)0xffffffff)
-
-/*
- * you will find rdblock somewhere in [0, RDBMAXBLOCKS)
- */
-#define RDB_MAXBLOCKS 16
-
-struct rdblock {
- u_long id; /* 'RDSK' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long nbytes; /* size of disk blocks */
- u_long flags;
- u_long badbhead; /* linked list of badblocks */
- u_long partbhead; /* linked list of partblocks */
- u_long fsbhead; /* " " of fsblocks */
- u_long driveinit;
- u_long resv1[6]; /* RDBNULL */
- u_long ncylinders; /* number of cylinders on drive */
- u_long nsectors; /* number of sectors per track */
- u_long nheads; /* number of tracks per cylinder */
- u_long interleave;
- u_long park; /* only used with st506 i.e. not */
- u_long resv2[3];
- u_long wprecomp; /* start cyl for write precomp */
- u_long reducedwrite; /* start cyl for reduced write current */
- u_long steprate; /* driver step rate in ?s */
- u_long resv3[5];
- u_long rdblowb; /* lowblock of range for rdb's */
- u_long rdbhighb; /* high block of range for rdb's */
- u_long lowcyl; /* low cylinder of partition area */
- u_long highcyl; /* upper cylinder of partition area */
- u_long secpercyl; /* number of sectors per cylinder */
- u_long parkseconds; /* zero if no park needed */
- u_long resv4[2];
- char diskvendor[8]; /* inquiry stuff */
- char diskproduct[16]; /* inquiry stuff */
- char diskrevision[4]; /* inquiry stuff */
- char contvendor[8]; /* inquiry stuff */
- char contproduct[16]; /* inquiry stuff */
- char contrevision[4]; /* inquiry stuff */
-#if never_use_secsize
- u_long resv5[0];
-#endif
-};
-
-
-#define RDBF_LAST 0x1 /* last drive available */
-#define RDBF_LASTLUN 0x2 /* last LUN available */
-#define RDBF_LASTUNIT 0x4 /* last target available */
-#define RDBF_NORESELECT 0x8 /* do not use reselect */
-#define RDBF_DISKID 0x10 /* disk id is valid ?? */
-#define RDBF_CTRLID 0x20 /* ctrl id is valid ?? */
-#define RDBF_SYNC 0x40 /* drive supports SCSI synchronous mode */
-
-struct ados_environ {
- u_long tabsize; /* 0: environ table size */
- u_long sizeblock; /* 1: n long words in a block */
- u_long secorg; /* 2: not used must be zero */
- u_long numheads; /* 3: number of surfaces */
- u_long secperblk; /* 4: must be 1 */
- u_long secpertrk; /* 5: blocks per track */
- u_long resvblocks; /* 6: reserved blocks at start */
- u_long prefac; /* 7: must be 0 */
- u_long interleave; /* 8: normally 1 */
- u_long lowcyl; /* 9: low cylinder of partition */
- u_long highcyl; /* 10: upper cylinder of partition */
- u_long numbufs; /* 11: ados: number of buffers */
- u_long membuftype; /* 12: ados: type of bufmem */
- u_long maxtrans; /* 13: maxtrans the ctrlr supports */
- u_long mask; /* 14: mask for valid address */
- u_long bootpri; /* 15: boot priority for autoboot */
- u_long dostype; /* 16: filesystem type */
- u_long baud; /* 17: serial handler baud rate */
- u_long control; /* 18: control word for fs */
- u_long bootblocks; /* 19: blocks containing boot code */
- u_long fsize; /* 20: file system block size */
- u_long frag; /* 21: allowable frags per block */
- u_long cpg; /* 22: cylinders per group */
-};
-
-struct partblock {
- u_long id; /* 'PART' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long flags; /* see below */
- u_long resv1[3];
- u_char partname[32]; /* (BCPL) part name (may not be unique) */
- u_long resv2[15];
- struct ados_environ e;
-#if never_use_secsize
- u_long extra[9]; /* 8 for extra added to environ */
-#endif
-};
-
-#define PBF_BOOTABLE 0x1 /* partition is bootable */
-#define PBF_NOMOUNT 0x2 /* partition should be mounted */
-
-struct badblock {
- u_long id; /* 'BADB' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long resv;
- struct badblockent {
- u_long badblock;
- u_long goodblock;
- } badtab[0]; /* 61 for secsize == 512 */
-};
-
-struct fsblock {
- u_long id; /* 'FSHD' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long flags;
- u_long resv1[2];
- u_long dostype; /* this is a file system for this type */
- u_long version; /* version of this fs */
- u_long patchflags; /* describes which functions to replace */
- u_long type; /* zero */
- u_long task; /* zero */
- u_long lock; /* zero */
- u_long handler; /* zero */
- u_long stacksize; /* to use when loading handler */
- u_long priority; /* to run the fs at. */
- u_long startup; /* zero */
- u_long lsegblocks; /* linked list of lsegblocks of fs code */
- u_long globalvec; /* bcpl vector not used mostly */
-#if never_use_secsize
- u_long resv2[44];
-#endif
-};
-
-struct lsegblock {
- u_long id; /* 'LSEG' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long loaddata[0]; /* load segment data, 123 for secsize == 512 */
-};
-
-#define RDBLOCK_ID 0x5244534b /* 'RDSK' */
-#define PARTBLOCK_ID 0x50415254 /* 'PART' */
-#define BADBLOCK_ID 0x42414442 /* 'BADB' */
-#define FSBLOCK_ID 0x46534844 /* 'FSHD' */
-#define LSEGBLOCK_ID 0x4c534547 /* 'LSEG' */
+/* Pull in RDB partition definitions. */
+#if HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/sys/disklabel_rdb.h>
+#else
+#include <sys/disklabel_rdb.h>
+#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
u_long rdblock; /* may be RDBNULL which invalidates */
Index: src/sys/arch/amigappc/include/disklabel.h
diff -u src/sys/arch/amigappc/include/disklabel.h:1.1 src/sys/arch/amigappc/include/disklabel.h:1.2
--- src/sys/arch/amigappc/include/disklabel.h:1.1 Thu May 25 22:11:59 2000
+++ src/sys/arch/amigappc/include/disklabel.h Sat Sep 12 09:18:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.1 2000/05/25 22:11:59 is Exp $ */
+/* $NetBSD: disklabel.h,v 1.2 2009/09/12 09:18:42 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -37,163 +37,12 @@
#define MAXPARTITIONS 16 /* number of partitions */
#define RAW_PART 2 /* raw partition: xx?c */
-/*
- * describes ados Rigid Disk Blocks
- * which are used to partition a drive
- */
-#define RDBNULL ((u_long)0xffffffff)
-
-/*
- * you will find rdblock somewhere in [0, RDBMAXBLOCKS)
- */
-#define RDB_MAXBLOCKS 16
-
-struct rdblock {
- u_long id; /* 'RDSK' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long nbytes; /* size of disk blocks */
- u_long flags;
- u_long badbhead; /* linked list of badblocks */
- u_long partbhead; /* linked list of partblocks */
- u_long fsbhead; /* " " of fsblocks */
- u_long driveinit;
- u_long resv1[6]; /* RDBNULL */
- u_long ncylinders; /* number of cylinders on drive */
- u_long nsectors; /* number of sectors per track */
- u_long nheads; /* number of tracks per cylinder */
- u_long interleave;
- u_long park; /* only used with st506 i.e. not */
- u_long resv2[3];
- u_long wprecomp; /* start cyl for write precomp */
- u_long reducedwrite; /* start cyl for reduced write current */
- u_long steprate; /* driver step rate in ?s */
- u_long resv3[5];
- u_long rdblowb; /* lowblock of range for rdb's */
- u_long rdbhighb; /* high block of range for rdb's */
- u_long lowcyl; /* low cylinder of partition area */
- u_long highcyl; /* upper cylinder of partition area */
- u_long secpercyl; /* number of sectors per cylinder */
- u_long parkseconds; /* zero if no park needed */
- u_long resv4[2];
- char diskvendor[8]; /* inquiry stuff */
- char diskproduct[16]; /* inquiry stuff */
- char diskrevision[4]; /* inquiry stuff */
- char contvendor[8]; /* inquiry stuff */
- char contproduct[16]; /* inquiry stuff */
- char contrevision[4]; /* inquiry stuff */
-#if never_use_secsize
- u_long resv5[0];
-#endif
-};
-
-
-#define RDBF_LAST 0x1 /* last drive available */
-#define RDBF_LASTLUN 0x2 /* last LUN available */
-#define RDBF_LASTUNIT 0x4 /* last target available */
-#define RDBF_NORESELECT 0x8 /* do not use reselect */
-#define RDBF_DISKID 0x10 /* disk id is valid ?? */
-#define RDBF_CTRLID 0x20 /* ctrl id is valid ?? */
-#define RDBF_SYNC 0x40 /* drive supports SCSI synchronous mode */
-
-struct ados_environ {
- u_long tabsize; /* 0: environ table size */
- u_long sizeblock; /* 1: n long words in a block */
- u_long secorg; /* 2: not used must be zero */
- u_long numheads; /* 3: number of surfaces */
- u_long secperblk; /* 4: must be 1 */
- u_long secpertrk; /* 5: blocks per track */
- u_long resvblocks; /* 6: reserved blocks at start */
- u_long prefac; /* 7: must be 0 */
- u_long interleave; /* 8: normally 1 */
- u_long lowcyl; /* 9: low cylinder of partition */
- u_long highcyl; /* 10: upper cylinder of partition */
- u_long numbufs; /* 11: ados: number of buffers */
- u_long membuftype; /* 12: ados: type of bufmem */
- u_long maxtrans; /* 13: maxtrans the ctrlr supports */
- u_long mask; /* 14: mask for valid address */
- u_long bootpri; /* 15: boot priority for autoboot */
- u_long dostype; /* 16: filesystem type */
- u_long baud; /* 17: serial handler baud rate */
- u_long control; /* 18: control word for fs */
- u_long bootblocks; /* 19: blocks containing boot code */
- u_long fsize; /* 20: file system block size */
- u_long frag; /* 21: allowable frags per block */
- u_long cpg; /* 22: cylinders per group */
-};
-
-struct partblock {
- u_long id; /* 'PART' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long flags; /* see below */
- u_long resv1[3];
- u_char partname[32]; /* (BCPL) part name (may not be unique) */
- u_long resv2[15];
- struct ados_environ e;
-#if never_use_secsize
- u_long extra[9]; /* 8 for extra added to environ */
-#endif
-};
-
-#define PBF_BOOTABLE 0x1 /* partition is bootable */
-#define PBF_NOMOUNT 0x2 /* partition should be mounted */
-
-struct badblock {
- u_long id; /* 'BADB' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long resv;
- struct badblockent {
- u_long badblock;
- u_long goodblock;
- } badtab[0]; /* 61 for secsize == 512 */
-};
-
-struct fsblock {
- u_long id; /* 'FSHD' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long flags;
- u_long resv1[2];
- u_long dostype; /* this is a file system for this type */
- u_long version; /* version of this fs */
- u_long patchflags; /* describes which functions to replace */
- u_long type; /* zero */
- u_long task; /* zero */
- u_long lock; /* zero */
- u_long handler; /* zero */
- u_long stacksize; /* to use when loading handler */
- u_long priority; /* to run the fs at. */
- u_long startup; /* zero */
- u_long lsegblocks; /* linked list of lsegblocks of fs code */
- u_long globalvec; /* bcpl vector not used mostly */
-#if never_use_secsize
- u_long resv2[44];
-#endif
-};
-
-struct lsegblock {
- u_long id; /* 'LSEG' */
- u_long nsumlong; /* number of longs in check sum */
- u_long chksum; /* simple additive with wrap checksum */
- u_long hostid; /* scsi target of host */
- u_long next; /* next in chain */
- u_long loaddata[0]; /* load segment data, 123 for secsize == 512 */
-};
-
-#define RDBLOCK_ID 0x5244534b /* 'RDSK' */
-#define PARTBLOCK_ID 0x50415254 /* 'PART' */
-#define BADBLOCK_ID 0x42414442 /* 'BADB' */
-#define FSBLOCK_ID 0x46534844 /* 'FSHD' */
-#define LSEGBLOCK_ID 0x4c534547 /* 'LSEG' */
+/* Pull in RDB partition definitions. */
+#if HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/sys/disklabel_rdb.h>
+#else
+#include <sys/disklabel_rdb.h>
+#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
u_long rdblock; /* may be RDBNULL which invalidates */
