hrev53657 adds 1 changeset to branch 'master'
old head: a9e97bc01f5c044338a671b0fc9e4751e34a9f7b
new head: 80df503d1d4117071f1ca79fce0d4c8a10cebc06
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=80df503d1d41+%5Ea9e97bc01f5c
----------------------------------------------------------------------------
80df503d1d41: sis19x: Fix build on gcc2
Declare loop variables before the for loops to be compatible with C89.
Fixes #15583.
Change-Id: If2a3b4447a88bb2e65c5ff4166f32df1b26fd859
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2058
Reviewed-by: Alexander G. M. Smith <agmsmith@xxxxxx>
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Joachim Mairböck <j.mairboeck@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev53657
Commit: 80df503d1d4117071f1ca79fce0d4c8a10cebc06
URL: https://git.haiku-os.org/haiku/commit/?id=80df503d1d41
Author: Joachim Mairböck <j.mairboeck@xxxxxxxxx>
Date: Fri Dec 27 18:27:02 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Fri Dec 27 22:21:46 2019 UTC
Ticket: https://dev.haiku-os.org/ticket/15583
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 3 deletions(-)
src/add-ons/kernel/drivers/network/sis19x/glue.c | 9 ++++++---
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/network/sis19x/glue.c
b/src/add-ons/kernel/drivers/network/sis19x/glue.c
index e7bc5fa7ad..b566fc4b59 100644
--- a/src/add-ons/kernel/drivers/network/sis19x/glue.c
+++ b/src/add-ons/kernel/drivers/network/sis19x/glue.c
@@ -73,12 +73,15 @@ haiku_sge_get_mac_addr_apc(device_t dev, uint8_t* dest,
int* rgmii)
uint16 ids[] = { 0x0965, 0x0966, 0x0968 };
pci_info pciInfo = {0};
- for (long i = 0; B_OK == (*gPci->get_nth_pci_info)(i, &pciInfo); i++) {
+ long i;
+ for (i = 0; B_OK == (*gPci->get_nth_pci_info)(i, &pciInfo); i++) {
+ size_t idx;
if (pciInfo.vendor_id != 0x1039)
continue;
- for (size_t idx = 0; idx < B_COUNT_OF(ids); idx++) {
+ for (idx = 0; idx < B_COUNT_OF(ids); idx++) {
if (pciInfo.device_id == ids[idx]) {
+ size_t i;
// enable ports 0x78 0x79 to access APC
registers
uint32 reg = gPci->read_pci_config(pciInfo.bus,
pciInfo.device, pciInfo.function, 0x48,
1);
@@ -90,7 +93,7 @@ haiku_sge_get_mac_addr_apc(device_t dev, uint8_t* dest, int*
rgmii)
pciInfo.device, pciInfo.function, 0x48,
1);
// read factory MAC address
- for (size_t i = 0; i < 6; i++) {
+ for (i = 0; i < 6; i++) {
gPci->write_io_8(0x78, 0x09 + i);
dest[i] = gPci->read_io_8(0x79);
}
