RickRongen/my-kern
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: made more definitions constant and did some more minor

Browse Source 
improvements
This commit is contained in:
Rick Rongen
2021-01-29 20:25:37 +01:00
parent d7f0e8dd36
commit 5a1caef5b1
13 changed files with 114 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/drivers/ports.h
View File

@@ -1,6 +1,11 @@
#ifndef MY_KERNEL_DRIVERS_PORT_H
#define MY_KERNEL_DRIVERS_PORT_H
#define PORT_PIC_MASTER_COMMAND 0x20
#define PORT_PIC_MASTER_DATA 0x21
#define PORT_PIC_SLAVE_COMMAND 0xA0
#define PORT_PIC_SLAVE_DATA 0xA1
//http://www.osdever.net/FreeVGA/vga/crtcreg.htm#0A
#define PORT_REG_SCREEN_CTRL 0x3d4
#define PORT_REG_SCREEN_CTRL_CURSOR_H 0x0E
@@ -26,11 +31,6 @@
// https://wiki.osdev.org/PIT
#define PORT_PIT_COMMAND 0x43
#define PIT_MODE_BIN 0x0
#define PIT_MODE_HW_STROBE 0b0101
#define PIT_MODE_SQUARE_WAVE 0b0110
#define PIT_ACCESS_MODE_HL 0b000011
#define PIT_CHANNEL_0 0b00000000
#define PORT_PIT_DATA_0 0x40
#define PORT_PIT_DATA_1 0x41
#define PORT_PIT_DATA_3 0x42

79
kernel/drivers/serial.c
View File

