Merge pull request #69 from delroth/mmio-interface

Redesign of the MMIO access interface

1 files changed, 4 insertions, 17 deletions

diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 4f60f9d4f6..132b40fa81 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -360,28 +360,15 @@ void VideoSoftware::Video_AbortFrame(void)
 {
 }
 
-readFn16 VideoSoftware::Video_CPRead16()
+void VideoSoftware::RegisterCPMMIO(MMIO::Mapping* mmio, u32 base)
 {
-	return SWCommandProcessor::Read16;
-}
-writeFn16 VideoSoftware::Video_CPWrite16()
-{
-	return SWCommandProcessor::Write16;
+	SWCommandProcessor::RegisterMMIO(mmio, base);
 }
 
-readFn16  VideoSoftware::Video_PERead16()
-{
-	return SWPixelEngine::Read16;
-}
-writeFn16 VideoSoftware::Video_PEWrite16()
+void VideoSoftware::RegisterPEMMIO(MMIO::Mapping* mmio, u32 base)
 {
-	return SWPixelEngine::Write16;
+	SWPixelEngine::RegisterMMIO(mmio, base);
 }
-writeFn32 VideoSoftware::Video_PEWrite32()
-{
-	return SWPixelEngine::Write32;
-}
-
 
 // Draw messages on top of the screen
 unsigned int VideoSoftware::PeekMessages()