Remove CPU_COLORDISP, GIO_COLOR now exists

This commit is contained in:
Andrey A. Chernov 1994-10-18 03:42:18 +00:00
parent 27e3c1f843
commit 37b28ca421
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=3682
5 changed files with 6 additions and 27 deletions

View File

@ -400,7 +400,6 @@ Most architectures define at least the following variables.
.It Li CPU_CONSDEV dev_t no
.It Li CPU_ADJKERNTZ int yes
.It Li CPU_DISRTCSET int yes
.It Li CPU_COLORDISP int no
.El
.Sh CTL_NET
The string and integer information available for the CTL_NET level

View File

@ -35,12 +35,11 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.74 1994/10/15 21:25:03 ache Exp $
* $Id: machdep.c,v 1.75 1994/10/17 12:36:43 ache Exp $
*/
#include "npx.h"
#include "isa.h"
#include "sc.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -136,11 +135,6 @@ int msgbufmapped = 0; /* set when safe to use msgbuf */
int _udatasel, _ucodesel;
extern int adjkerntz, disable_rtc_set; /* from clock.c */
#if NSC > 0
extern int color_display; /* from syscons.c */
#else
int color_display = -1;
#endif
/*
* Machine-dependent startup code
@ -925,8 +919,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
return (sysctl_int(oldp, oldlenp, newp, newlen, &adjkerntz));
case CPU_DISRTCSET:
return (sysctl_int(oldp, oldlenp, newp, newlen, &disable_rtc_set));
case CPU_COLORDISP:
return (sysctl_rdint(oldp, oldlenp, newp, color_display));
default:
return (EOPNOTSUPP);
}

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
* $Id: cpu.h,v 1.13 1994/10/10 01:06:48 phk Exp $
* $Id: cpu.h,v 1.14 1994/10/15 21:18:11 ache Exp $
*/
#ifndef _MACHINE_CPU_H_
@ -100,15 +100,13 @@ struct cpu_nameclass {
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ADJKERNTZ 2 /* int: timezone offset for resettodr() */
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
#define CPU_COLORDISP 4 /* int: console display type */
#define CPU_MAXID 5 /* number of valid machdep ids */
#define CPU_MAXID 4 /* number of valid machdep ids */
#define CTL_MACHDEP_NAMES { \
{ 0, 0 }, \
{ "console_device", CTLTYPE_STRUCT }, \
{ "adjkerntz", CTLTYPE_INT }, \
{ "disable_rtc_set", CTLTYPE_INT }, \
{ "color_display", CTLTYPE_INT }, \
}
#ifdef KERNEL

View File

@ -35,12 +35,11 @@
* SUCH DAMAGE.
*
* from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
* $Id: machdep.c,v 1.74 1994/10/15 21:25:03 ache Exp $
* $Id: machdep.c,v 1.75 1994/10/17 12:36:43 ache Exp $
*/
#include "npx.h"
#include "isa.h"
#include "sc.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -136,11 +135,6 @@ int msgbufmapped = 0; /* set when safe to use msgbuf */
int _udatasel, _ucodesel;
extern int adjkerntz, disable_rtc_set; /* from clock.c */
#if NSC > 0
extern int color_display; /* from syscons.c */
#else
int color_display = -1;
#endif
/*
* Machine-dependent startup code
@ -925,8 +919,6 @@ cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p)
return (sysctl_int(oldp, oldlenp, newp, newlen, &adjkerntz));
case CPU_DISRTCSET:
return (sysctl_int(oldp, oldlenp, newp, newlen, &disable_rtc_set));
case CPU_COLORDISP:
return (sysctl_rdint(oldp, oldlenp, newp, color_display));
default:
return (EOPNOTSUPP);
}

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)cpu.h 5.4 (Berkeley) 5/9/91
* $Id: cpu.h,v 1.13 1994/10/10 01:06:48 phk Exp $
* $Id: cpu.h,v 1.14 1994/10/15 21:18:11 ache Exp $
*/
#ifndef _MACHINE_CPU_H_
@ -100,15 +100,13 @@ struct cpu_nameclass {
#define CPU_CONSDEV 1 /* dev_t: console terminal device */
#define CPU_ADJKERNTZ 2 /* int: timezone offset for resettodr() */
#define CPU_DISRTCSET 3 /* int: disable resettodr() call */
#define CPU_COLORDISP 4 /* int: console display type */
#define CPU_MAXID 5 /* number of valid machdep ids */
#define CPU_MAXID 4 /* number of valid machdep ids */
#define CTL_MACHDEP_NAMES { \
{ 0, 0 }, \
{ "console_device", CTLTYPE_STRUCT }, \
{ "adjkerntz", CTLTYPE_INT }, \
{ "disable_rtc_set", CTLTYPE_INT }, \
{ "color_display", CTLTYPE_INT }, \
}
#ifdef KERNEL