Archives/cfenollosa_os-tutorial
1
0
Fork 0
mirror of https://github.com/cfenollosa/os-tutorial.git synced 2026-03-02 03:49:21 +00:00
Code Issues Projects Releases Wiki Activity

lesson 23, step 3

Browse Source
This commit is contained in:
Carlos
2015-08-18 10:31:28 +02:00
parent 92ff191c3d
commit de3d442569
18 changed files with 124 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
23-fixes/drivers/keyboard.c
View File

@@ -5,6 +5,7 @@
#include "../libc/string.h"
#include "../libc/function.h"
#include "../kernel/kernel.h"
#include <stdint.h>
#define BACKSPACE 0x0E
#define ENTER 0x1C
@@ -26,7 +27,7 @@ const char sc_ascii[] = { '?', '?', '1', '2', '3', '4', '5', '6',
static void keyboard_callback(registers_t regs) {
/* The PIC leaves us the scancode in port 0x60 */
u8 scancode = port_byte_in(0x60);
uint8_t scancode = port_byte_in(0x60);
if (scancode > SC_MAX) return;
if (scancode == BACKSPACE) {

2
23-fixes/drivers/keyboard.h
View File

@@ -1,3 +1 @@
#include "../cpu/type.h"
void init_keyboard();

15
23-fixes/drivers/screen.c
View File

@@ -1,6 +1,7 @@
#include "screen.h"
#include "../cpu/ports.h"
#include "../libc/mem.h"
#include <stdint.h>
/* Declaration of private functions */
int get_cursor_offset();
@@ -65,7 +66,7 @@ void kprint_backspace() {
* Sets the video cursor to the returned offset
*/
int print_char(char c, int col, int row, char attr) {
u8 *vidmem = (u8*) VIDEO_ADDRESS;
uint8_t *vidmem = (uint8_t*) VIDEO_ADDRESS;
if (!attr) attr = WHITE_ON_BLACK;
/* Error control: print a red 'E' if the coords aren't right */
@@ -95,12 +96,12 @@ int print_char(char c, int col, int row, char attr) {
if (offset >= MAX_ROWS * MAX_COLS * 2) {
int i;
for (i = 1; i < MAX_ROWS; i++)
memory_copy((u8*)(get_offset(0, i) + VIDEO_ADDRESS),
(u8*)(get_offset(0, i-1) + VIDEO_ADDRESS),
memory_copy((uint8_t*)(get_offset(0, i) + VIDEO_ADDRESS),
(uint8_t*)(get_offset(0, i-1) + VIDEO_ADDRESS),
MAX_COLS * 2);
/* Blank last line */
char *last_line = (char*) (get_offset(0, MAX_ROWS-1) + (u8*) VIDEO_ADDRESS);
char *last_line = (char*) (get_offset(0, MAX_ROWS-1) + (uint8_t*) VIDEO_ADDRESS);
for (i = 0; i < MAX_COLS * 2; i++) last_line[i] = 0;
offset -= 2 * MAX_COLS;
@@ -126,15 +127,15 @@ void set_cursor_offset(int offset) {
/* Similar to get_cursor_offset, but instead of reading we write data */
offset /= 2;
port_byte_out(REG_SCREEN_CTRL, 14);
port_byte_out(REG_SCREEN_DATA, (u8)(offset >> 8));
port_byte_out(REG_SCREEN_DATA, (uint8_t)(offset >> 8));
port_byte_out(REG_SCREEN_CTRL, 15);
port_byte_out(REG_SCREEN_DATA, (u8)(offset & 0xff));
port_byte_out(REG_SCREEN_DATA, (uint8_t)(offset & 0xff));
}
void clear_screen() {
int screen_size = MAX_COLS * MAX_ROWS;
int i;
u8 *screen = (u8*) VIDEO_ADDRESS;
uint8_t *screen = (uint8_t*) VIDEO_ADDRESS;
for (i = 0; i < screen_size; i++) {
screen[i*2] = ' ';

2
23-fixes/drivers/screen.h
View File

@@ -1,8 +1,6 @@
#ifndef SCREEN_H
#define SCREEN_H
#include "../cpu/type.h"
#define VIDEO_ADDRESS 0xb8000
#define MAX_ROWS 25
#define MAX_COLS 80