[src/trunk]: src/sys/arch/x68k/stand/boot_ufs adjust to the lfs splitadjust t...

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

details:   https://anonhg.NetBSD.org/src/rev/bcf2ac472acf
branches:  trunk
changeset: 787390:bcf2ac472acf
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 15 01:37:10 2013 +0000

description:
adjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the lfs splitadjust to the 
lfs split

diffstat:

 sys/arch/x68k/stand/boot_ufs/Makefile      |   4 ++--
 sys/arch/x68k/stand/boot_ufs/readufs.h     |   9 ++++++++-
 sys/arch/x68k/stand/boot_ufs/readufs_lfs.c |  10 +++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diffs (93 lines):

diff -r d7fc51e0e166 -r bcf2ac472acf sys/arch/x68k/stand/boot_ufs/Makefile
--- a/sys/arch/x68k/stand/boot_ufs/Makefile     Sat Jun 15 01:27:19 2013 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/Makefile     Sat Jun 15 01:37:10 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.26 2011/10/11 13:07:06 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.27 2013/06/15 01:37:10 christos Exp $
 
 NOMAN=         # defined
 
@@ -38,7 +38,7 @@
            ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT}
 
 CFLAGS=        -Os -fomit-frame-pointer
-CFLAGS+= -m68020-60
+#CFLAGS+= -m68020-60
 CFLAGS+= -W -Wall -Wstrict-prototypes -Wmissing-prototypes
 CPPFLAGS+= -DTEXTADDR="0x$(TEXT)" -DBOOT_TEXTADDR="0x$(BOOT_TEXT)"
 CPPFLAGS+= -DBOOT=\"$(BOOT)\" -DBOOT_VERS=\"$(VERSION)\"
diff -r d7fc51e0e166 -r bcf2ac472acf sys/arch/x68k/stand/boot_ufs/readufs.h
--- a/sys/arch/x68k/stand/boot_ufs/readufs.h    Sat Jun 15 01:27:19 2013 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/readufs.h    Sat Jun 15 01:37:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readufs.h,v 1.10 2011/02/21 02:31:58 itohy Exp $       */
+/*     $NetBSD: readufs.h,v 1.11 2013/06/15 01:37:10 christos Exp $    */
 /*     from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp  */
 
 /*
@@ -8,6 +8,9 @@
 
 #include <sys/types.h>
 #include <sys/param.h>
+#ifdef USE_LFS
+#include <ufs/lfs/lfs.h>
+#endif
 #include <ufs/ufs/dinode.h>
 #include <ufs/ufs/dir.h>
 
@@ -21,6 +24,10 @@
 #ifdef USE_UFS2
        struct ufs2_dinode di2;
 #endif
+#ifdef USE_LFS
+       struct ulfs1_dinode dil1;
+       struct ulfs2_dinode dil2;
+#endif
 };
 
 /* For more compact code and independence on 64-bit types and ops */
diff -r d7fc51e0e166 -r bcf2ac472acf sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
--- a/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c        Sat Jun 15 01:27:19 2013 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c        Sat Jun 15 01:37:10 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readufs_lfs.c,v 1.12 2011/02/21 02:31:58 itohy Exp $   */
+/*     $NetBSD: readufs_lfs.c,v 1.13 2013/06/15 01:37:10 christos Exp $        */
 /*     from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp      */
 
 /*
@@ -22,7 +22,7 @@
 
 static int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf);
 
-static struct ufs1_dinode      ifile_dinode;
+static struct ulfs1_dinode     ifile_dinode;
 
 #define fsi    (*ufsinfo)
 #define fsi_lfs        fsi.fs_u.u_lfs
@@ -160,7 +160,7 @@
        struct ufs_info *ufsinfo = &ufs_info;
        daddr_t daddr;
        char *buf = alloca(fsi.bsize);
-       struct ufs1_dinode *di, *diend;
+       struct ulfs1_dinode *di, *diend;
        int i;
 
        /* Get fs block which contains the specified inode. */
@@ -196,7 +196,7 @@
        );
 
        /* Search for the inode. */
-       di = (struct ufs1_dinode *) buf;
+       di = (struct ulfs1_dinode *) buf;
        diend = di + fsi_lfs.inopb;
 
        for ( ; di < diend; di++)
@@ -220,7 +220,7 @@
 #endif
 #endif
 
-       dibuf->di1 = *di;
+       dibuf->dil1 = *di;
 
        return 0;
 }