Implemented serial for basic debugging, Added MMU enable to kernel main
This commit is contained in:
19
src/kernel/arch/i386/ports/serial.cpp
Normal file
19
src/kernel/arch/i386/ports/serial.cpp
Normal file
@ -0,0 +1,19 @@
|
||||
#include "serial.h"
|
||||
|
||||
Serial Serial::init() {
|
||||
// No clue what to setup yet!
|
||||
|
||||
return Serial();
|
||||
}
|
||||
|
||||
void Serial::print(){
|
||||
// Do nothing!
|
||||
}
|
||||
|
||||
Serial::Serial(){
|
||||
// Do nothing!
|
||||
}
|
||||
|
||||
Serial::~Serial(){
|
||||
// Do nothing!
|
||||
}
|
19
src/kernel/arch/i386/ports/serial.h
Normal file
19
src/kernel/arch/i386/ports/serial.h
Normal file
@ -0,0 +1,19 @@
|
||||
#pragma once
|
||||
|
||||
class Serial {
|
||||
|
||||
public:
|
||||
static Serial init();
|
||||
|
||||
void print();
|
||||
|
||||
private:
|
||||
const int COM1 = 0x3F8;
|
||||
const int COM2 = 0x2F8;
|
||||
const int COM3 = 0x3E8;
|
||||
const int COM4 = 0x2E8;
|
||||
|
||||
|
||||
Serial();
|
||||
~Serial();
|
||||
};
|
@ -88,4 +88,5 @@ void kterm_write(const char* data, size_t size) {
|
||||
void kterm_writestring(const char* data ){
|
||||
AS_KERNEL();
|
||||
kterm_write(data, strlen(data));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3,6 +3,7 @@
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "../vga/colors.h"
|
||||
|
||||
void kterm_init();
|
||||
|
59
src/kernel/io.cpp
Normal file
59
src/kernel/io.cpp
Normal file
@ -0,0 +1,59 @@
|
||||
#include "io.h"
|
||||
|
||||
unsigned char inb_p(unsigned short ){
|
||||
|
||||
}
|
||||
unsigned short inw(unsigned short ){
|
||||
|
||||
}
|
||||
unsigned short inw_p(unsigned short ){
|
||||
|
||||
}
|
||||
unsigned int inl(unsigned short ){
|
||||
|
||||
}
|
||||
unsigned int inl_p(unsigned short ){
|
||||
|
||||
}
|
||||
|
||||
|
||||
void outb_p(unsigned char , unsigned short ){
|
||||
|
||||
}
|
||||
void outw(unsigned short , unsigned short ){
|
||||
|
||||
}
|
||||
void outw_p(unsigned short , unsigned short ){
|
||||
|
||||
}
|
||||
void outl(unsigned int , unsigned short ){
|
||||
|
||||
}
|
||||
void outl_p(unsigned int , unsigned short ){
|
||||
|
||||
}
|
||||
|
||||
void insb(unsigned short , void *,
|
||||
unsigned long ){
|
||||
|
||||
}
|
||||
void insw(unsigned short , void *,
|
||||
unsigned long ){
|
||||
|
||||
}
|
||||
void insl(unsigned short , void *,
|
||||
unsigned long ){
|
||||
|
||||
}
|
||||
void outsb(unsigned short , const void *,
|
||||
unsigned long ){
|
||||
|
||||
}
|
||||
void outsw(unsigned short , const void *,
|
||||
unsigned long ){
|
||||
|
||||
}
|
||||
void outsl(unsigned short , const void *,
|
||||
unsigned long ){
|
||||
|
||||
}
|
43
src/kernel/io.h
Normal file
43
src/kernel/io.h
Normal file
@ -0,0 +1,43 @@
|
||||
#pragma once
|
||||
#include <stdint.h>
|
||||
|
||||
static inline uint8_t inb(uint16_t port)
|
||||
{
|
||||
uint8_t ret;
|
||||
asm volatile ( "inb %1, %0"
|
||||
: "=a"(ret)
|
||||
: "Nd"(port) );
|
||||
return ret;
|
||||
}
|
||||
unsigned char inb_p(unsigned short port);
|
||||
unsigned short inw(unsigned short port);
|
||||
unsigned short inw_p(unsigned short port);
|
||||
unsigned int inl(unsigned short port);
|
||||
unsigned int inl_p(unsigned short port);
|
||||
|
||||
static inline void outb(uint16_t port, uint8_t val)
|
||||
{
|
||||
asm volatile ( "outb %0, %1" : : "a"(val), "Nd"(port) );
|
||||
/* There's an outb %al, $imm8 encoding, for compile-time constant port numbers that fit in 8b. (N constraint).
|
||||
* Wider immediate constants would be truncated at assemble-time (e.g. "i" constraint).
|
||||
* The outb %al, %dx encoding is the only option for all other cases.
|
||||
* %1 expands to %dx because port is a uint16_t. %w1 could be used if we had the port number a wider C type */
|
||||
}
|
||||
void outb_p(unsigned char value, unsigned short port);
|
||||
void outw(unsigned short value, unsigned short port);
|
||||
void outw_p(unsigned short value, unsigned short port);
|
||||
void outl(unsigned int value, unsigned short port);
|
||||
void outl_p(unsigned int value, unsigned short port);
|
||||
|
||||
void insb(unsigned short port, void *addr,
|
||||
unsigned long count);
|
||||
void insw(unsigned short port, void *addr,
|
||||
unsigned long count);
|
||||
void insl(unsigned short port, void *addr,
|
||||
unsigned long count);
|
||||
void outsb(unsigned short port, const void *addr,
|
||||
unsigned long count);
|
||||
void outsw(unsigned short port, const void *addr,
|
||||
unsigned long count);
|
||||
void outsl(unsigned short port, const void *addr,
|
||||
unsigned long count);
|
@ -1,27 +0,0 @@
|
||||
#include "kernel.h"
|
||||
/**
|
||||
* simple delay function
|
||||
**/
|
||||
void delay(int t){
|
||||
volatile int i,j;
|
||||
for(i=0;i<t;i++)
|
||||
for(j=0;j<25000;j++)
|
||||
asm("NOP");
|
||||
}
|
||||
|
||||
void kernel_main (void) {
|
||||
/** initialize terminal interface */
|
||||
kterm_init();
|
||||
|
||||
/** Wrtite stuff to the screen to test the terminal**/
|
||||
kterm_writestring("Hello world!\n");
|
||||
kterm_writestring("We got newline support!\n");
|
||||
|
||||
for(;;){
|
||||
delay(500);
|
||||
kterm_writestring("We have implemented terminal scrolling!\n");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
136
src/kernel/kernel.cpp
Normal file
136
src/kernel/kernel.cpp
Normal file
@ -0,0 +1,136 @@
|
||||
#include "kernel.h"
|
||||
/**
|
||||
* simple delay function
|
||||
**/
|
||||
void delay(int t){
|
||||
volatile int i,j;
|
||||
for(i=0;i<t;i++)
|
||||
for(j=0;j<25000;j++)
|
||||
asm("NOP");
|
||||
}
|
||||
|
||||
class Test {
|
||||
public:
|
||||
Test();
|
||||
void printMe();
|
||||
~Test();
|
||||
};
|
||||
|
||||
|
||||
Test::Test(){
|
||||
kterm_writestring("Create a test object\n");
|
||||
};
|
||||
|
||||
void Test::printMe(){
|
||||
kterm_writestring("testObject.printMe()\n");
|
||||
}
|
||||
|
||||
Test::~Test(){
|
||||
kterm_writestring("Destroy testObject! Bye bye\n");
|
||||
}
|
||||
|
||||
#define PORT 0x3f8
|
||||
static int init_serial() {
|
||||
outb(PORT + 1, 0x00); // Disable all interrupts
|
||||
outb(PORT + 3, 0x80); // Enable DLAB (set baud rate divisor)
|
||||
outb(PORT + 0, 0x03); // Set divisor to 3 (lo byte) 38400 baud
|
||||
outb(PORT + 1, 0x00); // (hi byte)
|
||||
outb(PORT + 3, 0x03); // 8 bits, no parity, one stop bit
|
||||
outb(PORT + 2, 0xC7); // Enable FIFO, clear them, with 14-byte threshold
|
||||
outb(PORT + 4, 0x0B); // IRQs enabled, RTS/DSR set
|
||||
outb(PORT + 4, 0x1E); // Set in loopback mode, test the serial chip
|
||||
outb(PORT + 0, 0xAE); // Test serial chip (send byte 0xAE and check if serial returns same byte)
|
||||
|
||||
// Check if serial is faulty (i.e: not same byte as sent)
|
||||
if(inb(PORT + 0) != 0xAE) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
// If serial is not faulty set it in normal operation mode
|
||||
// (not-loopback with IRQs enabled and OUT#1 and OUT#2 bits enabled)
|
||||
outb(PORT + 4, 0x0F);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int is_transmit_empty() {
|
||||
return inb(PORT + 5) & 0x20;
|
||||
}
|
||||
|
||||
void write_serial(char a) {
|
||||
while (is_transmit_empty() == 0);
|
||||
|
||||
outb(PORT,a);
|
||||
}
|
||||
|
||||
int serial_received() {
|
||||
return inb(PORT + 5) & 1;
|
||||
}
|
||||
|
||||
char read_serial() {
|
||||
while (serial_received() == 0);
|
||||
|
||||
return inb(PORT);
|
||||
}
|
||||
|
||||
|
||||
void test_serial(){
|
||||
/** Serial test **/
|
||||
kterm_writestring("Writing to COM1 serial port:");
|
||||
init_serial();
|
||||
write_serial('A');
|
||||
write_serial('B');
|
||||
write_serial('C');
|
||||
write_serial('D');
|
||||
write_serial('E');
|
||||
|
||||
char Character_received = read_serial();
|
||||
kterm_writestring("\n");
|
||||
kterm_writestring("received from COM 1: \n");
|
||||
kterm_put(Character_received);
|
||||
|
||||
kterm_writestring("\n");
|
||||
}
|
||||
|
||||
|
||||
extern "C" {
|
||||
void kernel_main (void) {
|
||||
/** initialize terminal interface */
|
||||
kterm_init();
|
||||
|
||||
/** Wrtite stuff to the screen to test the terminal**/
|
||||
kterm_writestring("Hello world!\n");
|
||||
kterm_writestring("We got newline support!\n");
|
||||
|
||||
/** Test scrolling **/
|
||||
for(int i=0; i < 5; i++){
|
||||
delay(500);
|
||||
kterm_writestring("We have implemented terminal scrolling!\n");
|
||||
}
|
||||
|
||||
|
||||
/** Test objective cpp **/
|
||||
kterm_writestring("Testing C++ object support\n");
|
||||
auto testObject = Test();
|
||||
testObject.printMe();
|
||||
|
||||
/** Setup the MMU **/
|
||||
kterm_writestring("Starting MMU...\n");
|
||||
auto mmu = MMU();
|
||||
mmu.enable();
|
||||
kterm_writestring("MMU enabled!\n");
|
||||
|
||||
|
||||
|
||||
|
||||
/** Lets start using the serial port for debugging .. **/
|
||||
// Hopefully once we go into realmode or do something that
|
||||
// cause the screen to go black.. this serial comms part will give
|
||||
// some situational awareness
|
||||
//Serial serialbus = Serial::init();
|
||||
|
||||
test_serial();
|
||||
|
||||
|
||||
}
|
||||
}
|
@ -1,3 +1,7 @@
|
||||
#pragma once
|
||||
extern "C" {
|
||||
#include "../libc/include/string.h"
|
||||
#include "arch/i386/tty/kterm.h"
|
||||
}
|
||||
#include "MMU.h"
|
||||
#include "io.h"
|
||||
|
Reference in New Issue
Block a user