@@ -6,16 +6,73 @@
#include <types.h>
#include <drivers/ports.h>
#define SERIAL_INTERRUPT_DATA_AVAILABLE (1 << 0)
#define SERIAL_INTERRUPT_TRANSMITTER_EMPTY (1 << 1)
#define SERIAL_INTERRUPT_BREAK_ERROR (1 << 2)
#define SERIAL_INTERRUPT_STATUS_CHANGE (1 << 3)
#define LINE_STATUS_DATA_READY (1 << 0)
#define LINE_STATUS_OVERRUN_ERROR (1 << 1)
#define LINE_STATUS_PARITY_ERROR (1 << 2)
#define LINE_STATUS_FRAMING_ERROR (1 << 3)
#define LINE_STATUS_BREAK_INDICATOR (1 << 4)
#define LINE_STATUS_TRANSMITTER_HOLDING_REGISTER_EMPTY (1 << 5)
#define LINE_STATUS_TRANSMITTER_EMPTY (1 << 6)
#define LINE_STATUS_IMPENDING_ERROR (1 << 7)
#define LINE_CONTROL_DATA_BITS_5 (0b00)
#define LINE_CONTROL_DATA_BITS_6 (0b01)
#define LINE_CONTROL_DATA_BITS_7 (0b10)
#define LINE_CONTROL_DATA_BITS_8 (0b11)
#define LINE_CONTROL_STOP_BITS_1 (0 << 2)
#define LINE_CONTROL_STOP_BITS_1_5_2 (1 << 2)
#define LINE_CONTROL_PARTY_NONE (0b000 << 3)
#define LINE_CONTROL_PARTY_ODD (0b001 << 3)
#define LINE_CONTROL_PARTY_EVEN (0b010 << 3)
#define LINE_CONTROL_PARTY_MARK (0b101 << 3)
#define LINE_CONTROL_PARTY_SPACE (0b111 << 3)
#define LINE_CONTROL_DIVISOR (1 << 7)
#define FIFO_CONTROL_ENABLE (1 << 0)
#define FIFO_CONTROL_CLEAR_RECEIVE (1 << 1)
#define FIFO_CONTROL_CLEAR_TRANSMIT (1 << 2)
#define FIFO_CONTROL_DMA_MODE_SELECT (1 << 3)
// reserved
#define FIFO_CONTROL_64_BYTE_ENABLE (1 << 5)
#define FIFO_CONTROL_TRIGGER_LEVEL_1_BYTE (0b00 << 6)
#define FIFO_CONTROL_TRIGGER_LEVEL_4_BYTE (0b01 << 6)
#define FIFO_CONTROL_TRIGGER_LEVEL_8_BYTE (0b10 << 6)
#define FIFO_CONTROL_TRIGGER_LEVEL_14_BYTE (0b11 << 6)
#define MODEM_CONTROL_DATA_TERMINAL_READY (1 << 0)
#define MODEM_CONTROL_REQUEST_TO_SEND (1 << 1)
#define MODEM_CONTROL_AUX_OUTPUT_1 (1 << 2)
#define MODEM_CONTROL_AUX_OUTPUT_2 (1 << 3)
#define MODEM_CONTROL_LOOPBACK_MODE (1 << 4)
#define MODEM_CONTROL_AUTOFLOW_CONTROL_ENABLED (1 << 5)
int serial_init() {
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_INTERRUPT, 0x00); // Disable all interrupts
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_LINE_CONTROL, 0x80); // Enable DLAB (set baud rate divisor)
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_INTERRUPT, 0); // Disable all interrupts
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_LINE_CONTROL,
LINE_CONTROL_DIVISOR); // Enable DLAB (set baud rate divisor)
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_DLAB_LSB, 0x03); // Set divisor to 3 (lo byte) 38400 baud
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_DLAB_MSB, 0x00); // (hi byte)
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_LINE_CONTROL, 0x03); // 8 bits, no parity, one stop bit
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_LINE_CONTROL,
LINE_CONTROL_DATA_BITS_8); // 8 bits, no parity, one stop bit
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_INTERRUPT_ID_FIFO,
0xC7); // Enable FIFO, clear them, with 14-byte threshold
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_MODEM_CONTROL, 0x0B); // IRQs enabled, RTS/DSR set
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_MODEM_CONTROL, 0x1E); // Set in loopback mode, test the serial chip
FIFO_CONTROL_ENABLE
| FIFO_CONTROL_CLEAR_RECEIVE
| FIFO_CONTROL_CLEAR_TRANSMIT
| FIFO_CONTROL_TRIGGER_LEVEL_14_BYTE); // Enable FIFO, clear them, with 14-byte threshold
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_MODEM_CONTROL,
MODEM_CONTROL_DATA_TERMINAL_READY
| MODEM_CONTROL_REQUEST_TO_SEND
| MODEM_CONTROL_AUX_OUTPUT_2); // IRQs enabled, RTS/DSR set
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_MODEM_CONTROL,
MODEM_CONTROL_REQUEST_TO_SEND
| MODEM_CONTROL_AUX_OUTPUT_1
| MODEM_CONTROL_AUX_OUTPUT_2
| MODEM_CONTROL_LOOPBACK_MODE); // Set in loopback mode, test the serial chip
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_DATA,
0xAE); // Test serial chip (send byte 0xAE and check if serial returns same byte)
@@ -26,12 +83,16 @@ int serial_init() {
// If serial is not faulty set it in normal operation mode
// (not-loopback with IRQs enabled and OUT#1 and OUT#2 bits enabled)
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_MODEM_CONTROL, 0x0F);
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_MODEM_CONTROL,
MODEM_CONTROL_DATA_TERMINAL_READY
| MODEM_CONTROL_REQUEST_TO_SEND
| MODEM_CONTROL_AUX_OUTPUT_1
| MODEM_CONTROL_AUX_OUTPUT_2);
return 0;
}
int is_transmit_empty() {
return port_byte_in(PORT_SERIAL_0 + PORT_SERIAL_LINE_STATUS) & 0x20;
return port_byte_in(PORT_SERIAL_0 + PORT_SERIAL_LINE_STATUS) & LINE_STATUS_TRANSMITTER_HOLDING_REGISTER_EMPTY;
}
void write_serial(char a) {
@@ -40,7 +101,7 @@ void write_serial(char a) {
port_byte_out(PORT_SERIAL_0 + PORT_SERIAL_DATA, a);
}
void serial_kprint(char *msg) {
void serial_kprint(const char *msg) {
u32 i = 0;
while (1) {
char c = msg[i];

2
kernel/drivers/serial.h
View File

@@ -7,6 +7,6 @@
int serial_init();
void serial_kprint(char *msg);
void serial_kprint(const char *msg);
#endif //NEW_KERNEL_SERIAL_H

4
kernel/drivers/vgascreen.c
View File

@@ -31,7 +31,7 @@ void vga_clear_screen() {
set_cursor_offset(0);
}
void kprint_at(char *message, int col, int row) {
void kprint_at(const char *message, int col, int row) {
int offset;
if (col > 0 && row > 0) {
offset = get_offset(col, row);
@@ -50,7 +50,7 @@ void kprint_at(char *message, int col, int row) {
}
void vga_kprint(char *message) {
void vga_kprint(const char *message) {
kprint_at(message, -1, -1);
}

2
kernel/drivers/vgascreen.h
View File

@@ -29,6 +29,6 @@
void vga_clear_screen();
void vga_kprint(char *msg);
void vga_kprint(const char *msg);
#endif //MY_KERNEL_VGASCREEN_H