aboutsummaryrefslogtreecommitdiff
path: root/sys/include
diff options
context:
space:
mode:
Diffstat (limited to 'sys/include')
-rw-r--r--sys/include/dev/timer/hpet.h38
-rw-r--r--sys/include/firmware/acpi/tables.h26
2 files changed, 62 insertions, 2 deletions
diff --git a/sys/include/dev/timer/hpet.h b/sys/include/dev/timer/hpet.h
new file mode 100644
index 0000000..513444e
--- /dev/null
+++ b/sys/include/dev/timer/hpet.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2023 Ian Marco Moffett and the VegaOS team.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of VegaOS nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _TIMER_HPET_H_
+#define _TIMER_HPET_H_
+
+#include <sys/types.h>
+
+int hpet_init(void);
+void hpet_msleep(size_t ms);
+
+#endif /* !_TIMER_HPET_H_ */
diff --git a/sys/include/firmware/acpi/tables.h b/sys/include/firmware/acpi/tables.h
index c145e90..2d65f46 100644
--- a/sys/include/firmware/acpi/tables.h
+++ b/sys/include/firmware/acpi/tables.h
@@ -51,7 +51,7 @@ struct __packed acpi_rsdp {
uint64_t signature; /* RSD PTR */
uint8_t checksum; /* Structure checksum */
char oemid[OEMID_SIZE]; /* OEM-supplied string that IDs the OEM */
- uint8_t revision; /* Revision of the structure */
+ uint8_t revision; /* Revision of the structure */
uint32_t rsdt_addr; /* RSDT physical address */
/* Reserved if revision < 2 */
@@ -61,7 +61,7 @@ struct __packed acpi_rsdp {
uint8_t reserved[3];
};
-/*
+/*
* XSDT or RSDT depending
* on what revision the header
* says.
@@ -105,4 +105,26 @@ struct __packed interrupt_override {
uint16_t flags;
};
+struct __packed acpi_gas {
+ uint8_t address_space_id;
+ uint8_t register_bit_width;
+ uint8_t register_bit_offset;
+ uint8_t reserved;
+ uint64_t address;
+};
+
+struct __packed hpet {
+ struct acpi_header hdr;
+ uint8_t hardware_rev_id;
+ uint8_t comparator_count : 5;
+ uint8_t counter_size : 1;
+ uint8_t reserved : 1;
+ uint8_t legacy_replacement : 1;
+ uint16_t pci_vendor_id;
+ struct acpi_gas gas;
+ uint8_t hpet_number;
+ uint16_t minimum_tick;
+ uint8_t page_protection;
+};
+
#endif /* !_ACPI_TABLES_H_ */