Skip to content

Commit

Permalink
GTS3: cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
@vbousquet
vbousquet committed Aug 29, 2024
1 parent 23755f6 commit f863cb6
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 30 deletions.
20 changes: 10 additions & 10 deletions src/wpc/gts3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
UINT8 DMDFrames [GTS3DMD_FRAMES][0x200];
UINT8 DMDFrames2[GTS3DMD_FRAMES][0x200]; //2nd DMD Display for Strikes N Spares

#define GTS3_VBLANKFREQ 60 /* VBLANK frequency*/
#define GTS3_IRQFREQ 1500 /* IRQ Frequency (Guessed)*/
#define GTS3_ALPHANMIFREQ 1000 /* Alpha NMI Frequency (Guessed)*/
#define GTS3_INTERFACE_UPD_PER_FRAME 1 /* interface update frequency per 60Hz frame */
#define GTS3_IRQFREQ 1500 /* IRQ Frequency (Guessed) */
#define GTS3_ALPHANMIFREQ 1000 /* Alpha NMI Frequency (Guessed)*/

#define GTS3_CPUNO 0
#define GTS3_DCPUNO 1
#define GTS3_SCPUNO 2
#define GTS3_DCPUNO 1
#define GTS3_SCPUNO 2
#define GTS3_DCPUNO2 2

#if 1
Expand Down Expand Up @@ -399,15 +399,15 @@ static struct via6522_interface via_1_interface =
/*irq */ 0 /* GTS3_irq */
};

