From 7da411d63b546240c7e4cbd6d4f7d2a138b72f85 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 28 Jan 2002 23:53:08 +0000
Subject: [PATCH] Look for _PIR in addition to $PIR. My libretto L2 now works
 without any other kludges.

---
 sys/arch/i386/pci/pcibios.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c
index 17b1ef4820a8..e46ba64abfb2 100644
--- a/sys/arch/i386/pci/pcibios.c
+++ b/sys/arch/i386/pci/pcibios.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcibios.c,v 1.8 2002/01/22 15:07:27 uch Exp $	*/
+/*	$NetBSD: pcibios.c,v 1.9 2002/01/28 23:53:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.8 2002/01/22 15:07:27 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcibios.c,v 1.9 2002/01/28 23:53:08 christos Exp $");
 
 #include "opt_pcibios.h"
 
@@ -240,8 +240,14 @@ pcibios_pir_init()
 
 	for (pa = PCI_IRQ_TABLE_START; pa < PCI_IRQ_TABLE_END; pa += 16) {
 		p = (caddr_t)ISA_HOLE_VADDR(pa);
-		if (*(int *)p != BIOS32_MAKESIG('$', 'P', 'I', 'R'))
-			continue;
+		if (*(int *)p != BIOS32_MAKESIG('$', 'P', 'I', 'R')) {
+			/*
+			 * XXX: Some laptops (Toshiba/Libretto L series
+			 * use _PIR instead of $PIR. So we try that too.
+			 */
+			if (*(int *)p != BIOS32_MAKESIG('_', 'P', 'I', 'R'))
+				continue;
+		}
 		
 		rev_min = *(p + 4);
 		rev_maj = *(p + 5);