From de3206a7bebce99f11e753164cc4d46357bba96a Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <stepan@coresystems.de>
Date: Mon, 22 Feb 2010 06:09:43 +0000
Subject: This is a general cleanup patch - drop include/part and move files to
 include/ - get rid lots of warnings - make resource allocator happy with
 w83627thg - trivial cbmem resume fix - fix payload and log level settings in
 abuild - fix kontron mptable for virtual wire mode - drop some dead includes
 and dead code.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5136 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/devices/hypertransport.c |  2 --
 src/devices/pci_device.c     |  2 --
 src/devices/pnp_device.c     | 20 +++++++++++++++++++-
 src/devices/root_device.c    |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'src/devices')

diff --git a/src/devices/hypertransport.c b/src/devices/hypertransport.c
index 8de20587a8..4bdf4ef8b8 100644
--- a/src/devices/hypertransport.c
+++ b/src/devices/hypertransport.c
@@ -34,8 +34,6 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/hypertransport.h>
-#include <part/hard_reset.h>
-#include <part/fallback_boot.h>
 
 /* The hypertransport link is already optimized in pre-ram code
  * so don't do it again
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index 10e6d23048..aeb03c7eee 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -32,8 +32,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include <part/hard_reset.h>
-#include <part/fallback_boot.h>
 #include <delay.h>
 #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT == 1
 #include <device/hypertransport.h>
diff --git a/src/devices/pnp_device.c b/src/devices/pnp_device.c
index 403fa6afe9..6181425673 100644
--- a/src/devices/pnp_device.c
+++ b/src/devices/pnp_device.c
@@ -240,7 +240,25 @@ static void get_resources(device_t dev, struct pnp_info *info)
 		resource = new_resource(dev, PNP_IDX_DRQ1);
 		resource->size = 1;
 		resource->flags |= IORESOURCE_DRQ;
-	}	
+	}
+	/* These are not IRQs, but set the flag to have the
+	 * resource allocator do the right thing
+	 */
+	if (info->flags & PNP_EN) {
+		resource = new_resource(dev, PNP_IDX_EN);
+		resource->size = 1;
+		resource->flags |= IORESOURCE_IRQ;
+	}
+	if (info->flags & PNP_MSC0) {
+		resource = new_resource(dev, PNP_IDX_MSC0);
+		resource->size = 1;
+		resource->flags |= IORESOURCE_IRQ;
+	}
+	if (info->flags & PNP_MSC1) {
+		resource = new_resource(dev, PNP_IDX_MSC1);
+		resource->size = 1;
+		resource->flags |= IORESOURCE_IRQ;
+	}
 } 
 
 void pnp_enable_devices(device_t base_dev, struct device_operations *ops, 
diff --git a/src/devices/root_device.c b/src/devices/root_device.c
index b8d56b646b..09582fccf2 100644
--- a/src/devices/root_device.c
+++ b/src/devices/root_device.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>
-#include <part/hard_reset.h>
+#include <reset.h>
 
 /** 
  * Read the resources for the root device,
-- 
cgit v1.2.3