diff options
| author | Ian Moffett <ian@osmora.org> | 2025-02-21 13:42:39 -0500 |
|---|---|---|
| committer | Ian Moffett <ian@osmora.org> | 2025-02-21 13:42:39 -0500 |
| commit | 6ceef43179c70852f001f1205ff92ebba4d0d4d7 (patch) | |
| tree | 7b5741067bfd89a78750fa05456bd95274317543 /sys/include | |
| parent | d20d25df529f6e8949fd12afe281dea65b22f17f (diff) | |
| parent | e3099277531b7b1be0aa6656a3eab3960ab6ede0 (diff) | |
Merge branch 'expt'main
Hyra v1.4
Diffstat (limited to 'sys/include')
| -rw-r--r-- | sys/include/arch/amd64/ioapic.h | 3 | ||||
| -rw-r--r-- | sys/include/lib/assert.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/include/arch/amd64/ioapic.h b/sys/include/arch/amd64/ioapic.h index beac473..c11a85c 100644 --- a/sys/include/arch/amd64/ioapic.h +++ b/sys/include/arch/amd64/ioapic.h @@ -31,8 +31,9 @@ #define _MACHINE_IOAPIC_H_ #include <sys/types.h> +#include <dev/acpi/tables.h> -void ioapic_init(void *base); +void ioapic_init(struct ioapic *p); void ioapic_gsi_mask(uint8_t gsi); void ioapic_gsi_unmask(uint8_t gsi); diff --git a/sys/include/lib/assert.h b/sys/include/lib/assert.h index d35cf09..a34a14f 100644 --- a/sys/include/lib/assert.h +++ b/sys/include/lib/assert.h @@ -35,7 +35,7 @@ #define __assert(condition) \ if ((uintptr_t)(condition) == 0) { \ - panic("Assert \"%s\" failed (%s() at %s:%d)\n", #condition, \ + panic("assert \"%s\" failed (%s() at %s:%d)\n", #condition, \ __func__, __FILE__, __LINE__); \ } |