From 821b3b26c61199dc5967a7825f5b618192f32f2f Mon Sep 17 00:00:00 2001 From: Julian Barathieu Date: Tue, 7 May 2019 23:21:02 +0200 Subject: [PATCH 1/2] stuff --- kaleid/libbuf/bgetc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kaleid/libbuf/bgetc.c b/kaleid/libbuf/bgetc.c index 6577c06..be4b276 100644 --- a/kaleid/libbuf/bgetc.c +++ b/kaleid/libbuf/bgetc.c @@ -31,7 +31,7 @@ error_t BGetFromBuf(Buffer_t *buf, uchar *ch) assert(buf && buf->initDone == INITOK); if (!buf) return EINVAL; - if (buf->state != BS_RDWR && buf->state != BS_RDONLY) { + if (buf->flags & BUF_TERM || buf->state != BS_RDWR && buf->state != BS_RDONLY) { return EBADF; } @@ -47,6 +47,12 @@ error_t bgetc(Buffer_t *buf, uchar *ch) if (buf->flags & (BF_EOF|BF_ERR)) return EENDF; - return EOK; + if ( + + if (rc != EOK) { + // buf->flags |= BF_ERR; + } + + return rc; } From 56fff7b52defbbbe639337e374422b4e514153ff Mon Sep 17 00:00:00 2001 From: Julian Barathieu Date: Wed, 8 May 2019 00:00:45 +0200 Subject: [PATCH 2/2] Keyboard, scroll-up, escape, and stuff --- include/kernel/pwmgnt.h | 8 +++----- kaleid/kernel/init/init.c | 37 ++++++++++++++++++++++++++++--------- kaleid/kernel/io/keyb.c | 11 +++++++++-- kaleid/kernel/io/vga.c | 28 +++++++++++++++++++++------- kaleid/kernel/po/shtdwn.c | 12 +++++++++--- kaleid/libbuf/bgetc.c | 36 ++++++++++++++++++++++++++++++++++-- 6 files changed, 104 insertions(+), 28 deletions(-) diff --git a/include/kernel/pwmgnt.h b/include/kernel/pwmgnt.h index 03fe1de..7e3218b 100644 --- a/include/kernel/pwmgnt.h +++ b/include/kernel/pwmgnt.h @@ -31,11 +31,9 @@ //----------------------------------------------------------------------------// -void PoShutdownQemu(void); - -void PoShutdownVirtualbox(void); - -void PoShutdownBochs(void); +noreturn void PoShutdownQemu(void); +noreturn void PoShutdownVirtualbox(void); +noreturn void PoShutdownBochs(void); //----------------------------------------------------------------------------// diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index 64be366..abacf82 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -38,8 +38,10 @@ extern void BtInitBootInfo(multiboot_info_t *mbi, void *codeSeg); // io/vga.c extern error_t IoInitVGABuffer(void); +extern void IoScrollDown(void); +extern void IoScrollUp(void); -//io/keyb.c +// io/keyb.c extern void IoEnableKeyb(void); // cpu/idt.c @@ -56,6 +58,9 @@ extern void divideByZero(void); // noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg) { + uchar ch; + error_t rc; + KeDisableIRQs(); // Initialize the BootInfo_t structure @@ -76,24 +81,38 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg) // Several inits MmInitHeap(); - //PsInitSched(); + PsInitSched(); // Interrupts launching IdtSetup(); KeEnableIRQs(); - // Drivers enabling + + // Start drivers IoEnableRtc(); IoEnableKeyb(); IoGetRtcTimeChar(); IoPrintRtcTime(); - // IoDoStarWars(); - KernLog("Goodbye at %s\n", IoGetRtcTimeChar()); + int i=0; + while(i++<50)KernLog("%d\n", i); + // Main loop + while ((rc = bgetc(BStdIn, &ch)) == EOK) { + switch (ch) { + case 17: // DC1 + IoScrollUp(); + break; + case 18: // DC2 + IoScrollDown(); + break; + case 27: // ESC + BFlushBuf(BStdOut); + PoShutdownQemu(); + break; + } + } + + KernLog("End of input reached\n"); PoShutdownQemu(); - - // End this machine's suffering - BFlushBuf(BStdOut); - KeCrashSystem(); } diff --git a/kaleid/kernel/io/keyb.c b/kaleid/kernel/io/keyb.c index 721280c..fd5721a 100644 --- a/kaleid/kernel/io/keyb.c +++ b/kaleid/kernel/io/keyb.c @@ -30,8 +30,8 @@ char ScanCodes[100] = { 0 }; void KeybPrint(char code) { - if (code) { - bputc(BStdIn, ScanCodes[(int)code]); + bputc(BStdIn, ScanCodes[(int)code]); + if (code && (isprint(ScanCodes[(int)code]) || ScanCodes[(int)code]=='\n')) { bputc(BStdOut, ScanCodes[(int)code]); //bprintf(BStdOut, "%x ", code); BStdOut->flusher(BStdOut); @@ -40,6 +40,7 @@ void KeybPrint(char code) void ScanCodesInit(void) { + ScanCodes[0x01] = 27; // ESC ScanCodes[0x02] = '1'; ScanCodes[0x03] = '2'; ScanCodes[0x04] = '3'; @@ -94,6 +95,12 @@ void ScanCodesInit(void) ScanCodes[0x1C] = '\n'; ScanCodes[0x39] = ' '; + + // Numpad + ScanCodes[0x48] = 17; // DC1, will serve as Arrow Up + ScanCodes[0x50] = 18; // DC2, will serve as Arrow Down + ScanCodes[0x4B] = 19; // DC3, will serve as Arrow Left + ScanCodes[0x4D] = 20; // DC4, will serve as Arrow Right } void KeybHandler(ISRFrame_t *regs) diff --git a/kaleid/kernel/io/vga.c b/kaleid/kernel/io/vga.c index d5e9683..d272985 100644 --- a/kaleid/kernel/io/vga.c +++ b/kaleid/kernel/io/vga.c @@ -26,11 +26,6 @@ #include #include -//----------------------------------------------------------// -// Internal functions for VGA terminals // -// These DO NOT check input correctness // -//----------------------------------------------------------// - // // VGA-related macros // @@ -38,6 +33,8 @@ #define VGA_ComputeOffset(term, x, y) ((y) * (term)->width + (x)) #define VGA_ComputeEntry(ch, cl) (((ushort)(ch)) | (ushort)(cl) << 8) +static uint bscroll = 0; + // // VGA Buffer Flusher // @@ -49,7 +46,7 @@ error_t bvgaflusher(Buffer_t *buf) uchar *currentLine = buf->wp - buf->lineLen - buf->lastLF; uchar *bufStart = (uchar *)lmax((size_t)buf->buf, (size_t)currentLine - - (buf->nLines - 2) * buf->lineLen); + - (buf->nLines - 2 + bscroll) * buf->lineLen); uchar *ptr = bufStart; @@ -80,6 +77,23 @@ error_t bvgaflusher(Buffer_t *buf) return EOK; } +void IoScrollDown(void) +{ + if (bscroll > 0) + bscroll--; + bvgaflusher(BStdOut); +} + + +void IoScrollUp(void) +{ + // Keep the 8 below the 10 given to BOpenTermBufEx + if (bscroll < BtVideoInfo.framebufferHeight * 8) + bscroll++; + bvgaflusher(BStdOut); +} + + // // Initialize VGA buffer // @@ -94,7 +108,7 @@ error_t IoInitVGABuffer(void) bvgabufsrc, BS_WRONLY, BtVideoInfo.framebufferWidth, BtVideoInfo.framebufferHeight, - 1, bvgaflusher); + 10, bvgaflusher); BEnableAutoScroll(BStdOut); diff --git a/kaleid/kernel/po/shtdwn.c b/kaleid/kernel/po/shtdwn.c index 364621b..cc0fb3d 100644 --- a/kaleid/kernel/po/shtdwn.c +++ b/kaleid/kernel/po/shtdwn.c @@ -26,29 +26,35 @@ #include #include -void PoShutdownQemu(void) +noreturn void PoShutdownQemu(void) { KernLog("Shutdown QEMU at %s...\n", IoGetRtcTimeChar()); IoRtcWait(1000); IoWriteWordOnPort(0x604, 0x2000); + + __builtin_unreachable(); }; -void PoShutdownVirtualbox(void) +noreturn void PoShutdownVirtualbox(void) { KernLog("Shutdown VirtualBox at %s...\n", IoGetRtcTimeChar()); IoRtcWait(1000); IoWriteWordOnPort(0x4004, 0x3400); + + __builtin_unreachable(); }; -void PoShutdownBochs(void) +noreturn void PoShutdownBochs(void) { KernLog("Shutdown Bochs at %s...\n", IoGetRtcTimeChar()); IoRtcWait(1000); IoWriteWordOnPort(0xB004, 0x2000); + + __builtin_unreachable(); }; diff --git a/kaleid/libbuf/bgetc.c b/kaleid/libbuf/bgetc.c index be4b276..9602b2c 100644 --- a/kaleid/libbuf/bgetc.c +++ b/kaleid/libbuf/bgetc.c @@ -25,13 +25,18 @@ #include #include +#ifdef _KALEID_KERNEL +#include +#endif + error_t BGetFromBuf(Buffer_t *buf, uchar *ch) { error_t rc; assert(buf && buf->initDone == INITOK); if (!buf) return EINVAL; - if (buf->flags & BUF_TERM || buf->state != BS_RDWR && buf->state != BS_RDONLY) { + if (buf->flags & BF_TERM) return EBADF; + if (buf->state != BS_RDWR && buf->state != BS_RDONLY) { return EBADF; } @@ -41,13 +46,40 @@ error_t BGetFromBuf(Buffer_t *buf, uchar *ch) return rc; } +// XXX for now, at most 4096 characters can be inputed in BStdIn + error_t bgetc(Buffer_t *buf, uchar *ch) { error_t rc = EOK; if (buf->flags & (BF_EOF|BF_ERR)) return EENDF; - if ( + assert(!(buf->rp > buf->wp)); // Shouldn't be possible right now + + if (buf->rp == buf->buf + buf->size) { + buf->flags |= BF_EOF; + return EENDF; + } + + // Are there things to read at all? + if (buf->rp < buf->wp) { + *ch = *buf->rp++; + return EOK; + } + + // We need to fill the buffer + else { + // We need a BFiller_t + // For now we wait until something is in there + // (so that BStdIn works; don't make anything else) + while (buf->rp >= buf->wp) { +#ifdef _KALEID_KERNEL + IoRtcWait(1); +#endif + } + + *ch = *buf->rp++; + } if (rc != EOK) { // buf->flags |= BF_ERR;