From f41cb4ecd23c951e1c1c4fef0c99772983a3eba4 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Mon, 30 Jun 2014 13:15:42 +0300 Subject: ROMCC: Fix collision with token name max MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Even with !defined(__ROMCC__) in the file, romcc chokes on these parameter names after we declare common max() macro in stdlib.h. Change-Id: Id4f2aa61d9c5b19f428452cd475b1b2ed9a70f52 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/6165 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Edward O'Callaghan --- src/include/device/device.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/include/device/device.h') diff --git a/src/include/device/device.h b/src/include/device/device.h index ced2786948..ec17adfc54 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -45,7 +45,7 @@ struct device_operations { void (*enable_resources)(device_t dev); void (*init)(device_t dev); void (*final)(device_t dev); - unsigned int (*scan_bus)(device_t bus, unsigned int max); + unsigned int (*scan_bus)(device_t bus, unsigned int _max); void (*enable)(device_t dev); void (*disable)(device_t dev); void (*set_link)(device_t dev, unsigned int link); @@ -58,6 +58,7 @@ struct device_operations { const struct pci_bus_operations * (*ops_pci_bus)(device_t dev); const struct pnp_mode_ops *ops_pnp_mode; }; + #endif /* ! __SIMPLE_DEVICE__ */ @@ -157,7 +158,7 @@ void dev_finalize_chips(void); /* Generic device helper functions */ int reset_bus(struct bus *bus); -unsigned int scan_bus(struct device *bus, unsigned int max); +unsigned int scan_bus(struct device *bus, unsigned int _max); void assign_resources(struct bus *bus); void enumerate_static_device(void); void enumerate_static_devices(void); @@ -211,8 +212,8 @@ void show_all_devs_resources(int debug_level, const char* msg); extern struct device_operations default_dev_ops_root; void pci_domain_read_resources(struct device *dev); -unsigned int pci_domain_scan_bus(struct device *dev, unsigned int max); -unsigned int scan_static_bus(device_t bus, unsigned int max); +unsigned int pci_domain_scan_bus(struct device *dev, unsigned int _max); +unsigned int scan_static_bus(device_t bus, unsigned int _max); void fixed_mem_resource(device_t dev, unsigned long index, unsigned long basek, unsigned long sizek, unsigned long type); -- cgit v1.2.3