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

Remove leftover from my first, incomplete attempt to cope with detaching 

pcmcia cards. Now that pcmcia attachements properly handle the activate
callback, this is no longer needed (and is suspect to cause completely
unrelated problems.)
This commit is contained in:
martin 2002-04-06 21:46:51 +00:00
parent d410426604
commit 87b8f8f259
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ic/isac.c
View File

@ -27,14 +27,14 @@
* i4b_isac.c - i4b siemens isdn chipset driver ISAC handler
* ---------------------------------------------------------
*
* $Id: isac.c,v 1.8 2002/04/01 12:12:26 martin Exp $
* $Id: isac.c,v 1.9 2002/04/06 21:46:51 martin Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.8 2002/04/01 12:12:26 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: isac.c,v 1.9 2002/04/06 21:46:51 martin Exp $");
#ifdef __FreeBSD__
#include "opt_i4b.h"
@ -92,7 +92,7 @@ static void isic_isac_ind_hdlr(register struct isic_softc *sc, int ind);
/*---------------------------------------------------------------------------*
* ISAC interrupt service routine
*---------------------------------------------------------------------------*/
int
void
isic_isac_irq(struct isic_softc *sc, int ista)
{
register u_char c = 0;
@ -101,10 +101,6 @@ isic_isac_irq(struct isic_softc *sc, int ista)
if(ista & ISAC_ISTA_EXI) /* extended interrupt */
{
u_int8_t exirstat = ISAC_READ(I_EXIR);
if ((ista & ~ISAC_IMASK) && exirstat == 0xff) {
/* bogus - might be a detaching pcmcia card */
return (1);
}
c |= isic_isac_exir_hdlr(sc, exirstat);
}
@ -155,7 +151,7 @@ isic_isac_irq(struct isic_softc *sc, int ista)
ISAC_WRITE(I_CMDR, ISAC_CMDR_RMC|ISAC_CMDR_RRES);
ISACCMDRWRDELAY();
return (0);
return;
}
rest = (ISAC_READ(I_RBCL) & (ISAC_FIFO_LEN-1));
@ -325,8 +321,6 @@ isic_isac_irq(struct isic_softc *sc, int ista)
ISAC_WRITE(I_CMDR, c);
ISACCMDRWRDELAY();
}
return (0);
}
/*---------------------------------------------------------------------------*

11
sys/dev/ic/isic.c
View File

@ -27,14 +27,14 @@
* i4b_isic.c - global isic stuff
* ==============================
*
* $Id: isic.c,v 1.12 2002/04/01 12:14:27 martin Exp $
* $Id: isic.c,v 1.13 2002/04/06 21:46:51 martin Exp $
*
* last edit-date: [Fri Jan 5 11:36:10 2001]
*
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.12 2002/04/01 12:14:27 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: isic.c,v 1.13 2002/04/06 21:46:51 martin Exp $");
#include <sys/param.h>
#include <sys/ioccom.h>
@ -135,8 +135,8 @@ isicintr(void *arg)
if(isac_irq_stat)
{
if (isic_isac_irq(sc, isac_irq_stat)) /* isac handler */
break; /* bad IRQ */
/* isac handler */
isic_isac_irq(sc, isac_irq_stat);
was_isac_irq = 1;
}
}
@ -196,8 +196,7 @@ isicintr(void *arg)
if(ipac_irq_stat & IPAC_ISTA_EXD)
{
/* force ISAC interrupt handling */
if (isic_isac_irq(sc, ISAC_ISTA_EXI))
break; /* bad IRQ */
isic_isac_irq(sc, ISAC_ISTA_EXI);
was_ipac_irq = 1;
}

4
sys/dev/ic/isic_l1.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_l1.h,v 1.9 2002/03/30 19:13:44 martin Exp $ */
/* $NetBSD: isic_l1.h,v 1.10 2002/04/06 21:46:52 martin Exp $ */
/*
* Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
@ -343,7 +343,7 @@ extern void isic_hscx_cmd __P(( struct isic_softc *sc, int h_chan, unsigned char
extern void isic_hscx_waitxfw __P(( struct isic_softc *sc, int h_chan ));
extern void isic_init_linktab __P((struct isic_softc *sc));
extern int isic_isac_init __P((struct isic_softc *sc));
extern int isic_isac_irq __P((struct isic_softc *sc, int r));
extern void isic_isac_irq __P((struct isic_softc *sc, int r));
extern void isic_isac_l1_cmd __P((struct isic_softc *sc, int command));
extern void isic_next_state __P((struct isic_softc *sc, int event));
extern char * isic_printstate __P((struct isic_softc *sc));