From f6323421e22c3585c58b54658a11e1e4706cc8fa Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Fri, 9 Apr 2021 10:29:23 +0200
Subject: Cleaning code and provide minimal libc

---
 src/utils/8042.c        |  2 +-
 src/utils/8042.h        | 42 ++++++++++++-------------
 src/utils/framebuffer.c | 58 +++++++++++++++++++++++++++++++++++
 src/utils/framebuffer.h | 27 +++++++++++++++++
 src/utils/gdt.c         |  1 -
 src/utils/mem.h         |  1 -
 src/utils/pic.c         |  2 +-
 src/utils/print.c       | 81 -------------------------------------------------
 src/utils/print.h       | 23 --------------
 9 files changed, 108 insertions(+), 129 deletions(-)
 create mode 100644 src/utils/framebuffer.c
 create mode 100644 src/utils/framebuffer.h
 delete mode 100644 src/utils/print.c
 delete mode 100644 src/utils/print.h

(limited to 'src/utils')

diff --git a/src/utils/8042.c b/src/utils/8042.c
index d8a5ba0..1d22152 100644
--- a/src/utils/8042.c
+++ b/src/utils/8042.c
@@ -1,5 +1,5 @@
 #include "8042.h"
-#include "print.h"
+#include "framebuffer.h"
 #include "asm.h"
 
 DEFINE_AZERTY;
diff --git a/src/utils/8042.h b/src/utils/8042.h
index 068a0ef..8efa8ce 100644
--- a/src/utils/8042.h
+++ b/src/utils/8042.h
@@ -6,22 +6,22 @@
 void _8042_keypress();
 
 #define DEFINE_AZERTY char AZERTY[]={\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',/* 10 */\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
-    '?',\
+    '\0',\
+    '\0',\
+    '&',\
+    '\0',\
+    '"',\
+    '\'',\
+    '(',\
+    '-',\
+    '\0',\
+    '_',/* 10 */\
+    '\0',\
+    '\0',\
+    ')',\
+    '=',\
+    '\0',\
+    '\t',\
     'a',\
     'z',\
     'e',\
@@ -34,8 +34,8 @@ void _8042_keypress();
     'p',\
     '^',\
     '$',\
-    '?',\
-    '?',\
+    '\0',\
+    '\0',\
     'q',/* 0x1E (30) */\
     's',\
     'd',\
@@ -46,9 +46,9 @@ void _8042_keypress();
     'k',\
     'l',\
     'm',\
-    '?',\
-    '?',\
-    '?',\
+    '\0',\
+    '\0',\
+    '\0',\
     '*',\
     'w',\
     'x',\
diff --git a/src/utils/framebuffer.c b/src/utils/framebuffer.c
new file mode 100644
index 0000000..110dc73
--- /dev/null
+++ b/src/utils/framebuffer.c
@@ -0,0 +1,58 @@
+#include "framebuffer.h"
+
+#define MAX_COL 80
+#define MAX_LINE 25
+
+VIDEO_STATE VS={
+  (u8 *)0xB8000,
+  0,
+  0,
+  BLACK,
+  GRAY,
+};
+
+void putchar(char c){
+  // Handle newline here
+  if(c=='\n'){
+    VS.col=0;
+    VS.line+=1;
+    if(VS.line>=MAX_LINE){
+      VS.line=MAX_LINE-1;
+      scrollup();
+    }
+    return;
+  }
+  
+  // Print char
+  VS.mem[VS.col*2+MAX_COL*VS.line*2]=c;
+  VS.mem[VS.col*2+MAX_COL*VS.line*2+1]=VS.fg|VS.bg<<4;
+  
+  // Refresh location
+  VS.col+=1;
+  if(VS.col>= MAX_COL){
+    VS.col=0;
+    VS.line+=1;
+    if(VS.line>=MAX_LINE){
+      VS.line=MAX_LINE-1;
+      scrollup();
+    }
+  }
+}
+
+void clear(){
+  for(char i=0;i<MAX_LINE;i++){
+    scrollup();
+  }
+}
+
+void scrollup(){
+  // Move VS.line up
+  for(char i=1;i<=MAX_LINE;i++){
+    for(char j=0;j<=MAX_COL;j++)
+      VS.mem[j*2+MAX_COL*(i-1)*2]=VS.mem[j*2+MAX_COL*i*2];
+  }
+  // Clear last VS.line
+  for(char i=0;i<=MAX_COL;i++){
+    VS.mem[i*2+MAX_COL*(MAX_LINE-1)*2]='\0';
+  }
+}
diff --git a/src/utils/framebuffer.h b/src/utils/framebuffer.h
new file mode 100644
index 0000000..f4e52a0
--- /dev/null
+++ b/src/utils/framebuffer.h
@@ -0,0 +1,27 @@
+#ifndef FRAMEBUFFER_H
+#define FRAMEBUFFER_H
+
+#include "types.h"
+
+typedef enum VIDEO_COLORS {
+  BLACK=0, BLUE=1, GREEN=2,CYAN=3, RED=4,PURPLE=5,BROWN=6,GRAY=7,
+  DARK_GRAY=8,LIGHT_BLUE=9,LIGHT_GREEN=10,LIGHT_CYAN=11,LIGHT_RED=12,LIGHT_PURPLE=13,YELLOW=14,WHITE=15
+  
+} VIDEO_COLORS;
+
+typedef struct VIDEO_STATE {
+  u8 *mem;
+  u8 col;
+  u8 line;
+  u8 bg;
+  u8 fg;
+} VIDEO_STATE;
+
+/**
+ * Print char
+ */
+void putchar(char);
+void scrollup();
+void clear();
+
+#endif
diff --git a/src/utils/gdt.c b/src/utils/gdt.c
index 85c4a09..e82ebe4 100644
--- a/src/utils/gdt.c
+++ b/src/utils/gdt.c
@@ -1,5 +1,4 @@
 #include "gdt.h"
