starnakin/42_KFS
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: change types from uint32_t to u32 (e.g)

Browse Source
This commit is contained in:
0x35c 2025-01-27 11:26:15 +01:00
parent 95fec015f2
commit d7626df19c
51 changed files with 422 additions and 374 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
headers/alloc.h
View File

@ -1,9 +1,7 @@
#pragma once #pragma once
// boolean types #include "types.h"
#include <stdbool.h> #include <stdbool.h>
// size_t, already in libft.h but for readability
#include <stddef.h> #include <stddef.h>
// Remove this and replace it with <assert.h> header // Remove this and replace it with <assert.h> header

5
headers/apic.h
View File

@ -1,12 +1,13 @@
#pragma once #pragma once
#include "types.h"
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
// MSR // MSR
bool cpu_has_msr(); bool cpu_has_msr();
void cpu_set_msr(uint32_t msr, uint32_t lo, uint32_t hi); void cpu_set_msr(u32 msr, u32 lo, u32 hi);
void cpu_get_msr(uint32_t msr, uint32_t *lo, uint32_t *hi); void cpu_get_msr(u32 msr, u32 *lo, u32 *hi);
// 8259 PIC // 8259 PIC
void pic_disable(void); void pic_disable(void);

5
headers/debug.h
View File

@ -2,6 +2,7 @@
#include "kpanic.h" #include "kpanic.h"
#include "kprintf.h" #include "kprintf.h"
#include "types.h"
#include <stdint.h> #include <stdint.h>
#define PRINT_PTR(X) kprintf("%s:%u %s: %p\n", __FILE__, __LINE__, #X, X) #define PRINT_PTR(X) kprintf("%s:%u %s: %p\n", __FILE__, __LINE__, #X, X)
@ -17,13 +18,13 @@
} while (0) } while (0)
struct function_entry { struct function_entry {
uint32_t addr; u32 addr;
char name[64]; char name[64];
}; };
struct stackframe { struct stackframe {
struct stackframe *ebp; struct stackframe *ebp;
uint32_t eip; u32 eip;
}; };
void print_stack(void); void print_stack(void);

7
headers/font.h
View File

@ -1,10 +1,11 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
struct font { struct font {
uint32_t height; u32 height;
uint32_t width; u32 width;
uint32_t yoffset; u32 yoffset;
char *bitmap; char *bitmap;
}; };

7
headers/gdt.h
View File

@ -1,14 +1,15 @@
#pragma once #pragma once
#include "tss.h" #include "tss.h"
#include "types.h"
#include <stdint.h> #include <stdint.h>
#define GDT_SIZE 8 #define GDT_SIZE 8
// https://wiki.osdev.org/Global_Descriptor_Table#GDTR // https://wiki.osdev.org/Global_Descriptor_Table#GDTR
struct gdt_descriptor { struct gdt_descriptor {
uint16_t size; u16 size;
uint32_t base; u32 base;
} __attribute__((packed)); } __attribute__((packed));
extern struct tss TSS; extern struct tss TSS;
@ -33,7 +34,7 @@ void init_gdt();
#define GDT_ACCESS_A_ACCESSED 0b00000001 #define GDT_ACCESS_A_ACCESSED 0b00000001
#define GDT_ACCESS_A_NOT_ACCESSED 0b00000000 #define GDT_ACCESS_A_NOT_ACCESSED 0b00000000
extern uint8_t gdt_entries[GDT_SIZE * 8]; extern u8 gdt_entries[GDT_SIZE * 8];
#define GDT_OFFSET_KERNEL_CODE 0x08 #define GDT_OFFSET_KERNEL_CODE 0x08
#define GDT_OFFSET_KERNEL_DATA 0x10 #define GDT_OFFSET_KERNEL_DATA 0x10

7
headers/icon.h
View File

@ -1,9 +1,10 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
struct icon { struct icon {
uint32_t height; u32 height;
uint32_t width; u32 width;
uint32_t *pixels; u32 *pixels;
}; };

2
headers/icons/image.h
View File

File diff suppressed because one or more lines are too long

15
headers/idt.h
View File

@ -1,20 +1,21 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
// doc : https://wiki.osdev.org/Interrupt_Descriptor_Table#IDTR // doc : https://wiki.osdev.org/Interrupt_Descriptor_Table#IDTR
struct idt_descriptor { struct idt_descriptor {
uint16_t size; u16 size;
uint32_t offset; u32 offset;
} __attribute__((packed)); } __attribute__((packed));
struct idt_entry { struct idt_entry {
uint16_t isr_low; // The lower 16 bits of the ISR's address u16 isr_low; // The lower 16 bits of the ISR's address
uint16_t kernel_cs; // The GDT segment selector that the CPU will load u16 kernel_cs; // The GDT segment selector that the CPU will load
// into CS before calling the ISR // into CS before calling the ISR
uint8_t reserved; // Set to zero u8 reserved; // Set to zero
uint8_t attributes; // Type and attributes; see the IDT page u8 attributes; // Type and attributes; see the IDT page
uint16_t isr_high; // The higher 16 bits of the ISR's address u16 isr_high; // The higher 16 bits of the ISR's address
} __attribute__((packed)); } __attribute__((packed));
#define IDT_SIZE 256 #define IDT_SIZE 256

13
headers/interrupts.h
View File

@ -1,22 +1,23 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
struct registers { struct registers {
// data segment selector // data segment selector
uint32_t ds; u32 ds;
// general purpose registers pushed by pusha // general purpose registers pushed by pusha
uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax; u32 edi, esi, ebp, esp, ebx, edx, ecx, eax;
// pushed by isr procedure // pushed by isr procedure
uint32_t int_no, err_code; u32 int_no, err_code;
// pushed by CPU automatically // pushed by CPU automatically
uint32_t eip, cs, eflags, useresp, ss; u32 eip, cs, eflags, useresp, ss;
}; };
typedef void (*isr_t)(struct registers *); typedef void (*isr_t)(struct registers *);
void isr_handler(struct registers *regs); void isr_handler(struct registers *regs);
void pic_send_eoi(uint8_t irq); void pic_send_eoi(u8 irq);
void register_interrupt_handler(int index, isr_t handler); void register_interrupt_handler(int index, isr_t handler);
static inline void cli(void) static inline void cli(void)
@ -27,4 +28,4 @@ static inline void cli(void)
static inline void sti(void) static inline void sti(void)
{ {
__asm__ volatile("sti"); __asm__ volatile("sti");
} }

5
headers/keyboard.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "types.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -116,8 +117,8 @@
#define KEY_CAPSLOCK 0x3A #define KEY_CAPSLOCK 0x3A
struct key_event { struct key_event {
uint8_t c; u8 c;
uint8_t scan_code; u8 scan_code;
}; };
struct key_event get_key(void); struct key_event get_key(void);

40
headers/memory.h
View File

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "multiboot.h" #include "multiboot.h"
#include "types.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -15,13 +16,13 @@
#define PD_SIZE 1024 #define PD_SIZE 1024
#define PAGE_MASK 0xFFFFF000 #define PAGE_MASK 0xFFFFF000
#define HEAP_END 0xC0000000 #define HEAP_END 0xC0000000
#define HEAP_START ((uint32_t) & _kernel_end - HEAP_END) #define HEAP_START ((u32) & _kernel_end - HEAP_END)
#define KERNEL_START ((uint32_t) & _kernel_start) #define KERNEL_START ((u32) & _kernel_start)
#define KERNEL_END ((uint32_t) & _kernel_end - HEAP_END) #define KERNEL_END ((u32) & _kernel_end - HEAP_END)
#define PT_START 256 #define PT_START 256
#define GET_PAGE_ADDR(pd_index, pt_index) \ #define GET_PAGE_ADDR(pd_index, pt_index) \
((((uint32_t)pd_index * 1024) + (uint32_t)pt_index) * 4096) ((((u32)pd_index * 1024) + (u32)pt_index) * 4096)
#define GET_FRAME(frame_table, i) (frame_table[i / 8] & (1 << (i % 8))) #define GET_FRAME(frame_table, i) (frame_table[i / 8] & (1 << (i % 8)))
#define SET_FRAME(frame_table, i, used) \ #define SET_FRAME(frame_table, i, used) \
@ -34,28 +35,29 @@
struct frame_zone { struct frame_zone {
void *addr; void *addr;
uint32_t first_free_frame; u32 first_free_frame;
uint8_t *frame_table; u8 *frame_table;
uint32_t total_frames; u32 total_frames;
uint32_t remaining_frames; u32 remaining_frames;
struct frame_zone *next; struct frame_zone *next;
}; };
extern uint32_t _kernel_end; extern u32 _kernel_end;
extern uint32_t _kernel_start; extern u32 _kernel_start;
extern uint32_t boot_page_directory; extern u32 boot_page_directory;
extern uint32_t *page_directory; extern u32 *page_directory;
extern uint32_t page_table_default[1024]; extern u32 page_table_default[1024];
extern uint32_t mem_size; extern u32 mem_size;
extern multiboot_memory_map_t *mmap_addr; extern multiboot_memory_map_t *mmap_addr;
extern multiboot_uint32_t mmap_length; extern multiboot_u32 mmap_length;
extern struct frame_zone *head; extern struct frame_zone *head;
uint32_t *virt_to_phys(uint32_t *virt_addr); u32 *virt_to_phys(u32 *virt_addr);
void init_memory(multiboot_info_t *mbd, uint32_t magic); void init_memory(multiboot_info_t *mbd, u32 magic);
void *alloc_frame(void); void *alloc_frame(void);
int free_frame(void *frame_ptr); int free_frame(void *frame_ptr);
i8 add_single_page(void *frame);
void *alloc_pages(size_t size, void **phys_addr); void *alloc_pages(size_t size, void **phys_addr);
int free_pages(void *page_ptr, size_t size); int free_pages(void *page_ptr, size_t size);
void init_page_table(uint32_t page_table[1024], uint16_t start); void init_page_table(u32 page_table[1024], u16 start);
int16_t add_page_table(uint16_t pd_index); int16_t add_page_table(u16 pd_index);

159
headers/multiboot.h
View File

