diff options
| author | 2012-12-17 07:22:20 +0000 | |
|---|---|---|
| committer | 2012-12-17 07:22:20 +0000 | |
| commit | 436d2f757f0c32573ea41013e8b10ca07ed6fc08 (patch) | |
| tree | 77fc28a1edb618f19ae38071ed1b7c3316d41f5e /src/mess | |
| parent | 449da4bc62a76ac132892d0f9e7e506fdf5eb586 (diff) | |
Cleanups and version bumpmame0147u4
Diffstat (limited to 'src/mess')
52 files changed, 831 insertions, 831 deletions
diff --git a/src/mess/drivers/a7000.c b/src/mess/drivers/a7000.c index 4db85ad1fe9..cf7701a0f94 100644 --- a/src/mess/drivers/a7000.c +++ b/src/mess/drivers/a7000.c @@ -829,7 +829,7 @@ ROM_START(a7000p) ROM_SYSTEM_BIOS( 2, "439", "RiscOS 4.39" ) ROMX_LOAD( "riscos439_1.bin", 0x000000, 0x200000, CRC(dab94cb8) SHA1(a81fb7f1a8117f85e82764675445092d769aa9af), ROM_GROUPWORD | ROM_SKIP(2) | ROM_BIOS(3)) ROMX_LOAD( "riscos439_2.bin", 0x000002, 0x200000, CRC(22e6a5d4) SHA1(b73b73c87824045130840a19ce16fa12e388c039), ROM_GROUPWORD | ROM_SKIP(2) | ROM_BIOS(3)) - ROM_REGION( 0x800000, "vram", ROMREGION_ERASE00 ) + ROM_REGION( 0x800000, "vram", ROMREGION_ERASE00 ) ROM_END /*************************************************************************** diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index 7d112e2a424..8c3159d9530 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -21,7 +21,7 @@ 2012/12/05 Robert Tuccitto Implemented proper IRE and phase value to the palette - 2012/12/14 Robert Tuccitto Adjusted colorburst/tint/hue of entire + 2012/12/14 Robert Tuccitto Adjusted colorburst/tint/hue of entire palette to closer reflect default hardware configuration setting of ~180 degrees. Palette settings now correspond documented and calculated settings as follows: diff --git a/src/mess/drivers/abc1600.c b/src/mess/drivers/abc1600.c index 99e76e59d19..62756cf7b73 100644 --- a/src/mess/drivers/abc1600.c +++ b/src/mess/drivers/abc1600.c @@ -1272,11 +1272,11 @@ WRITE8_MEMBER( abc1600_state::fw0_w ) // drive select floppy_image_device *floppy = NULL; - + if (BIT(data, 0)) floppy = m_floppy0->get_device(); if (BIT(data, 1)) floppy = m_floppy1->get_device(); if (BIT(data, 2)) floppy = m_floppy2->get_device(); - + m_fdc->set_floppy(floppy); // floppy motor @@ -1706,12 +1706,12 @@ static Z8536_INTERFACE( cio_intf ) //------------------------------------------------- /* static LEGACY_FLOPPY_OPTIONS_START( abc1600 ) - LEGACY_FLOPPY_OPTION(abc1600, "dsk", "Luxor ABC 1600", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([2]) - TRACKS([80]) - SECTORS([16]) - SECTOR_LENGTH([256]) - FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION(abc1600, "dsk", "Luxor ABC 1600", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([2]) + TRACKS([80]) + SECTORS([16]) + SECTOR_LENGTH([256]) + FIRST_SECTOR_ID([1])) LEGACY_FLOPPY_OPTIONS_END */ diff --git a/src/mess/drivers/amiga.c b/src/mess/drivers/amiga.c index 0db445ea759..fa3ae07c679 100644 --- a/src/mess/drivers/amiga.c +++ b/src/mess/drivers/amiga.c @@ -638,8 +638,8 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) MCFG_DEVICE_DISABLE() MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(59.997) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_REFRESH_RATE(59.997) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_MACHINE_RESET_OVERRIDE(amiga_state, amiga ) @@ -647,8 +647,8 @@ static MACHINE_CONFIG_START( ntsc, amiga_state ) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) -// MCFG_SCREEN_SIZE(228*4, 262) -// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1) +// MCFG_SCREEN_SIZE(228*4, 262) +// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1) MCFG_SCREEN_RAW_PARAMS(AMIGA_68000_NTSC_CLOCK*2,228*4,214,228*4,262,34,262) MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga) @@ -750,9 +750,9 @@ static MACHINE_CONFIG_DERIVED( pal, ntsc ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(AMIGA_68000_PAL_CLOCK*2,228*4,214,228*4,312,34,312) -// MCFG_SCREEN_REFRESH_RATE(50) -// MCFG_SCREEN_SIZE(228*4, 312) -// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1) +// MCFG_SCREEN_REFRESH_RATE(50) +// MCFG_SCREEN_SIZE(228*4, 312) +// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1) /* cia */ MCFG_DEVICE_REMOVE("cia_0") @@ -833,11 +833,11 @@ static MACHINE_CONFIG_START( a1200n, a1200_state ) /* TODO: params */ MCFG_SCREEN_ADD("screen", RASTER) -// MCFG_SCREEN_REFRESH_RATE(59.997) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) -// MCFG_SCREEN_SIZE(512*2, 312) -// MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1) -// MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8) +// MCFG_SCREEN_REFRESH_RATE(59.997) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) +// MCFG_SCREEN_SIZE(512*2, 312) +// MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1) +// MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8) MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_NTSC_CLOCK,228*4,214,228*4,262,34,262) MCFG_SCREEN_UPDATE_DRIVER(a1200_state, screen_update_amiga_aga) @@ -894,7 +894,7 @@ static MACHINE_CONFIG_DERIVED( a1200, a1200n ) /* video hardware */ /* TODO: params */ MCFG_SCREEN_MODIFY("screen") -// MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_PAL_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8) +// MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_PAL_CLOCK,512*2,(129-8-8)*2,(449+8-1+8)*2,312,44-8,300+8) MCFG_SCREEN_RAW_PARAMS(AMIGA_68EC020_PAL_CLOCK,228*4,214,228*4,312,34,312) /* sound hardware */ @@ -939,8 +939,8 @@ static MACHINE_CONFIG_START( a3000n, amiga_state ) /* video hardware */ MCFG_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK) MCFG_SCREEN_RAW_PARAMS(A3000_XTAL,228*4,214,228*4,262,34,262) -// MCFG_SCREEN_SIZE(228*4, 262) -// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1) +// MCFG_SCREEN_SIZE(228*4, 262) +// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1) MCFG_SCREEN_UPDATE_DRIVER(amiga_state, screen_update_amiga) MCFG_PALETTE_LENGTH(4096) @@ -982,9 +982,9 @@ static MACHINE_CONFIG_DERIVED( a3000, a3000n ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_RAW_PARAMS(A3000_XTAL,228*4,214,228*4,312,34,312) -// MCFG_SCREEN_REFRESH_RATE(50) -// MCFG_SCREEN_SIZE(228*4, 312) -// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1) +// MCFG_SCREEN_REFRESH_RATE(50) +// MCFG_SCREEN_SIZE(228*4, 312) +// MCFG_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1) /* cia */ MCFG_DEVICE_REMOVE("cia_0") diff --git a/src/mess/drivers/apc.c b/src/mess/drivers/apc.c index cd16908b46c..9d439a4c78b 100644 --- a/src/mess/drivers/apc.c +++ b/src/mess/drivers/apc.c @@ -114,8 +114,8 @@ public: DECLARE_WRITE8_MEMBER(apc_irq_ack_w); DECLARE_READ8_MEMBER(apc_rtc_r); DECLARE_WRITE8_MEMBER(apc_rtc_w); -// DECLARE_READ8_MEMBER(aux_pcg_r); -// DECLARE_WRITE8_MEMBER(aux_pcg_w); +// DECLARE_READ8_MEMBER(aux_pcg_r); +// DECLARE_WRITE8_MEMBER(aux_pcg_w); struct { UINT8 status; //status @@ -235,21 +235,21 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) continue; /* - Addr bus: C BA98 7654 3210 - | |||| |\\\ \\\\- character number bits 0-6 - | |||| \--------- y' bit 0 - | |||\----------- y' bit 1 - | ||\------------ y' bit 2 - | |\------------- y' bit 3 - | \-------------- character number bit 7 - \---------------- y' bit 4 - - y to y' (assumed; this needs hardware tests since there could be one more 'blank' line between all char rows): - y = 0 1 2 3 ... 16 17 18 - y' = 18 0 1 2 ... 15 16 17 - - Data bus: 76543210 = pixels, in left->01234567->right order - */ + Addr bus: C BA98 7654 3210 + | |||| |\\\ \\\\- character number bits 0-6 + | |||| \--------- y' bit 0 + | |||\----------- y' bit 1 + | ||\------------ y' bit 2 + | |\------------- y' bit 3 + | \-------------- character number bit 7 + \---------------- y' bit 4 + + y to y' (assumed; this needs hardware tests since there could be one more 'blank' line between all char rows): + y = 0 1 2 3 ... 16 17 18 + y' = 18 0 1 2 ... 15 16 17 + + Data bus: 76543210 = pixels, in left->01234567->right order + */ if(tile_sel == 0x89)// Aux character RAM select TODO: correct triggering? { if(yi & 0x10) @@ -464,9 +464,9 @@ RTC write bits: 76543210 static ADDRESS_MAP_START( apc_map, AS_PROGRAM, 16, apc_state ) AM_RANGE(0x00000, 0x9ffff) AM_RAM AM_RANGE(0xa0000, 0xa0fff) AM_RAM AM_SHARE("cmos") -// AM_RANGE(0xc0000, 0xcffff) standard character ROM +// AM_RANGE(0xc0000, 0xcffff) standard character ROM AM_RANGE(0xd8000, 0xd9fff) AM_RAM AM_REGION("aux_pcg", 0) // AUX character RAM -// AM_RANGE(0xe0000, 0xeffff) Special Character RAM +// AM_RANGE(0xe0000, 0xeffff) Special Character RAM AM_RANGE(0xfe000, 0xfffff) AM_ROM AM_REGION("ipl", 0) ADDRESS_MAP_END @@ -487,7 +487,7 @@ static ADDRESS_MAP_START( apc_io, AS_IO, 16, apc_state ) AM_RANGE(0x60, 0x61) AM_DEVREADWRITE8_LEGACY("upd1771c", upd1771_r, upd1771_w, 0x00ff ) // AM_RANGE(0x68, 0x6f) i8255 , printer port (A: status (R) B: data (W) C: command (W)) // AM_DEVREADWRITE8("upd7220_btm", upd7220_device, read, write, 0x00ff) -// 0x92, 0x9a, 0xa2, 0xaa is for a Hard Disk (unknown type) +// 0x92, 0x9a, 0xa2, 0xaa is for a Hard Disk (unknown type) ADDRESS_MAP_END /* TODO: key repeat, remove port impulse! */ @@ -561,7 +561,7 @@ static INPUT_PORTS_START( apc ) PORT_BIT(0x10,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("] / }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x5d) PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("(up score) / ^") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x5e) PORT_BIT(0x40,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("- / _") PORT_CODE(KEYCODE_MINUS) PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x5f) -// PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("unk6") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x26) +// PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("unk6") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x26) PORT_START("KEY6") PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("SPACE") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x20) @@ -579,46 +579,46 @@ static INPUT_PORTS_START( apc ) ; Special table for screwed-up keys. Scan codes are converted. ; SPECTBL: - BYTE 0X2D,0X3D - BYTE 0X40,0X60 - BYTE 0X3A,0X3B - BYTE 0X3B,0X27 -SPECTLN == (.-SPECTBL)/2 ; length of table + BYTE 0X2D,0X3D + BYTE 0X40,0X60 + BYTE 0X3A,0X3B + BYTE 0X3B,0X27 +SPECTLN == (.-SPECTBL)/2 ; length of table ; ; Shift case table ; CASETBL: - BYTE "1!" - BYTE "2@" - BYTE "3#" - BYTE "4$" - BYTE "5%" - BYTE "6",0XD0 - BYTE "7&" - BYTE "8*" - BYTE "9(" - BYTE "0)" - BYTE "-_" - BYTE "=+" - BYTE "`~" - BYTE "[{" - BYTE "]}" - BYTE "\\|" - BYTE ",<" - BYTE ".>" - BYTE "/?" - BYTE ";:" - BYTE 0X27,0X22 - BYTE 0X18,"^" + BYTE "1!" + BYTE "2@" + BYTE "3#" + BYTE "4$" + BYTE "5%" + BYTE "6",0XD0 + BYTE "7&" + BYTE "8*" + BYTE "9(" + BYTE "0)" + BYTE "-_" + BYTE "=+" + BYTE "`~" + BYTE "[{" + BYTE "]}" + BYTE "\\|" + BYTE ",<" + BYTE ".>" + BYTE "/?" + BYTE ";:" + BYTE 0X27,0X22 + BYTE 0X18,"^" */ /* - BYTE 0X18 ; 5E - Control-X - BYTE "-" ; 5F + BYTE 0X18 ; 5E - Control-X + BYTE "-" ; 5F */ /* - #REPEAT 0X96-0X80 ; 80 to 95 - function keys + #REPEAT 0X96-0X80 ; 80 to 95 - function keys */ PORT_START("KEY_PF1") PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("PF1") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x80) @@ -649,22 +649,22 @@ CASETBL: PORT_BIT(0x20,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("PF22") PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x95) /* - BYTE "*" ; 6A - BYTE "+" ; 6B - BYTE 0XFF ; 6C - undefined code - BYTE "-" ; 6D - BYTE "." ; 6E - BYTE "/" ; 6F - BYTE "0" ; 70 - BYTE "1" ; 71 - BYTE "2" ; 72 - BYTE "3" ; 73 - BYTE "4" ; 74 - BYTE "5" ; 75 - BYTE "6" ; 76 - BYTE "7" ; 77 - BYTE "8" ; 78 - BYTE "9" ; 79 + BYTE "*" ; 6A + BYTE "+" ; 6B + BYTE 0XFF ; 6C - undefined code + BYTE "-" ; 6D + BYTE "." ; 6E + BYTE "/" ; 6F + BYTE "0" ; 70 + BYTE "1" ; 71 + BYTE "2" ; 72 + BYTE "3" ; 73 + BYTE "4" ; 74 + BYTE "5" ; 75 + BYTE "6" ; 76 + BYTE "7" ; 77 + BYTE "8" ; 78 + BYTE "9" ; 79 */ PORT_START("KEY_PAD1") @@ -688,13 +688,13 @@ CASETBL: PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("9 (PAD)") PORT_CODE(KEYCODE_9_PAD) PORT_CHAR('9') PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x79) -/* BYTE 0X00 ; 96 - break stop - BYTE 0X0D ; 97 - return - BYTE 0X09 ; 98 - tab/back tab - BYTE 0XFF ; 99 - undefined code - BYTE 0X1E ; 9A - home/clear - BYTE 0XFF ; 9B - undefined code - BYTE 0X08 ; 9C - back space +/* BYTE 0X00 ; 96 - break stop + BYTE 0X0D ; 97 - return + BYTE 0X09 ; 98 - tab/back tab + BYTE 0XFF ; 99 - undefined code + BYTE 0X1E ; 9A - home/clear + BYTE 0XFF ; 9B - undefined code + BYTE 0X08 ; 9C - back space */ PORT_START("KEY_S1") PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("BREAK") PORT_CHAR(0x00) PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x96) @@ -707,13 +707,13 @@ CASETBL: PORT_BIT(0x80,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("ESC") PORT_CHAR(0x1b) PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0x1b) /* - BYTE 0X0B ; F7 - up arrow - BYTE 0X0A ; F8 - down arrow - BYTE 0X0C ; F9 - right arrow - BYTE 0X08 ; FA - left arrow - BYTE 0XFF (?) ; FB - ins - BYTE 0X7F ; FC - del - BYTE 0X0D ; FD - enter + BYTE 0X0B ; F7 - up arrow + BYTE 0X0A ; F8 - down arrow + BYTE 0X0C ; F9 - right arrow + BYTE 0X08 ; FA - left arrow + BYTE 0XFF (?) ; FB - ins + BYTE 0X7F ; FC - del + BYTE 0X0D ; FD - enter */ PORT_START("KEY_S2") PORT_BIT(0x01,IP_ACTIVE_HIGH,IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP) PORT_CHAR(0x0b) PORT_IMPULSE(1) PORT_CHANGED_MEMBER(DEVICE_SELF, apc_state, key_stroke, 0xf7) @@ -755,7 +755,7 @@ void apc_state::machine_start() m_fdc->setup_drq_cb(upd765a_device::line_cb(FUNC(apc_state::fdc_drq), this)); m_rtc->cs_w(1); -// m_rtc->oe_w(1); +// m_rtc->oe_w(1); } void apc_state::machine_reset() @@ -821,7 +821,7 @@ static GFXDECODE_START( apc ) GFXDECODE_ENTRY( "gfx", 0x0800, charset_8x16, 0, 128 ) GFXDECODE_ENTRY( "gfx", 0x1000, charset_8x16, 0, 128 ) GFXDECODE_ENTRY( "gfx", 0x1800, charset_8x16, 0, 128 ) -// GFXDECODE_ENTRY( "aux_pcg", 0x0000, charset_pcg, 0, 128 ) +// GFXDECODE_ENTRY( "aux_pcg", 0x0000, charset_pcg, 0, 128 ) GFXDECODE_END @@ -881,7 +881,7 @@ ir7 APU WRITE_LINE_MEMBER(apc_state::apc_master_set_int_line) { //printf("%02x\n",interrupt); -// printf("irq %d\n",state); +// printf("irq %d\n",state); machine().device("maincpu")->execute().set_input_line(0, state ? HOLD_LINE : CLEAR_LINE); } @@ -927,7 +927,7 @@ WRITE_LINE_MEMBER( apc_state::apc_tc_w ) /* floppy terminal count */ m_fdc->tc_w(state); -// printf("TC %02x\n",state); +// printf("TC %02x\n",state); } READ8_MEMBER(apc_state::apc_dma_read_byte) @@ -935,7 +935,7 @@ READ8_MEMBER(apc_state::apc_dma_read_byte) address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; -// printf("%08x\n",addr); +// printf("%08x\n",addr); return program.read_byte(addr); } diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index 33f1e0a795d..eb01ec2cb96 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -1092,16 +1092,16 @@ ROM_END ROM_START(am64) ROM_REGION(0x2000,"gfx1",0) - ROM_LOAD( "gm-2716.bin", 0x0000, 0x0800, CRC(863e657f) SHA1(cc954204c503bc545ec0d08862483aaad83805d5) ) + ROM_LOAD( "gm-2716.bin", 0x0000, 0x0800, CRC(863e657f) SHA1(cc954204c503bc545ec0d08862483aaad83805d5) ) ROM_REGION(0x4700,"maincpu",0) - ROM_LOAD( "am64-27128.bin", 0x0000, 0x4000, CRC(f25cdc7b) SHA1(235e72b77695938a9df8781f5bea3cbbbe1f4c76) ) + ROM_LOAD( "am64-27128.bin", 0x0000, 0x4000, CRC(f25cdc7b) SHA1(235e72b77695938a9df8781f5bea3cbbbe1f4c76) ) ROM_REGION(0x2000, "spares", 0) // parallel card ROM - ROM_LOAD( "ap-2716.bin", 0x0000, 0x0800, CRC(c6990f08) SHA1(e7daf63639234e46738a4d78a49287d11ccaf537) ) + ROM_LOAD( "ap-2716.bin", 0x0000, 0x0800, CRC(c6990f08) SHA1(e7daf63639234e46738a4d78a49287d11ccaf537) ) // i8048 keyboard MCU ROM - ROM_LOAD( "tk10.bin", 0x0800, 0x0800, CRC(a06c5b78) SHA1(27c5160b913e0f62120f384026d24b9f1acb6970) ) + ROM_LOAD( "tk10.bin", 0x0800, 0x0800, CRC(a06c5b78) SHA1(27c5160b913e0f62120f384026d24b9f1acb6970) ) ROM_END diff --git a/src/mess/drivers/dragon.c b/src/mess/drivers/dragon.c index f3b1b374981..91f42671748 100644 --- a/src/mess/drivers/dragon.c +++ b/src/mess/drivers/dragon.c @@ -243,7 +243,7 @@ ROM_END ROM_START(dragon200) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF ) - ROM_LOAD( "ic18.rom", 0x0000, 0x4000, CRC(84f68bf9) SHA1(1983b4fb398e3dd9668d424c666c5a0b3f1e2b69)) + ROM_LOAD( "ic18.rom", 0x0000, 0x4000, CRC(84f68bf9) SHA1(1983b4fb398e3dd9668d424c666c5a0b3f1e2b69)) ROM_LOAD( "ic17.rom", 0x8000, 0x4000, CRC(17893a42) SHA1(e3c8986bb1d44269c4587b04f1ca27a70b0aaa2e)) ROM_END diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c index a1d547ed07f..8e83ac7c54c 100644 --- a/src/mess/drivers/esq1.c +++ b/src/mess/drivers/esq1.c @@ -50,65 +50,65 @@ TODO: - Keyboard - Analog filters and VCA on the back end of the 5503 - SQ-80 support (additional banking, FDC) - -NOTES: - Commands from KPC are all 2 bytes - - first byte: command code, bit 7 is 1 = press, 0 = release - second byte is source: 00 = panel 01 = internal keyboard - - 04 SEQ - 05 CART A - 06 CART B - 07 INT - 08 1 / SEQ 1 - 09 2 / SEQ 2 - 0A 3 / SEQ 3 - 0B 4 / SONG - 0C COMPARE - 0D DATA UP - 0E DATA DOWN - 0F WRITE - 10 = UPPER 1 (buttons above display) - 11 = UPPER 2 - 12 = UPPER 3 - 13 = UPPER 4 - 14 = UPPER 5 - 15 = LOWER 1 (buttons below display) - 16 = LOWER 2 - 17 = LOWER 3 - 18 = LOWER 4 - 19 = LOWER 5 - 1a = LFO 1 - 1b = ENV 2 - 1c = MASTER - 1d = CREATE / ERASE - 1e = SELECT - 1f = RECORD - 20 = STORAGE - 21 = EDIT - 22 = MIX - 23 = STOP / CONT - 24 = MIDI - 25 = CONTROL - 26 = LOCATE - 27 = PLAY - 28 = OSC 1 - 29 = OSC 2 - 2A = OSC 3 - 2B = ENV 1 - 2C = DCA 1 - 2D = DCA 2 - 2E = DCA 3 - 2F = LFO 2 - 30 = LFO 3 - 31 = FILTER - 32 = ENV 4 - 33 = ENV 3 - 34 = DCA 4 - 35 = MODES - 36 = SPLIT / LAYER - + +NOTES: + Commands from KPC are all 2 bytes + + first byte: command code, bit 7 is 1 = press, 0 = release + second byte is source: 00 = panel 01 = internal keyboard + + 04 SEQ + 05 CART A + 06 CART B + 07 INT + 08 1 / SEQ 1 + 09 2 / SEQ 2 + 0A 3 / SEQ 3 + 0B 4 / SONG + 0C COMPARE + 0D DATA UP + 0E DATA DOWN + 0F WRITE + 10 = UPPER 1 (buttons above display) + 11 = UPPER 2 + 12 = UPPER 3 + 13 = UPPER 4 + 14 = UPPER 5 + 15 = LOWER 1 (buttons below display) + 16 = LOWER 2 + 17 = LOWER 3 + 18 = LOWER 4 + 19 = LOWER 5 + 1a = LFO 1 + 1b = ENV 2 + 1c = MASTER + 1d = CREATE / ERASE + 1e = SELECT + 1f = RECORD + 20 = STORAGE + 21 = EDIT + 22 = MIX + 23 = STOP / CONT + 24 = MIDI + 25 = CONTROL + 26 = LOCATE + 27 = PLAY + 28 = OSC 1 + 29 = OSC 2 + 2A = OSC 3 + 2B = ENV 1 + 2C = DCA 1 + 2D = DCA 2 + 2E = DCA 3 + 2F = LFO 2 + 30 = LFO 3 + 31 = FILTER + 32 = ENV 4 + 33 = ENV 3 + 34 = DCA 4 + 35 = MODES + 36 = SPLIT / LAYER + ***************************************************************************/ #include "emu.h" @@ -220,7 +220,7 @@ static ADDRESS_MAP_START( esq1_map, AS_PROGRAM, 8, esq1_state ) AM_RANGE(0x4000, 0x5fff) AM_RAM // SEQRAM AM_RANGE(0x6000, 0x63ff) AM_DEVREADWRITE("es5503", es5503_device, read, write) AM_RANGE(0x6400, 0x640f) AM_DEVREADWRITE_LEGACY("duart", duart68681_r, duart68681_w) - AM_RANGE(0x6800, 0x68ff) AM_NOP + AM_RANGE(0x6800, 0x68ff) AM_NOP AM_RANGE(0x7000, 0x7fff) AM_ROMBANK("osbank") AM_RANGE(0x8000, 0xffff) AM_ROM AM_REGION("osrom", 0x8000) // OS "high" ROM is always mapped here diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index dd5393e9c9c..0d829c37860 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -28,21 +28,21 @@ 5505 interrupts are on normal autovector IRQ 1 VFX / VFX-SD / SD-1 / SD-1 32 panel button codes: - 2 = PROGRAM CONTROL - 3 = WRITE - 4 = WAVE - 5 = SELECT VOICE - 6 = MIXER/SHAPER + 2 = PROGRAM CONTROL + 3 = WRITE + 4 = WAVE + 5 = SELECT VOICE + 6 = MIXER/SHAPER 7 = EFFECT 8 = COMPARE - 9 = COPY EFFECTS PARAMETERS - 10 = LFO - 11 = PITCH - 12 = ENV1 - 13 = PITCH MOD - 14 = ENV2 - 15 = FILTER - 16 = ENV3 + 9 = COPY EFFECTS PARAMETERS + 10 = LFO + 11 = PITCH + 12 = ENV1 + 13 = PITCH MOD + 14 = ENV2 + 15 = FILTER + 16 = ENV3 17 = OUTPUT 18 = ERROR 20 (VFX) / SEQ. CONTROL 19 = ? @@ -50,23 +50,23 @@ 21 = STORAGE 22 = ERROR 129 (VFX-SD w/Seq. loaded) 23 = ERROR 129 (VFX-SD w/Seq. loaded) - 24 = MIDI - 25 = BUTTON 9 - 26 = PSEL - 27 = STAT - 28 = EFFECT - 29 = SEQ? (toggles INT0 / TRAX display) - 30 = TRACKS 1-6 + 24 = MIDI + 25 = BUTTON 9 + 26 = PSEL + 27 = STAT + 28 = EFFECT + 29 = SEQ? (toggles INT0 / TRAX display) + 30 = TRACKS 1-6 31 = TRACKS 7-12 32 = ERROR 20 (VFX) / CLICK-REC 33 = ERROR 20 (VFX) / LOCATE - 34 = BUTTON 8 - 35 = BUTTON 7 - 36 = VOLUME - 37 = PAN - 38 = TIMBRE - 39 = KEY ZONE - 40 = TRANSPOSE + 34 = BUTTON 8 + 35 = BUTTON 7 + 36 = VOLUME + 37 = PAN + 38 = TIMBRE + 39 = KEY ZONE + 40 = TRANSPOSE 41 = RELEASE 42 = SOFT TOP CENTER 43 = SOFT TOP RIGHT @@ -90,7 +90,7 @@ 61 = ERROR 20 (VFX) / EDIT TRACK 62 = DATA INCREMENT 63 = DATA DECREMENT - + ***************************************************************************/ #include "emu.h" @@ -165,7 +165,7 @@ private: UINT32 es5510_gpr_latch; UINT8 es5510_ram_sel; - UINT16 *m_rom, *m_ram; + UINT16 *m_rom, *m_ram; public: DECLARE_DRIVER_INIT(eps); @@ -193,7 +193,7 @@ void esq5505_state::machine_reset() READ16_MEMBER(esq5505_state::es5510_dsp_r) { -// printf("%06x: DSP read offset %04x (data is %04x)\n",space.device().safe_pc(),offset,es5510_dsp_ram[offset]); +// printf("%06x: DSP read offset %04x (data is %04x)\n",space.device().safe_pc(),offset,es5510_dsp_ram[offset]); // VFX hack if (mame_stricmp(space.machine().system().name, "vfx") == 0) @@ -447,7 +447,7 @@ static UINT8 duart_input(device_t *device) if (floppy) { // ready_r returns true if the drive is *not* ready, false if it is -// if (!floppy->ready_r()) +// if (!floppy->ready_r()) { result |= 1; } @@ -465,22 +465,22 @@ static void duart_output(device_t *device, UINT8 data) state->m_duart_io = data; - /* - EPS: - bit 2 = SSEL - - VFX: - bits 0/1/2 = analog sel - bit 6 = ESPHALT - bit 7 = SACK (?) - - VFX-SD & SD-1 (32): - bits 0/1/2 = analog sel - bit 3 = SSEL (disk side) - bit 4 = DSEL (drive select?) - bit 6 = ESPHALT - bit 7 = SACK (?) - */ + /* + EPS: + bit 2 = SSEL + + VFX: + bits 0/1/2 = analog sel + bit 6 = ESPHALT + bit 7 = SACK (?) + + VFX-SD & SD-1 (32): + bits 0/1/2 = analog sel + bit 3 = SSEL (disk side) + bit 4 = DSEL (drive select?) + bit 6 = ESPHALT + bit 7 = SACK (?) + */ if (floppy) { @@ -830,11 +830,11 @@ ROM_START( vfx ) ROM_LOAD16_BYTE( "vfx210b-high.bin", 0x000001, 0x010000, CRC(59853be8) SHA1(8e07f69d53f80885d15f624e0b912aeaf3212ee4) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) - ROM_LOAD16_BYTE( "u14.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) - ROM_LOAD16_BYTE( "u15.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) + ROM_LOAD16_BYTE( "u14.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) + ROM_LOAD16_BYTE( "u15.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) ROM_REGION(0x80000, "nibbles", ROMREGION_ERASE00) - ROM_LOAD( "u16.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) + ROM_LOAD( "u16.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) ROM_END ROM_START( vfxsd ) @@ -843,13 +843,13 @@ ROM_START( vfxsd ) ROM_LOAD16_BYTE( "vfxsd_200_upper.bin", 0x000001, 0x010000, CRC(9a40efa2) SHA1(e38a2a4514519c1573361cb1526139bfcf94e45a) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) - ROM_LOAD16_BYTE( "u57.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) - ROM_LOAD16_BYTE( "u58.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) + ROM_LOAD16_BYTE( "u57.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) + ROM_LOAD16_BYTE( "u58.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) ROM_REGION(0x200000, "waverom2", ROMREGION_ERASE00) ROM_REGION(0x80000, "nibbles", 0) - ROM_LOAD( "u60.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) + ROM_LOAD( "u60.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) ROM_END ROM_START( sd1 ) @@ -858,15 +858,15 @@ ROM_START( sd1 ) ROM_LOAD16_BYTE( "sd1_410_hi.bin", 0x000001, 0x010000, CRC(618c0aa8) SHA1(74acf458aa1d04a0a7a0cd5855c49e6855dbd301) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) // BS=0 region (12-bit) - ROM_LOAD16_BYTE( "u34.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) - ROM_LOAD16_BYTE( "u35.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) + ROM_LOAD16_BYTE( "u34.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) + ROM_LOAD16_BYTE( "u35.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) ROM_REGION(0x200000, "waverom2", ROMREGION_ERASE00) // BS=1 region (16-bit) - ROM_LOAD16_WORD_SWAP( "u38.bin", 0x000000, 0x100000, CRC(a904190e) SHA1(e4fd4e1130906086fb4182dcb8b51269969e2836) ) - ROM_LOAD16_WORD_SWAP( "u37.bin", 0x100000, 0x100000, CRC(d706cef3) SHA1(24ba35248509e9ca45110e2402b8085006ea0cfc) ) + ROM_LOAD16_WORD_SWAP( "u38.bin", 0x000000, 0x100000, CRC(a904190e) SHA1(e4fd4e1130906086fb4182dcb8b51269969e2836) ) + ROM_LOAD16_WORD_SWAP( "u37.bin", 0x100000, 0x100000, CRC(d706cef3) SHA1(24ba35248509e9ca45110e2402b8085006ea0cfc) ) ROM_REGION(0x80000, "nibbles", 0) - ROM_LOAD( "u36.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) + ROM_LOAD( "u36.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) ROM_END ROM_START( sd132 ) @@ -875,15 +875,15 @@ ROM_START( sd132 ) ROM_LOAD16_BYTE( "sd1_32_402_hi.bin", 0x000001, 0x010000, CRC(fc45c210) SHA1(23b81ebd9176112e6eae0c7c75b39fcb1656c953) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) // BS=0 region (12-bit) - ROM_LOAD16_BYTE( "u34.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) - ROM_LOAD16_BYTE( "u35.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) + ROM_LOAD16_BYTE( "u34.bin", 0x000001, 0x080000, CRC(85592299) SHA1(1aa7cf612f91972baeba15991d9686ccde01599c) ) + ROM_LOAD16_BYTE( "u35.bin", 0x100001, 0x080000, CRC(c0055975) SHA1(5a22f1d5e437c6277eb0cfb1ff1b3f8dcdea1cc6) ) ROM_REGION(0x200000, "waverom2", ROMREGION_ERASE00) // BS=1 region (16-bit) - ROM_LOAD16_WORD_SWAP( "u38.bin", 0x000000, 0x100000, CRC(a904190e) SHA1(e4fd4e1130906086fb4182dcb8b51269969e2836) ) - ROM_LOAD16_WORD_SWAP( "u37.bin", 0x100000, 0x100000, CRC(d706cef3) SHA1(24ba35248509e9ca45110e2402b8085006ea0cfc) ) + ROM_LOAD16_WORD_SWAP( "u38.bin", 0x000000, 0x100000, CRC(a904190e) SHA1(e4fd4e1130906086fb4182dcb8b51269969e2836) ) + ROM_LOAD16_WORD_SWAP( "u37.bin", 0x100000, 0x100000, CRC(d706cef3) SHA1(24ba35248509e9ca45110e2402b8085006ea0cfc) ) ROM_REGION(0x80000, "nibbles", ROMREGION_ERASE00) - ROM_LOAD( "u36.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) + ROM_LOAD( "u36.bin", 0x000000, 0x080000, CRC(c3ddaf95) SHA1(44a7bd89cd7e82952cc5100479e110c385246559) ) ROM_END diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c index 1dbb9b7bf64..54c2cc4514e 100644 --- a/src/mess/drivers/esqkt.c +++ b/src/mess/drivers/esqkt.c @@ -3,22 +3,22 @@ esqkt.c - Ensoniq KT-76, KT-88, and E-Prime Driver by R. Belmont - + Hardware: - CPU: 68EC020-16 CPU - Serial/timers: SCN2681 (MC68681 clone) - Sound: 2xES5506 - Effects: ES5510 + CPU: 68EC020-16 CPU + Serial/timers: SCN2681 (MC68681 clone) + Sound: 2xES5506 + Effects: ES5510 Memory map: - - 0x000000-0x07FFFF OS ROM - 0x200000-0x20003F Master ES5506 - 0x240000-0x24003F Slave ES5506 - 0x280000-0x2801FF ES5510 - 0x300000-0x30000F 68681 DUART - 0xFF0000-0xFFFFFF OS RAM - + + 0x000000-0x07FFFF OS ROM + 0x200000-0x20003F Master ES5506 + 0x240000-0x24003F Slave ES5506 + 0x280000-0x2801FF ES5510 + 0x300000-0x30000F 68681 DUART + 0xFF0000-0xFFFFFF OS RAM + ***************************************************************************/ #include "emu.h" @@ -75,7 +75,7 @@ private: UINT32 es5510_gpr_latch; UINT8 es5510_ram_sel; - UINT32 *m_rom, *m_ram; + UINT32 *m_rom, *m_ram; public: DECLARE_DRIVER_INIT(kt); @@ -84,18 +84,18 @@ public: void esqkt_state::machine_reset() { -// m_rom = (UINT32 *)machine().root_device().memregion("osrom")->base(); -// m_ram = (UINT32 *)machine().root_device().memshare("osram")->ptr(); +// m_rom = (UINT32 *)machine().root_device().memregion("osrom")->base(); +// m_ram = (UINT32 *)machine().root_device().memshare("osram")->ptr(); -// memcpy(m_ram, m_rom, 8); -// m_maincpu->reset(); +// memcpy(m_ram, m_rom, 8); +// m_maincpu->reset(); m_bCalibSecondByte = false; } READ16_MEMBER(esqkt_state::es5510_dsp_r) { -// printf("%06x: DSP read offset %04x (data is %04x)\n",space.device().safe_pc(),offset,es5510_dsp_ram[offset]); +// printf("%06x: DSP read offset %04x (data is %04x)\n",space.device().safe_pc(),offset,es5510_dsp_ram[offset]); switch(offset) { @@ -523,8 +523,8 @@ INPUT_PORTS_END ROM_START( kt76 ) ROM_REGION(0x80000, "osrom", 0) - ROM_LOAD32_WORD( "kt76_162_lo.bin", 0x000000, 0x020000, CRC(1a1ab910) SHA1(dcc80db2297fd25993e090c2e5bb7f947319a8bf) ) - ROM_LOAD32_WORD( "kt76_162_hi.bin", 0x000002, 0x040000, CRC(de16d236) SHA1(c55fca86453e90e8c34a048bed45817063237370) ) + ROM_LOAD32_WORD( "kt76_162_lo.bin", 0x000000, 0x020000, CRC(1a1ab910) SHA1(dcc80db2297fd25993e090c2e5bb7f947319a8bf) ) + ROM_LOAD32_WORD( "kt76_162_hi.bin", 0x000002, 0x040000, CRC(de16d236) SHA1(c55fca86453e90e8c34a048bed45817063237370) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) ROM_REGION(0x200000, "waverom2", ROMREGION_ERASE00) diff --git a/src/mess/drivers/esqmr.c b/src/mess/drivers/esqmr.c index 2484594c06b..d8b173b10bf 100644 --- a/src/mess/drivers/esqmr.c +++ b/src/mess/drivers/esqmr.c @@ -3,16 +3,16 @@ esqmr.c - Ensoniq MR-61, MR-76, and MR-Rack Skeleton driver by R. Belmont - + Hardware: - CPU: 68340 MCU - Sound: 2xES5506 - Effects: ES5511 + CPU: 68340 MCU + Sound: 2xES5506 + Effects: ES5511 Memory map: - - 0x000000-0x0FFFFF OS ROM - + + 0x000000-0x0FFFFF OS ROM + ***************************************************************************/ #include "emu.h" @@ -45,8 +45,8 @@ void esqmr_state::machine_reset() static ADDRESS_MAP_START( mr_map, AS_PROGRAM, 32, esqmr_state ) AM_RANGE(0x00000000, 0x000fffff) AM_ROM AM_REGION("maincpu", 0) -// AM_RANGE(0x200000, 0x20003f) AM_DEVREADWRITE8_LEGACY("ensoniq", es5506_r, es5506_w, 0xffffffff) -// AM_RANGE(0x240000, 0x24003f) AM_DEVREADWRITE8_LEGACY("ensoniq2", es5506_r, es5506_w, 0xffffffff) +// AM_RANGE(0x200000, 0x20003f) AM_DEVREADWRITE8_LEGACY("ensoniq", es5506_r, es5506_w, 0xffffffff) +// AM_RANGE(0x240000, 0x24003f) AM_DEVREADWRITE8_LEGACY("ensoniq2", es5506_r, es5506_w, 0xffffffff) // AM_RANGE(0xff0000, 0xffffff) AM_RAM AM_SHARE("osram") ADDRESS_MAP_END @@ -101,8 +101,8 @@ INPUT_PORTS_END ROM_START( mrrack ) ROM_REGION(0x100000, "maincpu", 0) - ROM_LOAD16_BYTE( "mr-rack-150-lo.bin", 0x000001, 0x080000, CRC(b29988a1) SHA1(986c2def11de27fa2b9be55ac32f7fec0c414bca) ) - ROM_LOAD16_BYTE( "mr-rack-150-up.bin", 0x000000, 0x080000, CRC(71511692) SHA1(54744f16f1db1ac5abb2f70b6e04aebf1e0e029d) ) + ROM_LOAD16_BYTE( "mr-rack-150-lo.bin", 0x000001, 0x080000, CRC(b29988a1) SHA1(986c2def11de27fa2b9be55ac32f7fec0c414bca) ) + ROM_LOAD16_BYTE( "mr-rack-150-up.bin", 0x000000, 0x080000, CRC(71511692) SHA1(54744f16f1db1ac5abb2f70b6e04aebf1e0e029d) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) ROM_REGION(0x200000, "waverom2", ROMREGION_ERASE00) diff --git a/src/mess/drivers/geniusiq.c b/src/mess/drivers/geniusiq.c index a39dcd12e2d..b2aba5311d6 100644 --- a/src/mess/drivers/geniusiq.c +++ b/src/mess/drivers/geniusiq.c @@ -405,13 +405,13 @@ WRITE16_MEMBER(geniusiq_state::gfx_idx_w) READ16_MEMBER( geniusiq_state::input_r ) { /* - this is guesswork and may not be correct + this is guesswork and may not be correct - xxxx xxx- ---- ---- unknown - ---- ---x ---- ---- used for indicate if the data read is valid (if not set the other bits are discarded) - ---- ---- x--- ---- if set indicates a KeyUp otherwise a KeyDown - ---- ---- -xxx xxxx this is the scan code - */ + xxxx xxx- ---- ---- unknown + ---- ---x ---- ---- used for indicate if the data read is valid (if not set the other bits are discarded) + ---- ---- x--- ---- if set indicates a KeyUp otherwise a KeyDown + ---- ---- -xxx xxxx this is the scan code + */ UINT16 data = 0; diff --git a/src/mess/drivers/m20.c b/src/mess/drivers/m20.c index 0774dbe66b6..a75e171fab2 100644 --- a/src/mess/drivers/m20.c +++ b/src/mess/drivers/m20.c @@ -475,7 +475,7 @@ void m20_state::machine_start() void m20_state::machine_reset() { UINT8 *ROM = machine().root_device().memregion("maincpu")->base(); - // UINT8 *RAM = (UINT8 *)machine().root_device().memshare("mainram")->ptr(); + // UINT8 *RAM = (UINT8 *)machine().root_device().memshare("mainram")->ptr(); UINT8 *RAM = (UINT8 *)machine().root_device().memshare("dram0_4000")->ptr(); //ROM += 0x10000; // don't know why they load at an offset, but let's go with it diff --git a/src/mess/drivers/mikromik.c b/src/mess/drivers/mikromik.c index 7aa8e45f912..f82c123fb01 100644 --- a/src/mess/drivers/mikromik.c +++ b/src/mess/drivers/mikromik.c @@ -686,7 +686,7 @@ FLOPPY_FORMATS_MEMBER( mm1_state::floppy_formats ) FLOPPY_FORMATS_END /* FLOPPY_FORMATS_MEMBER( mm2_state::floppy_formats ) - FLOPPY_MM2_FORMAT + FLOPPY_MM2_FORMAT FLOPPY_FORMATS_END */ static SLOT_INTERFACE_START( mm1_floppies ) diff --git a/src/mess/drivers/mirage.c b/src/mess/drivers/mirage.c index 891bf03b487..c41c1789952 100644 --- a/src/mess/drivers/mirage.c +++ b/src/mess/drivers/mirage.c @@ -17,27 +17,27 @@ e800-e803: WD1770 FDC ec00-ecef: ES5503 "DOC" sound chip f000-ffff: boot ROM - + NMI: IRQ from WD1772 IRQ: DRQ from WD1772 wire-ORed with IRQ from ES5503 wire-ORed with IRQ from VIA6522 FIRQ: IRQ from 6850 UART - + LED / switch matrix: - - A B C D E F G DP + + A B C D E F G DP ROW 0: LOAD UPPER LOAD LOWER SAMPLE UPPER PLAY SEQ LOAD SEQ SAVE SEQ REC SEQ SAMPLE LOWER ROW 1: 3 6 9 5 8 0 2 Enter ROW 2: 1 4 7 up arrow PARAM dn arrow VALUE CANCEL L. AN: SEG A SEG B SEG C SEG D SEG E SEG F SEG G SEG DP (decimal point) R. AN: SEG A SEG B SEG C SEG D SEG E SEG F SEG G SEG DP - + Column number in VIA port A bits 0-2 is converted to discrete lines by a 74LS145. Port A bit 3 is right anode, bit 4 is left anode ROW 0 is read on VIA port A bit 5, ROW 1 in port A bit 6, and ROW 2 in port A bit 7. - + Keyboard models talk to the R6500 through the VIA shifter: CA2 is handshake, CB1 is shift clock, CB2 is shift data. This is unconnected on the rackmount version. - + ***************************************************************************/ @@ -162,7 +162,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_porta) 16, 8, 32, 2, 1, 64, 128, 4 }; -// printf("PA: %02x (PC=%x)\n", data, m_maincpu->pc()); +// printf("PA: %02x (PC=%x)\n", data, m_maincpu->pc()); // left LED selected? if ((data & 0x10) == 0x10) @@ -180,7 +180,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_porta) m_l_hi = seg; output_set_digit_value(0, m_l_segs); -// printf("L LED: seg %d (hi %d conv %02x, %02x)\n", seg, m_l_hi, segconv[seg], m_l_segs); +// printf("L LED: seg %d (hi %d conv %02x, %02x)\n", seg, m_l_hi, segconv[seg], m_l_segs); } // right LED selected? if ((data & 0x08) == 0x08) @@ -198,7 +198,7 @@ WRITE8_MEMBER(mirage_state::mirage_via_write_porta) m_r_hi = seg; output_set_digit_value(1, m_r_segs); -// printf("R LED: seg %d (hi %d conv %02x, %02x)\n", seg, m_r_hi, segconv[seg], m_r_segs); +// printf("R LED: seg %d (hi %d conv %02x, %02x)\n", seg, m_r_hi, segconv[seg], m_r_segs); } } diff --git a/src/mess/drivers/modellot.c b/src/mess/drivers/modellot.c index 8b379c71e9c..9005a32bdb6 100644 --- a/src/mess/drivers/modellot.c +++ b/src/mess/drivers/modellot.c @@ -1,5 +1,5 @@ /*************************************************************************** - + General Processor Modello T 10/12/2012 Skeleton driver. @@ -22,9 +22,9 @@ public: required_device<cpu_device> m_maincpu; required_shared_ptr<UINT8> m_video_ram; UINT32 screen_update_modellot(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - + virtual void machine_reset(); - + DECLARE_READ8_MEMBER(modellot_77); DECLARE_READ8_MEMBER(modellot_ff); }; @@ -70,7 +70,7 @@ const gfx_layout modellot_charlayout = 1, /* 1 bits per pixel */ {0}, /* no bitplanes; 1 bit per pixel */ {0,1,2,3,4,5,6,7}, - {0, 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8, + {0, 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8, 0x400*8, 0x401*8, 0x402*8, 0x403*8, 0x404*8, 0x405*8, 0x406*8, 0x407*8}, 8*8 /* space between characters */ }; @@ -99,8 +99,8 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu",Z80, XTAL_4MHz) MCFG_CPU_PROGRAM_MAP(modellot_mem) - MCFG_CPU_IO_MAP(modellot_io) - + MCFG_CPU_IO_MAP(modellot_io) + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(50) @@ -108,7 +108,7 @@ static MACHINE_CONFIG_START( modellot, modellot_state ) MCFG_SCREEN_SIZE(64*8, 16*16) MCFG_SCREEN_VISIBLE_AREA(0, 64*8-1, 0, 16*16-1) MCFG_SCREEN_UPDATE_DRIVER(modellot_state, screen_update_modellot) - + MCFG_GFXDECODE( modellot ) MCFG_PALETTE_LENGTH(2) diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c index 4aeb9d09f06..615d98d3b6c 100644 --- a/src/mess/drivers/ng_aes.c +++ b/src/mess/drivers/ng_aes.c @@ -21,7 +21,7 @@ Current status: - Cartridges run. - - Riding Hero runs in slow-mo (probably related to comms HW / IO port handling) + - Riding Hero runs in slow-mo (probably related to comms HW / IO port handling) ToDo : - Change input code to allow selection of the mahjong panel in PORT_CATEGORY. @@ -30,22 +30,22 @@ Neo-Geo CD hardware - Thanks to: - * The FBA team (Barry Harris) for much of the CDC / CDD code and system details. - ( http://www.barryharris.me.uk/ ) - * Mirko Buffoni for a commented disassembly of the NeoCD bios rom. + Thanks to: + * The FBA team (Barry Harris) for much of the CDC / CDD code and system details. + ( http://www.barryharris.me.uk/ ) + * Mirko Buffoni for a commented disassembly of the NeoCD bios rom. Current status: - - NeoCDZ runs, the original NeoCD does not - - Might think the tray is open? (check) - - Some unknown / unhandled CD commands, code is still a bit messy - - CDDA continues to play during loading, should stop it - - Games using Raster Effects are broken without a kludge - - CPU gets overloaded with IRQs from the timer callback... - - Double Dragon doesn't load, it erases the IRQ table - - might need better handling of the Vector Table Mapping, or better interrupts (see point above) - - Softlist are based on an old Tosec set and should be updated to the TruRip set once we can convert CCD - without throwing away gap data etc. + - NeoCDZ runs, the original NeoCD does not + - Might think the tray is open? (check) + - Some unknown / unhandled CD commands, code is still a bit messy + - CDDA continues to play during loading, should stop it + - Games using Raster Effects are broken without a kludge + - CPU gets overloaded with IRQs from the timer callback... + - Double Dragon doesn't load, it erases the IRQ table + - might need better handling of the Vector Table Mapping, or better interrupts (see point above) + - Softlist are based on an old Tosec set and should be updated to the TruRip set once we can convert CCD + without throwing away gap data etc. ****************************************************************************/ @@ -114,7 +114,7 @@ public: } optional_device<lc89510_temp_device> m_tempcdc; - + void NeoCDDoDMA(address_space& curr_space); @@ -163,7 +163,7 @@ public: void set_nNeoCDIRQVectorAck(int val) { nNeoCDIRQVectorAck = val; } int get_nNeoCDIRQVector(void) { return nNeoCDIRQVector; } void NeoCDIRQUpdate(UINT8 byteValue); - + // from the CDC void interrupt_callback_type1(void); void interrupt_callback_type2(void); @@ -482,8 +482,8 @@ WRITE16_MEMBER(ng_aes_state::neocd_control_w) if (data==0x00) { // not a good idea, causes hangs - // m_tempcdc->NeoCDCommsReset(); - + // m_tempcdc->NeoCDCommsReset(); + // I doubt this is correct either, but we need something to stop // the interrupts during gameplay and I'm not sure what... prohibit_cdc_irq = true; @@ -496,7 +496,7 @@ WRITE16_MEMBER(ng_aes_state::neocd_control_w) break; } case 0x0182: { - // printf("blah %02x\n", byteValue); + // printf("blah %02x\n", byteValue); if (byteValue == 0x00) { machine().device("ymsnd")->reset(); @@ -598,7 +598,7 @@ WRITE8_MEMBER(ng_aes_state::neocd_transfer_w) } else { - // printf("sekAddress %08x %02x\n", sekAddress, data); + // printf("sekAddress %08x %02x\n", sekAddress, data); if ((sekAddress & 0xfffff) >= 0x20000) break; NeoZ80ROMActive[(sekAddress & 0x1FFFF) >> 1] = byteValue; } @@ -1526,7 +1526,7 @@ INPUT_PORTS_END static MACHINE_CONFIG_DERIVED_CLASS( aes, neogeo_base, ng_aes_state ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(aes_main_map) // some different input handling, probably also responsible for Riding Hero not running properly - + MCFG_MEMCARD_HANDLER(neogeo_aes) MCFG_MACHINE_START_OVERRIDE(ng_aes_state, neogeo) diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 4fa5bf9928a..5941916e3e8 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -2252,7 +2252,7 @@ ROM_START( sx16 ) ROM_REGION(0x100000,"maincpu", 0) ROM_LOAD( "tmm27128ad.bin",0xfc000, 0x4000, CRC(f8543362) SHA1(fef625e260ca89ba02174584bdc12db609f0780e)) /* IBM 1501981(CGA) and 1501985(MDA) Character rom */ - ROM_REGION(0x2000,"gfx1", 0) + ROM_REGION(0x2000,"gfx1", 0) ROM_LOAD("5788005.u33", 0x00000, 0x2000, CRC(0bf56d70) SHA1(c2a8b10808bf51a3c123ba3eb1e9dd608231916f)) /* "AMI 8412PI // 5788005 // (C) IBM CORP. 1981 // KOREA" */ ROM_END diff --git a/src/mess/drivers/pc88va.c b/src/mess/drivers/pc88va.c index e02e50588da..ee99c2a43ff 100644 --- a/src/mess/drivers/pc88va.c +++ b/src/mess/drivers/pc88va.c @@ -17,8 +17,8 @@ hooked up by the current z80 core - PC-88VA stock version has two bogus opcodes. One is at 0xf0b15, another at 0xf0b31. Making a patch for the latter makes the system to jump into a "DIP-Switch" display. - - unemulated upd71071 demand mode. - - Fix floppy motor hook-up; + - unemulated upd71071 demand mode. + - Fix floppy motor hook-up; ********************************************************************************************/ @@ -137,13 +137,13 @@ public: DECLARE_WRITE_LINE_MEMBER(pc88va_pic_irq); DECLARE_READ8_MEMBER(get_slave_ack); DECLARE_WRITE_LINE_MEMBER(pc88va_pit_out0_changed); -// DECLARE_WRITE_LINE_MEMBER(pc88va_upd765_interrupt); +// DECLARE_WRITE_LINE_MEMBER(pc88va_upd765_interrupt); UINT8 m_fdc_ctrl_2; TIMER_CALLBACK_MEMBER(pc88va_fdc_timer); TIMER_CALLBACK_MEMBER(pc88va_fdc_motor_start_0); TIMER_CALLBACK_MEMBER(pc88va_fdc_motor_start_1); -// UINT16 m_fdc_dma_r(running_machine &machine); -// void m_fdc_dma_w(running_machine &machine, UINT16 data); +// UINT16 m_fdc_dma_r(running_machine &machine); +// void m_fdc_dma_w(running_machine &machine, UINT16 data); DECLARE_WRITE_LINE_MEMBER(pc88va_hlda_w); DECLARE_WRITE_LINE_MEMBER(pc88va_tc_w); @@ -1777,7 +1777,7 @@ WRITE_LINE_MEMBER(pc88va_state::pc88va_hlda_w) { m_maincpu->set_input_line(INPUT_LINE_HALT, state ? ASSERT_LINE : CLEAR_LINE); -// m_dmac->hack_w(state); +// m_dmac->hack_w(state); // printf("%02x HLDA\n",state); } @@ -1787,7 +1787,7 @@ WRITE_LINE_MEMBER( pc88va_state::pc88va_tc_w ) /* floppy terminal count */ m_fdc->tc_w(state); -// printf("TC %02x\n",state); +// printf("TC %02x\n",state); } diff --git a/src/mess/drivers/pc9801.c b/src/mess/drivers/pc9801.c index 6385cb79937..8ae3e8adaa3 100644 --- a/src/mess/drivers/pc9801.c +++ b/src/mess/drivers/pc9801.c @@ -7,17 +7,17 @@ TODO: - proper 8251 uart hook-up on keyboard - SASI /SCSI support; - - kanji support; + - kanji support; - Write a PC80S31K device (also used on PC-8801 and PC-88VA, it's the FDC + Z80 sub-system); - - Finish DIP-Switches support - - text scrolling - - GRCG+ - - EGC - - rewrite using slot devices - - some later SWs put "Invalid command byte 05" (Absolutely Mahjong on Epson logo) - - Basic games are mostly untested, but I think that upd7220 fails on those (Adventureland, Xevious) + - Finish DIP-Switches support + - text scrolling + - GRCG+ + - EGC + - rewrite using slot devices + - some later SWs put "Invalid command byte 05" (Absolutely Mahjong on Epson logo) + - Basic games are mostly untested, but I think that upd7220 fails on those (Adventureland, Xevious) - investigate on POR bit - - PC-9801RS+ should support uPD4990 RTC + - PC-9801RS+ should support uPD4990 RTC TODO (PC-9801RS): - extra features; @@ -28,8 +28,8 @@ - fix CPU for some clones; - "cache error" - undumped IDE ROM, kludged to work - - slave PIC never enables floppy IRQ (PC=0xffd08) - - Compatibility is untested; + - slave PIC never enables floppy IRQ (PC=0xffd08) + - Compatibility is untested; TODO: (PC-486MU) - Tries to read port C of i8255_sys (-> 0x35) at boot without setting up the control @@ -37,70 +37,70 @@ - Dies on ARTIC check; - Presumably one ROM is undumped? - floppy issues TODO (certain fail) - - Unsupported disk types: *.dsk, *.nfd, *.fdd, *.nhd - - 46 Okunen Monogatari - The Shinkaron - - AD&D Champions of Krynn - - AI Shougi (asserts upon loading) - - Aoki Ookami no Shiroki Mejika - Gengis Khan - - Arcshu - - Arcus 2 - - Art Jigsaw - - Atlantia (disk swap?) - - Azusa 108 Jimusho - - Bacta 2 - - BattleTech (disk swap?) - - Bay City Elegy (disk swap?) - - Beast (keeps reading command sense) - - Beast 2 - - Bells Avenue (disk swap?) - - - Bokosuka Wars - - Dokkin Minako Sensei (2dd image) - - Jangou 2: floppy fails to load after the title screen; - - Okuman Chouja 2: fails loading in PC-9801RS only ("packed file is corrupt"). Maybe a 386 core bug? - - Quarth: fails loading in PC-9801RS only ("packed file is corrupt"). Maybe a 386 core bug? - - List of per-game TODO: - - 4D Boxing: inputs are unresponsive - - A Ressha de Ikou 2: missing text (PC-9801RS only); - - Absolutely Mahjong: Transitions are too fast. - - Agumix Selects!: needs GDC = 5 MHz, interlace doesn't work properly; - - Aki no Tsukasa no Fushigi no Kabe: moans with a kanji error - "can't use (this) on a vanilla PC-9801, a PC-9801E nor a PC-9801U. Please turn off the computer and turn it on again." - - Alice no Yakata: doesn't set bitmap interlace properly, can't do disk swaps via the File Manager; - - Animahjong V3: accesses port 0x88; - - Anniversary - Memories of Summer: thinks that a button is pressed; - - Another Genesis: fails loading; - - Apple Club 1: how to pass an hand? - - Arctic: keyboard doesn't work? - - Arcus 3: moans with a JP message "not enough memory (needs 640kb to start)"; - - Armored Flagship Atragon: needs HDD install - - Arquephos: needs extra sound board(s)? - - Asoko no Koufuku: black screen with BGM, waits at 0x225f6; - - Aura Battler Dumbine: upd7220: unimplemented FIGD, has layer clearance bugs on gameplay; - - Bakasuka Wars: drawing seems busted (either mouse or upd7220) - - Band-Kun: (how to run this without installing?) - - Battle Chess: wants some dip-switches to be on in DSW4, too slow during IA thinking? - - - Dragon Buster: slight issue with window masking; - - Far Side Moon: doesn't detect sound board (tied to 0x00ec ports) - - Jan Borg Suzume: gets stuck at a pic8259 read; - - Jump Hero: right status display isn't shown during gameplay (changes the mode dynamically?) - - Lovely Horror: Doesn't show kanji, tries to read it thru the 0xa9 port; - - Quarth: should do a split screen effect, it doesn't hence there are broken gfxs - - Quarth: uploads a PCG charset - - Runner's High: wrong double height on the title screen; - - Uchiyama Aki no Chou Bangai: keyboard irq is fussy (sometimes it doesn't register a key press); - - Uno: uses EGC - - per-game TODO (PC-9821): - - Battle Skin Panic: gfx bugs at the Gainax logo, it crashes after it; - - Policenauts: EMS error at boot; - - Notes: - - Apple Club 1/2 needs data disks to load properly; - - Beast Lord: needs a titan.fnt, in MS-DOS + floppy issues TODO (certain fail) + - Unsupported disk types: *.dsk, *.nfd, *.fdd, *.nhd + - 46 Okunen Monogatari - The Shinkaron + - AD&D Champions of Krynn + - AI Shougi (asserts upon loading) + - Aoki Ookami no Shiroki Mejika - Gengis Khan + - Arcshu + - Arcus 2 + - Art Jigsaw + - Atlantia (disk swap?) + - Azusa 108 Jimusho + - Bacta 2 + - BattleTech (disk swap?) + - Bay City Elegy (disk swap?) + - Beast (keeps reading command sense) + - Beast 2 + - Bells Avenue (disk swap?) + + - Bokosuka Wars + - Dokkin Minako Sensei (2dd image) + - Jangou 2: floppy fails to load after the title screen; + - Okuman Chouja 2: fails loading in PC-9801RS only ("packed file is corrupt"). Maybe a 386 core bug? + - Quarth: fails loading in PC-9801RS only ("packed file is corrupt"). Maybe a 386 core bug? + + List of per-game TODO: + - 4D Boxing: inputs are unresponsive + - A Ressha de Ikou 2: missing text (PC-9801RS only); + - Absolutely Mahjong: Transitions are too fast. + - Agumix Selects!: needs GDC = 5 MHz, interlace doesn't work properly; + - Aki no Tsukasa no Fushigi no Kabe: moans with a kanji error + "can't use (this) on a vanilla PC-9801, a PC-9801E nor a PC-9801U. Please turn off the computer and turn it on again." + - Alice no Yakata: doesn't set bitmap interlace properly, can't do disk swaps via the File Manager; + - Animahjong V3: accesses port 0x88; + - Anniversary - Memories of Summer: thinks that a button is pressed; + - Another Genesis: fails loading; + - Apple Club 1: how to pass an hand? + - Arctic: keyboard doesn't work? + - Arcus 3: moans with a JP message "not enough memory (needs 640kb to start)"; + - Armored Flagship Atragon: needs HDD install + - Arquephos: needs extra sound board(s)? + - Asoko no Koufuku: black screen with BGM, waits at 0x225f6; + - Aura Battler Dumbine: upd7220: unimplemented FIGD, has layer clearance bugs on gameplay; + - Bakasuka Wars: drawing seems busted (either mouse or upd7220) + - Band-Kun: (how to run this without installing?) + - Battle Chess: wants some dip-switches to be on in DSW4, too slow during IA thinking? + + - Dragon Buster: slight issue with window masking; + - Far Side Moon: doesn't detect sound board (tied to 0x00ec ports) + - Jan Borg Suzume: gets stuck at a pic8259 read; + - Jump Hero: right status display isn't shown during gameplay (changes the mode dynamically?) + - Lovely Horror: Doesn't show kanji, tries to read it thru the 0xa9 port; + - Quarth: should do a split screen effect, it doesn't hence there are broken gfxs + - Quarth: uploads a PCG charset + - Runner's High: wrong double height on the title screen; + - Uchiyama Aki no Chou Bangai: keyboard irq is fussy (sometimes it doesn't register a key press); + - Uno: uses EGC + + per-game TODO (PC-9821): + - Battle Skin Panic: gfx bugs at the Gainax logo, it crashes after it; + - Policenauts: EMS error at boot; + + Notes: + - Apple Club 1/2 needs data disks to load properly; + - Beast Lord: needs a titan.fnt, in MS-DOS ======================================================================================== @@ -341,7 +341,7 @@ public: m_hgdc1(*this, "upd7220_chr"), m_hgdc2(*this, "upd7220_btm"), m_opn(*this, "opn"), -// m_opna(*this, "opna"), +// m_opna(*this, "opna"), m_video_ram_1(*this, "video_ram_1"), m_video_ram_2(*this, "video_ram_2"){ } @@ -354,7 +354,7 @@ public: required_device<upd7220_device> m_hgdc1; required_device<upd7220_device> m_hgdc2; required_device<ym2203_device> m_opn; -// optional_device<ym2608_device> m_opna; +// optional_device<ym2608_device> m_opna; required_shared_ptr<UINT8> m_video_ram_1; required_shared_ptr<UINT8> m_video_ram_2; @@ -481,8 +481,8 @@ public: DECLARE_WRITE8_MEMBER(pc9810rs_fdc_ctrl_w); DECLARE_READ8_MEMBER(pc9801rs_2hd_r); DECLARE_WRITE8_MEMBER(pc9801rs_2hd_w); -// DECLARE_READ8_MEMBER(pc9801rs_2dd_r); -// DECLARE_WRITE8_MEMBER(pc9801rs_2dd_w); +// DECLARE_READ8_MEMBER(pc9801rs_2dd_r); +// DECLARE_WRITE8_MEMBER(pc9801rs_2dd_w); DECLARE_WRITE8_MEMBER(pc9801rs_video_ff_w); DECLARE_WRITE8_MEMBER(pc9801rs_a0_w); DECLARE_READ8_MEMBER(pc980ux_memory_r); @@ -597,7 +597,7 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_2hd_drq); DECLARE_WRITE_LINE_MEMBER(fdc_2dd_irq); DECLARE_WRITE_LINE_MEMBER(fdc_2dd_drq); -// DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_irq); +// DECLARE_WRITE_LINE_MEMBER(pc9801rs_fdc_irq); DECLARE_READ8_MEMBER(ppi_mouse_porta_r); DECLARE_READ8_MEMBER(ppi_mouse_portb_r); @@ -752,8 +752,8 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) if(knj_tile) { /* Note: bit 7 doesn't really count, if a kanji is enabled then the successive tile is always the second part of it. - Trusted with Alice no Yakata, Animahjong V3, Aki no Tsukasa no Fushigi no Kabe, Apros ... - */ + Trusted with Alice no Yakata, Animahjong V3, Aki no Tsukasa no Fushigi no Kabe, Apros ... + */ //kanji_lr = (knj_tile & 0x80) >> 7; //kanji_lr |= (tile & 0x80) >> 7; // Tokimeki Sports Gal 3 tile &= 0x7f; @@ -764,7 +764,7 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) x_step = 1; else x_step = 2; -// kanji_lr = 0; +// kanji_lr = 0; } else x_step = 1; @@ -804,15 +804,15 @@ static UPD7220_DRAW_TEXT_LINE( hgdc_draw_text ) tile_data = 0; /* - gfx strip mode: + gfx strip mode: - number refers to the bit number in the tile data. - This mode is identical to the one seen in PC-8801 - 00004444 - 11115555 - 22226666 - 33337777 - */ + number refers to the bit number in the tile data. + This mode is identical to the one seen in PC-8801 + 00004444 + 11115555 + 22226666 + 33337777 + */ gfx_bit = (xi & 4); gfx_bit+= (yi & (2 << (char_size == 16 ? 0x01 : 0x00)))>>(1+(char_size == 16)); @@ -976,7 +976,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_20_w) } else // odd { -// printf("Write to DMA bank register %d %02x\n",((offset >> 1)+1) & 3,data); +// printf("Write to DMA bank register %d %02x\n",((offset >> 1)+1) & 3,data); m_dma_offset[((offset >> 1)+1) & 3] = data & 0x0f; } } @@ -1141,13 +1141,13 @@ WRITE8_MEMBER(pc9801_state::pc9801_video_ff_w) if((offset & 1) == 0) { /* - TODO: this is my best bet so far. Register 4 is annoying, the pattern seems to be: - Write to video FF register Graphic -> 00 - Write to video FF register 200 lines -> 0x - Write to video FF register 200 lines -> 00 + TODO: this is my best bet so far. Register 4 is annoying, the pattern seems to be: + Write to video FF register Graphic -> 00 + Write to video FF register 200 lines -> 0x + Write to video FF register 200 lines -> 00 - where x is the current mode. - */ + where x is the current mode. + */ switch((data & 0x0e) >> 1) { case 1: @@ -1213,7 +1213,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_70_w) { if((offset & 1) == 0) { -// printf("Write to display register [%02x] %02x\n",offset+0x70,data); +// printf("Write to display register [%02x] %02x\n",offset+0x70,data); m_txt_scroll_reg[offset >> 1] = data; //popmessage("%02x %02x %02x %02x",m_txt_scroll_reg[0],m_txt_scroll_reg[1],m_txt_scroll_reg[2],m_txt_scroll_reg[3]); @@ -1223,7 +1223,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_70_w) if(offset < 0x08) pit8253_w(machine().device("pit8253"), space, (offset & 6) >> 1, data); //else - // printf("Write to undefined port [%02x] <- %02x\n",offset+0x70,data); + // printf("Write to undefined port [%02x] <- %02x\n",offset+0x70,data); } } @@ -1596,7 +1596,7 @@ READ8_MEMBER(pc9801_state::pc9801_opn_r) if((offset & 1) == 0) { //if(m_has_opna) - // return ym2608_r(m_opna, space, offset >> 1); + // return ym2608_r(m_opna, space, offset >> 1); return offset & 4 ? 0xff : ym2203_r(m_opn,space, offset >> 1); } @@ -1612,8 +1612,8 @@ WRITE8_MEMBER(pc9801_state::pc9801_opn_w) if((offset & 1) == 0) { /*if(m_has_opna) - ym2608_w(m_opna,space, offset >> 1,data); - else */ + ym2608_w(m_opna,space, offset >> 1,data); + else */ if((offset & 4) == 0) ym2203_w(m_opn,space, offset >> 1,data); } @@ -1706,7 +1706,7 @@ READ8_MEMBER(pc9801_state::pc9801rs_knjram_r) pcg_offset = m_font_addr << 5; pcg_offset|= offset & 0x1f; -// pcg_offset|= m_font_lr; +// pcg_offset|= m_font_lr; return m_kanji_rom[pcg_offset]; } @@ -1805,21 +1805,21 @@ READ8_MEMBER(pc9801_state::pc9801rs_70_r) return 0xff; } - return pc9801_70_r(space,offset);; + return pc9801_70_r(space,offset);; } WRITE8_MEMBER(pc9801_state::pc9801rs_70_w) { if(offset == 0xc) { -// printf("%02x GRCG MODE\n",data); +// printf("%02x GRCG MODE\n",data); m_grcg.mode = data; m_grcg.tile_index = 0; return; } else if(offset == 0x0e) { -// printf("%02x GRCG TILE %02x\n",data,m_grcg.tile_index); +// printf("%02x GRCG TILE %02x\n",data,m_grcg.tile_index); m_grcg.tile[m_grcg.tile_index] = data; m_grcg.tile_index ++; m_grcg.tile_index &= 3; @@ -1851,7 +1851,7 @@ READ8_MEMBER(pc9801_state::pc9801rs_memory_r) else if(offset >= 0x00100000 && offset <= 0x00100000+m_ram_size-1) { return pc9801rs_ex_wram_r(space,offset-0x00100000); } else if(offset >= 0xfffe0000 && offset <= 0xffffffff) { return pc9801rs_ipl_r(space,offset & 0x1ffff); } -// printf("%08x\n",offset); +// printf("%08x\n",offset); return 0x00; } @@ -1886,14 +1886,14 @@ WRITE8_MEMBER(pc9801_state::pc9810rs_fdc_ctrl_w) ---- ---x select irq */ -// machine().device<floppy_connector>("upd765_2hd:0")->get_device()->set_rpm(data & 0x02 ? 360 : 300); -// machine().device<floppy_connector>("upd765_2hd:1")->get_device()->set_rpm(data & 0x02 ? 360 : 300); +// machine().device<floppy_connector>("upd765_2hd:0")->get_device()->set_rpm(data & 0x02 ? 360 : 300); +// machine().device<floppy_connector>("upd765_2hd:1")->get_device()->set_rpm(data & 0x02 ? 360 : 300); machine().device<upd765a_device>("upd765_2hd")->set_rate(data & 0x02 ? 500000 : 250000); m_fdc_ctrl = data; //if(data & 0xfc) - // printf("FDC ctrl called with %02x\n",data); + // printf("FDC ctrl called with %02x\n",data); } READ8_MEMBER(pc9801_state::pc9801rs_2hd_r) @@ -1929,8 +1929,8 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_2hd_w) machine().device<floppy_connector>("upd765_2hd:0")->get_device()->mon_w(data & 0x40 ? ASSERT_LINE : CLEAR_LINE); machine().device<floppy_connector>("upd765_2hd:1")->get_device()->mon_w(data & 0x40 ? ASSERT_LINE : CLEAR_LINE); -// machine().device<floppy_connector>("upd765_2hd:0")->get_device()->mon_w(data & 0x08 ? ASSERT_LINE : CLEAR_LINE); -// machine().device<floppy_connector>("upd765_2hd:1")->get_device()->mon_w(data & 0x08 ? ASSERT_LINE : CLEAR_LINE); +// machine().device<floppy_connector>("upd765_2hd:0")->get_device()->mon_w(data & 0x08 ? ASSERT_LINE : CLEAR_LINE); +// machine().device<floppy_connector>("upd765_2hd:1")->get_device()->mon_w(data & 0x08 ? ASSERT_LINE : CLEAR_LINE); return; } } @@ -1999,7 +1999,7 @@ WRITE8_MEMBER(pc9801_state::pc9801rs_video_ff_w) printf("Write to extended video FF register %s -> %02x\n",ex_video_ff_regnames[(data & 0x06) >> 1],data & 1); } //else - // printf("Write to extended video FF register %02x\n",data); + // printf("Write to extended video FF register %02x\n",data); return; } @@ -2112,7 +2112,7 @@ static ADDRESS_MAP_START( pc9801rs_io, AS_IO, 32, pc9801_state ) AM_RANGE(0x00a0, 0x00af) AM_READWRITE8(pc9801_a0_r, pc9801rs_a0_w, 0xffffffff) //upd7220 bitmap ports / display registers AM_RANGE(0x00bc, 0x00bf) AM_READWRITE8(pc9810rs_fdc_ctrl_r,pc9810rs_fdc_ctrl_w,0xffffffff) AM_RANGE(0x00c8, 0x00cf) AM_READWRITE8(pc9801rs_2hd_r, pc9801rs_2hd_w, 0xffffffff) -// AM_RANGE(0x00ec, 0x00ef) PC-9801-86 sound board +// AM_RANGE(0x00ec, 0x00ef) PC-9801-86 sound board AM_RANGE(0x00f0, 0x00ff) AM_READWRITE8(pc9801rs_f0_r, pc9801rs_f0_w, 0xffffffff) AM_RANGE(0x0188, 0x018f) AM_READWRITE8(pc9801_opn_r, pc9801_opn_w, 0xffffffff) //ym2203 opn / <undefined> AM_RANGE(0x0438, 0x043b) AM_READWRITE8(pc9801rs_access_ctrl_r,pc9801rs_access_ctrl_w,0xffffffff) @@ -2232,7 +2232,7 @@ READ8_MEMBER(pc9801_state::pc9821_memory_r) /* TODO: window bank at 0xa0000 - 0xbffff */ if ( offset <= 0x0009ffff) { return pc9801rs_wram_r(space,offset); } -// else if(offset >= 0x00080000 && offset <= 0x0009ffff) { return pc9821_winram_r(space,offset & 0x1ffff); } +// else if(offset >= 0x00080000 && offset <= 0x0009ffff) { return pc9821_winram_r(space,offset & 0x1ffff); } else if(offset >= 0x000a0000 && offset <= 0x000a3fff) { return pc9801_tvram_r(space,offset-0xa0000); } else if(offset >= 0x000a4000 && offset <= 0x000a4fff) { return pc9801rs_knjram_r(space,offset & 0xfff); } else if(offset >= 0x000a8000 && offset <= 0x000bffff) { return pc9801_gvram_r(space,offset-0xa8000); } @@ -2261,7 +2261,7 @@ WRITE8_MEMBER(pc9801_state::pc9821_memory_w) /* TODO: window bank at 0xa0000 - 0xbffff */ if ( offset <= 0x0009ffff) { pc9801rs_wram_w(space,offset,data); } -// else if(offset >= 0x00080000 && offset <= 0x0009ffff) { pc9821_winram_w(space,offset & 0x1ffff,data); } +// else if(offset >= 0x00080000 && offset <= 0x0009ffff) { pc9821_winram_w(space,offset & 0x1ffff,data); } else if(offset >= 0x000a0000 && offset <= 0x000a3fff) { pc9801_tvram_w(space,offset-0xa0000,data); } else if(offset >= 0x000a4000 && offset <= 0x000a4fff) { pc9801rs_knjram_w(space,offset & 0xfff,data); } else if(offset >= 0x000a8000 && offset <= 0x000bffff) { pc9801_gvram_w(space,offset-0xa8000,data); } @@ -2273,7 +2273,7 @@ WRITE8_MEMBER(pc9801_state::pc9821_memory_w) else if(offset >= 0x00100000 && offset <= 0x00100000+m_ram_size-1) { pc9801rs_ex_wram_w(space,offset-0x00100000,data); } else if(offset >= 0x00f00000 && offset <= 0x00f9ffff) { pc9821_ext_gvram_w(space,offset-0x00f00000,data); } //else - // printf("%08x %08x\n",offset,data); + // printf("%08x %08x\n",offset,data); } @@ -2284,7 +2284,7 @@ WRITE8_MEMBER(pc9801_state::pc9821_video_ff_w) m_ex_video_ff[(data & 0xfe) >> 1] = data & 1; //if((data & 0xfe) == 0x20) - // printf("%02x\n",data & 1); + // printf("%02x\n",data & 1); } /* Intentional fall-through */ @@ -2927,10 +2927,10 @@ static INPUT_PORTS_START( pc9801rs ) PORT_MODIFY("ROM_LOAD") PORT_BIT( 0x03, IP_ACTIVE_LOW, IPT_UNUSED ) -// PORT_START("SOUND_CONFIG") -// PORT_CONFNAME( 0x01, 0x00, "Sound Type" ) -// PORT_CONFSETTING( 0x00, "YM2203 (OPN)" ) -// PORT_CONFSETTING( 0x01, "YM2608 (OPNA)" ) +// PORT_START("SOUND_CONFIG") +// PORT_CONFNAME( 0x01, 0x00, "Sound Type" ) +// PORT_CONFSETTING( 0x00, "YM2203 (OPN)" ) +// PORT_CONFSETTING( 0x01, "YM2608 (OPNA)" ) INPUT_PORTS_END static INPUT_PORTS_START( pc9821 ) @@ -3120,7 +3120,7 @@ WRITE_LINE_MEMBER(pc9801_state::pc9801_tc_w ) m_fdc_2hd->tc_w(state); // TODO: 2dd? -// printf("TC %02x\n",state); +// printf("TC %02x\n",state); } READ8_MEMBER(pc9801_state::pc9801_dma_read_byte) @@ -3128,7 +3128,7 @@ READ8_MEMBER(pc9801_state::pc9801_dma_read_byte) address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; -// printf("%08x\n",addr); +// printf("%08x\n",addr); return program.read_byte(addr); } @@ -3139,7 +3139,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_dma_write_byte) address_space &program = m_maincpu->space(AS_PROGRAM); offs_t addr = (m_dma_offset[m_dack] << 16) | offset; -// printf("%08x %02x\n",addr,data); +// printf("%08x %02x\n",addr,data); program.write_byte(addr, data); } @@ -3290,7 +3290,7 @@ READ8_MEMBER(pc9801_state::ppi_mouse_porta_r) res |= (m_mouse.lx >> isporthi) & 0xf; } -// printf("A\n"); +// printf("A\n"); return res; } @@ -3299,12 +3299,12 @@ READ8_MEMBER(pc9801_state::ppi_mouse_portc_r) { return machine().root_device().i WRITE8_MEMBER(pc9801_state::ppi_mouse_porta_w) { -// printf("A %02x\n",data); +// printf("A %02x\n",data); } WRITE8_MEMBER(pc9801_state::ppi_mouse_portb_w) { -// printf("B %02x\n",data); +// printf("B %02x\n",data); } WRITE8_MEMBER(pc9801_state::ppi_mouse_portc_w) @@ -3340,13 +3340,13 @@ SLOT_INTERFACE_END void pc9801_state::fdc_2hd_irq(bool state) { -// printf("IRQ 2HD %d\n",state); +// printf("IRQ 2HD %d\n",state); pic8259_ir3_w(machine().device("pic8259_slave"), state); } void pc9801_state::fdc_2hd_drq(bool state) { -// printf("%02x DRQ\n",state); +// printf("%02x DRQ\n",state); m_dmac->dreq2_w(state ^ 1); } @@ -3362,7 +3362,7 @@ void pc9801_state::fdc_2dd_irq(bool state) void pc9801_state::fdc_2dd_drq(bool state) { -// printf("%02x DRQ\n",state); +// printf("%02x DRQ\n",state); m_dmac->dreq3_w(state ^ 1); } @@ -3380,7 +3380,7 @@ void pc9801_state::pc9801rs_fdc_irq(bool state) void pc9801_state::pc9801rs_fdc_drq(bool state) { -// printf("DRQ %d\n",state); +// printf("DRQ %d\n",state); if(m_fdc_ctrl & 1) m_dmac->dreq2_w(state ^ 1); @@ -3571,7 +3571,7 @@ MACHINE_RESET_MEMBER(pc9801_state,pc9801rs) m_fdc_ctrl = 3; m_access_ctrl = 0; m_keyb_press = 0xff; // temp kludge, for PC-9821 booting -// m_has_opna = machine().root_device().ioport("SOUND_CONFIG")->read() & 1; +// m_has_opna = machine().root_device().ioport("SOUND_CONFIG")->read() & 1; } MACHINE_RESET_MEMBER(pc9801_state,pc9821) @@ -3589,13 +3589,13 @@ INTERRUPT_GEN_MEMBER(pc9801_state::pc9801_vrtc_irq) pic8259_ir2_w(machine().device("pic8259_master"), 1); m_vrtc_irq_mask = 0; // TODO: this irq auto-masks? } -// else -// pic8259_ir2_w(machine().device("pic8259_master"), 0); +// else +// pic8259_ir2_w(machine().device("pic8259_master"), 0); } static void pc9801_sound_irq( device_t *device, int irq ) { -// pc9801_state *state = device->machine().driver_data<pc9801_state>(); +// pc9801_state *state = device->machine().driver_data<pc9801_state>(); /* TODO: seems to die very often */ pic8259_ir4_w(device->machine().device("pic8259_slave"), irq); @@ -3609,8 +3609,8 @@ READ8_MEMBER(pc9801_state::opn_porta_r) if(m_joy_sel == 0xc0) return machine().root_device().ioport("OPN_PA2")->read(); -// 0x81? -// printf("%02x\n",m_joy_sel); +// 0x81? +// printf("%02x\n",m_joy_sel); return 0xff; } @@ -3655,10 +3655,10 @@ TIMER_DEVICE_CALLBACK_MEMBER( pc9801_state::mouse_irq_cb ) { m_mouse.freq_index ++; -// printf("%02x\n",m_mouse.freq_index); +// printf("%02x\n",m_mouse.freq_index); if(m_mouse.freq_index > m_mouse.freq_reg) { -// printf("irq %02x\n",m_mouse.freq_reg); +// printf("irq %02x\n",m_mouse.freq_reg); m_mouse.freq_index = 0; pic8259_ir5_w(machine().device("pic8259_slave"), 0); pic8259_ir5_w(machine().device("pic8259_slave"), 1); @@ -3791,9 +3791,9 @@ static MACHINE_CONFIG_START( pc9801rs, pc9801_state ) MCFG_SOUND_CONFIG(pc98_ym2203_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) -// MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider -// MCFG_SOUND_CONFIG(pc98_ym2608_intf) -// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) +// MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider +// MCFG_SOUND_CONFIG(pc98_ym2608_intf) +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15) @@ -3858,9 +3858,9 @@ static MACHINE_CONFIG_START( pc9821, pc9801_state ) MCFG_SOUND_CONFIG(pc98_ym2203_intf) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) -// MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider -// MCFG_SOUND_CONFIG(pc98_ym2608_intf) -// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) +// MCFG_SOUND_ADD("opna", YM2608, MAIN_CLOCK_X1*4) // unknown clock / divider +// MCFG_SOUND_CONFIG(pc98_ym2608_intf) +// MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_SOUND_ADD(BEEPER_TAG, BEEP, 0) MCFG_SOUND_ROUTE(ALL_OUTPUTS,"mono",0.15) diff --git a/src/mess/drivers/sg1000.c b/src/mess/drivers/sg1000.c index c13ea859490..bac32255600 100644 --- a/src/mess/drivers/sg1000.c +++ b/src/mess/drivers/sg1000.c @@ -917,9 +917,9 @@ WRITE8_MEMBER( sf7000_state::ppi_pc_w ) PC7 /STROBE to Centronics printer */ - if (!BIT(data, 0)) + if (!BIT(data, 0)) m_fdc->set_floppy(m_floppy0); - else + else m_fdc->set_floppy(NULL); /* floppy motor */ diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c index fbb3a94c4ab..60a07a8152b 100644 --- a/src/mess/drivers/socrates.c +++ b/src/mess/drivers/socrates.c @@ -989,15 +989,15 @@ MACHINE_CONFIG_END /* This doesn't work for some reason. static MACHINE_CONFIG_DERIVED( socrates_pal, socrates ) - MCFG_CPU_REPLACE("maincpu", Z80, XTAL_26_601712MHz/8) - MCFG_SCREEN_REPLACE("screen", RASTER) - MCFG_SCREEN_REFRESH_RATE(50) - MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) - MCFG_SCREEN_SIZE(264, 256) // technically the screen size is 256x228 but super painter abuses what I suspect is a hardware bug to display repeated pixels of the very last pixel beyond this horizontal space, well into hblank - MCFG_SCREEN_VISIBLE_AREA(0, 263, 0, 256) // the last few rows are usually cut off by the screen bottom but are indeed displayed if you mess with v-hold - MCFG_SCREEN_UPDATE_DRIVER(socrates_state, screen_update_socrates) - MCFG_SOUND_REPLACE("soc_snd", SOCRATES, XTAL_26_601712MHz/(512+256)) // this is correct, as strange as it sounds. - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) + MCFG_CPU_REPLACE("maincpu", Z80, XTAL_26_601712MHz/8) + MCFG_SCREEN_REPLACE("screen", RASTER) + MCFG_SCREEN_REFRESH_RATE(50) + MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) + MCFG_SCREEN_SIZE(264, 256) // technically the screen size is 256x228 but super painter abuses what I suspect is a hardware bug to display repeated pixels of the very last pixel beyond this horizontal space, well into hblank + MCFG_SCREEN_VISIBLE_AREA(0, 263, 0, 256) // the last few rows are usually cut off by the screen bottom but are indeed displayed if you mess with v-hold + MCFG_SCREEN_UPDATE_DRIVER(socrates_state, screen_update_socrates) + MCFG_SOUND_REPLACE("soc_snd", SOCRATES, XTAL_26_601712MHz/(512+256)) // this is correct, as strange as it sounds. + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END */ /****************************************************************************** diff --git a/src/mess/drivers/studio2.c b/src/mess/drivers/studio2.c index 15a85f01be7..3a5636a8824 100644 --- a/src/mess/drivers/studio2.c +++ b/src/mess/drivers/studio2.c @@ -97,7 +97,7 @@ Notes: (all chips shown above) TMM331 is compatible with AMI S6831A, AMD AM9217, Intel 2316A/8316A, MOSTEK MK31000, GI RO-3-8316, NATIONAL/NEC/SYNERTEK 2316A etc - + */ /* diff --git a/src/mess/drivers/tim011.c b/src/mess/drivers/tim011.c index c2bdf493c1a..ecd93d2d2f2 100644 --- a/src/mess/drivers/tim011.c +++ b/src/mess/drivers/tim011.c @@ -23,7 +23,7 @@ public: m_floppy1(*this, FDC9266_TAG ":1:35dd"), m_floppy2(*this, FDC9266_TAG ":2:35dd"), m_floppy3(*this, FDC9266_TAG ":3:35dd") { } - + virtual void machine_reset(); virtual void video_start(); UINT32 screen_update_tim011(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -31,23 +31,23 @@ public: DECLARE_WRITE8_MEMBER(scroll_w); DECLARE_WRITE8_MEMBER(fdc_dma_w); DECLARE_READ8_MEMBER(print_r); - DECLARE_READ8_MEMBER(scroll_r); + DECLARE_READ8_MEMBER(scroll_r); void irq_w(bool state); void drq_w(bool state); UINT8 m_scroll; - + required_device<cpu_device> m_maincpu; required_device<upd765a_device> m_fdc; required_device<floppy_image_device> m_floppy0; required_device<floppy_image_device> m_floppy1; required_device<floppy_image_device> m_floppy2; - required_device<floppy_image_device> m_floppy3; + required_device<floppy_image_device> m_floppy3; }; static ADDRESS_MAP_START(tim011_mem, AS_PROGRAM, 8, tim011_state) ADDRESS_MAP_UNMAP_HIGH - AM_RANGE(0x00000, 0x01fff) AM_ROM AM_MIRROR(0x3e000) + AM_RANGE(0x00000, 0x01fff) AM_ROM AM_MIRROR(0x3e000) AM_RANGE(0x40000, 0x7ffff) AM_RAM // 256KB RAM 8 * 41256 DRAM ADDRESS_MAP_END @@ -57,7 +57,7 @@ static ADDRESS_MAP_START(tim011_io, AS_IO, 8, tim011_state) AM_RANGE(0x0080, 0x009f) AM_DEVICE(FDC9266_TAG, upd765a_device, map) //AM_RANGE(0x00a0, 0x00a0) AM_MIRROR(0x001f) AM_WRITE(fdc_dma_w) //AM_RANGE(0x00c0, 0x00c1) AM_MIRROR(0x000e) AM_READWRITE(print_r,print_w) - //AM_RANGE(0x00d0, 0x00d0) AM_MIRROR(0x000f) AM_READWRITE(scroll_r,scroll_w) + //AM_RANGE(0x00d0, 0x00d0) AM_MIRROR(0x000f) AM_READWRITE(scroll_r,scroll_w) AM_RANGE(0x8000, 0xffff) AM_RAM // Video RAM 43256 SRAM (32KB) ADDRESS_MAP_END @@ -82,9 +82,9 @@ void tim011_state::machine_reset() m_floppy1->mon_w(0); m_floppy2->mon_w(0); m_floppy3->mon_w(0); - + m_fdc->setup_intrq_cb(upd765a_device::line_cb(FUNC(tim011_state::irq_w), this)); - m_fdc->setup_drq_cb(upd765a_device::line_cb(FUNC(tim011_state::drq_w), this)); + m_fdc->setup_drq_cb(upd765a_device::line_cb(FUNC(tim011_state::drq_w), this)); } void tim011_state::video_start() @@ -140,7 +140,7 @@ static MACHINE_CONFIG_START( tim011,tim011_state ) MCFG_CPU_IO_MAP(tim011_io) MCFG_CPU_VBLANK_INT_DRIVER("screen", tim011_state, irq0_line_hold) -// MCFG_CPU_ADD("keyboard",COSMAC, XTAL_1_75MHz) // CDP1802, uknown clock +// MCFG_CPU_ADD("keyboard",COSMAC, XTAL_1_75MHz) // CDP1802, uknown clock // FDC9266 location U43 XTAL_8MHz MCFG_UPD765A_ADD(FDC9266_TAG, true, true) @@ -149,7 +149,7 @@ static MACHINE_CONFIG_START( tim011,tim011_state ) MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":1", tim011_floppies, "35dd", 0, tim011_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":2", tim011_floppies, "35dd", 0, tim011_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FDC9266_TAG ":3", tim011_floppies, "35dd", 0, tim011_floppy_formats) - + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mess/drivers/v1050.c b/src/mess/drivers/v1050.c index c7d677fed40..077b3c4eec9 100644 --- a/src/mess/drivers/v1050.c +++ b/src/mess/drivers/v1050.c @@ -970,12 +970,12 @@ void v1050_state::fdc_drq_w(bool state) /* static LEGACY_FLOPPY_OPTIONS_START( v1050 ) - LEGACY_FLOPPY_OPTION( v1050, "dsk", "Visual 1050 disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([1]) - TRACKS([80]) - SECTORS([10]) - SECTOR_LENGTH([512]) - FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION( v1050, "dsk", "Visual 1050 disk image", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([1]) + TRACKS([80]) + SECTORS([10]) + SECTOR_LENGTH([512]) + FIRST_SECTOR_ID([1])) LEGACY_FLOPPY_OPTIONS_END */ diff --git a/src/mess/drivers/vt100.c b/src/mess/drivers/vt100.c index 838d8c1ac9a..ca8ef76991c 100644 --- a/src/mess/drivers/vt100.c +++ b/src/mess/drivers/vt100.c @@ -506,7 +506,7 @@ MACHINE_CONFIG_END The DPM01 supposedly has its own processor and roms. * vt125 - 1982? base model (stock vt100 firmware plus extra gfx board firmware and processor) vt100 with the ReGIS graphical language board - (aka GPO) installed (almost literally a vk100-on-a-board, but with added + (aka GPO) installed (almost literally a vk100-on-a-board, but with added backwards compatibility mode for vt105/WG, and 2 bits per pixel color), AVO optional; Includes a custom 'dumb' STP board. * vt131 - 1982 cost reduced version of vt132, no longer has the vt100 diff --git a/src/mess/drivers/wangpc.c b/src/mess/drivers/wangpc.c index 01facb9d09f..e2b7ea0c4ec 100644 --- a/src/mess/drivers/wangpc.c +++ b/src/mess/drivers/wangpc.c @@ -1216,7 +1216,7 @@ void wangpc_state::on_disk0_unload(floppy_image_device *image) int wangpc_state::on_disk1_load(floppy_image_device *image) { on_disk1_unload(image); - + return IMAGE_INIT_PASS; } diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c index 81c9d42a20d..0bdc9615a66 100644 --- a/src/mess/drivers/xerox820.c +++ b/src/mess/drivers/xerox820.c @@ -10,14 +10,14 @@ TODO: - - Xerox 820 - - floppy (wd1772.c FM support) + - Xerox 820 + - floppy (wd1772.c FM support) - Xerox 820-II - - floppy (read/write to FDC triggers Z80 WAIT) - - Winchester - - Shugart SA1004 (chs=256,4,40 ss=256) - - Shugart SA606 (chs=160,6, ss=256) - - Shugart SA1403D controller + - floppy (read/write to FDC triggers Z80 WAIT) + - Winchester + - Shugart SA1004 (chs=256,4,40 ss=256) + - Shugart SA606 (chs=160,6, ss=256) + - Shugart SA1403D controller - Xerox 16/8 - Emerald Microware X120 board - type in Monitor v1.0 from manual @@ -444,14 +444,14 @@ WRITE8_MEMBER( xerox820_state::kbpio_pa_w ) if (m_8n5 != _8n5) { m_8n5 = _8n5; - + m_fdc->set_unscaled_clock(m_8n5 ? XTAL_20MHz/10 : XTAL_20MHz/20); } m_400_460 = !floppy->twosid_r(); floppy->mon_w(0); - + floppy->ss_w(BIT(data, 2)); } @@ -531,19 +531,19 @@ static Z80PIO_INTERFACE( gppio_intf ) READ8_MEMBER( xerox820ii_state::rdpio_pb_r ) { /* - - bit description - - 0 NBSY - 1 NMSG - 2 NC/D - 3 NREQ - 4 NI/O - 5 - 6 LS74 Q - 7 - - */ + + bit description + + 0 NBSY + 1 NMSG + 2 NC/D + 3 NREQ + 4 NI/O + 5 + 6 LS74 Q + 7 + + */ UINT8 data = 0; @@ -559,19 +559,19 @@ READ8_MEMBER( xerox820ii_state::rdpio_pb_r ) WRITE8_MEMBER( xerox820ii_state::rdpio_pb_w ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 NSEL - 6 - 7 NRST - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 NSEL + 6 + 7 NRST + + */ m_sasibus->scsi_sel_w(!BIT(data, 5)); m_sasibus->scsi_rst_w(!BIT(data, 7)); @@ -788,30 +788,30 @@ void xerox820ii_state::machine_reset() } /* static LEGACY_FLOPPY_OPTIONS_START( xerox820 ) - LEGACY_FLOPPY_OPTION( sssd8, "dsk", "8\" SSSD", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([1]) - TRACKS([77]) - SECTORS([26]) - SECTOR_LENGTH([128]) - FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION( ssdd8, "dsk", "8\" SSDD", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([1]) - TRACKS([77]) - SECTORS([26]) - SECTOR_LENGTH([256]) - FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION( sssd5, "dsk", "5.25\" SSSD", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([1]) - TRACKS([40]) - SECTORS([18]) - SECTOR_LENGTH([128]) - FIRST_SECTOR_ID([1])) - LEGACY_FLOPPY_OPTION( ssdd5, "dsk", "5.25\" SSDD", basicdsk_identify_default, basicdsk_construct_default, NULL, - HEADS([2]) - TRACKS([40]) - SECTORS([18]) - SECTOR_LENGTH([128]) - FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION( sssd8, "dsk", "8\" SSSD", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([1]) + TRACKS([77]) + SECTORS([26]) + SECTOR_LENGTH([128]) + FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION( ssdd8, "dsk", "8\" SSDD", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([1]) + TRACKS([77]) + SECTORS([26]) + SECTOR_LENGTH([256]) + FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION( sssd5, "dsk", "5.25\" SSSD", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([1]) + TRACKS([40]) + SECTORS([18]) + SECTOR_LENGTH([128]) + FIRST_SECTOR_ID([1])) + LEGACY_FLOPPY_OPTION( ssdd5, "dsk", "5.25\" SSDD", basicdsk_identify_default, basicdsk_construct_default, NULL, + HEADS([2]) + TRACKS([40]) + SECTORS([18]) + SECTOR_LENGTH([128]) + FIRST_SECTOR_ID([1])) LEGACY_FLOPPY_OPTIONS_END */ @@ -927,7 +927,7 @@ static MACHINE_CONFIG_START( xerox820ii, xerox820ii_state ) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", xerox820_floppies, "sa450", NULL, floppy_image_device::default_floppy_formats) MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", xerox820_floppies, "sa450", NULL, floppy_image_device::default_floppy_formats) MCFG_COM8116_ADD(COM8116_TAG, XTAL_5_0688MHz, com8116_intf) - + // SASI bus MCFG_SCSIBUS_ADD(SASIBUS_TAG) MCFG_SCSIDEV_ADD(SASIBUS_TAG ":harddisk0", SA1403D, SCSI_ID_0) @@ -961,7 +961,7 @@ MACHINE_CONFIG_END ROM_START( bigboard ) ROM_REGION( 0x1000, "monitor", 0 ) ROM_LOAD( "bigboard.u67", 0x0000, 0x0800, CRC(5a85a228) SHA1(d51a2cbd0aae80315bda9530275aabfe8305364e)) - + ROM_REGION( 0x800, "chargen", 0 ) ROM_LOAD( "bigboard.u73", 0x0000, 0x0800, CRC(10bf0d81) SHA1(7ec73670a4d9d6421a5d6a4c4edc8b7c87923f6c) ) ROM_END @@ -1036,9 +1036,9 @@ ROM_END /* System Drivers */ /* YEAR NAME PARENT COMPAT MACHINE INPUT INIT COMPANY FULLNAME FLAGS */ -COMP( 1980, bigboard, 0, 0, bigboard, xerox820, driver_device, 0, "Digital Research Computers", "Big Board", GAME_IMPERFECT_KEYBOARD ) -COMP( 1981, x820, bigboard, 0, xerox820, xerox820, driver_device, 0, "Xerox", "Xerox 820", GAME_IMPERFECT_KEYBOARD | GAME_NO_SOUND_HW ) -COMP( 1982, mk82, bigboard, 0, bigboard, xerox820, driver_device, 0, "Scomar", "MK-82", GAME_IMPERFECT_KEYBOARD ) -COMP( 1983, x820ii, 0, 0, xerox820ii, xerox820, driver_device, 0, "Xerox", "Xerox 820-II", GAME_NOT_WORKING | GAME_IMPERFECT_KEYBOARD ) -COMP( 1983, x168, x820ii, 0, xerox168, xerox820, driver_device, 0, "Xerox", "Xerox 16/8", GAME_NOT_WORKING | GAME_IMPERFECT_KEYBOARD ) -COMP( 1983, mk83, x820ii, 0, mk83, xerox820, driver_device, 0, "Scomar", "MK-83", GAME_NOT_WORKING | GAME_IMPERFECT_KEYBOARD | GAME_NO_SOUND_HW ) +COMP( 1980, bigboard, 0, 0, bigboard, xerox820, driver_device, 0, "Digital Research Computers", "Big Board", GAME_IMPERFECT_KEYBOARD ) +COMP( 1981, x820, bigboard, 0, xerox820, xerox820, driver_device, 0, "Xerox", "Xerox 820", GAME_IMPERFECT_KEYBOARD | GAME_NO_SOUND_HW ) +COMP( 1982, mk82, bigboard, 0, bigboard, xerox820, driver_device, 0, "Scomar", "MK-82", GAME_IMPERFECT_KEYBOARD ) +COMP( 1983, x820ii, 0, 0, xerox820ii, xerox820, driver_device, 0, "Xerox", "Xerox 820-II", GAME_NOT_WORKING | GAME_IMPERFECT_KEYBOARD ) +COMP( 1983, x168, x820ii, 0, xerox168, xerox820, driver_device, 0, "Xerox", "Xerox 16/8", GAME_NOT_WORKING | GAME_IMPERFECT_KEYBOARD ) +COMP( 1983, mk83, x820ii, 0, mk83, xerox820, driver_device, 0, "Scomar", "MK-83", GAME_NOT_WORKING | GAME_IMPERFECT_KEYBOARD | GAME_NO_SOUND_HW ) diff --git a/src/mess/drivers/xor100.c b/src/mess/drivers/xor100.c index dd58fed5417..02cfab94e41 100644 --- a/src/mess/drivers/xor100.c +++ b/src/mess/drivers/xor100.c @@ -478,7 +478,7 @@ static Z80CTC_INTERFACE( ctc_intf ) DEVCB_CPU_INPUT_LINE(Z80_TAG, INPUT_LINE_IRQ0), /* interrupt handler */ DEVCB_DRIVER_LINE_MEMBER(xor100_state, ctc_z0_w), /* ZC/TO0 callback */ DEVCB_DRIVER_LINE_MEMBER(xor100_state, ctc_z1_w), /* ZC/TO1 callback */ - DEVCB_DRIVER_LINE_MEMBER(xor100_state, ctc_z2_w) /* ZC/TO2 callback */ + DEVCB_DRIVER_LINE_MEMBER(xor100_state, ctc_z2_w) /* ZC/TO2 callback */ }; /* WD1795-02 Interface */ diff --git a/src/mess/drivers/ymmu100.c b/src/mess/drivers/ymmu100.c index 511840b327c..718af8e392e 100644 --- a/src/mess/drivers/ymmu100.c +++ b/src/mess/drivers/ymmu100.c @@ -1,70 +1,70 @@ /************************************************************************************* Yamaha MU-100 : 32-voice polyphonic/multitimbral General MIDI/GS/XG tone module - Preliminary driver by R. Belmont - + Preliminary driver by R. Belmont + CPU: Hitachi H8S/2655 (HD6432655F), strapped for mode 4 (24-bit address, 16-bit data, no internal ROM) Sound ASIC: Yamaha XS725A0 - RAM: 1 MSM51008 (1 meg * 1 bit = 128KBytes) - + RAM: 1 MSM51008 (1 meg * 1 bit = 128KBytes) + I/O ports from service manual: - + Port 1: - 0 - LCD data, SW data, LED 1 - 1 - LCD data, SW data, LED 2 - 2 - LCD data, SW data, LED 3 - 3 - LCD data, SW data, LED 4 - 4 - LCD data, SW data, LED 5 - 5 - LCD data, SW strobe data - 6 - LCD data, SW strobe data - 7 - LCD data, SW data, LED 6 - + 0 - LCD data, SW data, LED 1 + 1 - LCD data, SW data, LED 2 + 2 - LCD data, SW data, LED 3 + 3 - LCD data, SW data, LED 4 + 4 - LCD data, SW data, LED 5 + 5 - LCD data, SW strobe data + 6 - LCD data, SW strobe data + 7 - LCD data, SW data, LED 6 + Port 2: - 0 - (out) LCD control RS - 1 - (out) LCD control R/W - 2 - (out) LCD control E - 3 - (out) LCD contrast A - 4 - (out) LCD contrast B - 5 - (out) LCD contrast C - 6 - (out) 1 MHz clock for serial - 7 - NC - + 0 - (out) LCD control RS + 1 - (out) LCD control R/W + 2 - (out) LCD control E + 3 - (out) LCD contrast A + 4 - (out) LCD contrast B + 5 - (out) LCD contrast C + 6 - (out) 1 MHz clock for serial + 7 - NC + Port 3: - 4 - (out) A/D gain control 1 - 5 - (out) A/D gain control 2 - + 4 - (out) A/D gain control 1 + 5 - (out) A/D gain control 2 + Port 5: - 3 - (out) Reset signal for rotary encoder - + 3 - (out) Reset signal for rotary encoder + Port 6: - 1 - NC - 2 - (out) PB select (SW1) - 3 - (out) PB select (SW2) - 4 - (out) reset PB - 5 - (out) reset SWP30 (sound chip) - 6 - NC - 7 - (in) Plug detection for A/D input - + 1 - NC + 2 - (out) PB select (SW1) + 3 - (out) PB select (SW2) + 4 - (out) reset PB + 5 - (out) reset SWP30 (sound chip) + 6 - NC + 7 - (in) Plug detection for A/D input + Port A: - 5 - (in) Off Line Detection - 6 - (out) Signal for rotary encoder (REB) - 7 - (out) Signal for rotary encoder (REA) - + 5 - (in) Off Line Detection + 6 - (out) Signal for rotary encoder (REB) + 7 - (out) Signal for rotary encoder (REA) + Port F: - 0 - (out) LED,SW Strobe data latch - 1 - (out) SW data read control - 2 - (out) PB select (SW4) - + 0 - (out) LED,SW Strobe data latch + 1 - (out) SW data read control + 2 - (out) PB select (SW4) + Port G: - 0 - (out) PB select (SW3) - + 0 - (out) PB select (SW3) + Analog input channels: - 0 - level input R - 2 - level output L - 4 - host SW type switch position - 6 - battery voltage - 7 - model check (GND for MU100) - + 0 - level input R + 2 - level output L + 4 - host SW type switch position + 6 - battery voltage + 7 - model check (GND for MU100) + **************************************************************************************/ #include "emu.h" @@ -131,7 +131,7 @@ READ8_MEMBER(mu100_state::p1_r) } else return 0x00; } - + return 0xff; } @@ -197,15 +197,15 @@ MACHINE_CONFIG_END ROM_START( mu100 ) ROM_REGION( 0x200000, "maincpu", 0 ) ROM_SYSTEM_BIOS( 0, "bios0", "xu50720 (v1.11, Aug. 3, 1999)" ) - ROM_LOAD16_WORD_SWAP_BIOS( 0, "xu50720.ic11", 0x000000, 0x200000, CRC(1126a8a4) SHA1(e90b8bd9d14297da26ba12f4d9a4f2d22cd7d34a) ) + ROM_LOAD16_WORD_SWAP_BIOS( 0, "xu50720.ic11", 0x000000, 0x200000, CRC(1126a8a4) SHA1(e90b8bd9d14297da26ba12f4d9a4f2d22cd7d34a) ) ROM_SYSTEM_BIOS( 1, "bios1", "xt71420 (v1.05, Sep. 19, 1997)" ) - ROM_LOAD16_WORD_SWAP_BIOS( 1, "xt71420.ic11", 0x000000, 0x200000, CRC(0e5b3bae) SHA1(3148c5bd59a3d00809d3ab1921216215fe2582c5) ) + ROM_LOAD16_WORD_SWAP_BIOS( 1, "xt71420.ic11", 0x000000, 0x200000, CRC(0e5b3bae) SHA1(3148c5bd59a3d00809d3ab1921216215fe2582c5) ) ROM_REGION( 0x2800000, "waverom", 0 ) - ROM_LOAD32_WORD( "sx518b0.ic34", 0x000000, 0x400000, CRC(2550d44f) SHA1(fd3cce228c7d389a2fde25c808a5b26080588cba) ) - ROM_LOAD32_WORD( "sx743b0.ic35", 0x000002, 0x400000, CRC(a9109a6c) SHA1(a67bb49378a38a2d809bd717d286e18bc6496db0) ) - ROM_LOAD32_WORD( "xt445a0-828.ic36", 0x800000, 0x1000000, CRC(d4483a43) SHA1(5bfd0762dea8598eda19db20251dac20e31fa02c) ) - ROM_LOAD32_WORD( "xt461a0-829.ic37", 0x800002, 0x1000000, CRC(c5af4501) SHA1(1c88de197c36382311053add8b19a5740802cb78) ) + ROM_LOAD32_WORD( "sx518b0.ic34", 0x000000, 0x400000, CRC(2550d44f) SHA1(fd3cce228c7d389a2fde25c808a5b26080588cba) ) + ROM_LOAD32_WORD( "sx743b0.ic35", 0x000002, 0x400000, CRC(a9109a6c) SHA1(a67bb49378a38a2d809bd717d286e18bc6496db0) ) + ROM_LOAD32_WORD( "xt445a0-828.ic36", 0x800000, 0x1000000, CRC(d4483a43) SHA1(5bfd0762dea8598eda19db20251dac20e31fa02c) ) + ROM_LOAD32_WORD( "xt461a0-829.ic37", 0x800002, 0x1000000, CRC(c5af4501) SHA1(1c88de197c36382311053add8b19a5740802cb78) ) ROM_REGION( 0x0860, "lcd", ROMREGION_ERASE ) ROM_LOAD( "44780a00.bin", 0x0000, 0x0860, BAD_DUMP CRC(3a89024c) SHA1(5a87b68422a916d1b37b5be1f7ad0b3fb3af5a8d)) diff --git a/src/mess/includes/b2m.h b/src/mess/includes/b2m.h index 64f0e26d6e2..6e8be1c53e0 100644 --- a/src/mess/includes/b2m.h +++ b/src/mess/includes/b2m.h @@ -63,7 +63,7 @@ public: DECLARE_WRITE8_MEMBER(b2m_romdisk_portb_w); DECLARE_WRITE8_MEMBER(b2m_romdisk_portc_w); DECLARE_WRITE_LINE_MEMBER(b2m_pic_set_int_line); - void b2m_fdc_drq(bool state); + void b2m_fdc_drq(bool state); DECLARE_FLOPPY_FORMATS( b2m_floppy_formats ); }; diff --git a/src/mess/includes/nes.h b/src/mess/includes/nes.h index 451c901de9c..d1b30002232 100644 --- a/src/mess/includes/nes.h +++ b/src/mess/includes/nes.h @@ -1,8 +1,8 @@ /***************************************************************************** - nes.h + nes.h - Nintendo Entertainment System (Famicom) + Nintendo Entertainment System (Famicom) ****************************************************************************/ diff --git a/src/mess/includes/special.h b/src/mess/includes/special.h index 6c964f3e6ec..d53187a981e 100644 --- a/src/mess/includes/special.h +++ b/src/mess/includes/special.h @@ -95,7 +95,7 @@ public: UINT32 screen_update_specimx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(special_reset); TIMER_CALLBACK_MEMBER(setup_pit8253_gates); - void fdc_drq(bool state); + void fdc_drq(bool state); DECLARE_FLOPPY_FORMATS( specimx_floppy_formats ); }; diff --git a/src/mess/machine/b2m.c b/src/mess/machine/b2m.c index bf319478434..15b2a6b7976 100644 --- a/src/mess/machine/b2m.c +++ b/src/mess/machine/b2m.c @@ -224,17 +224,17 @@ WRITE8_MEMBER(b2m_state::b2m_ext_8255_portc_w) if (m_b2m_drive!=drive) { m_b2m_drive = drive; } - + if (m_b2m_side!=side) { m_b2m_side = side; - floppy->ss_w(side); + floppy->ss_w(side); } /* - When bit 5 is set CPU is in HALT state and stay there until - DRQ is triggered from floppy side - */ - - if ((data & 0xf0)==0x20) { + When bit 5 is set CPU is in HALT state and stay there until + DRQ is triggered from floppy side + */ + + if ((data & 0xf0)==0x20) { m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); } } diff --git a/src/mess/machine/c1581.c b/src/mess/machine/c1581.c index 11e7d9171ef..ca056529390 100644 --- a/src/mess/machine/c1581.c +++ b/src/mess/machine/c1581.c @@ -8,10 +8,10 @@ **********************************************************************/ /* - - TODO: - - wd_fdc drops the busy bit too soon, c1581 aborts reading the sector ID after the first CRC byte @CD17 + TODO: + + - wd_fdc drops the busy bit too soon, c1581 aborts reading the sector ID after the first CRC byte @CD17 */ @@ -146,18 +146,18 @@ READ8_MEMBER( base_c1581_device::cia_pa_r ) { /* - bit description + bit description - PA0 - PA1 /RDY - PA2 - PA3 DEV# SEL (SW1) - PA4 DEV# SEL (SW1) - PA5 - PA6 - PA7 /DISK CHNG + PA0 + PA1 /RDY + PA2 + PA3 DEV# SEL (SW1) + PA4 DEV# SEL (SW1) + PA5 + PA6 + PA7 /DISK CHNG - */ + */ UINT8 data = 0; @@ -177,18 +177,18 @@ WRITE8_MEMBER( base_c1581_device::cia_pa_w ) { /* - bit description + bit description - PA0 SIDE0 - PA1 - PA2 /MOTOR - PA3 - PA4 - PA5 POWER LED - PA6 ACT LED - PA7 + PA0 SIDE0 + PA1 + PA2 /MOTOR + PA3 + PA4 + PA5 POWER LED + PA6 ACT LED + PA7 - */ + */ // side select m_floppy->ss_w(BIT(data, 0)); @@ -207,18 +207,18 @@ READ8_MEMBER( base_c1581_device::cia_pb_r ) { /* - bit description + bit description - PB0 DATA IN - PB1 - PB2 CLK IN - PB3 - PB4 - PB5 - PB6 /WPRT - PB7 ATN IN + PB0 DATA IN + PB1 + PB2 CLK IN + PB3 + PB4 + PB5 + PB6 /WPRT + PB7 ATN IN - */ + */ UINT8 data = 0; @@ -241,18 +241,18 @@ WRITE8_MEMBER( base_c1581_device::cia_pb_w ) { /* - bit description + bit description - PB0 - PB1 DATA OUT - PB2 - PB3 CLK OUT - PB4 ATN ACK - PB5 FAST SER DIR - PB6 - PB7 + PB0 + PB1 DATA OUT + PB2 + PB3 CLK OUT + PB4 ATN ACK + PB5 FAST SER DIR + PB6 + PB7 - */ + */ // data out m_data_out = BIT(data, 1); diff --git a/src/mess/machine/c8280.c b/src/mess/machine/c8280.c index 734778c4a5b..b641881d404 100644 --- a/src/mess/machine/c8280.c +++ b/src/mess/machine/c8280.c @@ -9,11 +9,11 @@ /* - TODO: + TODO: - - format - - wd1772: track description 80x4e 12x00 3xf6 fc 50x4e 12x00 3xf5 fe 2x00 2x01 f7 22x4e 12x00 3xf5 fb 256xaa f7 54x4e + - format + + wd1772: track description 80x4e 12x00 3xf6 fc 50x4e 12x00 3xf5 fe 2x00 2x01 f7 22x4e 12x00 3xf5 fb 256xaa f7 54x4e */ diff --git a/src/mess/machine/cmdhd.c b/src/mess/machine/cmdhd.c index ce01bde8d63..17d2878425e 100644 --- a/src/mess/machine/cmdhd.c +++ b/src/mess/machine/cmdhd.c @@ -247,17 +247,17 @@ void cmd_hd_device::cbm_iec_reset(int state) WRITE8_MEMBER( cmd_hd_device::led_w ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + */ } diff --git a/src/mess/machine/comx_fd.c b/src/mess/machine/comx_fd.c index 06b0910dade..fff28fd1df7 100644 --- a/src/mess/machine/comx_fd.c +++ b/src/mess/machine/comx_fd.c @@ -261,16 +261,16 @@ void comx_fd_device::comx_io_w(address_space &space, offs_t offset, UINT8 data) { /* - bit description + bit description - 0 FDC A0 - 1 FDC A1 - 2 DRIVE0 - 3 DRIVE1 - 4 F9 DISB - 5 SIDE SELECT + 0 FDC A0 + 1 FDC A1 + 2 DRIVE0 + 3 DRIVE1 + 4 F9 DISB + 5 SIDE SELECT - */ + */ // latch data to F3 m_addr = data & 0x03; diff --git a/src/mess/machine/comx_prn.c b/src/mess/machine/comx_prn.c index de2484a4c3f..8053010806d 100644 --- a/src/mess/machine/comx_prn.c +++ b/src/mess/machine/comx_prn.c @@ -140,33 +140,33 @@ UINT8 comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *extr UINT8 comx_prn_device::comx_io_r(address_space &space, offs_t offset) { /* - Parallel: + Parallel: - INP 2 for the printer status, where: - b0=1: Acknowledge Fault - b1=0: Device Busy - b2=0: Paper Empty - b3=1: Device Not Selected + INP 2 for the printer status, where: + b0=1: Acknowledge Fault + b1=0: Device Busy + b2=0: Paper Empty + b3=1: Device Not Selected - Serial: + Serial: - INP 2 for the printer status and to start a new range of bits for the next byte. - */ + INP 2 for the printer status and to start a new range of bits for the next byte. + */ /* - bit description + bit description - 0 Acknowledge Fault - 1 Device Busy - 2 Paper Empty - 3 Device Not Selected - 4 - 5 - 6 - 7 + 0 Acknowledge Fault + 1 Device Busy + 2 Paper Empty + 3 Device Not Selected + 4 + 5 + 6 + 7 - */ + */ UINT8 data = 0; @@ -186,14 +186,14 @@ UINT8 comx_prn_device::comx_io_r(address_space &space, offs_t offset) void comx_prn_device::comx_io_w(address_space &space, offs_t offset, UINT8 data) { /* - Parallel: + Parallel: - OUT 2 is used to send a byte to the printer + OUT 2 is used to send a byte to the printer - Serial: + Serial: - OUT 2 is used to send a bit to the printer - */ + OUT 2 is used to send a bit to the printer + */ m_centronics->write(data); } diff --git a/src/mess/machine/comx_ram.h b/src/mess/machine/comx_ram.h index 805677cb1c7..95b86205f41 100644 --- a/src/mess/machine/comx_ram.h +++ b/src/mess/machine/comx_ram.h @@ -44,7 +44,7 @@ protected: private: optional_shared_ptr<UINT8> m_ram; - + int m_bank; }; diff --git a/src/mess/machine/comx_thm.c b/src/mess/machine/comx_thm.c index ea2f90411d2..ffb6b78f787 100644 --- a/src/mess/machine/comx_thm.c +++ b/src/mess/machine/comx_thm.c @@ -102,11 +102,11 @@ UINT8 comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *extr UINT8 comx_thm_device::comx_io_r(address_space &space, offs_t offset) { /* - INP 2 is used for the printer status, where: - b0=1: Printer Not Ready - b1=1: Energizing Head - b2=1: Head At Position 0 - */ + INP 2 is used for the printer status, where: + b0=1: Printer Not Ready + b1=1: Energizing Head + b2=1: Head At Position 0 + */ return 0; } @@ -119,10 +119,10 @@ UINT8 comx_thm_device::comx_io_r(address_space &space, offs_t offset) void comx_thm_device::comx_io_w(address_space &space, offs_t offset, UINT8 data) { /* - OUT 2 is used to control the thermal printer where: - Q = 0, b0-7: Pixel 1 to 8 - Q = 1, b7: Pixel 9 (if b0-6=#21) - Q = 1, b3=1: Move head right - Q = 1, b0-7=#12: Move head left - */ + OUT 2 is used to control the thermal printer where: + Q = 0, b0-7: Pixel 1 to 8 + Q = 1, b7: Pixel 9 (if b0-6=#21) + Q = 1, b3=1: Move head right + Q = 1, b0-7=#12: Move head left + */ } diff --git a/src/mess/machine/comxpl80.h b/src/mess/machine/comxpl80.h index c5bed225cb7..abb5e928dd2 100644 --- a/src/mess/machine/comxpl80.h +++ b/src/mess/machine/comxpl80.h @@ -30,7 +30,7 @@ class comx_pl80_device : public device_t, public: // construction/destruction comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - + // optional information overrides virtual const rom_entry *device_rom_region() const; virtual machine_config_constructor device_mconfig_additions() const; diff --git a/src/mess/machine/fd2000.c b/src/mess/machine/fd2000.c index cda3dd961b1..1605952bbcb 100644 --- a/src/mess/machine/fd2000.c +++ b/src/mess/machine/fd2000.c @@ -9,12 +9,12 @@ /* - TODO: + TODO: - - IEC - - VIA - - DP8473/PC8477A command extensions to upd765 - - D1M/D2M/D4M image format (http://ist.uwaterloo.ca/~schepers/formats/D2M-DNP.TXT) + - IEC + - VIA + - DP8473/PC8477A command extensions to upd765 + - D1M/D2M/D4M image format (http://ist.uwaterloo.ca/~schepers/formats/D2M-DNP.TXT) */ @@ -81,7 +81,7 @@ const rom_entry *fd2000_device::device_rom_region() const { default: return ROM_NAME( fd2000 ); - + case TYPE_FD4000: return ROM_NAME( fd4000 ); } @@ -121,19 +121,19 @@ ADDRESS_MAP_END READ8_MEMBER( fd2000_device::via_pa_r ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + + */ return 0; } @@ -141,37 +141,37 @@ READ8_MEMBER( fd2000_device::via_pa_r ) WRITE8_MEMBER( fd2000_device::via_pa_w ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 FAST DIR - 6 - 7 - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 FAST DIR + 6 + 7 + + */ } READ8_MEMBER( fd2000_device::via_pb_r ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 FDC INTRQ - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 FDC INTRQ + + */ UINT8 data = 0; @@ -184,19 +184,19 @@ READ8_MEMBER( fd2000_device::via_pb_r ) WRITE8_MEMBER( fd2000_device::via_pb_w ) { /* - - bit description - - 0 - 1 - 2 - 3 - 4 - 5 LED - 6 LED - 7 - - */ + + bit description + + 0 + 1 + 2 + 3 + 4 + 5 LED + 6 LED + 7 + + */ } static const via6522_interface via_intf = @@ -227,8 +227,8 @@ static SLOT_INTERFACE_START( fd4000_floppies ) SLOT_INTERFACE_END /* FLOPPY_FORMATS_MEMBER( fd2000_device::floppy_formats ) - FLOPPY_D81_FORMAT - FLOPPY_D2M_FORMAT + FLOPPY_D81_FORMAT + FLOPPY_D2M_FORMAT FLOPPY_FORMATS_END */ @@ -273,7 +273,7 @@ machine_config_constructor fd2000_device::device_mconfig_additions() const { default: return MACHINE_CONFIG_NAME( fd2000 ); - + case TYPE_FD4000: return MACHINE_CONFIG_NAME( fd4000 ); } @@ -293,7 +293,7 @@ void fd2000_device::device_config_complete() default: m_shortname = "fd2000"; break; - + case TYPE_FD4000: m_shortname = "fd4000"; break; diff --git a/src/mess/machine/iq151_disc2.h b/src/mess/machine/iq151_disc2.h index 5ead712023e..bfb513f9b01 100644 --- a/src/mess/machine/iq151_disc2.h +++ b/src/mess/machine/iq151_disc2.h @@ -24,7 +24,7 @@ public: // optional information overrides virtual machine_config_constructor device_mconfig_additions() const; virtual const rom_entry *device_rom_region() const; - + DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: diff --git a/src/mess/machine/lux10828.c b/src/mess/machine/lux10828.c index c7b5f0fc595..97d1c825390 100644 --- a/src/mess/machine/lux10828.c +++ b/src/mess/machine/lux10828.c @@ -676,7 +676,7 @@ READ8_MEMBER( luxor_55_10828_device::fdc_r ) if (!m_wait_enable && !m_fdc_irq && !m_fdc_drq) { fatalerror("Z80 WAIT not supported by MAME core\n"); - + m_maincpu->set_input_line(Z80_INPUT_LINE_WAIT, ASSERT_LINE); } diff --git a/src/mess/machine/mackbd.c b/src/mess/machine/mackbd.c index 769eff4a417..6eb60eb66f2 100644 --- a/src/mess/machine/mackbd.c +++ b/src/mess/machine/mackbd.c @@ -44,8 +44,8 @@ ---x Data to Mac The T1 line is "Option". - - There is a later M0110 keyboard version which uses a GI PIC1657; we do not have a dump of that version. + + There is a later M0110 keyboard version which uses a GI PIC1657; we do not have a dump of that version. */ diff --git a/src/mess/machine/nes.c b/src/mess/machine/nes.c index f9e82afdffb..14ada5774b3 100644 --- a/src/mess/machine/nes.c +++ b/src/mess/machine/nes.c @@ -1,8 +1,8 @@ /***************************************************************************** - nes.c + nes.c - Nintendo Entertainment System (Famicom) + Nintendo Entertainment System (Famicom) ****************************************************************************/ diff --git a/src/mess/machine/nubus_image.c b/src/mess/machine/nubus_image.c index 701d7015101..4204a7c39aa 100644 --- a/src/mess/machine/nubus_image.c +++ b/src/mess/machine/nubus_image.c @@ -206,7 +206,7 @@ void nubus_image_device::device_start() slotspace = get_slotspace(); superslotspace = get_super_slotspace(); -// printf("[image %p] slotspace = %x, super = %x\n", this, slotspace, superslotspace); +// printf("[image %p] slotspace = %x, super = %x\n", this, slotspace, superslotspace); m_nubus->install_device(slotspace, slotspace+3, read32_delegate(FUNC(nubus_image_device::image_r), this), write32_delegate(FUNC(nubus_image_device::image_w), this)); m_nubus->install_device(slotspace+4, slotspace+7, read32_delegate(FUNC(nubus_image_device::image_status_r), this), write32_delegate(FUNC(nubus_image_device::image_status_w), this)); @@ -263,6 +263,6 @@ READ32_MEMBER( nubus_image_device::image_super_r ) { UINT32 *image = (UINT32*)m_image->data; UINT32 data = image[offset]; - return ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24); + return ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24); } diff --git a/src/mess/machine/orion.c b/src/mess/machine/orion.c index 8b45ab024f0..545f3ae2894 100644 --- a/src/mess/machine/orion.c +++ b/src/mess/machine/orion.c @@ -172,7 +172,7 @@ WRITE8_MEMBER(orion_state::orion_disk_control_w) m_fdc->set_floppy(floppy); floppy->mon_w(0); - floppy->ss_w(((data & 0x10) >> 4) ^ 1); + floppy->ss_w(((data & 0x10) >> 4) ^ 1); } READ8_MEMBER(orion_state::orion128_floppy_r) diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c index 0c138749c77..dff2bf082c4 100644 --- a/src/mess/machine/pc.c +++ b/src/mess/machine/pc.c @@ -1182,7 +1182,7 @@ WRITE8_MEMBER(pc_state::pcjr_fdc_dor_w) UINT8 pdor = m_pcjr_dor; upd765a_device *fdc = machine().device<upd765a_device>("upd765"); floppy_image_device *floppy = machine().device<floppy_connector>("upd765:0")->get_device(); - m_pcjr_dor = data; + m_pcjr_dor = data; if(floppy) floppy->mon_w(!(m_pcjr_dor & 1)); @@ -1194,7 +1194,7 @@ WRITE8_MEMBER(pc_state::pcjr_fdc_dor_w) if((pdor^m_pcjr_dor) & 0x80) fdc->reset(); - + if(m_pcjr_dor & 0x20) { if((pdor & 0x40) && !(m_pcjr_dor & 0x40)) m_pcjr_watchdog->adjust(attotime::from_seconds(3)); @@ -1468,7 +1468,7 @@ MACHINE_START_MEMBER(pc_state,pcjr) m_maincpu->set_irq_acknowledge_callback(pc_irq_callback); machine().device<upd765a_device>("upd765")->set_ready_line_connected(false); - + m_pic8259 = machine().device("pic8259"); m_dma8237 = NULL; diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c index 32a02e8771a..7169c7f4902 100644 --- a/src/mess/machine/sms.c +++ b/src/mess/machine/sms.c @@ -885,7 +885,7 @@ READ8_MEMBER(sms_state::sms_sscope_r) WRITE8_MEMBER(sms_state::sms_sscope_w) { screen_device *screen = machine().first_screen(); - + m_sscope_state = data; // There are occurrences when Sega Scope's state changes after VBLANK, or at diff --git a/src/mess/machine/special.c b/src/mess/machine/special.c index 3ead45b349f..bfe357c9ace 100644 --- a/src/mess/machine/special.c +++ b/src/mess/machine/special.c @@ -266,7 +266,7 @@ WRITE8_MEMBER( special_state::specimx_disk_ctrl_w ) switch(offset) { - case 0 : + case 0 : m_maincpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE); break; case 2 : @@ -400,10 +400,10 @@ READ8_MEMBER( special_state::erik_disk_reg_r ) WRITE8_MEMBER( special_state::erik_disk_reg_w ) { /* - wd17xx_set_side (m_fdc,data & 1); - wd17xx_set_drive(m_fdc,(data >> 1) & 1); - wd17xx_dden_w(m_fdc, BIT(data, 2)); - floppy_mon_w(floppy_get_device(machine(), BIT(data, 1)), 0); - floppy_mon_w(floppy_get_device(machine(), BIT(data, 1) ^ 1), 1); - floppy_drive_set_ready_state(floppy_get_device(machine(), BIT(data, 1)), 1, 1);*/ + wd17xx_set_side (m_fdc,data & 1); + wd17xx_set_drive(m_fdc,(data >> 1) & 1); + wd17xx_dden_w(m_fdc, BIT(data, 2)); + floppy_mon_w(floppy_get_device(machine(), BIT(data, 1)), 0); + floppy_mon_w(floppy_get_device(machine(), BIT(data, 1) ^ 1), 1); + floppy_drive_set_ready_state(floppy_get_device(machine(), BIT(data, 1)), 1, 1);*/ } |
