summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/dev/itevar.h
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1997-04-16 11:56:40 +0000
committerJason Downs <downsj@cvs.openbsd.org>1997-04-16 11:56:40 +0000
commitab08be91e5dc66cfc42b85763d4caf94e2fd3d09 (patch)
tree89caace66e8787764cc54b781a8cbfd881b69458 /sys/arch/hp300/dev/itevar.h
parent75113d46e0ad67778c0741a5bfc96d9d686f7eec (diff)
Merge portions of NetBSD up to 970415.
This includes: * All of the prototyping and KNF changes. * The new interrupt system. * Portions of the Domain Keyboard support from Mike Smith. This does not include: * m68k changes, namely generic dumps. Various sundry changes and fixes by me.
Diffstat (limited to 'sys/arch/hp300/dev/itevar.h')
-rw-r--r--sys/arch/hp300/dev/itevar.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/arch/hp300/dev/itevar.h b/sys/arch/hp300/dev/itevar.h
index b42ba47ebfe..0ef7dcc62da 100644
--- a/sys/arch/hp300/dev/itevar.h
+++ b/sys/arch/hp300/dev/itevar.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: itevar.h,v 1.8 1997/02/06 00:14:41 downsj Exp $ */
-/* $NetBSD: itevar.h,v 1.13 1997/01/30 09:18:57 thorpej Exp $ */
+/* $OpenBSD: itevar.h,v 1.9 1997/04/16 11:56:11 downsj Exp $ */
+/* $NetBSD: itevar.h,v 1.14 1997/03/31 07:37:27 scottr Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -205,6 +205,8 @@ int iteon __P((struct ite_data *, int));
void iteoff __P((struct ite_data *, int));
void itefilter __P((char, char));
void itecninit __P((struct grf_data *, struct itesw *));
+int itecngetc __P((dev_t));
+void itecnputc __P((dev_t, int));
int ite_major __P((void));
/* ite_subr.c prototypes */