diff options
Diffstat (limited to 'sys/arch/alpha/alpha/disksubr.c')
| -rw-r--r-- | sys/arch/alpha/alpha/disksubr.c | 48 |
1 files changed, 3 insertions, 45 deletions
diff --git a/sys/arch/alpha/alpha/disksubr.c b/sys/arch/alpha/alpha/disksubr.c index 515dc643045..82b7687c203 100644 --- a/sys/arch/alpha/alpha/disksubr.c +++ b/sys/arch/alpha/alpha/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.43 2006/03/15 20:20:37 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.44 2006/06/11 21:15:35 krw Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $ */ /* @@ -41,8 +41,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. */ #include <sys/param.h> @@ -58,11 +56,9 @@ #define DISKLABEL_ALPHA #elif (defined(i386) || defined(arc)) && !defined(DISKLABEL_I386) #define DISKLABEL_I386 -#elif defined(amiga) && !defined(DISKLABEL_AMIGA) -#define DISKLABEL_AMIGA #endif -#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) +#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_ALL) void swapdisklabel(struct disklabel *d); char *readbsdlabel(struct buf *, void (*)(struct buf *), int, int, int, int, struct disklabel *, int); @@ -71,14 +67,10 @@ 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 static enum disklabel_tag probe_order[] = { LABELPROBES, -1 }; -#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_AMIGA) || defined(DISKLABEL_ALL) +#if defined(DISKLABEL_I386) || defined(DISKLABEL_ALPHA) || defined(DISKLABEL_ALL) /* * Byteswap all the fields that might be swapped. @@ -269,12 +261,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; - default: panic("unrecognized disklabel tag %d", *tp); } @@ -546,26 +532,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 - /* * Check new disk label for sensibility * before setting it. @@ -682,14 +648,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; - default: panic("unrecognized disklabel tag %d", *tp); } |