Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dpme.h, as it's no longer necessary.

Browse Source
This commit is contained in:
scottr 1998-02-27 09:17:18 +00:00
parent c1ea2b45ff
commit e3dfc809c6
2 changed files with 28 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sys/arch/mac68k/mac68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */
/* $NetBSD: disksubr.c,v 1.23 1998/02/27 09:17:18 scottr Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -85,8 +85,6 @@
#include <sys/disklabel.h>
#include <sys/syslog.h>
#include <mac68k/mac68k/dpme.h> /* MF the structure of a mac partition entry */
#define b_cylin b_resid
#define NUM_PARTS_PROBED 32
@ -98,15 +96,15 @@
#define SCRATCH_PART 5
static int getFreeLabelEntry __P((struct disklabel *));
static int whichType __P((struct partmapentry *));
static void fixPartTable __P((struct partmapentry *, long, char *, int *));
static void setRoot __P((struct partmapentry *, struct disklabel *, int));
static void setSwap __P((struct partmapentry *, struct disklabel *, int));
static void setUfs __P((struct partmapentry *, struct disklabel *, int));
static void setHfs __P((struct partmapentry *, struct disklabel *, int));
static void setScratch __P((struct partmapentry *, struct disklabel *, int));
static int whichType __P((struct part_map_entry *));
static void fixPartTable __P((struct part_map_entry *, long, char *, int *));
static void setRoot __P((struct part_map_entry *, struct disklabel *, int));
static void setSwap __P((struct part_map_entry *, struct disklabel *, int));
static void setUfs __P((struct part_map_entry *, struct disklabel *, int));
static void setHfs __P((struct part_map_entry *, struct disklabel *, int));
static void setScratch __P((struct part_map_entry *, struct disklabel *, int));
static int getNamedType
__P((struct partmapentry *, int, struct disklabel *, int, int, int *));
__P((struct part_map_entry *, int, struct disklabel *, int, int, int *));
static char *read_mac_label __P((dev_t, void (*)(struct buf *),
register struct disklabel *, struct cpu_disklabel *));
@ -134,24 +132,24 @@ getFreeLabelEntry(lp)
*/
static int
whichType(part)
struct partmapentry *part;
struct part_map_entry *part;
{
struct blockzeroblock *bzb;
if (part->pmPartType[0] == '\0')
return 0;
if (strcmp(PART_DRIVER_TYPE, (char *)part->pmPartType) == 0)
if (strcmp(PART_TYPE_DRIVER, (char *)part->pmPartType) == 0)
return 0;
if (strcmp(PART_DRIVER43_TYPE, (char *)part->pmPartType) == 0)
if (strcmp(PART_TYPE_DRIVER43, (char *)part->pmPartType) == 0)
return 0;
if (strcmp(PART_DRIVERATA_TYPE, (char *)part->pmPartType) == 0)
if (strcmp(PART_TYPE_DRIVERATA, (char *)part->pmPartType) == 0)
return 0;
if (strcmp(PART_FWB_COMPONENT_TYPE, (char *)part->pmPartType) == 0)
if (strcmp(PART_TYPE_FWB_COMPONENT, (char *)part->pmPartType) == 0)
return 0;
if (strcmp(PART_PARTMAP_TYPE, (char *)part->pmPartType) == 0)
if (strcmp(PART_TYPE_PARTMAP, (char *)part->pmPartType) == 0)
return 0;
if (strcmp(PART_UNIX_TYPE, (char *)part->pmPartType) == 0) {
if (strcmp(PART_TYPE_UNIX, (char *)part->pmPartType) == 0) {
/* unix part, swap, root, usr */
bzb = (struct blockzeroblock *)(&part->pmBootArgs);
if (bzb->bzbMagic != BZB_MAGIC)
@ -168,7 +166,7 @@ whichType(part)
return SCRATCH_PART;
}
if (strcmp(PART_MAC_TYPE, (char *)part->pmPartType) == 0)
if (strcmp(PART_TYPE_MAC, (char *)part->pmPartType) == 0)
return HFS_PART;
/*
if (strcmp(PART_SCRATCH, (char *)part->pmPartType) == 0)
@ -184,19 +182,19 @@ whichType(part)
*/
static void
fixPartTable(partTable, size, base, num)
struct partmapentry *partTable;
struct part_map_entry *partTable;
long size;
char *base;
int *num;
{
int i = 0;
struct partmapentry *pmap;
struct part_map_entry *pmap;
char *s;
for (i = 0; i < NUM_PARTS_PROBED; i++) {
pmap = (struct partmapentry *)((i * size) + base);
pmap = (struct part_map_entry *)((i * size) + base);
if (pmap->pmSig != DPME_MAGIC) { /* this is not valid */
if (pmap->pmSig != PART_ENTRY_MAGIC) { /* this is not valid */
pmap->pmPartType[0] = '\0';
break;
}
@ -216,7 +214,7 @@ fixPartTable(partTable, size, base, num)
static void
setRoot(part, lp, slot)
struct partmapentry *part;
struct part_map_entry *part;
struct disklabel *lp;
int slot;
{
@ -236,7 +234,7 @@ setRoot(part, lp, slot)
static void
setSwap(part, lp, slot)
struct partmapentry *part;
struct part_map_entry *part;
struct disklabel *lp;
int slot;
{
@ -256,7 +254,7 @@ setSwap(part, lp, slot)
static void
setUfs(part, lp, slot)
struct partmapentry *part;
struct part_map_entry *part;
struct disklabel *lp;
int slot;
{
@ -276,7 +274,7 @@ setUfs(part, lp, slot)
static void
setHfs(part, lp, slot)
struct partmapentry *part;
struct part_map_entry *part;
struct disklabel *lp;
int slot;
{
@ -296,7 +294,7 @@ setHfs(part, lp, slot)
static void
setScratch(part, lp, slot)
struct partmapentry *part;
struct part_map_entry *part;
struct disklabel *lp;
int slot;
{
@ -317,7 +315,7 @@ setScratch(part, lp, slot)
static int
getNamedType(part, num_parts, lp, type, alt, maxslot)
struct partmapentry *part;
struct part_map_entry *part;
int num_parts;
struct disklabel *lp;
int type, alt;
@ -394,7 +392,7 @@ read_mac_label(dev, strat, lp, osdep)
struct buf *bp;
char *msg = NULL;
int i = 0, num_parts = 0, maxslot = 0;
struct partmapentry pmap[NUM_PARTS_PROBED];
struct part_map_entry pmap[NUM_PARTS_PROBED];
bp = geteblk((int) lp->d_secsize * NUM_PARTS_PROBED);
bp->b_dev = dev;

101
sys/arch/mac68k/mac68k/dpme.h
View File

@ -1,101 +0,0 @@
/* $NetBSD: dpme.h,v 1.8 1997/11/30 04:46:59 briggs Exp $ */
/*-
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
* Michael L. Finch, Bradley A. Grantham, and
* Lawrence A. Kesteloot
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the Alice Group.
* 4. The names of the Alice Group or any of its members may not be used
* to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE ALICE GROUP ``AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE ALICE GROUP BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
#include <sys/types.h>
/*
* Partition map structure from Inside Macintosh V-579.
*/
struct partmapentry {
u_int16_t pmSig;
u_int16_t pmSigPad;
u_int32_t pmMapBlkCnt;
u_int32_t pmPyPartStart;
u_int32_t pmPartBlkCnt;
u_int8_t pmPartName[32];
u_int8_t pmPartType[32];
u_int32_t pmLgDataStart;
u_int32_t pmDataCnt;
u_int32_t pmPartStatus;
u_int32_t pmLgBootStart;
u_int32_t pmBootSize;
u_int32_t pmBootLoad;
u_int32_t pmBootLoad2;
u_int32_t pmBootEntry;
u_int32_t pmBootEntry2;
u_int32_t pmBootCksum;
int8_t pmProcessor[16];
u_int8_t pmBootArgs[128];
u_int8_t blockpadding[248];
};
/*
* Disk Partition Map Entry Magic number. Valid entries have this
* in the pmSig field.
*/
#define DPME_MAGIC 0x504d
/*
* "pmBootArgs" for APPLE_UNIX_SVR2 partition.
* NetBSD/Mac68k only uses Magic, Cluster, Type, and Flags.
*/
struct blockzeroblock {
u_int32_t bzbMagic;
u_int8_t bzbCluster;
u_int8_t bzbType;
u_int16_t bzbBadBlockInode;
u_int16_t bzbFlags;
u_int16_t bzbReserved;
u_int32_t bzbCreationTime;
u_int32_t bzbMountTime;
u_int32_t bzbUMountTime;
};
#define BZB_MAGIC 0xABADBABE
#define BZB_TYPEFS 1
#define BZB_TYPESWAP 3
#define BZB_ROOTFS 0x8000
#define BZB_USRFS 0x4000
/* MF */
#define PART_UNIX_TYPE "APPLE_UNIX_SVR2"
#define PART_MAC_TYPE "APPLE_HFS"
#define PART_SCRATCH "APPLE_SCRATCH"
#define PART_DRIVER_TYPE "APPLE_DRIVER"
#define PART_DRIVER43_TYPE "APPLE_DRIVER43"
#define PART_DRIVERATA_TYPE "APPLE_DRIVER_ATA"
#define PART_FWB_COMPONENT_TYPE "FWB DRIVER COMPONENTS"
#define PART_PARTMAP_TYPE "APPLE_PARTITION_MAP"