Change formatting rules
This commit is contained in:
@@ -31,26 +31,26 @@ static uint64_t hpet_period_fs;
|
||||
static spin_lock_t hpet_lock = SPIN_LOCK_INIT;
|
||||
|
||||
/* Read a HPET register. Assumes caller holds hpet_lock */
|
||||
static uint64_t hpet_read64 (uint32_t reg) {
|
||||
static uint64_t hpet_read64(uint32_t reg) {
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
uintptr_t hpet_vaddr = hpet_paddr + (uintptr_t)hhdm->offset;
|
||||
return *(volatile uint64_t*)(hpet_vaddr + reg);
|
||||
}
|
||||
|
||||
static uint32_t hpet_read32 (uint32_t reg) {
|
||||
static uint32_t hpet_read32(uint32_t reg) {
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
uintptr_t hpet_vaddr = hpet_paddr + (uintptr_t)hhdm->offset;
|
||||
return *(volatile uint32_t*)(hpet_vaddr + reg);
|
||||
}
|
||||
|
||||
/* Write a HPET register. Assumes caller holds hpet_lock */
|
||||
static void hpet_write64 (uint32_t reg, uint64_t value) {
|
||||
static void hpet_write64(uint32_t reg, uint64_t value) {
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
uintptr_t hpet_vaddr = hpet_paddr + (uintptr_t)hhdm->offset;
|
||||
*(volatile uint64_t*)(hpet_vaddr + reg) = value;
|
||||
}
|
||||
|
||||
static void hpet_write32 (uint32_t reg, uint32_t value) {
|
||||
static void hpet_write32(uint32_t reg, uint32_t value) {
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
uintptr_t hpet_vaddr = hpet_paddr + (uintptr_t)hhdm->offset;
|
||||
*(volatile uint32_t*)(hpet_vaddr + reg) = value;
|
||||
@@ -58,85 +58,85 @@ static void hpet_write32 (uint32_t reg, uint32_t value) {
|
||||
|
||||
/* Read current value of HPET_MCVR register. */
|
||||
|
||||
static uint64_t hpet_read_counter (void) {
|
||||
static uint64_t hpet_read_counter(void) {
|
||||
uint64_t fh;
|
||||
|
||||
uint64_t value;
|
||||
spin_lock (&hpet_lock, &fh);
|
||||
spin_lock(&hpet_lock, &fh);
|
||||
|
||||
if (!hpet_32bits)
|
||||
value = hpet_read64 (HPET_MCVR);
|
||||
value = hpet_read64(HPET_MCVR);
|
||||
else {
|
||||
uint32_t hi1, lo, hi2;
|
||||
do {
|
||||
hi1 = hpet_read32 (HPET_MCVR + 4);
|
||||
lo = hpet_read32 (HPET_MCVR + 0);
|
||||
hi2 = hpet_read32 (HPET_MCVR + 4);
|
||||
hi1 = hpet_read32(HPET_MCVR + 4);
|
||||
lo = hpet_read32(HPET_MCVR + 0);
|
||||
hi2 = hpet_read32(HPET_MCVR + 4);
|
||||
} while (hi1 != hi2);
|
||||
|
||||
value = ((uint64_t)hi1 << 32) | lo;
|
||||
}
|
||||
|
||||
spin_unlock (&hpet_lock, fh);
|
||||
spin_unlock(&hpet_lock, fh);
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
static void hpet_write_counter (uint64_t value) {
|
||||
static void hpet_write_counter(uint64_t value) {
|
||||
uint64_t fh;
|
||||
|
||||
spin_lock (&hpet_lock, &fh);
|
||||
spin_lock(&hpet_lock, &fh);
|
||||
|
||||
if (!hpet_32bits)
|
||||
hpet_write64 (HPET_MCVR, value);
|
||||
hpet_write64(HPET_MCVR, value);
|
||||
else {
|
||||
hpet_write32 (HPET_MCVR, (uint32_t)value);
|
||||
hpet_write32 (HPET_MCVR + 4, (uint32_t)(value >> 32));
|
||||
hpet_write32(HPET_MCVR, (uint32_t)value);
|
||||
hpet_write32(HPET_MCVR + 4, (uint32_t)(value >> 32));
|
||||
}
|
||||
|
||||
spin_unlock (&hpet_lock, fh);
|
||||
spin_unlock(&hpet_lock, fh);
|
||||
}
|
||||
|
||||
/* Sleep for a given amount of microseconds. This time can last longer due to \ref hpet_lock being
|
||||
* held. */
|
||||
void hpet_sleep_micro (uint64_t us) {
|
||||
void hpet_sleep_micro(uint64_t us) {
|
||||
if (hpet_period_fs == 0)
|
||||
return;
|
||||
|
||||
uint64_t ticks_to_wait = (us * 1000ULL) / (hpet_period_fs / 1000000ULL);
|
||||
uint64_t start = hpet_read_counter ();
|
||||
uint64_t start = hpet_read_counter();
|
||||
|
||||
for (;;) {
|
||||
uint64_t now = hpet_read_counter ();
|
||||
uint64_t now = hpet_read_counter();
|
||||
|
||||
if ((now - start) >= ticks_to_wait)
|
||||
break;
|
||||
|
||||
__asm__ volatile ("pause" ::: "memory");
|
||||
__asm__ volatile("pause" ::: "memory");
|
||||
}
|
||||
}
|
||||
|
||||
/* Initialize HPET */
|
||||
void hpet_init (void) {
|
||||
void hpet_init(void) {
|
||||
struct uacpi_table hpet_table;
|
||||
uacpi_status status = uacpi_table_find_by_signature (ACPI_HPET_SIGNATURE, &hpet_table);
|
||||
uacpi_status status = uacpi_table_find_by_signature(ACPI_HPET_SIGNATURE, &hpet_table);
|
||||
if (status != UACPI_STATUS_OK) {
|
||||
DEBUG ("Could not find HPET table!\n");
|
||||
spin ();
|
||||
DEBUG("Could not find HPET table!\n");
|
||||
spin();
|
||||
}
|
||||
|
||||
struct acpi_hpet* hpet = (struct acpi_hpet*)hpet_table.virt_addr;
|
||||
hpet_paddr = (uintptr_t)hpet->address.address;
|
||||
|
||||
struct limine_hhdm_response* hhdm = limine_hhdm_request.response;
|
||||
mm_map_kernel_page (hpet_paddr, (uintptr_t)hhdm->offset + hpet_paddr, MM_PG_PRESENT | MM_PG_RW);
|
||||
mm_map_kernel_page(hpet_paddr, (uintptr_t)hhdm->offset + hpet_paddr, MM_PG_PRESENT | MM_PG_RW);
|
||||
|
||||
uint64_t caps = hpet_read64 (HPET_GCIDR);
|
||||
uint64_t caps = hpet_read64(HPET_GCIDR);
|
||||
hpet_32bits = (caps & (1 << 13)) ? 0 : 1;
|
||||
|
||||
hpet_period_fs = (uint32_t)(caps >> 32);
|
||||
|
||||
hpet_write64 (HPET_GCR, 0);
|
||||
hpet_write_counter (0);
|
||||
hpet_write64 (HPET_GCR, 1);
|
||||
hpet_write64(HPET_GCR, 0);
|
||||
hpet_write_counter(0);
|
||||
hpet_write64(HPET_GCR, 1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user