From 5855a8e350f4e7ba8a6b322c0abd4ca4aad24691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Buczkowski?= Date: Tue, 17 Aug 2021 16:16:39 +0100 Subject: [PATCH] riscv: fix typo frequrency -> frequency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7a2ed220ad96a9b18bff3ac5c115592c8ba87d89 Reviewed-on: https://review.haiku-os.org/c/haiku/+/4334 Reviewed-by: Axel Dörfler --- headers/private/kernel/arch/riscv64/arch_kernel_args.h | 2 +- src/system/boot/platform/efi/dtb.cpp | 8 ++++---- src/system/kernel/arch/riscv64/arch_cpu.cpp | 2 +- src/system/kernel/arch/riscv64/arch_real_time_clock.cpp | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/headers/private/kernel/arch/riscv64/arch_kernel_args.h b/headers/private/kernel/arch/riscv64/arch_kernel_args.h index cfbbe64640..02706489e0 100644 --- a/headers/private/kernel/arch/riscv64/arch_kernel_args.h +++ b/headers/private/kernel/arch/riscv64/arch_kernel_args.h @@ -53,7 +53,7 @@ typedef struct { uint32 machine_platform; uint bootHart; - uint64 timerFrequrency; // in Hz + uint64 timerFrequency; // in Hz // All following address are virtual FixedWidthPointer acpi_root; diff --git a/src/system/boot/platform/efi/dtb.cpp b/src/system/boot/platform/efi/dtb.cpp index 10ee045089..12004585b9 100644 --- a/src/system/boot/platform/efi/dtb.cpp +++ b/src/system/boot/platform/efi/dtb.cpp @@ -33,7 +33,7 @@ static void* sDtbTable = NULL; static uint32 sDtbSize = 0; static uint32 sBootHart = 0; -static uint64 sTimerFrequrency = 10000000; +static uint64 sTimerFrequency = 10000000; static addr_range sPlic = {0}; static addr_range sClint = {0}; @@ -320,7 +320,7 @@ HandleFdt(const void* fdt, int node, uint32 addressCells, uint32 sizeCells, sBootHart = fdt32_to_cpu(*prop); } else if (strcmp(name, "cpus") == 0) { if (uint32* prop = (uint32*)fdt_getprop(fdt, node, "timebase-frequency", NULL)) - sTimerFrequrency = fdt32_to_cpu(*prop); + sTimerFrequency = fdt32_to_cpu(*prop); } const char* deviceType = (const char*)fdt_getprop(fdt, node, @@ -441,8 +441,8 @@ dtb_set_kernel_args() #ifdef __riscv dprintf("bootHart: %" B_PRIu32 "\n", sBootHart); gKernelArgs.arch_args.bootHart = sBootHart; - dprintf("timerFrequrency: %" B_PRIu64 "\n", sTimerFrequrency); - gKernelArgs.arch_args.timerFrequrency = sTimerFrequrency; + dprintf("timerFrequency: %" B_PRIu64 "\n", sTimerFrequency); + gKernelArgs.arch_args.timerFrequency = sTimerFrequency; // gKernelArgs.arch_args.htif = {.start = 0x40008000, .size = 0x10}; gKernelArgs.arch_args.htif = {.start = 0, .size = 0}; diff --git a/src/system/kernel/arch/riscv64/arch_cpu.cpp b/src/system/kernel/arch/riscv64/arch_cpu.cpp index b0f57b6bd0..899339d98b 100644 --- a/src/system/kernel/arch/riscv64/arch_cpu.cpp +++ b/src/system/kernel/arch/riscv64/arch_cpu.cpp @@ -40,7 +40,7 @@ arch_cpu_init(kernel_args *args) { /* uint64 conversionFactor - = (1LL << 32) * 1000000LL / args->arch_args.timerFrequrency; + = (1LL << 32) * 1000000LL / args->arch_args.timerFrequency; __riscv64_setup_system_time(conversionFactor); */ diff --git a/src/system/kernel/arch/riscv64/arch_real_time_clock.cpp b/src/system/kernel/arch/riscv64/arch_real_time_clock.cpp index 14d02e8078..9afd09a8ee 100644 --- a/src/system/kernel/arch/riscv64/arch_real_time_clock.cpp +++ b/src/system/kernel/arch/riscv64/arch_real_time_clock.cpp @@ -17,10 +17,10 @@ arch_rtc_init(kernel_args *args, struct real_time_data *data) { /* data->arch_data.system_time_conversion_factor - = (1LL << 32) * 1000000LL / args->arch_args.timerFrequrency; + = (1LL << 32) * 1000000LL / args->arch_args.timerFrequency; - dprintf("timerFrequrency: %" B_PRIu64 "\n", - args->arch_args.timerFrequrency); + dprintf("timerFrequency: %" B_PRIu64 "\n", + args->arch_args.timerFrequency); dprintf("system_time_conversion_factor: %" B_PRIu64 "\n", data->arch_data.system_time_conversion_factor); */