summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2012-08-08 12:05:23 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2012-08-08 12:05:23 +0000
commit89e9520cff90e8e0d4e64c0c653dd736546ca0f7 (patch)
tree4777a9620288f2349e71b56e8a88ff7026ffde4c /sbin
parent9a10e674281723f6021d9b947b439b84fcc0132b (diff)
remove mac68k leftovers
ok miod@ mpi@ deraadt@ martin@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/pdisk/partition_map.c4
-rw-r--r--sbin/pdisk/pdisk.c31
2 files changed, 0 insertions, 35 deletions
diff --git a/sbin/pdisk/partition_map.c b/sbin/pdisk/partition_map.c
index f28abc2ce7d..654fec52912 100644
--- a/sbin/pdisk/partition_map.c
+++ b/sbin/pdisk/partition_map.c
@@ -67,11 +67,7 @@
//
const char * kFreeType = "Apple_Free";
const char * kMapType = "Apple_partition_map";
-#ifdef __m68k__
-const char * kUnixType = "Apple_UNIX_SVR2";
-#else
const char * kUnixType = "OpenBSD";
-#endif
const char * kHFSType = "Apple_HFS";
const char * kPatchType = "Apple_Patches";
diff --git a/sbin/pdisk/pdisk.c b/sbin/pdisk/pdisk.c
index 3c594c08ab0..9d46f7cd1b1 100644
--- a/sbin/pdisk/pdisk.c
+++ b/sbin/pdisk/pdisk.c
@@ -102,9 +102,6 @@ static int first_get = 1;
// Forward declarations
//
void do_change_map_size(partition_map_header *map);
-#ifdef __m68k__
-void do_update_dpme(partition_map *entry);
-#endif
void do_create_partition(partition_map_header *map, int get_type);
void do_delete_partition(partition_map_header *map);
void do_display_block(partition_map_header *map, char *alt_name);
@@ -526,28 +523,6 @@ finis:
close_partition_map(map);
}
-#ifdef __m68k__
-void
-do_update_dpme(partition_map *entry)
-{
- int slice = 0;
- if (!entry) return;
- dpme_init_flags(entry->data);
- entry->HFS_name = get_HFS_name(entry, &entry->HFS_kind);
- if (istrncmp(entry->data->dpme_type, kUnixType, DPISTRLEN) == 0) {
- printf("Available partition slices for %s:\n",entry->data->dpme_type);
- printf(" a root partition\n");
- printf(" b swap partition\n");
- printf(" c do not set any bzb bits\n");
- printf(" g user partition\n");
- printf("Other lettered values will create user partitions\n");
- get_command("Select a slice for default bzb values: ",0,&slice);
- }
- bzb_init_slice((BZB *)entry->data->dpme_bzb,slice);
- entry->the_map->changed = 1;
-}
-#endif
-
void
do_create_partition(partition_map_header *map, int get_type)
{
@@ -591,9 +566,6 @@ do_create_partition(partition_map_header *map, int get_type)
}
add_partition_to_map(name, type_name, base, length, map);
}
-#ifdef __m68k__
- do_update_dpme(find_entry_by_base(base,map));
-#endif
xit2:
if (type_name)
free(type_name);
@@ -731,9 +703,6 @@ do_change_type(partition_map_header *map)
}
strncpy(entry->data->dpme_type, type, DPISTRLEN);
-#ifdef __m68k__
- do_update_dpme(entry);
-#endif
map->changed = 1;
out: