Libc headers are now in a sysroot

Makefile

@@ -1,13 +1,16 @@
 PLAT=i386
 C_SOURCES = $(wildcard kernel/*.c drivers/$(PLAT)/*.c drivers/$(PLAT)/*/*.c cpu/$(PLAT)/*.c fs/*.c)
 LIBC_SOURCES = $(wildcard libc/*.c libc/*/*.c)
+LIBC_HEADERS = $(wildcard libc/*.h libc/*/*.h)
 OBJ = $(C_SOURCES:.c=.o $(shell cat psinfo/$(PLAT)/o.txt))
 LIBC_OBJ = $(LIBC_SOURCES:.c=.o)
 CC = $(shell cat psinfo/$(PLAT)/cc.txt)
 GDB = $(shell cat psinfo/$(PLAT)/gdb.txt)
-CFLAGS = -Ilibc -Wextra -Wall -Wno-unused-parameter -g -ffreestanding
+CFLAGS =  -Isysroot/usr/include -Wextra -Wall -Wno-unused-parameter -g -ffreestanding
 QFLAGS =  -m 2G -boot d -cdrom os.iso -serial vc #-chardev socket,id=s1,port=3000,host=localhost -serial chardev:s1
 
+.PHONY: sysroot
+
 all: os.iso
 
 run: os.iso
@@ -29,10 +32,15 @@ initrd/prog.elf: prog/*
 kernel/kernel.elf: $(OBJ) libc/libc.a
 	i386-elf-ld -T linker.ld -o $@ $^
 
+sysroot: $(LIBC_HEADERS)
+	cp -r libc/* sysroot/usr/include
+	rm -f sysroot/usr/include/libc.a sysroot/usr/include/*.o sysroot/usr/include/*/*.o sysroot/usr/include/*.c sysroot/usr/include/*/*.c
+
+
 libc/libc.a: $(LIBC_OBJ)
 	i386-elf-ar rcs $@ $^
 
-%.o: %.c
+%.o: %.c sysroot
 	$(CC) $(CFLAGS)  -c $< -o $@
 
 %.o: %.asm

cpu/i386/isr.c

@@ -4,7 +4,7 @@
 #include "ports.h"
 #include "paging.h"
 #include "../halt.h"
-#include "../drivers/vga.h"
+#include "../../drivers/vga.h"
 #include "../tasking.h"
 #include "interrupt.h"
 #include <string.h>

sysroot/usr/include/devbuf.h

@@ -0,0 +1,16 @@
+#ifndef DEVBUF_H
+#define DEVBUF_H
+
+#include <stdint.h>
+
+typedef struct {
+  int buf[256];
+  uint8_t rd;
+  uint8_t wr;
+} devbuf;
+
+devbuf* devbuf_init();
+void devbuf_add(char byte,devbuf* buf);
+int devbuf_get(devbuf* buf);
+
+#endif

sysroot/usr/include/grub/multiboot.h

