Added Sigma Designs Color 400 emulation. Patch from John Elliott.
This commit is contained in:
parent
5167ba5b2d
commit
4155b283ab
5 changed files with 999 additions and 2 deletions
|
|
@ -37,7 +37,7 @@ t1000.c t3100e.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_colorplus.c vid_compaq_cga.c vid_ega.c vid_et4000.c vid_et4000w32.c vid_genius.c vid_hercules.c \
|
||||
vid_icd2061.c vid_ics2595.c vid_incolor.c vid_mda.c vid_olivetti_m24.c vid_oti037.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_sigma.c \
|
||||
vid_stg_ramdac.c vid_svga.c vid_svga_render.c vid_t1000.c vid_t3100e.c vid_tandy.c vid_tandysl.c vid_tgui9440.c \
|
||||
vid_tkd8001_ramdac.c vid_tvga.c vid_unk_ramdac.c vid_vga.c vid_voodoo.c video.c wd76c10.c vid_wy700.c \
|
||||
x86seg.c x87.c xi8088.c xtide.c sound_dbopl.cc sound_resid.cc
|
||||
|
|
|
|||
|
|
@ -507,6 +507,7 @@ enum
|
|||
GFX_CL_GD5434, /*Cirrus Logic CL-GD5434*/
|
||||
GFX_OTI037, /*Oak OTI-037*/
|
||||
GFX_COMPAQ_CGA, /*Compaq CGA*/
|
||||
GFX_SIGMA400, /*Sigma Designs Color 400 */
|
||||
GFX_MAX
|
||||
};
|
||||
|
||||
|
|
|
|||
980
src/vid_sigma.c
Normal file
980
src/vid_sigma.c
Normal file
|
|
@ -0,0 +1,980 @@
|
|||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
#include "ibm.h"
|
||||
#include "device.h"
|
||||
#include "io.h"
|
||||
#include "mem.h"
|
||||
#include "rom.h"
|
||||
#include "timer.h"
|
||||
#include "video.h"
|
||||
#include "vid_sigma.h"
|
||||
|
||||
extern void loadfont(char *s, int format);
|
||||
|
||||
/* The Sigma Designs Color 400 is a video card from 1985, presumably intended
|
||||
* as an EGA competitor.
|
||||
*
|
||||
* The hardware seems to have gone through various iterations; I've seen
|
||||
* pictures of full-length and half-length versions.
|
||||
* TH99 describes the jumpers / switches:
|
||||
* <http://arvutimuuseum.ee/th99/v/S-T/52579.htm>
|
||||
*
|
||||
* The card is CGA-compatible at BIOS level, but to improve compatibility
|
||||
* attempts to write to the CGA I/O ports at 0x3D0-0x3DF trigger an NMI. The
|
||||
* card's BIOS handles the NMI and translates the CGA writes into commands
|
||||
* to its own hardware at 0x2D0-0x2DF. (DIP switches on the card allow the
|
||||
* base address to be changed, but since the BIOS dump I have doesn't support
|
||||
* this I haven't emulated it. Likewise the BIOS ROM address can be changed,
|
||||
* but I'm going with the default of 0xC0000).
|
||||
*
|
||||
* The BIOS still functions if the NMI system isn't operational. There
|
||||
* doesn't seem to be a jumper or DIP switch to lock it out, but at startup
|
||||
* the BIOS tests for its presence and configures itself to work or not
|
||||
* as required. I've therefore added a configuration option to handle this.
|
||||
*
|
||||
* The card's real CRTC at 0x2D0/0x2D1 appears to be a 6845. One oddity is
|
||||
* that all its horizontal counts are halved compared to what a real CGA
|
||||
* uses; 40-column modes have a width of 20, and 80-column modes have a
|
||||
* width of 40. This means that the CRTC cursor position (registers 14/15) can
|
||||
* only address even-numbered columns, so the top bit of the control
|
||||
* register at 0x2D9 is used to adjust the position.
|
||||
*
|
||||
* Apart from the CRTC, registers are:
|
||||
*
|
||||
* 0x2D8: Mode register. Values written by the card BIOS are:
|
||||
* Text 40x25: 0xA8
|
||||
* Text 80x25: 0xB9
|
||||
* Text 80x30: 0xB9
|
||||
* Text 80x50: 0x79
|
||||
* Graphics 320x200: 0x0F
|
||||
* Graphics 640x200: 0x1F
|
||||
* Graphics 640x400: 0x7F
|
||||
*
|
||||
* I have assumed this is a bitmap with the following meaning: */
|
||||
#define MODE_80COLS 0x01 /* For text modes, 80 columns across */
|
||||
#define MODE_GRAPHICS 0x02 /* Graphics mode */
|
||||
#define MODE_NOBLINK 0x04 /* Disable blink? */
|
||||
#define MODE_ENABLE 0x08 /* Enable display */
|
||||
#define MODE_HRGFX 0x10 /* For graphics modes, 640 pixels across */
|
||||
#define MODE_640x400 0x40 /* 400-line graphics mode */
|
||||
#define MODE_FONT16 0x80 /* Use 16-pixel high font */
|
||||
/*
|
||||
* 0x2D9: Control register, with the following bits: */
|
||||
#define CTL_CURSOR 0x80 /* Low bit of cursor position */
|
||||
#define CTL_NMI 0x20 /* Writes to 0x3D0-0x3DF trigger NMI */
|
||||
#define CTL_CLEAR_LPEN 0x08 /* Strobe 0 to clear lightpen latch */
|
||||
#define CTL_SET_LPEN 0x04 /* Strobe 0 to set lightpen latch */
|
||||
#define CTL_PALETTE 0x01 /* 0x2DE writes to palette (1) or plane (0) */
|
||||
/*
|
||||
* The card BIOS seems to support two variants of the hardware: One where
|
||||
* bits 2 and 3 are normally 1 and are set to 0 to set/clear the latch, and
|
||||
* one where they are normally 0 and are set to 1. Behaviour is selected by
|
||||
* whether the byte at C000:17FFh is greater than 2Fh.
|
||||
*
|
||||
* 0x2DA: Status register.
|
||||
*/
|
||||
#define STATUS_CURSOR 0x80 /* Last value written to bit 7 of 0x2D9 */
|
||||
#define STATUS_NMI 0x20 /* Last value written to bit 5 of 0x2D9 */
|
||||
#define STATUS_RETR_V 0x10 /* Vertical retrace */
|
||||
#define STATUS_LPEN_T 0x04 /* Lightpen switch is off */
|
||||
#define STATUS_LPEN_A 0x02 /* Edge from lightpen has set trigger */
|
||||
#define STATUS_RETR_H 0x01 /* Horizontal retrace */
|
||||
/*
|
||||
* 0x2DB: On read: Byte written to the card that triggered NMI
|
||||
* 0x2DB: On write: Resets the 'card raised NMI' flag.
|
||||
* 0x2DC: On read: Bit 7 set if the card raised NMI. If so, bits 0-3
|
||||
* give the low 4 bits of the I/O port address.
|
||||
* 0x2DC: On write: Resets the NMI.
|
||||
* 0x2DD: Memory paging. The memory from 0xC1800 to 0xC1FFF can be either:
|
||||
*
|
||||
* > ROM: A 128 character 8x16 font for use in graphics modes
|
||||
* > RAM: Use by the video BIOS to hold its settings.
|
||||
*
|
||||
* Reading port 2DD switches to ROM. Bit 7 of the value read gives the
|
||||
* previous paging state: bit 7 set if ROM was paged, clear if RAM was
|
||||
* paged.
|
||||
*
|
||||
* Writing port 2DD switches to RAM.
|
||||
*
|
||||
* 0x2DE: Meaning depends on bottom bit of value written to port 0x2D9.
|
||||
* Bit 0 set: Write to palette. High 4 bits of value = register,
|
||||
* low 4 bits = RGBI values (active low)
|
||||
* Bit 0 clear: Write to plane select. Low 2 bits of value select
|
||||
* plane 0-3
|
||||
*/
|
||||
|
||||
|
||||
typedef struct sigma_t
|
||||
{
|
||||
mem_mapping_t mapping;
|
||||
mem_mapping_t bios_ram;
|
||||
rom_t bios_rom;
|
||||
|
||||
uint8_t lastport; /* Last I/O port written */
|
||||
uint8_t lastwrite; /* Value written to that port */
|
||||
uint8_t sigma_ctl; /* Controls register:
|
||||
* Bit 7 is low bit of cursor position
|
||||
* Bit 5 set if writes to CGA ports trigger NMI
|
||||
* Bit 3 clears lightpen latch
|
||||
* Bit 2 sets lightpen latch
|
||||
* Bit 1 controls meaning of port 2DE
|
||||
*/
|
||||
uint8_t enable_nmi; /* Enable the NMI mechanism for CGA emulation?*/
|
||||
uint8_t rom_paged; /* Is ROM paged in at 0xC1800? */
|
||||
|
||||
uint8_t crtc_value; /* Value to return from a CRTC register read */
|
||||
|
||||
int crtcreg; /* CRTC: Real selected register */
|
||||
uint8_t crtc[32]; /* CRTC: Real values */
|
||||
|
||||
uint8_t sigmastat; /* Status register [0x2DA] */
|
||||
|
||||
uint8_t sigmamode; /* Mode control register [0x2D8] */
|
||||
|
||||
int linepos, displine;
|
||||
int sc, vc;
|
||||
int cgadispon;
|
||||
int con, coff, cursoron, cgablink;
|
||||
int vsynctime, vadj;
|
||||
uint16_t ma, maback;
|
||||
int oddeven;
|
||||
|
||||
int dispontime, dispofftime;
|
||||
int vidtime;
|
||||
|
||||
int firstline, lastline;
|
||||
|
||||
int drawcursor;
|
||||
|
||||
uint8_t *vram;
|
||||
uint8_t bram[2048];
|
||||
|
||||
uint8_t palette[16];
|
||||
|
||||
int plane;
|
||||
int revision;
|
||||
} sigma_t;
|
||||
|
||||
#define COMPOSITE_OLD 0
|
||||
#define COMPOSITE_NEW 1
|
||||
|
||||
static uint8_t crtcmask[32] =
|
||||
{
|
||||
0xff, 0xff, 0xff, 0xff, 0x7f, 0x1f, 0x7f, 0x7f, 0xf3, 0x1f, 0x7f, 0x1f, 0x3f, 0xff, 0x3f, 0xff,
|
||||
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
void sigma_recalctimings(sigma_t *cga);
|
||||
|
||||
void sigma_out(uint16_t addr, uint8_t val, void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
uint8_t old;
|
||||
|
||||
// pclog("SIGMA_OUT %04X %02X\n", addr, val);
|
||||
|
||||
// if (addr == 0x3D8 && (val & 0x80)) output = 3;
|
||||
|
||||
if (addr >= 0x3D0 && addr < 0x3E0)
|
||||
{
|
||||
sigma->lastport = addr & 0x0F;
|
||||
sigma->lastwrite = val;
|
||||
/* If set to NMI on video I/O... */
|
||||
if (sigma->enable_nmi && (sigma->sigma_ctl & CTL_NMI))
|
||||
{
|
||||
sigma->lastport |= 0x80; /* Card raised NMI */
|
||||
nmi = 1;
|
||||
// pclog("Sigma: Raise NMI\n");
|
||||
}
|
||||
/* For CRTC emulation, the card BIOS sets the value to be
|
||||
* read from port 0x3D1 like this */
|
||||
if (addr == 0x3D1)
|
||||
sigma->crtc_value = val;
|
||||
}
|
||||
else switch (addr)
|
||||
{
|
||||
case 0x2D0:
|
||||
case 0x2D2:
|
||||
case 0x2D4:
|
||||
case 0x2D6:
|
||||
sigma->crtcreg = val & 31;
|
||||
return;
|
||||
|
||||
case 0x2D1:
|
||||
case 0x2D3:
|
||||
case 0x2D5:
|
||||
case 0x2D7:
|
||||
old = sigma->crtc[sigma->crtcreg];
|
||||
sigma->crtc[sigma->crtcreg] = val & crtcmask[sigma->crtcreg];
|
||||
// pclog("Sigma: CRTC[0x%02x] := 0x%02x\n",
|
||||
// sigma->crtcreg, val);
|
||||
if (old != val)
|
||||
{
|
||||
if (sigma->crtcreg < 0xe || sigma->crtcreg > 0x10)
|
||||
{
|
||||
fullchange = changeframecount;
|
||||
sigma_recalctimings(sigma);
|
||||
}
|
||||
}
|
||||
return;
|
||||
|
||||
case 0x2D8:
|
||||
// pclog("Sigma mode := %02x\n", val);
|
||||
sigma->sigmamode = val;
|
||||
return;
|
||||
case 0x2D9:
|
||||
// pclog("Sigma control := %02x\n", val);
|
||||
sigma->sigma_ctl = val;
|
||||
return;
|
||||
case 0x2DB:
|
||||
sigma->lastport &= 0x7F;
|
||||
return;
|
||||
case 0x2DC: /* Reset NMI */
|
||||
nmi = 0;
|
||||
sigma->lastport &= 0x7F;
|
||||
// pclog("Sigma: Reset NMI\n");
|
||||
return;
|
||||
case 0x2DD: /* Page in RAM at 0xC1800 */
|
||||
if (sigma->rom_paged != 0)
|
||||
mmu_invalidate(0xC0000);
|
||||
sigma->rom_paged = 0;
|
||||
// pclog("Sigma: page RAM at C1800\n");
|
||||
return;
|
||||
|
||||
case 0x2DE:
|
||||
if (sigma->sigma_ctl & CTL_PALETTE)
|
||||
{
|
||||
// pclog("Sigma: Write palette %x := %x\n",
|
||||
// val >> 4, val & 0x0F);
|
||||
sigma->palette[val >> 4] = (val & 0x0F) ^ 0x0F;
|
||||
}
|
||||
else
|
||||
{
|
||||
// pclog("Sigma: Set plane to %d\n", val & 3);
|
||||
sigma->plane = val & 3;
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t sigma_in(uint16_t addr, void *p)
|
||||
{
|
||||
uint8_t result = 0xFF;
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
|
||||
switch (addr)
|
||||
{
|
||||
case 0x2D0:
|
||||
case 0x2D2:
|
||||
case 0x2D4:
|
||||
case 0x2D6:
|
||||
result = sigma->crtcreg;
|
||||
break;
|
||||
|
||||
case 0x2D1:
|
||||
case 0x2D3:
|
||||
case 0x2D5:
|
||||
case 0x2D7:
|
||||
result = sigma->crtc[sigma->crtcreg & 0x1F];
|
||||
break;
|
||||
|
||||
case 0x2DA:
|
||||
result = (sigma->sigma_ctl & 0xE0) |
|
||||
(sigma->sigmastat & 0x1F);
|
||||
break;
|
||||
|
||||
case 0x2DB:
|
||||
result = sigma->lastwrite; /* Value that triggered NMI */
|
||||
break;
|
||||
case 0x2DC:
|
||||
result = sigma->lastport; /* Port that triggered NMI */
|
||||
break;
|
||||
case 0x2DD: /* Page in ROM at 0xC1800 */
|
||||
// pclog("Sigma: page ROM at C1800\n");
|
||||
result = (sigma->rom_paged ? 0x80 : 0);
|
||||
if (sigma->rom_paged != 0x80)
|
||||
mmu_invalidate(0xC0000);
|
||||
sigma->rom_paged = 0x80;
|
||||
break;
|
||||
|
||||
case 0x3D1:
|
||||
case 0x3D3:
|
||||
case 0x3D5:
|
||||
case 0x3D7:
|
||||
result = sigma->crtc_value;
|
||||
break;
|
||||
|
||||
/* For CGA compatibility we have to return something palatable on this port.
|
||||
* On a real card this functionality can be turned on or off with SW1/6 */
|
||||
case 0x3DA:
|
||||
result = sigma->sigmastat & 7;
|
||||
if (sigma->sigmastat & STATUS_RETR_V) result |= 8;
|
||||
break;
|
||||
}
|
||||
// pclog("SIGMA_IN %04X = %02x\n", addr, result);
|
||||
return result;
|
||||
}
|
||||
|
||||
void sigma_write(uint32_t addr, uint8_t val, void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
|
||||
// pclog("CGA_WRITE %04X %02X\n", addr, val);
|
||||
sigma->vram[sigma->plane * 0x8000 + (addr & 0x7fff)] = val;
|
||||
egawrites++;
|
||||
cycles -= 4;
|
||||
}
|
||||
|
||||
uint8_t sigma_read(uint32_t addr, void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
|
||||
cycles -= 4;
|
||||
egareads++;
|
||||
// pclog("CGA_READ %04X\n", addr);
|
||||
return sigma->vram[sigma->plane * 0x8000 + (addr & 0x7fff)];
|
||||
}
|
||||
|
||||
void sigma_bwrite(uint32_t addr, uint8_t val, void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
|
||||
addr &= 0x3FFF;
|
||||
if (addr < 0x1800 || sigma->rom_paged || addr >= 0x2000)
|
||||
{
|
||||
// pclog("sigma_bwrite(0x%05x) := [ROM] %02x\n", addr, val);
|
||||
}
|
||||
else
|
||||
{
|
||||
// pclog("sigma_bwrite(0x%05x) := [RAM] %02x\n", addr, val);
|
||||
sigma->bram[addr & 0x7FF] = val;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t sigma_bread(uint32_t addr, void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
uint8_t result;
|
||||
|
||||
addr &= 0x3FFF;
|
||||
if (addr >= 0x2000)
|
||||
{
|
||||
// if (output == 3) pclog("sigma_bread(0x%05x) = [NIL] %02x\n",
|
||||
// addr, 0xFF);
|
||||
return 0xFF;
|
||||
}
|
||||
if (addr < 0x1800 || sigma->rom_paged)
|
||||
{
|
||||
result = sigma->bios_rom.rom[addr & 0x1FFF];
|
||||
// if (output == 3) pclog("sigma_bread(0x%05x) = [ROM] %02x\n", addr, result);
|
||||
}
|
||||
else
|
||||
{
|
||||
result = sigma->bram[addr & 0x7FF];
|
||||
// if (output == 3) pclog("sigma_bread(0x%05x) = [RAM] %02x\n", addr, result);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void sigma_recalctimings(sigma_t *sigma)
|
||||
{
|
||||
double disptime;
|
||||
double _dispontime, _dispofftime;
|
||||
// pclog("Sigma_recalctimings - total=%i displayed=%i hi-res=%i\n",
|
||||
// sigma->crtc[0], sigma->crtc[1], sigma->sigmamode & MODE_80COLS);
|
||||
if (sigma->sigmamode & MODE_80COLS)
|
||||
{
|
||||
disptime = (sigma->crtc[0] + 1) << 1;
|
||||
_dispontime = (sigma->crtc[1]) << 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
disptime = (sigma->crtc[0] + 1) << 2;
|
||||
_dispontime = sigma->crtc[1] << 2;
|
||||
}
|
||||
_dispofftime = disptime - _dispontime;
|
||||
// printf("%i %f %f %f %i %i\n",cgamode&1,disptime,dispontime,dispofftime,crtc[0],crtc[1]);
|
||||
_dispontime *= CGACONST;
|
||||
_dispofftime *= CGACONST;
|
||||
// printf("Timings - on %f off %f frame %f second %f\n",dispontime,dispofftime,(dispontime+dispofftime)*262.0,(dispontime+dispofftime)*262.0*59.92);
|
||||
sigma->dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
|
||||
sigma->dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* Render a line in 80-column text mode */
|
||||
void sigma_text80(sigma_t *sigma)
|
||||
{
|
||||
int x, c;
|
||||
uint8_t chr, attr;
|
||||
uint16_t ca = (sigma->crtc[15] | (sigma->crtc[14] << 8));
|
||||
uint16_t ma = ((sigma->ma & 0x3FFF) << 1);
|
||||
int drawcursor;
|
||||
uint32_t cols[4];
|
||||
uint8_t *vram = sigma->vram + (ma << 1);
|
||||
|
||||
ca = ca << 1;
|
||||
if (sigma->sigma_ctl & CTL_CURSOR) ++ca;
|
||||
ca &= 0x3fff;
|
||||
// pclog("sigma_text80: displine=%d sc=%d Width=%d\n",
|
||||
// sigma->displine, sigma->sc, sigma->crtc[1]);
|
||||
|
||||
/* The Sigma 400 seems to use screen widths stated in words
|
||||
* (40 for 80-column, 20 for 40-column) */
|
||||
for (x = 0; x < (sigma->crtc[1] << 1); x++)
|
||||
{
|
||||
chr = vram[x << 1];
|
||||
attr = vram[(x << 1) + 1];
|
||||
drawcursor = ((ma == ca) && sigma->con && sigma->cursoron);
|
||||
|
||||
if (!(sigma->sigmamode & MODE_NOBLINK))
|
||||
{
|
||||
cols[1] = attr & 15;
|
||||
cols[0] = (attr >> 4) & 7;
|
||||
if ((sigma->cgablink & 8) && (attr & 0x80) && !sigma->drawcursor)
|
||||
cols[1] = cols[0];
|
||||
}
|
||||
else /* No blink */
|
||||
{
|
||||
cols[1] = attr & 15;
|
||||
cols[0] = attr >> 4;
|
||||
}
|
||||
// if (chr != ' ')
|
||||
// {
|
||||
// pclog("[%x:%x]%c", cols[1], cols[0], chr);
|
||||
// }
|
||||
if (drawcursor)
|
||||
{
|
||||
for (c = 0; c < 8; c++)
|
||||
{
|
||||
if (sigma->sigmamode & MODE_FONT16)
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + c + 8] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xffffff;
|
||||
else ((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + c + 8] = cols[(fontdat[chr][sigma->sc & 7] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xffffff;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (c = 0; c < 8; c++)
|
||||
{
|
||||
if (sigma->sigmamode & MODE_FONT16)
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + c + 8] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
|
||||
else ((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + c + 8] = cols[(fontdat[chr][sigma->sc & 7] & (1 << (c ^ 7))) ? 1 : 0];
|
||||
}
|
||||
}
|
||||
++ma;
|
||||
}
|
||||
sigma->ma += sigma->crtc[1];
|
||||
//pclog("\n");
|
||||
}
|
||||
|
||||
|
||||
/* Render a line in 40-column text mode */
|
||||
void sigma_text40(sigma_t *sigma)
|
||||
{
|
||||
int x, c;
|
||||
uint8_t chr, attr;
|
||||
uint16_t ca = (sigma->crtc[15] | (sigma->crtc[14] << 8));
|
||||
uint16_t ma = ((sigma->ma & 0x3FFF) << 1);
|
||||
int drawcursor;
|
||||
uint32_t cols[4];
|
||||
uint8_t *vram = sigma->vram + ((ma << 1) & 0x3FFF);
|
||||
|
||||
ca = ca << 1;
|
||||
if (sigma->sigma_ctl & CTL_CURSOR) ++ca;
|
||||
ca &= 0x3fff;
|
||||
/* The Sigma 400 seems to use screen widths stated in words
|
||||
* (40 for 80-column, 20 for 40-column) */
|
||||
for (x = 0; x < (sigma->crtc[1] << 1); x++)
|
||||
{
|
||||
chr = vram[x << 1];
|
||||
attr = vram[(x << 1) + 1];
|
||||
drawcursor = ((ma == ca) && sigma->con && sigma->cursoron);
|
||||
|
||||
if (!(sigma->sigmamode & MODE_NOBLINK))
|
||||
{
|
||||
cols[1] = attr & 15;
|
||||
cols[0] = (attr >> 4) & 7;
|
||||
if ((sigma->cgablink & 8) && (attr & 0x80) && !sigma->drawcursor)
|
||||
cols[1] = cols[0];
|
||||
}
|
||||
else /* No blink */
|
||||
{
|
||||
cols[1] = attr & 15;
|
||||
cols[0] = attr >> 4;
|
||||
}
|
||||
// if (chr != ' ')
|
||||
// {
|
||||
// pclog("[%x:%x]%c", cols[1], cols[0], chr);
|
||||
// }
|
||||
if (drawcursor)
|
||||
{
|
||||
for (c = 0; c < 8; c++)
|
||||
{
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 4) + 2*c + 8] =
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 4) + 2*c + 9] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xffffff;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (c = 0; c < 8; c++)
|
||||
{
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 4) + 2*c + 8] =
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 4) + 2*c + 9] = cols[(fontdatm[chr][sigma->sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
|
||||
}
|
||||
}
|
||||
ma++;
|
||||
}
|
||||
sigma->ma += sigma->crtc[1];
|
||||
//pclog("\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/* Draw a line in the 640x400 graphics mode */
|
||||
void sigma_gfx400(sigma_t *sigma)
|
||||
{
|
||||
int x;
|
||||
unsigned char *vram = &sigma->vram[((sigma->ma << 1) & 0x1FFF)
|
||||
+ (sigma->sc & 3) * 0x2000];
|
||||
uint8_t plane[4];
|
||||
uint8_t mask, col, c;
|
||||
|
||||
for (x = 0; x < (sigma->crtc[1] << 1); x++)
|
||||
{
|
||||
plane[0] = vram[x];
|
||||
plane[1] = vram[0x8000 + x];
|
||||
plane[2] = vram[0x10000 + x];
|
||||
plane[3] = vram[0x18000 + x];
|
||||
|
||||
for (c = 0, mask = 0x80; c < 8; c++, mask >>= 1)
|
||||
{
|
||||
col = ((plane[3] & mask) ? 8 : 0) |
|
||||
((plane[2] & mask) ? 4 : 0) |
|
||||
((plane[1] & mask) ? 2 : 0) |
|
||||
((plane[0] & mask) ? 1 : 0);
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + c + 8] = col;
|
||||
}
|
||||
if (x & 1) ++sigma->ma;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Draw a line in the 640x200 graphics mode.
|
||||
* This is actually a 640x200x16 mode; on startup, the BIOS selects plane 2,
|
||||
* blanks the other planes, and sets palette ink 4 to white. Pixels plotted
|
||||
* in plane 2 come out in white, others black; but by programming the palette
|
||||
* and plane registers manually you can get the full resolution. */
|
||||
void sigma_gfx200(sigma_t *sigma)
|
||||
{
|
||||
int x;
|
||||
unsigned char *vram = &sigma->vram[((sigma->ma << 1) & 0x1FFF)
|
||||
+ (sigma->sc & 2) * 0x1000];
|
||||
uint8_t plane[4];
|
||||
uint8_t mask, col, c;
|
||||
|
||||
for (x = 0; x < (sigma->crtc[1] << 1); x++)
|
||||
{
|
||||
plane[0] = vram[x];
|
||||
plane[1] = vram[0x8000 + x];
|
||||
plane[2] = vram[0x10000 + x];
|
||||
plane[3] = vram[0x18000 + x];
|
||||
|
||||
for (c = 0, mask = 0x80; c < 8; c++, mask >>= 1)
|
||||
{
|
||||
col = ((plane[3] & mask) ? 8 : 0) |
|
||||
((plane[2] & mask) ? 4 : 0) |
|
||||
((plane[1] & mask) ? 2 : 0) |
|
||||
((plane[0] & mask) ? 1 : 0);
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + c + 8] = col;
|
||||
}
|
||||
if (x & 1) ++sigma->ma;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* Draw a line in the 320x200 graphics mode */
|
||||
void sigma_gfx4col(sigma_t *sigma)
|
||||
{
|
||||
int x;
|
||||
unsigned char *vram = &sigma->vram[((sigma->ma << 1) & 0x1FFF)
|
||||
+ (sigma->sc & 2) * 0x1000];
|
||||
uint8_t plane[4];
|
||||
uint8_t mask, col, c;
|
||||
|
||||
for (x = 0; x < (sigma->crtc[1] << 1); x++)
|
||||
{
|
||||
plane[0] = vram[x];
|
||||
plane[1] = vram[0x8000 + x];
|
||||
plane[2] = vram[0x10000 + x];
|
||||
plane[3] = vram[0x18000 + x];
|
||||
|
||||
mask = 0x80;
|
||||
for (c = 0; c < 4; c++)
|
||||
{
|
||||
col = ((plane[3] & mask) ? 2 : 0) |
|
||||
((plane[2] & mask) ? 1 : 0);
|
||||
mask = mask >> 1;
|
||||
col |= ((plane[3] & mask) ? 8 : 0) |
|
||||
((plane[2] & mask) ? 4 : 0);
|
||||
mask = mask >> 1;
|
||||
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + (c << 1) + 8] =
|
||||
((uint32_t *)buffer32->line[sigma->displine])[(x << 3) + (c << 1) + 9] = col;
|
||||
}
|
||||
if (x & 1) ++sigma->ma;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void sigma_poll(void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
int x, c;
|
||||
int oldvc;
|
||||
uint32_t cols[4];
|
||||
int oldsc;
|
||||
|
||||
if (!sigma->linepos)
|
||||
{
|
||||
sigma->vidtime += sigma->dispofftime;
|
||||
sigma->sigmastat |= STATUS_RETR_H;
|
||||
sigma->linepos = 1;
|
||||
oldsc = sigma->sc;
|
||||
if ((sigma->crtc[8] & 3) == 3)
|
||||
sigma->sc = ((sigma->sc << 1) + sigma->oddeven) & 7;
|
||||
if (sigma->cgadispon)
|
||||
{
|
||||
if (sigma->displine < sigma->firstline)
|
||||
{
|
||||
sigma->firstline = sigma->displine;
|
||||
video_wait_for_buffer();
|
||||
// printf("Firstline %i\n",firstline);
|
||||
}
|
||||
sigma->lastline = sigma->displine;
|
||||
|
||||
cols[0] = 0;
|
||||
// Left overscan
|
||||
for (c = 0; c < 8; c++)
|
||||
{
|
||||
((uint32_t *)buffer32->line[sigma->displine])[c] = cols[0];
|
||||
if (sigma->sigmamode & MODE_80COLS)
|
||||
((uint32_t *)buffer32->line[sigma->displine])[c + (sigma->crtc[1] << 4) + 8] = cols[0];
|
||||
else
|
||||
((uint32_t *)buffer32->line[sigma->displine])[c + (sigma->crtc[1] << 5) + 8] = cols[0];
|
||||
}
|
||||
if (sigma->sigmamode & MODE_GRAPHICS)
|
||||
{
|
||||
if (sigma->sigmamode & MODE_640x400)
|
||||
{
|
||||
sigma_gfx400(sigma);
|
||||
}
|
||||
else if (sigma->sigmamode & MODE_HRGFX)
|
||||
{
|
||||
sigma_gfx200(sigma);
|
||||
}
|
||||
else sigma_gfx4col(sigma);
|
||||
|
||||
}
|
||||
else /* Text modes */
|
||||
{
|
||||
if (sigma->sigmamode & MODE_80COLS)
|
||||
{
|
||||
sigma_text80(sigma);
|
||||
}
|
||||
else
|
||||
{
|
||||
sigma_text40(sigma);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
cols[0] = 0;
|
||||
if (sigma->sigmamode & MODE_80COLS)
|
||||
hline(buffer32, 0, sigma->displine, (sigma->crtc[1] << 4) + 16, cols[0]);
|
||||
else hline(buffer32, 0, sigma->displine, (sigma->crtc[1] << 5) + 16, cols[0]);
|
||||
}
|
||||
|
||||
if (sigma->sigmamode & MODE_80COLS)
|
||||
{
|
||||
x = (sigma->crtc[1] << 4) + 16;
|
||||
}
|
||||
else
|
||||
{
|
||||
x = (sigma->crtc[1] << 5) + 16;
|
||||
}
|
||||
|
||||
for (c = 0; c < x; c++)
|
||||
{
|
||||
((uint32_t *)buffer32->line[sigma->displine])[c] = cgapal[sigma->palette[((uint32_t *)buffer32->line[sigma->displine])[c] & 0xf]];
|
||||
}
|
||||
|
||||
sigma->sc = oldsc;
|
||||
if (sigma->vc == sigma->crtc[7] && !sigma->sc)
|
||||
sigma->sigmastat |= STATUS_RETR_V;
|
||||
sigma->displine++;
|
||||
if (sigma->displine >= 560)
|
||||
sigma->displine = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
sigma->vidtime += sigma->dispontime;
|
||||
sigma->linepos = 0;
|
||||
if (sigma->vsynctime)
|
||||
{
|
||||
sigma->vsynctime--;
|
||||
if (!sigma->vsynctime)
|
||||
sigma->sigmastat &= ~STATUS_RETR_V;
|
||||
}
|
||||
if (sigma->sc == (sigma->crtc[11] & 31) || ((sigma->crtc[8] & 3) == 3 && sigma->sc == ((sigma->crtc[11] & 31) >> 1)))
|
||||
{
|
||||
sigma->con = 0;
|
||||
sigma->coff = 1;
|
||||
}
|
||||
if ((sigma->crtc[8] & 3) == 3 && sigma->sc == (sigma->crtc[9] >> 1))
|
||||
sigma->maback = sigma->ma;
|
||||
if (sigma->vadj)
|
||||
{
|
||||
sigma->sc++;
|
||||
sigma->sc &= 31;
|
||||
sigma->ma = sigma->maback;
|
||||
sigma->vadj--;
|
||||
if (!sigma->vadj)
|
||||
{
|
||||
sigma->cgadispon = 1;
|
||||
sigma->ma = sigma->maback = (sigma->crtc[13] | (sigma->crtc[12] << 8)) & 0x3fff;
|
||||
sigma->sc = 0;
|
||||
}
|
||||
}
|
||||
else if (sigma->sc == sigma->crtc[9])
|
||||
{
|
||||
sigma->maback = sigma->ma;
|
||||
sigma->sc = 0;
|
||||
oldvc = sigma->vc;
|
||||
sigma->vc++;
|
||||
sigma->vc &= 127;
|
||||
|
||||
if (sigma->vc == sigma->crtc[6])
|
||||
sigma->cgadispon = 0;
|
||||
|
||||
if (oldvc == sigma->crtc[4])
|
||||
{
|
||||
sigma->vc = 0;
|
||||
sigma->vadj = sigma->crtc[5];
|
||||
if (!sigma->vadj) sigma->cgadispon = 1;
|
||||
if (!sigma->vadj) sigma->ma = sigma->maback = (sigma->crtc[13] | (sigma->crtc[12] << 8)) & 0x3fff;
|
||||
if ((sigma->crtc[10] & 0x60) == 0x20) sigma->cursoron = 0;
|
||||
else sigma->cursoron = sigma->cgablink & 8;
|
||||
}
|
||||
|
||||
if (sigma->vc == sigma->crtc[7])
|
||||
{
|
||||
sigma->cgadispon = 0;
|
||||
sigma->displine = 0;
|
||||
sigma->vsynctime = 16;
|
||||
if (sigma->crtc[7])
|
||||
{
|
||||
if (sigma->sigmamode & MODE_80COLS)
|
||||
x = (sigma->crtc[1] << 4) + 16;
|
||||
else
|
||||
x = (sigma->crtc[1] << 5) + 16;
|
||||
sigma->lastline++;
|
||||
if (x != xsize || (sigma->lastline - sigma->firstline) != ysize)
|
||||
{
|
||||
xsize = x;
|
||||
ysize = sigma->lastline - sigma->firstline;
|
||||
// pclog("sigma: xsize := %d ysize := %d\n", xsize, ysize);
|
||||
if (xsize < 64) xsize = 656;
|
||||
if (ysize < 32) ysize = 200;
|
||||
updatewindowsize(xsize, ysize + 8);
|
||||
}
|
||||
|
||||
video_blit_memtoscreen(0, sigma->firstline - 4, 0, (sigma->lastline - sigma->firstline) + 8, xsize, (sigma->lastline - sigma->firstline) + 8);
|
||||
frames++;
|
||||
|
||||
video_res_x = xsize - 16;
|
||||
video_res_y = ysize;
|
||||
if (sigma->sigmamode & MODE_GRAPHICS)
|
||||
{
|
||||
if (sigma->sigmamode & (MODE_HRGFX | MODE_640x400))
|
||||
{
|
||||
video_bpp = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
video_res_x /= 2;
|
||||
video_bpp = 2;
|
||||
}
|
||||
}
|
||||
else if (sigma->sigmamode & MODE_80COLS)
|
||||
{
|
||||
/* 80-column text */
|
||||
video_res_x /= 8;
|
||||
video_res_y /= sigma->crtc[9] + 1;
|
||||
video_bpp = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
/* 40-column text */
|
||||
video_res_x /= 16;
|
||||
video_res_y /= sigma->crtc[9] + 1;
|
||||
video_bpp = 0;
|
||||
}
|
||||
}
|
||||
sigma->firstline = 1000;
|
||||
sigma->lastline = 0;
|
||||
sigma->cgablink++;
|
||||
sigma->oddeven ^= 1;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
sigma->sc++;
|
||||
sigma->sc &= 31;
|
||||
sigma->ma = sigma->maback;
|
||||
}
|
||||
if (sigma->cgadispon)
|
||||
sigma->sigmastat &= ~STATUS_RETR_H;
|
||||
if ((sigma->sc == (sigma->crtc[10] & 31) || ((sigma->crtc[8] & 3) == 3 && sigma->sc == ((sigma->crtc[10] & 31) >> 1))))
|
||||
sigma->con = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
void *sigma_init()
|
||||
{
|
||||
int display_type, contrast;
|
||||
sigma_t *sigma = malloc(sizeof(sigma_t));
|
||||
memset(sigma, 0, sizeof(sigma_t));
|
||||
|
||||
display_type = device_get_config_int("display_type");
|
||||
contrast = device_get_config_int("contrast");
|
||||
sigma->enable_nmi = device_get_config_int("enable_nmi");
|
||||
|
||||
loadfont("sigma400_font.rom", 7);
|
||||
rom_init(&sigma->bios_rom, "sigma400_bios.rom", 0xC0000, 0x2000,
|
||||
0x1FFF, 0, MEM_MAPPING_EXTERNAL);
|
||||
/* The BIOS ROM is overlaid by RAM, so remove its default mapping
|
||||
* and access it through sigma_bread() / sigma_bwrite() below */
|
||||
mem_mapping_disable(&sigma->bios_rom.mapping);
|
||||
|
||||
sigma->vram = malloc(0x8000 * 4);
|
||||
|
||||
timer_add(sigma_poll, &sigma->vidtime, TIMER_ALWAYS_ENABLED, sigma);
|
||||
mem_mapping_add(&sigma->mapping, 0xb8000, 0x08000,
|
||||
sigma_read, NULL, NULL,
|
||||
sigma_write, NULL, NULL,
|
||||
NULL, MEM_MAPPING_EXTERNAL, sigma);
|
||||
mem_mapping_add(&sigma->bios_ram, 0xC1800, 0x0800,
|
||||
sigma_bread, NULL, NULL,
|
||||
sigma_bwrite, NULL, NULL,
|
||||
sigma->bios_rom.rom, MEM_MAPPING_EXTERNAL, sigma);
|
||||
io_sethandler(0x03d0, 0x0010,
|
||||
sigma_in, NULL, NULL,
|
||||
sigma_out, NULL, NULL, sigma);
|
||||
io_sethandler(0x02d0, 0x0010,
|
||||
sigma_in, NULL, NULL,
|
||||
sigma_out, NULL, NULL, sigma);
|
||||
|
||||
/* Start with ROM paged in, BIOS RAM paged out */
|
||||
sigma->rom_paged = 0x80;
|
||||
|
||||
cgapal_rebuild(display_type, contrast);
|
||||
|
||||
if (sigma->enable_nmi)
|
||||
{
|
||||
sigma->sigmastat = STATUS_LPEN_T;
|
||||
}
|
||||
return sigma;
|
||||
}
|
||||
|
||||
void sigma_close(void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
|
||||
free(sigma->vram);
|
||||
free(sigma);
|
||||
}
|
||||
|
||||
void sigma_speed_changed(void *p)
|
||||
{
|
||||
sigma_t *sigma = (sigma_t *)p;
|
||||
|
||||
sigma_recalctimings(sigma);
|
||||
}
|
||||
|
||||
device_config_t sigma_config[] =
|
||||
{
|
||||
{
|
||||
.name = "display_type",
|
||||
.description = "Display type",
|
||||
.type = CONFIG_SELECTION,
|
||||
.selection =
|
||||
{
|
||||
{
|
||||
.description = "RGB",
|
||||
.value = DISPLAY_RGB
|
||||
},
|
||||
{
|
||||
.description = "RGB (no brown)",
|
||||
.value = DISPLAY_RGB_NO_BROWN
|
||||
},
|
||||
{
|
||||
.description = "Green Monochrome",
|
||||
.value = DISPLAY_GREEN
|
||||
},
|
||||
{
|
||||
.description = "Amber Monochrome",
|
||||
.value = DISPLAY_AMBER
|
||||
},
|
||||
{
|
||||
.description = "White Monochrome",
|
||||
.value = DISPLAY_WHITE
|
||||
},
|
||||
{
|
||||
.description = ""
|
||||
}
|
||||
},
|
||||
.default_int = DISPLAY_RGB
|
||||
},
|
||||
{
|
||||
.name = "enable_nmi",
|
||||
.description = "Enable NMI for CGA emulation",
|
||||
.type = CONFIG_BINARY,
|
||||
.default_int = 1
|
||||
},
|
||||
{
|
||||
.name = "contrast",
|
||||
.description = "Alternate monochrome contrast",
|
||||
.type = CONFIG_BINARY,
|
||||
.default_int = 0
|
||||
},
|
||||
{
|
||||
.type = -1
|
||||
}
|
||||
};
|
||||
|
||||
device_t sigma_device =
|
||||
{
|
||||
"Sigma Color 400",
|
||||
0,
|
||||
sigma_init,
|
||||
sigma_close,
|
||||
NULL,
|
||||
sigma_speed_changed,
|
||||
NULL,
|
||||
NULL,
|
||||
sigma_config
|
||||
};
|
||||
2
src/vid_sigma.h
Normal file
2
src/vid_sigma.h
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
extern device_t sigma_device;
|
||||
|
||||
16
src/video.c
16
src/video.c
|
|
@ -37,6 +37,7 @@
|
|||
#include "vid_ps1_svga.h"
|
||||
#include "vid_s3.h"
|
||||
#include "vid_s3_virge.h"
|
||||
#include "vid_sigma.h"
|
||||
#include "vid_tandy.h"
|
||||
#include "vid_tandysl.h"
|
||||
#include "vid_tgui9440.h"
|
||||
|
|
@ -103,6 +104,7 @@ static VIDEO_CARD video_cards[] =
|
|||
{"Phoenix S3 Trio64", "px_trio64", &s3_phoenix_trio64_device, GFX_PHOENIX_TRIO64, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 3, 2, 4, 25, 25, 40}},
|
||||
{"Plantronics ColorPlus", "plantronics", &colorplus_device, GFX_COLORPLUS, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}},
|
||||
{"S3 ViRGE/DX", "virge375", &s3_virge_375_device, GFX_VIRGEDX, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 2, 2, 3, 28, 28, 45}},
|
||||
{"Sigma Color 400", "sigma400", &sigma_device, GFX_SIGMA400, VIDEO_FLAG_TYPE_CGA, {VIDEO_ISA, 8, 16, 32, 8, 16, 32}},
|
||||
{"Trident TVGA8900D", "tvga8900d", &tvga8900d_device, GFX_TVGA, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 8, 8, 12}},
|
||||
{"Tseng ET4000AX", "et4000ax", &et4000_device, GFX_ET4000, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_ISA, 3, 3, 6, 5, 5, 10}},
|
||||
{"Trident TGUI9400CXi", "tgui9400cxi", &tgui9400cxi_device, GFX_TGUI9400CXI, VIDEO_FLAG_TYPE_SPECIAL, {VIDEO_BUS, 4, 8, 16, 4, 8, 16}},
|
||||
|
|
@ -891,7 +893,19 @@ void loadfont(char *s, int format)
|
|||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 7: /* Sigma Color 400 */
|
||||
/* The first 4k of the character ROM holds an 8x8 font */
|
||||
for (c = 0; c < 256; c++)
|
||||
{
|
||||
fread(&fontdat[c][0], 1, 8, f);
|
||||
fseek(f, 8, SEEK_CUR);
|
||||
}
|
||||
/* The second 4k holds an 8x16 font */
|
||||
for (c = 0; c < 256; c++)
|
||||
{
|
||||
fread(&fontdatm[c][0], 1, 16, f);
|
||||
}
|
||||
break;
|
||||
}
|
||||
fclose(f);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue