summaryrefslogtreecommitdiffstats
path: root/arch/x86/io
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/io')
-rw-r--r--arch/x86/io/GlobalObj.cpp3
-rw-r--r--arch/x86/io/GlobalObj.h8
-rw-r--r--arch/x86/io/VGADisplay.cpp2
-rw-r--r--arch/x86/io/VGADisplay.h8
4 files changed, 10 insertions, 11 deletions
diff --git a/arch/x86/io/GlobalObj.cpp b/arch/x86/io/GlobalObj.cpp
deleted file mode 100644
index a1c4f03..0000000
--- a/arch/x86/io/GlobalObj.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "VGADisplay.h"
-
-VGADisplay display;
diff --git a/arch/x86/io/GlobalObj.h b/arch/x86/io/GlobalObj.h
deleted file mode 100644
index 72c6b06..0000000
--- a/arch/x86/io/GlobalObj.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef GLOBALOBJ_H
-#define GLOBALOBJ_H
-
-#include "VGADisplay.h"
-
-extern VGADisplay display;
-
-#endif
diff --git a/arch/x86/io/VGADisplay.cpp b/arch/x86/io/VGADisplay.cpp
index 0cd0bed..ceb4862 100644
--- a/arch/x86/io/VGADisplay.cpp
+++ b/arch/x86/io/VGADisplay.cpp
@@ -1,5 +1,7 @@
#include "VGADisplay.h"
+VGADisplay out::display;
+
VGADisplay::VGADisplay()
{
isBright = isBlink = shift = 0;
diff --git a/arch/x86/io/VGADisplay.h b/arch/x86/io/VGADisplay.h
index db4c4df..326ae95 100644
--- a/arch/x86/io/VGADisplay.h
+++ b/arch/x86/io/VGADisplay.h
@@ -36,4 +36,12 @@ class VGADisplay
void setBlink(bool blinkAttr);
void setBright(bool brigthAttr);
};
+
+// Global variables
+
+namespace out
+{
+ extern VGADisplay display;
+};
+
#endif