Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-23 14:19:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Updated Archimedes to the latest source, not worth mentioning

Browse Source
This commit is contained in:
Angelo Salese 2010-08-16 12:15:54 +00:00
parent e05ee0fd11
commit a941d38d15
2 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ void archimedes_request_irq_b(running_machine *machine, int mask)
if (ioc_regs[10] & mask) if (ioc_regs[10] & mask)
{ {
cputag_set_input_line(machine, "maincpu", ARM_IRQ_LINE, PULSE_LINE); generic_pulse_irq_line(machine->device("maincpu"), ARM_IRQ_LINE);
} }
} }
@ -74,7 +74,7 @@ void archimedes_request_fiq(running_machine *machine, int mask)
if (ioc_regs[14] & mask) if (ioc_regs[14] & mask)
{ {
cputag_set_input_line(machine, "maincpu", ARM_FIRQ_LINE, PULSE_LINE); generic_pulse_irq_line(machine->device("maincpu"), ARM_FIRQ_LINE);
} }
} }
@ -153,6 +153,9 @@ void archimedes_reset(running_machine *machine)
{ {
memc_pages[i] = -1; // indicate unmapped memc_pages[i] = -1; // indicate unmapped
} }
ioc_regs[4] = 0x10; //set up POR (Power On Reset) at start-up
ioc_regs[8] = 0x02; //set up IL[1] On
} }
void archimedes_init(running_machine *machine) void archimedes_init(running_machine *machine)
@ -319,7 +322,7 @@ READ32_HANDLER(archimedes_ioc_r)
#ifdef MESS #ifdef MESS
running_device *fdc = (running_device *)space->machine->device("wd1772"); running_device *fdc = (running_device *)space->machine->device("wd1772");
#endif #endif
if (offset >= 0x80000 && offset < 0xc0000) if (offset*4 >= 0x200000 && offset*4 < 0x300000)
{ {
switch (offset & 0x1f) switch (offset & 0x1f)
{ {
@ -345,11 +348,11 @@ READ32_HANDLER(archimedes_ioc_r)
return (ioc_timerout[3]>>8)&0xff; return (ioc_timerout[3]>>8)&0xff;
} }
logerror("IOC: R %s = %02x (PC=%x)\n", ioc_regnames[offset&0x1f], ioc_regs[offset&0x1f], cpu_get_pc( space->cpu )); logerror("IOC: R %s = %02x (PC=%x) %02x\n", ioc_regnames[offset&0x1f], ioc_regs[offset&0x1f], cpu_get_pc( space->cpu ),offset & 0x1f);
return ioc_regs[offset&0x1f]; return ioc_regs[offset&0x1f];
} }
#ifdef MESS #ifdef MESS
else if (offset >= 0xc4000 && offset <= 0xc4010) else if (offset*4 >= 0x310000 && offset*4 < 0x310040)
{ {
logerror("17XX: R @ addr %x mask %08x\n", offset*4, mem_mask); logerror("17XX: R @ addr %x mask %08x\n", offset*4, mem_mask);
return wd17xx_data_r(fdc, offset&0xf); return wd17xx_data_r(fdc, offset&0xf);
@ -370,14 +373,14 @@ WRITE32_HANDLER(archimedes_ioc_w)
running_device *fdc = (running_device *)space->machine->device("wd1772"); running_device *fdc = (running_device *)space->machine->device("wd1772");
#endif #endif
if (offset >= 0x80000 && offset < 0xc0000) if (offset*4 >= 0x200000 && offset*4 < 0x300000)
{ {
// logerror("IOC: W %02x @ reg %s (PC=%x)\n", data&0xff, ioc_regnames[offset&0x1f], cpu_get_pc( space->cpu )); // logerror("IOC: W %02x @ reg %s (PC=%x)\n", data&0xff, ioc_regnames[offset&0x1f], cpu_get_pc( space->cpu ));
switch (offset&0x1f) switch (offset&0x1f)
{ {
case 0: // I2C bus control case 0: // I2C bus control
logerror("IOC I2C: CLK %d DAT %d\n", (data>>1)&1, data&1); //logerror("IOC I2C: CLK %d DAT %d\n", (data>>1)&1, data&1);
break; break;
case 5: // IRQ clear A case 5: // IRQ clear A
@ -452,12 +455,12 @@ WRITE32_HANDLER(archimedes_ioc_w)
} }
} }
#ifdef MESS #ifdef MESS
else if (offset >= 0xc4000 && offset <= 0xc4010) else if (offset*4 >= 0x310000 && offset*4 < 0x310040)
{ {
logerror("17XX: %x to addr %x mask %08x\n", data, offset*4, mem_mask); logerror("17XX: %x to addr %x mask %08x\n", data, offset*4, mem_mask);
wd17xx_data_w(fdc, offset&0xf, data&0xff); wd17xx_data_w(fdc, offset&0xf, data&0xff);
} }
else if (offset == 0xd4006) else if (offset*4 == 0x350018)
{ {
// latch A // latch A
if (data & 1) if (data & 1)
@ -480,7 +483,7 @@ WRITE32_HANDLER(archimedes_ioc_w)
wd17xx_set_side(fdc,(data & 0x10)>>4); wd17xx_set_side(fdc,(data & 0x10)>>4);
} }
else if (offset == 0xd4010) else if (offset*4 == 0x350040)
{ {
// latch B // latch B
wd17xx_dden_w(fdc, BIT(data, 1)); wd17xx_dden_w(fdc, BIT(data, 1));
@ -523,7 +526,22 @@ WRITE32_HANDLER(archimedes_vidc_w)
}; };
#endif #endif
if (reg >= 0x80 && reg <= 0xbc) // 0x00 - 0x3c Video Palette Logical Colors (16 colors)
// 0x40 Border Color
// 0x44 - 0x4c Cursor Palette Logical Colors
if (reg >= 0x00 && reg <= 0x4c)
{
int r,g,b;
//TODO: 8bpp mode uses a different formula
//i = (val & 0x1000) >> 12; //supremacy bit
b = (val & 0x0f00) >> 8;
g = (val & 0x00f0) >> 4;
r = (val & 0x000f) >> 0;
palette_set_color_rgb(space->machine, reg >> 2, pal4bit(r), pal4bit(g), pal4bit(b) );
}
else if (reg >= 0x80 && reg <= 0xbc)
{ {
#ifdef DEBUG #ifdef DEBUG
logerror("VIDC: %s = %d\n", vrnames[(reg-0x80)/4], val>>12); logerror("VIDC: %s = %d\n", vrnames[(reg-0x80)/4], val>>12);