d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix benign type mismatches in isa interrupt handlers. Many returned int

Browse Source 
instead of void.
This commit is contained in:
bde 1995-09-19 18:55:37 +00:00
parent 81e3ae42da
commit 7c1467b432
25 changed files with 99 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/amd64/amd64/fpu.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
* $Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $
* $Id: npx.c,v 1.23 1995/05/30 08:02:51 rgrimes Exp $
*/
#include "npx.h"
@ -434,10 +434,11 @@ npxexit(p)
* solution for signals other than SIGFPE.
*/
void
npxintr(frame)
struct intrframe frame;
npxintr(unit)
int unit;
{
int code;
struct intrframe *frame;
if (npxproc == NULL || !npx_exists) {
printf("npxintr: npxproc = %p, curproc = %p, npx_exists = %d\n",
@ -458,7 +459,8 @@ npxintr(frame)
/*
* Pass exception to process.
*/
if (ISPL(frame.if_cs) == SEL_UPL) {
frame = (struct intrframe *)&unit; /* XXX */
if (ISPL(frame->if_cs) == SEL_UPL) {
/*
* Interrupt is essentially a trap, so we can afford to call
* the SIGFPE handler (if any) as soon as the interrupt
@ -470,7 +472,7 @@ npxintr(frame)
* in doreti, and the frame for that could easily be set up
* just before it is used).
*/
curproc->p_md.md_regs = (int *)&frame.if_es;
curproc->p_md.md_regs = &frame->if_es;
#ifdef notyet
/*
* Encode the appropriate code for detailed information on

4
sys/amd64/include/fpu.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.7 1995/01/03 03:57:46 bde Exp $
* $Id: npx.h,v 1.8 1995/08/17 11:30:02 davidg Exp $
*/
/*
@ -143,7 +143,7 @@ struct proc;
int npxdna __P((void));
void npxexit __P((struct proc *p));
void npxinit __P((int control));
void npxintr __P((struct intrframe frame));
void npxintr __P((int unit));
void npxsave __P((struct save87 *addr));
#endif

4
sys/amd64/include/npx.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.7 1995/01/03 03:57:46 bde Exp $
* $Id: npx.h,v 1.8 1995/08/17 11:30:02 davidg Exp $
*/
/*
@ -143,7 +143,7 @@ struct proc;
int npxdna __P((void));
void npxexit __P((struct proc *p));
void npxinit __P((int control));
void npxintr __P((struct intrframe frame));
void npxintr __P((int unit));
void npxsave __P((struct save87 *addr));
#endif

12
sys/amd64/isa/npx.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
* $Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $
* $Id: npx.c,v 1.23 1995/05/30 08:02:51 rgrimes Exp $
*/
#include "npx.h"
@ -434,10 +434,11 @@ npxexit(p)
* solution for signals other than SIGFPE.
*/
void
npxintr(frame)
struct intrframe frame;
npxintr(unit)
int unit;
{
int code;
struct intrframe *frame;
if (npxproc == NULL || !npx_exists) {
printf("npxintr: npxproc = %p, curproc = %p, npx_exists = %d\n",
@ -458,7 +459,8 @@ npxintr(frame)
/*
* Pass exception to process.
*/
if (ISPL(frame.if_cs) == SEL_UPL) {
frame = (struct intrframe *)&unit; /* XXX */
if (ISPL(frame->if_cs) == SEL_UPL) {
/*
* Interrupt is essentially a trap, so we can afford to call
* the SIGFPE handler (if any) as soon as the interrupt
@ -470,7 +472,7 @@ npxintr(frame)
* in doreti, and the frame for that could easily be set up
* just before it is used).
*/
curproc->p_md.md_regs = (int *)&frame.if_es;
curproc->p_md.md_regs = &frame->if_es;
#ifdef notyet
/*
* Encode the appropriate code for detailed information on

6
sys/dev/ie/if_ie.c
View File

@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.24 1995/05/30 08:02:13 rgrimes Exp $
* $Id: if_ie.c,v 1.25 1995/08/16 16:12:32 bde Exp $
*/
/*
@ -617,7 +617,7 @@ ieattach(dvp)
/*
* What to do upon receipt of an interrupt.
*/
int ieintr(unit)
void ieintr(unit)
int unit;
{
register struct ie_softc *ie = &ie_softc[unit];
@ -682,8 +682,6 @@ int ieintr(unit)
/* Clear the interrupt latch on the 3C507. */
if (ie->hard_type == IE_3C507)
outb(PORT + IE507_ICTRL, 1);
return unit;
}
/*

8
sys/dev/scd/scd.c
View File

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.5 1995/05/30 08:03:02 rgrimes Exp $ */
/* $Id: scd.c,v 1.6 1995/09/08 11:07:55 bde Exp $ */
/* Please send any comments to micke@dynas.se */
@ -500,12 +500,6 @@ scdsize(dev_t dev)
return -1;
}
void
scdintr()
{
return;
}
/***************************************************************
* lower level of driver starts here
**************************************************************/

10
sys/gnu/i386/isa/nic3009.c
View File

@ -1,6 +1,6 @@
static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.6 1995/05/11 19:25:56 rgrimes Exp $";
static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.7 1995/09/08 11:06:47 bde Exp $";
/*******************************************************************************
* II - Version 0.1 $Revision: 1.6 $ $State: Exp $
* II - Version 0.1 $Revision: 1.7 $ $State: Exp $
*
* Copyright 1994 Dietmar Friede
*******************************************************************************
@ -10,6 +10,10 @@ static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.6 1995/05/11 19:25:56 rgrim
*
*******************************************************************************
* $Log: nic3009.c,v $
* Revision 1.7 1995/09/08 11:06:47 bde
* Fix benign type mismatches in devsw functions. 82 out of 299 devsw
* functions were wrong.
*
* Revision 1.6 1995/05/11 19:25:56 rgrimes
* Fix -Wformat warnings from LINT kernel.
*
@ -1234,7 +1238,7 @@ nnnicintr(void *gen)
dn_intr(unit,sc);
}
void
nnicintr(unsigned unit)
nnicintr(int unit)
{
timeout(nnnicintr, (void *)unit,1);
}

7
sys/i386/eisa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.35 1995/07/25 15:53:07 bde Exp $
* $Id: aha1742.c,v 1.36 1995/08/23 23:02:24 gibbs Exp $
*/
#include <sys/types.h>
@ -266,7 +266,7 @@ int ahbprobe();
int ahbprobe1 __P((struct isa_device *dev));
int ahb_attach();
int ahb_init __P((int unit));
int ahbintr();
inthand2_t ahbintr;
int32 ahb_scsi_cmd();
timeout_t ahb_timeout;
void ahb_done();
@ -581,7 +581,7 @@ ahb_adapter_info(unit)
/*
* Catch an interrupt from the adaptor
*/
int
void
ahbintr(unit)
int unit;
{
@ -662,7 +662,6 @@ ahbintr(unit)
ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
}
}
return 1;
}
/*

4
sys/i386/include/npx.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.h 5.3 (Berkeley) 1/18/91
* $Id: npx.h,v 1.7 1995/01/03 03:57:46 bde Exp $
* $Id: npx.h,v 1.8 1995/08/17 11:30:02 davidg Exp $
*/
/*
@ -143,7 +143,7 @@ struct proc;
int npxdna __P((void));
void npxexit __P((struct proc *p));
void npxinit __P((int control));
void npxintr __P((struct intrframe frame));
void npxintr __P((int unit));
void npxsave __P((struct save87 *addr));
#endif

9
sys/i386/isa/aha1542.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: aha1542.c,v 1.45 1995/05/30 08:01:05 rgrimes Exp $
* $Id: aha1542.c,v 1.46 1995/08/23 23:02:22 gibbs Exp $
*/
/*
@ -320,7 +320,7 @@ struct aha_ccb *aha_get_ccb();
int ahaprobe();
void aha_done();
int ahaattach();
int ahaintr();
inthand2_t ahaintr;
int32 aha_scsi_cmd();
timeout_t aha_timeout;
void ahaminphys();
@ -666,7 +666,7 @@ aha_adapter_info(unit)
/*
* Catch an interrupt from the adaptor
*/
int
void
ahaintr(unit)
int unit;
{
@ -684,7 +684,7 @@ ahaintr(unit)
stat = inb(AHA_INTR_PORT);
outb(AHA_CTRL_STAT_PORT, AHA_IRST);
if (!(stat & AHA_MBIF))
return 1;
return;
#ifdef AHADEBUG
printf("mbxin ");
#endif /*AHADEBUG */
@ -773,7 +773,6 @@ ahaintr(unit)
mbi->stat = AHA_MBI_FREE;
}
}
return 1;
}
/*

7
sys/i386/isa/aha1742.c
View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.35 1995/07/25 15:53:07 bde Exp $
* $Id: aha1742.c,v 1.36 1995/08/23 23:02:24 gibbs Exp $
*/
#include <sys/types.h>
@ -266,7 +266,7 @@ int ahbprobe();
int ahbprobe1 __P((struct isa_device *dev));
int ahb_attach();
int ahb_init __P((int unit));
int ahbintr();
inthand2_t ahbintr;
int32 ahb_scsi_cmd();
timeout_t ahb_timeout;
void ahb_done();
@ -581,7 +581,7 @@ ahb_adapter_info(unit)
/*
* Catch an interrupt from the adaptor
*/
int
void
ahbintr(unit)
int unit;
{
@ -662,7 +662,6 @@ ahbintr(unit)
ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
}
}
return 1;
}
/*

28
sys/i386/isa/aic6360.c
View File

@ -31,7 +31,7 @@
*/
/*
* $Id: aic6360.c,v 1.9 1995/05/30 08:01:12 rgrimes Exp $
* $Id: aic6360.c,v 1.10 1995/08/23 23:02:25 gibbs Exp $
*
* Acknowledgements: Many of the algorithms used in this driver are
* inspired by the work of Julian Elischer (julian@tfs.com) and
@ -683,7 +683,7 @@ void aicattach __P((struct device *, struct device *, void *));
void aic_minphys __P((struct buf *));
#ifdef __FreeBSD__
u_int32 aic_adapter_info __P((int));
int aicintr __P((int));
inthand2_t aicintr;
void aic_init __P((struct aic_data *));
int aic_find __P((struct aic_data *));
#else
@ -2203,10 +2203,12 @@ aic_datain(aic)
* 2) doesn't support synchronous transfers properly (yet)
*/
int
#ifdef __FreeBSD__
void
aicintr(int unit)
#else
#error /* the ifdefs for returning unused values were too much trouble */
int
aicintr(aic)
register struct aic_softc *aic;
#endif
@ -2245,7 +2247,7 @@ aicintr(aic)
aic_init(aic); /* Restart everything */
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
return 1;
return;
} else {
printf("aic: SCSI bus parity error\n");
outb(CLRSINT1, CLRSCSIPERR);
@ -2307,7 +2309,7 @@ aicintr(aic)
if (aic->phase & PH_PSBIT) {
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
return 1; /* Come back when REQ is set */
return; /* Come back when REQ is set */
}
if (aic->phase == PH_MSGI)
aic_msgin(aic); /* Handle identify message */
@ -2319,13 +2321,13 @@ aicintr(aic)
Debugger("aic6360");
fatal_if_no_DDB();
aic_init(aic);
return 1;
return;
}
if (aic->state != AIC_HASNEXUS) {/* IDENTIFY fail?! */
printf("aic at line %d: identify failed\n",
__LINE__);
aic_init(aic);
return 1;
return;
} else {
outb(SIMODE1,
ENSCSIRST|ENBUSFREE|ENSCSIPERR|ENREQINIT);
@ -2385,7 +2387,7 @@ aicintr(aic)
}
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
return 1;
return;
} else if (sstat1 & SELTO) {
/* Selection timed out. What to do:
* Disable selections out and fail the command with
@ -2406,7 +2408,7 @@ aicintr(aic)
aic_done(acb);
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
return 1;
return;
} else {
/* Assume a bus free interrupt. What to do:
* Start selecting.
@ -2419,7 +2421,7 @@ aicintr(aic)
#endif
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
return 1;
return;
}
}
/* Driver is now in state AIC_HASNEXUS, i.e. we have a current command
@ -2487,7 +2489,7 @@ aicintr(aic)
untimeout(aic_timeout, (caddr_t)acb);
aic_done(acb);
aic_init(aic);
return 1;
return;
}
outb(SXFRCTL0, CHEN); /* Clear SCSIEN & DMAEN */
outb(SIMODE0, 0);
@ -2505,7 +2507,7 @@ aicintr(aic)
untimeout(aic_timeout, (caddr_t)acb);
aic_done(acb);
aic_init(aic);
return 1;
return;
}
outb(SIMODE1, ENSCSIRST|ENBUSFREE|ENSCSIPERR|ENREQINIT);
/* Enabled ints: BUSFREE, SCSIPERR, SCSIRSTI (unexpected)
@ -2571,7 +2573,7 @@ aicintr(aic)
}
LOGLINE(aic);
outb(DMACNTRL0, INTEN);
return 1;
return;
}
void

13
sys/i386/isa/bt742a.c
View File

@ -12,7 +12,7 @@
* on the understanding that TFS is not responsible for the correct
* functioning of this software in any circumstances.
*
* $Id: bt742a.c,v 1.39 1995/07/25 16:06:06 bde Exp $
* $Id: bt742a.c,v 1.40 1995/08/23 23:02:27 gibbs Exp $
*/
/*
@ -394,7 +394,7 @@ int bt_debug = 0;
#ifdef KERNEL
int btprobe();
int btattach();
int btintr();
inthand2_t btintr;
int32 bt_scsi_cmd();
int bt_poll __P((int unit, struct scsi_xfer *xs, struct bt_ccb *ccb));
void bt_timeout(void *);
@ -737,7 +737,7 @@ bt_adapter_info(unit)
/*
* Catch an interrupt from the adaptor
*/
int
void
btintr(unit)
int unit;
{
@ -773,16 +773,16 @@ btintr(unit)
if (i == 0) {
printf("bt%d: bt_intr, cmd/data port full\n", unit);
outb(BT_CTRL_STAT_PORT, BT_SRST);
return 1;
return;
}
outb(BT_CMD_DATA_PORT, 0x00); /* Disable */
wakeup((caddr_t)&bt->bt_mbx);
outb(BT_CTRL_STAT_PORT, BT_IRST);
return 1;
return;
}
if (!(stat & BT_MBIF)) {
outb(BT_CTRL_STAT_PORT, BT_IRST);
return 1;
return;
}
/*
* If it IS then process the competed operation
@ -863,7 +863,6 @@ btintr(unit)
}
wmbx->tmbi = wmbi;
outb(BT_CTRL_STAT_PORT, BT_IRST);
return 1;
}
/*

6
sys/i386/isa/if_ie.c
View File

@ -43,7 +43,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.24 1995/05/30 08:02:13 rgrimes Exp $
* $Id: if_ie.c,v 1.25 1995/08/16 16:12:32 bde Exp $
*/
/*
@ -617,7 +617,7 @@ ieattach(dvp)
/*
* What to do upon receipt of an interrupt.
*/
int ieintr(unit)
void ieintr(unit)
int unit;
{
register struct ie_softc *ie = &ie_softc[unit];
@ -682,8 +682,6 @@ int ieintr(unit)
/* Clear the interrupt latch on the 3C507. */
if (ie->hard_type == IE_3C507)
outb(PORT + IE507_ICTRL, 1);
return unit;
}
/*

7
sys/i386/isa/if_ix.c
View File

@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ix.c,v 1.6 1995/05/10 15:19:25 rgrimes Exp $
* $Id: if_ix.c,v 1.7 1995/05/30 08:02:15 rgrimes Exp $
*/
#include "ix.h"
@ -148,7 +148,7 @@ int ixattach(struct isa_device *);
void ixinit(int);
void ixinit_rfa(int);
void ixinit_tfa(int);
int ixintr(int);
inthand2_t ixintr;
static inline void ixintr_cx(int);
static inline void ixintr_cx_free(int, cb_t *);
static inline void ixintr_fr(int);
@ -1045,7 +1045,7 @@ ixinit_tfa(int unit) {
DEBUGEND
}
int
void
ixintr(int unit) {
ix_softc_t *sc = &ix_softc[unit];
struct ifnet *ifp = &sc->arpcom.ac_if;
@ -1114,7 +1114,6 @@ ixintr(int unit) {
DEBUGBEGIN(DEBUGINTR)
DEBUGDO(printf(" ixintr exited\n");)
DEBUGEND
return(0 /* XXX Should be ??? */);
}
static inline void

7
sys/i386/isa/if_le.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.17 1995/05/30 08:02:22 rgrimes Exp $
* $Id: if_le.c,v 1.18 1995/07/29 13:00:17 paul Exp $
*/
/*
@ -245,7 +245,7 @@ struct le_softc {
static int le_probe(struct isa_device *dvp);
static int le_attach(struct isa_device *dvp);
static int le_ioctl(struct ifnet *ifp, int command, caddr_t data);
extern int le_intr(int unit);
extern inthand2_t le_intr;
static void le_input(le_softc_t *sc, caddr_t seg1, size_t total_len,
size_t len2, caddr_t seg2);
static void le_multi_filter(le_softc_t *sc);
@ -425,7 +425,7 @@ le_attach(
return 1;
}
int
void
le_intr(
int unit)
{
@ -435,7 +435,6 @@ le_intr(
(*le_intrvec[unit])(&le_softc[unit]);
splx(s);
return unit;
}
#define LE_XTRA 0

5
sys/i386/isa/ncr5380.c
View File

@ -215,7 +215,7 @@ adapter_t ncadata[NNCA];
if (cnt == -1 && msg)\
printf ("nca: %s timeout\n", msg); }
int ncaintr (int unit);
inthand2_t ncaintr;
static int nca_probe (struct isa_device *dev);
static int nca_attach (struct isa_device *dev);
static int32 nca_scsi_cmd (struct scsi_xfer *xs);
@ -539,7 +539,7 @@ void ncaminphys (struct buf *bp)
/*
* Catch an interrupt from the adaptor.
*/
int ncaintr (int unit)
void ncaintr (int unit)
{
adapter_t *z = &ncadata[unit];
@ -548,7 +548,6 @@ int ncaintr (int unit)
nca_start (z);
/* Reset interrupt state. */
inb (z->RPIR);
return (1);
}
/*

12
sys/i386/isa/npx.c
View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: @(#)npx.c 7.2 (Berkeley) 5/12/91
* $Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $
* $Id: npx.c,v 1.23 1995/05/30 08:02:51 rgrimes Exp $
*/
#include "npx.h"
@ -434,10 +434,11 @@ npxexit(p)
* solution for signals other than SIGFPE.
*/
void
npxintr(frame)
struct intrframe frame;
npxintr(unit)
int unit;
{
int code;
struct intrframe *frame;
if (npxproc == NULL || !npx_exists) {
printf("npxintr: npxproc = %p, curproc = %p, npx_exists = %d\n",
@ -458,7 +459,8 @@ npxintr(frame)
/*
* Pass exception to process.
*/
if (ISPL(frame.if_cs) == SEL_UPL) {
frame = (struct intrframe *)&unit; /* XXX */
if (ISPL(frame->if_cs) == SEL_UPL) {
/*
* Interrupt is essentially a trap, so we can afford to call
* the SIGFPE handler (if any) as soon as the interrupt
@ -470,7 +472,7 @@ npxintr(frame)
* in doreti, and the frame for that could easily be set up
* just before it is used).
*/
curproc->p_md.md_regs = (int *)&frame.if_es;
curproc->p_md.md_regs = &frame->if_es;
#ifdef notyet
/*
* Encode the appropriate code for detailed information on

20
sys/i386/isa/pcvt/pcvt_drv.c
View File

@ -848,8 +848,8 @@ static void pcvt_timeout (void *arg)
#endif
int
pcrint(void)
void
pcrint(int unit)
{
#if PCVT_KBD_FIFO
@ -871,10 +871,8 @@ pcrint(void)
#if PCVT_KBD_FIFO
if (kbd_polling)
{
if(sgetc(1) == 0)
return -1;
else
return 1;
sgetc(1);
return;
}
while (inb(CONTROLLER_CTRL) & STATUS_OUTPBF) /* check 8042 buffer */
@ -912,31 +910,29 @@ pcrint(void)
PCVT_ENABLE_INTR ();
}
}
return (ret);
#else /* !PCVT_KBD_FIFO */
if((cp = sgetc(1)) == 0)
return -1;
return;
if (kbd_polling)
return 1;
return;
if(!(vs[current_video_screen].openf)) /* XXX was vs[minor(dev)] */
return 1;
return;
#if PCVT_NULLCHARS
if(*cp == '\0')
{
/* pass a NULL character */
(*linesw[pcconsp->t_line].l_rint)('\0', pcconsp);
return 1;
return;
}
#endif /* PCVT_NULLCHARS */
while (*cp)
(*linesw[pcconsp->t_line].l_rint)(*cp++ & 0xff, pcconsp);
return 1;
#endif /* PCVT_KBD_FIFO */
}

2
sys/i386/isa/pcvt/pcvt_hdr.h
View File

@ -1211,7 +1211,7 @@ extern void bcopyb(void *from, void *to, u_int length);
extern void fillw(U_short value, void *addr, u_int length);
#endif
int pcrint ( void );
void pcrint ( int );
int pcparam ( struct tty *tp, struct termios *t );
/*

2
sys/i386/isa/pcvt/pcvt_kbd.c
View File

@ -194,7 +194,7 @@ check_for_lost_intr (void *arg)
if (inb(CONTROLLER_CTRL) & STATUS_OUTPBF)
{
int opri = spltty ();
(void) pcrint ();
pcrint ();
splx (opri);
}
}

8
sys/i386/isa/scd.c
View File

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.5 1995/05/30 08:03:02 rgrimes Exp $ */
/* $Id: scd.c,v 1.6 1995/09/08 11:07:55 bde Exp $ */
/* Please send any comments to micke@dynas.se */
@ -500,12 +500,6 @@ scdsize(dev_t dev)
return -1;
}
void
scdintr()
{
return;
}
/***************************************************************
* lower level of driver starts here
**************************************************************/

7
sys/i386/isa/seagate.c
View File

@ -60,7 +60,7 @@
* that category, with the possible exception of scanners and
* some of the older MO drives.
*
* $Id: seagate.c,v 1.9 1995/07/13 15:01:38 jkh Exp $
* $Id: seagate.c,v 1.10 1995/08/23 23:02:30 gibbs Exp $
*/
/*
@ -330,7 +330,7 @@ adapter_t seadata[NSEA];
(t)->ndelay.op = 1;\
(t)->init.op = 1; }
int seaintr (int unit);
inthand2_t seaintr;
static int sea_probe (struct isa_device *dev);
static int sea_detect (adapter_t *z, struct isa_device *dev);
static int sea_attach (struct isa_device *dev);
@ -591,13 +591,12 @@ void seaminphys (struct buf *bp)
/*
* Catch an interrupt from the adaptor.
*/
int seaintr (int unit)
void seaintr (int unit)
{
adapter_t *z = &seadata[unit];
PRINT (("sea%d: interrupt status=%b\n", unit, *z->STATUS, STAT_BITS));
sea_start (z);
return (1);
}
/*

9
sys/i386/isa/ultra14f.c
View File

@ -22,7 +22,7 @@
* today: Fri Jun 2 17:21:03 EST 1994
* added 24F support ++sg
*
* $Id: ultra14f.c,v 1.35 1995/08/23 23:02:32 gibbs Exp $
* $Id: ultra14f.c,v 1.36 1995/08/25 20:39:01 bde Exp $
*/
#include <sys/types.h>
@ -264,7 +264,7 @@ struct uha_data {
int uhaprobe();
int uha_attach();
int uhaintr();
inthand2_t uhaintr;
int32 uha_scsi_cmd();
timeout_t uha_timeout;
void uha_free_mscp();
@ -585,7 +585,7 @@ uha_adapter_info(unit)
/*
* Catch an interrupt from the adaptor
*/
int
void
uhaintr(unit)
int unit;
{
@ -621,13 +621,12 @@ uhaintr(unit)
mscp = uha_mscp_phys_kv(uha, mboxval);
if (!mscp) {
printf("uha: BAD MSCP RETURNED\n");
return (0); /* whatever it was, it'll timeout */
return; /* whatever it was, it'll timeout */
}
untimeout(uha_timeout, (caddr_t)mscp);
uha_done(unit, mscp);
}
return (1);
}
/*

7
sys/i386/isa/wd7000.c
View File

@ -228,7 +228,7 @@ void wds_minphys(struct buf *);
struct wds_req *wdsr_alloc(int);
int32 wds_scsi_cmd(struct scsi_xfer *);
u_int32 wds_adapter_info(int);
int wdsintr(int);
inthand2_t wdsintr;
int wds_done(int, struct wds_cmd *, u_char);
int wdsattach(struct isa_device *);
int wds_init(struct isa_device *);
@ -445,7 +445,7 @@ wds_adapter_info(int unit)
return 1;
}
int
void
wdsintr(int unit)
{
struct wds_cmd *pc, *vc;
@ -456,7 +456,7 @@ wdsintr(int unit)
if(!inb(wds[unit].addr+WDS_STAT) & WDS_IRQ)
{
outb(wds[unit].addr + WDS_IRQACK, 0);
return 1;
return;
}
c = inb(wds[unit].addr + WDS_IRQSTAT);
@ -474,7 +474,6 @@ wdsintr(int unit)
outb(wds[unit].addr + WDS_IRQACK, 0);
}
return 1;
}
int