From: aoyama Date: Tue, 22 Apr 2014 22:58:02 +0000 (+0000) Subject: Unify the model name to LUNA-88K{,2}, that is considered the X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c13d9c011bcbd6445d094e0bc42f5428fb572b35;p=openbsd Unify the model name to LUNA-88K{,2}, that is considered the `official' name. ok jmc@ miod@ --- diff --git a/distrib/notes/luna88k/hardware b/distrib/notes/luna88k/hardware index 8172e4b929f..ee2850e1099 100644 --- a/distrib/notes/luna88k/hardware +++ b/distrib/notes/luna88k/hardware @@ -1,5 +1,5 @@ -dnl $OpenBSD: hardware,v 1.5 2014/02/27 18:48:15 deraadt Exp $ -OpenBSD/MACHINE OSREV runs on the OMRON Luna-88K workstations family. +dnl $OpenBSD: hardware,v 1.6 2014/04/22 22:58:02 aoyama Exp $ +OpenBSD/MACHINE OSREV runs on the OMRON LUNA-88K workstations family. 16MB of RAM should be sufficient to boot and a minimal system can probably be squeezed onto a 250MB disk by installing only the `base' and `etc' sets. diff --git a/distrib/notes/luna88k/install b/distrib/notes/luna88k/install index 851bfb80209..ad6df3e44f9 100644 --- a/distrib/notes/luna88k/install +++ b/distrib/notes/luna88k/install @@ -1,4 +1,4 @@ -dnl $OpenBSD: install,v 1.12 2014/03/19 01:59:49 tedu Exp $ +dnl $OpenBSD: install,v 1.13 2014/04/22 22:58:02 aoyama Exp $ OpenBSDInstallPrelude There are several ways to install OpenBSD onto a disk. The easiest way @@ -15,7 +15,7 @@ system should be backed up. While installing OpenBSD does not necessarily wipe out all the partitions on the hard disk, errors during the install process can have unforeseen consequences and will probably leave the system unbootable if the installation process is not completed. Availability -of the installation media for the prior installation, such as a Luna-88K +of the installation media for the prior installation, such as a LUNA-88K UniOS tape, is always a good insurance, should it be necessary to "go back" for some reason. @@ -40,7 +40,7 @@ Booting from an existing partition: disk drive SCSI ID: 0 1 2 3 4 5 6 value of 'n': 6 5 4 3 2 1 0 - On LUNA88K-2 systems, if the disk drive is connected to the external SCSI + On LUNA-88K2 systems, if the disk drive is connected to the external SCSI controller, add 10 to this number. For example, to boot from a disk drive with ID #0 connected to the external controller, enter: diff --git a/distrib/notes/luna88k/prep b/distrib/notes/luna88k/prep index 5c8c81da166..064bac4a35f 100644 --- a/distrib/notes/luna88k/prep +++ b/distrib/notes/luna88k/prep @@ -1,9 +1,9 @@ -dnl $OpenBSD: prep,v 1.7 2014/03/19 01:59:49 tedu Exp $ +dnl $OpenBSD: prep,v 1.8 2014/04/22 22:58:02 aoyama Exp $ dnl Need to provide a short monitor description. Start from dnl http://www.nk-home.net/~aoyama/luna88k/monitor.txt dnl and also document NVRAM? -Luna-88K do not require any specific preparation prior to the OpenBSD +LUNA-88K do not require any specific preparation prior to the OpenBSD installation. However, you might want to get familiar with the PROM interface, in order to be able to boot the installation media and, later, specify the correct boot parameters. @@ -13,7 +13,7 @@ Setting up the boot device and filename: Boot device and filename information is stored by the PROM into the machine's non-volatile memory. - LUNA88K systems can only boot from SCSI devices. The boot device type + LUNA-88K systems can only boot from SCSI devices. The boot device type (such as ``sd'' for a disk) is specified by the ``boot_device'' variable. The SCSI id of the boot device is specified by the ``boot_unit'' NVRAM variable, and the boot partition on said @@ -26,10 +26,10 @@ Setting up the boot device and filename: The ``boot_unit'' value is an encoding of the device SCSI identifier. If the boot device is an SCSI disk (``sd''), the value of ``boot_unit'' - should be (6 - ID). On LUNA88K-2 systems, if the boot device is connected + should be (6 - ID). On LUNA-88K2 systems, if the boot device is connected to the external SCSI connector, 10 should be added to the value of ``boot_unit''. Thus booting off an external SCSI disk of ID #0 would - be 16 on a LUNA88K-2, and 6 on a LUNA88K. + be 16 on a LUNA-88K2, and 6 on a LUNA-88K. Setting up the boot behaviour: @@ -41,8 +41,8 @@ Setting up the boot behaviour: console device. The meaning of these switches will depend upon your particular machine. - On the LUNA88K, the 'down' position is 'on', and the 'up' position is - 'off', while the LUNA88K-2 uses the opposite convention (i.e. 'up' is + On the LUNA-88K, the 'down' position is 'on', and the 'up' position is + 'off', while the LUNA-88K2 uses the opposite convention (i.e. 'up' is 'on' and 'down' is 'off'). If the leftmost switch in SW1, #1, is in the 'off' position, the system @@ -56,8 +56,8 @@ Setting up serial console: position, it selects the serial console port as the console; otherwise, the graphics display and keyboard are used as the console. - While the LUNA88K-2 uses ``standard'' DB9 serial ports, the earlier - LUNA88K have a specific connector, HiRose QM10-14R(L)-PR. Wiring + While the LUNA-88K2 uses ``standard'' DB9 serial ports, the earlier + LUNA-88K have a specific connector, HiRose QM10-14R(L)-PR. Wiring information for this connector can be found at the following URL: http://www.kk.iij4u.or.jp/~taokamur/luna68k/serial.jpg A suitable cable connector for this port would be either HiRose diff --git a/distrib/notes/luna88k/whatis b/distrib/notes/luna88k/whatis index 0fad9d65c0b..16d85ed1e82 100644 --- a/distrib/notes/luna88k/whatis +++ b/distrib/notes/luna88k/whatis @@ -1,3 +1,3 @@ -dnl $OpenBSD: whatis,v 1.3 2005/03/18 13:29:46 miod Exp $ +dnl $OpenBSD: whatis,v 1.4 2014/04/22 22:58:02 aoyama Exp $ -OpenBSD/MACHINE runs on the OMRON Luna-88K family of workstations. +OpenBSD/MACHINE runs on the OMRON LUNA-88K family of workstations. diff --git a/share/man/man4/man4.luna88k/lcd.4 b/share/man/man4/man4.luna88k/lcd.4 index 72410ab1392..f8e96163d63 100644 --- a/share/man/man4/man4.luna88k/lcd.4 +++ b/share/man/man4/man4.luna88k/lcd.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: lcd.4,v 1.2 2007/05/31 19:19:55 jmc Exp $ +.\" $OpenBSD: lcd.4,v 1.3 2014/04/22 22:58:02 aoyama Exp $ .\" .\" Copyright (c) 2007 Kenji AOYAMA .\" All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: April 22 2014 $ .Dt LCD 4 luna88k .Os .Sh NAME @@ -35,7 +35,7 @@ .Sh DESCRIPTION The .Nm -driver provides access to the front panel LCD display on LUNA88K. +driver provides access to the front panel LCD display on LUNA-88K. It is accessed using .Xr write 2 to print the characters on the LCD. diff --git a/share/man/man4/man4.luna88k/pcexmem.4 b/share/man/man4/man4.luna88k/pcexmem.4 index d00b90f1642..e3fb1b2a577 100644 --- a/share/man/man4/man4.luna88k/pcexmem.4 +++ b/share/man/man4/man4.luna88k/pcexmem.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pcexmem.4,v 1.1 2014/04/16 12:01:33 aoyama Exp $ +.\" $OpenBSD: pcexmem.4,v 1.2 2014/04/22 22:58:02 aoyama Exp $ .\" .\" Copyright (c) 2014 Kenji Aoyama. .\" @@ -13,7 +13,7 @@ .\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: April 16 2014 $ +.Dd $Mdocdate: April 22 2014 $ .Dt PCEXMEM 4 luna88k .Os .Sh NAME @@ -28,7 +28,7 @@ The file is an .Xr mmap 2 capable interface to the memory area of the installed board at "NEC PC-9801 -extension board slot" on LUNA88K. +extension board slot" on LUNA-88K. Byte offsets in this file are interpreted as relative memory addresses of the installed board. The range should be between 0x0 and 0xffffff. diff --git a/share/man/man8/man8.luna88k/boot_luna88k.8 b/share/man/man8/man8.luna88k/boot_luna88k.8 index c97bc3b2501..895845acc44 100644 --- a/share/man/man8/man8.luna88k/boot_luna88k.8 +++ b/share/man/man8/man8.luna88k/boot_luna88k.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: boot_luna88k.8,v 1.5 2011/09/03 22:59:07 jmc Exp $ +.\" $OpenBSD: boot_luna88k.8,v 1.6 2014/04/22 22:58:02 aoyama Exp $ .\" .\" Copyright (c) 2004, Miodrag Vallat. .\" All rights reserved. @@ -23,7 +23,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 3 2011 $ +.Dd $Mdocdate: April 22 2014 $ .Dt BOOT_LUNA88K 8 luna88k .Os .Sh NAME @@ -38,10 +38,10 @@ configured in nvram if autoboot is enabled. The behaviour of the ROM monitor, as well as some kernel options, are controlled through the SW1 set of DIP switches on the front panel. .Pp -The switch positions are not the same on Luna-88k and Luna-88k2 models. -On Luna-88k, a switch is enabled when in the +The switch positions are not the same on LUNA-88K and LUNA-88K2 models. +On LUNA-88K, a switch is enabled when in the .Em down -position, while on the Luna-88k2, a switch is enabled when in the +position, while on the LUNA-88K2, a switch is enabled when in the .Em up position. .Pp @@ -100,7 +100,7 @@ standalone installation kernel, suitable for disaster recovery .Xr savecore 8 , .Xr shutdown 8 .Sh CAVEATS -There is currently no standalone bootloader program on the Luna88k. +There is currently no standalone bootloader program on the LUNA-88K. The .Ox kernel is loaded directly from the ROM monitor. diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c index 8a8fae40098..2a60498163f 100644 --- a/sys/arch/luna88k/luna88k/autoconf.c +++ b/sys/arch/luna88k/luna88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.20 2013/11/02 23:10:29 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.21 2014/04/22 22:58:02 aoyama Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -158,7 +158,7 @@ void device_register(struct device *dev, void *aux) { /* - * scsi: sd,cd XXX: Can LUNA88K boot from CD-ROM? + * scsi: sd,cd XXX: Can LUNA-88K boot from CD-ROM? */ if (strcmp("sd", dev->dv_cfdata->cf_driver->cd_name) == 0 || strcmp("cd", dev->dv_cfdata->cf_driver->cd_name) == 0) { diff --git a/sys/arch/luna88k/luna88k/eh.S b/sys/arch/luna88k/luna88k/eh.S index 63a7eb42042..c6192196fa3 100644 --- a/sys/arch/luna88k/luna88k/eh.S +++ b/sys/arch/luna88k/luna88k/eh.S @@ -1,4 +1,4 @@ -/* $OpenBSD: eh.S,v 1.9 2013/01/05 11:20:55 miod Exp $ */ +/* $OpenBSD: eh.S,v 1.10 2014/04/22 22:58:02 aoyama Exp $ */ /* * Copyright (c) 2006, Miodrag Vallat * @@ -33,7 +33,7 @@ * PFSR_SAVE is invoked with TMP, TMP2 and TMP3 available, and TMP contains * curcpu(). * - * On the Luna88k we just have to peek at the CMMU PFSR our curcpu() points + * On the LUNA-88K we just have to peek at the CMMU PFSR our curcpu() points * to. */ diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index c4e96715cc9..1f55e498a8c 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.96 2014/04/12 11:26:42 aoyama Exp $ */ +/* $OpenBSD: machdep.c,v 1.97 2014/04/22 22:58:02 aoyama Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -511,7 +511,7 @@ haltsys: if (mainbus != NULL) config_suspend(mainbus, DVACT_POWERDOWN); - /* Luna88k supports automatic powerdown */ + /* LUNA-88K supports automatic powerdown */ if ((howto & RB_POWERDOWN) == RB_POWERDOWN) { printf("attempting to power down...\n"); powerdown(); @@ -810,7 +810,7 @@ secondary_main() #endif /* MULTIPROCESSOR */ /* - * Device interrupt handler for LUNA88K + * Device interrupt handler for LUNA-88K */ void @@ -1052,7 +1052,7 @@ luna88k_bootstrap() avail_end = last_addr; #ifdef DEBUG - printf("LUNA88K boot: memory from 0x%x to 0x%x\n", + printf("LUNA-88K boot: memory from 0x%x to 0x%x\n", avail_start, avail_end); #endif diff --git a/usr.bin/mandoc/arch.in b/usr.bin/mandoc/arch.in index 1ae001c1371..3b05321f283 100644 --- a/usr.bin/mandoc/arch.in +++ b/usr.bin/mandoc/arch.in @@ -1,4 +1,4 @@ -/* $Id: arch.in,v 1.9 2013/09/04 19:39:18 patrick Exp $ */ +/* $Id: arch.in,v 1.10 2014/04/22 22:58:02 aoyama Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -66,7 +66,7 @@ LINE("iyonix", "Iyonix") LINE("landisk", "LANDISK") LINE("loongson", "Loongson") LINE("luna68k", "Luna68k") -LINE("luna88k", "Luna88k") +LINE("luna88k", "LUNA-88K") LINE("m68k", "m68k") LINE("mac68k", "Mac68k") LINE("macppc", "MacPPC")