brad/brados
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implemented initial printk. Added multiboot support.

Browse Source
This commit is contained in:
L. Bradley LaBoon
2014-01-31 16:12:04 -05:00
parent 3b27d50edb
commit f23f3a8a8d
12 changed files with 257 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/brados/printk.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef __brados_printk_h__
#define __brados_printk_h__
#include <video/vga.h>
int printk(struct vgastate *term, const char *fmt, ...);
#endif

1
include/brados/string.h
View File

@ -3,6 +3,7 @@
#include <stddef.h>
int strindexof(char c, const char *str);
size_t strlen(const char *str);
#endif

79
include/multiboot.h Normal file
View File

@ -0,0 +1,79 @@
#ifndef __brados_multiboot_h__
#define __brados_multiboot_h__
#include <stdint.h>
// For more information on this structure, see:
// http://www.gnu.org/software/grub/manual/multiboot/multiboot.html
struct multiboot_header {
// Indicates the presence and validity of other fields
uint32_t flags;
// Present if bit 0 in 'flags' is set
uint32_t mem_lower;
uint32_t mem_upper;
// Present if bit 1 in 'flags' is set
uint32_t boot_device;
// Present if bit 2 in 'flags' is set
uint32_t cmdline;
// Present if bit 3 in 'flags' is set
uint32_t mods_count;
uint32_t mods_addr;
// Present if bits 4 or 5 are present in 'flags'
// NOTE: Bits 4 and 5 are mutually exclusive. Bit 4 indicates fields
// related to a.out kernel images, while bit 5 indicated fields related
// to ELF kernel images. Since BRaDOS is an ELF kernel, the bit 5 field
// names will be used.
uint32_t shdr_num; // "tabsize" for an a.out kernel
uint32_t shdr_size; // "strsize" for an a.out kernel
uint32_t shdr_addr; // "addr" for an a.out kernel
uint32_t shdr_shndx; // "reserved" for an a.out kernel
// Present if bit 6 in 'flags' is set
uint32_t mmap_length;
uint32_t mmap_addr;
// Present if bit 7 in 'flags' is set
uint32_t drives_length;
uint32_t drives_addr;
// Present if bit 8 in 'flags' is set
uint32_t config_table;
// Present if bit 9 in 'flags' is set
uint32_t boot_loader_name;
// Present if bit 10 in 'flags' is set
uint32_t apm_table;
// Present if bit 11 in 'flags' is set
uint32_t vbe_control_info;
uint32_t vbe_mode_info;
uint16_t vbe_mode;
uint16_t vbe_interface_seg;
uint16_t vbe_interface_off;
uint16_t vbe_interface_len;
};
struct multiboot_mmap {
uint32_t size;
uint64_t base_addr;
uint64_t length;
uint32_t type;
};
struct multiboot_mod {
uint32_t mod_start;
uint32_t mod_end;
uint32_t string;
uint32_t reserved;
};
uint32_t multiboot_getAddress();
uint32_t multiboot_getMagic();
#endif

16
include/video/vga.h
View File

@ -37,28 +37,14 @@ enum vga_color
VGA_COLOR_WHITE = 15
};
// Create a VGA color
uint8_t make_color(enum vga_color fg, enum vga_color bg);
// Create a VGA character
uint16_t make_vgaEntry(char c, uint8_t color);
// Initialize a VGA term
void term_init(struct vgastate *state);
// Write a character to a VGA term
void term_putChar(struct vgastate *state, char c);
// Place a character in a VGA term's buffer
void term_putEntryAt(struct vgastate *state, char c, uint8_t color, size_t x, size_t y);
// Scroll the term down 1 line
void term_scroll(struct vgastate *state);
// Set VGA term color
void term_setColor(struct vgastate *state, uint8_t color);
// Write a string to a VGA term
void term_test(struct vgastate *term);
void term_writeStr(struct vgastate *state, const char *data);
#endif