From ad0f4853619b1c239b8ace7554958c6b4932c04f Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Wed, 23 Oct 2019 21:41:43 -0600 Subject: src/mainboard: change "unsigned" to "unsigned int" Signed-off-by: Martin Roth Change-Id: I46d131f76ec930d2ef0f74e6eaabae067df10754 Reviewed-on: https://review.coreboot.org/c/coreboot/+/36330 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph --- src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c | 2 +- src/mainboard/supermicro/h8dmr_fam10/irq_tables.c | 8 ++++---- src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h | 2 +- src/mainboard/supermicro/h8dmr_fam10/mptable.c | 2 +- src/mainboard/supermicro/h8dmr_fam10/romstage.c | 2 +- src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c | 4 ++-- src/mainboard/supermicro/h8qme_fam10/irq_tables.c | 8 ++++---- src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h | 6 +++--- src/mainboard/supermicro/h8qme_fam10/mptable.c | 4 ++-- src/mainboard/supermicro/h8qme_fam10/romstage.c | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/mainboard/supermicro') diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c index 6279d9c060..0bb16d36b2 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c +++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c @@ -33,7 +33,7 @@ struct mb_sysconf_t mb_sysconf; void get_bus_conf(void) { - unsigned apicid_base; + unsigned int apicid_base; struct mb_sysconf_t *m; struct device *dev; diff --git a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c index e33ceecbaa..69327dcafa 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c +++ b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c @@ -49,10 +49,10 @@ unsigned long write_pirq_routing_table(unsigned long addr) struct irq_routing_table *pirq; struct irq_info *pirq_info; - unsigned slot_num; + unsigned int slot_num; uint8_t *v; struct mb_sysconf_t *m; - unsigned sbdn; + unsigned int sbdn; uint8_t sum = 0; int i; @@ -96,8 +96,8 @@ unsigned long write_pirq_routing_table(unsigned long addr) for (i = 1; i < sysconf.hc_possible_num; i++) { if (!(sysconf.pci1234[i] & 0x1)) continue; - unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff; - unsigned devn = sysconf.hcdn[i] & 0xff; + unsigned int busn = (sysconf.pci1234[i] >> 12) & 0xff; + unsigned int devn = sysconf.hcdn[i] & 0xff; write_pirq_info(pirq_info, busn, PCI_DEVFN(devn, 0), 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); diff --git a/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h index ddd6cfe38f..1a287c6a8a 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h +++ b/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h @@ -20,7 +20,7 @@ struct mb_sysconf_t { unsigned char bus_mcp55[8]; //1 - unsigned apicid_mcp55; + unsigned int apicid_mcp55; }; #endif diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c index d41551db27..cdb2980867 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c +++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c @@ -26,7 +26,7 @@ static void *smp_write_config_table(void *v) { struct mp_config_table *mc; struct mb_sysconf_t *m; - unsigned sbdn; + unsigned int sbdn; int i, j, bus_isa; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c index 2750129859..6f6ac712c7 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c +++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c @@ -55,7 +55,7 @@ inline int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -unsigned get_sbdn(unsigned bus) +unsigned int get_sbdn(unsigned int bus) { pci_devfn_t dev; diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c index f32312d6dc..56ea43c7fe 100644 --- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c +++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c @@ -30,12 +30,12 @@ // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables struct mb_sysconf_t mb_sysconf; -unsigned sbdn3; +unsigned int sbdn3; void get_bus_conf(void) { - unsigned apicid_base; + unsigned int apicid_base; struct mb_sysconf_t *m; struct device *dev; diff --git a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c index 5248567739..b77e86209b 100644 --- a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c +++ b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c @@ -49,10 +49,10 @@ unsigned long write_pirq_routing_table(unsigned long addr) struct irq_routing_table *pirq; struct irq_info *pirq_info; - unsigned slot_num; + unsigned int slot_num; uint8_t *v; struct mb_sysconf_t *m; - unsigned sbdn; + unsigned int sbdn; uint8_t sum = 0; int i; @@ -96,8 +96,8 @@ unsigned long write_pirq_routing_table(unsigned long addr) for (i = 1; i < sysconf.hc_possible_num; i++) { if (!(sysconf.pci1234[i] & 0x1)) continue; - unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff; - unsigned devn = sysconf.hcdn[i] & 0xff; + unsigned int busn = (sysconf.pci1234[i] >> 12) & 0xff; + unsigned int devn = sysconf.hcdn[i] & 0xff; write_pirq_info(pirq_info, busn, PCI_DEVFN(devn, 0), 0x1, 0x4ca0, 0x2, 0x4ca0, 0x3, 0x4ca0, 0x4, 0x4ca0, 0, 0); diff --git a/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h index de45310c62..f93f9e8380 100644 --- a/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h +++ b/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h @@ -20,13 +20,13 @@ struct mb_sysconf_t { unsigned char bus_mcp55[8]; //1 - unsigned apicid_mcp55; + unsigned int apicid_mcp55; unsigned char bus_8132_0; //7 unsigned char bus_8132_1; //8 unsigned char bus_8132_2; //9 - unsigned apicid_8132_1; - unsigned apicid_8132_2; + unsigned int apicid_8132_1; + unsigned int apicid_8132_2; }; #endif diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c index 8c884c4d65..7e6237f1f6 100644 --- a/src/mainboard/supermicro/h8qme_fam10/mptable.c +++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c @@ -22,13 +22,13 @@ #include #include "mb_sysconf.h" -extern unsigned sbdn3; +extern unsigned int sbdn3; static void *smp_write_config_table(void *v) { struct mp_config_table *mc; struct mb_sysconf_t *m; - unsigned sbdn; + unsigned int sbdn; int i, j, bus_isa; mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN); diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c index 56d9f35ef2..7c489ca8dd 100644 --- a/src/mainboard/supermicro/h8qme_fam10/romstage.c +++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c @@ -63,7 +63,7 @@ inline int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -unsigned get_sbdn(unsigned bus) +unsigned int get_sbdn(unsigned int bus) { pci_devfn_t dev; -- cgit v1.2.3