From 8a8c58705ca8f8518792c20136eefba03704b19e Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 5 Mar 2005 18:08:50 +0000 Subject: [PATCH] Remove PC98 support. --- sys/sys/consio.h | 12 +----------- sys/sys/copyright.h | 11 +---------- sys/sys/disklabel.h | 6 +----- sys/sys/disklabel32.h | 6 +----- sys/sys/diskslice.h | 6 +----- sys/sys/odisklabel.h | 6 +----- 6 files changed, 6 insertions(+), 41 deletions(-) diff --git a/sys/sys/consio.h b/sys/sys/consio.h index 65076df021..c427f91346 100644 --- a/sys/sys/consio.h +++ b/sys/sys/consio.h @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/sys/consio.h,v 1.5.2.7 2002/09/15 22:30:46 dd Exp $ - * $DragonFly: src/sys/sys/consio.h,v 1.2 2003/06/17 04:28:58 dillon Exp $ + * $DragonFly: src/sys/sys/consio.h,v 1.3 2005/03/05 18:08:50 swildner Exp $ */ #ifndef _SYS_CONSIO_H_ @@ -270,10 +270,6 @@ typedef struct term_info term_info_t; #define CONS_GETTERM _IOWR('c', 112, term_info_t) #define CONS_SETTERM _IOW('c', 113, term_info_t) -#ifdef PC98 -#define ADJUST_CLOCK _IO('t',100) /* for 98note resume */ -#endif - /* * Vty switching ioctl commands. */ @@ -364,12 +360,6 @@ typedef struct vt_mode vtmode_t; #define SW_VGA_CG640 _IO('S', M_VGA_CG640) #define SW_VGA_MODEX _IO('S', M_VGA_MODEX) -#define SW_PC98_80x25 _IO('S', M_PC98_80x25) -#define SW_PC98_80x30 _IO('S', M_PC98_80x30) -#define SW_PC98_EGC640x400 _IO('S', M_PC98_EGC640x400) -#define SW_PC98_PEGC640x400 _IO('S', M_PC98_PEGC640x400) -#define SW_PC98_PEGC640x480 _IO('S', M_PC98_PEGC640x480) - #define SW_VGA_C90x25 _IO('S', M_VGA_C90x25) #define SW_VGA_M90x25 _IO('S', M_VGA_M90x25) #define SW_VGA_C90x30 _IO('S', M_VGA_C90x30) diff --git a/sys/sys/copyright.h b/sys/sys/copyright.h index 9438ff927f..0d76a2041d 100644 --- a/sys/sys/copyright.h +++ b/sys/sys/copyright.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/copyright.h,v 1.10.2.5 2003/01/07 04:28:55 imp Exp $ - * $DragonFly: src/sys/sys/copyright.h,v 1.6 2005/01/01 11:15:44 hmp Exp $ + * $DragonFly: src/sys/sys/copyright.h,v 1.7 2005/03/05 18:08:50 swildner Exp $ */ @@ -42,13 +42,4 @@ #define COPYRIGHT_UCB \ "Copyright (c) 1979, 1980, 1983, 1986, 1988, 1989, 1991, 1992, 1993, 1994\n\tThe Regents of the University of California. All rights reserved.\n" -/* a port of FreeBSD to the NEC PC98, Japan */ -#define COPYRIGHT_PC98 \ - "Copyright (c) 1994-2003 FreeBSD(98) porting team.\nCopyright (c) 1992 A.Kojima F.Ukai M.Ishii (KMC).\n" - -#if defined(PC98) -char copyright[] = COPYRIGHT_DragonFly/**/COPYRIGHT_FreeBSD/**/COPYRIGHT_PC98/**/COPYRIGHT_UCB; - -#else char copyright[] = COPYRIGHT_DragonFly/**/COPYRIGHT_FreeBSD/**/COPYRIGHT_UCB; -#endif diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h index e61897b77b..f7271b2494 100644 --- a/sys/sys/disklabel.h +++ b/sys/sys/disklabel.h @@ -32,7 +32,7 @@ * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 * $FreeBSD: src/sys/sys/disklabel.h,v 1.49.2.7 2001/05/27 05:58:26 jkh Exp $ - * $DragonFly: src/sys/sys/disklabel.h,v 1.7 2004/06/02 19:31:02 dillon Exp $ + * $DragonFly: src/sys/sys/disklabel.h,v 1.8 2005/03/05 18:08:50 swildner Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -225,10 +225,6 @@ dkcksum(struct disklabel *lp) #define DTYPE_VINUM 12 /* vinum volume */ #define DTYPE_DOC2K 13 /* Msys DiskOnChip */ -#if defined(PC98) && !defined(PC98_ATCOMPAT) -#define DSTYPE_SEC256 0x80 /* physical sector size=256 */ -#endif - #ifdef DKTYPENAMES static char *dktypenames[] = { "unknown", diff --git a/sys/sys/disklabel32.h b/sys/sys/disklabel32.h index d16b0c74ec..b0eb3a3d06 100644 --- a/sys/sys/disklabel32.h +++ b/sys/sys/disklabel32.h @@ -32,7 +32,7 @@ * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 * $FreeBSD: src/sys/sys/disklabel.h,v 1.49.2.7 2001/05/27 05:58:26 jkh Exp $ - * $DragonFly: src/sys/sys/disklabel32.h,v 1.7 2004/06/02 19:31:02 dillon Exp $ + * $DragonFly: src/sys/sys/disklabel32.h,v 1.8 2005/03/05 18:08:50 swildner Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -225,10 +225,6 @@ dkcksum(struct disklabel *lp) #define DTYPE_VINUM 12 /* vinum volume */ #define DTYPE_DOC2K 13 /* Msys DiskOnChip */ -#if defined(PC98) && !defined(PC98_ATCOMPAT) -#define DSTYPE_SEC256 0x80 /* physical sector size=256 */ -#endif - #ifdef DKTYPENAMES static char *dktypenames[] = { "unknown", diff --git a/sys/sys/diskslice.h b/sys/sys/diskslice.h index c4b21af64f..d63e6b11c3 100644 --- a/sys/sys/diskslice.h +++ b/sys/sys/diskslice.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/sys/diskslice.h,v 1.36.2.1 2001/01/29 01:50:50 ken Exp $ - * $DragonFly: src/sys/sys/diskslice.h,v 1.4 2004/03/04 01:37:57 dillon Exp $ + * $DragonFly: src/sys/sys/diskslice.h,v 1.5 2005/03/05 18:08:50 swildner Exp $ */ #ifndef _SYS_DISKSLICE_H_ @@ -46,10 +46,6 @@ struct diskslice { u_long ds_offset; /* starting sector */ u_long ds_size; /* number of sectors */ int ds_type; /* (foreign) slice type */ -#ifdef PC98 - int ds_subtype; /* sub slice type */ - u_char ds_name[16]; /* slice name */ -#endif struct disklabel *ds_label; /* BSD label, if any */ void *ds_dev; /* devfs token for raw whole slice */ #ifdef MAXPARTITIONS /* XXX don't depend on disklabel.h */ diff --git a/sys/sys/odisklabel.h b/sys/sys/odisklabel.h index f271cbcec0..d8424f7792 100644 --- a/sys/sys/odisklabel.h +++ b/sys/sys/odisklabel.h @@ -32,7 +32,7 @@ * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 * $FreeBSD: src/sys/sys/disklabel.h,v 1.49.2.7 2001/05/27 05:58:26 jkh Exp $ - * $DragonFly: src/sys/sys/Attic/odisklabel.h,v 1.7 2004/06/02 19:31:02 dillon Exp $ + * $DragonFly: src/sys/sys/Attic/odisklabel.h,v 1.8 2005/03/05 18:08:50 swildner Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -225,10 +225,6 @@ dkcksum(struct disklabel *lp) #define DTYPE_VINUM 12 /* vinum volume */ #define DTYPE_DOC2K 13 /* Msys DiskOnChip */ -#if defined(PC98) && !defined(PC98_ATCOMPAT) -#define DSTYPE_SEC256 0x80 /* physical sector size=256 */ -#endif - #ifdef DKTYPENAMES static char *dktypenames[] = { "unknown", -- 2.41.0