diff options
| -rw-r--r-- | kernel/drivers/pit.c | 8 | ||||
| -rw-r--r-- | kernel/memory/virtalloc.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/kernel/drivers/pit.c b/kernel/drivers/pit.c index 5b15dd9..a8fe179 100644 --- a/kernel/drivers/pit.c +++ b/kernel/drivers/pit.c @@ -8,17 +8,19 @@ uint64_t ticks = 0; -uint16_t pit_read_divider(void) { +uint16_t pit_read_divider(void) +{ uint16_t count = 0; cli(); outb(CMD, 0); // clear bits count = inb(CHAN_0); // low byte - count |= inb(CHAN_0)<<8; // highbyte + count |= inb(CHAN_0) << 8; // highbyte sti(); return count; } -void pit_set_divider(uint16_t count) { +void pit_set_divider(uint16_t count) +{ cli(); outb(CHAN_0, count & 0xFF); // low byte outb(CHAN_0, (count & 0xFF00) >> 8); // high byte diff --git a/kernel/memory/virtalloc.c b/kernel/memory/virtalloc.c index e82ac96..8a0d1ed 100644 --- a/kernel/memory/virtalloc.c +++ b/kernel/memory/virtalloc.c @@ -81,7 +81,7 @@ static void free_node(struct virt_ctx *ctx, struct virt_addr_node *node) void virtaddr_init(struct virt_ctx *ctx) { struct virt_addr_node init = { - .start = 0x600000, // third pd + .start = 0x40005000, // map after paging pt .end = 0x1000000000000, // 48bit memory address max .next = NULL, .prev = NULL, |