From 745a7974aa98b3ab047fd55a39cbb177e735e26a Mon Sep 17 00:00:00 2001 From: Jonathan Gevaryahu Date: Sun, 16 Jan 2011 04:53:17 +0000 Subject: [PATCH] More beezer changes, mostly documentation and preparing for new sound core. no whatsnew. --- src/mame/drivers/beezer.c | 5 ++++- src/mame/machine/beezer.c | 15 +++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/mame/drivers/beezer.c b/src/mame/drivers/beezer.c index 73b4a77a7b7..6557fb022d1 100644 --- a/src/mame/drivers/beezer.c +++ b/src/mame/drivers/beezer.c @@ -17,7 +17,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0xbfff) AM_RAM AM_BASE_MEMBER(beezer_state, videoram) AM_RANGE(0xc000, 0xcfff) AM_ROMBANK("bank1") - AM_RANGE(0xd000, 0xffff) AM_ROM AM_WRITE(beezer_bankswitch_w) + AM_RANGE(0xd000, 0xdfff) AM_ROM AM_WRITE(beezer_bankswitch_w) // ROM at G1, bankswitch + AM_RANGE(0xe000, 0xffff) AM_ROM // ROMS at G3, G5 ADDRESS_MAP_END static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 ) @@ -98,6 +99,8 @@ static MACHINE_CONFIG_START( beezer, beezer_state ) MCFG_SOUND_ADD("dac", DAC, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + //MCFG_SOUND_ADD("custom", BEEZER, 0) + //MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) /* via */ MCFG_VIA6522_ADD("via6522_0", 0, b_via_0_interface) diff --git a/src/mame/machine/beezer.c b/src/mame/machine/beezer.c index 1d433fe4b65..8a5d7a8b600 100644 --- a/src/mame/machine/beezer.c +++ b/src/mame/machine/beezer.c @@ -11,7 +11,6 @@ static READ8_DEVICE_HANDLER( b_via_0_pb_r ); static WRITE8_DEVICE_HANDLER( b_via_0_pa_w ); static WRITE8_DEVICE_HANDLER( b_via_0_pb_w ); static READ_LINE_DEVICE_HANDLER( b_via_0_ca2_r ); -static WRITE_LINE_DEVICE_HANDLER( b_via_0_ca2_w ); static READ8_DEVICE_HANDLER( b_via_1_pa_r ); static READ8_DEVICE_HANDLER( b_via_1_pb_r ); @@ -34,20 +33,20 @@ static WRITE8_DEVICE_HANDLER( b_via_1_pb_w ); bits 7-0: input/output: pbus port C: CA1: N/C - CA2: input? "TDISP" (not sure what this is) + CA2: input: "TDISP" (one of the higher bits in the video line counter, a mirror of the D5 bit from beezer_line_r), done in /video/beezer.c CB1: ASH1 to via 1 CB2: ASH2 to via 1 /IRQ: to main m6809 cpu /RES: from main reset generator/watchdog/button - TODO: figure out what TDISP is, may need to trace pcb + TODO: find a better way to attach ca2 read to beezer_line_r */ const via6522_interface b_via_0_interface = { /*inputs : A/B */ DEVCB_HANDLER(b_via_0_pa_r), DEVCB_HANDLER(b_via_0_pb_r), /*inputs : CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_DEVICE_LINE_MEMBER("via6522_1", via6522_device, read_ca2), DEVCB_LINE(b_via_0_ca2_r), DEVCB_DEVICE_LINE_MEMBER("via6522_1", via6522_device, read_ca1), /*outputs: A/B */ DEVCB_HANDLER(b_via_0_pa_w), DEVCB_HANDLER(b_via_0_pb_w), - /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_LINE(b_via_0_ca2_w), DEVCB_DEVICE_LINE_MEMBER("via6522_1", via6522_device, write_ca1), + /*outputs: CA/B1,CA/B2 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_DEVICE_LINE_MEMBER("via6522_1", via6522_device, write_ca1), /*irq */ DEVCB_CPU_INPUT_LINE("maincpu", M6809_IRQ_LINE) }; @@ -85,12 +84,8 @@ const via6522_interface b_via_1_interface = static READ_LINE_DEVICE_HANDLER( b_via_0_ca2_r ) { - return 0; // TODO: TDISP on schematic; what is this? -} + return 0; // TODO: TDISP on schematic, same as D5 bit of scanline count from 74LS161 counter at 7A -static WRITE_LINE_DEVICE_HANDLER( b_via_0_ca2_w ) -{ - // TODO: TDISP on schematic; what is this? } static READ8_DEVICE_HANDLER( b_via_0_pa_r ) @@ -124,7 +119,7 @@ static WRITE8_DEVICE_HANDLER( b_via_0_pa_w ) pbus = input_port_read(device->machine, "DSWB"); break; case 3: - pbus = 0xff; // Technically DSWA, however it isn't populated on the board and is pulled to 0xFF with resistor pack + pbus = input_port_read(device->machine, "DSWA"); // Technically DSWA isn't populated on the board and is pulled to 0xFF with resistor pack, but there IS a DSWA port in the driver so we may as well use it. break; } }