@ -93,71 +93,71 @@
#ifndef ASM_FILE #ifndef ASM_FILE
typedef unsigned char multiboot_uint8_t; typedef unsigned char multiboot_u8;
typedef unsigned short multiboot_uint16_t; typedef unsigned short multiboot_u16;
typedef unsigned int multiboot_uint32_t; typedef unsigned int multiboot_u32;
typedef unsigned long long multiboot_uint64_t; typedef unsigned long long multiboot_u64;
struct multiboot_header { struct multiboot_header {
/* Must be MULTIBOOT_MAGIC - see above. */ /* Must be MULTIBOOT_MAGIC - see above. */
multiboot_uint32_t magic; multiboot_u32 magic;
/* Feature flags. */ /* Feature flags. */
multiboot_uint32_t flags; multiboot_u32 flags;
/* The above fields plus this one must equal 0 mod 2^32. */ /* The above fields plus this one must equal 0 mod 2^32. */
multiboot_uint32_t checksum; multiboot_u32 checksum;
/* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
multiboot_uint32_t header_addr; multiboot_u32 header_addr;
multiboot_uint32_t load_addr; multiboot_u32 load_addr;
multiboot_uint32_t load_end_addr; multiboot_u32 load_end_addr;
multiboot_uint32_t bss_end_addr; multiboot_u32 bss_end_addr;
multiboot_uint32_t entry_addr; multiboot_u32 entry_addr;
/* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
multiboot_uint32_t mode_type; multiboot_u32 mode_type;
multiboot_uint32_t width; multiboot_u32 width;
multiboot_uint32_t height; multiboot_u32 height;
multiboot_uint32_t depth; multiboot_u32 depth;
}; };
/* The symbol table for a.out. */ /* The symbol table for a.out. */
struct multiboot_aout_symbol_table { struct multiboot_aout_symbol_table {
multiboot_uint32_t tabsize; multiboot_u32 tabsize;
multiboot_uint32_t strsize; multiboot_u32 strsize;
multiboot_uint32_t addr; multiboot_u32 addr;
multiboot_uint32_t reserved; multiboot_u32 reserved;
}; };
typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
/* The section header table for ELF. */ /* The section header table for ELF. */
struct multiboot_elf_section_header_table { struct multiboot_elf_section_header_table {
multiboot_uint32_t num; multiboot_u32 num;
multiboot_uint32_t size; multiboot_u32 size;
multiboot_uint32_t addr; multiboot_u32 addr;
multiboot_uint32_t shndx; multiboot_u32 shndx;
}; };
typedef struct multiboot_elf_section_header_table typedef struct multiboot_elf_section_header_table
multiboot_elf_section_header_table_t; multiboot_elf_section_header_table_t;
struct multiboot_info { struct multiboot_info {
/* Multiboot info version number */ /* Multiboot info version number */
multiboot_uint32_t flags; multiboot_u32 flags;
/* Available memory from BIOS */ /* Available memory from BIOS */
multiboot_uint32_t mem_lower; multiboot_u32 mem_lower;
multiboot_uint32_t mem_upper; multiboot_u32 mem_upper;
/* "root" partition */ /* "root" partition */
multiboot_uint32_t boot_device; multiboot_u32 boot_device;
/* Kernel command line */ /* Kernel command line */
multiboot_uint32_t cmdline; multiboot_u32 cmdline;
/* Boot-Module list */ /* Boot-Module list */
multiboot_uint32_t mods_count; multiboot_u32 mods_count;
multiboot_uint32_t mods_addr; multiboot_u32 mods_addr;
union { union {
multiboot_aout_symbol_table_t aout_sym; multiboot_aout_symbol_table_t aout_sym;
@ -165,104 +165,105 @@ struct multiboot_info {
} u; } u;
/* Memory Mapping buffer */ /* Memory Mapping buffer */
multiboot_uint32_t mmap_length; multiboot_u32 mmap_length;
multiboot_uint32_t mmap_addr; multiboot_u32 mmap_addr;
/* Drive Info buffer */ /* Drive Info buffer */
multiboot_uint32_t drives_length; multiboot_u32 drives_length;
multiboot_uint32_t drives_addr; multiboot_u32 drives_addr;
/* ROM configuration table */ /* ROM configuration table */
multiboot_uint32_t config_table; multiboot_u32 config_table;
/* Boot Loader Name */ /* Boot Loader Name */
multiboot_uint32_t boot_loader_name; multiboot_u32 boot_loader_name;
/* APM table */ /* APM table */
multiboot_uint32_t apm_table; multiboot_u32 apm_table;
/* Video */ /* Video */
multiboot_uint32_t vbe_control_info; multiboot_u32 vbe_control_info;
multiboot_uint32_t vbe_mode_info; multiboot_u32 vbe_mode_info;
multiboot_uint16_t vbe_mode; multiboot_u16 vbe_mode;
multiboot_uint16_t vbe_interface_seg; multiboot_u16 vbe_interface_seg;
multiboot_uint16_t vbe_interface_off; multiboot_u16 vbe_interface_off;
multiboot_uint16_t vbe_interface_len; multiboot_u16 vbe_interface_len;
multiboot_uint64_t framebuffer_addr; multiboot_u64 framebuffer_addr;
multiboot_uint32_t framebuffer_pitch; multiboot_u32 framebuffer_pitch;
multiboot_uint32_t framebuffer_width; multiboot_u32 framebuffer_width;
multiboot_uint32_t framebuffer_height; multiboot_u32 framebuffer_height;
multiboot_uint8_t framebuffer_bpp; multiboot_u8 framebuffer_bpp;
#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 #define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 #define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1
#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 #define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2
multiboot_uint8_t framebuffer_type; multiboot_u8 framebuffer_type;
union { union {
struct { struct {
multiboot_uint32_t framebuffer_palette_addr; multiboot_u32 framebuffer_palette_addr;
multiboot_uint16_t framebuffer_palette_num_colors; multiboot_u16 framebuffer_palette_num_colors;
}; };
struct { struct {
multiboot_uint8_t framebuffer_red_field_position; multiboot_u8 framebuffer_red_field_position;
multiboot_uint8_t framebuffer_red_mask_size; multiboot_u8 framebuffer_red_mask_size;
multiboot_uint8_t framebuffer_green_field_position; multiboot_u8 framebuffer_green_field_position;
multiboot_uint8_t framebuffer_green_mask_size; multiboot_u8 framebuffer_green_mask_size;
multiboot_uint8_t framebuffer_blue_field_position; multiboot_u8 framebuffer_blue_field_position;
multiboot_uint8_t framebuffer_blue_mask_size; multiboot_u8 framebuffer_blue_mask_size;
}; };
}; };
}; };
typedef struct multiboot_info multiboot_info_t; typedef struct multiboot_info multiboot_info_t;
struct multiboot_color { struct multiboot_color {
multiboot_uint8_t red; multiboot_u8 red;
multiboot_uint8_t green; multiboot_u8 green;
multiboot_uint8_t blue; multiboot_u8 blue;
}; };
struct multiboot_mmap_entry { struct multiboot_mmap_entry {
multiboot_uint32_t size; multiboot_u32 size;
multiboot_uint64_t addr; multiboot_u64 addr;
multiboot_uint64_t len; multiboot_u64 len;
#define MULTIBOOT_MEMORY_AVAILABLE 1 #define MULTIBOOT_MEMORY_AVAILABLE 1
#define MULTIBOOT_MEMORY_RESERVED 2 #define MULTIBOOT_MEMORY_RESERVED 2
#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3
#define MULTIBOOT_MEMORY_NVS 4 #define MULTIBOOT_MEMORY_NVS 4
#define MULTIBOOT_MEMORY_BADRAM 5 #define MULTIBOOT_MEMORY_BADRAM 5
multiboot_uint32_t type; multiboot_u32 type;
} __attribute__((packed)); } __attribute__((packed));
typedef struct multiboot_mmap_entry multiboot_memory_map_t; typedef struct multiboot_mmap_entry multiboot_memory_map_t;
struct multiboot_mod_list { struct multiboot_mod_list {
/* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive /* the memory used goes from bytes ’mod_start’ to ’mod_end-1’ inclusive
*/ */
multiboot_uint32_t mod_start; multiboot_u32 mod_start;
multiboot_uint32_t mod_end; multiboot_u32 mod_end;
/* Module command line */ /* Module command line */
multiboot_uint32_t cmdline; multiboot_u32 cmdline;
/* padding to take it to 16 bytes (must be zero) */ /* padding to take it to 16 bytes (must be zero) */
multiboot_uint32_t pad; multiboot_u32 pad;
}; };
typedef struct multiboot_mod_list multiboot_module_t; typedef struct multiboot_mod_list multiboot_module_t;
/* APM BIOS info. */ /* APM BIOS info. */
struct multiboot_apm_info { struct multiboot_apm_info {
multiboot_uint16_t version; multiboot_u16 version;
multiboot_uint16_t cseg; multiboot_u16 cseg;
multiboot_uint32_t offset; multiboot_u32 offset;
multiboot_uint16_t cseg_16; multiboot_u16 cseg_16;
multiboot_uint16_t dseg; multiboot_u16 dseg;
multiboot_uint16_t flags; multiboot_u16 flags;
multiboot_uint16_t cseg_len; multiboot_u16 cseg_len;
multiboot_uint16_t cseg_16_len; multiboot_u16 cseg_16_len;
multiboot_uint16_t dseg_len; multiboot_u16 dseg_len;
}; };
#endif /* ! ASM_FILE */ #endif /* ! ASM_FILE */
#include "types.h"
#include <stdint.h> #include <stdint.h>
void init_multiboot(multiboot_info_t *mbd, uint32_t magic); void init_multiboot(multiboot_info_t *mbd, u32 magic);

17
headers/rtc.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
#define SECOND_REGISTER 0x00 #define SECOND_REGISTER 0x00
@ -17,14 +18,14 @@
enum { CMOS_ADDRESS = 0x70, CMOS_DATA = 0x71 }; enum { CMOS_ADDRESS = 0x70, CMOS_DATA = 0x71 };
struct rtc_date { struct rtc_date {
uint8_t second; u8 second;
uint8_t minute; u8 minute;
uint8_t hour; u8 hour;
uint8_t index_of_the_day; u8 index_of_the_day;
uint8_t day; u8 day;
uint8_t month; u8 month;
uint32_t year; u32 year;
}; };
struct rtc_date get_date(void); struct rtc_date get_date(void);

19
headers/task.h
View File

@ -2,6 +2,7 @@
#include "list.h" #include "list.h"
#include "memory.h" #include "memory.h"
#include "types.h"
#include <stdint.h> #include <stdint.h>
@ -13,14 +14,14 @@ enum owner { OWNER_KERNEL, OWNER_USER };
#define STACK_SIZE PAGE_SIZE * 4 #define STACK_SIZE PAGE_SIZE * 4
struct task { struct task {
uint32_t *esp; u32 *esp;
uint32_t *esp0; u32 *esp0;
uint32_t *cr3; // physical u32 *cr3; // physical
uint32_t *heap; // virtual u32 *heap; // virtual
uint32_t *eip; u32 *eip;
uint16_t pid; u16 pid;
uint8_t status; u8 status;
uint8_t owner_id; u8 uid;
struct task *daddy; struct task *daddy;
struct task *child; struct task *child;
struct list **signals; struct list **signals;
@ -31,4 +32,4 @@ struct task {
void scheduler(void); void scheduler(void);
void switch_to_task(struct task *next_task); void switch_to_task(struct task *next_task);
void exec_fn(void (*fn)(void)); void exec_fn(void (*fn)(void));
int create_kernel_task(void); i8 create_kernel_task(void);

23
headers/terminal.h
View File

@ -3,6 +3,7 @@
#include "font.h" #include "font.h"
#include "icon.h" #include "icon.h"
#include "keyboard.h" #include "keyboard.h"
#include "types.h"
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
@ -18,10 +19,10 @@
struct screen { struct screen {
size_t row; size_t row;
size_t column; size_t column;
uint32_t fg_color; u32 fg_color;
uint32_t bg_color; u32 bg_color;
uint8_t buffer[VGA_WIDTH * VGA_HEIGHT]; u8 buffer[VGA_WIDTH * VGA_HEIGHT];
uint32_t default_color; u32 default_color;
struct icon *background; struct icon *background;
struct font *font; struct font *font;
char line[256]; char line[256];
@ -49,8 +50,8 @@ typedef enum {
enum cursor_direction { LEFT, RIGHT, UP, DOWN }; enum cursor_direction { LEFT, RIGHT, UP, DOWN };
void terminal_initialize(void); void terminal_initialize(void);
void terminal_set_bg_color(uint32_t color); void terminal_set_bg_color(u32 color);
void terminal_set_fg_color(uint32_t color); void terminal_set_fg_color(u32 color);
int terminal_putchar(char c); int terminal_putchar(char c);
int terminal_write(const char *data, size_t size); int terminal_write(const char *data, size_t size);
int terminal_writestring(const char *data); int terminal_writestring(const char *data);
@ -62,9 +63,9 @@ struct key_event terminal_getkey(void);
void update_cursor(void); void update_cursor(void);
void move_cursor(int direction); void move_cursor(int direction);
void set_color_level(int level); void set_color_level(int level);
void terminal_set_default_fg_color(uint32_t fg_color); void terminal_set_default_fg_color(u32 fg_color);
void terminal_set_default_bg_color(uint32_t fg_color); void terminal_set_default_bg_color(u32 fg_color);
void terminal_change_default_fg_color(uint32_t color); void terminal_change_default_fg_color(u32 color);
uint32_t terminal_get_default_color(void); u32 terminal_get_default_color(void);
uint8_t terminal_get_char(int column, int row); u8 terminal_get_char(int column, int row);
void terminal_remove_last_char(void); void terminal_remove_last_char(void);

3
headers/time.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
void sleep(uint64_t delay); void sleep(u64 delay);

77
headers/tss.h
View File

@ -1,60 +1,61 @@
#pragma once #pragma once
#include "types.h"
#include <stdint.h> #include <stdint.h>
// _h fields are for the offset // _h fields are for the offset
struct tss { struct tss {
uint16_t link; u16 link;
uint16_t link_h; u16 link_h;
uint32_t esp0; u32 esp0;
uint16_t ss0; u16 ss0;
uint16_t ss0_h; u16 ss0_h;
uint32_t esp1; u32 esp1;
uint16_t ss1; u16 ss1;
uint16_t ss1_h; u16 ss1_h;
uint32_t esp2; u32 esp2;
uint16_t ss2; u16 ss2;
uint16_t ss2_h; u16 ss2_h;
uint32_t cr3; u32 cr3;
uint32_t eip; u32 eip;
uint32_t eflags; u32 eflags;
uint32_t eax; u32 eax;
uint32_t ecx; u32 ecx;
uint32_t edx; u32 edx;
uint32_t ebx; u32 ebx;
uint32_t esp; u32 esp;
uint32_t ebp; u32 ebp;
uint32_t esi; u32 esi;
uint32_t edi; u32 edi;
uint16_t es; u16 es;
uint16_t es_h; u16 es_h;
uint16_t cs; u16 cs;
uint16_t cs_h; u16 cs_h;
uint16_t ss; u16 ss;
uint16_t ss_h; u16 ss_h;
uint16_t ds; u16 ds;
uint16_t ds_h; u16 ds_h;
uint16_t fs; u16 fs;
uint16_t fs_h; u16 fs_h;
uint16_t gs; u16 gs;
uint16_t gs_h; u16 gs_h;
uint16_t ldt; u16 ldt;
uint16_t ldt_h; u16 ldt_h;
uint16_t trap; u16 trap;
uint16_t iomap; u16 iomap;
}; };

15
headers/vbe.h
View File

@ -1,17 +1,18 @@
#pragma once #pragma once
#include "icon.h" #include "icon.h"
#include "types.h"
#include <stdint.h> #include <stdint.h>
struct vbe_interface { struct vbe_interface {
uint32_t *buff; u32 *buff;
uint16_t height; u16 height;
uint16_t width; u16 width;
uint32_t pitch; u32 pitch;
uint8_t bpp; u8 bpp;
}; };
extern struct vbe_interface display; extern struct vbe_interface display;
void draw_icon(uint32_t pos_x, uint32_t pos_y, struct icon *img); void draw_icon(u32 pos_x, u32 pos_y, struct icon *img);
void put_pixel(uint32_t color, uint32_t x, uint32_t y); void put_pixel(u32 color, u32 x, u32 y);

3
libbozo/headers/string.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "types.h"
#include <stddef.h> #include <stddef.h>
char *strchr(const char *str, int c); char *strchr(const char *str, int c);
@ -12,4 +13,4 @@ void *memcpy(void *dest, const void *src, size_t n);
int memcmp(const void *s1, const void *s2, size_t n); int memcmp(const void *s1, const void *s2, size_t n);
void *memset(void *str, int c, size_t n); void *memset(void *str, int c, size_t n);
void *memmove(void *dest, const void *src, size_t n); void *memmove(void *dest, const void *src, size_t n);
void bzero(void *s, size_t n); void bzero(void *s, size_t n);

13
libbozo/headers/sys/io.h
View File

@ -1,28 +1,29 @@
#pragma once #pragma once
#include "types.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
static inline void outb(uint16_t port, uint8_t val) static inline void outb(u16 port, u8 val)
{ {
__asm__ volatile("outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory"); __asm__ volatile("outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory");
} }
static inline uint8_t inb(uint16_t port) static inline u8 inb(u16 port)
{ {
uint8_t ret; u8 ret;
__asm__ volatile("inb %w1, %b0" : "=a"(ret) : "Nd"(port) : "memory"); __asm__ volatile("inb %w1, %b0" : "=a"(ret) : "Nd"(port) : "memory");
return ret; return ret;
} }
static inline void outw(uint16_t port, uint16_t val) static inline void outw(u16 port, u16 val)
{ {
__asm__ volatile("outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory"); __asm__ volatile("outb %b0, %w1" : : "a"(val), "Nd"(port) : "memory");
} }
static inline uint16_t inw(uint16_t port) static inline u16 inw(u16 port)
{ {
uint8_t ret; u8 ret;
__asm__ volatile("inb %w1, %b0" : "=a"(ret) : "Nd"(port) : "memory"); __asm__ volatile("inb %w1, %b0" : "=a"(ret) : "Nd"(port) : "memory");
return ret; return ret;
} }

14
libbozo/headers/types.h Normal file
View File

@ -0,0 +1,14 @@
#pragma once
#include <stdint.h>
// Unsigned int
typedef uint64_t u64;
typedef uint32_t u32;
typedef uint16_t u16;
typedef uint8_t u8;
// Int
typedef int64_t i64;
typedef int32_t i32;
typedef int16_t i16;
typedef int8_t i8;

5
libbozo/src/string/memcpy.c
View File

@ -1,10 +1,11 @@
#include "types.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
void *memcpy(void *dest, const void *src, size_t n) void *memcpy(void *dest, const void *src, size_t n)
{ {
uint8_t *c1 = (uint8_t *)dest; u8 *c1 = (u8 *)dest;
const uint8_t *c2 = (const uint8_t *)src; const u8 *c2 = (const u8 *)src;
for (size_t i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
c1[i] = c2[i]; c1[i] = c2[i];

3
libbozo/src/string/memset.c
View File

@ -1,9 +1,10 @@
#include "types.h"
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
void *memset(void *str, int c, size_t n) void *memset(void *str, int c, size_t n)
{ {
uint8_t *c1 = (uint8_t *)str; u8 *c1 = (u8 *)str;
for (size_t i = 0; i < n; i++) for (size_t i = 0; i < n; i++)
c1[i] = c; c1[i] = c;

8
src/drivers/clock.c
View File

@ -13,8 +13,8 @@
#define PIT_COUNT (65535 / 2) #define PIT_COUNT (65535 / 2)
#define DELAY (1000 / (PIT_FREQUENCY / PIT_COUNT)) #define DELAY (1000 / (PIT_FREQUENCY / PIT_COUNT))
static uint32_t sleep_counter; static u32 sleep_counter;
static uint32_t scheduler_counter; static u32 scheduler_counter;
static void clock_handler(struct registers *regs); static void clock_handler(struct registers *regs);
@ -38,7 +38,7 @@ void clock_init(struct registers *regs)
static void clock_handler(struct registers *regs) static void clock_handler(struct registers *regs)
{ {
(void)regs; (void)regs;
if (scheduler_counter % 10 == 0) { if (scheduler_counter % 100 == 0) {
cli(); cli();
scheduler(); scheduler();
sti(); sti();
@ -47,7 +47,7 @@ static void clock_handler(struct registers *regs)
sleep_counter--; sleep_counter--;
} }
void sleep(uint64_t delay) void sleep(u64 delay)
{ {
sleep_counter = delay / DELAY; sleep_counter = delay / DELAY;
while (sleep_counter) while (sleep_counter)

10
src/drivers/vbe.c
View File

@ -3,17 +3,17 @@
struct vbe_interface display; struct vbe_interface display;
void put_pixel(uint32_t color, uint32_t x, uint32_t y) void put_pixel(u32 color, u32 x, u32 y)
{ {
// divide by 4 because display.buff is in 32bit instead of 8bit // divide by 4 because display.buff is in 32bit instead of 8bit
const uint32_t coords = x + y * display.pitch / 4; const u32 coords = x + y * display.pitch / 4;
display.buff[coords] = color; display.buff[coords] = color;
} }
void draw_icon(uint32_t pos_x, uint32_t pos_y, struct icon *img) void draw_icon(u32 pos_x, u32 pos_y, struct icon *img)
{ {
for (uint32_t y = 0; y < img->height; y++) { for (u32 y = 0; y < img->height; y++) {
for (uint32_t x = 0; x < img->width; x++) { for (u32 x = 0; x < img->width; x++) {
put_pixel(img->pixels[y * img->width + x], pos_x + x, put_pixel(img->pixels[y * img->width + x], pos_x + x,
pos_y + y); pos_y + y);
} }

14
src/gdt/gdt.c
View File

@ -3,14 +3,14 @@
#include "gdt.h" #include "gdt.h"
#include "kprintf.h" #include "kprintf.h"
extern void set_gdt(uint32_t gdt_ptr); extern void set_gdt(u32 gdt_ptr);
struct tss TSS; struct tss TSS;
uint8_t gdt_entries[GDT_SIZE * 8]; u8 gdt_entries[GDT_SIZE * 8];
struct gdt_descriptor gdtr; struct gdt_descriptor gdtr;
static void set_gdt_entry_value(uint8_t *target, uint32_t base, uint32_t limit, static void set_gdt_entry_value(u8 *target, u32 base, u32 limit,
uint8_t access, uint8_t granularity) u8 access, u8 granularity)
{ {
if (limit > 0xFFFFF) { if (limit > 0xFFFFF) {
kprintf(KERN_ERR kprintf(KERN_ERR
@ -38,7 +38,7 @@ static void set_gdt_entry_value(uint8_t *target, uint32_t base, uint32_t limit,
void init_gdt(void) void init_gdt(void)
{ {
gdtr.size = 8 * GDT_SIZE - 1; gdtr.size = 8 * GDT_SIZE - 1;
gdtr.base = (uint32_t)&gdt_entries[0]; gdtr.base = (u32)&gdt_entries[0];
set_gdt_entry_value(gdt_entries + 0x00, 0, 0, 0, 0); // Null segment set_gdt_entry_value(gdt_entries + 0x00, 0, 0, 0, 0); // Null segment
@ -92,8 +92,8 @@ void init_gdt(void)
GDT_ACCESS_A_ACCESSED, GDT_ACCESS_A_ACCESSED,
GDT_FLAG_32BIT_MODE | GDT_FLAG_PAGE_MODE); // User stack GDT_FLAG_32BIT_MODE | GDT_FLAG_PAGE_MODE); // User stack
// TSS // TSS
set_gdt_entry_value(gdt_entries + GDT_OFFSET_TSS, (uint32_t)&TSS, set_gdt_entry_value(gdt_entries + GDT_OFFSET_TSS, (u32)&TSS,
sizeof(struct tss) - 1, 0x89, 0); sizeof(struct tss) - 1, 0x89, 0);
set_gdt(((uint32_t)&gdtr)); set_gdt(((u32)&gdtr));
} }

2
src/interrupt/handler.c
View File

@ -33,7 +33,7 @@ static isr_t interrupt_handlers[16];
void isr_handler(struct registers *regs) void isr_handler(struct registers *regs)
{ {
uint8_t i = 0; u8 i = 0;
while (i < ARRAY_SIZE(faults)) { while (i < ARRAY_SIZE(faults)) {
if (i == regs->int_no) if (i == regs->int_no)
kpanic("interrupt: %s\n", faults[i]); kpanic("interrupt: %s\n", faults[i]);

12
src/interrupt/idt.c
View File

@ -21,27 +21,27 @@ static struct idt_descriptor idtr;
void load_idt(struct idt_descriptor *idtr); void load_idt(struct idt_descriptor *idtr);
void idt_set_descriptor(uint8_t index, void *isr, uint8_t flags) void idt_set_descriptor(u8 index, void *isr, u8 flags)
{ {
struct idt_entry *descriptor = &idt_entries[index]; struct idt_entry *descriptor = &idt_entries[index];
descriptor->isr_low = (uint32_t)isr & 0xFFFF; descriptor->isr_low = (u32)isr & 0xFFFF;
descriptor->kernel_cs = GDT_OFFSET_KERNEL_CODE; descriptor->kernel_cs = GDT_OFFSET_KERNEL_CODE;
descriptor->attributes = flags; descriptor->attributes = flags;
descriptor->isr_high = (uint32_t)isr >> 16; descriptor->isr_high = (u32)isr >> 16;
descriptor->reserved = 0; descriptor->reserved = 0;
} }
void init_idt(void) void init_idt(void)
{ {
idtr.offset = (uintptr_t)&idt_entries[0]; idtr.offset = (uintptr_t)&idt_entries[0];
idtr.size = (uint16_t)sizeof(struct idt_entry) * IDT_SIZE - 1; idtr.size = (u16)sizeof(struct idt_entry) * IDT_SIZE - 1;
uint8_t i; u8 i;
for (i = 0; i < 32; i++) for (i = 0; i < 32; i++)
idt_set_descriptor(i, isr_stub_table[i], 0x8E); idt_set_descriptor(i, isr_stub_table[i], 0x8E);
pic_remap(0x20, 0x28); pic_remap(0x20, 0x28);
for (uint8_t j = 0; j < 16; j++) for (u8 j = 0; j < 16; j++)
idt_set_descriptor(i + j, irq_stub_table[j], 0x8E); idt_set_descriptor(i + j, irq_stub_table[j], 0x8E);
load_idt(&idtr); load_idt(&idtr);
__asm__ volatile("sti"); __asm__ volatile("sti");

7
src/interrupt/msr.c
View File

@ -1,8 +1,9 @@
#include "types.h"
#include <cpuid.h> #include <cpuid.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
const uint32_t CPUID_FLAG_MSR = 1 << 5; const u32 CPUID_FLAG_MSR = 1 << 5;
bool cpu_has_msr() bool cpu_has_msr()
{ {
@ -11,12 +12,12 @@ bool cpu_has_msr()
return edx & CPUID_FLAG_MSR; return edx & CPUID_FLAG_MSR;
} }
void cpu_get_msr(uint32_t msr, uint32_t *lo, uint32_t *hi) void cpu_get_msr(u32 msr, u32 *lo, u32 *hi)
{ {
asm volatile("rdmsr" : "=a"(*lo), "=d"(*hi) : "c"(msr)); asm volatile("rdmsr" : "=a"(*lo), "=d"(*hi) : "c"(msr));
} }
void cpu_set_msr(uint32_t msr, uint32_t lo, uint32_t hi) void cpu_set_msr(u32 msr, u32 lo, u32 hi)
{ {
asm volatile("wrmsr" : : "a"(lo), "d"(hi), "c"(msr)); asm volatile("wrmsr" : : "a"(lo), "d"(hi), "c"(msr));
} }

4
src/interrupt/pic.c
View File

@ -24,7 +24,7 @@
void pic_remap(int offset_master, int offset_slave) void pic_remap(int offset_master, int offset_slave)
{ {
uint8_t a1, a2; u8 a1, a2;
a1 = inb(PIC1_DATA); // save masks a1 = inb(PIC1_DATA); // save masks
a2 = inb(PIC2_DATA); a2 = inb(PIC2_DATA);
@ -56,7 +56,7 @@ void pic_remap(int offset_master, int offset_slave)
outb(PIC2_DATA, a2); outb(PIC2_DATA, a2);
} }
void pic_send_eoi(uint8_t irq) void pic_send_eoi(u8 irq)
{ {
if (irq >= 8) if (irq >= 8)
outb(PIC2_COMMAND, PIC_EOI); outb(PIC2_COMMAND, PIC_EOI);

14
src/kernel.c
View File

@ -38,17 +38,16 @@ static void uwu(void)
static void owo(void) static void owo(void)
{ {
while (true) while (true)
kprintf("owo\n"); kprintf("owoooooooooooooooooooooooooooooooooooo\n");
} }
static void awa(void) static void awa(void)
{ {
kprintf("awa\n");
while (true) while (true)
; kprintf("awaille\n");
} }
void kernel_main(multiboot_info_t *mbd, uint32_t magic) void kernel_main(multiboot_info_t *mbd, u32 magic)
{ {
terminal_initialize(); terminal_initialize();
init_gdt(); init_gdt();
@ -62,9 +61,10 @@ void kernel_main(multiboot_info_t *mbd, uint32_t magic)
*/ */
/* "Martin 03:50, 22 March 2009 (UTC)\n"); */ /* "Martin 03:50, 22 March 2009 (UTC)\n"); */
create_kernel_task(); create_kernel_task();
exec_fn(owo);
exec_fn(awa); exec_fn(awa);
exec_fn(awa); /* exec_fn(owo); */
exec_fn(awa); /* exec_fn(owo); */
exec_fn(awa); /* exec_fn(owo); */
shell_init(); shell_init();
} }

4
src/kpanic.c
View File

@ -6,7 +6,7 @@
#include "power.h" #include "power.h"
#include "terminal.h" #include "terminal.h"
extern uint32_t page_table1[1024]; extern u32 page_table1[1024];
__attribute__((noreturn)) void kpanic(const char *format, ...) __attribute__((noreturn)) void kpanic(const char *format, ...)
{ {
@ -17,7 +17,7 @@ __attribute__((noreturn)) void kpanic(const char *format, ...)
va_start(va, format); va_start(va, format);
kvprintf(format, &va); kvprintf(format, &va);
va_end(va); va_end(va);
uint32_t faulting_address; u32 faulting_address;
__asm__ __volatile__("mov %%cr2, %0" : "=r"(faulting_address)); __asm__ __volatile__("mov %%cr2, %0" : "=r"(faulting_address));
kprintf("fault at address: %p\n", faulting_address); kprintf("fault at address: %p\n", faulting_address);
/* for (int i = 16; i < 32; i++) */ /* for (int i = 16; i < 32; i++) */

12
src/kprint/kvprintf.c
View File

@ -5,7 +5,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h> #include <stdint.h>
int print_int_base(int64_t number, const char *prefix, const char *base); int print_int_base(i64 number, const char *prefix, const char *base);
static int get_level(const char *str) static int get_level(const char *str)
{ {
@ -20,19 +20,19 @@ static int print_flag(char flag, va_list *ap)
case '%': case '%':
return terminal_putchar('%'); return terminal_putchar('%');
case 'i': case 'i':
return print_int_base(va_arg(*ap, int32_t), NULL, BASE_DECA); return print_int_base(va_arg(*ap, i32), NULL, BASE_DECA);
case 'd': case 'd':
return print_int_base(va_arg(*ap, int32_t), NULL, BASE_DECA); return print_int_base(va_arg(*ap, i32), NULL, BASE_DECA);
case 'c': case 'c':
return terminal_putchar(va_arg(*ap, int)); return terminal_putchar(va_arg(*ap, int));
case 's': case 's':
return terminal_writestring(va_arg(*ap, char *)); return terminal_writestring(va_arg(*ap, char *));
case 'p': case 'p':
return print_int_base(va_arg(*ap, uint32_t), "0x", BASE_HEXA); return print_int_base(va_arg(*ap, u32), "0x", BASE_HEXA);
case 'x': case 'x':
return print_int_base(va_arg(*ap, int32_t), "0x", BASE_HEXA); return print_int_base(va_arg(*ap, i32), "0x", BASE_HEXA);
case 'u': case 'u':
return print_int_base(va_arg(*ap, uint32_t), NULL, BASE_DECA); return print_int_base(va_arg(*ap, u32), NULL, BASE_DECA);
} }
return 0; return 0;
} }

6
src/kprint/print_int_base.c
View File

@ -3,11 +3,11 @@
#include "string.h" #include "string.h"
#include "terminal.h" #include "terminal.h"
int print_int_base(int64_t number, const char *prefix, const char *base) int print_int_base(i64 number, const char *prefix, const char *base)
{ {
const int base_size = strlen(base); const int base_size = strlen(base);
uint64_t div = 1; u64 div = 1;
uint32_t tmp; u32 tmp;
int rv = 0; int rv = 0;
if (prefix) if (prefix)

2
src/memory/frame.c
View File

@ -34,7 +34,7 @@ int free_frame(void *frame_ptr)
frame_ptr >= it->addr + it->total_frames * PAGE_SIZE)) frame_ptr >= it->addr + it->total_frames * PAGE_SIZE))
it = it->next; it = it->next;
uint32_t index = ((frame_ptr - it->addr) / PAGE_SIZE); u32 index = ((frame_ptr - it->addr) / PAGE_SIZE);
SET_FRAME(it->frame_table, index, 0); SET_FRAME(it->frame_table, index, 0);
if (it->first_free_frame > index) if (it->first_free_frame > index)
it->first_free_frame = index; it->first_free_frame = index;

38
src/memory/memory.c
View File

@ -4,10 +4,10 @@
#include <stdint.h> #include <stdint.h>
uint32_t *page_directory = &boot_page_directory; u32 *page_directory = &boot_page_directory;
uint32_t page_table_default[1024] __attribute__((aligned(PAGE_SIZE))); u32 page_table_default[1024] __attribute__((aligned(PAGE_SIZE)));
uint32_t frame_zones_page_table[1024] __attribute__((aligned(PAGE_SIZE))); u32 frame_zones_page_table[1024] __attribute__((aligned(PAGE_SIZE)));
uint32_t mem_size; u32 mem_size;
struct frame_zone *head; struct frame_zone *head;
static void lst_add_back(struct frame_zone **root, struct frame_zone *element) static void lst_add_back(struct frame_zone **root, struct frame_zone *element)
@ -24,16 +24,16 @@ static void lst_add_back(struct frame_zone **root, struct frame_zone *element)
static void add_frame_node(multiboot_memory_map_t *mmmt) static void add_frame_node(multiboot_memory_map_t *mmmt)
{ {
static uint32_t index; static u32 index;
/** /**
* # = kernel code * # = kernel code
* - = blank * - = blank
*/ */
uint64_t start_addr = mmmt->addr; u64 start_addr = mmmt->addr;
uint64_t end_addr = mmmt->addr + mmmt->len; u64 end_addr = mmmt->addr + mmmt->len;
uint64_t len = mmmt->len; u64 len = mmmt->len;
/** Kernel code cover all the block /** Kernel code cover all the block
* this situation: * this situation:
@ -62,21 +62,21 @@ static void add_frame_node(multiboot_memory_map_t *mmmt)
init_page_table(frame_zones_page_table, 0); init_page_table(frame_zones_page_table, 0);
page_directory[1022] = page_directory[1022] =
((uint32_t)frame_zones_page_table - HEAP_END) | 0x03; ((u32)frame_zones_page_table - HEAP_END) | 0x03;
frame_zones_page_table[index] = frame_zones_page_table[index] =
((uint32_t)start_addr & PAGE_MASK) | INIT_FLAGS; ((u32)start_addr & PAGE_MASK) | INIT_FLAGS;
struct frame_zone *current = struct frame_zone *current =
(struct frame_zone *)GET_PAGE_ADDR(1022, index++); (struct frame_zone *)GET_PAGE_ADDR(1022, index++);
current->frame_table = (uint8_t *)current + sizeof(struct frame_zone); current->frame_table = (u8 *)current + sizeof(struct frame_zone);
/** 8 is cause we are using uint8_t /** 8 is cause we are using u8
nb_frame = size / (PAGE_SIZE + 1 / 8) nb_frame = size / (PAGE_SIZE + 1 / 8)
cause we are using non decimal number cause we are using non decimal number
nb_frame = ((size * 8) / (PAGE_SIZE * 8 + 1)) nb_frame = ((size * 8) / (PAGE_SIZE * 8 + 1))
*/ */
const uint32_t nb_frame = ((len * 8) / (PAGE_SIZE * 8 + 1)); const u32 nb_frame = ((len * 8) / (PAGE_SIZE * 8 + 1));
current->first_free_frame = 0; current->first_free_frame = 0;
current->next = NULL; current->next = NULL;
current->remaining_frames = nb_frame; current->remaining_frames = nb_frame;
@ -85,10 +85,10 @@ static void add_frame_node(multiboot_memory_map_t *mmmt)
memset(current->frame_table, 0, memset(current->frame_table, 0,
nb_frame * sizeof(*current->frame_table)); nb_frame * sizeof(*current->frame_table));
uint32_t i = 1; u32 i = 1;
for (; i < CEIL(nb_frame, PAGE_SIZE); i++) for (; i < CEIL(nb_frame, PAGE_SIZE); i++)
frame_zones_page_table[index + i] = frame_zones_page_table[index + i] =
((uint32_t)(start_addr + i * PAGE_SIZE) & PAGE_MASK) | ((u32)(start_addr + i * PAGE_SIZE) & PAGE_MASK) |
INIT_FLAGS; INIT_FLAGS;
current->addr = (void *)start_addr + i * PAGE_SIZE; current->addr = (void *)start_addr + i * PAGE_SIZE;
index += i - 1; index += i - 1;
@ -97,7 +97,7 @@ static void add_frame_node(multiboot_memory_map_t *mmmt)
static void init_frame_zones(void) static void init_frame_zones(void)
{ {
for (uint32_t i = 0; i < mmap_length; i++) { for (u32 i = 0; i < mmap_length; i++) {
multiboot_memory_map_t *mmmt = multiboot_memory_map_t *mmmt =
(multiboot_memory_map_t *)mmap_addr + i; (multiboot_memory_map_t *)mmap_addr + i;
if (mmmt->type == MULTIBOOT_MEMORY_AVAILABLE) if (mmmt->type == MULTIBOOT_MEMORY_AVAILABLE)
@ -105,12 +105,12 @@ static void init_frame_zones(void)
} }
} }
void init_memory(multiboot_info_t *mbd, uint32_t magic) void init_memory(multiboot_info_t *mbd, u32 magic)
{ {
for (uint16_t i = 0; i < 0x300; i++) for (u16 i = 0; i < 0x300; i++)
page_directory[i] = 0x02; page_directory[i] = 0x02;
init_page_table(page_table_default, 0); init_page_table(page_table_default, 0);
page_directory[0] = ((uint32_t)page_table_default - HEAP_END) | 0x03; page_directory[0] = ((u32)page_table_default - HEAP_END) | 0x03;
init_multiboot(mbd, magic); init_multiboot(mbd, magic);
init_frame_zones(); init_frame_zones();
} }

52
src/memory/page.c
View File

@ -8,8 +8,8 @@
#include "string.h" #include "string.h"
#include "utils.h" #include "utils.h"
static int16_t find_next_block(size_t nb_pages, uint16_t *pd_index_ptr, static i16 find_next_block(size_t nb_pages, u16 *pd_index_ptr,
uint32_t **page_table_ptr) u32 **page_table_ptr)
{ {
for (*pd_index_ptr = 1; *pd_index_ptr < 768; (*pd_index_ptr)++) { for (*pd_index_ptr = 1; *pd_index_ptr < 768; (*pd_index_ptr)++) {
if (page_directory[(*pd_index_ptr)] == 0x02) { if (page_directory[(*pd_index_ptr)] == 0x02) {
@ -17,9 +17,9 @@ static int16_t find_next_block(size_t nb_pages, uint16_t *pd_index_ptr,
return -2; return -2;
} }
*page_table_ptr = *page_table_ptr =
(uint32_t *)GET_PAGE_ADDR(0, *pd_index_ptr + PT_START); (u32 *)GET_PAGE_ADDR(0, *pd_index_ptr + PT_START);
for (uint16_t i = 0; i + nb_pages - 1 < PT_SIZE; i++) { for (u16 i = 0; i + nb_pages - 1 < PT_SIZE; i++) {
uint16_t j; u16 j;
for (j = 0; (*page_table_ptr)[i + j] >> 12 == i + j && for (j = 0; (*page_table_ptr)[i + j] >> 12 == i + j &&
j < nb_pages; j < nb_pages;
j++) j++)
@ -32,12 +32,26 @@ static int16_t find_next_block(size_t nb_pages, uint16_t *pd_index_ptr,
return -1; return -1;
} }
i8 add_single_page(void *frame)
{
u16 pd_index;
u32 *page_table;
const i16 i = find_next_block(1, &pd_index, &page_table);
if (i < 0) {
kprintf(KERN_CRIT "impossible to add page to page directory\n");
return -1;
}
page_table[i] = ((u32)frame & PAGE_MASK) | INIT_FLAGS;
return 0;
}
void *alloc_pages(size_t size, void **phys_addr) void *alloc_pages(size_t size, void **phys_addr)
{ {
const uint32_t nb_pages = CEIL(size, PAGE_SIZE); const u32 nb_pages = CEIL(size, PAGE_SIZE);
uint16_t pd_index; u16 pd_index;
uint32_t *page_table; u32 *page_table;
const int16_t index = find_next_block(nb_pages, &pd_index, &page_table); const i16 index = find_next_block(nb_pages, &pd_index, &page_table);
if (index < 0) { if (index < 0) {
kprintf(KERN_CRIT "%d: Not enough pages (max: %d)\n", index, kprintf(KERN_CRIT "%d: Not enough pages (max: %d)\n", index,
@ -53,7 +67,7 @@ void *alloc_pages(size_t size, void **phys_addr)
} }
if (phys_addr) if (phys_addr)
*phys_addr = frame; *phys_addr = frame;
page_table[i] = ((uint32_t)frame & PAGE_MASK) | INIT_FLAGS; page_table[i] = ((u32)frame & PAGE_MASK) | INIT_FLAGS;
} }
memset((void *)GET_PAGE_ADDR(pd_index, index), 0, nb_pages * PAGE_SIZE); memset((void *)GET_PAGE_ADDR(pd_index, index), 0, nb_pages * PAGE_SIZE);
return (void *)GET_PAGE_ADDR(pd_index, index); return (void *)GET_PAGE_ADDR(pd_index, index);
@ -61,13 +75,13 @@ void *alloc_pages(size_t size, void **phys_addr)
int free_pages(void *page_ptr, size_t size) int free_pages(void *page_ptr, size_t size)
{ {
const uint32_t page_addr = (uint32_t)page_ptr; const u32 page_addr = (u32)page_ptr;
const uint32_t nb_pages = CEIL(size, PAGE_SIZE); const u32 nb_pages = CEIL(size, PAGE_SIZE);
const uint32_t page_index = page_addr / PAGE_SIZE; const u32 page_index = page_addr / PAGE_SIZE;
const uint32_t pd_index = page_index / PD_SIZE; const u32 pd_index = page_index / PD_SIZE;
const uint32_t pt_index = page_index % PD_SIZE; const u32 pt_index = page_index % PD_SIZE;
if ((uint32_t)pd_index > 0x300) { if ((u32)pd_index > 0x300) {
kprintf(KERN_WARNING "Address out of range\n"); kprintf(KERN_WARNING "Address out of range\n");
return -1; return -1;
} else if (page_addr % PAGE_SIZE) { } else if (page_addr % PAGE_SIZE) {
@ -77,9 +91,9 @@ int free_pages(void *page_ptr, size_t size)
kprintf(KERN_WARNING "Invalid number of frames\n"); kprintf(KERN_WARNING "Invalid number of frames\n");
return -1; return -1;
} }
uint32_t *page_table = u32 *page_table =
(uint32_t *)GET_PAGE_ADDR(0, PT_START + pd_index); (u32 *)GET_PAGE_ADDR(0, PT_START + pd_index);
for (uint16_t i = pt_index; i < pt_index + nb_pages; i++) { for (u16 i = pt_index; i < pt_index + nb_pages; i++) {
if (page_table[i] >> 12 == i) { if (page_table[i] >> 12 == i) {
kprintf(KERN_WARNING "Page already free\n"); kprintf(KERN_WARNING "Page already free\n");
return -2; return -2;

14
src/memory/page_table.c
View File

@ -1,22 +1,22 @@
#include "debug.h" #include "debug.h"
#include "kprintf.h" #include "kprintf.h"
#include "memory.h" #include "memory.h"
void init_page_table(uint32_t page_table[1024], uint16_t start) void init_page_table(u32 page_table[1024], u16 start)
{ {
for (uint16_t i = start; i < 1024; i++) for (u16 i = start; i < 1024; i++)
page_table[i] = (i << 12) | 0x03; page_table[i] = (i << 12) | 0x03;
} }
int16_t add_page_table(uint16_t pd_index) i16 add_page_table(u16 pd_index)
{ {
void *frame = alloc_frame(); void *frame = alloc_frame();
if (!frame) if (!frame)
return -1; return -1;
page_table_default[PT_START + pd_index] = page_table_default[PT_START + pd_index] =
((uint32_t)frame & PAGE_MASK) | 0x03; ((u32)frame & PAGE_MASK) | 0x03;
uint32_t *page_table = u32 *page_table =
(uint32_t *)GET_PAGE_ADDR(0, PT_START + pd_index); (u32 *)GET_PAGE_ADDR(0, PT_START + pd_index);
init_page_table(page_table, 0); init_page_table(page_table, 0);
page_directory[pd_index] = ((uint32_t)frame & PAGE_MASK) | 0x03; page_directory[pd_index] = ((u32)frame & PAGE_MASK) | 0x03;
return 0; return 0;
} }

8
src/memory/virt/allocator.c
View File

@ -17,15 +17,15 @@ static void add_zone(Zone *zone, block_type_t type)
zones[type] = zone; zones[type] = zone;
} }
static void new_block(Zone *zone, uint32_t zone_size) static void new_block(Zone *zone, u32 zone_size)
{ {
Block *new_block = (Block *)align_mem((uint32_t)zone + sizeof(Zone)); Block *new_block = (Block *)align_mem((u32)zone + sizeof(Zone));
// Metadata // Metadata
new_block->in_use = false; new_block->in_use = false;
new_block->size = zone_size - sizeof(Zone) - sizeof(Block); new_block->size = zone_size - sizeof(Zone) - sizeof(Block);
new_block->sub_size = new_block->size; new_block->sub_size = new_block->size;
new_block->ptr = (Block *)((uint32_t)new_block + sizeof(Block)); new_block->ptr = (Block *)((u32)new_block + sizeof(Block));
new_block->zone = zone; new_block->zone = zone;
// Init future linked lists // Init future linked lists
@ -46,7 +46,7 @@ static void new_block(Zone *zone, uint32_t zone_size)
assert(zone->free == new_block); assert(zone->free == new_block);
} }
int new_vzone(block_type_t type, uint32_t size) int new_vzone(block_type_t type, u32 size)
{ {
void *heap = alloc_pages(size, NULL); void *heap = alloc_pages(size, NULL);
if (heap == NULL) { if (heap == NULL) {

6
src/memory/virt/info.c
View File

@ -8,7 +8,7 @@
void show_valloc_mem(void) void show_valloc_mem(void)
{ {
char *const zones_name[3] = {"TINY", "SMALL", "LARGE"}; char *const zones_name[3] = {"TINY", "SMALL", "LARGE"};
uint32_t total_size = 0; u32 total_size = 0;
for (block_type_t type = 0; type < 3; ++type) { for (block_type_t type = 0; type < 3; ++type) {
int count = 0; int count = 0;
@ -23,7 +23,7 @@ void show_valloc_mem(void)
/* i++; */ /* i++; */
/* if (i < 10) */ /* if (i < 10) */
kprintf("%p - %p : %u bytes\n", block_it->ptr, kprintf("%p - %p : %u bytes\n", block_it->ptr,
(uint32_t)block_it->ptr + (u32)block_it->ptr +
block_it->sub_size + sizeof(Block), block_it->sub_size + sizeof(Block),
block_it->sub_size); block_it->sub_size);
total_size += block_it->sub_size; total_size += block_it->sub_size;
@ -39,7 +39,7 @@ void show_valloc_mem(void)
for (Block *block_it = zone_it->free; block_it != NULL; for (Block *block_it = zone_it->free; block_it != NULL;
block_it = block_it->next_free) { block_it = block_it->next_free) {
kprintf("%p - %p : %u bytes\n", block_it->ptr, kprintf("%p - %p : %u bytes\n", block_it->ptr,
(uint32_t)block_it->ptr + (u32)block_it->ptr +
block_it->sub_size + sizeof(Block), block_it->sub_size + sizeof(Block),
block_it->sub_size); block_it->sub_size);
} }

2
src/memory/virt/vfree.c
View File

@ -98,7 +98,7 @@ void vfree(void *ptr)
{ {
if (ptr == NULL) if (ptr == NULL)
return; return;
Block *to_free = (Block *)((uint32_t)ptr - sizeof(Block)); Block *to_free = (Block *)((u32)ptr - sizeof(Block));
Block *to_merge = NULL; Block *to_merge = NULL;
to_free->in_use = false; to_free->in_use = false;
remove_used(to_free); remove_used(to_free);

14
src/memory/virt/vmalloc.c
View File

@ -8,7 +8,7 @@
* Find first available (not in_use) block * Find first available (not in_use) block
* in a zone matching the size we need * in a zone matching the size we need
*/ */
static Block *find_block(Zone *head, uint32_t size) static Block *find_block(Zone *head, u32 size)
{ {
for (Zone *zone_it = head; zone_it != NULL; zone_it = zone_it->next) { for (Zone *zone_it = head; zone_it != NULL; zone_it = zone_it->next) {
for (Block *block_it = zone_it->free; block_it != NULL; for (Block *block_it = zone_it->free; block_it != NULL;
@ -46,17 +46,17 @@ static Block *find_block(Zone *head, uint32_t size)
* We can see that it now has its own metadata and available * We can see that it now has its own metadata and available
* data and it points towards [6] * data and it points towards [6]
*/ */
static void frag_block(Zone *zone, Block *old_block, uint32_t size) static void frag_block(Zone *zone, Block *old_block, u32 size)
{ {
Block *new_block = (Block *)align_mem((uint32_t)old_block + size); Block *new_block = (Block *)align_mem((u32)old_block + size);
assert(new_block < assert(new_block <
(Block *)((uint32_t)zone + get_zone_size(zone->type))); (Block *)((u32)zone + get_zone_size(zone->type)));
// Newly created block metadata // Newly created block metadata
new_block->size = old_block->size - align_mem(size); new_block->size = old_block->size - align_mem(size);
new_block->sub_size = new_block->size; new_block->sub_size = new_block->size;
new_block->in_use = false; new_block->in_use = false;
new_block->ptr = (void *)((uint32_t)new_block + sizeof(Block)); new_block->ptr = (void *)((u32)new_block + sizeof(Block));
new_block->zone = zone; new_block->zone = zone;
new_block->prev = old_block; new_block->prev = old_block;
@ -120,7 +120,7 @@ static void save_block(Zone *head, Block *block, Zone *zone)
* *
* ptr: returns the aligned pointer of the block (after the metadata) * ptr: returns the aligned pointer of the block (after the metadata)
*/ */
void *vmalloc(uint32_t size) void *vmalloc(u32 size)
{ {
void *ptr = NULL; void *ptr = NULL;
@ -136,7 +136,7 @@ void *vmalloc(uint32_t size)
// Find an available block in a zone of type "type" // Find an available block in a zone of type "type"
Block *available = find_block(head, size); Block *available = find_block(head, size);
if (available == NULL) { if (available == NULL) {
uint32_t full_size; u32 full_size;
if (type == LARGE) if (type == LARGE)
full_size = size + sizeof(Block) + sizeof(Zone); full_size = size + sizeof(Block) + sizeof(Zone);
else else

6
src/memory/virt/vrealloc.c
View File

@ -4,7 +4,7 @@
// Prototype for kfree and vmalloc // Prototype for kfree and vmalloc
void kfree(void *ptr); void kfree(void *ptr);
void *vmalloc(uint32_t size); void *vmalloc(u32 size);
/* /*
* ptr: block to resize (undefined behavior if invalid) * ptr: block to resize (undefined behavior if invalid)
@ -18,12 +18,12 @@ void *vmalloc(uint32_t size);
* *
* ptr: returns the aligned pointer of the vreallocated block * ptr: returns the aligned pointer of the vreallocated block
*/ */
void *vrealloc(void *ptr, uint32_t size) void *vrealloc(void *ptr, u32 size)
{ {
void *new_ptr = NULL; void *new_ptr = NULL;
if (ptr == NULL) if (ptr == NULL)
return NULL; return NULL;
Block *block = (Block *)((uint32_t)ptr - sizeof(Block)); Block *block = (Block *)((u32)ptr - sizeof(Block));
if (block->size >= size) { if (block->size >= size) {
block->sub_size = size; block->sub_size = size;
return (ptr); return (ptr);

4
src/memory/virt/vsize.c
View File

@ -1,9 +1,9 @@
#include "alloc.h" #include "alloc.h"
#include <stdint.h> #include <stdint.h>
uint32_t vsize(void *ptr) u32 vsize(void *ptr)
{ {
Block *meta_data = (Block *)((uint32_t)ptr - sizeof(Block)); Block *meta_data = (Block *)((u32)ptr - sizeof(Block));
return meta_data->sub_size; return meta_data->sub_size;
} }

30
src/multiboot.c
View File

@ -9,21 +9,21 @@
#include "utils.h" #include "utils.h"
#include "vbe.h" #include "vbe.h"
uint32_t multiboot_page_table[1024] __attribute__((aligned(PAGE_SIZE))); u32 multiboot_page_table[1024] __attribute__((aligned(PAGE_SIZE)));
uint32_t vbe_page_table[1024] __attribute__((aligned(PAGE_SIZE))); u32 vbe_page_table[1024] __attribute__((aligned(PAGE_SIZE)));
multiboot_memory_map_t *mmap_addr; multiboot_memory_map_t *mmap_addr;
multiboot_uint32_t mmap_length; multiboot_u32 mmap_length;
static void init_mmap(multiboot_info_t *mbd_virt, size_t *pt_index) static void init_mmap(multiboot_info_t *mbd_virt, size_t *pt_index)
{ {
// Index mbd->mmap_addr pointers // Index mbd->mmap_addr pointers
uint32_t i = 0; u32 i = 0;
for (; i < mbd_virt->mmap_length; i++) for (; i < mbd_virt->mmap_length; i++)
multiboot_page_table[i + *pt_index] = multiboot_page_table[i + *pt_index] =
((mbd_virt->mmap_addr + i * PAGE_SIZE) & PAGE_MASK) | ((mbd_virt->mmap_addr + i * PAGE_SIZE) & PAGE_MASK) |
INIT_FLAGS; INIT_FLAGS;
mmap_addr = (multiboot_memory_map_t *)(GET_PAGE_ADDR(1023, *pt_index) + mmap_addr = (multiboot_memory_map_t *)(GET_PAGE_ADDR(1023, *pt_index) +
(uint32_t)mbd_virt->mmap_addr % (u32)mbd_virt->mmap_addr %
PAGE_SIZE); PAGE_SIZE);
mmap_length = mbd_virt->mmap_length / sizeof(multiboot_memory_map_t); mmap_length = mbd_virt->mmap_length / sizeof(multiboot_memory_map_t);
*pt_index += i; *pt_index += i;
@ -31,15 +31,15 @@ static void init_mmap(multiboot_info_t *mbd_virt, size_t *pt_index)
static void init_vbe(multiboot_info_t *mbd_virt) static void init_vbe(multiboot_info_t *mbd_virt)
{ {
const uint32_t framebuffer_size = const u32 framebuffer_size =
mbd_virt->framebuffer_height * mbd_virt->framebuffer_pitch; mbd_virt->framebuffer_height * mbd_virt->framebuffer_pitch;
for (uint32_t i = 0; i < CEIL(framebuffer_size, PAGE_SIZE); i++) { for (u32 i = 0; i < CEIL(framebuffer_size, PAGE_SIZE); i++) {
vbe_page_table[i % 1024] = vbe_page_table[i % 1024] =
((mbd_virt->framebuffer_addr + i * PAGE_SIZE) & PAGE_MASK) | ((mbd_virt->framebuffer_addr + i * PAGE_SIZE) & PAGE_MASK) |
INIT_FLAGS; INIT_FLAGS;
} }
page_directory[800] = ((uint32_t)vbe_page_table - HEAP_END) | 0x03; page_directory[800] = ((u32)vbe_page_table - HEAP_END) | 0x03;
display.buff = (uint32_t *)GET_PAGE_ADDR(800, 0) + display.buff = (u32 *)GET_PAGE_ADDR(800, 0) +
(mbd_virt->framebuffer_addr % PAGE_SIZE); (mbd_virt->framebuffer_addr % PAGE_SIZE);
display.height = mbd_virt->framebuffer_height; display.height = mbd_virt->framebuffer_height;
display.width = mbd_virt->framebuffer_width; display.width = mbd_virt->framebuffer_width;
@ -47,24 +47,24 @@ static void init_vbe(multiboot_info_t *mbd_virt)
display.bpp = mbd_virt->framebuffer_bpp; display.bpp = mbd_virt->framebuffer_bpp;
} }
void init_multiboot(multiboot_info_t *mbd, uint32_t magic) void init_multiboot(multiboot_info_t *mbd, u32 magic)
{ {
if (magic != MULTIBOOT_BOOTLOADER_MAGIC) if (magic != MULTIBOOT_BOOTLOADER_MAGIC)
kpanic("invalid magic number! (git good skill issue)"); kpanic("invalid magic number! (git good skill issue)");
init_page_table(multiboot_page_table, 0); init_page_table(multiboot_page_table, 0);
page_directory[1023] = page_directory[1023] =
((uint32_t)multiboot_page_table - HEAP_END) | 0x03; ((u32)multiboot_page_table - HEAP_END) | 0x03;
size_t pt_index = CEIL( size_t pt_index = CEIL(
(uint32_t)mbd % PAGE_SIZE + sizeof(multiboot_info_t), PAGE_SIZE); (u32)mbd % PAGE_SIZE + sizeof(multiboot_info_t), PAGE_SIZE);
// Index multiboot_info_t struct // Index multiboot_info_t struct
for (uint32_t i = 0; i < pt_index; i++) for (u32 i = 0; i < pt_index; i++)
multiboot_page_table[i] = multiboot_page_table[i] =
(((uint32_t)mbd + PAGE_SIZE * i) & PAGE_MASK) | INIT_FLAGS; (((u32)mbd + PAGE_SIZE * i) & PAGE_MASK) | INIT_FLAGS;
multiboot_info_t *mbd_virt = multiboot_info_t *mbd_virt =
(multiboot_info_t *)(GET_PAGE_ADDR(1023, 0) + (multiboot_info_t *)(GET_PAGE_ADDR(1023, 0) +
(uint32_t)mbd % PAGE_SIZE); (u32)mbd % PAGE_SIZE);
init_mmap(mbd_virt, &pt_index); init_mmap(mbd_virt, &pt_index);
init_vbe(mbd_virt); init_vbe(mbd_virt);
} }

14
src/multitasking/task.c
View File

@ -7,18 +7,18 @@
#include <stdint.h> #include <stdint.h>
uint32_t esp_backup; u32 esp_backup;
static struct task *create_task(uint8_t owner_id) static struct task *create_task(u8 owner_id)
{ {
static uint32_t pid = 1; static u32 pid = 1;
struct task *new_task = vmalloc(sizeof(struct task)); struct task *new_task = vmalloc(sizeof(struct task));
if (!new_task) if (!new_task)
return NULL; return NULL;
new_task->next = current_task->next; new_task->next = current_task->next;
new_task->prev = current_task; new_task->prev = current_task;
current_task->next = new_task; current_task->next = new_task;
new_task->owner_id = owner_id; new_task->uid = owner_id;
new_task->esp0 = alloc_pages(STACK_SIZE, NULL); new_task->esp0 = alloc_pages(STACK_SIZE, NULL);
if (!new_task->esp0) { if (!new_task->esp0) {
vfree(new_task); vfree(new_task);
@ -35,13 +35,13 @@ static struct task *create_task(uint8_t owner_id)
return new_task; return new_task;
} }
int create_kernel_task(void) i8 create_kernel_task(void)
{ {
struct task *new_task = vmalloc(sizeof(struct task)); struct task *new_task = vmalloc(sizeof(struct task));
if (!new_task) if (!new_task)
return -1; return -1;
new_task->status = RUN; new_task->status = RUN;
new_task->owner_id = 0; new_task->uid = 0;
new_task->pid = 0; new_task->pid = 0;
new_task->heap = page_directory; new_task->heap = page_directory;
new_task->cr3 = page_directory - KERNEL_START; new_task->cr3 = page_directory - KERNEL_START;
@ -57,7 +57,7 @@ void exec_fn(void (*fn)(void))
if (!new_task) if (!new_task)
kpanic("failed to create new task"); kpanic("failed to create new task");
new_task->status = RUN; new_task->status = RUN;
new_task->eip = (uint32_t *)fn; new_task->eip = (u32 *)fn;
} }
/* /*

2
src/power/reboot.c
View File

@ -17,7 +17,7 @@
void reboot(void) void reboot(void)
{ {
uint8_t tmp; u8 tmp;
__asm__ volatile("cli"); /* disable all interrupts */ __asm__ volatile("cli"); /* disable all interrupts */
do { do {

10
src/rtc/rtc.c
View File

@ -4,7 +4,7 @@
#include "kprintf.h" #include "kprintf.h"
static uint16_t raw_read_register(uint16_t cmos_register) static u16 raw_read_register(u16 cmos_register)
{ {
// selecting the register // selecting the register
outb(CMOS_ADDRESS, cmos_register); outb(CMOS_ADDRESS, cmos_register);
@ -12,19 +12,19 @@ static uint16_t raw_read_register(uint16_t cmos_register)
return inb(CMOS_DATA); return inb(CMOS_DATA);
} }
static uint8_t update_is_in_progress(void) static u8 update_is_in_progress(void)
{ {
return raw_read_register(REGISTER_A) & 0x80; return raw_read_register(REGISTER_A) & 0x80;
} }
static uint16_t read_register(uint16_t cmos_register) static u16 read_register(u16 cmos_register)
{ {
while (update_is_in_progress()) while (update_is_in_progress())
kprintf("%d\n", update_is_in_progress()); kprintf("%d\n", update_is_in_progress());
return raw_read_register(cmos_register); return raw_read_register(cmos_register);
} }
uint8_t bcd_mode_to_bin(uint8_t value) u8 bcd_mode_to_bin(u8 value)
{ {
return (value & 0x0F) + ((value / 16) * 10); return (value & 0x0F) + ((value / 16) * 10);
} }
@ -32,7 +32,7 @@ uint8_t bcd_mode_to_bin(uint8_t value)
struct rtc_date get_date(void) struct rtc_date get_date(void)
{ {
struct rtc_date rv = {}; struct rtc_date rv = {};
uint8_t century; u8 century;
rv.second = read_register(SECOND_REGISTER); rv.second = read_register(SECOND_REGISTER);
rv.minute = read_register(MINUTE_REGISTER); rv.minute = read_register(MINUTE_REGISTER);

2
src/shell/commands/color_cmd.c
View File

@ -6,7 +6,7 @@
void color_cmd(char *arg) void color_cmd(char *arg)
{ {
uint8_t tmp_color; u8 tmp_color;
static const char *colors[] = { static const char *colors[] = {
"BLACK", "BLUE", "GREEN", "CYAN", "BLACK", "BLUE", "GREEN", "CYAN",
"RED", "MAGENTA", "BROWN", "LIGHT_GREY", "RED", "MAGENTA", "BROWN", "LIGHT_GREY",

2
src/terminal/get.c
View File

@ -8,7 +8,7 @@ struct key_event terminal_getkey(void)
{ {
static bool caps_mode = false; static bool caps_mode = false;
struct key_event ev = {0}; struct key_event ev = {0};
uint8_t scan_code; u8 scan_code;
scan_code = inb(KEYBOARD_PORT); scan_code = inb(KEYBOARD_PORT);
if (scan_code == 0x3A || scan_code == 0x58) { if (scan_code == 0x3A || scan_code == 0x58) {

36
src/terminal/put.c
View File

@ -42,18 +42,18 @@ void terminal_remove_last_char(void)
screen->column = VGA_WIDTH - 1; screen->column = VGA_WIDTH - 1;
screen->row--; screen->row--;
} }
uint32_t pos_x = (screen->column) * FONT_WIDTH; u32 pos_x = (screen->column) * FONT_WIDTH;
uint32_t pos_y = screen->row * FONT_HEIGHT; u32 pos_y = screen->row * FONT_HEIGHT;
struct font node = get_font_node( struct font node = get_font_node(
screen->buffer[screen->row * VGA_WIDTH + screen->column]); screen->buffer[screen->row * VGA_WIDTH + screen->column]);
screen->buffer[screen->row * VGA_WIDTH + screen->column] = '\0'; screen->buffer[screen->row * VGA_WIDTH + screen->column] = '\0';
for (uint32_t y = 0; y < node.height; y++) { for (u32 y = 0; y < node.height; y++) {
for (uint32_t x = 0; x < node.width; x++) { for (u32 x = 0; x < node.width; x++) {
// Current bg is taking too much memory // Current bg is taking too much memory
// so we do a black bg for now // so we do a black bg for now
/* struct icon *bg = screen->background; */ /* struct icon *bg = screen->background; */
/* uint32_t pixel = 0; */ /* u32 pixel = 0; */
/* if (bg->width > pos_x + x && bg->height > pos_y + y) /* if (bg->width > pos_x + x && bg->height > pos_y + y)
*/ */
/* pixel = bg->pixels[(pos_y + y) * bg->width + */ /* pixel = bg->pixels[(pos_y + y) * bg->width + */
@ -74,38 +74,38 @@ void terminal_set_screen(int pos)
/* kprintf(PROMPT); */ /* kprintf(PROMPT); */
} }
void terminal_set_bg_color(uint32_t bg_color) void terminal_set_bg_color(u32 bg_color)
{ {
screen->bg_color = bg_color; screen->bg_color = bg_color;
} }
void terminal_set_fg_color(uint32_t fg_color) void terminal_set_fg_color(u32 fg_color)
{ {
screen->fg_color = screen->fg_color; screen->fg_color = screen->fg_color;
} }
void terminal_set_color(uint32_t fg_color, uint32_t bg_color) void terminal_set_color(u32 fg_color, u32 bg_color)
{ {
screen->fg_color = fg_color; screen->fg_color = fg_color;
screen->bg_color = bg_color; screen->bg_color = bg_color;
} }
void terminal_set_default_fg_color(uint32_t fg_color) void terminal_set_default_fg_color(u32 fg_color)
{ {
screen->default_color = fg_color; screen->default_color = fg_color;
} }
uint32_t terminal_get_default_color(void) u32 terminal_get_default_color(void)
{ {
return screen->default_color; return screen->default_color;
} }
uint8_t terminal_get_char(int x, int y) u8 terminal_get_char(int x, int y)
{ {
return screen->buffer[y * VGA_WIDTH + x]; return screen->buffer[y * VGA_WIDTH + x];
} }
void terminal_putentryat(struct font node, uint32_t fg_color, uint32_t bg_color, void terminal_putentryat(struct font node, u32 fg_color, u32 bg_color,
size_t x, size_t y) size_t x, size_t y)
{ {
char *glyph = node.bitmap; char *glyph = node.bitmap;
@ -128,8 +128,8 @@ static void terminal_scroll(void)
screen->row--; screen->row--;
memset(display.buff, 0, display.height * display.pitch); memset(display.buff, 0, display.height * display.pitch);
for (size_t i = 0; i < VGA_WIDTH * (VGA_HEIGHT - 1); i++) { for (size_t i = 0; i < VGA_WIDTH * (VGA_HEIGHT - 1); i++) {
const uint32_t x = (i % VGA_WIDTH) * FONT_WIDTH; const u32 x = (i % VGA_WIDTH) * FONT_WIDTH;
const uint32_t y = (i / VGA_WIDTH) * FONT_HEIGHT; const u32 y = (i / VGA_WIDTH) * FONT_HEIGHT;
screen->buffer[i] = screen->buffer[i + VGA_WIDTH]; screen->buffer[i] = screen->buffer[i + VGA_WIDTH];
terminal_putentryat(get_font_node(screen->buffer[i]), terminal_putentryat(get_font_node(screen->buffer[i]),
screen->fg_color, screen->bg_color, x, y); screen->fg_color, screen->bg_color, x, y);
@ -143,7 +143,7 @@ static void terminal_new_line(void)
terminal_scroll(); terminal_scroll();
} }
void terminal_change_default_color(uint32_t color) void terminal_change_default_color(u32 color)
{ {
// TODO // TODO
/* terminal_set_color(color); */ /* terminal_set_color(color); */
@ -151,7 +151,7 @@ void terminal_change_default_color(uint32_t color)
/* for (size_t x = 0; x < VGA_WIDTH; x++) { */ /* for (size_t x = 0; x < VGA_WIDTH; x++) { */
/* const size_t index = y * VGA_WIDTH + x; /* const size_t index = y * VGA_WIDTH + x;
*/ */
/* uint8_t entry_color = /* u8 entry_color =
* get_entry_color(TERM_BUF[index]); * get_entry_color(TERM_BUF[index]);
*/ */
/* TERM_BUF[index] = vga_entry( */ /* TERM_BUF[index] = vga_entry( */
@ -170,7 +170,7 @@ void terminal_change_default_color(uint32_t color)
/* screen->color = color; */ /* screen->color = color; */
} }
void terminal_change_default_fg_color(uint32_t fg_color) void terminal_change_default_fg_color(u32 fg_color)
{ {
terminal_set_fg_color(fg_color); terminal_set_fg_color(fg_color);
/* terminal_change_default_color(screen->fg_color); */ /* terminal_change_default_color(screen->fg_color); */
@ -228,7 +228,7 @@ int terminal_writestring(const char *data)
void update_cursor(void) void update_cursor(void)
{ {
/* uint16_t pos = screen->row * VGA_WIDTH + /* u16 pos = screen->row * VGA_WIDTH +
* screen->column; */ * screen->column; */
/* outb(0x3D4, 0x0F); */ /* outb(0x3D4, 0x0F); */