CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Oct 13 16:30:01 UTC 2023 Modified Files: src/sys/arch/luna68k/stand/boot: bmd.c Log Message: Fix spelling. From OpenBSD/luna88k. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/bmd.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/luna68k/stand/boot/bmd.c diff -u src/sys/arch/luna68k/stand/boot/bmd.c:1.8 src/sys/arch/luna68k/stand/boot/bmd.c:1.9 --- src/sys/arch/luna68k/stand/boot/bmd.c:1.8 Sun Jun 30 05:04:49 2019 +++ src/sys/arch/luna68k/stand/boot/bmd.c Fri Oct 13 16:30:01 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bmd.c,v 1.8 2019/06/30 05:04:49 tsutsui Exp $ */ +/* $NetBSD: bmd.c,v 1.9 2023/10/13 16:30:01 tsutsui Exp $ */ /* * Copyright (c) 1992 OMRON Corporation. @@ -471,7 +471,7 @@ bmdclear(void) /* - * charactor operation routines + * character operation routines */ static void
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Oct 13 16:30:01 UTC 2023 Modified Files: src/sys/arch/luna68k/stand/boot: bmd.c Log Message: Fix spelling. From OpenBSD/luna88k. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/bmd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Oct 13 16:10:24 UTC 2023 Modified Files: src/sys/arch/luna68k/stand/boot: ufs_disksubr.c Log Message: Fix typo. From OpenBSD/luna88k. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/ufs_disksubr.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/luna68k/stand/boot/ufs_disksubr.c diff -u src/sys/arch/luna68k/stand/boot/ufs_disksubr.c:1.6 src/sys/arch/luna68k/stand/boot/ufs_disksubr.c:1.7 --- src/sys/arch/luna68k/stand/boot/ufs_disksubr.c:1.6 Mon May 17 19:31:38 2021 +++ src/sys/arch/luna68k/stand/boot/ufs_disksubr.c Fri Oct 13 16:10:24 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_disksubr.c,v 1.6 2021/05/17 19:31:38 mrg Exp $ */ +/* $NetBSD: ufs_disksubr.c,v 1.7 2023/10/13 16:10:24 tsutsui Exp $ */ /* * Copyright (c) 1992 OMRON Corporation. @@ -85,7 +85,7 @@ /* * Attempt to read a disk label from a device - * using the indicated stategy routine. + * using the indicated strategy routine. * The label must be partly set up before this: * secpercyl and anything required in the strategy routine * (e.g., sector size) must be filled in before calling us.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Oct 13 16:10:24 UTC 2023 Modified Files: src/sys/arch/luna68k/stand/boot: ufs_disksubr.c Log Message: Fix typo. From OpenBSD/luna88k. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/ufs_disksubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Sat Jun 24 08:00:52 UTC 2023 Modified Files: src/sys/arch/luna68k/stand/boot: sioreg.h Log Message: Add comments and remove nonexistent status registers. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/sioreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Sat Jun 24 08:00:52 UTC 2023
Modified Files:
src/sys/arch/luna68k/stand/boot: sioreg.h
Log Message:
Add comments and remove nonexistent status registers.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/stand/boot/sioreg.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/luna68k/stand/boot/sioreg.h
diff -u src/sys/arch/luna68k/stand/boot/sioreg.h:1.5 src/sys/arch/luna68k/stand/boot/sioreg.h:1.6
--- src/sys/arch/luna68k/stand/boot/sioreg.h:1.5 Tue Mar 28 20:01:57 2023
+++ src/sys/arch/luna68k/stand/boot/sioreg.h Sat Jun 24 08:00:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sioreg.h,v 1.5 2023/03/28 20:01:57 andvar Exp $ */
+/* $NetBSD: sioreg.h,v 1.6 2023/06/24 08:00:52 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -98,17 +98,14 @@ struct siodevice {
#define WR6 0x06
#define WR7 0x07
-#define WR2A 0x02
-#define WR2B 0x12
+#define WR2A 0x02 /* on channel A */
+#define WR2B 0x12 /* on channel B */
#define RR0 0x08
#define RR1 0x09
#define RR2 0x0A
-#define RR3 0x0B
-#define RR4 0x0C
-#define RR2A 0x0A
-#define RR2B 0x1A
+#define RR2B 0x1A /* only on channel B */
#define WR0_NOP 0x00 /* No Operation */
#define WR0_SNDABRT 0x08 /* Send Abort (HDLC) */
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Sat Jun 24 07:02:11 UTC 2023
Modified Files:
src/sys/arch/luna68k/stand/boot: sd.c
Log Message:
Fix a wrong cdb size of SCSI disk write command. From OpenBSD/luna88k.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/stand/boot/sd.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/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.12 src/sys/arch/luna68k/stand/boot/sd.c:1.13
--- src/sys/arch/luna68k/stand/boot/sd.c:1.12 Sat Feb 14 13:07:39 2015
+++ src/sys/arch/luna68k/stand/boot/sd.c Sat Jun 24 07:02:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.12 2015/02/14 13:07:39 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.13 2023/06/24 07:02:11 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -215,7 +215,7 @@ static struct scsi_generic_cdb cdb_read
};
static struct scsi_generic_cdb cdb_write = {
- 6,
+ 10,
{ CMD_WRITE_EXT, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Sat Jun 24 07:02:11 UTC 2023 Modified Files: src/sys/arch/luna68k/stand/boot: sd.c Log Message: Fix a wrong cdb size of SCSI disk write command. From OpenBSD/luna88k. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/luna68k/stand/boot/sd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri Sep 3 16:21:15 UTC 2021
Modified Files:
src/sys/arch/luna68k/stand/boot: kbd.c
Log Message:
Ignore mouse packets to avoid unexpected data handled as keyboard input.
Patch from moveccr.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/kbd.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/luna68k/stand/boot/kbd.c
diff -u src/sys/arch/luna68k/stand/boot/kbd.c:1.4 src/sys/arch/luna68k/stand/boot/kbd.c:1.5
--- src/sys/arch/luna68k/stand/boot/kbd.c:1.4 Sat Feb 14 13:06:28 2015
+++ src/sys/arch/luna68k/stand/boot/kbd.c Fri Sep 3 16:21:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.4 2015/02/14 13:06:28 tsutsui Exp $ */
+/* $NetBSD: kbd.c,v 1.5 2021/09/03 16:21:15 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -213,12 +213,23 @@ static const struct kbd_keymap kbd_keyma
int shift_flag = 0;
int ctrl_flag = 0;
int meta_flag = 0;
+int mouse_flag = 0;
int
kbd_decode(uint8_t code)
{
unsigned int c, updown = 0;
+ /* ignore mouse data */
+ if (mouse_flag != 0) {
+ mouse_flag--;
+ return KC_IGNORE;
+ }
+ if ((code & 0xf8) == 0x80) {
+ mouse_flag = 2;
+ return KC_IGNORE;
+ }
+
if (code & 0x80)
updown = 1;
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri Sep 3 16:21:15 UTC 2021 Modified Files: src/sys/arch/luna68k/stand/boot: kbd.c Log Message: Ignore mouse packets to avoid unexpected data handled as keyboard input. Patch from moveccr. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: martin Date: Sun Oct 27 11:21:52 UTC 2019 Modified Files: src/sys/arch/luna68k/stand/boot: machdep.c Log Message: Back out previous - fixed differently by rin already. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/machdep.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/luna68k/stand/boot/machdep.c diff -u src/sys/arch/luna68k/stand/boot/machdep.c:1.7 src/sys/arch/luna68k/stand/boot/machdep.c:1.8 --- src/sys/arch/luna68k/stand/boot/machdep.c:1.7 Sun Oct 27 11:08:04 2019 +++ src/sys/arch/luna68k/stand/boot/machdep.c Sun Oct 27 11:21:52 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.7 2019/10/27 11:08:04 martin Exp $ */ +/* $NetBSD: machdep.c,v 1.8 2019/10/27 11:21:52 martin Exp $ */ /* * Copyright (c) 1992 OMRON Corporation. @@ -71,9 +71,7 @@ */ #include -#define _KERNEL /* we need the register defines (PC/SP/...) */ #include -#undef _KERNEL #include static void dumpmem(int *, int, int);
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: martin Date: Sun Oct 27 11:21:52 UTC 2019 Modified Files: src/sys/arch/luna68k/stand/boot: machdep.c Log Message: Back out previous - fixed differently by rin already. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: martin Date: Sun Oct 27 11:08:04 UTC 2019 Modified Files: src/sys/arch/luna68k/stand/boot: machdep.c Log Message: Define _KERNEL while including reg.h: we need the (now protected) register names. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/machdep.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/luna68k/stand/boot/machdep.c diff -u src/sys/arch/luna68k/stand/boot/machdep.c:1.6 src/sys/arch/luna68k/stand/boot/machdep.c:1.7 --- src/sys/arch/luna68k/stand/boot/machdep.c:1.6 Sat Apr 6 03:06:25 2019 +++ src/sys/arch/luna68k/stand/boot/machdep.c Sun Oct 27 11:08:04 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.6 2019/04/06 03:06:25 thorpej Exp $ */ +/* $NetBSD: machdep.c,v 1.7 2019/10/27 11:08:04 martin Exp $ */ /* * Copyright (c) 1992 OMRON Corporation. @@ -71,7 +71,9 @@ */ #include +#define _KERNEL /* we need the register defines (PC/SP/...) */ #include +#undef _KERNEL #include static void dumpmem(int *, int, int);
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: martin Date: Sun Oct 27 11:08:04 UTC 2019 Modified Files: src/sys/arch/luna68k/stand/boot: machdep.c Log Message: Define _KERNEL while including reg.h: we need the (now protected) register names. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Fri May 24 15:52:36 UTC 2019
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile
Log Message:
LUNA's firmware requires OMAGIC a.out.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/luna68k/stand/boot/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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.16 src/sys/arch/luna68k/stand/boot/Makefile:1.17
--- src/sys/arch/luna68k/stand/boot/Makefile:1.16 Wed Jan 2 00:50:02 2019
+++ src/sys/arch/luna68k/stand/boot/Makefile Fri May 24 15:52:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/01/02 00:50:02 christos Exp $
+# $NetBSD: Makefile,v 1.17 2019/05/24 15:52:35 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -32,6 +32,8 @@ TEXTADDR= 70
LDSCRIPT= ${.CURDIR}/boot.ldscript
LINKFORMAT= -static -N -Ttext ${TEXTADDR} -T ${LDSCRIPT}
+ELF2AOUT_OPTS= -O # LUNA's firmware requires OMAGIC a.out
+
SRCS= locore.S
SRCS+= init_main.c autoconf.c
SRCS+= trap.c
@@ -80,7 +82,7 @@ LIBS= ${SALIB} ${ZLIB} ${KERNLIB}
${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
${_MKTARGET_LINK}
${LD} ${LINKFORMAT} -x -o ${PROG}.elf ${OBJS} ${LIBS}
- ${M68K_ELF2AOUT} ${PROG}.elf ${PROG}.aout
+ ${M68K_ELF2AOUT} ${ELF2AOUT_OPTS} ${PROG}.elf ${PROG}.aout
mv ${PROG}.aout ${PROG}
CLEANFILES+= ${PROG}.aout ${PROG}.elf
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Fri May 24 15:52:36 UTC 2019 Modified Files: src/sys/arch/luna68k/stand/boot: Makefile Log Message: LUNA's firmware requires OMAGIC a.out. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/luna68k/stand/boot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
