Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 05 Feb 2017 22:11:44 +0900 (JST)
From:      TAKAHASHI Yoshihiro <nyan@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r312910 - in head: . etc/etc.pc98 etc/rc.d lib/libsysdecode libexec release release/doc release/doc/en_US.ISO8859-1/hardware release/doc/en_US.ISO8859-1/readme release/doc/share/example...
Message-ID:  <20170205.221144.1616842004369178243.nyan@FreeBSD.org>
In-Reply-To: <201701280222.v0S2MFSR022477@repo.freebsd.org>
References:  <201701280222.v0S2MFSR022477@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
I have decided to remove pc98 support on stable/11 as well
after 2 weeks to reduce conflicts between head and stable/11.

In article <201701280222.v0S2MFSR022477@repo.freebsd.org>
Takahashi Yoshihiro <nyan@FreeBSD.org> writes:

> Author: nyan
> Date: Sat Jan 28 02:22:15 2017
> New Revision: 312910
> URL: https://svnweb.freebsd.org/changeset/base/312910
> 
> Log:
>   Remove pc98 support completely.
>   I thank all developers and contributors for pc98.
>   
>   Relnotes:	yes
> 
> Deleted:
>   head/etc/etc.pc98/
>   head/libexec/Makefile.pc98
>   head/release/pc98/
>   head/sbin/Makefile.pc98
>   head/sbin/fdisk_pc98/
>   head/share/man/man4/man4.i386/ct.4
>   head/share/man/man4/man4.i386/snc.4
>   head/share/syscons/keymaps/jp.pc98.iso.kbd
>   head/share/syscons/keymaps/jp.pc98.kbd
>   head/share/vt/keymaps/jp.pc98.iso.kbd
>   head/share/vt/keymaps/jp.pc98.kbd
>   head/sys/boot/Makefile.pc98
>   head/sys/boot/pc98/
>   head/sys/conf/Makefile.pc98
>   head/sys/conf/files.pc98
>   head/sys/conf/options.pc98
>   head/sys/dev/aic/aic_cbus.c
>   head/sys/dev/ata/ata-cbus.c
>   head/sys/dev/ct/
>   head/sys/dev/ed/if_ed98.h
>   head/sys/dev/ed/if_ed_cbus.c
>   head/sys/dev/fdc/fdc_cbus.c
>   head/sys/dev/fe/if_fe_cbus.c
>   head/sys/dev/ic/i8251.h
>   head/sys/dev/ic/wd33c93reg.h
>   head/sys/dev/le/if_le_cbus.c
>   head/sys/dev/mse/mse_cbus.c
>   head/sys/dev/snc/
>   head/sys/dev/uart/uart_cpu_pc98.c
>   head/sys/geom/geom_pc98.c
>   head/sys/geom/geom_pc98_enc.c
>   head/sys/geom/part/g_part_pc98.c
>   head/sys/modules/canbepm/
>   head/sys/modules/canbus/
>   head/sys/modules/ct/
>   head/sys/modules/geom/geom_part/geom_part_pc98/
>   head/sys/modules/geom/geom_pc98/
>   head/sys/modules/pmc/
>   head/sys/modules/snc/
>   head/sys/pc98/
>   head/sys/sys/disk/pc98.h
>   head/sys/sys/diskpc98.h
>   head/usr.bin/mkimg/pc98.c
>   head/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-4096-pc98.qcow2.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-4096-pc98.raw.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhd.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vhdf.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-4096-pc98.vmdk.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-512-pc98.qcow2.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-512-pc98.raw.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhd.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-512-pc98.vhdf.gz.uu
>   head/usr.bin/mkimg/tests/img-1x1-512-pc98.vmdk.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-4096-pc98.qcow2.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-4096-pc98.raw.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhd.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vhdf.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-4096-pc98.vmdk.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-512-pc98.qcow2.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-512-pc98.raw.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhd.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-512-pc98.vhdf.gz.uu
>   head/usr.bin/mkimg/tests/img-63x255-512-pc98.vmdk.gz.uu
>   head/usr.sbin/boot98cfg/
>   head/usr.sbin/bsdinstall/partedit/partedit_pc98.c
> Modified:
>   head/Makefile
>   head/Makefile.inc1
>   head/ObsoleteFiles.inc
>   head/etc/rc.d/syscons
>   head/lib/libsysdecode/Makefile
>   head/lib/libsysdecode/mkioctls
>   head/release/doc/README
>   head/release/doc/en_US.ISO8859-1/hardware/article.xml
>   head/release/doc/en_US.ISO8859-1/readme/article.xml
>   head/release/doc/share/examples/Makefile.relnotesng
>   head/release/doc/share/misc/dev.archlist.txt
>   head/release/doc/share/xml/release.ent
>   head/release/rc.local
>   head/rescue/rescue/Makefile
>   head/sbin/bsdlabel/bsdlabel.8
>   head/sbin/bsdlabel/bsdlabel.c
>   head/sbin/geom/class/part/gpart.8
>   head/share/examples/bootforth/frames.4th
>   head/share/man/man4/adv.4
>   head/share/man/man4/ahc.4
>   head/share/man/man4/apic.4
>   head/share/man/man4/ed.4
>   head/share/man/man4/esp.4
>   head/share/man/man4/fxp.4
>   head/share/man/man4/geom.4
>   head/share/man/man4/man4.i386/Makefile
>   head/share/man/man4/man4.i386/aic.4
>   head/share/man/man4/ncr.4
>   head/share/man/man4/ncv.4
>   head/share/man/man4/sym.4
>   head/share/mk/bsd.stand.mk
>   head/share/mk/local.meta.sys.mk
>   head/share/syscons/keymaps/INDEX.keymaps
>   head/share/syscons/keymaps/Makefile
>   head/share/vt/keymaps/INDEX.keymaps
>   head/share/vt/keymaps/Makefile
>   head/sys/Makefile
>   head/sys/boot/common/Makefile.inc
>   head/sys/boot/common/isapnp.h
>   head/sys/boot/ficl/loader.c
>   head/sys/boot/forth/frames.4th
>   head/sys/cam/cam_xpt.c
>   head/sys/conf/NOTES
>   head/sys/conf/config.mk
>   head/sys/conf/files
>   head/sys/conf/files.amd64
>   head/sys/conf/files.i386
>   head/sys/conf/options
>   head/sys/crypto/aesni/aesni.h
>   head/sys/crypto/via/padlock.c
>   head/sys/crypto/via/padlock_hash.c
>   head/sys/dev/ata/ata-all.h
>   head/sys/dev/ep/if_ep_isa.c
>   head/sys/dev/exca/excareg.h
>   head/sys/dev/fb/fb.c
>   head/sys/dev/fb/splash_bmp.c
>   head/sys/dev/fdc/fdc.c
>   head/sys/dev/fdc/fdcvar.h
>   head/sys/dev/fe/if_fe.c
>   head/sys/dev/fe/if_fereg.h
>   head/sys/dev/kbd/kbd.c
>   head/sys/dev/le/am79900.c
>   head/sys/dev/mse/msevar.h
>   head/sys/dev/pccbb/pccbb_isa.c
>   head/sys/dev/pci/vga_pci.c
>   head/sys/dev/ppc/ppc.c
>   head/sys/dev/ppc/ppcreg.h
>   head/sys/dev/sio/sio_pccard.c
>   head/sys/dev/sio/sio_pci.c
>   head/sys/dev/sio/sio_puc.c
>   head/sys/dev/sio/siovar.h
>   head/sys/dev/sound/isa/mss.c
>   head/sys/dev/sound/isa/mss.h
>   head/sys/dev/sound/isa/sbc.c
>   head/sys/dev/syscons/daemon/daemon_saver.c
>   head/sys/dev/syscons/dragon/dragon_saver.c
>   head/sys/dev/syscons/fire/fire_saver.c
>   head/sys/dev/syscons/logo/logo_saver.c
>   head/sys/dev/syscons/plasma/plasma_saver.c
>   head/sys/dev/syscons/rain/rain_saver.c
>   head/sys/dev/syscons/scmouse.c
>   head/sys/dev/syscons/scvidctl.c
>   head/sys/dev/syscons/star/star_saver.c
>   head/sys/dev/syscons/syscons.c
>   head/sys/dev/syscons/syscons.h
>   head/sys/dev/syscons/warp/warp_saver.c
>   head/sys/dev/uart/uart.h
>   head/sys/dev/uart/uart_bus_isa.c
>   head/sys/geom/geom_bsd.c
>   head/sys/i386/bios/apm.c
>   head/sys/i386/bios/apm.h
>   head/sys/i386/i386/genassym.c
>   head/sys/i386/i386/initcpu.c
>   head/sys/i386/i386/locore.s
>   head/sys/i386/i386/machdep.c
>   head/sys/i386/i386/mp_machdep.c
>   head/sys/i386/i386/mpboot.s
>   head/sys/i386/i386/vm_machdep.c
>   head/sys/i386/isa/elink.h
>   head/sys/i386/isa/npx.c
>   head/sys/i386/pci/pci_pir.c
>   head/sys/isa/isareg.h
>   head/sys/isa/isavar.h
>   head/sys/isa/pnp.c
>   head/sys/isa/pnpreg.h
>   head/sys/modules/Makefile
>   head/sys/modules/Makefile.inc
>   head/sys/modules/aic/Makefile
>   head/sys/modules/apm/Makefile
>   head/sys/modules/ata/Makefile
>   head/sys/modules/drm2/Makefile
>   head/sys/modules/ed/Makefile
>   head/sys/modules/fdc/Makefile
>   head/sys/modules/fe/Makefile
>   head/sys/modules/geom/geom_part/Makefile
>   head/sys/modules/i2c/controllers/Makefile
>   head/sys/modules/le/Makefile
>   head/sys/modules/mse/Makefile
>   head/sys/modules/ppc/Makefile
>   head/sys/modules/sio/Makefile
>   head/sys/modules/sound/sound/Makefile
>   head/sys/sys/consio.h
>   head/sys/sys/copyright.h
>   head/sys/sys/fbio.h
>   head/sys/sys/fdcio.h
>   head/sys/x86/isa/atpic.c
>   head/sys/x86/isa/clock.c
>   head/sys/x86/isa/icu.h
>   head/sys/x86/isa/isa.c
>   head/sys/x86/x86/autoconf.c
>   head/sys/x86/x86/cpu_machdep.c
>   head/sys/x86/x86/intr_machdep.c
>   head/sys/x86/x86/mptable.c
>   head/sys/x86/x86/nexus.c
>   head/targets/pseudo/userland/Makefile.depend
>   head/targets/pseudo/userland/misc/Makefile.depend
>   head/tools/build/mk/OptionalObsoleteFiles.inc
>   head/tools/tools/kerninclude/kerninclude.sh
>   head/tools/tools/sysdoc/sysdoc.sh
>   head/tools/tools/vt/keymaps/KBDFILES.map
>   head/tools/tools/vt/keymaps/convert-keymap.pl
>   head/usr.bin/mkimg/Makefile
>   head/usr.bin/mkimg/tests/mkimg.sh
>   head/usr.sbin/Makefile.i386
>   head/usr.sbin/bsdinstall/partedit/gpart_ops.c
>   head/usr.sbin/bsdinstall/partedit/part_wizard.c
>   head/usr.sbin/bsdinstall/partedit/scripted.c
>   head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c
>   head/usr.sbin/config/config.5
>   head/usr.sbin/fdcontrol/Makefile
>   head/usr.sbin/fdformat/Makefile
>   head/usr.sbin/fdread/Makefile
>   head/usr.sbin/fdread/fdutil.c
>   head/usr.sbin/kgzip/kgzip.8
>   head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
>   head/usr.sbin/pnpinfo/Makefile
>   head/usr.sbin/vidcontrol/vidcontrol.c
> 
> Modified: head/Makefile
> ==============================================================================
> --- head/Makefile	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/Makefile	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -236,7 +236,7 @@ _MAKE+=	MK_META_MODE=no
>  
>  # Guess machine architecture from machine type, and vice versa.
>  .if !defined(TARGET_ARCH) && defined(TARGET)
> -_TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
> +_TARGET_ARCH=	${TARGET:S/arm64/aarch64/}
>  .elif !defined(TARGET) && defined(TARGET_ARCH) && \
>      ${TARGET_ARCH} != ${MACHINE_ARCH}
>  _TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?(hf)?/mips/:C/arm(v6)?(eb)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/powerpcspe/powerpc/:C/riscv64(sf)?/riscv/}
> @@ -417,13 +417,12 @@ worlds: .PHONY
>  # existing system is.
>  #
>  .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
> -TARGETS?=amd64 arm arm64 i386 mips pc98 powerpc sparc64
> +TARGETS?=amd64 arm arm64 i386 mips powerpc sparc64
>  _UNIVERSE_TARGETS=	${TARGETS}
>  TARGET_ARCHES_arm?=	arm armeb armv6
>  TARGET_ARCHES_arm64?=	aarch64
>  TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32 mipselhf mipshf mips64elhf mips64hf
>  TARGET_ARCHES_powerpc?=	powerpc powerpc64 powerpcspe
> -TARGET_ARCHES_pc98?=	i386
>  .for target in ${TARGETS}
>  TARGET_ARCHES_${target}?= ${target}
>  .endfor
> 
> Modified: head/Makefile.inc1
> ==============================================================================
> --- head/Makefile.inc1	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/Makefile.inc1	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -349,7 +349,6 @@ KNOWN_ARCHES?=	aarch64/arm64 \
>  		armeb/arm \
>  		armv6/arm \
>  		i386 \
> -		i386/pc98 \
>  		mips \
>  		mipsel/mips \
>  		mips64el/mips \
> 
> Modified: head/ObsoleteFiles.inc
> ==============================================================================
> --- head/ObsoleteFiles.inc	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/ObsoleteFiles.inc	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -38,6 +38,17 @@
>  #   xargs -n1 | sort | uniq -d;
>  # done
>  
> +# 20170128: remove pc98 support
> +OLD_FILES+=usr/include/dev/ic/i8251.h
> +OLD_FILES+=usr/include/dev/ic/wd33c93reg.h
> +OLD_FILES+=usr/include/sys/disk/pc98.h
> +OLD_FILES+=usr/include/sys/diskpc98.h
> +OLD_FILES+=usr/share/man/man4/i386/ct.4.gz
> +OLD_FILES+=usr/share/man/man4/i386/snc.4.gz
> +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
> +OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
> +OLD_FILES+=usr/share/vt/keymaps/jp.pc98.iso.kbd
> +OLD_FILES+=usr/share/vt/keymaps/jp.pc98.kbd
>  # 20170110: Four files from ggate tests consolidated into one
>  OLD_FILES+=usr/tests/sys/geom/class/gate/1_test
>  OLD_FILES+=usr/tests/sys/geom/class/gate/2_test
> 
> Modified: head/etc/rc.d/syscons
> ==============================================================================
> --- head/etc/rc.d/syscons	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/etc/rc.d/syscons	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -112,7 +112,6 @@ icelandic.iso)			echo is;;
>  it.iso)				echo it;;
>  jp.106x)			echo jp.capsctrl;;
>  jp.106)				echo jp;;
> -#?? jp.pc98.iso)		echo jp.pc98;;
>  kk.pt154.io)			echo kz.io;;
>  kk.pt154.kst)			echo kz.kst;;
>  latinamerican.iso.acc)		echo latinamerican.acc;;
> 
> Modified: head/lib/libsysdecode/Makefile
> ==============================================================================
> --- head/lib/libsysdecode/Makefile	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/lib/libsysdecode/Makefile	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -120,7 +120,7 @@ tables.h: mktables
>  ioctl.c: .PHONY
>  .endif
>  ioctl.c: mkioctls .META
> -	env MACHINE=${MACHINE} CPP="${CPP}" \
> +	env CPP="${CPP}" \
>  		/bin/sh ${.CURDIR}/mkioctls ${DESTDIR}${INCLUDEDIR} > ${.TARGET}
>  
>  beforedepend: ioctl.c tables.h
> 
> Modified: head/lib/libsysdecode/mkioctls
> ==============================================================================
> --- head/lib/libsysdecode/mkioctls	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/lib/libsysdecode/mkioctls	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -24,15 +24,7 @@ ioctl_includes=$(
>  		awk '{printf("#include <%s>\\n", $1)}'
>  )
>  
> -: ${MACHINE=$(uname -m)}
> -case "${MACHINE}" in
> -*pc98*)
> -	ioctl_includes="$ioctl_includes#include <sys/diskpc98.h>\\n"
> -	;;
> -*)
> -	ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
> -	;;
> -esac
> +ioctl_includes="$ioctl_includes#include <sys/diskmbr.h>\\n"
>  
>  awk -v x="$ioctl_includes" 'BEGIN {print x}' |
>  	$CPP -nostdinc -I$includedir -dM -DCOMPAT_43TTY - |
> 
> Modified: head/release/doc/README
> ==============================================================================
> --- head/release/doc/README	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/doc/README	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -99,7 +99,7 @@ element will be included.  For example:
>  
>  	<para arch="sparc64">SPARC64-specific text</para>
>  
> -The currently-supported architectures are amd64, arm, i386, pc98,
> +The currently-supported architectures are amd64, arm, i386,
>  powerpc and sparc64.  An element may appear for multiple architectures
>  by specifying a comma-separated list of architectures
>  (i.e. arch="sparc64,amd64").
> 
> Modified: head/release/doc/en_US.ISO8859-1/hardware/article.xml
> ==============================================================================
> --- head/release/doc/en_US.ISO8859-1/hardware/article.xml	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/doc/en_US.ISO8859-1/hardware/article.xml	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -252,35 +252,6 @@
>  	more information.</para>
>      </sect2>
>  
> -    <sect2 xml:id="proc-pc98">
> -      <title>pc98</title>
> -
> -      <para>NEC PC-9801/9821 series with almost all &i386;-compatible
> -	processors, including 80486, &pentium;, &pentium; Pro,
> -	&pentium; II, and variants.  All &i386;-compatible processors
> -	by AMD, Cyrix, IBM, and IDT are also supported.</para>
> -
> -      <para>NEC FC-9801/9821 series, and NEC SV-98 series (both of
> -	them are compatible with PC-9801/9821 series) should be
> -	supported.</para>
> -
> -      <para>EPSON PC-386/486/586 series, which are compatible with NEC
> -	PC-9801 series are supported.</para>
> -
> -      <para>High-resolution mode is not supported.  NEC
> -	PC-98XA/XL/RL/XL^2, and NEC PC-H98 series are supported in
> -	normal (PC-9801 compatible) mode only.</para>
> -
> -      <para>Although there are some multi-processor systems (such as
> -	Rs20/B20), SMP-related features of &os; are not supported
> -	yet.</para>
> -
> -      <para>PC-9801/9821 standard bus (called C-Bus), PC-9801NOTE
> -	expansion bus (110pin), and PCI bus are supported.  New Extend
> -	Standard Architecture (NESA) bus (used in PC-H98, SV-H98, and
> -	FC-H98 series) is not supported.</para>
> -    </sect2>
> -
>      <sect2 xml:id="proc-powerpc">
>        <title>powerpc</title>
>  
> @@ -636,17 +607,9 @@
>      <sect2 xml:id="disk">
>        <title>Disk Controllers</title>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;, &arch.sparc64;]
> +      <para>[&arch.amd64;, &arch.i386;, &arch.sparc64;]
>  	IDE/ATA controllers (&man.ata.4; driver)</para>
>  
> -      <para>[&arch.pc98;] IDE/ATA controllers (wdc driver)</para>
> -
> -      <itemizedlist>
> -	<listitem>
> -	  <para>On-board IDE controller</para>
> -	</listitem>
> -      </itemizedlist>
> -
>        &hwlist.aac;
>  
>        &hwlist.adv;
> @@ -673,8 +636,6 @@
>  
>        &hwlist.ciss;
>  
> -      &hwlist.ct;
> -
>        &hwlist.dpt;
>  
>        <note>
> @@ -894,8 +855,6 @@
>  
>        &hwlist.sn;
>  
> -      &hwlist.snc;
> -
>        &hwlist.ste;
>  
>        &hwlist.stge;
> @@ -904,7 +863,7 @@
>  
>        &hwlist.tl;
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] SMC 83c17x
> +      <para>[&arch.amd64;, &arch.i386;] SMC 83c17x
>  	(EPIC)-based Ethernet NICs (&man.tx.4; driver)</para>
>  
>        &hwlist.txp;
> @@ -934,8 +893,7 @@
>      <sect2 xml:id="fddi">
>        <title>FDDI Interfaces</title>
>  
> -      <para>[&arch.i386;, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4;
> -	driver)</para>
> +      <para>[&arch.i386;] DEC DEFPA PCI (&man.fpa.4; driver)</para>
>  
>        <para>[&arch.i386;] DEC DEFEA EISA (&man.fpa.4; driver)</para>
>      </sect2>
> @@ -943,28 +901,28 @@
>      <sect2 xml:id="atm">
>        <title>ATM Interfaces</title>
>  
> -      <para>[&arch.i386;, &arch.pc98;] Midway-based ATM interfaces
> +      <para>[&arch.i386;] Midway-based ATM interfaces
>  	(&man.en.4; driver)</para>
>  
> -      <para>[&arch.i386;, &arch.pc98; &arch.sparc64;] FORE Systems,
> +      <para>[&arch.i386;, &arch.sparc64;] FORE Systems,
>  	Inc. PCA-200E ATM PCI Adapters (hfa and &man.fatm.4;
>  	drivers)</para>
>  
> -      <para>[&arch.i386;, &arch.pc98;] IDT NICStAR 77201/211-based ATM
> +      <para>[&arch.i386;] IDT NICStAR 77201/211-based ATM
>  	Adapters (&man.idt.4; driver)</para>
>  
> -      <para>[&arch.i386;, &arch.pc98; &arch.sparc64;] FORE Systems,
> +      <para>[&arch.i386;, &arch.sparc64;] FORE Systems,
>  	Inc. HE155 and HE622 ATM interfaces (&man.hatm.4;
>  	driver)</para>
>  
> -      <para>[&arch.i386;, &arch.pc98;] IDT77252-based ATM cards
> +      <para>[&arch.i386;] IDT77252-based ATM cards
>  	(&man.patm.4; driver)</para>
>      </sect2>
>  
>      <sect2 xml:id="wlan">
>        <title>Wireless Network Interfaces</title>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet
> +      <para>[&arch.amd64;, &arch.i386;] Cisco/Aironet
>  	802.11b wireless adapters (&man.an.4; driver)</para>
>  
>        &hwlist.ath;
> @@ -1016,7 +974,7 @@
>  
>        &hwlist.urtw;
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Lucent
> +      <para>[&arch.amd64;, &arch.i386;] Lucent
>  	Technologies WaveLAN/IEEE 802.11b wireless network adapters
>  	and workalikes using the Lucent Hermes, Intersil PRISM-II,
>  	Intersil PRISM-2.5, Intersil Prism-3, and Symbol Spectrum24
> @@ -1214,77 +1172,6 @@
>  
>        &hwlist.rc;
>  
> -      <para>[&arch.pc98;] Internel serial interfaces (&man.sio.4;
> -	driver)</para>
> -
> -      <itemizedlist>
> -	<listitem>
> -	  <para>PC-9801 on-board</para>
> -	</listitem>
> -	<listitem>
> -	  <para>PC-9821 2'nd CCU (flags 0x12000000)</para>
> -	</listitem>
> -      </itemizedlist>
> -
> -      <para>[&arch.pc98;] NEC PC-9861K, PC-9801-101 and Midori-Denshi
> -	MDC-926Rs (&man.sio.4; driver)</para>
> -
> -      <itemizedlist>
> -	<listitem>
> -	  <para>COM2 (flags 0x01000000)</para>
> -	</listitem>
> -
> -	<listitem>
> -	  <para>COM3 (flags 0x02000000)</para>
> -	</listitem>
> -      </itemizedlist>
> -
> -      <para>[&arch.pc98;] NEC PC-9801-120 (&man.sio.4; driver)</para>
> -
> -      <note>
> -	<para>"flags 0x11000000" is necessary in kernel
> -	  configuration.</para>
> -      </note>
> -
> -      <para>[&arch.pc98;] Microcore MC-16550, MC-16550II, MC-RS98
> -	(&man.sio.4; driver)</para>
> -
> -      <note>
> -	<para>"flags 0x14000?01" is necessary in kernel
> -	  configuration.</para>
> -      </note>
> -
> -      <para>[&arch.pc98;] Media Intelligent RSB-2000, RSB-3000 and
> -	AIWA B98-02 (&man.sio.4; driver)</para>
> -
> -      <note>
> -	<para>"flags 0x15000?01" is necessary in kernel
> -	configuration.</para>
> -      </note>
> -
> -      <para>[&arch.pc98;] Media Intelligent RSB-384 (&man.sio.4;
> -	driver)</para>
> -
> -      <note>
> -	<para>"flags 0x16000001" is necessary in kernel
> -	  configuration.</para>
> -      </note>
> -
> -      <para>[&arch.pc98;] I-O DATA RSA-98III (&man.sio.4;
> -	driver)</para>
> -
> -      <note>
> -	<para>"flags 0x18000?01" is necessary in kernel
> -	  configuration.</para>
> -      </note>
> -
> -      <para>[&arch.pc98;] Hayes ESP98 (&man.sio.4; driver)</para>
> -
> -      <note>
> -	<para>"options COM_ESP" and "flags 0x19000000" are necessary
> -	  in kernel configuration.</para>
> -      </note>
> -
>      </sect2>
>  
>      <sect2 xml:id="sound">
> @@ -1350,35 +1237,6 @@
>  
>        &hwlist.snd.vibes;
>  
> -      <para>[&arch.pc98;] NEC PC-9801-73, 86 and compatibles (nss
> -	driver)</para>
> -
> -      <itemizedlist>
> -	<listitem>
> -	  <para>NEC A-MATE internal sound</para>
> -	</listitem>
> -
> -	<listitem>
> -	  <para>Q-Vision WaveStar, WaveMaster</para>
> -	</listitem>
> -      </itemizedlist>
> -
> -      <para>[&arch.pc98;] NEC X-MATE, CanBe, ValueStar internal (mss
> -	driver)</para>
> -
> -      <para>[&arch.pc98;] Creative Technologies SoundBlaster(98)
> -	(&man.sb.4; driver)</para>
> -
> -      <para>[&arch.pc98;] I-O DATA CD-BOX (&man.sb.4; driver)</para>
> -
> -      <para>[&arch.pc98;] MPU-401 and compatible interfaces (mpu
> -	driver)</para>
> -
> -      <itemizedlist>
> -	<listitem>
> -	  <para>Q-Vision WaveStar</para>
> -	</listitem>
> -      </itemizedlist>
>      </sect2>
>  
>      <sect2 xml:id="camera">
> @@ -1392,7 +1250,7 @@
>      <sect2 xml:id="usb">
>        <title>USB Devices</title>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] A
> +      <para>[&arch.amd64;, &arch.i386;] A
>  	range of USB peripherals are supported; devices known to work
>  	are listed in this section.  Owing to the generic nature of
>  	most USB devices, with some exceptions any device of a given
> @@ -1400,14 +1258,14 @@
>  	here.</para>
>  
>        <note>
> -	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> +	<para>[&arch.amd64;, &arch.i386;]
>  	  USB Ethernet adapters can be found in the section listing
>  	  <link linkend="ethernet">Ethernet
>  	    interfaces</link>.</para>
>        </note>
>  
>        <note>
> -	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> +	<para>[&arch.amd64;, &arch.i386;]
>  	  USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para>
>        </note>
>  
> @@ -1415,18 +1273,15 @@
>  
>        &hwlist.uhci;
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] USB
> +      <para>[&arch.amd64;, &arch.i386;] USB
>  	2.0 controllers using the EHCI interface (&man.ehci.4;
>  	driver)</para>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> -	Hubs</para>
> +      <para>[&arch.amd64;, &arch.i386;] Hubs</para>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> -	Keyboards (&man.ukbd.4; driver)</para>
> +      <para>[&arch.amd64;, &arch.i386;] Keyboards (&man.ukbd.4; driver)</para>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> -	Miscellaneous</para>
> +      <para>[&arch.amd64;, &arch.i386;] Miscellaneous</para>
>  
>        <itemizedlist>
>  	<listitem>
> @@ -1454,8 +1309,7 @@
>  
>        &hwlist.umodem;
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Mice
> -	(&man.ums.4; driver)</para>
> +      <para>[&arch.amd64;, &arch.i386;] Mice (&man.ums.4; driver)</para>
>  
>        &hwlist.ulpt;
>  
> @@ -1471,7 +1325,7 @@
>  
>        &hwlist.umass;
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Audio Devices
> +      <para>[&arch.amd64;, &arch.i386;] Audio Devices
>  	(&man.uaudio.4; driver)</para>
>  
>        &hwlist.uvisor;
> @@ -1507,8 +1361,7 @@
>      <sect2 xml:id="misc">
>        <title>Miscellaneous</title>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> -	FAX-Modem/PCCARD</para>
> +      <para>[&arch.amd64;, &arch.i386;] FAX-Modem/PCCARD</para>
>  
>        <itemizedlist>
>  	<listitem>
> @@ -1521,7 +1374,7 @@
>  	</listitem>
>        </itemizedlist>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Floppy drives
> +      <para>[&arch.amd64;, &arch.i386;] Floppy drives
>  	(&man.fdc.4; driver)</para>
>  
>        <para>[&arch.amd64;, &arch.i386;] VGA-compatible video cards
> @@ -1533,8 +1386,7 @@
>  	  found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>;
>        </note>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> -	Keyboards including:</para>
> +      <para>[&arch.amd64;, &arch.i386;] Keyboards including:</para>
>  
>        <itemizedlist>
>  	<listitem>
> @@ -1548,21 +1400,17 @@
>  	</listitem>
>  
>  	<listitem>
> -	  <para>[&arch.pc98;] Standard keyboards</para>
> -	</listitem>
> -
> -	<listitem>
> -	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> +	  <para>[&arch.amd64;, &arch.i386;]
>  	    USB keyboards (&man.ukbd.4; driver)</para>
>  	</listitem>
>        </itemizedlist>
>  
> -      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> +      <para>[&arch.amd64;, &arch.i386;]
>  	Pointing devices including:</para>
>  
>        <itemizedlist>
>  	<listitem>
> -	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Bus mice and
> +	  <para>[&arch.amd64;, &arch.i386;] Bus mice and
>  	    compatible devices (&man.mse.4; driver)</para>
>  	</listitem>
>  
> @@ -1577,7 +1425,7 @@
>  	</listitem>
>  
>  	<listitem>
> -	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
> +	  <para>[&arch.amd64;, &arch.i386;]
>  	    USB mice (&man.ums.4; driver)</para>
>  	</listitem>
>        </itemizedlist>
> @@ -1591,17 +1439,10 @@
>        <para>[&arch.amd64;, &arch.i386;] <quote>PC standard</quote>
>  	parallel ports (&man.ppc.4; driver)</para>
>  
> -      <para>[&arch.pc98;] <quote>PC-9821 standard</quote> parallel
> -	ports (&man.ppc.4; driver)</para>
> -
>        <para>[&arch.i386;, &arch.amd64;] PC-compatible joysticks
>  	(&man.joy.4; driver)</para>
>  
> -      <para>[&arch.pc98;] Joystick port of SoundBlaster(98)
> -	(&man.joy.4; driver)</para>
> -
> -      <para>[&arch.i386;, &arch.pc98;] PHS Data Communication
> -	Card/PCCARD</para>
> +      <para>[&arch.i386;] PHS Data Communication Card/PCCARD</para>
>  
>        <itemizedlist>
>  	<listitem>
> @@ -1621,8 +1462,6 @@
>  	cards compatible with the HOT1 from <link xlink:href="http://www.vcc.com/">Virtual Computers</link> (xrpu
>  	driver).</para>
>  
> -      <para>[&arch.pc98;] Power Management Controller of NEC PC-98
> -	Note (pmc driver)</para>
>      </sect2>
>    </sect1>
>  </article>
> 
> Modified: head/release/doc/en_US.ISO8859-1/readme/article.xml
> ==============================================================================
> --- head/release/doc/en_US.ISO8859-1/readme/article.xml	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/doc/en_US.ISO8859-1/readme/article.xml	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -69,7 +69,6 @@
>        <para>&os; is an operating system based on 4.4 BSD Lite for
>  	AMD64 and Intel EM64T based PC hardware (&arch.amd64;),
>  	Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC hardware (&arch.i386;),
> -	NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;),
>  	and &ultrasparc; machines (&arch.sparc64;).  Versions
>  	for the &arm; (&arch.arm;), &mips; (&arch.mips;), and
>  	&powerpc; (&arch.powerpc;) architectures are currently under
> @@ -324,7 +323,7 @@
>        </para>
>  
>        <para>On platforms that support &man.bsdinstall.8; (currently
> -	&arch.amd64;, &arch.i386;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the
> +	&arch.amd64;, &arch.i386;, and &arch.sparc64;), these documents are generally available via the
>  	Documentation menu during installation.  Once the system is
>  	installed, you can revisit this menu by re-running the
>  	&man.bsdinstall.8; utility.</para>
> 
> Modified: head/release/doc/share/examples/Makefile.relnotesng
> ==============================================================================
> --- head/release/doc/share/examples/Makefile.relnotesng	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/doc/share/examples/Makefile.relnotesng	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -6,7 +6,7 @@
>  # the build tree.
>  #
>  
> -ARCHS=		amd64 i386 pc98 powerpc sparc64
> +ARCHS=		amd64 i386 powerpc sparc64
>  MULTITEXTS=	
>  UNITEXTS=	hardware readme relnotes errata
>  
> 
> Modified: head/release/doc/share/misc/dev.archlist.txt
> ==============================================================================
> --- head/release/doc/share/misc/dev.archlist.txt	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/doc/share/misc/dev.archlist.txt	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -36,43 +36,42 @@
>  # <Driver name><tab><arch>[,<arch>...]
>  #
>  aac	i386,amd64
> -adv	i386,pc98,amd64
> -adw	i386,pc98,amd64
> +adv	i386,amd64
> +adw	i386,amd64
>  aha	i386
>  ahb	i386
>  ahd	i386,sparc64,amd64
> -aic	i386,pc98,amd64
> -amd	i386,pc98,amd64
> +aic	i386,amd64
> +amd	i386,amd64
>  arcmsr	i386,amd64
>  asr	i386
> -ath	i386,pc98,amd64,sparc64
> -aue	i386,pc98,amd64,powerpc
> -axe	i386,pc98,amd64,powerpc
> +ath	i386,amd64,sparc64
> +aue	i386,amd64,powerpc
> +axe	i386,amd64,powerpc
>  bce	i386,amd64
> -bge	i386,pc98,sparc64,amd64
> -bktr	i386,pc98
> +bge	i386,sparc64,amd64
> +bktr	i386
>  bt	i386,amd64
>  bxe	i386,amd64
> -cdce	i386,pc98,amd64,powerpc
> +cdce	i386,amd64,powerpc
>  ciss	i386,amd64
> -ce	i386,pc98
> +ce	i386
>  cm	i386
> -cnw	i386,pc98,amd64
> -cp	i386,pc98
> -ct	pc98
> +cnw	i386,amd64
> +cp	i386
>  ctau	i386
> -cue	i386,pc98,amd64,powerpc
> +cue	i386,amd64,powerpc
>  cx	i386
>  cxgb	i386,amd64
> -de	i386,pc98,amd64
> +de	i386,amd64
>  dpt	i386,amd64
> -ed	i386,pc98
> -ep	i386,pc98,amd64
> +ed	i386
> +ep	i386,amd64
>  esp	sparc64
>  ex	i386,amd64
> -fe	i386,pc98,amd64
> +fe	i386,amd64
>  fwohci	i386,sparc64,amd64,powerpc
> -hifn	i386,pc98,amd64
> +hifn	i386,amd64
>  hpt27xx	i386,amd64
>  hptiop	i386,amd64
>  hptmv	i386,amd64
> @@ -83,26 +82,26 @@ iir	i386,amd64
>  ips	i386,amd64
>  isci	i386,amd64
>  ixgb	i386,amd64
> -kue	i386,pc98,amd64,powerpc
> -lge	i386,pc98,amd64
> +kue	i386,amd64,powerpc
> +lge	i386,amd64
>  mfi	i386,amd64
>  mlx	i386,amd64
>  mly	i386,amd64
>  msk	i386,amd64
>  mxge	i386,amd64
> -my	i386,pc98
> -ncr	i386,pc98,amd64
> -ncv	i386,pc98
> +my	i386
> +ncr	i386,amd64
> +ncv	i386
>  nfe	i386,amd64
> -ng_bt3c	i386,pc98,amd64
> -ng_ubt	i386,pc98,amd64
> -nsp	i386,pc98
> +ng_bt3c	i386,amd64
> +ng_ubt	i386,amd64
> +nsp	i386
>  nxge	i386,amd64
>  oce	i386,amd64
> -ohci	i386,pc98,amd64,powerpc
> +ohci	i386,amd64,powerpc
>  oltr	i386
>  otus	i386,amd64
> -pcn	i386,pc98,amd64
> +pcn	i386,amd64
>  pst	i386
>  qlxgb	amd64
>  qlxgbe	amd64
> @@ -110,14 +109,13 @@ qlxge	amd64
>  rc	i386
>  ral	i386,amd64
>  rsu	i386,amd64
> -rue	i386,pc98,amd64
> +rue	i386,amd64
>  rum	i386,amd64
>  run	i386,amd64
> -safe	i386,pc98,amd64
> +safe	i386,amd64
>  sbp	i386,sparc64,amd64
>  sfgxe	amd64
>  sn	i386,amd64
> -snc	pc98
>  snd_ad1816	i386,amd64
>  snd_als4000	i386
>  snd_atiixp	i386,amd64
> @@ -148,31 +146,31 @@ snd_t4dwave	i386,amd64,sparc64
>  snd_via8233	i386,amd64
>  snd_via82c686	i386,amd64
>  snd_vibes	i386,amd64
> -stg	i386,pc98
> -ti	i386,pc98,amd64,sparc64
> -tl	i386,pc98,amd64
> +stg	i386
> +ti	i386,amd64,sparc64
> +tl	i386,amd64
>  trm	i386,amd64
>  twa	i386,amd64
>  twe	i386,amd64
>  tws	i386,amd64
> -ubsa	i386,pc98,amd64
> -ubsec	i386,pc98,amd64
> -ubser	i386,pc98,amd64
> -ucycom	i386,pc98,amd64
> -udav	i386,pc98,amd64
> -uftdi	i386,pc98,amd64
> -uhci	i386,pc98,amd64,powerpc
> -ulpt	i386,pc98,amd64,powerpc
> -umass	i386,pc98,amd64,powerpc
> -umodem	i386,pc98,amd64
> -uplcom	i386,pc98,amd64
> +ubsa	i386,amd64
> +ubsec	i386,amd64
> +ubser	i386,amd64
> +ucycom	i386,amd64
> +udav	i386,amd64
> +uftdi	i386,amd64
> +uhci	i386,amd64,powerpc
> +ulpt	i386,amd64,powerpc
> +umass	i386,amd64,powerpc
> +umodem	i386,amd64
> +uplcom	i386,amd64
>  ural	i386,amd64
> -urio	i386,pc98,amd64,powerpc
> -uvisor	i386,pc98,amd64
> -uvscom	i386,pc98,amd64
> +urio	i386,amd64,powerpc
> +uvisor	i386,amd64
> +uvscom	i386,amd64
>  vpo	i386
> -vx	i386,pc98,amd64
> +vx	i386,amd64
>  vxge	i386,amd64
> -wb	i386,pc98,amd64
> +wb	i386,amd64
>  xe	i386,amd64
>  zyd	i386,amd64
> 
> Modified: head/release/doc/share/xml/release.ent
> ==============================================================================
> --- head/release/doc/share/xml/release.ent	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/doc/share/xml/release.ent	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -73,7 +73,6 @@
>  <!ENTITY arch.arm64 "aarch64">
>  <!ENTITY arch.i386 "i386">
>  <!ENTITY arch.mips "mips">
> -<!ENTITY arch.pc98 "pc98">
>  <!ENTITY arch.powerpc "powerpc">
>  <!ENTITY arch.powerpc64 "powerpc64">
>  <!ENTITY arch.sparc64 "sparc64">
> 
> Modified: head/release/rc.local
> ==============================================================================
> --- head/release/rc.local	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/release/rc.local	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -16,11 +16,7 @@ mkdir /tmp/bsdinstall_etc
>  kbdcontrol -d >/dev/null 2>&1
>  if [ $? -eq 0 ]; then
>  	# Syscons: use xterm, start interesting things on other VTYs
> -	if [ ${MACHINE} = "pc98" ]; then
> -		TERM=cons25w
> -	else
> -		TERM=xterm
> -	fi
> +	TERM=xterm
>  
>  	# Don't send ESC on function-key 62/63 (left/right command key)
>  	kbdcontrol -f 62 '' > /dev/null 2>&1
> 
> Modified: head/rescue/rescue/Makefile
> ==============================================================================
> --- head/rescue/rescue/Makefile	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/rescue/rescue/Makefile	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -141,10 +141,6 @@ CRUNCH_ALIAS_bsdlabel= disklabel
>  #CRUNCH_LIBS+= -lsmb
>  .endif
>  
> -.if ${MACHINE} == "pc98"
> -CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
> -.endif
> -
>  .if ${MACHINE_CPUARCH} == "sparc64"
>  CRUNCH_PROGS_sbin+= bsdlabel sunlabel
>  .endif
> 
> Modified: head/sbin/bsdlabel/bsdlabel.8
> ==============================================================================
> --- head/sbin/bsdlabel/bsdlabel.8	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/sbin/bsdlabel/bsdlabel.8	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -109,9 +109,9 @@ argument forces
>  .Nm
>  to use a layout suitable for a different architecture.
>  Current valid values are
> -.Cm i386 , amd64 ,
> +.Cm i386
>  and
> -.Cm pc98 .
> +.Cm amd64 .
>  If this option is omitted,
>  .Nm
>  will use a layout suitable for the current machine.
> 
> Modified: head/sbin/bsdlabel/bsdlabel.c
> ==============================================================================
> --- head/sbin/bsdlabel/bsdlabel.c	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/sbin/bsdlabel/bsdlabel.c	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -164,8 +164,7 @@ main(int argc, char *argv[])
>  				break;
>  			case 'm':
>  				if (!strcmp(optarg, "i386") ||
> -				    !strcmp(optarg, "amd64") ||
> -				    !strcmp(optarg, "pc98")) {
> +				    !strcmp(optarg, "amd64")) {
>  					labelsoffset = 1;
>  					labeloffset = 0;
>  					bbsize = 8192;
> 
> Modified: head/sbin/geom/class/part/gpart.8
> ==============================================================================
> --- head/sbin/geom/class/part/gpart.8	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/sbin/geom/class/part/gpart.8	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -543,11 +543,6 @@ The
>  option enables backward compatibility for partition names
>  in the EBR scheme.
>  It also prevents any type of actions on such partitions.
> -.It Cm PC98
> -An MBR variant for NEC PC-98 and compatible computers.
> -Requires the
> -.Cm GEOM_PART_PC98
> -kernel option.
>  .It Cm VTOC8
>  Sun's SMI Volume Table Of Contents, used by
>  .Tn SPARC64
> @@ -945,12 +940,6 @@ The scheme-specific attributes for MBR:
>  .Bl -tag -width ".Cm active"
>  .It Cm active
>  .El
> -.Pp
> -The scheme-specific attributes for PC98:
> -.Bl -tag -width ".Cm bootable"
> -.It Cm active
> -.It Cm bootable
> -.El
>  .Sh BOOTSTRAPPING
>  .Fx
>  supports several partitioning schemes and each scheme uses different
> 
> Modified: head/share/examples/bootforth/frames.4th
> ==============================================================================
> --- head/share/examples/bootforth/frames.4th	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/share/examples/bootforth/frames.4th	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -12,49 +12,26 @@ variable rt_el
>  variable rb_el
>  variable fill
>  
> -s" arch-pc98" environment? [if]
> -	\ Single frames
> -	149 constant sh_el
> -	150 constant sv_el
> -	152 constant slt_el
> -	154 constant slb_el
> -	153 constant srt_el
> -	155 constant srb_el
> -	\ Double frames
> -	149 constant dh_el
> -	150 constant dv_el
> -	152 constant dlt_el
> -	154 constant dlb_el
> -	153 constant drt_el
> -	155 constant drb_el
> -	\ Fillings
> -	0 constant fill_none
> -	32 constant fill_blank
> -	135 constant fill_dark
> -	135 constant fill_med
> -	135 constant fill_bright
> -[else]
> -	\ Single frames
> -	196 constant sh_el
> -	179 constant sv_el
> -	218 constant slt_el
> -	192 constant slb_el
> -	191 constant srt_el
> -	217 constant srb_el
> -	\ Double frames
> -	205 constant dh_el
> -	186 constant dv_el
> -	201 constant dlt_el
> -	200 constant dlb_el
> -	187 constant drt_el
> -	188 constant drb_el
> -	\ Fillings
> -	0 constant fill_none
> -	32 constant fill_blank
> -	176 constant fill_dark
> -	177 constant fill_med
> -	178 constant fill_bright
> -[then]
> +\ Single frames
> +196 constant sh_el
> +179 constant sv_el
> +218 constant slt_el
> +192 constant slb_el
> +191 constant srt_el
> +217 constant srb_el
> +\ Double frames
> +205 constant dh_el
> +186 constant dv_el
> +201 constant dlt_el
> +200 constant dlb_el
> +187 constant drt_el
> +188 constant drb_el
> +\ Fillings
> +0 constant fill_none
> +32 constant fill_blank
> +176 constant fill_dark
> +177 constant fill_med
> +178 constant fill_bright
>  
>  : hline	( len x y -- )	\ Draw horizontal single line
>  	at-xy		\ move cursor
> 
> Modified: head/share/man/man4/adv.4
> ==============================================================================
> --- head/share/man/man4/adv.4	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/share/man/man4/adv.4	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -204,12 +204,6 @@ AdvanSys ABP950
>  AdvanSys ABP980, ABP980U
>  .It
>  AdvanSys ABP980UA/3980UA
> -.It
> -MELCO IFC-USP (PC-98)
> -.It
> -RATOC REX-PCI30 (PC-98)
> -.It
> -@Nifty FNECHARD IFC-USUP-TX (PC-98)
>  .El
>  .Sh SEE ALSO
>  .Xr adw 4 ,
> 
> Modified: head/share/man/man4/ahc.4
> ==============================================================================
> --- head/share/man/man4/ahc.4	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/share/man/man4/ahc.4	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -349,14 +349,6 @@ Adaptec
>  Adaptec
>  .Tn 4944UW
>  .It
> -NEC PC-9821Xt13 (PC-98)
> -.It
> -NEC RvII26 (PC-98)
> -.It
> -NEC PC-9821X-B02L/B09 (PC-98)
> -.It
> -NEC SV-98/2-B03 (PC-98)
> -.It
>  Many motherboards with on-board
>  .Tn SCSI
>  support
> 
> Modified: head/share/man/man4/apic.4
> ==============================================================================
> --- head/share/man/man4/apic.4	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/share/man/man4/apic.4	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -32,7 +32,7 @@
>  .Nd Advanced Programmable Interrupt Controller (APIC) driver
>  .Sh SYNOPSIS
>  This driver is a mandatory part of amd64 kernel.
> -To compile this driver into i386 or pc98 kernel,
> +To compile this driver into i386 kernel,
>  place the following line in your
>  kernel configuration file:
>  .Bd -ragged -offset indent
> 
> Modified: head/share/man/man4/ed.4
> ==============================================================================
> --- head/share/man/man4/ed.4	Sat Jan 28 00:40:36 2017	(r312909)
> +++ head/share/man/man4/ed.4	Sat Jan 28 02:22:15 2017	(r312910)
> @@ -133,12 +133,6 @@ Accton EN2212/EN2216/UE2216
>  .It
>  Allied Telesis CentreCOM LA100-PCM_V2
>  .It
> -Allied Telesis LA-98 (flags 0x000000) (PC-98)
> -.It
> -Allied Telesis SIC-98, SIC-98NOTE (110pin), SIU-98 (flags 0x600000) (PC-98)
> -.It
> -Allied Telesis SIU-98-D (flags 0x610000) (PC-98)
> -.It
>  AmbiCom 10BaseT card (8002, 8002T, 8010 and 8610)
>  .It
>  Bay Networks NETGEAR FA410TXC Fast Ethernet
> @@ -163,12 +157,6 @@ Compex Net-A adapter
>  .It
>  Compex RL2000
>  .It
> -Contec C-NET(98), RT-1007(98), C-NET(9N) (110pin) (flags 0xa00000) (PC-98)
> -.It
> -Contec C-NET(98)E-A, C-NET(98)L-A, C-NET(98)P (flags 0x300000) (PC-98)
> -.It
> -Corega Ether98-T (flags 0x000000) (PC-98)
> -.It
>  Corega Ether PCC-T/EtherII PCC-T/FEther PCC-TXF/PCC-TXD PCC-T/Fether II TXD
>  .It
>  Corega LAPCCTXD (TC5299J)
> @@ -179,16 +167,10 @@ DEC EtherWorks DE305
>  .It
>  Danpex EN-6200P2
>  .It
> -D-Link DE-298, DE-298P (flags 0x500000) (PC-98)
> -.It
>  D-Link DE-660, DE-660+
>  .It
>  D-Link IC-CARD/IC-CARD+ Ethernet
>  .It
> -ELECOM LD-98P (flags 0x500000) (PC-98)
> -.It
> -ELECOM LD-BDN, LD-NW801G (flags 0x200000) (PC-98)
> -.It
>  ELECOM Laneed LD-CDL/TX, LD-CDF, LD-CDS, LD-10/100CD, LD-CDWA (DP83902A)
>  .It
>  Hawking PN652TX PC Card (AX88790)
> @@ -198,17 +180,10 @@ HP PC Lan+ 27247B and 27252A
>  .It
>  IBM Creditcard Ethernet I/II
>  .It
> -ICM AD-ET2-T, DT-ET-25, DT-ET-T5, IF-2766ET, IF-2771ET, NB-ET-T (110pin)
> -(flags 0x500000) (PC-98)
> -.It
> -I-O DATA LA/T-98, LA/T-98SB, LA2/T-98, ET/T-98 (flags 0x900000) (PC-98)
> -.It
>  I-O DATA ET2/T-PCI
>  .It
>  I-O DATA PCLATE
>  .It
> -Kansai KLA-98C/T (flags 0x900000) (PC-98)
> -.It
>  Kingston KNE-PC2, CIO10T, KNE-PCM/x Ethernet
>  .It
>  KTI ET32P2 PCI
> @@ -217,28 +192,14 @@ Linksys EC2T/PCMPC100/PCM100, PCMLM56
>  .It
>  Linksys EtherFast 10/100 PC Card, Combo PCMCIA Ethernet Card (PCMPC100 V2)
>  .It
> -Logitec LAN-98T (flags 0xb00000) (PC-98)
> -.It
>  MACNICA Ethernet ME1 for JEIDA
>  .It
> -MACNICA ME98 (flags 0x900000) (PC-98)
> -.It
> -MACNICA NE2098 (flags 0x400000) (PC-98)
> -.It
> -MELCO EGY-98 (flags 0x300000) (PC-98)
> 
> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
> 

---
TAKAHASHI Yoshihiro <nyan@FreeBSD.org>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170205.221144.1616842004369178243.nyan>