From 8c4f45155735d9c618217c23aeef8b6ef53de492 Mon Sep 17 00:00:00 2001 From: tomcw Date: Fri, 17 Feb 2017 16:00:22 +0000 Subject: [PATCH] Remove old, unused _Video_SetupBanks() --- source/Debugger/Debug.cpp | 6 +++--- source/Video.cpp | 15 --------------- source/Video.h | 1 - 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index 10a181ba..29f1aa16 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -6757,9 +6757,9 @@ Update_t _ViewOutput( ViewVideoPage_t iPage, int bVideoModeFlags ) { switch( iPage ) { - case VIEW_PAGE_X: bVideoModeFlags |= _Video_SetupBanks( VideoGetSWPAGE2() ); break; // Page Current - case VIEW_PAGE_1: bVideoModeFlags |= _Video_SetupBanks( false ); break; // Page 1 - case VIEW_PAGE_2: bVideoModeFlags |= _Video_SetupBanks( true ); break; // Page 2 ! + case VIEW_PAGE_X: bVideoModeFlags |= !VideoGetSWPAGE2() ? 0 : VF_PAGE2; break; // Page Current + case VIEW_PAGE_1: bVideoModeFlags |= 0; break; // Page 1 + case VIEW_PAGE_2: bVideoModeFlags |= VF_PAGE2; break; // Page 2 default: break; } diff --git a/source/Video.cpp b/source/Video.cpp index f6904804..7dba8ccf 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -236,8 +236,6 @@ static HDC g_hDeviceDC; static LPBITMAPINFO g_pFramebufferinfo = NULL; static LPBYTE g_aFrameBufferOffset[FRAMEBUFFER_H]; // array of pointers to start of each scanline -static LPBYTE g_pHiresBank1; -static LPBYTE g_pHiresBank0; HBITMAP g_hLogoBitmap; static HPALETTE g_hPalette; @@ -245,8 +243,6 @@ static HBITMAP g_hSourceBitmap; static LPBYTE g_pSourcePixels; const int MAX_SOURCE_Y = 512; static LPBYTE g_aSourceStartofLine[ MAX_SOURCE_Y ]; -static LPBYTE g_pTextBank1; // Aux -static LPBYTE g_pTextBank0; // Main static LPBYTE framebufferaddr = (LPBYTE)0; static LONG g_nFrameBufferPitch = 0; @@ -1073,17 +1069,6 @@ void VideoRedrawScreen (void) VideoRefreshScreen( g_uVideoMode, true ); } -//=========================================================================== -int _Video_SetupBanks( bool bBank2 ) -{ - g_pHiresBank1 = MemGetAuxPtr (0x2000 << (int)bBank2); - g_pHiresBank0 = MemGetMainPtr(0x2000 << (int)bBank2); - g_pTextBank1 = MemGetAuxPtr (0x400 << (int)bBank2); - g_pTextBank0 = MemGetMainPtr(0x400 << (int)bBank2); - - return bBank2 ? VF_PAGE2 : 0; -} - //=========================================================================== // NB. Can get "big" 1000+ms times: these occur during disk loading when the emulator is at full-speed. diff --git a/source/Video.h b/source/Video.h index 89f263ef..a2878826 100644 --- a/source/Video.h +++ b/source/Video.h @@ -190,7 +190,6 @@ void VideoSetSnapshot_v1(const UINT AltCharSet, const UINT VideoMode); void VideoSaveSnapshot(class YamlSaveHelper& yamlSaveHelper); void VideoLoadSnapshot(class YamlLoadHelper& yamlLoadHelper); -int _Video_SetupBanks( bool bBank2 ); bool Update40ColCell (int x, int y, int xpixel, int ypixel, int offset); bool Update80ColCell (int x, int y, int xpixel, int ypixel, int offset); bool UpdateLoResCell (int x, int y, int xpixel, int ypixel, int offset);