Added Plantronics ColorPlus emulation. Patch from John Elliot.
This commit is contained in:
SarahW
parent
3df46b4479
commit
3527f822b9
10 changed files with 389 additions and 7 deletions
|
|
@ -27,7 +27,7 @@ sound_ad1848.c sound_adlib.c sound_adlibgold.c sound_cms.c sound_emu8k.c sound_g
|
||||||
sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c sound_pssj.c sound_sb.c sound_sb_dsp.c sound_sn76489.c \
|
sound_mpu401_uart.c sound_opl.c sound_pas16.c sound_ps1.c sound_pssj.c sound_sb.c sound_sb_dsp.c sound_sn76489.c \
|
||||||
sound_speaker.c sound_ssi2001.c sound_wss.c sound_ym7128.c soundopenal.c tandy_eeprom.c tandy_rom.c thread-pthread.c \
|
sound_speaker.c sound_ssi2001.c sound_wss.c sound_ym7128.c soundopenal.c tandy_eeprom.c tandy_rom.c thread-pthread.c \
|
||||||
timer.c um8669f.c um8881f.c vid_ati_eeprom.c vid_ati_mach64.c vid_ati18800.c vid_ati28800.c \
|
timer.c um8669f.c um8881f.c vid_ati_eeprom.c vid_ati_mach64.c vid_ati18800.c vid_ati28800.c \
|
||||||
vid_ati68860_ramdac.c vid_cga.c vid_cl5429.c vid_ega.c vid_et4000.c vid_et4000w32.c vid_hercules.c \
|
vid_ati68860_ramdac.c vid_cga.c vid_cl5429.c vid_colorplus.c vid_ega.c vid_et4000.c vid_et4000w32.c vid_hercules.c \
|
||||||
vid_icd2061.c vid_ics2595.c vid_incolor.c vid_mda.c vid_olivetti_m24.c vid_oti067.c vid_paradise.c vid_pc200.c \
|
vid_icd2061.c vid_ics2595.c vid_incolor.c vid_mda.c vid_olivetti_m24.c vid_oti067.c vid_paradise.c vid_pc200.c \
|
||||||
vid_pc1512.c vid_pc1640.c vid_pcjr.c vid_ps1_svga.c vid_s3.c vid_s3_virge.c vid_sdac_ramdac.c \
|
vid_pc1512.c vid_pc1640.c vid_pcjr.c vid_ps1_svga.c vid_s3.c vid_s3_virge.c vid_sdac_ramdac.c \
|
||||||
vid_stg_ramdac.c vid_svga.c vid_svga_render.c vid_tandy.c vid_tandysl.c vid_tgui9440.c \
|
vid_stg_ramdac.c vid_svga.c vid_svga_render.c vid_tandy.c vid_tandysl.c vid_tgui9440.c \
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_g
|
||||||
sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
|
sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
|
||||||
sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o thread-pthread.o \
|
sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o thread-pthread.o \
|
||||||
timer.o um8669f.o um8881f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o vid_ati28800.o \
|
timer.o um8669f.o um8881f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o vid_ati28800.o \
|
||||||
vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_ega.o vid_et4000.o vid_et4000w32.o vid_hercules.o \
|
vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_colorplus.o vid_ega.o vid_et4000.o vid_et4000w32.o vid_hercules.o \
|
||||||
vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc200.o \
|
vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc200.o \
|
||||||
vid_pc1512.o vid_pc1640.o vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o \
|
vid_pc1512.o vid_pc1640.o vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o \
|
||||||
vid_stg_ramdac.o vid_svga.o vid_svga_render.o vid_tandy.o vid_tandysl.o vid_tgui9440.o \
|
vid_stg_ramdac.o vid_svga.o vid_svga_render.o vid_tandy.o vid_tandysl.o vid_tgui9440.o \
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ sound_ad1848.o sound_adlib.o sound_adlibgold.o sound_cms.o sound_emu8k.o sound_g
|
||||||
sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
|
sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_sb.o sound_sb_dsp.o sound_sn76489.o \
|
||||||
sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o thread-pthread.o \
|
sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o thread-pthread.o \
|
||||||
timer.o um8669f.o um8881f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o vid_ati28800.o \
|
timer.o um8669f.o um8881f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o vid_ati28800.o \
|
||||||
vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_ega.o vid_et4000.o vid_et4000w32.o vid_hercules.o \
|
vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_colorplus.o vid_ega.o vid_et4000.o vid_et4000w32.o vid_hercules.o \
|
||||||
vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc200.o \
|
vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc200.o \
|
||||||
vid_pc1512.o vid_pc1640.o vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o \
|
vid_pc1512.o vid_pc1640.o vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o \
|
||||||
vid_stg_ramdac.o vid_svga.o vid_svga_render.o vid_tandy.o vid_tandysl.o vid_tgui9440.o \
|
vid_stg_ramdac.o vid_svga.o vid_svga_render.o vid_tandy.o vid_tandysl.o vid_tgui9440.o \
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad
|
||||||
sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
|
sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
|
||||||
sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o \
|
sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o \
|
||||||
sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \
|
sound_ym7128.o soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \
|
||||||
vid_ati28800.o vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_ega.o vid_et4000.o \
|
vid_ati28800.o vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_colorplus.o vid_ega.o vid_et4000.o \
|
||||||
vid_et4000w32.o vid_et4000w32i.o vid_hercules.o vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o \
|
vid_et4000w32.o vid_et4000w32i.o vid_hercules.o vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o \
|
||||||
vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc1512.o vid_pc1640.o vid_pc200.o \
|
vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc1512.o vid_pc1640.o vid_pc200.o \
|
||||||
vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o vid_stg_ramdac.o vid_svga.o \
|
vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o vid_stg_ramdac.o vid_svga.o \
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ OBJ = 386.o 386_dynarec.o 386_dynarec_ops.o 808x.o acer386sx.o ali1429.o amstrad
|
||||||
sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
|
sound_emu8k.o sound_gus.o sound_mpu401_uart.o sound_opl.o sound_pas16.o sound_ps1.o sound_pssj.o sound_resid.o \
|
||||||
sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o \
|
sound_sb.o sound_sb_dsp.o sound_sn76489.o sound_speaker.o sound_ssi2001.o sound_wss.o sound_ym7128.o \
|
||||||
soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \
|
soundopenal.o tandy_eeprom.o tandy_rom.o timer.o um8881f.o um8669f.o vid_ati_eeprom.o vid_ati_mach64.o vid_ati18800.o \
|
||||||
vid_ati28800.o vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_ega.o vid_et4000.o \
|
vid_ati28800.o vid_ati68860_ramdac.o vid_cga.o vid_cl5429.o vid_colorplus.o vid_ega.o vid_et4000.o \
|
||||||
vid_et4000w32.o vid_et4000w32i.o vid_hercules.o vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o \
|
vid_et4000w32.o vid_et4000w32i.o vid_hercules.o vid_icd2061.o vid_ics2595.o vid_incolor.o vid_mda.o \
|
||||||
vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc1512.o vid_pc1640.o vid_pc200.o \
|
vid_olivetti_m24.o vid_oti067.o vid_paradise.o vid_pc1512.o vid_pc1640.o vid_pc200.o \
|
||||||
vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o vid_stg_ramdac.o vid_svga.o \
|
vid_pcjr.o vid_ps1_svga.o vid_s3.o vid_s3_virge.o vid_sdac_ramdac.o vid_stg_ramdac.o vid_svga.o \
|
||||||
|
|
|
||||||
|
|
@ -342,7 +342,7 @@ char discfns[2][256];
|
||||||
int driveempty[2];
|
int driveempty[2];
|
||||||
|
|
||||||
#define MDA ((gfxcard==GFX_MDA || gfxcard==GFX_HERCULES || gfxcard==GFX_INCOLOR) && (romset<ROM_TANDY || romset>=ROM_IBMAT))
|
#define MDA ((gfxcard==GFX_MDA || gfxcard==GFX_HERCULES || gfxcard==GFX_INCOLOR) && (romset<ROM_TANDY || romset>=ROM_IBMAT))
|
||||||
#define VGA ((gfxcard>=GFX_TVGA || romset==ROM_ACER386) && gfxcard!=GFX_INCOLOR && romset!=ROM_PC1640 && romset!=ROM_PC1512 && romset!=ROM_TANDY && romset!=ROM_PC200)
|
#define VGA ((gfxcard>=GFX_TVGA || romset==ROM_ACER386) && gfxcard!=GFX_COLORPLUS && gfxcard!=GFX_INCOLOR && romset!=ROM_PC1640 && romset!=ROM_PC1512 && romset!=ROM_TANDY && romset!=ROM_PC200)
|
||||||
#define PCJR (romset == ROM_IBMPCJR)
|
#define PCJR (romset == ROM_IBMPCJR)
|
||||||
#define AMIBIOS (romset==ROM_AMI386 || romset==ROM_AMI486 || romset == ROM_WIN486)
|
#define AMIBIOS (romset==ROM_AMI386 || romset==ROM_AMI486 || romset == ROM_WIN486)
|
||||||
|
|
||||||
|
|
@ -425,6 +425,7 @@ enum
|
||||||
GFX_PHOENIX_TRIO32, /*S3 732/Trio32 (Phoenix)*/
|
GFX_PHOENIX_TRIO32, /*S3 732/Trio32 (Phoenix)*/
|
||||||
GFX_PHOENIX_TRIO64, /*S3 764/Trio64 (Phoenix)*/
|
GFX_PHOENIX_TRIO64, /*S3 764/Trio64 (Phoenix)*/
|
||||||
GFX_INCOLOR, /* Hercules InColor */
|
GFX_INCOLOR, /* Hercules InColor */
|
||||||
|
GFX_COLORPLUS, /* Plantronics ColorPlus */
|
||||||
GFX_MAX
|
GFX_MAX
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ void jim_init()
|
||||||
europc_rtc.dat[3]=1;
|
europc_rtc.dat[3]=1;
|
||||||
europc_rtc.dat[4]=1;
|
europc_rtc.dat[4]=1;
|
||||||
europc_rtc.dat[5]=0x88;
|
europc_rtc.dat[5]=0x88;
|
||||||
if (gfxcard==GFX_CGA) viddat=0x12;
|
if (gfxcard==GFX_CGA || gfxcard == GFX_COLORPLUS) viddat=0x12;
|
||||||
else if (gfxcard==GFX_MDA || gfxcard==GFX_HERCULES || gfxcard==GFX_INCOLOR) viddat=3;
|
else if (gfxcard==GFX_MDA || gfxcard==GFX_HERCULES || gfxcard==GFX_INCOLOR) viddat=3;
|
||||||
else viddat=0x10;
|
else viddat=0x10;
|
||||||
europc_rtc.dat[0xB]=viddat;
|
europc_rtc.dat[0xB]=viddat;
|
||||||
|
|
|
||||||
378
src/vid_colorplus.c
Normal file
378
src/vid_colorplus.c
Normal file
|
|
@ -0,0 +1,378 @@
|
||||||
|
/*Plantronics ColorPlus emulation*/
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <math.h>
|
||||||
|
#include "ibm.h"
|
||||||
|
#include "device.h"
|
||||||
|
#include "io.h"
|
||||||
|
#include "mem.h"
|
||||||
|
#include "timer.h"
|
||||||
|
#include "video.h"
|
||||||
|
#include "vid_cga.h"
|
||||||
|
#include "vid_colorplus.h"
|
||||||
|
|
||||||
|
typedef struct colorplus_t
|
||||||
|
{
|
||||||
|
cga_t cga;
|
||||||
|
uint8_t control;
|
||||||
|
} colorplus_t;
|
||||||
|
|
||||||
|
/* Bits in the colorplus control register: */
|
||||||
|
#define COLORPLUS_PLANE_SWAP 0x40 /* Swap planes at 0000h and 4000h */
|
||||||
|
#define COLORPLUS_640x200_MODE 0x20 /* 640x200x4 mode active */
|
||||||
|
#define COLORPLUS_320x200_MODE 0x10 /* 320x200x16 mode active */
|
||||||
|
#define COLORPLUS_EITHER_MODE 0x30 /* Either mode active */
|
||||||
|
|
||||||
|
/* Bits in the CGA graphics mode register */
|
||||||
|
#define CGA_GRAPHICS_MODE 0x02 /* CGA graphics mode selected? */
|
||||||
|
|
||||||
|
void colorplus_out(uint16_t addr, uint8_t val, void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
|
||||||
|
// pclog("COLORPLUS_OUT %04X %02X\n", addr, val);
|
||||||
|
if (addr == 0x3DD)
|
||||||
|
{
|
||||||
|
colorplus->control = val & 0x70;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cga_out(addr, val, &colorplus->cga);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t colorplus_in(uint16_t addr, void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
|
||||||
|
return cga_in(addr, &colorplus->cga);
|
||||||
|
}
|
||||||
|
|
||||||
|
void colorplus_write(uint32_t addr, uint8_t val, void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
|
||||||
|
// pclog("COLORPLUS_WRITE %04X %02X\n", addr, val);
|
||||||
|
if ((colorplus->control & COLORPLUS_PLANE_SWAP) &&
|
||||||
|
(colorplus->control & COLORPLUS_EITHER_MODE) &&
|
||||||
|
(colorplus->cga.cgamode & CGA_GRAPHICS_MODE))
|
||||||
|
{
|
||||||
|
addr ^= 0x4000;
|
||||||
|
}
|
||||||
|
else if (!(colorplus->control & COLORPLUS_EITHER_MODE))
|
||||||
|
{
|
||||||
|
addr &= 0x3FFF;
|
||||||
|
}
|
||||||
|
colorplus->cga.vram[addr & 0x7fff] = val;
|
||||||
|
egawrites++;
|
||||||
|
cycles -= 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t colorplus_read(uint32_t addr, void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
|
||||||
|
if ((colorplus->control & COLORPLUS_PLANE_SWAP) &&
|
||||||
|
(colorplus->control & COLORPLUS_EITHER_MODE) &&
|
||||||
|
(colorplus->cga.cgamode & CGA_GRAPHICS_MODE))
|
||||||
|
{
|
||||||
|
addr ^= 0x4000;
|
||||||
|
}
|
||||||
|
else if (!(colorplus->control & COLORPLUS_EITHER_MODE))
|
||||||
|
{
|
||||||
|
addr &= 0x3FFF;
|
||||||
|
}
|
||||||
|
cycles -= 4;
|
||||||
|
egareads++;
|
||||||
|
// pclog("COLORPLUS_READ %04X\n", addr);
|
||||||
|
return colorplus->cga.vram[addr & 0x7fff];
|
||||||
|
}
|
||||||
|
|
||||||
|
void colorplus_recalctimings(colorplus_t *colorplus)
|
||||||
|
{
|
||||||
|
cga_recalctimings(&colorplus->cga);
|
||||||
|
}
|
||||||
|
|
||||||
|
void colorplus_poll(void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
int x, c;
|
||||||
|
int oldvc;
|
||||||
|
uint16_t dat0, dat1;
|
||||||
|
int cols[4];
|
||||||
|
int col;
|
||||||
|
int oldsc;
|
||||||
|
static const int cols16[16] = { 0x10,0x12,0x14,0x16,
|
||||||
|
0x18,0x1A,0x1C,0x1E,
|
||||||
|
0x11,0x13,0x15,0x17,
|
||||||
|
0x19,0x1B,0x1D,0x1F };
|
||||||
|
uint8_t *plane0 = colorplus->cga.vram;
|
||||||
|
uint8_t *plane1 = colorplus->cga.vram + 0x4000;
|
||||||
|
|
||||||
|
/* If one of the extra modes is not selected, drop down to the CGA
|
||||||
|
* drawing code. */
|
||||||
|
if (!((colorplus->control & COLORPLUS_EITHER_MODE) &&
|
||||||
|
(colorplus->cga.cgamode & CGA_GRAPHICS_MODE)))
|
||||||
|
{
|
||||||
|
cga_poll(&colorplus->cga);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!colorplus->cga.linepos)
|
||||||
|
{
|
||||||
|
colorplus->cga.vidtime += colorplus->cga.dispofftime;
|
||||||
|
colorplus->cga.cgastat |= 1;
|
||||||
|
colorplus->cga.linepos = 1;
|
||||||
|
oldsc = colorplus->cga.sc;
|
||||||
|
if ((colorplus->cga.crtc[8] & 3) == 3)
|
||||||
|
colorplus->cga.sc = ((colorplus->cga.sc << 1) + colorplus->cga.oddeven) & 7;
|
||||||
|
if (colorplus->cga.cgadispon)
|
||||||
|
{
|
||||||
|
if (colorplus->cga.displine < colorplus->cga.firstline)
|
||||||
|
{
|
||||||
|
colorplus->cga.firstline = colorplus->cga.displine;
|
||||||
|
video_wait_for_buffer();
|
||||||
|
// printf("Firstline %i\n",firstline);
|
||||||
|
}
|
||||||
|
colorplus->cga.lastline = colorplus->cga.displine;
|
||||||
|
/* Left / right border */
|
||||||
|
for (c = 0; c < 8; c++)
|
||||||
|
{
|
||||||
|
buffer->line[colorplus->cga.displine][c] =
|
||||||
|
buffer->line[colorplus->cga.displine][c + (colorplus->cga.crtc[1] << 4) + 8] = (colorplus->cga.cgacol & 15) + 16;
|
||||||
|
}
|
||||||
|
if (colorplus->control & COLORPLUS_320x200_MODE)
|
||||||
|
{
|
||||||
|
for (x = 0; x < colorplus->cga.crtc[1]; x++)
|
||||||
|
{
|
||||||
|
dat0 = (plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) |
|
||||||
|
plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
|
||||||
|
dat1 = (plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) |
|
||||||
|
plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
|
||||||
|
colorplus->cga.ma++;
|
||||||
|
for (c = 0; c < 8; c++)
|
||||||
|
{
|
||||||
|
buffer->line[colorplus->cga.displine][(x << 4) + (c << 1) + 8] =
|
||||||
|
buffer->line[colorplus->cga.displine][(x << 4) + (c << 1) + 1 + 8] =
|
||||||
|
cols16[(dat0 >> 14) | ((dat1 >> 14) << 2)];
|
||||||
|
dat0 <<= 2;
|
||||||
|
dat1 <<= 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (colorplus->control & COLORPLUS_640x200_MODE)
|
||||||
|
{
|
||||||
|
cols[0] = (colorplus->cga.cgacol & 15) | 16;
|
||||||
|
col = (colorplus->cga.cgacol & 16) ? 24 : 16;
|
||||||
|
if (colorplus->cga.cgamode & 4)
|
||||||
|
{
|
||||||
|
cols[1] = col | 3;
|
||||||
|
cols[2] = col | 4;
|
||||||
|
cols[3] = col | 7;
|
||||||
|
}
|
||||||
|
else if (colorplus->cga.cgacol & 32)
|
||||||
|
{
|
||||||
|
cols[1] = col | 3;
|
||||||
|
cols[2] = col | 5;
|
||||||
|
cols[3] = col | 7;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cols[1] = col | 2;
|
||||||
|
cols[2] = col | 4;
|
||||||
|
cols[3] = col | 6;
|
||||||
|
}
|
||||||
|
for (x = 0; x < colorplus->cga.crtc[1]; x++)
|
||||||
|
{
|
||||||
|
dat0 = (plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) |
|
||||||
|
plane0[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
|
||||||
|
dat1 = (plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000)] << 8) |
|
||||||
|
plane1[((colorplus->cga.ma << 1) & 0x1fff) + ((colorplus->cga.sc & 1) * 0x2000) + 1];
|
||||||
|
colorplus->cga.ma++;
|
||||||
|
for (c = 0; c < 16; c++)
|
||||||
|
{
|
||||||
|
buffer->line[colorplus->cga.displine][(x << 4) + c + 8] =
|
||||||
|
cols[(dat0 >> 15) | ((dat1 >> 15) << 1)];
|
||||||
|
dat0 <<= 1;
|
||||||
|
dat1 <<= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else /* Top / bottom border */
|
||||||
|
{
|
||||||
|
cols[0] = (colorplus->cga.cgacol & 15) + 16;
|
||||||
|
hline(buffer, 0, colorplus->cga.displine, (colorplus->cga.crtc[1] << 4) + 16, cols[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
x = (colorplus->cga.crtc[1] << 4) + 16;
|
||||||
|
|
||||||
|
colorplus->cga.sc = oldsc;
|
||||||
|
if (colorplus->cga.vc == colorplus->cga.crtc[7] && !colorplus->cga.sc)
|
||||||
|
colorplus->cga.cgastat |= 8;
|
||||||
|
colorplus->cga.displine++;
|
||||||
|
if (colorplus->cga.displine >= 360)
|
||||||
|
colorplus->cga.displine = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
colorplus->cga.vidtime += colorplus->cga.dispontime;
|
||||||
|
colorplus->cga.linepos = 0;
|
||||||
|
if (colorplus->cga.vsynctime)
|
||||||
|
{
|
||||||
|
colorplus->cga.vsynctime--;
|
||||||
|
if (!colorplus->cga.vsynctime)
|
||||||
|
colorplus->cga.cgastat &= ~8;
|
||||||
|
}
|
||||||
|
if (colorplus->cga.sc == (colorplus->cga.crtc[11] & 31) || ((colorplus->cga.crtc[8] & 3) == 3 && colorplus->cga.sc == ((colorplus->cga.crtc[11] & 31) >> 1)))
|
||||||
|
{
|
||||||
|
colorplus->cga.con = 0;
|
||||||
|
colorplus->cga.coff = 1;
|
||||||
|
}
|
||||||
|
if ((colorplus->cga.crtc[8] & 3) == 3 && colorplus->cga.sc == (colorplus->cga.crtc[9] >> 1))
|
||||||
|
colorplus->cga.maback = colorplus->cga.ma;
|
||||||
|
if (colorplus->cga.vadj)
|
||||||
|
{
|
||||||
|
colorplus->cga.sc++;
|
||||||
|
colorplus->cga.sc &= 31;
|
||||||
|
colorplus->cga.ma = colorplus->cga.maback;
|
||||||
|
colorplus->cga.vadj--;
|
||||||
|
if (!colorplus->cga.vadj)
|
||||||
|
{
|
||||||
|
colorplus->cga.cgadispon = 1;
|
||||||
|
colorplus->cga.ma = colorplus->cga.maback = (colorplus->cga.crtc[13] | (colorplus->cga.crtc[12] << 8)) & 0x3fff;
|
||||||
|
colorplus->cga.sc = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (colorplus->cga.sc == colorplus->cga.crtc[9])
|
||||||
|
{
|
||||||
|
colorplus->cga.maback = colorplus->cga.ma;
|
||||||
|
colorplus->cga.sc = 0;
|
||||||
|
oldvc = colorplus->cga.vc;
|
||||||
|
colorplus->cga.vc++;
|
||||||
|
colorplus->cga.vc &= 127;
|
||||||
|
|
||||||
|
if (colorplus->cga.vc == colorplus->cga.crtc[6])
|
||||||
|
colorplus->cga.cgadispon = 0;
|
||||||
|
|
||||||
|
if (oldvc == colorplus->cga.crtc[4])
|
||||||
|
{
|
||||||
|
colorplus->cga.vc = 0;
|
||||||
|
colorplus->cga.vadj = colorplus->cga.crtc[5];
|
||||||
|
if (!colorplus->cga.vadj) colorplus->cga.cgadispon = 1;
|
||||||
|
if (!colorplus->cga.vadj) colorplus->cga.ma = colorplus->cga.maback = (colorplus->cga.crtc[13] | (colorplus->cga.crtc[12] << 8)) & 0x3fff;
|
||||||
|
if ((colorplus->cga.crtc[10] & 0x60) == 0x20) colorplus->cga.cursoron = 0;
|
||||||
|
else colorplus->cga.cursoron = colorplus->cga.cgablink & 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (colorplus->cga.vc == colorplus->cga.crtc[7])
|
||||||
|
{
|
||||||
|
colorplus->cga.cgadispon = 0;
|
||||||
|
colorplus->cga.displine = 0;
|
||||||
|
colorplus->cga.vsynctime = 16;
|
||||||
|
if (colorplus->cga.crtc[7])
|
||||||
|
{
|
||||||
|
if (colorplus->cga.cgamode & 1) x = (colorplus->cga.crtc[1] << 3) + 16;
|
||||||
|
else x = (colorplus->cga.crtc[1] << 4) + 16;
|
||||||
|
colorplus->cga.lastline++;
|
||||||
|
if (x != xsize || (colorplus->cga.lastline - colorplus->cga.firstline) != ysize)
|
||||||
|
{
|
||||||
|
xsize = x;
|
||||||
|
ysize = colorplus->cga.lastline - colorplus->cga.firstline;
|
||||||
|
if (xsize < 64) xsize = 656;
|
||||||
|
if (ysize < 32) ysize = 200;
|
||||||
|
updatewindowsize(xsize, (ysize << 1) + 16);
|
||||||
|
}
|
||||||
|
|
||||||
|
video_blit_memtoscreen_8(0, colorplus->cga.firstline - 4, xsize, (colorplus->cga.lastline - colorplus->cga.firstline) + 8);
|
||||||
|
frames++;
|
||||||
|
|
||||||
|
video_res_x = xsize - 16;
|
||||||
|
video_res_y = ysize;
|
||||||
|
if (colorplus->cga.cgamode & 1)
|
||||||
|
{
|
||||||
|
video_res_x /= 8;
|
||||||
|
video_res_y /= colorplus->cga.crtc[9] + 1;
|
||||||
|
video_bpp = 0;
|
||||||
|
}
|
||||||
|
else if (!(colorplus->cga.cgamode & 2))
|
||||||
|
{
|
||||||
|
video_res_x /= 16;
|
||||||
|
video_res_y /= colorplus->cga.crtc[9] + 1;
|
||||||
|
video_bpp = 0;
|
||||||
|
}
|
||||||
|
else if (!(colorplus->cga.cgamode & 16))
|
||||||
|
{
|
||||||
|
video_res_x /= 2;
|
||||||
|
video_bpp = 2;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
video_bpp = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
colorplus->cga.firstline = 1000;
|
||||||
|
colorplus->cga.lastline = 0;
|
||||||
|
colorplus->cga.cgablink++;
|
||||||
|
colorplus->cga.oddeven ^= 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
colorplus->cga.sc++;
|
||||||
|
colorplus->cga.sc &= 31;
|
||||||
|
colorplus->cga.ma = colorplus->cga.maback;
|
||||||
|
}
|
||||||
|
if (colorplus->cga.cgadispon)
|
||||||
|
colorplus->cga.cgastat &= ~1;
|
||||||
|
if ((colorplus->cga.sc == (colorplus->cga.crtc[10] & 31) || ((colorplus->cga.crtc[8] & 3) == 3 && colorplus->cga.sc == ((colorplus->cga.crtc[10] & 31) >> 1))))
|
||||||
|
colorplus->cga.con = 1;
|
||||||
|
if (colorplus->cga.cgadispon && (colorplus->cga.cgamode & 1))
|
||||||
|
{
|
||||||
|
for (x = 0; x < (colorplus->cga.crtc[1] << 1); x++)
|
||||||
|
colorplus->cga.charbuffer[x] = colorplus->cga.vram[(((colorplus->cga.ma << 1) + x) & 0x3fff)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void *colorplus_init()
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = malloc(sizeof(colorplus_t));
|
||||||
|
memset(colorplus, 0, sizeof(colorplus_t));
|
||||||
|
|
||||||
|
colorplus->cga.vram = malloc(0x8000);
|
||||||
|
colorplus->cga.composite = colorplus->cga.snow_enabled = 0;
|
||||||
|
|
||||||
|
timer_add(colorplus_poll, &colorplus->cga.vidtime, TIMER_ALWAYS_ENABLED, colorplus);
|
||||||
|
mem_mapping_add(&colorplus->cga.mapping, 0xb8000, 0x08000, colorplus_read, NULL, NULL, colorplus_write, NULL, NULL, NULL, 0, colorplus);
|
||||||
|
io_sethandler(0x03d0, 0x0010, colorplus_in, NULL, NULL, colorplus_out, NULL, NULL, colorplus);
|
||||||
|
|
||||||
|
return colorplus;
|
||||||
|
}
|
||||||
|
|
||||||
|
void colorplus_close(void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
|
||||||
|
free(colorplus->cga.vram);
|
||||||
|
free(colorplus);
|
||||||
|
}
|
||||||
|
|
||||||
|
void colorplus_speed_changed(void *p)
|
||||||
|
{
|
||||||
|
colorplus_t *colorplus = (colorplus_t *)p;
|
||||||
|
|
||||||
|
cga_recalctimings(&colorplus->cga);
|
||||||
|
}
|
||||||
|
|
||||||
|
device_t colorplus_device =
|
||||||
|
{
|
||||||
|
"Colorplus",
|
||||||
|
0,
|
||||||
|
colorplus_init,
|
||||||
|
colorplus_close,
|
||||||
|
NULL,
|
||||||
|
colorplus_speed_changed,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL
|
||||||
|
};
|
||||||
1
src/vid_colorplus.h
Normal file
1
src/vid_colorplus.h
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
extern device_t colorplus_device;
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
#include "vid_et4000w32.h"
|
#include "vid_et4000w32.h"
|
||||||
#include "vid_hercules.h"
|
#include "vid_hercules.h"
|
||||||
#include "vid_incolor.h"
|
#include "vid_incolor.h"
|
||||||
|
#include "vid_colorplus.h"
|
||||||
#include "vid_mda.h"
|
#include "vid_mda.h"
|
||||||
#include "vid_olivetti_m24.h"
|
#include "vid_olivetti_m24.h"
|
||||||
#include "vid_oti067.h"
|
#include "vid_oti067.h"
|
||||||
|
|
@ -64,6 +65,7 @@ static VIDEO_CARD video_cards[] =
|
||||||
{"Paradise Bahamas 64 (S3 Vision864)", &s3_bahamas64_device, GFX_BAHAMAS64},
|
{"Paradise Bahamas 64 (S3 Vision864)", &s3_bahamas64_device, GFX_BAHAMAS64},
|
||||||
{"Phoenix S3 Trio32", &s3_phoenix_trio32_device, GFX_PHOENIX_TRIO32},
|
{"Phoenix S3 Trio32", &s3_phoenix_trio32_device, GFX_PHOENIX_TRIO32},
|
||||||
{"Phoenix S3 Trio64", &s3_phoenix_trio64_device, GFX_PHOENIX_TRIO64},
|
{"Phoenix S3 Trio64", &s3_phoenix_trio64_device, GFX_PHOENIX_TRIO64},
|
||||||
|
{"Plantronics ColorPlus", &colorplus_device, GFX_COLORPLUS},
|
||||||
{"S3 ViRGE/DX", &s3_virge_375_device, GFX_VIRGEDX},
|
{"S3 ViRGE/DX", &s3_virge_375_device, GFX_VIRGEDX},
|
||||||
{"Trident TVGA8900D", &tvga8900d_device, GFX_TVGA},
|
{"Trident TVGA8900D", &tvga8900d_device, GFX_TVGA},
|
||||||
{"Tseng ET4000AX", &et4000_device, GFX_ET4000},
|
{"Tseng ET4000AX", &et4000_device, GFX_ET4000},
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue