From e7b1c01dbc92afe058dfb44c230940b595abaafe Mon Sep 17 00:00:00 2001
From: Dale Rahn <drahn@cvs.openbsd.org>
Date: Tue, 26 Aug 2003 19:55:22 +0000
Subject: fix for dinode rename, this broke the forth bootblock.s ok jason@
 tedu@

---
 sys/arch/sparc64/stand/bootblk/bootblk.fth | 10 +++++-----
 sys/arch/sparc64/stand/bootblk/genfth.cf   |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/sparc64/stand/bootblk/bootblk.fth b/sys/arch/sparc64/stand/bootblk/bootblk.fth
index 42f5e21089b..66d7bcda2fe 100644
--- a/sys/arch/sparc64/stand/bootblk/bootblk.fth
+++ b/sys/arch/sparc64/stand/bootblk/bootblk.fth
@@ -1,4 +1,4 @@
-\	$OpenBSD: bootblk.fth,v 1.1 2001/08/18 04:16:37 jason Exp $
+\	$OpenBSD: bootblk.fth,v 1.2 2003/08/26 19:55:21 drahn Exp $
 \	$NetBSD: bootblk.fth,v 1.3 2001/08/15 20:10:24 eeh Exp $
 \
 \	IEEE 1275 Open Firmware Boot Block
@@ -213,7 +213,7 @@ struct
    8		field	>f_ihandle	\ device handle
    8 		field 	>f_seekp	\ seek pointer
    8 		field 	>f_fs		\ pointer to super block
-   dinode_SIZEOF 	field 	>f_di	\ copy of on-disk inode
+   ufs1_dinode_SIZEOF 	field 	>f_di	\ copy of on-disk inode
    8		field	>f_buf		\ buffer for data block
    4		field 	>f_buf_size	\ size of data block
    4		field	>f_buf_blkno	\ block number of data block
@@ -222,7 +222,7 @@ constant file_SIZEOF
 file_SIZEOF buffer: the-file
 sb-buf the-file >f_fs x!
 
-dinode_SIZEOF buffer: cur-inode
+ufs1_dinode_SIZEOF buffer: cur-inode
 h# 2000 buffer: indir-block
 -1 value indir-addr
 
@@ -339,8 +339,8 @@ h# 2000 buffer: indir-block
    <>  if ." read-inode - residual" cr abort then
    dup 2over				( inode fs buffer -- inode fs buffer buffer inode fs )
    ino-to-fsbo				( inode fs buffer -- inode fs buffer buffer fsbo )
-   dinode_SIZEOF * +			( inode fs buffer buffer fsbo -- inode fs buffer dinop )
-   cur-inode dinode_SIZEOF move 	( inode fs buffer dinop -- inode fs buffer )
+   ufs1_dinode_SIZEOF * +			( inode fs buffer buffer fsbo -- inode fs buffer dinop )
+   cur-inode ufs1_dinode_SIZEOF move 	( inode fs buffer dinop -- inode fs buffer )
 	\ clear out the old buffers
    drop					( inode fs buffer -- inode fs )
    2drop
diff --git a/sys/arch/sparc64/stand/bootblk/genfth.cf b/sys/arch/sparc64/stand/bootblk/genfth.cf
index 5df5f2e37e0..4b640e5cb6c 100644
--- a/sys/arch/sparc64/stand/bootblk/genfth.cf
+++ b/sys/arch/sparc64/stand/bootblk/genfth.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genfth.cf,v 1.2 2003/06/02 23:27:56 millert Exp $
+#	$OpenBSD: genfth.cf,v 1.3 2003/08/26 19:55:21 drahn Exp $
 #	$NetBSD: genfth.cf,v 1.1 2000/08/20 14:58:46 mrg Exp $
 
 #
@@ -130,7 +130,7 @@ member	fs_maxsymlinklen
 #
 # ufs dinode
 #
-struct	dinode
+struct	ufs1_dinode
 member	di_size
 member	di_mode
 member	di_db
-- 
cgit v1.2.3