Nuke a few unused structures and variables.

2 files changed, 27 insertions, 118 deletions

diff --git a/sys/arch/mvme88k/mvme88k/disksubr.c b/sys/arch/mvme88k/mvme88k/disksubr.c
index 2102245da71..c0ed981dc5e 100644
--- a/sys/arch/mvme88k/mvme88k/disksubr.c
+++ b/sys/arch/mvme88k/mvme88k/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.23 2003/10/05 20:25:08 miod Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.24 2004/01/12 17:30:26 miod Exp $	*/
 /*
  * Copyright (c) 1998 Steve Murphree, Jr.
  * Copyright (c) 1995 Dale Rahn.
@@ -42,18 +42,16 @@
 #define b_cylin b_resid
 
 #ifdef DEBUG
-int disksubr_debug = 0;
+int disksubr_debug;
 #endif
 
-static void bsdtocpulabel(struct disklabel *lp,
-	struct cpu_disklabel *clp);
-static void cputobsdlabel(struct disklabel *lp,
-	struct cpu_disklabel *clp);
+void bsdtocpulabel(struct disklabel *, struct cpu_disklabel *);
+void cputobsdlabel(struct disklabel *, struct cpu_disklabel *);
 int get_target(void);
 
 #ifdef DEBUG
-static void printlp(struct disklabel *lp, char *str);
-static void printclp(struct cpu_disklabel *clp, char *str);
+void printlp(struct disklabel *, char *);
+void printclp(struct cpu_disklabel *, char *);
 #endif
 
 /*
@@ -124,7 +122,7 @@ dk_establish(dk, dev)
  * The label must be partly set up before this:
  * secpercyl and anything required in the strategy routine
  * (e.g., sector size) must be filled in before calling us.
- * Returns null on success and an error string on failure.
+ * Returns NULL on success and an error string on failure.
  */
 
 char *
@@ -188,7 +186,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly)
 		return ("disk label corrupted");
 
 #ifdef DEBUG
