Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/compat/linux/arch/i386 Remove the pcvt support.



details:   https://anonhg.NetBSD.org/src/rev/38ff70ac6323
branches:  trunk
changeset: 487679:38ff70ac6323
user:      veego <veego%NetBSD.org@localhost>
date:      Sun Jun 11 09:19:27 2000 +0000

description:
Remove the pcvt support.

diffstat:

 sys/compat/linux/arch/i386/linux_machdep.c |  23 ++++-------------------
 sys/compat/linux/arch/i386/linux_machdep.h |   3 +--
 2 files changed, 5 insertions(+), 21 deletions(-)

diffs (86 lines):

diff -r 0b1251d97565 -r 38ff70ac6323 sys/compat/linux/arch/i386/linux_machdep.c
--- a/sys/compat/linux/arch/i386/linux_machdep.c        Sun Jun 11 09:13:51 2000 +0000
+++ b/sys/compat/linux/arch/i386/linux_machdep.c        Sun Jun 11 09:19:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_machdep.c,v 1.49 2000/05/15 01:12:07 jhawk Exp $ */
+/*     $NetBSD: linux_machdep.c,v 1.50 2000/06/11 09:19:27 veego Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -82,15 +82,8 @@
 #include <machine/vmparam.h>
 
 /*
- * To see whether pcvt is configured (for virtual console ioctl calls).
+ * To see whether wscons is configured (for virtual console ioctl calls).
  */
-#ifndef NVT
-#include "vt.h"
-#endif
-#if NVT > 0
-#include <arch/i386/isa/pcvt/pcvt_ioctl.h>
-#endif
-
 #include "wsdisplay.h"
 #if (NWSDISPLAY > 0)
 #include <sys/ioctl.h>
@@ -452,10 +445,6 @@
 linux_fakedev(dev)
        dev_t dev;
 {
-#if (NVT > 0)
-       if (major(dev) == NETBSD_PCCONS_MAJOR)
-               return makedev(LINUX_CONS_MAJOR, (minor(dev) + 1));
-#endif
 #if (NWSDISPLAY > 0)
        if (major(dev) == NETBSD_WSCONS_MAJOR)
                return makedev(LINUX_CONS_MAJOR, (minor(dev) + 1));
@@ -559,12 +548,10 @@
        } */ *uap = v;
        struct sys_ioctl_args bia;
        u_long com;
-#if (NVT > 0) || (NWSDISPLAY > 0)
+#if (NWSDISPLAY > 0)
        int error;
        struct vt_mode lvt;
        caddr_t bvtp, sg;
-#endif
-#if (NWSDISPLAY > 0)
        struct kbentry kbe;
 #endif
 
@@ -573,7 +560,7 @@
        com = SCARG(uap, com);
 
        switch (com) {
-#if (NVT > 0) || (NWSDISPLAY > 0)
+#if (NWSDISPLAY > 0)
        case LINUX_KDGKBMODE:
                com = KDGKBMODE;
                break;
@@ -638,8 +625,6 @@
        case LINUX_VT_WAITACTIVE:
                com = VT_WAITACTIVE;
                break;
-#endif
-#if (NWSDISPLAY > 0)
        case LINUX_VT_GETSTATE:
                com = VT_GETSTATE;
                break;
diff -r 0b1251d97565 -r 38ff70ac6323 sys/compat/linux/arch/i386/linux_machdep.h
--- a/sys/compat/linux/arch/i386/linux_machdep.h        Sun Jun 11 09:13:51 2000 +0000
+++ b/sys/compat/linux/arch/i386/linux_machdep.h        Sun Jun 11 09:19:27 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: linux_machdep.h,v 1.10 1999/10/04 17:46:37 fvdl Exp $  */
+/*     $NetBSD: linux_machdep.h,v 1.11 2000/06/11 09:19:27 veego Exp $ */
 
 /*-
  * Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -94,7 +94,6 @@
  * ugly patch to fake device numbers.
  */
 #define LINUX_CONS_MAJOR   4
-#define NETBSD_PCCONS_MAJOR 12
 #define NETBSD_WSCONS_MAJOR 47
 
 /*



Home | Main Index | Thread Index | Old Index