mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-28 05:55:27 +01:00
More appropriate fix to the id_irq read during probe
This commit is contained in:
parent
bd54ec1edf
commit
5174ad8b76
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=44023
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user