From 244a9154e42a49470bd28e3a95ebe9f4a5fe5ff7 Mon Sep 17 00:00:00 2001
From: Alexey Gavrilov <rebovas@yahoo.com>
Date: Wed, 6 Mar 2024 15:32:17 +0700
Subject: Initialization mechanism

---
 arch/x86/io/GlobalObj.cpp  | 3 ---
 arch/x86/io/GlobalObj.h    | 8 --------
 arch/x86/io/VGADisplay.cpp | 2 ++
 arch/x86/io/VGADisplay.h   | 8 ++++++++
 4 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 arch/x86/io/GlobalObj.cpp
 delete mode 100644 arch/x86/io/GlobalObj.h

(limited to 'arch/x86/io')

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
-- 
cgit v1.2.3