[src/trunk]: src/sys/arch/hppa/stand/xxboot minimal changes to get this to co...

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

details:   https://anonhg.NetBSD.org/src/rev/d10158e2a71a
branches:  trunk
changeset: 340004:d10158e2a71a
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Aug 20 07:50:08 2015 +0000

description:
minimal changes to get this to compile.

diffstat:

 sys/arch/hppa/stand/xxboot/readufs.h     |   6 +++---
 sys/arch/hppa/stand/xxboot/readufs_lfs.c |  12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (74 lines):

diff -r 306df56a8d69 -r d10158e2a71a sys/arch/hppa/stand/xxboot/readufs.h
--- a/sys/arch/hppa/stand/xxboot/readufs.h      Thu Aug 20 07:13:07 2015 +0000
+++ b/sys/arch/hppa/stand/xxboot/readufs.h      Thu Aug 20 07:50:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readufs.h,v 1.1 2014/02/24 07:23:43 skrll Exp $        */
+/*     $NetBSD: readufs.h,v 1.2 2015/08/20 07:50:08 christos Exp $     */
 /*     from Id: readufs.h,v 1.10 2003/12/16 13:54:11 itohy Exp */
 
 /*
@@ -23,8 +23,8 @@
        struct ufs2_dinode di2;
 #endif
 #ifdef USE_LFS
-       struct ulfs1_dinode dil1;
-       struct ulfs2_dinode dil2;
+       struct lfs32_dinode dil32;
+       struct lfs64_dinode dil64;
 #endif
 };
 
diff -r 306df56a8d69 -r d10158e2a71a sys/arch/hppa/stand/xxboot/readufs_lfs.c
--- a/sys/arch/hppa/stand/xxboot/readufs_lfs.c  Thu Aug 20 07:13:07 2015 +0000
+++ b/sys/arch/hppa/stand/xxboot/readufs_lfs.c  Thu Aug 20 07:50:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readufs_lfs.c,v 1.2 2015/07/28 16:50:12 christos Exp $ */
+/*     $NetBSD: readufs_lfs.c,v 1.3 2015/08/20 07:50:08 christos Exp $ */
 /*     from Id: readufs_lfs.c,v 1.8 2003/12/16 13:54:11 itohy Exp      */
 
 /*
@@ -20,7 +20,7 @@
  #error LFS currently requires USE_UFS1
 #endif
 
-static struct ulfs1_dinode     ifile_dinode;
+static struct lfs32_dinode     ifile_dinode;
 
 #define fsi    (*ufsinfo)
 #define fsi_lfs        fsi.fs_u.u_lfs
@@ -156,7 +156,7 @@
        struct ufs_info *ufsinfo = &ufs_info;
        daddr_t daddr;
        char *buf = alloca(fsi.bsize);
-       struct ulfs1_dinode *di, *diend;
+       struct lfs32_dinode *di, *diend;
        int i;
 
        /* Get fs block which contains the specified inode. */
@@ -173,7 +173,7 @@
                i = ino % fsi_lfs.ifpb;
                daddr = (fsi_lfs.version == 1) ?
                    ((IFILE_V1 *) buf + i)->if_daddr
-                   : ((IFILE *) buf + i)->if_daddr;
+                   : ((IFILE32 *) buf + i)->if_daddr;
        }
 #ifdef DEBUG_WITH_STDIO
        printf("LFS(%d): daddr: %d\n", ino, (int) daddr);
@@ -186,7 +186,7 @@
        RAW_READ(buf, daddr << fsi.fsbtodb, fsi_lfs.ibsize);
 
        /* Search for the inode. */
-       di = (struct ulfs1_dinode *) buf;
+       di = (struct lfs32_dinode *) buf;
        diend = di + fsi_lfs.inopb;
 
        for ( ; di < diend; di++)
@@ -210,7 +210,7 @@
 #endif
 #endif
 
-       dibuf->dil1 = *di;
+       dibuf->dil32 = *di;
 
        return 0;
 }