[src/netbsd-1-6]: src/distrib/utils/sysinst/arch/mac68k Pull up revision 1.11...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6bb19b9f27cc
branches:  netbsd-1-6
changeset: 528296:6bb19b9f27cc
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sat Jun 29 23:23:54 2002 +0000

description:
Pull up revision 1.11 (requested by scottr in ticket #403):
Rework sysinst so that it actually works for common cases. Notably, the
partition handling has been completely rewritten to address serious data
loss issues with Mac HFS partitions, and the a.out -> ELF upgrade has
been addressed. From Bob Nestor; part 1 of 2 of a fix for PR 15528.

diffstat:

 distrib/utils/sysinst/arch/mac68k/md.h |  50 +++++++++++++++++----------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diffs (88 lines):

diff -r 3c0b429cc7d7 -r 6bb19b9f27cc distrib/utils/sysinst/arch/mac68k/md.h
--- a/distrib/utils/sysinst/arch/mac68k/md.h    Sat Jun 29 23:23:46 2002 +0000
+++ b/distrib/utils/sysinst/arch/mac68k/md.h    Sat Jun 29 23:23:54 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: md.h,v 1.10 2001/11/29 23:24:24 thorpej Exp $  */
+/*     $NetBSD: md.h,v 1.10.2.1 2002/06/29 23:23:54 lukem Exp $        */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -40,30 +40,23 @@
 
 /* md.h -- Machine specific definitions for the mac68k */
 
+#define LIB_COUNT 0
+#define LIB_MOVE 1
+
+/*
+ * Define partition types
+ */
+#define ROOT_PART 1
+#define UFS_PART 2
+#define SWAP_PART 3
+#define HFS_PART 4
+#define SCRATCH_PART 5
+
 EXTERN int bcyl, bhead, bsec, bsize, bcylsize;
 EXTERN int part[4][5] INIT({{0}});
 EXTERN int bsdpart;                    /* partition in use by NetBSD */
 EXTERN int usefull;                    /* on install, clobber entire disk */
 
-/*  
- * Known partition types on a MacOS initialized disk
- *  Note: Setting the usable field on the last entry defines
- *        how unknown partition types will be handled.
- */ 
-typedef struct {
-        int usable;             /* Use type: 0=>reserved */
-        char *partype;
-        char *fstyp;
-} PTYPES;
-
-/*    
- * Define the classes of partitions types we can handle 
- */   
-#define TYP_RSRVD 0             /* Unusable low-level part of disk */
-#define TYP_AVAIL 1             /* Anything not used by MacOS or NetBSD */ 
-#define TYP_HFS   2             /* In use by MacOS */
-#define TYP_BSD   3             /* In use by NetBSD */
-
 typedef struct {
         int size;               /* number of blocks in map for I/O */
         int in_use_cnt;         /* number of block in current use in map */
@@ -88,14 +81,22 @@
 
 int    edit_diskmap (void);            
 void   disp_selected_part (int sel);
-int    part_type(int entry, char *fstyp, char *use, char *name);
-int    strnicmp(const char *c1, const char *c2, int n);
+int    whichType(struct part_map_entry *);
+char   *getFstype(struct part_map_entry *, int, char *);
+char   *getUse(struct part_map_entry *, int, char *);
+char   *getName(struct part_map_entry *, int, char *);
+int    stricmp(const char *c1, const char *c2);
+int    getFreeLabelEntry(char *);
+int    findStdType(int, char *, int, int *, int);
+void   setpartition(struct part_map_entry *, char *, int);
 void   sortmerge(void);
-void   reset_part_flags(int part);
+void   reset_part_flags(struct part_map_entry *);
 int    check_for_errors(void);
 void   report_errors(void);
 void   set_fdisk_info (void);          /* write incore info into disk */
 int    get_diskmap_info (void);
+void   md_select_kernel(void);
+int    md_debug_dump(char *);
 
 /* constants and defines */
 
@@ -113,7 +114,8 @@
        unsigned int root : 1;  /* FS contains a Root FS */
        unsigned int usr  : 1;  /* FS contains a Usr FS */
        unsigned int crit : 1;  /* FS contains a "Critical"? FS */
-       unsigned int      : 8;
+       unsigned int used : 1;  /* FS in use */
+       unsigned int      : 7;
        unsigned int slice : 5; /* Slice number to assocate with plus one */
        unsigned int part  : 16; /* reserved, but we'll hide disk part here */
     } flags;