@@ -0,0 +1,274 @@
+/* multiboot.h - Multiboot header file. */
+/* Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
+*
+*  Permission is hereby granted, free of charge, to any person obtaining a copy
+*  of this software and associated documentation files (the "Software"), to
+*  deal in the Software without restriction, including without limitation the
+*  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+*  sell copies of the Software, and to permit persons to whom the Software is
+*  furnished to do so, subject to the following conditions:
+*
+*  The above copyright notice and this permission notice shall be included in
+*  all copies or substantial portions of the Software.
+*
+*  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+*  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+*  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+*  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+*  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+*  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+ #ifndef MULTIBOOT_HEADER
+ #define MULTIBOOT_HEADER 1
+
+ /* How many bytes from the start of the file we search for the header. */
+ #define MULTIBOOT_SEARCH                        8192
+ #define MULTIBOOT_HEADER_ALIGN                  4
+
+ /* The magic field should contain this. */
+ #define MULTIBOOT_HEADER_MAGIC                  0x1BADB002
+
+ /* This should be in %eax. */
+ #define MULTIBOOT_BOOTLOADER_MAGIC              0x2BADB002
+
+ /* Alignment of multiboot modules. */
+ #define MULTIBOOT_MOD_ALIGN                     0x00001000
+
+ /* Alignment of the multiboot info structure. */
+ #define MULTIBOOT_INFO_ALIGN                    0x00000004
+
+ /* Flags set in the 'flags' member of the multiboot header. */
+
+ /* Align all boot modules on i386 page (4KB) boundaries. */
+ #define MULTIBOOT_PAGE_ALIGN                    0x00000001
+
+ /* Must pass memory information to OS. */
+ #define MULTIBOOT_MEMORY_INFO                   0x00000002
+
+ /* Must pass video information to OS. */
+ #define MULTIBOOT_VIDEO_MODE                    0x00000004
+
+ /* This flag indicates the use of the address fields in the header. */
+ #define MULTIBOOT_AOUT_KLUDGE                   0x00010000
+
+ /* Flags to be set in the 'flags' member of the multiboot info structure. */
+
+ /* is there basic lower/upper memory information? */
+ #define MULTIBOOT_INFO_MEMORY                   0x00000001
+ /* is there a boot device set? */
+ #define MULTIBOOT_INFO_BOOTDEV                  0x00000002
+ /* is the command-line defined? */
+ #define MULTIBOOT_INFO_CMDLINE                  0x00000004
+ /* are there modules to do something with? */
+ #define MULTIBOOT_INFO_MODS                     0x00000008
+
+ /* These next two are mutually exclusive */
+
+ /* is there a symbol table loaded? */
+ #define MULTIBOOT_INFO_AOUT_SYMS                0x00000010
+ /* is there an ELF section header table? */
+ #define MULTIBOOT_INFO_ELF_SHDR                 0X00000020
+
+ /* is there a full memory map? */
+ #define MULTIBOOT_INFO_MEM_MAP                  0x00000040
+
+ /* Is there drive info? */
+ #define MULTIBOOT_INFO_DRIVE_INFO               0x00000080
+
+ /* Is there a config table? */
+ #define MULTIBOOT_INFO_CONFIG_TABLE             0x00000100
+
+ /* Is there a boot loader name? */
+ #define MULTIBOOT_INFO_BOOT_LOADER_NAME         0x00000200
+
+ /* Is there a APM table? */
+ #define MULTIBOOT_INFO_APM_TABLE                0x00000400
+
+ /* Is there video information? */
+ #define MULTIBOOT_INFO_VBE_INFO                 0x00000800
+ #define MULTIBOOT_INFO_FRAMEBUFFER_INFO         0x00001000
+
+ #ifndef ASM_FILE
+
+ typedef unsigned char           multiboot_uint8_t;
+ typedef unsigned short          multiboot_uint16_t;
+ typedef unsigned int            multiboot_uint32_t;
+ typedef unsigned long long      multiboot_uint64_t;
+
+ struct multiboot_header
+ {
+   /* Must be MULTIBOOT_MAGIC - see above. */
+   multiboot_uint32_t magic;
+
+   /* Feature flags. */
+   multiboot_uint32_t flags;
+
+   /* The above fields plus this one must equal 0 mod 2^32. */
+   multiboot_uint32_t checksum;
+
+   /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
+   multiboot_uint32_t header_addr;
+   multiboot_uint32_t load_addr;
+   multiboot_uint32_t load_end_addr;
+   multiboot_uint32_t bss_end_addr;
+   multiboot_uint32_t entry_addr;
+
+   /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
+   multiboot_uint32_t mode_type;
+   multiboot_uint32_t width;
+   multiboot_uint32_t height;
+   multiboot_uint32_t depth;
+ };
+
+ /* The symbol table for a.out. */
+ struct multiboot_aout_symbol_table
+ {
+   multiboot_uint32_t tabsize;
+   multiboot_uint32_t strsize;
+   multiboot_uint32_t addr;
+   multiboot_uint32_t reserved;
+ };
+ typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
+
+ /* The section header table for ELF. */
+ struct multiboot_elf_section_header_table
+ {
+   multiboot_uint32_t num;
+   multiboot_uint32_t size;
+   multiboot_uint32_t addr;
+   multiboot_uint32_t shndx;
+ };
+ typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
+
+ struct multiboot_info
+ {
+   /* Multiboot info version number */
+   multiboot_uint32_t flags;
+
+   /* Available memory from BIOS */
+   multiboot_uint32_t mem_lower;
+   multiboot_uint32_t mem_upper;
+
+   /* "root" partition */
+   multiboot_uint32_t boot_device;
+
+   /* Kernel command line */
+   multiboot_uint32_t cmdline;
+
+   /* Boot-Module list */
+   multiboot_uint32_t mods_count;
+   multiboot_uint32_t mods_addr;
+
+   union
+   {
+     multiboot_aout_symbol_table_t aout_sym;
+     multiboot_elf_section_header_table_t elf_sec;
+   } u;
+
+   /* Memory Mapping buffer */
+   multiboot_uint32_t mmap_length;
+   multiboot_uint32_t mmap_addr;
+
+   /* Drive Info buffer */
+   multiboot_uint32_t drives_length;
+   multiboot_uint32_t drives_addr;
+
+   /* ROM configuration table */
+   multiboot_uint32_t config_table;
+
+   /* Boot Loader Name */
+   multiboot_uint32_t boot_loader_name;
+
+   /* APM table */
+   multiboot_uint32_t apm_table;
+
+   /* Video */
+   multiboot_uint32_t vbe_control_info;
+   multiboot_uint32_t vbe_mode_info;
+   multiboot_uint16_t vbe_mode;
+   multiboot_uint16_t vbe_interface_seg;
+   multiboot_uint16_t vbe_interface_off;
+   multiboot_uint16_t vbe_interface_len;
+
+   multiboot_uint64_t framebuffer_addr;
+   multiboot_uint32_t framebuffer_pitch;
+   multiboot_uint32_t framebuffer_width;
+   multiboot_uint32_t framebuffer_height;
+   multiboot_uint8_t framebuffer_bpp;
+ #define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0
+ #define MULTIBOOT_FRAMEBUFFER_TYPE_RGB     1
+ #define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT     2
+   multiboot_uint8_t framebuffer_type;
+   union
+   {
+     struct
+     {
+       multiboot_uint32_t framebuffer_palette_addr;
+       multiboot_uint16_t framebuffer_palette_num_colors;
+     };
+     struct
+     {
+       multiboot_uint8_t framebuffer_red_field_position;
+       multiboot_uint8_t framebuffer_red_mask_size;
+       multiboot_uint8_t framebuffer_green_field_position;
+       multiboot_uint8_t framebuffer_green_mask_size;
+       multiboot_uint8_t framebuffer_blue_field_position;
+       multiboot_uint8_t framebuffer_blue_mask_size;
+     };
+   };
+ };
+ typedef struct multiboot_info multiboot_info_t;
+
+ struct multiboot_color
+ {
+   multiboot_uint8_t red;
+   multiboot_uint8_t green;
+   multiboot_uint8_t blue;
+ };
+
+ struct multiboot_mmap_entry
+ {
+   multiboot_uint32_t size;
+   multiboot_uint64_t addr;
+   multiboot_uint64_t len;
+ #define MULTIBOOT_MEMORY_AVAILABLE              1
+ #define MULTIBOOT_MEMORY_RESERVED               2
+ #define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE       3
+ #define MULTIBOOT_MEMORY_NVS                    4
+ #define MULTIBOOT_MEMORY_BADRAM                 5
+   multiboot_uint32_t type;
+ } __attribute__((packed));
+ typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+ struct multiboot_mod_list
+ {
+   /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
+   multiboot_uint32_t mod_start;
+   multiboot_uint32_t mod_end;
+
+   /* Module command line */
+   multiboot_uint32_t cmdline;
+
+   /* padding to take it to 16 bytes (must be zero) */
+   multiboot_uint32_t pad;
+ };
+ typedef struct multiboot_mod_list multiboot_module_t;
+
+ /* APM BIOS info. */
+ struct multiboot_apm_info
+ {
+   multiboot_uint16_t version;
+   multiboot_uint16_t cseg;
+   multiboot_uint32_t offset;
+   multiboot_uint16_t cseg_16;
+   multiboot_uint16_t dseg;
+   multiboot_uint16_t flags;
+   multiboot_uint16_t cseg_len;
+   multiboot_uint16_t cseg_16_len;
+   multiboot_uint16_t dseg_len;
+ };
+
+ #endif /* ! ASM_FILE */
+
+ #endif /* ! MULTIBOOT_HEADER */

