diff options
| author | Alexey Gavrilov <90127298+rebovas@users.noreply.github.com> | 2024-03-07 15:18:51 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-07 15:18:51 +0700 |
| commit | 05673a8a51a9f00fa367ec2898ffce493e7ecdc9 (patch) | |
| tree | 4999e8c789a036511a1b6bbaec594b712bb1f64a /arch/x86/io | |
| parent | 976575c12b5da66996a3204ec711e4937a3ef240 (diff) | |
| parent | 244a9154e42a49470bd28e3a95ebe9f4a5fe5ff7 (diff) | |
Merge pull request #1 from rebovas/init_proc
Mechanism of initialization
Diffstat (limited to 'arch/x86/io')
| -rw-r--r-- | arch/x86/io/GlobalObj.cpp | 3 | ||||
| -rw-r--r-- | arch/x86/io/GlobalObj.h | 8 | ||||
| -rw-r--r-- | arch/x86/io/VGADisplay.cpp | 2 | ||||
| -rw-r--r-- | arch/x86/io/VGADisplay.h | 8 |
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 |