mirror of
https://github.com/Tom-on64/kern.git
synced 2026-11-03 18:22:22 +00:00
Changed camelCase to snake_case
This commit is contained in:
@@ -18,8 +18,8 @@ typedef struct bitmap_t {
|
||||
void* bmap_ptr(bitmap_t* map, size_t bit);
|
||||
void bmap_set(bitmap_t* map, size_t bit, int val);
|
||||
int bmap_get(bitmap_t* map, size_t bit);
|
||||
void bmap_setarea(bitmap_t* map, size_t base, size_t len, int val);
|
||||
void bmap_setall(bitmap_t* map, int val);
|
||||
size_t bmap_findarea(bitmap_t* map, size_t len, int val);
|
||||
void bmap_set_area(bitmap_t* map, size_t base, size_t len, int val);
|
||||
size_t bmap_get_area(bitmap_t* map, size_t len, int val);
|
||||
void bmap_set_all(bitmap_t* map, int val);
|
||||
|
||||
#endif
|
||||
|
||||
+14
-14
@@ -29,20 +29,20 @@ struct boot_memmap {
|
||||
* Some values may not be provided by the bootloader, in this case
|
||||
* pointers will be NULL and integer values will be 0 if applicable.
|
||||
* Some unprovided values may also be implied. Eg.:
|
||||
* If 'memmap = NULL' then 'memmapLen' doesn't matter.
|
||||
* If 'memmap = NULL' then 'memmap_size' doesn't matter.
|
||||
|
||||
*/
|
||||
struct boot_info {
|
||||
uint32_t memLower;
|
||||
uint32_t memUpper;
|
||||
uint8_t bootDrive;
|
||||
uint8_t bootPart1;
|
||||
uint8_t bootPart2;
|
||||
uint8_t bootPart3;
|
||||
char* cmdline;
|
||||
struct boot_memmap* memmap;
|
||||
size_t memmapLen;
|
||||
char* bootname;
|
||||
uint32_t mem_lower;
|
||||
uint32_t mem_upper;
|
||||
uint8_t boot_drive;
|
||||
uint8_t boot_part1;
|
||||
uint8_t boot_part2;
|
||||
uint8_t boot_part3;
|
||||
struct boot_memmap* memmap;
|
||||
size_t memmap_size;
|
||||
char* cmdline;
|
||||
char* bootname;
|
||||
} __packed;
|
||||
extern struct boot_info bootloader;
|
||||
|
||||
@@ -53,9 +53,9 @@ extern struct boot_info bootloader;
|
||||
*/
|
||||
int boot_init(int type, ...);
|
||||
|
||||
int boot_initMB1(void* ptr, uint32_t magic);
|
||||
int boot_init_mb1(void* ptr, uint32_t magic);
|
||||
// TODO:
|
||||
// int boot_initMB2(...);
|
||||
// int boot_initLimine(...);
|
||||
// int boot_init_mb2(...);
|
||||
// int boot_init_limine(...);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -48,20 +48,20 @@
|
||||
|
||||
#define GDT_DESC(_lim, _base, _acc, _flag) (struct gdt_entry){\
|
||||
.limit = (_lim) & 0xffff,\
|
||||
.baseLow = (uint16_t)(_base),\
|
||||
.baseMid = (uint8_t)((_base) >> 16),\
|
||||
.base_low = (uint16_t)(_base),\
|
||||
.base_mid = (uint8_t)((_base) >> 16),\
|
||||
.access = (_acc),\
|
||||
.flags = ((_flag & 0x0f) << 4) | (((_lim) >> 16) & 0x0f),\
|
||||
.baseHigh = (uint8_t)((_base) >> 24),\
|
||||
.base_high = (uint8_t)((_base) >> 24),\
|
||||
}
|
||||
|
||||
struct gdt_entry {
|
||||
uint16_t limit;
|
||||
uint16_t baseLow;
|
||||
uint8_t baseMid;
|
||||
uint16_t base_low;
|
||||
uint8_t base_mid;
|
||||
uint8_t access;
|
||||
uint8_t flags; // low 4 bits are 4 msbs of limit, high 4 bits are flags
|
||||
uint8_t baseHigh;
|
||||
uint8_t base_high;
|
||||
} __packed;
|
||||
|
||||
struct gdt_pointer {
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
#define IDT_FLAG_USER 0xee // P = 1, Priv = 11, S = 0, Type = 1110 (32-bit int)
|
||||
|
||||
struct idt_entry {
|
||||
uint16_t offsetLow;
|
||||
uint16_t offset_low;
|
||||
uint16_t selector;
|
||||
uint8_t __unused;
|
||||
uint8_t flags;
|
||||
uint16_t offsetHigh;
|
||||
uint16_t offset_high;
|
||||
} __packed;
|
||||
|
||||
struct idt_pointer {
|
||||
@@ -22,6 +22,6 @@ struct idt_pointer {
|
||||
} __packed;
|
||||
|
||||
int idt_init(void);
|
||||
void idt_setGate(uint8_t i, void* handler, uint8_t flags);
|
||||
void idt_set_gate(uint8_t i, void* handler, uint8_t flags);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <kernel.h>
|
||||
|
||||
// Interrupt frame (ie. what's on the stack on interrupt)
|
||||
struct isr_intFrame {
|
||||
struct isr_int_frame {
|
||||
// Pushed by OS
|
||||
uint32_t esp, ebx, ecx, edx, esi, edi, ebp;
|
||||
uint32_t ds, es, fs, gs, eax;
|
||||
@@ -13,14 +13,14 @@ struct isr_intFrame {
|
||||
// Pushed by CPU
|
||||
uint32_t eip, cs, eflags, user_esp, user_ss;
|
||||
};
|
||||
typedef void (*isr_handlerPtr)(struct isr_intFrame* iframe);
|
||||
typedef void (*isr_handler_ptr)(struct isr_int_frame* iframe);
|
||||
|
||||
int isr_init(void);
|
||||
void isr_registerIRQ(uint8_t i, isr_handlerPtr handler);
|
||||
int isr_handleInterrupt(struct isr_intFrame iframe);
|
||||
void isr_register_IRQ(uint8_t i, isr_handler_ptr handler);
|
||||
int isr_handle_interrupt(struct isr_int_frame iframe);
|
||||
|
||||
// Assembly definitions (isr.s)
|
||||
extern void* isr_redirectTable[48]; // ISR Table
|
||||
extern void* isr_redirect_table[48]; // ISR Table
|
||||
extern void isr128(); // int 0x80 - syscall
|
||||
|
||||
#endif
|
||||
|
||||
@@ -43,6 +43,7 @@ typedef char* va_list;
|
||||
#define ceil(_x, _y) ((((_x) + (_y)) (_y)) * (_y))
|
||||
#define floor(_x, _y) ((_x) - ((_x) % (_y)))
|
||||
#define dceil(_x, _y) (((_x) + (_y) - 1) / (_y))
|
||||
#define fence() __asm__ volatile ("":::"memory")
|
||||
|
||||
/*
|
||||
* Attribute definitions
|
||||
@@ -98,7 +99,7 @@ extern uint32_t __kernel_stack_top, __kernel_stack_bottom;
|
||||
#define pr_wrn(_s) printk("[warning] %s\n", (_s))
|
||||
#define pr_err(_s) printk("[error] %s\n", (_s))
|
||||
#define panic(_s) do {\
|
||||
printk("[kernel] Panic! %s\n", (_s));\
|
||||
printk("[kernel] Panic! %s", (_s));\
|
||||
while (1) __asm__ volatile ("cli; hlt");\
|
||||
} while (0)
|
||||
#define BUG() panic("BUG()")
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
#ifndef _KMALLOC_H
|
||||
#define _KMALLOC_H
|
||||
|
||||
void* kmalloc(size_t size);
|
||||
void* kzalloc(size_t size);
|
||||
void* kcalloc(size_t count, size_t size);
|
||||
void kfree(void* ptr);
|
||||
|
||||
#endif
|
||||
+11
-11
@@ -24,18 +24,18 @@
|
||||
#define PAGE_FLAG_OWNER (1 << 9)
|
||||
|
||||
extern uint32_t init_pagedir[1024]; // Defined in entry.s for initial paging
|
||||
extern size_t pag_pageCount;
|
||||
extern size_t pag_page_count;
|
||||
|
||||
int pag_init(void);
|
||||
void pag_registerTempFrame(uint32_t target);
|
||||
uint32_t pag_tempFrame(void);
|
||||
void pag_mapPage(uint32_t vaddr, uint32_t paddr, uint32_t flags);
|
||||
uint32_t pag_umapPage(uint32_t vaddr);
|
||||
void* pag_virtToPhys(uint32_t vaddr);
|
||||
uint32_t* pag_getPagedir();
|
||||
void pag_setPagedir(uint32_t* pagedir);
|
||||
void pag_syncPagedir();
|
||||
uint32_t* pag_allocPagedir();
|
||||
void pag_freePagedir(uint32_t* pagedir);
|
||||
void pag_register_temp_frame(uint32_t target);
|
||||
uint32_t pag_temp_frame(void);
|
||||
void pag_map(uint32_t vaddr, uint32_t paddr, uint32_t flags);
|
||||
uint32_t pag_umap(uint32_t vaddr);
|
||||
void* pag_virt_to_phys(uint32_t vaddr);
|
||||
uint32_t* pag_get_pagedir();
|
||||
void pag_set_pagedir(uint32_t* pagedir);
|
||||
void pag_sync_pagedir();
|
||||
uint32_t* pag_alloc_pagedir();
|
||||
void pag_free_pagedir(uint32_t* pagedir);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
extern bitmap_t pmm_bitmap;
|
||||
|
||||
int pmm_init(void);
|
||||
void* pmm_allocPage(void);
|
||||
void pmm_freePage(void* page);
|
||||
void* pmm_alloc(void);
|
||||
void pmm_free(void* page);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -3,6 +3,6 @@
|
||||
|
||||
#include <isr.h>
|
||||
|
||||
int syscallHandler(struct isr_intFrame* iframe) { return 1; }
|
||||
int syscall_handler(struct isr_int_frame* iframe) { (void)iframe; return 1; }
|
||||
|
||||
#endif
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
int tty_init(void);
|
||||
void tty_clear(void);
|
||||
void tty_setattr(uint8_t attr);
|
||||
void tty_enableCursor(uint8_t start, uint8_t end);
|
||||
void tty_disableCursor(void);
|
||||
void tty_set_attr(uint8_t attr);
|
||||
void tty_show_cursor(uint8_t start, uint8_t end);
|
||||
void tty_hide_cursor(void);
|
||||
void tty_write(char* buf, size_t len);
|
||||
void tty_putc(char c);
|
||||
void tty_puts(char* s);
|
||||
|
||||
Reference in New Issue
Block a user