[src/trunk]: src/sys/arch/hp700/dev Simplify and improve dino_intr_map by che...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/44b58eb63bcf
branches:  trunk
changeset: 749780:44b58eb63bcf
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Dec 08 06:56:54 2009 +0000

description:
Simplify and improve dino_intr_map by checking for 0xff as error value.

Inspired by OpenBSD.

diffstat:

 sys/arch/hp700/dev/dino.c |  17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diffs (39 lines):

diff -r 39077fcfd0e7 -r 44b58eb63bcf sys/arch/hp700/dev/dino.c
--- a/sys/arch/hp700/dev/dino.c Tue Dec 08 02:56:37 2009 +0000
+++ b/sys/arch/hp700/dev/dino.c Tue Dec 08 06:56:54 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.18 2009/12/03 22:18:04 skrll Exp $ */
+/*     $NetBSD: dino.c,v 1.19 2009/12/08 06:56:54 skrll Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.18 2009/12/03 22:18:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.19 2009/12/08 06:56:54 skrll Exp $");
 
 /* #include "cardbus.h" */
 
@@ -372,13 +372,14 @@
 int
 dino_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp)
 {
-       pci_chipset_tag_t pc = pa->pa_pc;
-       pcitag_t tag = pa->pa_tag;
-       pcireg_t reg;
+       int line = pa->pa_intrline;
 
-       reg = pci_conf_read(pc, tag, PCI_INTERRUPT_REG);
-       *ihp = PCI_INTERRUPT_LINE(reg);
-       return *ihp < 0;
+       if (line == 0xff)
+               return 1;
+
+       *ihp = line;
+
+       return 0;
 }
 
 const char *