CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: isaki
Date: Tue Jan 14 04:00:41 UTC 2020
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: boot.S boot_ufs.h
Log Message:
Clean up.
- B_KEYINP is no longer called from C.
- B_COLOR is no longer used.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x68k/stand/boot_ufs/boot.S
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/boot.S
diff -u src/sys/arch/x68k/stand/boot_ufs/boot.S:1.11 src/sys/arch/x68k/stand/boot_ufs/boot.S:1.12
--- src/sys/arch/x68k/stand/boot_ufs/boot.S:1.11 Mon Jan 13 03:34:05 2020
+++ src/sys/arch/x68k/stand/boot_ufs/boot.S Tue Jan 14 04:00:41 2020
@@ -2,7 +2,7 @@
| author: chapuni(webmas...@chapuni.com)
| ITOH Yasufumi
|
-| $NetBSD: boot.S,v 1.11 2020/01/13 03:34:05 isaki Exp $
+| $NetBSD: boot.S,v 1.12 2020/01/14 04:00:41 isaki Exp $
#include
#include "iocscall.h"
@@ -451,10 +451,6 @@ raw_read_end:
read_half: BOOT_ERROR("read half of block")
-ENTRY_NOPROFILE(B_KEYINP)
- IOCS(__B_KEYINP)
- rts
-
ENTRY_NOPROFILE(B_PUTC)
movel %sp@(4),%d1
IOCS(__B_PUTC)
Index: src/sys/arch/x68k/stand/boot_ufs/boot_ufs.h
diff -u src/sys/arch/x68k/stand/boot_ufs/boot_ufs.h:1.5 src/sys/arch/x68k/stand/boot_ufs/boot_ufs.h:1.6
--- src/sys/arch/x68k/stand/boot_ufs/boot_ufs.h:1.5 Sat Mar 14 14:46:07 2009
+++ src/sys/arch/x68k/stand/boot_ufs/boot_ufs.h Tue Jan 14 04:00:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: boot_ufs.h,v 1.5 2009/03/14 14:46:07 dsl Exp $ */
+/* $NetBSD: boot_ufs.h,v 1.6 2020/01/14 04:00:41 isaki Exp $ */
/***
*
@@ -14,10 +14,8 @@ int badbaddr(volatile void *adr);
#ifdef SCSI_ADHOC_BOOTPART
void RAW_READ0(void *buf, u_int32_t blkpos, size_t bytelen);
#endif
-unsigned B_KEYINP(void);
void B_PUTC(unsigned int c);
void B_PRINT(const char *p);
-unsigned B_COLOR(unsigned int w);
extern unsigned ID; /* target SCSI ID */
extern unsigned BOOT_INFO; /* result of IOCS(__BOOTINF) */
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: christos
Date: Fri Aug 21 15:33:04 UTC 2015
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: readufs.h readufs_lfs.c
Log Message:
fix build (dholland)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/readufs.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/readufs.h
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.12 src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.13
--- src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.12 Tue Jun 18 14:18:58 2013
+++ src/sys/arch/x68k/stand/boot_ufs/readufs.h Fri Aug 21 11:33:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs.h,v 1.12 2013/06/18 18:18:58 christos Exp $ */
+/* $NetBSD: readufs.h,v 1.13 2015/08/21 15:33:04 christos Exp $ */
/* from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp */
/*
@@ -26,8 +26,7 @@ union ufs_dinode {
struct ufs2_dinode di2;
#endif
#ifdef USE_LFS
- struct ulfs1_dinode dil1;
- struct ulfs2_dinode dil2;
+ struct lfs32_dinode dil32;
#endif
};
Index: src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.17
--- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16 Tue Jul 28 12:51:25 2015
+++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c Fri Aug 21 11:33:04 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.16 2015/07/28 16:51:25 christos Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.17 2015/08/21 15:33:04 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp */
/*
@@ -21,7 +21,7 @@
static int get_lfs_inode(ino32_t ino, union ufs_dinode *dibuf);
-static struct ulfs1_dinode ifile_dinode;
+static struct lfs32_dinode ifile_dinode;
#define fsi (*ufsinfo)
#define fsi_lfs fsi.fs_u.u_lfs
@@ -159,7 +159,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
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. */
@@ -176,7 +176,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
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);
@@ -195,7 +195,7 @@ get_lfs_inode(ino32_t ino, union ufs_din
);
/* Search for the inode. */
- di = (struct ulfs1_dinode *) buf;
+ di = (struct lfs32_dinode *) buf;
diend = di + fsi_lfs.inopb;
for ( ; di diend; di++)
@@ -219,7 +219,7 @@ found:
#endif
#endif
- dibuf-dil1 = *di;
+ dibuf-dil32 = *di;
return 0;
}
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: christos
Date: Tue Jul 28 16:51:25 UTC 2015
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: readufs_lfs.c
Log Message:
fix build
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.15 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.16
--- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.15 Mon Dec 9 04:35:16 2013
+++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c Tue Jul 28 12:51:25 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: readufs_lfs.c,v 1.15 2013/12/09 09:35:16 wiz Exp $ */
+/* $NetBSD: readufs_lfs.c,v 1.16 2015/07/28 16:51:25 christos Exp $ */
/* from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp */
/*
@@ -105,7 +105,7 @@ try_lfs(void)
if (sblk2.dlfs_magic == LFS_MAGIC) {
if (fsi_lfs.version == 1) {
-if (sblk.dlfs_otstamp sblk2.dlfs_otstamp)
+if (sblk.dlfs_inopf sblk2.dlfs_inopf)
s = sblk2;
} else {
if (sblk.dlfs_serial sblk2.dlfs_serial)
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: christos
Date: Sat Jun 15 01:37:10 UTC 2013
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: Makefile readufs.h readufs_lfs.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/x68k/stand/boot_ufs/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x68k/stand/boot_ufs/readufs.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.26 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.27
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.26 Tue Oct 11 09:07:06 2011
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Fri Jun 14 21:37:10 2013
@@ -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 @@ vers.c: ${VERSIONFILE}
${.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)\
Index: src/sys/arch/x68k/stand/boot_ufs/readufs.h
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.10 src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.11
--- src/sys/arch/x68k/stand/boot_ufs/readufs.h:1.10 Sun Feb 20 21:31:58 2011
+++ src/sys/arch/x68k/stand/boot_ufs/readufs.h Fri Jun 14 21:37:10 2013
@@ -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 @@ union ufs_dinode {
#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 */
Index: src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
diff -u src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.12 src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.13
--- src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c:1.12 Sun Feb 20 21:31:58 2011
+++ src/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c Fri Jun 14 21:37:10 2013
@@ -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 @@ get_lfs_inode(ino32_t ino, union ufs_din
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 @@ get_lfs_inode(ino32_t ino, union ufs_din
);
/* 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 @@ found:
#endif
#endif
- dibuf-di1 = *di;
+ dibuf-dil1 = *di;
return 0;
}
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src
Committed By: christos
Date: Sat Jun 15 01:39:56 UTC 2013
Modified Files:
src/sys/arch/x68k/stand/boot_ufs: Makefile
Log Message:
revert previous
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x68k/stand/boot_ufs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot_ufs/Makefile
diff -u src/sys/arch/x68k/stand/boot_ufs/Makefile:1.27 src/sys/arch/x68k/stand/boot_ufs/Makefile:1.28
--- src/sys/arch/x68k/stand/boot_ufs/Makefile:1.27 Fri Jun 14 21:37:10 2013
+++ src/sys/arch/x68k/stand/boot_ufs/Makefile Fri Jun 14 21:39:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/06/15 01:37:10 christos Exp $
+# $NetBSD: Makefile,v 1.28 2013/06/15 01:39:56 christos Exp $
NOMAN= # defined
@@ -38,7 +38,7 @@ vers.c: ${VERSIONFILE}
${.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)\
CVS commit: src/sys/arch/x68k/stand/boot_ufs
Module Name:src Committed By: isaki Date: Thu Nov 1 14:33:31 UTC 2012 Modified Files: src/sys/arch/x68k/stand/boot_ufs: boot.S Log Message: Fix typo in comment. s/d1/d0/ To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x68k/stand/boot_ufs/boot.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x68k/stand/boot_ufs/boot.S diff -u src/sys/arch/x68k/stand/boot_ufs/boot.S:1.9 src/sys/arch/x68k/stand/boot_ufs/boot.S:1.10 --- src/sys/arch/x68k/stand/boot_ufs/boot.S:1.9 Mon Feb 21 02:31:58 2011 +++ src/sys/arch/x68k/stand/boot_ufs/boot.S Thu Nov 1 14:33:31 2012 @@ -2,7 +2,7 @@ | author: chapuni(webmas...@chapuni.com) | ITOH Yasufumi | -| $NetBSD: boot.S,v 1.9 2011/02/21 02:31:58 itohy Exp $ +| $NetBSD: boot.S,v 1.10 2012/11/01 14:33:31 isaki Exp $ #include machine/asm.h #include iocscall.h @@ -64,7 +64,7 @@ clrbss: clrb %a1@+ | we use 68020 instructions, and check MPU beforehand | - | here d1.w = -1, and the above subw a1,d0 = 0x9049, and + | here d0.w = -1, and the above subw a1,d0 = 0x9049, and | if MPU = 010 loads 0x49, | if MPU = 020 loads 0x90. | This is a move, not a tst instruction