-	if (disksubr_debug > 0) {
+	if (disksubr_debug != 0) {
 		printlp(lp, "readdisklabel:bsd label");
 		printclp(clp, "readdisklabel:cpu label");
 	}
@@ -210,7 +208,7 @@ setdisklabel(olp, nlp, openmask, clp)
 	struct partition *opp, *npp;
 
 #ifdef DEBUG
-	if(disksubr_debug > 0) {
+	if (disksubr_debug != 0) {
 		printlp(nlp, "setdisklabel:new disklabel");
 		printlp(olp, "setdisklabel:old disklabel");
 		printclp(clp, "setdisklabel:cpu disklabel");
@@ -258,7 +256,7 @@ setdisklabel(olp, nlp, openmask, clp)
  	nlp->d_checksum = dkcksum(nlp);
 	*olp = *nlp;
 #ifdef DEBUG
-	if(disksubr_debug > 0) {
+	if (disksubr_debug != 0) {
 		printlp(olp, "setdisklabel:old->new disklabel");
 	}
 #endif
@@ -279,7 +277,7 @@ writedisklabel(dev, strat, lp, clp)
 	int error;
 
 #ifdef DEBUG
-	if(disksubr_debug > 0) {
+	if (disksubr_debug != 0) {
 		printlp(lp, "writedisklabel: bsd label");
 	}
 #endif
@@ -311,7 +309,7 @@ writedisklabel(dev, strat, lp, clp)
 	bsdtocpulabel(lp, clp);
 
 #ifdef DEBUG
-	if (disksubr_debug > 0) {
+	if (disksubr_debug != 0) {
 		printclp(clp, "writedisklabel: cpu label");
 	}
 #endif
@@ -397,7 +395,7 @@ bad:
 }
 
 
-static void
+void
 bsdtocpulabel(lp, clp)
 	struct disklabel *lp;
 	struct cpu_disklabel *clp;
@@ -470,83 +468,7 @@ bsdtocpulabel(lp, clp)
 	}
 }
 
-struct cpu_disklabel_old {
-	/* VID */
-	u_char		vid_id[4];
-	u_char		vid_0[16];
-	u_int		vid_oss;
-	u_short		vid_osl;
-	u_char		vid_1[4];
-	u_short		vid_osa_u;
-	u_short		vid_osa_l;
-	u_char		vid_2[2];
-	u_short		partitions;
-	u_char		vid_vd[16];
-	u_long		bbsize;
-	u_long		magic1;		/* 4 */
-	u_short		type;		/* 2 */
-	u_short		subtype;	/* 2 */
-	u_char		packname[16];	/* 16 */
-	u_long		flags;		/* 4 */
-	u_long		drivedata[5];	/* 4 */
-	u_long		spare[5];	/* 4 */
-	u_short		checksum;	/* 2 */
-
-	u_long		secpercyl;	/* 4 */
-	u_long		secperunit;	/* 4 */
-	u_long		headswitch;	/* 4 */
-
-	u_char		vid_3[4];
-	u_int		vid_cas;
-	u_char		vid_cal;
-	u_char		vid_4_0[3];
-	u_char		vid_4[64];
-	u_char		vid_4_1[28];
-	u_long		sbsize;
-	u_char		vid_mot[8];
-
-	/* CFG */
-	u_char		cfg_0[4];
-	u_short		cfg_atm;
-	u_short		cfg_prm;
-	u_short		cfg_atw;
-	u_short		cfg_rec;
-
-	u_short		sparespertrack;
-	u_short		sparespercyl;
-	u_long		acylinders;
-	u_short		rpm;
-	u_short		cylskew;
-
-	u_char		cfg_spt;
-	u_char		cfg_hds;
-	u_short		cfg_trk;
-	u_char		cfg_ilv;
-	u_char		cfg_sof;
-	u_short		cfg_psm;
-	u_short		cfg_shd;
-	u_char		cfg_2[2];
-	u_short		cfg_pcom;
-	u_char		cfg_3;
-	u_char		cfg_ssr;
-	u_short		cfg_rwcc;
-	u_short		cfg_ecc;
-	u_short		cfg_eatm;
-	u_short		cfg_eprm;
-	u_short		cfg_eatw;
-	u_char		cfg_gpb1;
-	u_char		cfg_gpb2;
-	u_char		cfg_gpb3;
-	u_char		cfg_gpb4;
-	u_char		cfg_ssc;
-	u_char		cfg_runit;
-	u_short		cfg_rsvc1;
-	u_short		cfg_rsvc2;
-	u_long		magic2;
-	u_char		cfg_4[192];
-};
-
-static void
+void
 cputobsdlabel(lp, clp)
 	struct disklabel *lp;
 	struct cpu_disklabel *clp;
@@ -555,7 +477,7 @@ cputobsdlabel(lp, clp)
 
 	if (clp->version == 0) {
 #ifdef DEBUG
-		if (disksubr_debug > 0) {
+		if (disksubr_debug != 0) {
 			printf("Reading old disklabel\n");
 		}
 #endif
@@ -619,7 +541,7 @@ cputobsdlabel(lp, clp)
 		lp->d_checksum = dkcksum(lp);
 	} else {
 #ifdef DEBUG
-		if (disksubr_debug > 0) {
+		if (disksubr_debug != 0) {
 			printf("Reading new disklabel\n");
 		}
 #endif
@@ -683,14 +605,14 @@ cputobsdlabel(lp, clp)
 		lp->d_checksum = dkcksum(lp);
 	}
 #if defined(DEBUG)
-	if (disksubr_debug > 0) {
+	if (disksubr_debug != 0) {
 		printlp(lp, "translated label read from disk\n");
 	}
 #endif
 }
 
 #ifdef DEBUG
-static void
+void
 printlp(lp, str)
 	struct disklabel *lp;
 	char *str;
@@ -714,7 +636,7 @@ printlp(lp, str)
 	}
 }
 
-static void
+void
 printclp(clp, str)
 	struct cpu_disklabel *clp;
 	char *str;
diff --git a/sys/arch/mvme88k/mvme88k/machdep.c b/sys/arch/mvme88k/mvme88k/machdep.c
index 4a0def5e274..c0d95244f75 100644
--- a/sys/arch/mvme88k/mvme88k/machdep.c
+++ b/sys/arch/mvme88k/mvme88k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.128 2004/01/12 07:46:17 miod Exp $	*/
+/* $OpenBSD: machdep.c,v 1.129 2004/01/12 17:30:26 miod Exp $	*/
 /*
  * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
  * Copyright (c) 1996 Nivas Madhur
@@ -228,19 +228,6 @@ caddr_t allocsys(caddr_t);
 char  machine[] = MACHINE;	 /* cpu "architecture" */
 char  cpu_model[120];
 
-struct bugenv bugargs;
-
-struct kernel {
-	void *entry;
-	void *symtab;
-	void *esym;
-	int   bflags;
-	int   bdev;
-	char *kname;
-	void *smini;
-	void *emini;
-	void *end_load;
-}kflags;
 #if defined(DDB) || NKSYMS > 0
 extern char *esym;
 #endif
@@ -837,15 +824,15 @@ struct sigstate {
 
 /*
  * WARNING: code in locore.s assumes the layout shown for sf_signo
- * thru sf_handler so... don't screw with them!
+ * through sf_handler so... don't screw with them!
  */
 struct sigframe {
-	int   sf_signo;	     /* signo for handler */
-	siginfo_t *sf_sip;
-	struct   sigcontext *sf_scp;  /* context ptr for handler */
-	sig_t sf_handler;    /* handler addr for u_sigc */
-	struct   sigcontext sf_sc; /* actual context */
-	siginfo_t sf_si;
+	int			sf_signo;	/* signo for handler */
+	siginfo_t *		sf_sip;
+	struct sigcontext *	sf_scp;		/* context ptr for handler */
+	sig_t			sf_handler;	/* handler addr for u_sigc */
+	struct sigcontext	sf_sc;		/* actual context */
+	siginfo_t		sf_si;
 };
 
 #ifdef DEBUG