diff options
Diffstat (limited to 'sys/arch/mips64')
| -rw-r--r-- | sys/arch/mips64/include/disklabel.h | 14 | ||||
| -rw-r--r-- | sys/arch/mips64/mips64/disksubr.c | 48 |
2 files changed, 6 insertions, 56 deletions
diff --git a/sys/arch/mips64/include/disklabel.h b/sys/arch/mips64/include/disklabel.h index 6f7d3170e3c..90c300d9ac6 100644 --- a/sys/arch/mips64/include/disklabel.h +++ b/sys/arch/mips64/include/disklabel.h @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.h,v 1.3 2005/12/20 06:57:02 miod Exp $ */ +/* $OpenBSD: disklabel.h,v 1.4 2006/06/11 21:15:35 krw Exp $ */ /* $NetBSD: disklabel.h,v 1.1 1995/02/13 23:07:34 cgd Exp $ */ /* @@ -34,21 +34,19 @@ #ifndef _MACHINE_DISKLABEL_H_ #define _MACHINE_DISKLABEL_H_ -enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_AMIGA, DLT_HPPA, DLT_SGI }; +enum disklabel_tag { DLT_ALPHA, DLT_I386, DLT_HPPA, DLT_SGI }; /* * What disklabels are we probing for, and in which order? */ #ifndef LABELPROBES -#define LABELPROBES DLT_ALPHA, DLT_I386, DLT_AMIGA, DLT_HPPA, DLT_SGI +#define LABELPROBES DLT_ALPHA, DLT_I386, DLT_HPPA, DLT_SGI #endif #define ALPHA_LABELSECTOR 0 /* sector containing label */ #define ALPHA_LABELOFFSET 64 /* offset of label in sector */ #define I386_LABELSECTOR 1 /* sector containing label */ #define I386_LABELOFFSET 0 /* offset of label in sector */ -#define AMIGA_LABELSECTOR 0 /* sector containing label */ -#define AMIGA_LABELOFFSET 64 /* offset of label in sector */ #define HPPA_LABELSECTOR 1 /* sector containing label */ #define HPPA_LABELOFFSET 0 /* offset of label in sector */ #define SGI_LABELSECTOR 1 /* sector containing label */ @@ -420,12 +418,6 @@ struct cpu_disklabel { struct dkbad bad; } _i386; struct { - u_int32_t rdblock; /* RDBNULL -> inval. */ - u_int32_t pblist[MAXPARTITIONS];/* pblock number */ - int pbindex[MAXPARTITIONS]; /* index of pblock */ - int valid; /* valid? */ - } _amiga; - struct { struct lifvol lifvol; struct lifdir lifdir[LIF_NUMDIR]; struct hpux_label hplabel; diff --git a/sys/arch/mips64/mips64/disksubr.c b/sys/arch/mips64/mips64/disksubr.c index a5e9f1e9fd4..cef48a1ddc0 100644 --- a/sys/arch/mips64/mips64/disksubr.c +++ b/sys/arch/mips64/mips64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.12 2006/03/15 20:20:40 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.13 2006/06/11 21:15:35 krw Exp $ */ /* * Copyright (c) 1999 Michael Shalayeff @@ -42,8 +42,6 @@ * XXX The DOS partitioning code is not endian-independent, only native * endian DOS partition tables can be parsed yet. * - * XXX Amiga RDB partitioning is not understood yet. - * * XXX HPUX disklabel is not understood yet. */ @@ -60,15 +58,13 @@ #define DISKLABEL_ALPHA #elif (defined(i386) || defined(arc)) && !defined(DISKLABEL_I386) #define DISKLABEL_I386 -#elif defined(amiga) && !defined(DISKLABEL_AMIGA) -#define DISKLABEL_AMIGA #elif defined(hppa) && !defined(DISKLABEL_HPPA) #define DISKLABEL_HPPA #elif defined(__sgi__) && !defined(DISKLABEL_SGI) #define DISKLABEL_SGI #endif -#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL) +#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL) void swapdisklabel(struct disklabel *d); char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, int, int, struct disklabel *, int); @@ -77,10 +73,6 @@ char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, char *readdoslabel(struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int); #endif -#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -char *readamigalabel(struct buf *, void (*)(struct buf *), - struct disklabel *, struct cpu_disklabel *, int); -#endif #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) char *readliflabel(struct buf *, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *, int *, int *, int); @@ -93,7 +85,7 @@ void map_sgi_label(struct disklabel *, struct sgilabel *); static enum disklabel_tag probe_order[] = { LABELPROBES, -1 }; -#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL) +#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_HPPA) || defined(DISKLABEL_SGI) || defined(DISKLABEL_ALL) /* * Byteswap all the fields that might be swapped. @@ -284,12 +276,6 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) #endif break; - case DLT_AMIGA: -#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) - msg = readamigalabel(bp, strat, lp, osdep, spoofonly); -#endif - break; - case DLT_HPPA: #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) msg = readliflabel(bp, strat, lp, osdep, 0, 0, spoofonly); @@ -577,26 +563,6 @@ donot: } #endif -#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) -/* - * XXX RDB parsing is missing still. - */ -char * -readamigalabel(bp, strat, lp, osdep, spoofonly) - struct buf *bp; - void (*strat)(struct buf *); - struct disklabel *lp; - struct cpu_disklabel *osdep; - int spoofonly; -{ - char *msg; - - msg = readbsdlabel(bp, strat, 0, AMIGA_LABELSECTOR, AMIGA_LABELOFFSET, - BIG_ENDIAN, lp, spoofonly); - return (msg); -} -#endif - #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) char * readliflabel (bp, strat, lp, osdep, partoffp, cylp, spoofonly) @@ -983,14 +949,6 @@ writedisklabel(dev, strat, lp, osdep) #endif break; - case DLT_AMIGA: -#if defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) - msg = readamigalabel(bp, strat, &dl, &cdl, 0); - labeloffset = AMIGA_LABELOFFSET; - endian = BIG_ENDIAN; -#endif - break; - case DLT_HPPA: #if defined(DISKLABEL_HPPA) || defined(DISKLABEL_ALL) msg = readliflabel(bp, strat, &dl, &cdl, &partoff, |