summaryrefslogtreecommitdiff
path: root/src/include/device
diff options
context:
space:
mode:
authorEric Biederman <ebiederm@xmission.com>2004-10-16 02:48:37 +0000
committerEric Biederman <ebiederm@xmission.com>2004-10-16 02:48:37 +0000
commit216525d1fd86c13e0f1ebe85ba518cdc1da06fcb (patch)
treecc46ef6602d791525f8eb6d7e9eb5eaf6f2a34cd /src/include/device
parent688af4be2b92350f0f62268a2ec9b874f2f4bf42 (diff)
- Fix config.g and the hdama config so everthing builds again.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1680 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/include/device')
-rw-r--r--src/include/device/device.h3
-rw-r--r--src/include/device/path.h24
2 files changed, 21 insertions, 6 deletions
diff --git a/src/include/device/device.h b/src/include/device/device.h
index 3e70f5d386..c5a18c298e 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -67,7 +67,8 @@ struct device {
unsigned long rom_address;
struct device_operations *ops;
- struct chip *chip;
+ struct chip_control *chip_control;
+ void *chip_info;
};
extern struct device dev_root; /* root bus */
diff --git a/src/include/device/path.h b/src/include/device/path.h
index cd6be6ac03..9df1d9fa67 100644
--- a/src/include/device/path.h
+++ b/src/include/device/path.h
@@ -9,11 +9,17 @@ enum device_path_type {
DEVICE_PATH_PNP,
DEVICE_PATH_I2C,
DEVICE_PATH_APIC,
+ DEVICE_PATH_PCI_DOMAIN,
+ DEVICE_APIC_CLUSTER,
+};
+
+struct pci_domain_path
+{
+ unsigned domain;
};
struct pci_path
{
- unsigned bus;
unsigned devfn;
};
@@ -33,13 +39,21 @@ struct apic_path
unsigned apic_id;
};
+struct apic_cluster_path
+{
+ unsigned cluster;
+};
+
+
struct device_path {
enum device_path_type type;
union {
- struct pci_path pci;
- struct pnp_path pnp;
- struct i2c_path i2c;
- struct apic_path apic;
+ struct pci_path pci;
+ struct pnp_path pnp;
+ struct i2c_path i2c;
+ struct apic_path apic;
+ struct pci_domain_path pci_domain;
+ struct apic_cluster_path apic_cluster;
} u;
};