From 94f3432c06ca91afe16fb58f936cacdb8f1b06d4 Mon Sep 17 00:00:00 2001
From: jdc <jdc@NetBSD.org>
Date: Sun, 2 Jul 2006 10:14:15 +0000
Subject: [PATCH] PCI device list and interrupt mapping for JavaStation
 Espresso. Interrupt line values from Linux sparc sources.

---
 sys/arch/sparc/dev/ebus.c          |  9 +++++++--
 sys/arch/sparc/sparc/pci_machdep.c | 15 +++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/sys/arch/sparc/dev/ebus.c b/sys/arch/sparc/dev/ebus.c
index 1e1205b714b2..731dfc5bef75 100644
--- a/sys/arch/sparc/dev/ebus.c
+++ b/sys/arch/sparc/dev/ebus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ebus.c,v 1.24 2005/11/24 13:33:33 he Exp $ */
+/*	$NetBSD: ebus.c,v 1.25 2006/07/02 10:14:15 jdc Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.24 2005/11/24 13:33:33 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ebus.c,v 1.25 2006/07/02 10:14:15 jdc Exp $");
 
 #if defined(DEBUG) && !defined(EBUS_DEBUG)
 #define EBUS_DEBUG
@@ -149,6 +149,10 @@ static const struct msiiep_ebus_intr_wiring krups_ebus_intr_wiring[] = {
 	{ "su", 0 }, { "8042", 0 }, { "sound", 3 }
 };
 
+static const struct msiiep_ebus_intr_wiring espresso_ebus_intr_wiring[] = {
+	{ "su", 0 }, { "8042", 0 }, { "sound", 3 }, { "parallel", 4 }
+};
+
 
 struct msiiep_known_ebus_wiring {
 	const char *model;
@@ -161,6 +165,7 @@ struct msiiep_known_ebus_wiring {
 
 static const struct msiiep_known_ebus_wiring known_models[] = {
 	MSIIEP_MODEL_WIRING("SUNW,501-4267", krups_ebus_intr_wiring),
+	MSIIEP_MODEL_WIRING("SUNW,375-0059", espresso_ebus_intr_wiring),
 	{ NULL, NULL, 0}
 };
 
diff --git a/sys/arch/sparc/sparc/pci_machdep.c b/sys/arch/sparc/sparc/pci_machdep.c
index 7d5849fd6d06..1376fd20de2b 100644
--- a/sys/arch/sparc/sparc/pci_machdep.c
+++ b/sys/arch/sparc/sparc/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.c,v 1.12 2005/11/16 03:00:23 uwe Exp $ */
+/*	$NetBSD: pci_machdep.c,v 1.13 2006/07/02 10:14:15 jdc Exp $ */
 
 /*
  * Copyright (c) 1999, 2000 Matthew R. Green
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.12 2005/11/16 03:00:23 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.13 2006/07/02 10:14:15 jdc Exp $");
 
 #if defined(DEBUG) && !defined(SPARC_PCI_DEBUG)
 #define SPARC_PCI_DEBUG
@@ -114,6 +114,16 @@ static struct mspcic_pci_intr_wiring krups_pci_intr_wiring[] = {
 	{ 0, 1, 0,    2 },	/* vga */
 };
 
+static struct mspcic_pci_intr_wiring espresso_pci_intr_wiring[] = {
+	{ 0,  0, 1,    1 },	/* ethernet */
+	{ 0,  1, 0,    2 },	/* vga */
+	{ 0,  2, 0,    6 },	/* pci slot1 */
+	{ 0,  3, 0,    7 },	/* pci slot2 */
+	{ 0,  7, 0,    4 },	/* isa */
+	{ 0, 16, 0,    5 },	/* eide */
+/*	{ 0, 17, 0,    ? },	   power management */
+	{ 0, 20, 0,    4 },	/* usb */
+};
 
 struct mspcic_known_model {
 	const char *model;
@@ -126,6 +136,7 @@ struct mspcic_known_model {
 
 static struct mspcic_known_model mspcic_known_models[] = {
 	MSPCIC_MODEL_WIRING("SUNW,501-4267", krups_pci_intr_wiring),
+	MSPCIC_MODEL_WIRING("SUNW,375-0059", espresso_pci_intr_wiring),
 	{ NULL, NULL, 0}
 };