ANSI C: declarations outside for

3 files changed, 19 insertions, 11 deletions

diff --git a/kernel/src/apic/apic.c b/kernel/src/apic/apic.c
index f543c82..ad3ccec 100644
--- a/kernel/src/apic/apic.c
+++ b/kernel/src/apic/apic.c
@@ -29,7 +29,9 @@ void init_ap_cpus()
 	init_mutex(&cnt_lock);
 	map_addr(lapic_addr, lapic_addr, FLAG_PRESENT);
 
-	for (size_t i = 0; i < numcores; i++) {
+	size_t i;
+	size_t j;
+	for (i = 0; i < numcores; i++) {
 		/* do not start BSP, that's already running this code */
 		if (cpu_apic_ids[i] == bspid)
 			continue;
@@ -75,7 +77,7 @@ void init_ap_cpus()
 
 		/* send STARTUP IPI (twice) */
 
-		for (size_t j = 0; j < 2; j++) {
+		for (j = 0; j < 2; j++) {
 			/* clear APIC errors */
 			*((__volatile__ uint32_t *)(lapic_addr + 0x280)) = 0;
 			/* select AP */
diff --git a/kernel/src/apic/madt.c b/kernel/src/apic/madt.c
index 3a152aa..24f739c 100644
--- a/kernel/src/apic/madt.c
+++ b/kernel/src/apic/madt.c
@@ -17,8 +17,8 @@ void parse_madt()
 	memcpy(madt, madt_addr, sizeof(struct MADT));
 	lapic_addr = madt->lapic_addr;
 
-	for (size_t curr_size = sizeof(struct MADT);
-	     curr_size < madt->h.Length;) {
+	size_t curr_size;
+	for (curr_size = sizeof(struct MADT); curr_size < madt->h.Length;) {
 		struct MADT_type_header *m = (struct MADT_type_header *)kalloc(
 			sizeof(struct MADT_type_header));
 		memcpy(m,
diff --git a/kernel/src/apic/rsdp.c b/kernel/src/apic/rsdp.c
index c12b63f..6a1505f 100644
--- a/kernel/src/apic/rsdp.c
+++ b/kernel/src/apic/rsdp.c
@@ -8,10 +8,13 @@ uint64_t *find_rsdp()
 {
 	map_addr(0x0, 0x0, FLAG_PRESENT);
 	const char *rsdp_cs = "RSD PTR ";
-	for (uint64_t i = 0x10; i < 0x100000; i += 0x10) {
+	uint64_t i;
+	size_t j;
+
+	for (i = 0x10; i < 0x100000; i += 0x10) {
 		char *x = (char *)i;
 		uint8_t ind = 1;
-		for (size_t j = 0; j < strlen(rsdp_cs); j++) {
+		for (j = 0; j < strlen(rsdp_cs); j++) {
 			if (rsdp_cs[j] != x[j]) {
 				ind = 0;
 				break;
@@ -43,8 +46,9 @@ void list_sys_tables(void)
 
 	uint32_t entries =
 		(rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4;
-
-	for (size_t i = 0; i < entries; i++) {
+	size_t i;
+	size_t j;
+	for (i = 0; i < entries; i++) {
 		uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress +
 				   (uint32_t)sizeof(struct ACPI_header) +
 				   (uint32_t)i * 4;
@@ -56,7 +60,7 @@ void list_sys_tables(void)
 		memcpy(t, (uint64_t *)(uint64_t)addr,
 		       sizeof(struct ACPI_header));
 
-		for (size_t j = 0; j < 4; j++) {
+		for (j = 0; j < 4; j++) {
 			printf("%c", t->Signature[j]);
 		}
 		printf(", ");
@@ -88,7 +92,9 @@ uint64_t *find_sys_table_addr(const char *signature)
 	uint32_t entries =
 		(rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4;
 
-	for (size_t i = 0; i < entries; i++) {
+	size_t i;
+	size_t j;
+	for (i = 0; i < entries; i++) {
 		uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress +
 				   (uint32_t)sizeof(struct ACPI_header) +
 				   (uint32_t)i * 4;
@@ -101,7 +107,7 @@ uint64_t *find_sys_table_addr(const char *signature)
 		       sizeof(struct ACPI_header));
 
 		int ind = 1;
-		for (size_t j = 0; j < 4; j++) {
+		for (j = 0; j < 4; j++) {
 			if (t->Signature[j] != signature[j])
 				ind = 0;
 		}