[src/trunk]: src/sys/arch/hp700/stand Get hp700 boot tools to compile again. ...

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

details:   https://anonhg.NetBSD.org/src/rev/b4ceb33a746e
branches:  trunk
changeset: 553167:b4ceb33a746e
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Oct 11 03:57:31 2003 +0000

description:
Get hp700 boot tools to compile again.  Patches from Jochen Knuz.
(with some modification from me).

diffstat:

 sys/arch/hp700/stand/boot/boot.c    |  3 ++-
 sys/arch/hp700/stand/common/dk.c    |  4 ++--
 sys/arch/hp700/stand/common/libsa.h |  4 ++--
 sys/arch/hp700/stand/common/lif.c   |  9 +++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diffs (80 lines):

diff -r e605295d3bbc -r b4ceb33a746e sys/arch/hp700/stand/boot/boot.c
--- a/sys/arch/hp700/stand/boot/boot.c  Sat Oct 11 03:53:52 2003 +0000
+++ b/sys/arch/hp700/stand/boot/boot.c  Sat Oct 11 03:57:31 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.3 2003/08/07 16:27:45 agc Exp $     */
+/*     $NetBSD: boot.c,v 1.4 2003/10/11 03:57:31 matt Exp $    */
 
 /*-
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -72,6 +72,7 @@
 #include <lib/libsa/loadfile.h>
 
 #include <machine/pdc.h>
+#include <machine/vmparam.h>
 
 #include <arch/hp700/stand/common/dev_hppa.h>
 
diff -r e605295d3bbc -r b4ceb33a746e sys/arch/hp700/stand/common/dk.c
--- a/sys/arch/hp700/stand/common/dk.c  Sat Oct 11 03:53:52 2003 +0000
+++ b/sys/arch/hp700/stand/common/dk.c  Sat Oct 11 03:57:31 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dk.c,v 1.2 2002/11/28 05:38:42 chs Exp $       */
+/*     $NetBSD: dk.c,v 1.3 2003/10/11 03:57:32 matt Exp $      */
 
 /*     $OpenBSD: dk.c,v 1.5 1999/04/20 20:01:01 mickey Exp $   */
 
@@ -40,7 +40,7 @@
 dk_disklabel(struct hppa_dev *dp, struct disklabel *label)
 {
        char buf[DEV_BSIZE];
-       int ret;
+       size_t ret;
 
        if (iodcstrategy(dp, F_READ, LABELSECTOR, DEV_BSIZE, buf, &ret))
                if (ret != DEV_BSIZE)
diff -r e605295d3bbc -r b4ceb33a746e sys/arch/hp700/stand/common/libsa.h
--- a/sys/arch/hp700/stand/common/libsa.h       Sat Oct 11 03:53:52 2003 +0000
+++ b/sys/arch/hp700/stand/common/libsa.h       Sat Oct 11 03:57:31 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: libsa.h,v 1.2 2002/11/28 05:38:42 chs Exp $    */
+/*     $NetBSD: libsa.h,v 1.3 2003/10/11 03:57:32 matt Exp $   */
 
 /*     $OpenBSD: libsa.h,v 1.7 1999/12/23 04:07:47 mickey Exp $        */
 
@@ -76,7 +76,7 @@
 void devboot(dev_t, char *);
 void fcacheall(void);
 
-int     lif_open(char *, struct open_file *);
+int     lif_open(const char *, struct open_file *);
 int     lif_close(struct open_file *);
 int     lif_read(struct open_file *, void *, size_t, size_t *);
 int     lif_write(struct open_file *, void *, size_t, size_t *);
diff -r e605295d3bbc -r b4ceb33a746e sys/arch/hp700/stand/common/lif.c
--- a/sys/arch/hp700/stand/common/lif.c Sat Oct 11 03:53:52 2003 +0000
+++ b/sys/arch/hp700/stand/common/lif.c Sat Oct 11 03:57:31 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lif.c,v 1.2 2002/11/28 05:38:42 chs Exp $      */
+/*     $NetBSD: lif.c,v 1.3 2003/10/11 03:57:32 matt Exp $     */
 
 /*     $OpenBSD: lif.c,v 1.7 2001/06/09 03:54:41 mickey Exp $  */
 
@@ -53,13 +53,14 @@
 };
 
 int
-lif_open(char *path, struct open_file *f)
+lif_open(const char *path, struct open_file *f)
 {
        struct file *fp;
        struct lifdir *dp;
-       char *p, *q;
+       const char *p, *q;
        struct lif_load load;
-       int err, buf_size, l;
+       int err, l;
+       size_t buf_size;
 
 #ifdef LIFDEBUG
        if (debug)