diff options
author | Alex AUVOLAT <alexis211@gmail.com> | 2013-07-11 22:38:20 +0200 |
---|---|---|
committer | Alex AUVOLAT <alexis211@gmail.com> | 2013-07-11 22:38:20 +0200 |
commit | d2aebee488b71e6f28b8728e7473b63f412ca897 (patch) | |
tree | fbe432590bfcf0b77b189a3db99762fb4f104f39 /src/kernel | |
parent | 78d7ffce4861dea5624ff29ceb39f1643dff8235 (diff) | |
download | TCE-d2aebee488b71e6f28b8728e7473b63f412ca897.tar.gz TCE-d2aebee488b71e6f28b8728e7473b63f412ca897.zip |
Added direct acces to video memory from userland.std_c_userland
Next : same for keyboard ; move VT handling to userland.
Consequence : a foreground app has total control over I/O.
Next : implement sockets & a userland console multiplexer.
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/dev/display.h | 1 | ||||
-rw-r--r-- | src/kernel/dev/keyboard.cpp | 2 | ||||
-rw-r--r-- | src/kernel/dev/ps2keyboard.cpp | 1 | ||||
-rw-r--r-- | src/kernel/dev/vgatxt.cpp | 34 | ||||
-rw-r--r-- | src/kernel/dev/vgatxt.h | 7 | ||||
-rw-r--r-- | src/kernel/mem/paging.cpp | 1 | ||||
-rw-r--r-- | src/kernel/task/syscall.cpp | 5 | ||||
-rw-r--r-- | src/kernel/vfs/node.cpp | 6 | ||||
-rw-r--r-- | src/kernel/vfs/node.h | 2 |
9 files changed, 56 insertions, 3 deletions
diff --git a/src/kernel/dev/display.h b/src/kernel/dev/display.h index ec67e7e..963b5e6 100644 --- a/src/kernel/dev/display.h +++ b/src/kernel/dev/display.h @@ -22,7 +22,6 @@ class display : public node { vt *connected_vt; display(node* parent) : node(parent, FT_DEV) { - dev_type = DT_DISPLAY; connected_vt = 0; } virtual ~display() {} diff --git a/src/kernel/dev/keyboard.cpp b/src/kernel/dev/keyboard.cpp index 3f54b99..af4c380 100644 --- a/src/kernel/dev/keyboard.cpp +++ b/src/kernel/dev/keyboard.cpp @@ -77,7 +77,7 @@ static keymap default_km = { }; keyboard::keyboard(node *parent) : node(parent, FT_DEV) { - dev_type = DT_KEYBOARD; + dev_type = DT_PCKBD; km = &default_km; num = true; diff --git a/src/kernel/dev/ps2keyboard.cpp b/src/kernel/dev/ps2keyboard.cpp index 31cd75f..c7fc322 100644 --- a/src/kernel/dev/ps2keyboard.cpp +++ b/src/kernel/dev/ps2keyboard.cpp @@ -53,3 +53,4 @@ void ps2kbd::kbdIrq() { escaped = false; } } + diff --git a/src/kernel/dev/vgatxt.cpp b/src/kernel/dev/vgatxt.cpp index eb57eb9..7abbaf9 100644 --- a/src/kernel/dev/vgatxt.cpp +++ b/src/kernel/dev/vgatxt.cpp @@ -4,11 +4,12 @@ #include <mem/mem.h> static uint16_t *video_memory = (uint16_t*)((size_t)K_HIGHHALF_ADDR + 0xB8000); +#define VIDMEM_SIZE (80 * 25 * 2) vgatxt *text_display; vgatxt::vgatxt(node *parent) : display(parent) { - // nothing to do, really + dev_type = DT_VGATXT; } int vgatxt::text_w() { @@ -52,3 +53,34 @@ void vgatxt::text_scroll(int n, uint8_t fgcolor, uint8_t bgcolor) { // TODO } } + + +// Operations as a FS node + +size_t vgatxt::get_size() { // size as a node of the filesystem + return (text_w() << 16) + text_h(); +} + +int vgatxt::read(size_t offset, size_t len, char *buffer) { + if (offset > VIDMEM_SIZE) return 0; + if (offset + len > VIDMEM_SIZE) len = VIDMEM_SIZE - offset; + + char *vm = (char*)video_memory; + memcpy(buffer, vm + offset, len); + return len; +} + +int vgatxt::write(size_t offset, size_t len, char *buffer) { + if (offset > VIDMEM_SIZE) return 0; + if (offset + len > VIDMEM_SIZE) len = VIDMEM_SIZE - offset; + + char *vm = (char*)video_memory; + memcpy(vm + offset, buffer, len); + return len; +} + +int vgatxt::dev_control(char *data) { + uint16_t *d = (uint16_t*)data; + text_setcsr(d[0], d[1], d[2] != 0); + return 0; +} diff --git a/src/kernel/dev/vgatxt.h b/src/kernel/dev/vgatxt.h index 550d4ba..bed743e 100644 --- a/src/kernel/dev/vgatxt.h +++ b/src/kernel/dev/vgatxt.h @@ -10,6 +10,13 @@ class vgatxt : public display { vgatxt(node *parent); virtual ~vgatxt() {} + // as a FS node + virtual size_t get_size(); + virtual int read(size_t offset, size_t len, char *buffer); + virtual int write(size_t offset, size_t len, char *buffer); + virtual int dev_control(char *data); + + // as a display virtual int text_w(); virtual int text_h(); virtual void text_setcsr(int l, int c, bool visible); diff --git a/src/kernel/mem/paging.cpp b/src/kernel/mem/paging.cpp index 436c888..4878ab3 100644 --- a/src/kernel/mem/paging.cpp +++ b/src/kernel/mem/paging.cpp @@ -146,6 +146,7 @@ uint32_t paging_fault(registers *regs) { if (regs->err_code & 0x4) dbg_printf(" user"); if (regs->err_code & 0x8) dbg_printf(" rsvd"); if (regs->err_code & 0x10) dbg_printf(" opfetch"); + dbg_printf("\n"); return 1; } return 0; diff --git a/src/kernel/task/syscall.cpp b/src/kernel/task/syscall.cpp index a3074b8..2e1350e 100644 --- a/src/kernel/task/syscall.cpp +++ b/src/kernel/task/syscall.cpp @@ -78,6 +78,10 @@ static void link_sc(registers *r) { r->eax = link((char*)r->ebx, (char*)r->ecx, r->edx); } +static void devcontrol_sc(registers *r) { + r->eax = dev_control(r->ebx, (char*)r->ecx); +} + int_callback syscalls[NUMBER_OF_SYSCALLS] = { // This must correspond to common/include/tce/syscalls.h 0, // 0 @@ -109,6 +113,7 @@ int_callback syscalls[NUMBER_OF_SYSCALLS] = { // This must correspond to common read_sc, write_sc, link_sc, + devcontrol_sc, 0 }; diff --git a/src/kernel/vfs/node.cpp b/src/kernel/vfs/node.cpp index 0b753af..d5d4c65 100644 --- a/src/kernel/vfs/node.cpp +++ b/src/kernel/vfs/node.cpp @@ -126,3 +126,9 @@ int link(char* from, char* to, int mode) { node *f2 = (to == 0 ? 0 : vfs_find(root, to)); return f1->link(f2, mode); } + +int dev_control(FILE file, char *data) { + node *f = vfs_read_fd(file); + if (f == 0) return E_INVALID_FD; + return f->dev_control(data); +} diff --git a/src/kernel/vfs/node.h b/src/kernel/vfs/node.h index 3b1c700..7fbc205 100644 --- a/src/kernel/vfs/node.h +++ b/src/kernel/vfs/node.h @@ -28,6 +28,7 @@ class node { virtual int add_child(char* name, node *child) { return E_NOT_IMPLEMENTED; } virtual size_t get_size() { return 0; } virtual int link(node* other, int mode) { return E_NOT_IMPLEMENTED; } + virtual int dev_control(char *data) { return E_NOT_IMPLEMENTED; } // kind of like dynamic_cast'ing these things virtual display *as_display() { return 0; } @@ -51,5 +52,6 @@ void close(FILE file); int read(FILE file, size_t offset, size_t len, char *buffer); int write(FILE file, size_t offset, size_t len, char *buffer); int link(char* from, char* to, int mode); +int dev_control(FILE file, char *data); #endif |