v0.0.2

check out the release notes. Big updates this time!

Author: coldmayo

README.md

@@ -7,10 +7,12 @@ I watched Star Wars Episode 9 opening night in theaters and Klaud was the main c
 ## Features
 
 * double stage bootloader
+* BIOS boot
+* FAT file system (shawty got a fatty)
 * gdt, interrupt handler
 * keyboard input and printed output
 * kernel with commands
-* built in x86 assembly and C using gcc
+* built in x86 assembly and C with gcc as compiler
 
 ## How to use
 

release_notes/v0.0.2.md

@@ -0,0 +1,7 @@
+# Version 0.0.2
+
+Added features:
+* Added '!' as a useable key 
+* Added factorial in calculator
+* Finally added frame buffer so backspace actually works (a lot more work than you think)
+* Updated README and main.c in kernel

src/kernel/interrupts.c

@@ -10,10 +10,12 @@
 #include "libs/strings.h"
 #include "arch/i686/serial_port.h"
 #include "keyboard.h"
+#include "libs/disp.h"
 
 #define INTERRUPTS_DESCRIPTOR_COUNT 256 
 #define INTERRUPTS_KEYBOARD 33
 #define INTERRUPTS_TIMER 0 
+unsigned int BUFFER_COUNT;
 
 struct IDTDescriptor idt_descriptors[INTERRUPTS_DESCRIPTOR_COUNT];
 struct IDT idt;
