diff --git a/src/mess/drivers/eti660.c b/src/mess/drivers/eti660.c index f680b806eae..279b8df45f0 100644 --- a/src/mess/drivers/eti660.c +++ b/src/mess/drivers/eti660.c @@ -42,6 +42,7 @@ WRITE8_MEMBER( eti660_state::colorram_w ) static ADDRESS_MAP_START( eti660_map, AS_PROGRAM, 8, eti660_state ) AM_RANGE(0x0000, 0x03ff) AM_ROM AM_RANGE(0x0400, 0x0fff) AM_RAM + AM_RANGE(0x0c00, 0x0fff) AM_ROM ADDRESS_MAP_END static ADDRESS_MAP_START( eti660_io_map, AS_IO, 8, eti660_state ) @@ -131,7 +132,7 @@ WRITE_LINE_MEMBER( eti660_state::q_w ) WRITE8_MEMBER( eti660_state::dma_w ) { - UINT8 colorram_offset = ((offset & 0xf8) >> 1) || (offset & 0x03); + UINT8 colorram_offset = ((offset & 0xf8) >> 1) | (offset & 0x03); m_color = m_color_ram[colorram_offset]; @@ -265,4 +266,4 @@ ROM_START( eti660 ) ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ -COMP( 1981, eti660, 0, 0, eti660, eti660, driver_device, 0, "Electronics Today International", "ETI-660 (Australia)", GAME_NOT_WORKING ) +COMP( 1981, eti660, 0, 0, eti660, eti660, driver_device, 0, "Electronics Today International", "ETI-660", GAME_NOT_WORKING ) diff --git a/src/mess/drivers/tmc1800.c b/src/mess/drivers/tmc1800.c index 43ee6e238eb..f08431bd3b4 100644 --- a/src/mess/drivers/tmc1800.c +++ b/src/mess/drivers/tmc1800.c @@ -927,6 +927,6 @@ DRIVER_INIT_MEMBER(tmc1800_state,tmc1800) /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ COMP( 1977, tmc1800, 0, 0, tmc1800, tmc1800, tmc1800_state, tmc1800, "Telercas Oy", "Telmac 1800", GAME_NOT_WORKING ) -COMP( 1977, osc1000b, tmc1800,0, osc1000b, tmc1800, driver_device, 0, "OSCOM Oy", "OSCOM 1000B", GAME_NOT_WORKING ) -COMP( 1980, tmc2000, 0, 0, tmc2000, tmc2000, driver_device, 0, "Telercas Oy", "Telmac 2000", GAME_SUPPORTS_SAVE ) -COMP( 1980, nano, tmc2000,0, nano, nano, driver_device, 0, "OSCOM Oy", "OSCOM Nano", GAME_SUPPORTS_SAVE ) +COMP( 1977, osc1000b, tmc1800,0, osc1000b, tmc1800, driver_device, 0, "OSCOM Oy", "OSCOM 1000B", GAME_NOT_WORKING ) +COMP( 1980, tmc2000, 0, 0, tmc2000, tmc2000, driver_device, 0, "Telercas Oy", "Telmac 2000", GAME_SUPPORTS_SAVE ) +COMP( 1980, nano, tmc2000,0, nano, nano, driver_device, 0, "OSCOM Oy", "OSCOM Nano", GAME_WRONG_COLORS | GAME_SUPPORTS_SAVE ) diff --git a/src/mess/includes/eti660.h b/src/mess/includes/eti660.h index 35c54927fca..258494d8ed6 100644 --- a/src/mess/includes/eti660.h +++ b/src/mess/includes/eti660.h @@ -3,7 +3,6 @@ #ifndef __ETI660__ #define __ETI660__ - #include "emu.h" #include "cpu/cosmac/cosmac.h" #include "imagedev/cassette.h"