sysroot/usr/include/grub/text_fb_info.h

@@ -0,0 +1,12 @@
+#ifndef GRUB_TEXT_FB_INFO_H
+#define GRUB_TEXT_FB_INFO_H
+
+#include <stdint.h>
+
+typedef struct {
+  char* address;
+  uint32_t width;
+  uint32_t height;
+} text_fb_info;
+
+#endif

sysroot/usr/include/klog.h

@@ -0,0 +1,6 @@
+#ifndef KLOG_H
+#define KLOG_H
+
+void klog(char* level,char* s,...);
+
+#endif

sysroot/usr/include/math.h

@@ -0,0 +1,6 @@
+#ifndef MATH_H
+#define MATH_H
+
+float ceilf(float num);
+
+#endif

sysroot/usr/include/memory.h

@@ -0,0 +1,11 @@
+#ifndef MEMORY_H
+#define MEMORY_H
+
+#include <stdint.h>
+
+#define BLK_SZ 4096
+
+void* alloc_memory(uint32_t num_pages);
+void alloc_memory_virt(uint32_t num_pages,void* addr);
+
+#endif

sysroot/usr/include/stdio.h

@@ -0,0 +1,39 @@
+#ifndef STDIO_H
+#define STDIO_H
+
+#include <stddef.h>
+#include <stdint.h>
+typedef struct {
+  char* mntpnt;
+  const char* path;
+  uint32_t type;
+  long pos;
+  int eof;
+  void* data;
+} FILE;
+
+#define SEEK_CUR 1
+#define SEEK_END 2
+#define SEEK_SET 3
+#define EOF -1
+
+extern FILE* stdin;
+extern FILE* stdout;
+extern FILE* stderr;
+
+FILE* fopen(const char* filename,const char* mode);
+int fgetc(FILE* stream);
+int getc();
+char* fgets(char* str,int count,FILE* stream);
+size_t fread(void* buffer,size_t size,size_t count,FILE* stream);
+int fputc(int c,FILE* stream);
+int putc(int c);
+int fputs(const char* s,FILE* stream);
+int puts(const char* s);
+int fprintf(FILE* stream,const char* format,...);
+int printf(const char* format,...);
+int fseek(FILE* stream,long offset,int origin);
+long ftell(FILE* stream);
+int fclose(FILE* file);
+
+#endif