@@ -68,34 +70,50 @@ void interrupt_handler(__attribute__((unused)) struct cpu_state cpu, unsigned in
 	switch (interrupt){
 		case INTERRUPTS_KEYBOARD:
 			scan_code = keyboard_read_scan_code();
+			//printf("%d",scan_code);
 			if (scan_code == 28) {
 				printf("\n");
+				fb_write('\n',BUFFER_COUNT);
 				user_input(key_buffer);
 				memcpy(prevComm,key_buffer,strlen(key_buffer)+1);
 				key_buffer[0] = '\0';
 			} else if (scan_code == 1) {
 				printf("\n> ");
 				key_buffer[0] = '\0';
+				scroll(1);
 			} else if (scan_code == 72) {
 				memcpy(key_buffer,prevComm,strlen(key_buffer)+1);
+				move_curs(strlen(key_buffer));
 				printf("%s",key_buffer);
 			} else if (shift == 1) {
 				if (scan_code==13) {scan_code = 78;}
 				else if (scan_code==6) {scan_code = 84;}
 				else if (scan_code==7) {scan_code = 85;}
 				else if (scan_code==9) {scan_code = 86;}
+				else if (scan_code==2) {scan_code = 87;}
+				else if (scan_code==43) {scan_code = 88;}
 				ascii = keyboard_scan_code_to_ascii(scan_code);
 				append(key_buffer, ascii);
-				printf("%c",ascii);
+				fb_write(ascii,BUFFER_COUNT);
+				//printf("%c",ascii);
 				shift = 0;
 			} else if (scan_code == 14) {
 				backspace(key_buffer);
+				BUFFER_COUNT--;
+				fb_clear(BUFFER_COUNT);
 			} else if (scan_code == 42) {
 				shift = 1;
+			} else if (scan_code == 77) {
+				
+			} else if (scan_code == 75) {
+				
 			} else if (scan_code <= KEYBOARD_MAX_ASCII) {
 				ascii = keyboard_scan_code_to_ascii(scan_code);
 				append(key_buffer, ascii);
-				printf("%c",ascii);
+				fb_write(ascii,BUFFER_COUNT);
+				//putc(ascii);
+				BUFFER_COUNT++;
+				//printf("%c",ascii);
 			}
 			pic_acknowledge(interrupt);
 

src/kernel/keyboard.c

@@ -22,7 +22,7 @@ char keyboard_scan_code_to_ascii(unsigned char scan_code)
 		0x0, ' ', 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,		// 56 - 63
 		0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, '7',		// 64 - 71
 		'8', '9', '-', '4', '5', '6', '+', '1',		// 72 - 79
-		'2', '3', '0', '.', '%','^','*',				// 80 - 83 plus extras
+		'2', '3', '0', '.', '%','^','*','!'				// 80 - 83 plus extras
 	};
 
 	return ascii[scan_code];

src/kernel/libs/asciiArt.c

@@ -1,4 +1,5 @@
 #include "stdio.h"
+#include "libs/disp.h"
 
 void klaud_ascii() {
     puts(                                                                               
@@ -16,6 +17,7 @@ void klaud_ascii() {
     "                             *,*,**#**,,**((#&&#(        \r\n"              
     "                            ,*,*,.....,**/#((//#(        \r\n"               
     );
+    scroll(14);
 }
 
 void flowers() {
@@ -29,8 +31,8 @@ void flowers() {
     "                     |       |/       | /   | /   |/        \r\n"
     "                     |//     |///     |//   |///  |///      \r\n"
     "                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  \r\n"
-
     );
+    scroll(8);
 }
 
 void help() {
@@ -57,4 +59,5 @@ void help() {
         "Up arrow: prints the previous command into current line\r\n"
         "Shift: same usage as normal (uppercase not supported yet)"
     );
+    scroll(20);
 }

src/kernel/libs/disp.c

@@ -0,0 +1,62 @@
+#include "disp.h"	
+
+static char *fb = (char *)0x000B8000;
+char curr_x[6];
+
+void fb_move_cursor(unsigned short pos) {
+	i686_outb(FB_COMMAND_PORT, FB_HIGH_BYTE_COMMAND);
+	i686_outb(FB_DATA_PORT, ((pos >> 8) & 0x00FF));
+	i686_outb(FB_COMMAND_PORT, FB_LOW_BYTE_COMMAND);
+  	i686_outb(FB_DATA_PORT, pos & 0x00FF);
+}
+
+void reset() {
+    memcpy(curr_x,itoa(3),strlen(itoa(100))+1);
+}
+
+void move_curs(int x) {
+    memcpy(curr_x,itoa(convert(curr_x)+x),strlen(itoa(curr_x+x))+1);
+}
+
+void scroll(int x) {
+    int c_x = convert(curr_x);
+    c_x = (c_x + (80*x) - c_x%80)+2;
+    //printf("%d",c_x);
+    if (c_x >= 1842) {
+        //printf("peen");
+        memcpy(curr_x,itoa(1842+80),strlen(itoa(c_x))+1);
+    } else {
+        memcpy(curr_x,itoa(c_x),strlen(itoa(c_x))+1);
+    }
+}
+
+void fb_write_cell(unsigned int i, char c, unsigned char fg, unsigned char bg) {
+	int c_x = convert(curr_x);
+    if (c == '\n') {
+        //c_x = c_x + 80 - c_x%80;
+        scroll(1);
+        //printf("%d",i);
+    } else if (c == '$') {
+        fb[i-2] = ' ';
+	    fb[i] = ((fg & 0x0F) << 4) | (bg & 0x0F);
+        c_x--;
+        memcpy(curr_x,itoa(c_x),strlen(itoa(c_x))+1);
+    } else {
+        fb[i] = c;
+	    fb[i + 1] = ((fg & 0x0F) << 4) | (bg & 0x0F);
+        c_x++;
+        memcpy(curr_x,itoa(c_x),strlen(itoa(c_x))+1);
+    }
+}
+
+void fb_write(char c, unsigned int i){
+    int c_x = convert(curr_x);
+    //printf("%d",c_x);
+	fb_write_cell(c_x*2, c, BLACK, LIGHT_GREY);
+	fb_move_cursor(c_x+1);
+}
+
+void fb_clear(unsigned int i){
+    int c_x = convert(curr_x);
+    fb_write_cell(c_x*2+1, '$', BLACK, BLACK);
+}

src/kernel/libs/disp.h

@@ -0,0 +1,64 @@
+#ifndef INCLUDE_FRAMEBUFFER_H
+#define INCLUDE_FRAMEBUFFER_H
+
+#pragma once
+#include "arch/i686/io.h"
+
+/* The I/O ports */
+#define FB_COMMAND_PORT 0x3D4
+#define FB_DATA_PORT 0x3D5
+
+/* The I/O port commands */
+#define FB_HIGH_BYTE_COMMAND 14
+#define FB_LOW_BYTE_COMMAND 15
+
+/* Frame buffer supported color value */
+#define BLACK      0
+#define BLUE       1
+#define LIGHT_GREY 7
+
+// Make a pixel(2 bytes), background is always black, a is a char, b is foreground color
+#define LOAD_MEMORY_ADDRESS 0xC0000000
+#define SCREEN ((uint16_t*)(LOAD_MEMORY_ADDRESS + 0xB8000))
+#define WIDTH 80
+#define HEIGHT 25
+#define DEFAULT_COLOR LIGHT_GREY
+#define PAINT(a,b) (((b & 0xF) << 8) | (a & 0xFF))
+
+// Get pixel
+#define PIXEL(x, y) SCREEN[y * 80 + x]
+
+/** fb_move_cursor:
+ *  Moves the cursor of the framebuffer to the given position
+ *
+ *  @param pos The new position of the cursor
+ */
+void fb_move_cursor(unsigned short pos);
+
+/** fb_write_cell:
+ *  Writes a character with the given foreground and background to position i
+ *  in the framebuffer.
+ *
+ *  @param i  The location in the framebuffer
+ *  @param c  The character
+ *  @param fg The foreground color
+ *  @param bg The background color
+ */
+void fb_write_cell(unsigned int i, char c, unsigned char fg, unsigned char bg);
+
+/** write:
+ *  writes the contents of the buffer buf of length len to the screen
+ *
+ *  @param c  character that needs to be written to screen
+ *  @param i  number of total characters written on the framebuffer
+ */
+void fb_write(char c, unsigned int i);
+
+/** clear:
+ *  clears the previous content of the buffer and move the cursor back
+ *
+ *  @param i    number of total characters written on the framebuffer
+ */
+void fb_clear(unsigned int i);
+
+#endif

src/kernel/libs/math.c

@@ -18,34 +18,45 @@ int pow(int one, int two) {
     return ans;
 }
 
+// function for 4 function calculator
+int factorial(int x) {
+    int ans = 1;
+    for (int i=1;i<=x;i++)
+        ans *= i;
+    return ans;
+}
+
 // function for 4 function calculator
 
 int calc(char * str) {
     char *start = str;
     int ans = 0;
     char lastOp;
-    char opList[7] = {'+','-','/','*','%','^'};
+    char opList[7] = {'+','-','/','*','%','^','!'};
     int i=0;   // makes sure the first number doesn't do an operation on the number before that (0)
     for(;*str;str++) { 
         // I hate continuous if/else if statements TODO fix this shit
         if(*str == '+') {
             *str = '\0';
             ans = ans + convert(start);
+            if (i == 0) {ans = convert(start);}
+            //printf("%d\n%d\n",ans,convert(start));
             *str = '+';
             start = str + 1;
             lastOp = *str;
+            i++;
         } else if (*str == '-') {
             *str = '\0';
-            ans = ans - convert(start);
+            ans = ans-convert(start);
             if (i == 0) {ans = convert(start);}
             *str = '-';
             start = str + 1;
             lastOp = *str;
             i++;
         } else if (*str == '*') {
             *str = '\0';
-            if (i == 0) {ans = 1;}
             ans = convert(start) * ans;
+            if (i == 0) {ans = convert(start);}
             *str = '*';
             start = str + 1;
             lastOp = *str;
@@ -75,15 +86,28 @@ int calc(char * str) {
             start = str + 1;
             lastOp = *str;
             i++;
+        } else if (*str == '!') {
+            *str = '\0';
+            ans = factorial(convert(start));
+            *str = '!';
+            start = str + 1;
+            lastOp = *str;
+            i++;
         }
     }
     // catches last numbers
+    //printf("%d\n",ans);
     if (lastOp == '+') {ans = ans + convert(start);}
     else if (lastOp == '-') {ans = ans - convert(start);}
     else if (lastOp == '*') {ans = ans * convert(start);}
     else if (lastOp == '/') {ans = ans / convert(start);}
     else if (lastOp == '%') {ans = ans % convert(start);}
     else if (lastOp == '^') {ans = pow(ans,convert(start));}
+    if (lastOp == '!') {
+        if (i > 1) {
+            ans = factorial(ans);
+        }
+    }
     return ans;
 }
 

src/kernel/libs/stdio.c

@@ -55,6 +55,7 @@ void clrscr()
     g_ScreenX = 0;
     g_ScreenY = 0;
     setcursor(g_ScreenX, g_ScreenY);
+    reset();
 }
 
 void changeColor(const uint8_t color) {