From 255fe1b6182d45e946b1e03bf33c302904932b72 Mon Sep 17 00:00:00 2001
From: nsouch <nsouch@FreeBSD.org>
Date: Sun, 14 Feb 1999 17:09:59 +0000
Subject: [PATCH] The way the interrupt id was calculated was wrong and the lpt
 driver was thinking irq was enabled although it wasn't. This case was
 particular to a no-interrupt static configuration.

Reported by: "Norman C. Rice" <nrice@emu.sourcee.com>
---
 sys/dev/ppc/ppc.c  | 4 ++--
 sys/i386/isa/ppc.c | 4 ++--
 sys/isa/ppc.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/ppc/ppc.c b/sys/dev/ppc/ppc.c
index 59f55ca4cfba..ec85acca6d44 100644
--- a/sys/dev/ppc/ppc.c
+++ b/sys/dev/ppc/ppc.c
@@ -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.17 1999/01/31 11:52:04 nsouch Exp $
+ *	$Id: ppc.c,v 1.18 1999/02/14 12:03:35 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -1725,7 +1725,7 @@ ppcprobe(struct isa_device *dvp)
 	 * XXX Try and detect if interrupts are working
 	 */
 	if (!(dvp->id_flags & 0x20))
-		ppc->ppc_irq = ffs(dvp->id_irq) - 1;
+		ppc->ppc_irq = dvp->id_irq;
 
 	ppc->ppc_dmachan = dvp->id_drq;
 
diff --git a/sys/i386/isa/ppc.c b/sys/i386/isa/ppc.c
index 59f55ca4cfba..ec85acca6d44 100644
--- a/sys/i386/isa/ppc.c
+++ b/sys/i386/isa/ppc.c
@@ -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.17 1999/01/31 11:52:04 nsouch Exp $
+ *	$Id: ppc.c,v 1.18 1999/02/14 12:03:35 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -1725,7 +1725,7 @@ ppcprobe(struct isa_device *dvp)
 	 * XXX Try and detect if interrupts are working
 	 */
 	if (!(dvp->id_flags & 0x20))
-		ppc->ppc_irq = ffs(dvp->id_irq) - 1;
+		ppc->ppc_irq = dvp->id_irq;
 
 	ppc->ppc_dmachan = dvp->id_drq;
 
diff --git a/sys/isa/ppc.c b/sys/isa/ppc.c
index 59f55ca4cfba..ec85acca6d44 100644
--- a/sys/isa/ppc.c
+++ b/sys/isa/ppc.c
@@ -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.17 1999/01/31 11:52:04 nsouch Exp $
+ *	$Id: ppc.c,v 1.18 1999/02/14 12:03:35 nsouch Exp $
  *
  */
 #include "ppc.h"
@@ -1725,7 +1725,7 @@ ppcprobe(struct isa_device *dvp)
 	 * XXX Try and detect if interrupts are working
 	 */
 	if (!(dvp->id_flags & 0x20))
-		ppc->ppc_irq = ffs(dvp->id_irq) - 1;
+		ppc->ppc_irq = dvp->id_irq;
 
 	ppc->ppc_dmachan = dvp->id_drq;