sysroot/usr/include/stdlib.h

@@ -0,0 +1,12 @@
+#ifndef STDLIB_H
+#define STDLIB_H
+
+#include <stddef.h>
+#define EXIT_SUCCESS 0
+#define EXIT_FAILURE 1
+
+void* malloc(size_t size);
+void* realloc(void *mem, size_t new_sz);
+void free(void* mem);
+
+#endif

sysroot/usr/include/string.h

@@ -0,0 +1,17 @@
+#ifndef STRING_H
+#define STRING_H
+#include <stddef.h>
+
+void* memcpy(void* dest,const void* src,size_t len);
+void* memset(void* dest,int val,size_t len);
+int strcmp(const char* s1,const char* s2);
+size_t strlen(const char* str);
+char* strcpy(char* dest,const char* src);
+char* strtok(char* str, const char* delim);
+
+char* strrev(char *str);
+void int_to_ascii(int n,char* str);
+void hex_to_ascii(int n, char* str);
+void append(char* s, char n);
+void backspace(char* s);
+#endif

sysroot/usr/include/tasking.h

@@ -0,0 +1,12 @@
+#ifndef TASKING_H
+#define TASKING_H
+
+#include <stdint.h>
+
+void yield();
+void createTask(void* task);
+char isPrivleged(uint32_t pid);
+void send_msg(uint32_t pid,void* msg);
+void* get_msg(uint32_t* sender);
+
+#endif