Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to match generic ISA changes.

This commit is contained in:
mycroft 1995-04-18 00:59:53 +00:00
parent 800b1f371a
commit 8874fd61ca
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/arch/i386/isa/pcvt/pcvt_drv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcvt_drv.c,v 1.12 1995/04/10 18:08:45 mycroft Exp $ */
/* $NetBSD: pcvt_drv.c,v 1.13 1995/04/18 00:59:53 mycroft Exp $ */
/*
* Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore,
@ -124,7 +124,6 @@ void
pcattach(struct device *parent, struct device *self, void *aux)
{
struct isa_attach_args *ia = aux;
static struct intrhand vthand;
#else
int
pcattach(struct isa_device *dev)
@ -273,10 +272,8 @@ pcattach(struct isa_device *dev)
async_update(0); /* start asynchronous updates */
#if PCVT_NETBSD > 9
vthand.ih_fun = pcrint;
vthand.ih_arg = 0;
vthand.ih_level = IPL_TTY;
intr_establish(ia->ia_irq, IST_EDGE, &vthand);
isa_intr_establish(ia->ia_irq, ISA_IST_EDGE, ISA_IPL_TTY, pcrint,
(void *)0);
#else
return 1;
#endif
@ -612,7 +609,7 @@ pcmmap(Dev_t dev, int offset, int nprot)
*
*---------------------------------------------------------------------------*/
int
pcrint(void)
pcrint(void *arg)
{
u_char *cp;
@ -819,7 +816,7 @@ pccnpollc(Dev_t dev, int on)
* won't get any further interrupts.
*/
s = spltty();
pcrint();
pcrint((void *)0);
splx(s);
}
}

10
sys/arch/i386/isa/pcvt/pcvt_hdr.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcvt_hdr.h,v 1.12 1995/04/10 01:07:18 mycroft Exp $ */
/* $NetBSD: pcvt_hdr.h,v 1.13 1995/04/18 00:59:58 mycroft Exp $ */
/*
* Copyright (c) 1992,1993,1994 Hellmuth Michaelis, Brian Dunford-Shore
@ -106,14 +106,12 @@
#endif
#if PCVT_NETBSD > 9
#include "i386/isa/isavar.h"
#include "dev/isa/isavar.h"
#else
#include "i386/isa/isa_device.h"
#endif
#if PCVT_NETBSD <= 10
#include "i386/isa/icu.h"
#endif
#include "i386/isa/isareg.h"
#include "dev/isa/isareg.h"
#if PCVT_NETBSD > 9
#include "dev/cons.h"
@ -1486,7 +1484,7 @@ 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, u_long cmd, caddr_t data, int flag, struct proc *p );
int pcmmap ( Dev_t dev, int offset, int nprot );
int pcrint ( void );
int pcrint ( void * );
int pcparam ( struct tty *tp, struct termios *t );
void pccnprobe ( struct consdev *cp );
void pccninit ( struct consdev *cp );