diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-05-03 22:47:46 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1999-05-03 22:47:46 +0000 |
| commit | 00643782085b380c153577e17447f93d2dfd479b (patch) | |
| tree | 56e064399ece314675935cbdb6cfa34b21aaad54 /sys/arch/hppa/stand/libsa | |
| parent | 5536ef0569d704c1a7dbc2e355846fec3a7911cd (diff) | |
lifvar.h -- bye, bye
Diffstat (limited to 'sys/arch/hppa/stand/libsa')
| -rw-r--r-- | sys/arch/hppa/stand/libsa/lif.c | 11 | ||||
| -rw-r--r-- | sys/arch/hppa/stand/libsa/machdep.c | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/hppa/stand/libsa/lif.c b/sys/arch/hppa/stand/libsa/lif.c index 6a7f2d0e347..dbc23798f73 100644 --- a/sys/arch/hppa/stand/libsa/lif.c +++ b/sys/arch/hppa/stand/libsa/lif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lif.c,v 1.3 1999/01/25 20:15:23 mickey Exp $ */ +/* $OpenBSD: lif.c,v 1.4 1999/05/03 22:46:38 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -31,9 +31,8 @@ */ #include <sys/param.h> -#include <lib/libsa/stand.h> - -#include <machine/lifvar.h> +#include <sys/disklabel.h> +#include "libsa.h" extern int debug; @@ -59,7 +58,7 @@ lif_open (path, f) register struct file *fp; register struct lifdir *dp; register char *p = NULL, *q = NULL; /* XXX shut up gcc */ - struct load load; + struct lif_load load; int err, buf_size, l; #ifdef LIFDEBUG @@ -75,7 +74,7 @@ lif_open (path, f) if (debug) printf("lif_open: unable to read LIF header (%d)\n", err); #endif - } else if ((fp->f_lp = (struct lifvol *)fp->f_buf)->vol_id == VOL_ID) { + } else if ((fp->f_lp = (struct lifvol *)fp->f_buf)->vol_id == LIF_VOL_ID) { f->f_fsdata = fp; fp->f_ld = (struct lifdir *)(fp->f_buf + LIF_DIRSTART); fp->f_seek = 0; diff --git a/sys/arch/hppa/stand/libsa/machdep.c b/sys/arch/hppa/stand/libsa/machdep.c index 79b285cee48..87dfa733697 100644 --- a/sys/arch/hppa/stand/libsa/machdep.c +++ b/sys/arch/hppa/stand/libsa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.4 1999/04/20 20:01:02 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.5 1999/05/03 22:46:38 mickey Exp $ */ /* * Copyright (c) 1998 Michael Shalayeff @@ -31,11 +31,11 @@ */ #include <sys/param.h> +#include <sys/disklabel.h> #include <sys/reboot.h> #include "libsa.h" #include <machine/iomod.h> #include <machine/pdc.h> -#include <machine/lifvar.h> #include "dev_hppa.h" |