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

More appropriate fix to the id_irq read during probe

Browse Source
This commit is contained in:
Nicolas Souchu 1999-02-14 22:02:47 +00:00
parent bd54ec1edf
commit 5174ad8b76
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/ppc/ppc.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ppc.c,v 1.18 1999/02/14 12:03:35 nsouch Exp $
* $Id: ppc.c,v 1.19 1999/02/14 17:09:59 nsouch Exp $
*
*/
#include "ppc.h"
@ -1724,8 +1724,8 @@ ppcprobe(struct isa_device *dvp)
/*
* XXX Try and detect if interrupts are working
*/
if (!(dvp->id_flags & 0x20))
ppc->ppc_irq = dvp->id_irq;
if (!(dvp->id_flags & 0x20) && dvp->id_irq)
ppc->ppc_irq = ffs(dvp->id_irq) - 1;
ppc->ppc_dmachan = dvp->id_drq;

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

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ppc.c,v 1.18 1999/02/14 12:03:35 nsouch Exp $
* $Id: ppc.c,v 1.19 1999/02/14 17:09:59 nsouch Exp $
*
*/
#include "ppc.h"
@ -1724,8 +1724,8 @@ ppcprobe(struct isa_device *dvp)
/*
* XXX Try and detect if interrupts are working
*/
if (!(dvp->id_flags & 0x20))
ppc->ppc_irq = dvp->id_irq;
if (!(dvp->id_flags & 0x20) && dvp->id_irq)
ppc->ppc_irq = ffs(dvp->id_irq) - 1;
ppc->ppc_dmachan = dvp->id_drq;

6
sys/isa/ppc.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ppc.c,v 1.18 1999/02/14 12:03:35 nsouch Exp $
* $Id: ppc.c,v 1.19 1999/02/14 17:09:59 nsouch Exp $
*
*/
#include "ppc.h"
@ -1724,8 +1724,8 @@ ppcprobe(struct isa_device *dvp)
/*
* XXX Try and detect if interrupts are working
*/
if (!(dvp->id_flags & 0x20))
ppc->ppc_irq = dvp->id_irq;
if (!(dvp->id_flags & 0x20) && dvp->id_irq)
ppc->ppc_irq = ffs(dvp->id_irq) - 1;
ppc->ppc_dmachan = dvp->id_drq;