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

Use flags for scsi interrupts. clean up a small bit.

This commit is contained in:
briggs 1995-07-01 16:35:16 +00:00
parent 175a1e27f4
commit 36654b75d9
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/arch/mac68k/mac68k/via.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: via.c,v 1.21 1995/06/20 05:13:19 briggs Exp $ */ /* $NetBSD: via.c,v 1.22 1995/07/01 16:35:16 briggs Exp $ */
/*- /*-
* Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo, * Copyright (C) 1993 Allen K. Briggs, Chris P. Caputo,
@ -39,10 +39,11 @@
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
#include <machine/cpu.h> #include <machine/cpu.h>
#include <machine/frame.h> #include <machine/frame.h>
#include "via.h" #include "via.h"
#include <sys/kernel.h>
static int scsi_drq_intr(void), scsi_irq_intr(void); static int scsi_drq_intr(void), scsi_irq_intr(void);
@ -128,14 +129,14 @@ void VIA_initialize()
via_reg(VIA1, vBufB) |= (0x40); via_reg(VIA1, vBufB) |= (0x40);
via_reg(VIA1, vDirB) |= (0x40); via_reg(VIA1, vDirB) |= (0x40);
} }
#if 1
/* /*
* unlock nubus * unlock nubus
*/ */
via_reg(VIA2, vPCR) = 0x06; via_reg(VIA2, vPCR) = 0x06;
via_reg(VIA2, vBufB) |= 0x02; via_reg(VIA2, vBufB) |= 0x02;
via_reg(VIA2, vDirB) |= 0x02; via_reg(VIA2, vDirB) |= 0x02;
#endif
real_via2_intr = via2_intr; real_via2_intr = via2_intr;
via2itab[1] = via2_nubus_intr; via2itab[1] = via2_nubus_intr;
@ -203,7 +204,8 @@ via2_intr(struct frame *fp)
} }
} }
void rbv_intr(struct frame *fp) void
rbv_intr(struct frame *fp)
{ {
register unsigned char intbits; register unsigned char intbits;
register char bitnum, bitmsk; register char bitnum, bitmsk;
@ -225,13 +227,15 @@ void rbv_intr(struct frame *fp)
} }
} }
long via1_noint(int bitnum) long
via1_noint(int bitnum)
{ {
/* printf("via1_noint(%d)\n", bitnum); */ /* printf("via1_noint(%d)\n", bitnum); */
return 1; return 1;
} }
long via2_noint(int bitnum) long
via2_noint(int bitnum)
{ {
/* printf("via2_noint(%d)\n", bitnum); */ /* printf("via2_noint(%d)\n", bitnum); */
return 1; return 1;
@ -345,7 +349,8 @@ via_shutdown()
} }
} }
int rbv_vidstatus(void) int
rbv_vidstatus(void)
{ {
int montype; int montype;
@ -362,23 +367,31 @@ int rbv_vidstatus(void)
static int static int
scsi_irq_intr(void) scsi_irq_intr(void)
{ {
#if NNCR96SCSI
if (mac68k_machine.scsi96) { if (mac68k_machine.scsi96) {
if (ncr53c96_irq_intr()) return 1; if (ncr53c96_irq_intr()) return 1;
} }
#endif
#if NNCRSCSI
if (mac68k_machine.scsi80) { if (mac68k_machine.scsi80) {
if (ncr5380_irq_intr()) return 1; if (ncr5380_irq_intr()) return 1;
} }
#endif
return 0; return 0;
} }
static int static int
scsi_drq_intr(void) scsi_drq_intr(void)
{ {
#if NNCR96SCSI
if (mac68k_machine.scsi96) { if (mac68k_machine.scsi96) {
if (ncr53c96_drq_intr()) return 1; if (ncr53c96_drq_intr()) return 1;
} }
#endif
#if NNCRSCSI
if (mac68k_machine.scsi80) { if (mac68k_machine.scsi80) {
if (ncr5380_drq_intr()) return 1; if (ncr5380_drq_intr()) return 1;
} }
#endif
return 0; return 0;
} }