diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2003-02-24 22:13:10 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2003-02-24 22:13:10 +0000 |
| commit | a9f573d7585111e5ce603f20abf5696e179cf9d4 (patch) | |
| tree | 928199cad5e7866fc4d1ff3590c6550b349fd96c /sys | |
| parent | d4a76a185e0fef43b35700678bf7c494f56a3017 (diff) | |
Do not redefine stuff already in <sys/disklabel.h>
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/mvme68k/include/disklabel.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/sys/arch/mvme68k/include/disklabel.h b/sys/arch/mvme68k/include/disklabel.h index 792d6406b70..29d590f1767 100644 --- a/sys/arch/mvme68k/include/disklabel.h +++ b/sys/arch/mvme68k/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.6 2000/04/07 13:39:01 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.7 2003/02/24 22:13:09 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur @@ -34,23 +34,11 @@ #ifndef _MVME68K_DISKLABEL_H_ #define _MVME68K_DISKLABEL_H_ -/* number of boot pieces , ie xxboot bootxx */ -#define NUMBOOT 2 - -#define PARTITIONSHIFT 4 - #define LABELSECTOR 0 /* sector containing label */ #define LABELOFFSET 0 /* offset of label in sector */ -#define MAXPARTITIONS (1 << PARTITIONSHIFT) /* number of partitions */ +#define MAXPARTITIONS 16 /* number of partitions */ #define RAW_PART 2 /* raw partition: xx?c */ -/* - * used to encode disk minor numbers - * this should probably be moved to sys/disklabel.h - */ -#define DISKUNIT(dev) (minor(dev) / MAXPARTITIONS) -#define DISKPART(dev) (minor(dev) % MAXPARTITIONS) - /* * a cpu_disklabel is a disklabel that the bug (prom) can understand * and live with. the bug works in terms of 256 byte blocks. in our |