From d9443c7fdf756212bb52ffc934b1166038bc2ad3 Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Wed, 21 Apr 2021 12:23:54 +0200
Subject: Refactoring

---
 src/drivers/framebuffer.c   | 58 ---------------------------------------------
 src/drivers/framebuffer.cc  | 58 +++++++++++++++++++++++++++++++++++++++++++++
 src/drivers/framebuffer.h   | 35 ---------------------------
 src/drivers/framebuffer.hpp | 33 ++++++++++++++++++++++++++
 4 files changed, 91 insertions(+), 93 deletions(-)
 delete mode 100644 src/drivers/framebuffer.c
 create mode 100644 src/drivers/framebuffer.cc
 delete mode 100644 src/drivers/framebuffer.h
 create mode 100644 src/drivers/framebuffer.hpp

(limited to 'src/drivers')

diff --git a/src/drivers/framebuffer.c b/src/drivers/framebuffer.c
deleted file mode 100644
index 110dc73..0000000
--- a/src/drivers/framebuffer.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#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/drivers/framebuffer.cc b/src/drivers/framebuffer.cc
new file mode 100644
index 0000000..b945e77
--- /dev/null
+++ b/src/drivers/framebuffer.cc
@@ -0,0 +1,58 @@
+#include "framebuffer.hpp"
+
+#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/drivers/framebuffer.h b/src/drivers/framebuffer.h
deleted file mode 100644
index d265015..0000000
--- a/src/drivers/framebuffer.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef FRAMEBUFFER_H
-#define FRAMEBUFFER_H
-
-#include "core/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);
-
-/**
- * Scroll the framebuffer from one line
- */
-void scrollup();
-
-/**
- * Clear all char from the framebuffer
- */
-void clear();
-
-#endif
diff --git a/src/drivers/framebuffer.hpp b/src/drivers/framebuffer.hpp
new file mode 100644
index 0000000..fb09d6f
--- /dev/null
+++ b/src/drivers/framebuffer.hpp
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "core/types.hpp"
+
+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);
+
+/**
+ * Scroll the framebuffer from one line
+ */
+void scrollup();
+
+/**
+ * Clear all char from the framebuffer
+ */
+void clear();
+
-- 
cgit v1.2.3