Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-02 19:06:43 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixed a fatal bug in MEMC handling and removed the mapping kludge for Aristocrat MK-5 [Angelo Salese]

Browse Source
This commit is contained in:
Angelo Salese 2010-08-18 16:02:04 +00:00
parent ac6c07a019
commit 0634470398
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mame/drivers/aristmk5.c
View File

@ -69,16 +69,19 @@ static VIDEO_UPDATE(aristmk5)
UINT32 *vram = archimedes_memc_physmem; UINT32 *vram = archimedes_memc_physmem;
// sets video DMA to 0x400 - 0x400 - 0xfe00 // sets video DMA to 0x400 - 0x400 - 0xfe00
count = 0x800/4; // 0x400 text is offset??? count = 0x380/4; // 0x400 text is offset???
for(y=0;y<400;y+=2)
for(y=0;y<480;y++)
{ {
for(x=0;x<640;x+=4) for(x=0;x<640;x+=4)
{ {
for(xi=0;xi<4;xi++) for(xi=0;xi<4;xi++)
{
if ((x+xi) <= screen->visible_area().max_x && (y) <= screen->visible_area().max_y) if ((x+xi) <= screen->visible_area().max_x && (y) <= screen->visible_area().max_y)
*BITMAP_ADDR32(bitmap, y, x+xi) = screen->machine->pens[(vram[count]>>(xi*8))&0xff]; *BITMAP_ADDR32(bitmap, y, x+xi) = screen->machine->pens[(vram[count]>>(xi*8))&0xff];
if ((x+xi) <= screen->visible_area().max_x && (y+1) <= screen->visible_area().max_y)
*BITMAP_ADDR32(bitmap, y+1, x+xi) = screen->machine->pens[(vram[count]>>(xi*8))&0xff];
}
count++; count++;
} }
@ -116,9 +119,9 @@ static ADDRESS_MAP_START( aristmk5_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x03010420, 0x03010423) AM_WRITE(mk5_i2c_w) AM_RANGE(0x03010420, 0x03010423) AM_WRITE(mk5_i2c_w)
AM_RANGE(0x03010810, 0x03010813) AM_READNOP //MK-5 specific, watchdog AM_RANGE(0x03010810, 0x03010813) AM_READNOP //MK-5 specific, watchdog
AM_RANGE(0x03000000, 0x033fffff) AM_READWRITE(mk5_ioc_r, archimedes_ioc_w) AM_RANGE(0x03000000, 0x033fffff) AM_READWRITE(mk5_ioc_r, archimedes_ioc_w)
AM_RANGE(0x03400000, 0x035fffff) AM_ROM AM_REGION("maincpu", 0) AM_WRITE(archimedes_memc_page_w) AM_RANGE(0x03400000, 0x035fffff) AM_ROM AM_REGION("maincpu", 0) AM_WRITE(archimedes_vidc_w)
AM_RANGE(0x03600000, 0x037fffff) AM_READWRITE(archimedes_memc_r, archimedes_memc_w) AM_RANGE(0x03600000, 0x037fffff) AM_READWRITE(archimedes_memc_r, archimedes_memc_w)
AM_RANGE(0x03800000, 0x039fffff) AM_READWRITE(archimedes_vidc_r, archimedes_vidc_w) //TODO: this is different here, it appears to contain palette data only AM_RANGE(0x03800000, 0x039fffff) AM_WRITE(archimedes_memc_page_w)
ADDRESS_MAP_END ADDRESS_MAP_END
@ -151,15 +154,6 @@ static MACHINE_RESET( aristmk5 )
{ {
archimedes_reset(machine); archimedes_reset(machine);
timer_adjust_oneshot(mk5_2KHz_timer, ATTOTIME_IN_HZ(2000), 0); timer_adjust_oneshot(mk5_2KHz_timer, ATTOTIME_IN_HZ(2000), 0);
{
int i;
// kludge, set up MMU pages to a normal value, in order to draw all of the vram
for (i = 0; i < (32*1024*1024)/(4096); i++)
{
memc_pages[i] = i;
}
}
} }
#define NVRAM_SIZE 1024 #define NVRAM_SIZE 1024

4
src/mame/machine/archimds.c
View File

@ -492,6 +492,7 @@ WRITE32_HANDLER(archimedes_ioc_w)
// if that did it, clear the IRQ // if that did it, clear the IRQ
if (ioc_regs[IRQ_STATUS_A] == 0) if (ioc_regs[IRQ_STATUS_A] == 0)
{ {
printf("IRQ clear A\n");
cputag_set_input_line(space->machine, "maincpu", ARM_IRQ_LINE, CLEAR_LINE); cputag_set_input_line(space->machine, "maincpu", ARM_IRQ_LINE, CLEAR_LINE);
} }
break; break;
@ -837,6 +838,7 @@ WRITE32_HANDLER(archimedes_memc_page_w)
log <<= 23; log <<= 23;
log |= (data & 0x7f8000); log |= (data & 0x7f8000);
memc = ((data & 0x80) ? 1 : 0) | ((data & 0x1000) ? 2 : 0); memc = ((data & 0x80) ? 1 : 0) | ((data & 0x1000) ? 2 : 0);
//printf("Mapping %08X to %08X\n",0x2000000+(phys*32768),(((data >> 15)&0xff)|((data >> 2)&0x300)));
break; break;
} }
@ -846,7 +848,7 @@ WRITE32_HANDLER(archimedes_memc_page_w)
memc_latchrom = 0; memc_latchrom = 0;
// now go ahead and set the mapping in the page table // now go ahead and set the mapping in the page table
memc_pages[log] = phys * memc; memc_pages[log] = phys + (memc*0x80);
// printf("MEMC_PAGE(%d): W %08x: log %x to phys %x, MEMC %d, perms %d\n", memc_pagesize, data, log, phys, memc, perms); // printf("MEMC_PAGE(%d): W %08x: log %x to phys %x, MEMC %d, perms %d\n", memc_pagesize, data, log, phys, memc, perms);
} }