diff options
| -rw-r--r-- | src/arch/x86/mpspec.c | 8 | ||||
| -rw-r--r-- | src/device/device.c | 22 | ||||
| -rw-r--r-- | src/device/device_util.c | 8 | ||||
| -rw-r--r-- | src/include/device/device.h | 6 |
4 files changed, 22 insertions, 22 deletions
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c index 05605adf2e..7541eeb493 100644 --- a/src/arch/x86/mpspec.c +++ b/src/arch/x86/mpspec.c @@ -529,12 +529,12 @@ unsigned long __weak write_smp_table(unsigned long addr) struct drivers_generic_ioapic_config *ioapic_config; struct mp_config_table *mc; int isa_bus, pin, parentpin; - struct device *dev; - struct device *parent; - struct device *oldparent; + const struct device *dev; + const struct device *parent; + const struct device *oldparent; void *tmp, *v; int isaioapic = -1, have_fixed_entries; - struct pci_irq_info *pci_irq_info; + const struct pci_irq_info *pci_irq_info; v = smp_write_floating_table(addr, 0); mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); diff --git a/src/device/device.c b/src/device/device.c index 4c6b6f94a9..b896f5e683 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -66,7 +66,7 @@ struct resource *free_resources = NULL; */ void dev_initialize_chips(void) { - struct device *dev; + const struct device *dev; for (dev = all_devices; dev; dev = dev->next) { /* Initialize chip if we haven't yet. */ @@ -88,7 +88,7 @@ void dev_initialize_chips(void) */ void dev_finalize_chips(void) { - struct device *dev; + const struct device *dev; for (dev = all_devices; dev; dev = dev->next) { /* Initialize chip if we haven't yet. */ @@ -247,7 +247,7 @@ static void read_resources(struct bus *bus) struct pick_largest_state { struct resource *last; - struct device *result_dev; + const struct device *result_dev; struct resource *result; int seen_last; }; @@ -283,7 +283,7 @@ static void pick_largest_resource(void *gp, struct device *dev, } } -static struct device *largest_resource(struct bus *bus, +static const struct device *largest_resource(struct bus *bus, struct resource **result_res, unsigned long type_mask, unsigned long type) @@ -338,7 +338,7 @@ static struct device *largest_resource(struct bus *bus, static void compute_resources(struct bus *bus, struct resource *bridge, unsigned long type_mask, unsigned long type) { - struct device *dev; + const struct device *dev; struct resource *resource; resource_t base; base = round(bridge->base, bridge->align); @@ -482,7 +482,7 @@ static void compute_resources(struct bus *bus, struct resource *bridge, static void allocate_resources(struct bus *bus, struct resource *bridge, unsigned long type_mask, unsigned long type) { - struct device *dev; + const struct device *dev; struct resource *resource; resource_t base; base = bridge->base; @@ -640,9 +640,9 @@ static struct resource * resource_limit(struct constraints *limits, struct resou return lim; } -static void constrain_resources(struct device *dev, struct constraints* limits) +static void constrain_resources(const struct device *dev, struct constraints* limits) { - struct device *child; + const struct device *child; struct resource *res; struct resource *lim; struct bus *link; @@ -696,7 +696,7 @@ static void constrain_resources(struct device *dev, struct constraints* limits) } } -static void avoid_fixed_resources(struct device *dev) +static void avoid_fixed_resources(const struct device *dev) { struct constraints limits; struct resource *res; @@ -1019,8 +1019,8 @@ void dev_enumerate(void) void dev_configure(void) { struct resource *res; - struct device *root; - struct device *child; + const struct device *root; + const struct device *child; set_vga_bridge_bits(); diff --git a/src/device/device_util.c b/src/device/device_util.c index 6bc2730143..3d7f5a154a 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -269,7 +269,7 @@ u32 dev_path_encode(struct device *dev) * Warning: This function uses a static buffer. Don't call it more than once * from the same print statement! */ -const char *dev_path(struct device *dev) +const char *dev_path(const struct device *dev) { static char buffer[DEVICE_PATH_MAX]; @@ -814,7 +814,7 @@ bool dev_is_active_bridge(struct device *dev) return 0; } -static void resource_tree(struct device *root, int debug_level, int depth) +static void resource_tree(const struct device *root, int debug_level, int depth) { int i = 0; struct device *child; @@ -846,7 +846,7 @@ static void resource_tree(struct device *root, int debug_level, int depth) } } -void print_resource_tree(struct device *root, int debug_level, const char *msg) +void print_resource_tree(const struct device *root, int debug_level, const char *msg) { /* Bail if root is null. */ if (!root) { @@ -862,7 +862,7 @@ void print_resource_tree(struct device *root, int debug_level, const char *msg) resource_tree(root, debug_level, 0); } -void show_devs_tree(struct device *dev, int debug_level, int depth) +void show_devs_tree(const struct device *dev, int debug_level, int depth) { char depth_str[20]; int i; diff --git a/src/include/device/device.h b/src/include/device/device.h index acead58f8a..48a5bcc221 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -184,7 +184,7 @@ int reset_bus(struct bus *bus); void scan_bridges(struct bus *bus); void assign_resources(struct bus *bus); const char *dev_name(struct device *dev); -const char *dev_path(struct device *dev); +const char *dev_path(const struct device *dev); u32 dev_path_encode(struct device *dev); const char *bus_path(struct bus *bus); void dev_set_enabled(struct device *dev, int enable); @@ -216,9 +216,9 @@ void set_cpu_topology(struct device *cpu, unsigned int node, set_cpu_topology(cpu, 0, package, core, thread) /* Debug functions */ -void print_resource_tree(struct device *root, int debug_level, +void print_resource_tree(const struct device *root, int debug_level, const char *msg); -void show_devs_tree(struct device *dev, int debug_level, int depth); +void show_devs_tree(const struct device *dev, int debug_level, int depth); void show_devs_subtree(struct device *root, int debug_level, const char *msg); void show_all_devs(int debug_level, const char *msg); void show_all_devs_tree(int debug_level, const char *msg); |