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

Probe functions rewritten to support new podulebus configuration code. 

matchpodule() is now used to test podule_attach_args for correct id's.
Fixed compiler warnings generated with -Wall.
This commit is contained in:
mark 1996-04-26 22:38:11 +00:00
parent 4a3ceede5a
commit 9a12d19953
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/arch/arm32/podulebus/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.5 1996/04/19 20:13:56 mark Exp $ */
/* $NetBSD: asc.c,v 1.6 1996/04/26 22:38:11 mark Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@ -114,15 +114,11 @@ ascmatch(pdp, match, auxp)
void *match, *auxp;
{
struct podule_attach_args *pa = (struct podule_attach_args *)auxp;
int podule;
podule = findpodule(0x00, 0x02, pa->pa_podule_number);
/* Look for the card */
if (podule == -1)
return(0);
pa->pa_podule_number = podule;
pa->pa_podule = &podules[podule];
if (matchpodule(pa, 0x00, 0x02, -1) == 0)
return(0);
return(1);
}
@ -132,19 +128,19 @@ ascattach(pdp, dp, auxp)
struct device *pdp, *dp;
void *auxp;
{
volatile struct sdmac *rp;
/* volatile struct sdmac *rp;*/
struct asc_softc *sc;
struct sbic_softc *sbic;
struct podule_attach_args *pa;
sc = (struct asc_softc *)dp;
pa = (struct podule_attach_args *)auxp;
sc->sc_podule_number = pa->pa_podule_number;
if (sc->sc_podule_number == -1)
if (pa->pa_podule_number == -1)
panic("Podule has disappeared !");
sc->sc_podule = &podules[sc->sc_podule_number];
sc->sc_podule_number = pa->pa_podule_number;
sc->sc_podule = pa->pa_podule;
podules[sc->sc_podule_number].attached = 1;
#if ASC_POLL > 0
@ -282,6 +278,7 @@ asc_dmago(dev, addr, count, flags)
return(dev->sc_tcnt);
#endif
return(0);
}
void
@ -362,6 +359,7 @@ asc_dmaintr(dev)
found += sbicintr(dev);
return(found);
#endif
return(0);
}
@ -408,6 +406,7 @@ asc_dmanext(dev)
dev->sc_tcnt = dev->sc_cur->dc_count << 1;
return(dev->sc_tcnt);
#endif
return(0);
}
void
@ -424,7 +423,7 @@ int
asc_scsicmd(xs)
struct scsi_xfer *xs;
{
struct scsi_link *sc_link = xs->sc_link;
/* struct scsi_link *sc_link = xs->sc_link;*/
/* ensure command is polling for the moment */
#if ASC_POLL > 0
@ -448,7 +447,7 @@ asc_intr(sc)
/* printf("ascintr:");*/
intr = ReadByte(sc->sc_intstat);
/* printf("%02x\n", intr);*/
/* printf("%02x\n", intr);*/
if (intr & IS_SBIC_IRQ)
sbicintr((struct sbic_softc *)sc);

24
sys/arch/arm32/podulebus/oak.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: oak.c,v 1.3 1996/03/17 01:24:51 thorpej Exp $ */
/* $NetBSD: oak.c,v 1.4 1996/04/26 22:38:15 mark Exp $ */
/*
* Copyright (c) 1995 Melvin Tang-Richardson 1996.
@ -80,7 +80,8 @@
struct oak_softc {
struct ncr5380_softc ncr_sc;
int sc_podule;
int sc_podule_number;
podule_t *sc_podule;
int sc_base;
};
@ -118,17 +119,12 @@ oakprobe(parent, match, aux)
void *match;
void *aux;
{
struct oak_softc *sc = (void *) match;
struct podule_attach_args *pa = (void *) aux;
int podule;
podule = findpodule(MY_MANUFACTURER, MY_PODULE, pa->pa_podule_number);
/* Look for the card */
if (podule == -1)
return 0;
sc->sc_podule = podule;
sc->sc_base = podules[podule].mod_base;
if (matchpodule(pa, MY_MANUFACTURER, MY_PODULE, -1) == 0)
return(0);
return 1;
}
@ -143,6 +139,14 @@ oakattach(parent, self, aux)
struct ncr5380_softc *ncr_sc = (struct ncr5380_softc *)sc;
struct podule_attach_args *pa = (void *)aux;
if (pa->pa_podule_number == -1)
panic("Podule has disappeared !");
sc->sc_podule_number = pa->pa_podule_number;
sc->sc_podule = pa->pa_podule;
podules[sc->sc_podule_number].attached = 1;
sc->sc_base = sc->sc_podule->mod_base;
printf(" 16-bit");
ncr_sc->sc_link.adapter_softc = sc;

21
sys/arch/arm32/podulebus/ptsc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptsc.c,v 1.2 1996/03/17 01:24:54 thorpej Exp $ */
/* $NetBSD: ptsc.c,v 1.3 1996/04/26 22:38:18 mark Exp $ */
/*
* Copyright (c) 1995 Scott Stevens
@ -103,15 +103,11 @@ ptscmatch(pdp, match, auxp)
void *match, *auxp;
{
struct podule_attach_args *pa = (struct podule_attach_args *)auxp;
int podule;
podule = findpodule(0x5b, 0x107, pa->pa_podule_number);
/* Look for the card */
if (podule == -1)
return(0);
pa->pa_podule_number = podule;
pa->pa_podule = &podules[podule];
if (matchpodule(pa, 0x5b, 0x107, -1) == 0)
return(0);
return(1);
}
@ -128,11 +124,12 @@ ptscattach(pdp, dp, auxp)
vu_char *fas;
pa = (struct podule_attach_args *)auxp;
sc->sc_specific.sc_podule_number = pa->pa_podule_number;
if (sc->sc_specific.sc_podule_number == -1)
panic("Podule has disappeared !");
sc->sc_specific.sc_podule = &podules[sc->sc_specific.sc_podule_number];
if (pa->pa_podule_number == -1)
panic("Podule has disappeared !");
sc->sc_specific.sc_podule_number = pa->pa_podule_number;
sc->sc_specific.sc_podule = pa->pa_podule;
sc->sc_specific.sc_iobase =
(vu_char *)sc->sc_specific.sc_podule->fast_base;