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

make the LEDs work with both channels active, some cleanup and

Browse Source 
simplification
This commit is contained in:
drochner 2002-05-03 14:12:59 +00:00
parent dd51b8be28
commit 3c9ad6abb6
2 changed files with 37 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/dev/pci/isic_pci.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_pci.h,v 1.5 2002/04/19 10:55:46 drochner Exp $ */ /* $NetBSD: isic_pci.h,v 1.6 2002/05/03 14:12:59 drochner Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/ */
struct pci_isic_softc { struct pci_isic_softc {
struct isic_softc sc_isic; /* parent class */ struct isic_softc sc_isic; /* parent class, must be first */
/* PCI-specific goo */ /* PCI-specific goo */
void *sc_ih; /* interrupt handler */ void *sc_ih; /* interrupt handler */
@ -46,6 +46,11 @@ struct pci_isic_softc {
pci_chipset_tag_t sc_pc; pci_chipset_tag_t sc_pc;
int flags; int flags;
#define PCIISIC_LCROK 0x01 #define PCIISIC_LCROK 0x01
/* status LED handling */
struct callout ledcallout;
u_int8_t ledstat, ledblinkmask;
int ledblinkfreq;
}; };
extern void isic_attach_Eqs1pp __P((struct pci_isic_softc *psc, struct pci_attach_args *pa)); extern void isic_attach_Eqs1pp __P((struct pci_isic_softc *psc, struct pci_attach_args *pa));

80
sys/dev/pci/isic_pci_elsa_qs1p.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: isic_pci_elsa_qs1p.c,v 1.9 2002/04/19 10:55:46 drochner Exp $ */ /* $NetBSD: isic_pci_elsa_qs1p.c,v 1.10 2002/05/03 14:12:59 drochner Exp $ */
/* /*
* Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved. * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
@ -32,7 +32,7 @@
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.9 2002/04/19 10:55:46 drochner Exp $"); __KERNEL_RCSID(0, "$NetBSD: isic_pci_elsa_qs1p.c,v 1.10 2002/05/03 14:12:59 drochner Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -267,6 +267,7 @@ isic_attach_Eqs1pp(psc, pa)
IPAC_WRITE(IPAC_AOE, /* aux 5..2 are inputs, 7, 6 outputs */ IPAC_WRITE(IPAC_AOE, /* aux 5..2 are inputs, 7, 6 outputs */
(IPAC_AOE_OE5 | IPAC_AOE_OE4 | IPAC_AOE_OE3 | IPAC_AOE_OE2)); (IPAC_AOE_OE5 | IPAC_AOE_OE4 | IPAC_AOE_OE3 | IPAC_AOE_OE2));
IPAC_WRITE(IPAC_ATX, ELSA_NO_LED); /* set all output lines high */ IPAC_WRITE(IPAC_ATX, ELSA_NO_LED); /* set all output lines high */
callout_init(&((struct pci_isic_softc *)sc)->ledcallout);
/* disable any interrupts */ /* disable any interrupts */
IPAC_WRITE(IPAC_MASK, 0xff); IPAC_WRITE(IPAC_MASK, 0xff);
@ -298,8 +299,8 @@ isic_intr_qs1p(vsc)
static void static void
elsa_cmd_req(struct isic_softc *sc, int cmd, void *data) elsa_cmd_req(struct isic_softc *sc, int cmd, void *data)
{ {
int s, v, blink = 0; int s, v;
u_int8_t led_val; struct pci_isic_softc *psc = (struct pci_isic_softc *)sc;
switch (cmd) { switch (cmd) {
case CMR_DOPEN: case CMR_DOPEN:
@ -312,38 +313,36 @@ elsa_cmd_req(struct isic_softc *sc, int cmd, void *data)
break; break;
case CMR_DCLOSE: case CMR_DCLOSE:
s = splnet(); s = splnet();
callout_stop(&sc->sc_driver_callout); callout_stop(&psc->ledcallout);
IPAC_WRITE(IPAC_ATX, ELSA_NO_LED); IPAC_WRITE(IPAC_ATX, ELSA_NO_LED);
IPAC_WRITE(IPAC_MASK, 0xff); IPAC_WRITE(IPAC_MASK, 0xff);
bus_space_write_1(sc->sc_maps[0].t, sc->sc_maps[0].h, 0x4c, 0x01); bus_space_write_1(sc->sc_maps[0].t, sc->sc_maps[0].h, 0x4c, 0x01);
splx(s); splx(s);
break; break;
case CMR_SETLEDS: case CMR_SETLEDS:
v = (int)data;
callout_stop(&psc->ledcallout);
/* the magic value and keep reset off */ /* the magic value and keep reset off */
led_val = ELSA_NO_LED; psc->ledstat = ELSA_NO_LED;
psc->ledblinkmask = 0;
psc->ledblinkfreq = 0;
/* now see what LEDs we want to add */ /* now see what LEDs we want to add */
v = (int)data;
if (v & CMRLEDS_TEI) if (v & CMRLEDS_TEI)
led_val &= ~ELSA_GREEN_LED; psc->ledstat &= ~ELSA_GREEN_LED;
blink = 0;
if (v & (CMRLEDS_B0|CMRLEDS_B1)) { if (v & (CMRLEDS_B0|CMRLEDS_B1)) {
led_val &= ~ELSA_YELLOW_LED; psc->ledstat &= ~ELSA_YELLOW_LED;
if ((v & (CMRLEDS_B0|CMRLEDS_B1)) == (CMRLEDS_B0|CMRLEDS_B1)) psc->ledblinkmask |= ELSA_YELLOW_LED;
blink = hz/4; if ((v & (CMRLEDS_B0|CMRLEDS_B1))
== (CMRLEDS_B0|CMRLEDS_B1))
psc->ledblinkfreq = hz/4;
else else
blink = hz; psc->ledblinkfreq = hz;
sc->sc_driver_specific = v;
} }
s = splnet(); elsa_led_handler(psc);
IPAC_WRITE(IPAC_ATX, led_val);
callout_stop(&sc->sc_driver_callout);
if (blink)
callout_reset(&sc->sc_driver_callout, blink,
elsa_led_handler, sc);
splx(s);
break; break;
} }
} }
@ -351,35 +350,16 @@ elsa_cmd_req(struct isic_softc *sc, int cmd, void *data)
static void static void
elsa_led_handler(void *token) elsa_led_handler(void *token)
{ {
struct isic_softc *sc = token; struct pci_isic_softc *psc = token;
int v, s, blink, off = 0; struct isic_softc *sc = token; /* XXX */
u_int8_t led_val = ELSA_NO_LED; int s;
s = splnet(); s = splnet();
v = sc->sc_driver_specific; IPAC_WRITE(IPAC_ATX, psc->ledstat);
if (v > 0) {
/* turn blinking LED off */
v = -sc->sc_driver_specific;
sc->sc_driver_specific = v;
off = 1;
} else {
sc->sc_driver_specific = -v;
}
if (v & CMRLEDS_TEI)
led_val &= ~ELSA_GREEN_LED;
blink = 0;
if (off == 0) {
if (v & (CMRLEDS_B0|CMRLEDS_B1))
led_val &= ~ELSA_YELLOW_LED;
}
if ((v & (CMRLEDS_B0|CMRLEDS_B1)) == (CMRLEDS_B0|CMRLEDS_B1))
blink = hz/4;
else
blink = hz;
IPAC_WRITE(IPAC_ATX, led_val);
if (blink)
callout_reset(&sc->sc_driver_callout, blink,
elsa_led_handler, sc);
splx(s); splx(s);
if (psc->ledblinkfreq) {
psc->ledstat ^= psc->ledblinkmask;
callout_reset(&psc->ledcallout, psc->ledblinkfreq,
elsa_led_handler, psc);
}
} }