From 239900af293f192931391dc5579afab39a43e6c6 Mon Sep 17 00:00:00 2001 From: Aleksa Vuckovic Date: Sat, 25 Feb 2023 06:56:01 +0100 Subject: clang-format --- kernel/src/apic/rsdp.c | 62 +++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 24 deletions(-) (limited to 'kernel/src/apic/rsdp.c') diff --git a/kernel/src/apic/rsdp.c b/kernel/src/apic/rsdp.c index e0127aa..c12b63f 100644 --- a/kernel/src/apic/rsdp.c +++ b/kernel/src/apic/rsdp.c @@ -4,12 +4,12 @@ #include #include -uint64_t* find_rsdp() +uint64_t *find_rsdp() { map_addr(0x0, 0x0, FLAG_PRESENT); - const char* rsdp_cs = "RSD PTR "; + const char *rsdp_cs = "RSD PTR "; for (uint64_t i = 0x10; i < 0x100000; i += 0x10) { - char *x = (char*)i; + char *x = (char *)i; uint8_t ind = 1; for (size_t j = 0; j < strlen(rsdp_cs); j++) { if (rsdp_cs[j] != x[j]) { @@ -18,7 +18,7 @@ uint64_t* find_rsdp() } } if (ind) { - return (uint64_t*)i; + return (uint64_t *)i; } } return NULL; @@ -26,28 +26,35 @@ uint64_t* find_rsdp() void list_sys_tables(void) { - uint64_t* rsdp = find_rsdp(); + uint64_t *rsdp = find_rsdp(); if (rsdp == NULL) { printf("RSDP NOT FOUND\n"); return; } - struct RSDP_descriptor* rsdp_desc = (struct RSDP_descriptor*)rsdp; + struct RSDP_descriptor *rsdp_desc = (struct RSDP_descriptor *)rsdp; map_addr(rsdp_desc->RsdtAddress, rsdp_desc->RsdtAddress, FLAG_PRESENT); - struct ACPI_header* rsdt = (struct ACPI_header*)kalloc(sizeof(struct ACPI_header)); - memcpy(rsdt, (uint64_t*)(uint64_t)rsdp_desc->RsdtAddress, sizeof(struct ACPI_header)); + struct ACPI_header *rsdt = + (struct ACPI_header *)kalloc(sizeof(struct ACPI_header)); + memcpy(rsdt, (uint64_t *)(uint64_t)rsdp_desc->RsdtAddress, + sizeof(struct ACPI_header)); - uint32_t entries = (rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4; + uint32_t entries = + (rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4; for (size_t i = 0; i < entries; i++) { - uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress + (uint32_t)sizeof(struct ACPI_header) + (uint32_t)i * 4; + uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress + + (uint32_t)sizeof(struct ACPI_header) + + (uint32_t)i * 4; uint32_t addr; - memcpy(&addr, (uint64_t*)(uint64_t)na_addr, 4); + memcpy(&addr, (uint64_t *)(uint64_t)na_addr, 4); - struct ACPI_header* t = (struct ACPI_header*)kalloc(sizeof(struct ACPI_header)); - memcpy(t, (uint64_t*)(uint64_t)addr, sizeof(struct ACPI_header)); + struct ACPI_header *t = (struct ACPI_header *)kalloc( + sizeof(struct ACPI_header)); + memcpy(t, (uint64_t *)(uint64_t)addr, + sizeof(struct ACPI_header)); for (size_t j = 0; j < 4; j++) { printf("%c", t->Signature[j]); @@ -61,30 +68,37 @@ void list_sys_tables(void) kfree(rsdt); } -uint64_t* find_sys_table_addr(const char* signature) +uint64_t *find_sys_table_addr(const char *signature) { - uint64_t* rsdp = find_rsdp(); + uint64_t *rsdp = find_rsdp(); if (rsdp == NULL) { printf("RSDP NOT FOUND\n"); return NULL; } - struct RSDP_descriptor* rsdp_desc = (struct RSDP_descriptor*)rsdp; + struct RSDP_descriptor *rsdp_desc = (struct RSDP_descriptor *)rsdp; map_addr(rsdp_desc->RsdtAddress, rsdp_desc->RsdtAddress, FLAG_PRESENT); - struct ACPI_header* rsdt = (struct ACPI_header*)kalloc(sizeof(struct ACPI_header)); - memcpy(rsdt, (uint64_t*)(uint64_t)rsdp_desc->RsdtAddress, sizeof(struct ACPI_header)); + struct ACPI_header *rsdt = + (struct ACPI_header *)kalloc(sizeof(struct ACPI_header)); + memcpy(rsdt, (uint64_t *)(uint64_t)rsdp_desc->RsdtAddress, + sizeof(struct ACPI_header)); - uint32_t entries = (rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4; + uint32_t entries = + (rsdt->Length - (uint32_t)sizeof(struct ACPI_header)) / 4; for (size_t i = 0; i < entries; i++) { - uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress + (uint32_t)sizeof(struct ACPI_header) + (uint32_t)i * 4; + uint32_t na_addr = (uint32_t)rsdp_desc->RsdtAddress + + (uint32_t)sizeof(struct ACPI_header) + + (uint32_t)i * 4; uint32_t addr; - memcpy(&addr, (uint64_t*)(uint64_t)na_addr, 4); + memcpy(&addr, (uint64_t *)(uint64_t)na_addr, 4); - struct ACPI_header* t = (struct ACPI_header*)kalloc(sizeof(struct ACPI_header)); - memcpy(t, (uint64_t*)(uint64_t)addr, sizeof(struct ACPI_header)); + struct ACPI_header *t = (struct ACPI_header *)kalloc( + sizeof(struct ACPI_header)); + memcpy(t, (uint64_t *)(uint64_t)addr, + sizeof(struct ACPI_header)); int ind = 1; for (size_t j = 0; j < 4; j++) { @@ -94,7 +108,7 @@ uint64_t* find_sys_table_addr(const char* signature) if (ind) { kfree(t); kfree(rsdt); - return (uint64_t*)(uint64_t)addr; + return (uint64_t *)(uint64_t)addr; } kfree(t); -- cgit v1.2.3