diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-04-16 11:56:40 +0000 |
| commit | ab08be91e5dc66cfc42b85763d4caf94e2fd3d09 (patch) | |
| tree | 89caace66e8787764cc54b781a8cbfd881b69458 /sys/arch/hp300/dev/grfvar.h | |
| parent | 75113d46e0ad67778c0741a5bfc96d9d686f7eec (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/grfvar.h')
| -rw-r--r-- | sys/arch/hp300/dev/grfvar.h | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/sys/arch/hp300/dev/grfvar.h b/sys/arch/hp300/dev/grfvar.h index 5eaa0d3fe3c..0da88462c8c 100644 --- a/sys/arch/hp300/dev/grfvar.h +++ b/sys/arch/hp300/dev/grfvar.h @@ -1,5 +1,5 @@ -/* $OpenBSD: grfvar.h,v 1.5 1997/02/05 16:01:17 downsj Exp $ */ -/* $NetBSD: grfvar.h,v 1.9 1997/01/30 09:18:51 thorpej Exp $ */ +/* $OpenBSD: grfvar.h,v 1.6 1997/04/16 11:56:06 downsj Exp $ */ +/* $NetBSD: grfvar.h,v 1.10 1997/03/31 07:34:19 scottr Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -126,6 +126,30 @@ struct grfdev_attach_args { #ifdef _KERNEL extern struct grf_data grf_cn; /* grf_data for console device */ +/* grf.c prototypes */ +int grfmap __P((dev_t, caddr_t *, struct proc *)); +int grfunmap __P((dev_t, caddr_t, struct proc *)); +int grfon __P((dev_t)); +int grfoff __P((dev_t)); +int grfaddr __P((struct grf_softc *, int)); + +#ifdef COMPAT_HPUX +int hpuxgrfioctl __P((dev_t, int, caddr_t, int, struct proc *)); + +int grflock __P((struct grf_data *, int)); +int grfunlock __P((struct grf_data *)); +int grfdevno __P((dev_t)); + +int iommap __P((dev_t, caddr_t *)); +int iounmmap __P((dev_t, caddr_t)); + +int grffindpid __P((struct grf_data *)); +void grfrmpid __P((struct grf_data *)); +int grflckmmap __P((dev_t, caddr_t *)); +int grflckunmmap __P((dev_t, caddr_t)); +#endif /* COMPAT_HPUX */ + +/* grf_subr.c prototypes */ struct itesw; void grfdev_attach __P((struct grfdev_softc *, int (*init)(struct grf_data *, int, caddr_t), |