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

Fixed IOMD identification during device probing.

This commit is contained in:
mark 1996-03-06 23:26:20 +00:00
parent bdb7e8955c
commit e766702f7e
4 changed files with 44 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/arch/arm32/dev/qms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qms.c,v 1.1 1996/01/31 23:25:03 mark Exp $ */
/* $NetBSD: qms.c,v 1.2 1996/03/06 23:26:23 mark Exp $ */
/*
* Copyright (c) Scott Stevens 1995 All rights reserved
@ -29,8 +29,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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: qms.c,v 1.1 1996/01/31 23:25:03 mark Exp $
*/
/*
@ -108,12 +106,18 @@ quadmouseprobe(parent, match, aux)
/* Make sure we have an IOMD we understand */
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) >> 8);
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) << 8);
/* So far I only know about this IOMD */
if (id == RPC600_IOMD_ID)
switch (id) {
case RPC600_IOMD_ID:
return(1);
break;
default:
printf("quadmouse: Unknown IOMD id=%04x", id);
break;
}
return(0);
}
@ -195,8 +199,8 @@ quadmouseopen(dev, flag, mode, p)
WriteByte(IOMD_T1HIGH, (TIMER1_COUNT >> 8) & 0xff);
WriteByte(IOMD_T1GO, 0);
if (irq_claim(IRQ_TIMER1, &sc->sc_ih) == -1)
panic("Cannot claim VSYNC IRQ\n");
if (irq_claim(IRQ_TIMER1, &sc->sc_ih))
panic("Cannot claim TIMER1 IRQ for quadmouse%d\n", sc->sc_device.dv_unit);
return(0);
}

19
sys/arch/arm32/mainbus/beep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: beep.c,v 1.1 1996/01/31 23:24:19 mark Exp $ */
/* $NetBSD: beep.c,v 1.2 1996/03/06 23:26:20 mark Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@ -27,8 +27,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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: beep.c,v 1.1 1996/01/31 23:24:19 mark Exp $
*/
/*
@ -104,13 +102,18 @@ beepprobe(parent, match, aux)
/* Make sure we have an IOMD we understand */
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) >> 8);
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) << 8);
/* So far I only know about this IOMD */
if (id == RPC600_IOMD_ID)
switch (id) {
case RPC600_IOMD_ID:
return(1);
break;
default:
printf("beep: Unknown IOMD id=%04x", id);
break;
}
return(0);
}
@ -159,8 +162,8 @@ beepattach(parent, self, aux)
sc->sc_ih.ih_arg = sc;
sc->sc_ih.ih_level = IPL_NONE;
if (irq_claim(IRQ_DMASCH0, &sc->sc_ih) == -1)
panic("Cannot claim DMASCH0 IRQ\n");
if (irq_claim(IRQ_DMASCH0, &sc->sc_ih))
panic("Cannot claim DMASCH0 IRQ for beep%d\n", parent->dv_unit);
disable_irq(IRQ_DMASCH0);

18
sys/arch/arm32/mainbus/qmouse.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qmouse.c,v 1.1 1996/01/31 23:25:03 mark Exp $ */
/* $NetBSD: qmouse.c,v 1.2 1996/03/06 23:26:23 mark Exp $ */
/*
* Copyright (c) Scott Stevens 1995 All rights reserved
@ -29,8 +29,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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: qmouse.c,v 1.1 1996/01/31 23:25:03 mark Exp $
*/
/*
@ -108,12 +106,18 @@ quadmouseprobe(parent, match, aux)
/* Make sure we have an IOMD we understand */
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) >> 8);
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) << 8);
/* So far I only know about this IOMD */
if (id == RPC600_IOMD_ID)
switch (id) {
case RPC600_IOMD_ID:
return(1);
break;
default:
printf("quadmouse: Unknown IOMD id=%04x", id);
break;
}
return(0);
}
@ -195,8 +199,8 @@ quadmouseopen(dev, flag, mode, p)
WriteByte(IOMD_T1HIGH, (TIMER1_COUNT >> 8) & 0xff);
WriteByte(IOMD_T1GO, 0);
if (irq_claim(IRQ_TIMER1, &sc->sc_ih) == -1)
panic("Cannot claim VSYNC IRQ\n");
if (irq_claim(IRQ_TIMER1, &sc->sc_ih))
panic("Cannot claim TIMER1 IRQ for quadmouse%d\n", sc->sc_device.dv_unit);
return(0);
}

19
sys/arch/arm32/vidc/beep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: beep.c,v 1.1 1996/01/31 23:24:19 mark Exp $ */
/* $NetBSD: beep.c,v 1.2 1996/03/06 23:26:20 mark Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe
@ -27,8 +27,6 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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: beep.c,v 1.1 1996/01/31 23:24:19 mark Exp $
*/
/*
@ -104,13 +102,18 @@ beepprobe(parent, match, aux)
/* Make sure we have an IOMD we understand */
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) >> 8);
id = ReadByte(IOMD_ID0) | (ReadByte(IOMD_ID1) << 8);
/* So far I only know about this IOMD */
if (id == RPC600_IOMD_ID)
switch (id) {
case RPC600_IOMD_ID:
return(1);
break;
default:
printf("beep: Unknown IOMD id=%04x", id);
break;
}
return(0);
}
@ -159,8 +162,8 @@ beepattach(parent, self, aux)
sc->sc_ih.ih_arg = sc;
sc->sc_ih.ih_level = IPL_NONE;
if (irq_claim(IRQ_DMASCH0, &sc->sc_ih) == -1)
panic("Cannot claim DMASCH0 IRQ\n");
if (irq_claim(IRQ_DMASCH0, &sc->sc_ih))
panic("Cannot claim DMASCH0 IRQ for beep%d\n", parent->dv_unit);
disable_irq(IRQ_DMASCH0);