static INTERRUPT_GEN(GTS3_vblank) {
static INTERRUPT_GEN(GTS3_interface_update) {
/*-------------------------------
/ copy local data to interface
/--------------------------------*/
GTS3locals.vblankCount++;
GTS3locals.interfaceUpdateCount++;

/*-- solenoids --*/
coreGlobals.solenoids = GTS3locals.solenoids;
if ((GTS3locals.vblankCount % GTS3_SOLSMOOTH) == 0) {
if ((GTS3locals.interfaceUpdateCount % GTS3_SOLSMOOTH) == 0) {
// FIXME ssEn is never set. Special solenoids are handled by core_updateSw triggered from GameOn directly read from solenoid #31 state
// Note that the code here would have a bug because it sets solenoids #23 as GameOn but this solenoid is used for other purposes by GTS3 hardware
// if (GTS3locals.ssEn) {
Expand All @@ -422,7 +422,7 @@ static INTERRUPT_GEN(GTS3_vblank) {
}

/*-- diagnostic leds --*/
if ((GTS3locals.vblankCount % GTS3_DISPLAYSMOOTH) == 0) { // TODO it seems that diag LEDs are PWMed => move to a lamp
if ((GTS3locals.interfaceUpdateCount % GTS3_DISPLAYSMOOTH) == 0) { // TODO it seems that diag LEDs are PWMed => move to a lamp
if (GTS3_dmdlocals[0].has2DMD) { //Strikes N Spares has 2 DMD LED, but no Sound Board LED
coreGlobals.diagnosticLed = GTS3locals.diagnosticLed |
(GTS3_dmdlocals[0].diagnosticLed << 1) |
Expand Down Expand Up @@ -1078,7 +1078,7 @@ MACHINE_DRIVER_START(gts3)
MDRV_IMPORT_FROM(PinMAME)
MDRV_CPU_ADD(M65C02, 2000000) // XTAL(4'000'000) / 2
MDRV_CPU_MEMORY(GTS3_readmem, GTS3_writemem)
MDRV_CPU_VBLANK_INT(GTS3_vblank, GTS3_VBLANKFREQ)
MDRV_CPU_VBLANK_INT(GTS3_interface_update, GTS3_INTERFACE_UPD_PER_FRAME)
MDRV_CPU_PERIODIC_INT(alphanmi, GTS3_ALPHANMIFREQ)
MDRV_TIMER_ADD(GTS3_irq, GTS3_IRQFREQ)
MDRV_NVRAM_HANDLER(gts3)
Expand Down
2 changes: 1 addition & 1 deletion src/wpc/gts3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ typedef struct {
UINT8 alphagen; //0,1,2
int alphaNumCol, alphaNumColShiftRegister;
core_tWord activeSegments[2]; // Realtime active alphanum segments
int vblankCount;
int interfaceUpdateCount;
UINT32 solenoids;
int lampRow, lampColumn;
UINT8 diagnosticLed; // bool
Expand Down
29 changes: 10 additions & 19 deletions src/wpc/gts3dmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,11 @@ extern UINT8 DMDFrames2[GTS3DMD_FRAMES][0x200];
extern GTS3_DMDlocals GTS3_dmdlocals[2];

// Shaded frame computed from stored PWMed DMD frames
UINT16 accumulatedFrame[32][128];
UINT16 GTS3_accumulatedFrame[32][128];

#if defined(VPINMAME) || defined(LIBPINMAME)
extern UINT8 g_raw_gtswpc_dmd[GTS3DMD_FRAMES*0x200];
extern UINT32 g_raw_gtswpc_dmdframes;

static const unsigned char lookup[16] = {
0x0, 0x8, 0x4, 0xc, 0x2, 0xa, 0x6, 0xe,
0x1, 0x9, 0x5, 0xd, 0x3, 0xb, 0x7, 0xf, };

INLINE UINT8 reverse(UINT8 n) {
// Reverse the top and bottom nibble then swap them.
return (lookup[n & 0x0f] << 4) | lookup[n >> 4];
}
#endif

// GTS3 hardware creates shades by quickly switching frames (PWM).
Expand Down Expand Up @@ -55,13 +46,13 @@ plot(filtered(:,4),";1/10 - 10;")
bp = 10000 * b; % scaled filter used for PinMame integer math
*/

const UINT16 fir_weights[] = { 8, 19, 44, 91, 168, 274, 405, 552, // Octave: b = fir1(23, fc/(fs/2)); with fc = 15; and fs = 376;
699, 830, 928, 981, 981, 928, 830, 699,
552, 405, 274, 168, 91, 44, 19, 8 };
const UINT16 fir_sum = 9998;

int gts3_dmd128x32(int which, struct mame_bitmap* bitmap, const struct rectangle* cliprect, const struct core_dispLayout* layout)
{
static const UINT16 fir_weights[] = { 8, 19, 44, 91, 168, 274, 405, 552, // Octave: b = fir1(23, fc/(fs/2)); with fc = 15; and fs = 376;
699, 830, 928, 981, 981, 928, 830, 699,
552, 405, 274, 168, 91, 44, 19, 8 };
const UINT16 fir_sum = 9998;

int ii,jj,kk,ll;
UINT8* dmdFrames = which == 0 ? &DMDFrames[0][0] : &DMDFrames2[0][0];

Expand All @@ -73,19 +64,19 @@ int gts3_dmd128x32(int which, struct mame_bitmap* bitmap, const struct rectangle
UINT8* frameData = dmdFrames + ((GTS3_dmdlocals[0].nextDMDFrame + (GTS3DMD_FRAMES - 1) + (GTS3DMD_FRAMES - ii)) % GTS3DMD_FRAMES) * 0x200;
for (jj = 0; jj < 32 * 16; jj++) { // 32 lines of 16 columns of 8 pixels
UINT8 data = *frameData++;
*rawData = reverse(data);
*rawData = core_revbyte(data);
rawData++;
}
}
#endif

// Apply low pass filter over 24 frames
memset(accumulatedFrame, 0, sizeof(accumulatedFrame));
memset(GTS3_accumulatedFrame, 0, sizeof(GTS3_accumulatedFrame));
for (ii = 0; ii < sizeof(fir_weights)/sizeof(fir_weights[0]); ii++) {
const UINT16 frame_weight = fir_weights[ii];
UINT8* frameData = dmdFrames + ((GTS3_dmdlocals[0].nextDMDFrame + (GTS3DMD_FRAMES - 1) + (GTS3DMD_FRAMES - ii)) % GTS3DMD_FRAMES) * 0x200;
for (jj = 1; jj <= 32; jj++) { // 32 lines
UINT16* line = &accumulatedFrame[jj - 1][0];
UINT16* line = &GTS3_accumulatedFrame[jj - 1][0];
for (kk = 0; kk < 16; kk++) { // 16 columns/line
UINT8 data = *frameData++;
for (ll = 0; ll < 8; ll++) { // 8 pixels/column
Expand All @@ -99,7 +90,7 @@ int gts3_dmd128x32(int which, struct mame_bitmap* bitmap, const struct rectangle
// Scale down to 16 shades (note that precision matters and is needed to avoid flickering)
for (ii = 1; ii <= 32; ii++) // 32 lines
for (jj = 0; jj < 128; jj++) { // 128 pixels/line
UINT16 data = accumulatedFrame[ii-1][jj];
UINT16 data = GTS3_accumulatedFrame[ii-1][jj];
coreGlobals.dotCol[ii][jj] = ((UINT8)((255 * (unsigned int) data) / fir_sum)) >> 4;
}

Expand Down

0 comments on commit f863cb6

Please sign in to comment.