From 74548929a04d820f7cfc178592c9d2a4616ccea1 Mon Sep 17 00:00:00 2001
From: Adrian Conlon <Adrian.conlon@gmail.com>
Date: Mon, 14 Jan 2019 02:25:09 +0000
Subject: [PATCH] Sync to the latest EightBit library.

Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
---
 libraries/EightBit |  2 +-
 src/Board.h        |  2 --
 src/Computer.cpp   | 11 ++++++-----
 src/Computer.h     |  4 ++--
 src/gb.cpp         |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/libraries/EightBit b/libraries/EightBit
index 2a223a5..a44658e 160000
--- a/libraries/EightBit
+++ b/libraries/EightBit
@@ -1 +1 @@
-Subproject commit 2a223a5acd511ae2a906880019f5f2e1b5a3a77e
+Subproject commit a44658ec94a33a1eacd32a7c423ef4fcaa8c5f12
diff --git a/src/Board.h b/src/Board.h
index 594dc47..01dac12 100644
--- a/src/Board.h
+++ b/src/Board.h
@@ -13,8 +13,6 @@ class Board final : public EightBit::GameBoy::Bus {
 	Board(const Configuration& configuration);
 
 	void plug(const std::string& path);
-
-protected:
 	virtual void initialise() final;
 
 private:
diff --git a/src/Computer.cpp b/src/Computer.cpp
index 20d7f03..f2aa49c 100644
--- a/src/Computer.cpp
+++ b/src/Computer.cpp
@@ -17,9 +17,10 @@ void Computer::plug(const std::string& path) {
 	m_board.plug(path);
 }
 
-void Computer::powerOn() {
+void Computer::raisePOWER() {
 
-	m_board.powerOn();
+	m_board.raisePOWER();
+	m_board.initialise();
 
 	m_window.reset(::SDL_CreateWindow(
 		"GameBoy",
@@ -114,8 +115,8 @@ void Computer::powerOn() {
 	m_startTicks = ::SDL_GetTicks();
 }
 
-void Computer::powerOff() {
-	m_board.powerOff();
+void Computer::lowerPOWER() {
+	m_board.lowerPOWER();
 }
 
 void Computer::configureBackground() const {
@@ -143,7 +144,7 @@ void Computer::run() {
 		while (::SDL_PollEvent(&e)) {
 			switch (e.type) {
 			case SDL_QUIT:
-				powerOff();
+				lowerPOWER();
 				break;
 			case SDL_KEYDOWN:
 				handleKeyDown(e.key.keysym.sym);
diff --git a/src/Computer.h b/src/Computer.h
index 6bac36f..b8aa24c 100644
--- a/src/Computer.h
+++ b/src/Computer.h
@@ -24,8 +24,8 @@ class Computer final {
 	void run();
 	void plug(const std::string& path);
 
-	void powerOn();
-	void powerOff();
+	void raisePOWER();
+	void lowerPOWER();
 	
 private:
 	static void throwSDLException(std::string failure) {
diff --git a/src/gb.cpp b/src/gb.cpp
index f9fff52..0cde415 100644
--- a/src/gb.cpp
+++ b/src/gb.cpp
@@ -110,7 +110,7 @@ int main(int, char*[])
 
 	//computer.plug("mooneye/emulator-only/mbc1/multicart_rom_8Mb.gb");
 
-	computer.powerOn();
+	computer.raisePOWER();
 	try {
 		computer.run();
 	} catch (const std::exception& error) {