diff options
Diffstat (limited to 'src/mame/audio/dcs.c')
-rw-r--r-- | src/mame/audio/dcs.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c index 9d6df30c75d..dc9c4b47a48 100644 --- a/src/mame/audio/dcs.c +++ b/src/mame/audio/dcs.c @@ -431,14 +431,14 @@ static int preprocess_write(running_machine *machine, UINT16 data); *************************************/ /* DCS 2k memory map */ -static ADDRESS_MAP_START( dcs_2k_program_map, ADDRESS_SPACE_PROGRAM, 32 ) +static ADDRESS_MAP_START( dcs_2k_program_map, AS_PROGRAM, 32 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&dcs_internal_program_ram) AM_RANGE(0x0800, 0x0fff) AM_RAM AM_SHARE("share1") AM_BASE(&dcs_external_program_ram) AM_RANGE(0x1000, 0x17ff) AM_RAM AM_SHARE("share1") AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("share1") ADDRESS_MAP_END -static ADDRESS_MAP_START( dcs_2k_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( dcs_2k_data_map, AS_DATA, 16 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_READWRITE(dcs_dataram_r, dcs_dataram_w) AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("databank") AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w) @@ -449,7 +449,7 @@ ADDRESS_MAP_END /* DCS 2k with UART memory map */ -static ADDRESS_MAP_START( dcs_2k_uart_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( dcs_2k_uart_data_map, AS_DATA, 16 ) AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_READWRITE(dcs_dataram_r, dcs_dataram_w) AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("databank") AM_RANGE(0x3000, 0x33ff) AM_WRITE(dcs_data_bank_select_w) @@ -462,12 +462,12 @@ ADDRESS_MAP_END /* DCS 8k memory map */ -static ADDRESS_MAP_START( dcs_8k_program_map, ADDRESS_SPACE_PROGRAM, 32 ) +static ADDRESS_MAP_START( dcs_8k_program_map, AS_PROGRAM, 32 ) AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&dcs_internal_program_ram) AM_RANGE(0x0800, 0x1fff) AM_RAM AM_BASE(&dcs_external_program_ram) ADDRESS_MAP_END -static ADDRESS_MAP_START( dcs_8k_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( dcs_8k_data_map, AS_DATA, 16 ) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_RANGE(0x0800, 0x1fff) AM_READWRITE(dcs_dataram_r, dcs_dataram_w) AM_RANGE(0x2000, 0x2fff) AM_ROMBANK("databank") @@ -485,18 +485,18 @@ ADDRESS_MAP_END * *************************************/ -static ADDRESS_MAP_START( dcs2_2115_program_map, ADDRESS_SPACE_PROGRAM, 32 ) +static ADDRESS_MAP_START( dcs2_2115_program_map, AS_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&dcs_internal_program_ram) ADDRESS_MAP_END -static ADDRESS_MAP_START( dcs2_2104_program_map, ADDRESS_SPACE_PROGRAM, 32 ) +static ADDRESS_MAP_START( dcs2_2104_program_map, AS_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x01ff) AM_RAM AM_BASE(&dcs_internal_program_ram) ADDRESS_MAP_END -static ADDRESS_MAP_START( dcs2_2115_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( dcs2_2115_data_map, AS_DATA, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w) AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w) @@ -508,7 +508,7 @@ static ADDRESS_MAP_START( dcs2_2115_data_map, ADDRESS_SPACE_DATA, 16 ) AM_RANGE(0x3fe0, 0x3fff) AM_READWRITE(adsp_control_r, adsp_control_w) ADDRESS_MAP_END -static ADDRESS_MAP_START( dcs2_2104_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( dcs2_2104_data_map, AS_DATA, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w) AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w) @@ -528,13 +528,13 @@ ADDRESS_MAP_END * *************************************/ -static ADDRESS_MAP_START( dsio_program_map, ADDRESS_SPACE_PROGRAM, 32 ) +static ADDRESS_MAP_START( dsio_program_map, AS_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE(&dcs_internal_program_ram) ADDRESS_MAP_END -static ADDRESS_MAP_START( dsio_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( dsio_data_map, AS_DATA, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x03ff) AM_RAMBANK("databank") AM_RANGE(0x0400, 0x3fdf) AM_RAM @@ -542,7 +542,7 @@ static ADDRESS_MAP_START( dsio_data_map, ADDRESS_SPACE_DATA, 16 ) ADDRESS_MAP_END -static ADDRESS_MAP_START( dsio_io_map, ADDRESS_SPACE_IO, 16 ) +static ADDRESS_MAP_START( dsio_io_map, AS_IO, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w) AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w) @@ -560,13 +560,13 @@ ADDRESS_MAP_END * *************************************/ -static ADDRESS_MAP_START( denver_program_map, ADDRESS_SPACE_PROGRAM, 32 ) +static ADDRESS_MAP_START( denver_program_map, AS_PROGRAM, 32 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x3fff) AM_RAM AM_BASE(&dcs_internal_program_ram) ADDRESS_MAP_END -static ADDRESS_MAP_START( denver_data_map, ADDRESS_SPACE_DATA, 16 ) +static ADDRESS_MAP_START( denver_data_map, AS_DATA, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0000, 0x07ff) AM_RAMBANK("databank") AM_RANGE(0x0800, 0x3fdf) AM_RAM @@ -574,7 +574,7 @@ static ADDRESS_MAP_START( denver_data_map, ADDRESS_SPACE_DATA, 16 ) ADDRESS_MAP_END -static ADDRESS_MAP_START( denver_io_map, ADDRESS_SPACE_IO, 16 ) +static ADDRESS_MAP_START( denver_io_map, AS_IO, 16 ) ADDRESS_MAP_UNMAP_HIGH AM_RANGE(0x0400, 0x0400) AM_READWRITE(input_latch_r, input_latch_ack_w) AM_RANGE(0x0401, 0x0401) AM_WRITE(output_latch_w) @@ -2131,7 +2131,7 @@ static TIMER_CALLBACK( s1_ack_callback2 ) machine->scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback2), param); return; } - output_latch_w(dcs.cpu->memory().space(ADDRESS_SPACE_PROGRAM), 0, 0x000a, 0xffff); + output_latch_w(dcs.cpu->memory().space(AS_PROGRAM), 0, 0x000a, 0xffff); } @@ -2143,7 +2143,7 @@ static TIMER_CALLBACK( s1_ack_callback1 ) machine->scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback1), param); return; } - output_latch_w(dcs.cpu->memory().space(ADDRESS_SPACE_PROGRAM), 0, param, 0xffff); + output_latch_w(dcs.cpu->memory().space(AS_PROGRAM), 0, param, 0xffff); /* chain to the next word we need to write back */ machine->scheduler().timer_set(attotime::from_usec(1), FUNC(s1_ack_callback2)); @@ -2273,7 +2273,7 @@ static int preprocess_stage_1(running_machine *machine, UINT16 data) static TIMER_CALLBACK( s2_ack_callback ) { - address_space *space = dcs.cpu->memory().space(ADDRESS_SPACE_PROGRAM); + address_space *space = dcs.cpu->memory().space(AS_PROGRAM); /* if the output is full, stall for a usec */ if (IS_OUTPUT_FULL()) |