more vga oop & levelization

Author: usrlocalben

makefile

@@ -48,14 +48,19 @@ vga_irq.obj: vga_irq.cpp vga_irq.hpp vga_reg.lib pc_pit.lib pc_cpu.lib
 vga_irq.lib: vga_irq.obj             vga_reg.lib pc_pit.lib pc_cpu.lib
 	$(LIB) $@ $<
 
-vga_mode.obj: vga_mode.cpp vga_mode.hpp vga_reg.lib pc_bus.lib pc_cpu.lib
+vga_mode.obj: vga_mode.cpp vga_mode.hpp vga_reg.lib vga_bios.lib pc_bus.lib pc_cpu.lib
 	$(CPP) $[@
-vga_mode.lib: vga_mode.obj              vga_reg.lib pc_bus.lib pc_cpu.lib
+vga_mode.lib: vga_mode.obj              vga_reg.lib vga_bios.lib pc_bus.lib pc_cpu.lib
 	$(LIB) $@ $<
 
-vga_reg.obj: vga_reg.cpp vga_reg.hpp pc_bus.lib
+vga_reg.obj: vga_reg.cpp vga_reg.hpp pc_bus.lib pc_cpu.lib
 	$(CPP) $[@
-vga_reg.lib: vga_reg.obj             pc_bus.lib
+vga_reg.lib: vga_reg.obj             pc_bus.lib pc_cpu.lib
+	$(LIB) $@ $<
+
+vga_bios.obj: vga_bios.cpp vga_bios.hpp pc_bus.lib
+	$(CPP) $[@
+vga_bios.lib: vga_bios.obj              pc_bus.lib
 	$(LIB) $@ $<
 
 sb16.obj: sb16.cpp sb16.hpp pc_dma.lib pc_pic.lib pc_cpu.lib pc_bus.lib 

vga_bios.cpp

@@ -0,0 +1,32 @@
+#include "vga_bios.hpp"
+
+#include <cstdint>
+
+#include "i86.h"  // int386
+
+using std::uint8_t;
+
+namespace rqdq {
+namespace vga {
+
+namespace bios {
+
+void SetMode(uint8_t modeNum) {
+	union REGS r;
+	r.h.ah = 0;  // set video mode
+	r.h.al = modeNum;
+	int386(0x10, &r, &r); }
+
+
+std::uint8_t GetMode() {
+	union REGS r;
+	r.h.ah = 0x0f;  // get current video mode
+	int386(0x10, &r, &r);
+	return r.h.al; }
+
+
+}  // namespace bios
+
+
+}  // namespace vga
+}  // namespace rqdq

vga_bios.hpp

@@ -0,0 +1,18 @@
+#pragma once
+#include <cstdint>
+
+namespace rqdq {
+namespace vga {
+
+namespace bios {
+
+void SetMode(std::uint8_t modeNum);
+
+std::uint8_t GetMode();
+
+
+}  // namespace bios
+
+
+}  // namespace vga
+}  // namespace rqdq

vga_mode.cpp

@@ -1,40 +1,20 @@
 #include "vga_mode.hpp"
 
-#include <i86.h>  // int386
-
 #include "pc_bus.hpp"
 #include "pc_cpu.hpp"
+#include "vga_bios.hpp"
 #include "vga_reg.hpp"
 
 namespace rqdq {
 namespace vga {
 
-
-void SetBIOSMode(int num) {
-	union REGS r;
-	r.x.eax = num;
-	int386(0x10, &r, &r); }
-
-
-class SequencerDisabledSection {
-public:
-	SequencerDisabledSection(const pc::CriticalSection& cs) :cs(cs) {
-		pc::TXdw(VP_SEQC, 0x100); }  // clear bit 1, starting reset
-	~SequencerDisabledSection() {
-		pc::TXdw(VP_SEQC, 0x300); }  // undo reset / restart sequencer)
-private:
-	SequencerDisabledSection& operator=(const SequencerDisabledSection&);  // non-copyable
-	SequencerDisabledSection(const SequencerDisabledSection&);             // non-copyable
-	const pc::CriticalSection& cs; };
-
-
 /*
  * ModeX 320x240 initialization
  *
  * This is taken directly from M.Abrash's Mode-X .asm code
  */
 void SetModeX() {
-	SetBIOSMode(0x13);
+	bios::SetMode(0x13);
 	SpinUntilNextRetraceBegins();
 
 	pc::TXdw(VP_SEQC, 0x604);  // disable chain4

vga_mode.hpp

@@ -2,6 +2,7 @@
 #include <cstdint>
 #include <cstdlib>
 
+#include "vga_bios.hpp"
 #include "vga_reg.hpp"
 
 using std::uint8_t;
@@ -10,7 +11,7 @@ using std::uint16_t;
 namespace rqdq {
 namespace vga {
 
-const int VM_TEXT = 3;
+const int VM_TEXT = 0x03;
 const int VM_MODE13 = 0x13;
 const int VM_MODEX = 0x100;
 
@@ -26,27 +27,24 @@ const vga::VRAMPage modeXPages[2] = {
 	{ 1, vga::VGAPTR + (320*240/4), 320*240/4 } };
 
 
-void SetBIOSMode(int num);
 void SetModeX();
 
 
 class ModeSetter {
 public:
-	// XXX assume text-mode, need detection
-	ModeSetter() :oldMode_(0x3), curMode_(oldMode_) {}
+	ModeSetter()
+		:oldMode_(bios::GetMode()),
+		curMode_(oldMode_) {}
 
 	void Set(int req) {
-		if (req == VM_TEXT) {
-			vga::SetBIOSMode(0x3);
-			curMode_ = VM_TEXT; }
-		else if (req == VM_MODE13) {
-			vga::SetBIOSMode(0x13);
-			curMode_ = VM_MODE13; }
+		if (req < 256) {
+			bios::SetMode(req);
+			curMode_ = req; }
 		else if (req == VM_MODEX) {
 			vga::SetModeX();
 			curMode_ = VM_MODEX; }
 		else {
-			// XXX
+			// xxx throw std::runtime_error("unsupported vga mode");
 			std::exit(1); }}
 
 	~ModeSetter() {

vga_reg.hpp

@@ -5,6 +5,7 @@
 #include <cstdint>
 
 #include "pc_bus.hpp"
+#include "pc_cpu.hpp"
 
 using std::uint8_t;
 using std::uint16_t;
@@ -103,5 +104,17 @@ inline void SpinWhileHorizontalRetrace() {
 */
 
 
+class SequencerDisabledSection {
+public:
+	SequencerDisabledSection(const pc::CriticalSection& cs) :cs(cs) {
+		pc::TXdw(VP_SEQC, 0x100); }  // clear bit 1, starting reset
+	~SequencerDisabledSection() {
+		pc::TXdw(VP_SEQC, 0x300); }  // undo reset / restart sequencer)
+private:
+	SequencerDisabledSection& operator=(const SequencerDisabledSection&);  // non-copyable
+	SequencerDisabledSection(const SequencerDisabledSection&);             // non-copyable
+	const class pc::CriticalSection& cs; };
+
+
 }  // namespace vga
 }  // namespace rqdq