-#include "print.h"
 #include "mem.h"
 
 struct GDT_REGISTER GDTR = { 0, 0 };
diff --git a/src/utils/mem.h b/src/utils/mem.h
index b09c3f0..f051219 100644
--- a/src/utils/mem.h
+++ b/src/utils/mem.h
@@ -3,7 +3,6 @@
 
 #include "types.h"
 
-
 void memcpy(void *src, void *dst, int size);
 
 #endif
diff --git a/src/utils/pic.c b/src/utils/pic.c
index 4806cb9..dcbd983 100644
--- a/src/utils/pic.c
+++ b/src/utils/pic.c
@@ -56,7 +56,7 @@ void pic_enable_interrupt(){
     outbj(0xA1,0x01); // Default operating mode
 
     // OCW: Masking
-    outbj(0x21,0);
+    outbj(0x21,0b11111100);
 
 
     asm("lidtl (IDTR)");
diff --git a/src/utils/print.c b/src/utils/print.c
deleted file mode 100644
index c2cdaf1..0000000
--- a/src/utils/print.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include "print.h"
-
-#define MAX_COL 80
-#define MAX_LINE 25
-
-struct VIDEO_STATE {
-  u8 *mem;
-  u8 col;
-  u8 line;
-  u8 bg;
-  u8 fg;
-};
-
-VIDEO_STATE VS={
-  (u8 *)0xB8000,
-  0,
-  0,
-  BLACK,
-  GRAY,
-};
-
-void putchar(char c){
-  // Handle newline here
-  if(c=='\n'){
-    VS.col=0;
-    VS.line+=1;
-    if(VS.line>=MAX_LINE){
-      VS.line=MAX_LINE-1;
-      scrollup();
-    }
-    return;
-  }
-  
-  // Print char
-  VS.mem[VS.col*2+MAX_COL*VS.line*2]=c;
-  VS.mem[VS.col*2+MAX_COL*VS.line*2+1]=VS.fg|VS.bg<<4;
-  
-  // Refresh location
-  VS.col+=1;
-  if(VS.col>= MAX_COL){
-    VS.col=0;
-    VS.line+=1;
-    if(VS.line>=MAX_LINE){
-      VS.line=MAX_LINE-1;
-      scrollup();
-    }
-  }
-}
-
-void print(char *str){
-  int i=0;
-  while(str[i]!='\0'){
-    putchar(str[i]);
-    i++;
-  }
-}
-
-void printc(char* str,VIDEO_COLORS c){
-  VIDEO_COLORS backup=VS.fg;
-  VS.fg=c;
-  print(str);
-  VS.fg=backup;
-}
-
-void clear(){
-  for(char i=0;i<MAX_LINE;i++){
-    scrollup();
-  }
-}
-
-void scrollup(){
-  // Move VS.line up
-  for(char i=1;i<=MAX_LINE;i++){
-    for(char j=0;j<=MAX_COL;j++)
-      VS.mem[j*2+MAX_COL*(i-1)*2]=VS.mem[j*2+MAX_COL*i*2];
-  }
-  // Clear last VS.line
-  for(char i=0;i<=MAX_COL;i++){
-    VS.mem[i*2+MAX_COL*(MAX_LINE-1)*2]='\0';
-  }
-}
diff --git a/src/utils/print.h b/src/utils/print.h
deleted file mode 100644
index 163f4ec..0000000
--- a/src/utils/print.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef PRINT_H
-#define PRINT_H
-
-#include "types.h"
-
-typedef enum VIDEO_COLORS {
-  BLACK=0, BLUE=1, GREEN=2,CYAN=3, RED=4,PURPLE=5,BROWN=6,GRAY=7,
-  DARK_GRAY=8,LIGHT_BLUE=9,LIGHT_GREEN=10,LIGHT_CYAN=11,LIGHT_RED=12,LIGHT_PURPLE=13,YELLOW=14,WHITE=15
-  
-} VIDEO_COLORS;
-
-typedef struct VIDEO_STATE VIDEO_STATE;
-
-/**
- * Print char
- */
-void putchar(char);
-void print(char*);
-void printc(char*,VIDEO_COLORS c);
-void scrollup();
-void clear();
-
-#endif
-- 
cgit v1.2.3