6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-18 16:30:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1203 from ryandesign/apple-ii-floating-bus-3

Browse Source 
Fix Apple II/II+/IIe floating bus first eight non-hbl vbl bytes
This commit is contained in:
Thomas Harte 2023-11-14 10:59:29 -05:00 committed by GitHub
commit 29169ffed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Machines/Apple/AppleII/Video.hpp
View File

@ -215,16 +215,16 @@ template <class BusHandler, bool is_iie> class Video: public VideoBase {
// Calculate the address. // Calculate the address.
uint16_t read_address = uint16_t(get_row_address(mapped_row) + mapped_column - 25); uint16_t read_address = uint16_t(get_row_address(mapped_row) + mapped_column - 25);
if(hbl) { // Wraparound addressing within 128 byte sections.
// Wraparound addressing within 128 byte sections. if(mapped_row < 64 && mapped_column < 25) {
if(mapped_row < 64) { read_address += 128;
read_address += 128; }
}
if(hbl && !is_iie_) {
// On Apple II and II+ (not IIe or later) in text/lores mode (not hires), horizontal // On Apple II and II+ (not IIe or later) in text/lores mode (not hires), horizontal
// blanking bytes read from $1000 higher. // blanking bytes read from $1000 higher.
const GraphicsMode pixel_mode = graphics_mode(mapped_row); const GraphicsMode pixel_mode = graphics_mode(mapped_row);
if(!is_iie_ && ((pixel_mode == GraphicsMode::Text) || (pixel_mode == GraphicsMode::LowRes))) { if((pixel_mode == GraphicsMode::Text) || (pixel_mode == GraphicsMode::LowRes)) {
read_address += 0x1000; read_address += 0x1000;
} }
} }