Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7333
-gerrit
commit 7ceebd90f283a88b9f1d2b716f62584646ad71a3 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Wed Nov 5 11:07:57 2014 +1100
TESTing
Change-Id: Ieee4a1505bcbdff5b5f91a65cae21080d585867e Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/device/device.c | 14 +++++++------- src/lib/reg_script.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/device/device.c b/src/device/device.c index e068cee..5c5d4d9 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -114,9 +114,9 @@ uint64_t uma_memory_size = 0; * * @see device_path */ -static device_t __alloc_dev(struct bus *parent, struct device_path *path) +static struct device *__alloc_dev(struct bus *parent, struct device_path *path) { - device_t dev, child; + struct device *dev, child;
/* Find the last child of our parent. */ for (child = parent->children; child && child->sibling; /* */ ) @@ -148,9 +148,9 @@ static device_t __alloc_dev(struct bus *parent, struct device_path *path) return dev; }
-device_t alloc_dev(struct bus *parent, struct device_path *path) +struct device *alloc_dev(struct bus *parent, struct device_path *path) { - device_t dev; + struct device *dev; spin_lock(&dev_lock); dev = __alloc_dev(parent, path); spin_unlock(&dev_lock); @@ -164,9 +164,9 @@ device_t alloc_dev(struct bus *parent, struct device_path *path) * @param path The relative path from the bus to the appropriate device. * @return Pointer to a device structure for the device on bus at path. */ -device_t alloc_find_dev(struct bus *parent, struct device_path *path) +struct device *alloc_find_dev(struct bus *parent, struct device_path *path) { - device_t child; + struct device *child; spin_lock(&dev_lock); child = find_dev_path(parent, path); if (!child) @@ -750,7 +750,7 @@ static void avoid_fixed_resources(struct device *dev) } }
-device_t vga_pri = 0; +struct device *vga_pri = NULL; static void set_vga_bridge_bits(void) { /* diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c index 647723b..d8fe195 100644 --- a/src/lib/reg_script.c +++ b/src/lib/reg_script.c @@ -42,13 +42,13 @@ #endif
struct reg_script_context { - device_t dev; + struct device *dev; struct resource *res; const struct reg_script *step; };
static inline void reg_script_set_dev(struct reg_script_context *ctx, - device_t dev) + struct device *dev) { ctx->dev = dev; ctx->res = NULL; @@ -536,7 +536,7 @@ static void reg_script_run_next(struct reg_script_context *prev_ctx, reg_script_run_with_context(&ctx); }
-void reg_script_run_on_dev(device_t dev, const struct reg_script *step) +void reg_script_run_on_dev(struct device *dev, const struct reg_script *step) { struct reg_script_context ctx;