80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed the Tandy 320x200x4 modes.

Browse Source
This commit is contained in:
OBattler
2019-12-28 05:50:55 +01:00
parent 1d41f99dcf
commit 8cad1a3c4c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/machine/m_tandy.c
View File

@@ -8,7 +8,7 @@
* *
* Emulation of Tandy models 1000, 1000HX and 1000SL2. * Emulation of Tandy models 1000, 1000HX and 1000SL2.
* *
* Version: @(#)m_tandy.c 1.0.10 2019/10/20 * Version: @(#)m_tandy.c 1.0.11 2019/12/28
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -74,11 +74,7 @@ typedef struct {
int crtcreg; int crtcreg;
int array_index; int array_index;
#if 0
uint8_t array[32];
#else
uint8_t array[256]; uint8_t array[256];
#endif
int memctrl; int memctrl;
uint8_t mode, col; uint8_t mode, col;
uint8_t stat; uint8_t stat;
@@ -95,13 +91,13 @@ typedef struct {
int con, coff, int con, coff,
cursoron, cursoron,
blink; blink;
int vsynctime; int vsynctime;
int vadj; int vadj;
uint16_t ma, maback; uint16_t ma, maback;
uint64_t dispontime, uint64_t dispontime,
dispofftime; dispofftime;
pc_timer_t timer; pc_timer_t timer;
int firstline, int firstline,
lastline; lastline;
@@ -857,8 +853,8 @@ vid_poll(void *priv)
} }
} }
} else if (! (vid->mode & 16)) { } else if (! (vid->mode & 16)) {
cols[0] = (vid->col & 15) | 16; cols[0] = (vid->col & 15);
col = (vid->col & 16) ? 24 : 16; col = (vid->col & 16) ? 8 : 0;
if (vid->mode & 4) { if (vid->mode & 4) {
cols[1] = col | 3; cols[1] = col | 3;
cols[2] = col | 4; cols[2] = col | 4;
@@ -872,6 +868,10 @@ vid_poll(void *priv)
cols[2] = col | 4; cols[2] = col | 4;
cols[3] = col | 6; cols[3] = col | 6;
} }
cols[0] = vid->array[(cols[0] & vid->array[1]) + 16] + 16;
cols[1] = vid->array[(cols[1] & vid->array[1]) + 16] + 16;
cols[2] = vid->array[(cols[2] & vid->array[1]) + 16] + 16;
cols[3] = vid->array[(cols[3] & vid->array[1]) + 16] + 16;
for (x = 0; x < vid->crtc[1]; x++) { for (x = 0; x < vid->crtc[1]; x++) {
dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000)] << 8) | dat = (vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000)] << 8) |
vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000) + 1]; vid->vram[((vid->ma << 1) & 0x1fff) + ((vid->sc & 1) * 0x2000) + 1];