summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_drv.c45
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_ext.c4
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_hdr.h10
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_kbd.c4
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_sup.c4
5 files changed, 54 insertions, 13 deletions
diff --git a/sys/arch/i386/isa/pcvt/pcvt_drv.c b/sys/arch/i386/isa/pcvt/pcvt_drv.c
index 8a99c350f8e..acaf7c101f8 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_drv.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_drv.c
@@ -1,7 +1,9 @@
-/* $OpenBSD: pcvt_drv.c,v 1.26 1999/11/25 20:24:20 aaron Exp $ */
+/* $OpenBSD: pcvt_drv.c,v 1.27 1999/11/25 21:00:35 aaron Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
+ *
* Copyright (c) 1992, 1993 Brian Dunford-Shore and Scott Turner.
+ *
* Copyright (c) 1993 Charles Hannum.
*
* All rights reserved.
@@ -43,6 +45,45 @@
*
*/
+/*---------------------------------------------------------------------------*
+ *
+ * pcvt_drv.c VT220 Driver Main Module / OS - Interface
+ * ---------------------------------------------------------
+ * -hm ------------ Release 3.00 --------------
+ * -hm integrating NetBSD-current patches
+ * -hm adding ttrstrt() proto for NetBSD 0.9
+ * -hm kernel/console output cursor positioning fixed
+ * -hm kernel/console output switches optional to screen 0
+ * -hm FreeBSD 1.1 porting
+ * -hm the NetBSD 0.9 compiler detected a nondeclared var which was
+ * NOT detected by neither the NetBSD-current nor FreeBSD 1.x!
+ * -hm including Michael's keyboard fifo code
+ * -hm Joergs patch for FreeBSD tty-malloc code
+ * -hm adjustments for NetBSD-current
+ * -hm FreeBSD bugfix from Joerg re timeout/untimeout casts
+ * -jw including Thomas Gellekum's FreeBSD 1.1.5 patch
+ * -hm adjusting #if's for NetBSD-current
+ * -hm applying Joerg's patch for FreeBSD 2.0
+ * -hm patch from Onno & Martin for NetBSD-current (post 1.0)
+ * -hm some adjustments for NetBSD 1.0
+ * -hm NetBSD PR #400: screen size report for new session
+ * -hm patch from Rafael Boni/Lon Willett for NetBSD-current
+ * -hm bell patch from Thomas Eberhardt for NetBSD
+ * -hm multiple X server bugfixes from Lon Willett
+ * -hm patch from joerg - pcdevtotty for FreeBSD pre-2.1
+ * -hm delay patch from Martin Husemann after port-i386 ml-discussion
+ * -jw add some code to provide more FreeBSD pre-2.1 support
+ * -hm patches from Michael for NetBSD-current (Apr/21/95) support
+ * -hm merged in changes from FreeBSD 2.0.5-RELEASE
+ * -hm NetBSD-current patches from John Kohl
+ * -hm ---------------- Release 3.30 -----------------------
+ * -hm patch from Joerg in pcopen() to make mouse emulator work again
+ * -hm patch from Frank van der Linden for keyboard state per VT
+ * -hm no TS_ASLEEP anymore in FreeBSD 2.1.0 SNAP 950928
+ * -hm ---------------- Release 3.32 -----------------------
+ *
+ *---------------------------------------------------------------------------*/
+
#include "vt.h"
#if NVT > 0
@@ -287,7 +328,7 @@ pctty(Dev_t dev)
}
int
-pcioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+pcioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
register int error;
register struct tty *tp;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_ext.c b/sys/arch/i386/isa/pcvt/pcvt_ext.c
index bd41a5ceb2d..3b9313407b9 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_ext.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_ext.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_ext.c,v 1.24 1999/11/25 20:24:21 aaron Exp $ */
+/* $OpenBSD: pcvt_ext.c,v 1.25 1999/11/25 21:00:35 aaron Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -2561,7 +2561,7 @@ vgapage(int new_screen)
* VT_USL ioctl handling
*---------------------------------------------------------------------------*/
int
-usl_vt_ioctl(Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
+usl_vt_ioctl(Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int i, j, error, opri, mode;
struct vt_mode newmode;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
index 122f8a7f6d6..4842b2e45f7 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_hdr.h,v 1.29 1999/11/25 20:24:21 aaron Exp $ */
+/* $OpenBSD: pcvt_hdr.h,v 1.30 1999/11/25 21:00:36 aaron Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -948,7 +948,7 @@ int pcopen ( Dev_t dev, int flag, int mode, struct proc *p );
int pcclose ( Dev_t dev, int flag, int mode, struct proc *p );
int pcread ( Dev_t dev, struct uio *uio, int flag );
int pcwrite ( Dev_t dev, struct uio *uio, int flag );
-int pcioctl ( Dev_t dev, int cmd, caddr_t data, int flag, struct proc *p );
+int pcioctl ( Dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p );
int pcmmap ( Dev_t dev, int offset, int nprot );
struct tty *
@@ -964,7 +964,7 @@ void pcstart ( struct tty *tp );
void pcstop ( struct tty *tp, int flag );
void switch_screen ( int n, int oldgrafx, int newgrafx );
-int usl_vt_ioctl (Dev_t dev,int cmd,caddr_t data,int flag,struct proc *);
+int usl_vt_ioctl (Dev_t dev, u_long cmd,caddr_t data,int flag,struct proc *);
int vt_activate ( int newscreen );
int vgapage ( int n );
void get_usl_keymap( keymap_t *map );
@@ -985,7 +985,7 @@ int kbd_cmd ( int val );
void kbd_code_init ( void );
void kbd_code_init1 ( void );
void kbd_setmode(int mode);
-int kbdioctl ( Dev_t dev, int cmd, caddr_t data, int flag );
+int kbdioctl ( Dev_t dev, u_long cmd, caddr_t data, int flag );
void loadchar ( int fontset, int character, int char_scanlines,
u_char *char_table );
void mda2egaorvga ( void );
@@ -1016,7 +1016,7 @@ void vga_screen_off ( void );
void vga_screen_on ( void );
char *vga_string ( int number );
int vga_test ( void );
-int vgaioctl ( Dev_t dev, int cmd, caddr_t data, int flag );
+int vgaioctl ( Dev_t dev, u_long cmd, caddr_t data, int flag );
void vgapaletteio ( unsigned idx, struct rgb *val, int writeit );
void vt_aln ( struct video_state *svsp );
void vt_clearudk ( struct video_state *svsp );
diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
index 60a8b8a9200..454030f28ce 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_kbd.c,v 1.29 1999/11/25 20:24:21 aaron Exp $ */
+/* $OpenBSD: pcvt_kbd.c,v 1.30 1999/11/25 21:00:36 aaron Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -1432,7 +1432,7 @@ setkeydef(Ovl_tbl *data)
* keyboard ioctl's entry
*---------------------------------------------------------------------------*/
int
-kbdioctl(Dev_t dev, int cmd, caddr_t data, int flag)
+kbdioctl(Dev_t dev, u_long cmd, caddr_t data, int flag)
{
int key;
diff --git a/sys/arch/i386/isa/pcvt/pcvt_sup.c b/sys/arch/i386/isa/pcvt/pcvt_sup.c
index fe1b797e7b9..3e932bcf9a0 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_sup.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_sup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_sup.c,v 1.13 1999/11/25 20:24:22 aaron Exp $ */
+/* $OpenBSD: pcvt_sup.c,v 1.14 1999/11/25 21:00:36 aaron Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -109,7 +109,7 @@ static u_short getrand ( void );
* execute vga ioctls
*---------------------------------------------------------------------------*/
int
-vgaioctl(Dev_t dev, int cmd, caddr_t data, int flag)
+vgaioctl(Dev_t dev, u_long cmd, caddr_t data, int flag)
{
if(minor(dev) >= PCVT_NSCREENS)
return -1;