diff options
Diffstat (limited to 'src/mess')
71 files changed, 420 insertions, 421 deletions
diff --git a/src/mess/drivers/a7800.c b/src/mess/drivers/a7800.c index 0ab4845df74..da93bc8618e 100644 --- a/src/mess/drivers/a7800.c +++ b/src/mess/drivers/a7800.c @@ -62,13 +62,13 @@ added. 2013/10/16 Robert Tuccitto Added Phase Shifts 24.7, 25.2, 26.2, 27.2. - Phase Shifts 24.7 through 27.7 degrees with 0.5 degree + Phase Shifts 24.7 through 27.7 degrees with 0.5 degree increments documented. Phase Shift 26.2 degrees made active. Fixed typo under 26.7 7$. 2013/10/27 Robert Tuccitto Modernized screen parameters for NTSC & PAL. - 2013/11/03 Fixed correctly typo under 26.7 7$. + 2013/11/03 Fixed correctly typo under 26.7 7$. ***************************************************************************/ #include "emu.h" @@ -98,18 +98,18 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state ) AM_RANGE(0x0460, 0x046f) /* XBOARD POKEY2 */ AM_RANGE(0x0470, 0x047f) /* XBOARD CTRL */ AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_RAM /* RIOT RAM */ - AM_RANGE(0x1000, 0x17ff) AM_RAM /* hs SRAM */ + AM_RANGE(0x1000, 0x17ff) AM_RAM /* hs SRAM */ AM_RANGE(0x1800, 0x27ff) AM_RAM AM_RANGE(0x2800, 0x2fff) AM_RAMBANK("bank7") /* MAINRAM */ AM_RANGE(0x3000, 0x37ff) AM_RAMBANK("bank7") /* MAINRAM */ AM_RANGE(0x3800, 0x3fff) AM_RAMBANK("bank7") /* MAINRAM */ - AM_RANGE(0x3000, 0x3fff) AM_ROM /* hs ROM space */ + AM_RANGE(0x3000, 0x3fff) AM_ROM /* hs ROM space */ AM_RANGE(0x4000, 0x7fff) AM_ROMBANK("bank1") /* f18 hornet */ AM_RANGE(0x4000, 0xffff) AM_WRITE(a7800_cart_w) /* XBOARD SRAM */ - AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") /* sc */ + AM_RANGE(0x8000, 0x9fff) AM_ROMBANK("bank2") /* sc */ AM_RANGE(0xa000, 0xbfff) AM_ROMBANK("bank3") /* sc + ac */ AM_RANGE(0xc000, 0xdfff) AM_ROMBANK("bank4") /* ac */ - AM_RANGE(0xe000, 0xffff) AM_ROM + AM_RANGE(0xe000, 0xffff) AM_ROM ADDRESS_MAP_END @@ -160,100 +160,100 @@ INPUT_PORTS_END ***************************************************************************/ #define NTSC_GREY \ - MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \ - MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \ - MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \ - MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF ) + MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \ + MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \ + MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \ + MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF ) #define NTSC_GOLD \ - MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \ - MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \ - MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \ - MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 ) + MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \ + MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \ + MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \ + MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xF7,0x97 ) #define NTSC_ORANGE \ - MAKE_RGB(0x31,0x00,0x00), MAKE_RGB(0x42,0x06,0x00), MAKE_RGB(0x53,0x17,0x00), MAKE_RGB(0x64,0x28,0x00), \ - MAKE_RGB(0x75,0x39,0x00), MAKE_RGB(0x86,0X4A,0x00), MAKE_RGB(0x97,0x5B,0x0B), MAKE_RGB(0xA8,0x6C,0x1C), \ - MAKE_RGB(0xB9,0x7D,0x2D), MAKE_RGB(0xCA,0x8E,0x3E), MAKE_RGB(0xDB,0x9F,0x4F), MAKE_RGB(0xEC,0xB0,0x60), \ - MAKE_RGB(0xFD,0xC1,0x71), MAKE_RGB(0xFF,0xD2,0x86), MAKE_RGB(0xFF,0xE3,0x9D), MAKE_RGB(0xFF,0xF4,0xB3 ) + MAKE_RGB(0x31,0x00,0x00), MAKE_RGB(0x42,0x06,0x00), MAKE_RGB(0x53,0x17,0x00), MAKE_RGB(0x64,0x28,0x00), \ + MAKE_RGB(0x75,0x39,0x00), MAKE_RGB(0x86,0X4A,0x00), MAKE_RGB(0x97,0x5B,0x0B), MAKE_RGB(0xA8,0x6C,0x1C), \ + MAKE_RGB(0xB9,0x7D,0x2D), MAKE_RGB(0xCA,0x8E,0x3E), MAKE_RGB(0xDB,0x9F,0x4F), MAKE_RGB(0xEC,0xB0,0x60), \ + MAKE_RGB(0xFD,0xC1,0x71), MAKE_RGB(0xFF,0xD2,0x86), MAKE_RGB(0xFF,0xE3,0x9D), MAKE_RGB(0xFF,0xF4,0xB3 ) #define NTSC_RED_ORANGE \ - MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x08,0x00), MAKE_RGB(0x71,0x19,0x00), \ - MAKE_RGB(0x82,0x2A,0x0F), MAKE_RGB(0x93,0x3B,0x20), MAKE_RGB(0xA4,0x4C,0x31), MAKE_RGB(0xB5,0x5D,0x42), \ - MAKE_RGB(0xC6,0x6E,0x53), MAKE_RGB(0xD7,0x7F,0x64), MAKE_RGB(0xE8,0x90,0x75), MAKE_RGB(0xF9,0xA1,0x86), \ - MAKE_RGB(0xFF,0xB2,0x9A), MAKE_RGB(0xFF,0xC3,0xB0), MAKE_RGB(0xFF,0xD4,0xC6), MAKE_RGB(0xFF,0xE5,0xDC ) + MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x08,0x00), MAKE_RGB(0x71,0x19,0x00), \ + MAKE_RGB(0x82,0x2A,0x0F), MAKE_RGB(0x93,0x3B,0x20), MAKE_RGB(0xA4,0x4C,0x31), MAKE_RGB(0xB5,0x5D,0x42), \ + MAKE_RGB(0xC6,0x6E,0x53), MAKE_RGB(0xD7,0x7F,0x64), MAKE_RGB(0xE8,0x90,0x75), MAKE_RGB(0xF9,0xA1,0x86), \ + MAKE_RGB(0xFF,0xB2,0x9A), MAKE_RGB(0xFF,0xC3,0xB0), MAKE_RGB(0xFF,0xD4,0xC6), MAKE_RGB(0xFF,0xE5,0xDC ) #define NTSC_PINK \ - MAKE_RGB(0x3E,0x00,0x06), MAKE_RGB(0x4F,0x00,0x12), MAKE_RGB(0x60,0x00,0x1E), MAKE_RGB(0x71,0x0E,0x2E), \ - MAKE_RGB(0x82,0x1F,0x3F), MAKE_RGB(0x93,0x30,0x50), MAKE_RGB(0xA4,0x41,0x61), MAKE_RGB(0xB5,0x52,0x72), \ - MAKE_RGB(0xC6,0x63,0x83), MAKE_RGB(0xD7,0x74,0x94), MAKE_RGB(0xE8,0x85,0xA5), MAKE_RGB(0xF9,0x96,0xB6), \ - MAKE_RGB(0xFF,0xA7,0xCB), MAKE_RGB(0xFF,0xB8,0xE1), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 ) + MAKE_RGB(0x3E,0x00,0x06), MAKE_RGB(0x4F,0x00,0x12), MAKE_RGB(0x60,0x00,0x1E), MAKE_RGB(0x71,0x0E,0x2E), \ + MAKE_RGB(0x82,0x1F,0x3F), MAKE_RGB(0x93,0x30,0x50), MAKE_RGB(0xA4,0x41,0x61), MAKE_RGB(0xB5,0x52,0x72), \ + MAKE_RGB(0xC6,0x63,0x83), MAKE_RGB(0xD7,0x74,0x94), MAKE_RGB(0xE8,0x85,0xA5), MAKE_RGB(0xF9,0x96,0xB6), \ + MAKE_RGB(0xFF,0xA7,0xCB), MAKE_RGB(0xFF,0xB8,0xE1), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 ) #define NTSC_PURPLE \ - MAKE_RGB(0x32,0x00,0x38), MAKE_RGB(0x43,0x00,0x44), MAKE_RGB(0x54,0x00,0x50), MAKE_RGB(0x65,0x0C,0x5F), \ - MAKE_RGB(0x76,0x1D,0x70), MAKE_RGB(0x87,0x2E,0x81), MAKE_RGB(0x98,0x3F,0x92), MAKE_RGB(0xA9,0x50,0xA3), \ - MAKE_RGB(0xBA,0x61,0xB4), MAKE_RGB(0xCB,0x72,0xC5), MAKE_RGB(0xDC,0x83,0xD6), MAKE_RGB(0xED,0x94,0xE4), \ - MAKE_RGB(0xFE,0xA5,0xE4), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 ) + MAKE_RGB(0x32,0x00,0x38), MAKE_RGB(0x43,0x00,0x44), MAKE_RGB(0x54,0x00,0x50), MAKE_RGB(0x65,0x0C,0x5F), \ + MAKE_RGB(0x76,0x1D,0x70), MAKE_RGB(0x87,0x2E,0x81), MAKE_RGB(0x98,0x3F,0x92), MAKE_RGB(0xA9,0x50,0xA3), \ + MAKE_RGB(0xBA,0x61,0xB4), MAKE_RGB(0xCB,0x72,0xC5), MAKE_RGB(0xDC,0x83,0xD6), MAKE_RGB(0xED,0x94,0xE4), \ + MAKE_RGB(0xFE,0xA5,0xE4), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 ) #define NTSC_PURPLE_BLUE \ - MAKE_RGB(0x1B,0x00,0x5F), MAKE_RGB(0x2C,0x00,0x6B), MAKE_RGB(0x3D,0x00,0x77), MAKE_RGB(0x4E,0x11,0x88), \ - MAKE_RGB(0x5F,0x22,0x99), MAKE_RGB(0x70,0x33,0xAA), MAKE_RGB(0x81,0x44,0xBB), MAKE_RGB(0x92,0x55,0xCC), \ - MAKE_RGB(0xA3,0x66,0xDD), MAKE_RGB(0xB4,0x77,0xED), MAKE_RGB(0xC5,0x88,0xED), MAKE_RGB(0xD6,0x99,0xED), \ - MAKE_RGB(0xE7,0xAA,0xED), MAKE_RGB(0xF8,0xBB,0xED), MAKE_RGB(0xFF,0xCC,0xF0), MAKE_RGB(0xFF,0xDD,0xF5 ) + MAKE_RGB(0x1B,0x00,0x5F), MAKE_RGB(0x2C,0x00,0x6B), MAKE_RGB(0x3D,0x00,0x77), MAKE_RGB(0x4E,0x11,0x88), \ + MAKE_RGB(0x5F,0x22,0x99), MAKE_RGB(0x70,0x33,0xAA), MAKE_RGB(0x81,0x44,0xBB), MAKE_RGB(0x92,0x55,0xCC), \ + MAKE_RGB(0xA3,0x66,0xDD), MAKE_RGB(0xB4,0x77,0xED), MAKE_RGB(0xC5,0x88,0xED), MAKE_RGB(0xD6,0x99,0xED), \ + MAKE_RGB(0xE7,0xAA,0xED), MAKE_RGB(0xF8,0xBB,0xED), MAKE_RGB(0xFF,0xCC,0xF0), MAKE_RGB(0xFF,0xDD,0xF5 ) #define NTSC_BLUE1 \ - MAKE_RGB(0x00,0x00,0x72), MAKE_RGB(0x10,0x00,0x7E), MAKE_RGB(0x21,0x0D,0x8E), MAKE_RGB(0x32,0x1E,0x9F), \ - MAKE_RGB(0x43,0x2F,0xB0), MAKE_RGB(0x54,0x40,0xC1), MAKE_RGB(0x65,0x51,0xD2), MAKE_RGB(0x76,0x62,0xE3), \ - MAKE_RGB(0x87,0x73,0xF4), MAKE_RGB(0x98,0x84,0xF9), MAKE_RGB(0xA9,0x95,0xF9), MAKE_RGB(0xBA,0xA6,0xF9), \ - MAKE_RGB(0xCB,0xB7,0xF9), MAKE_RGB(0xDC,0xC8,0xF9), MAKE_RGB(0xED,0xD9,0xF9), MAKE_RGB(0xFE,0xEA,0xF9 ) + MAKE_RGB(0x00,0x00,0x72), MAKE_RGB(0x10,0x00,0x7E), MAKE_RGB(0x21,0x0D,0x8E), MAKE_RGB(0x32,0x1E,0x9F), \ + MAKE_RGB(0x43,0x2F,0xB0), MAKE_RGB(0x54,0x40,0xC1), MAKE_RGB(0x65,0x51,0xD2), MAKE_RGB(0x76,0x62,0xE3), \ + MAKE_RGB(0x87,0x73,0xF4), MAKE_RGB(0x98,0x84,0xF9), MAKE_RGB(0xA9,0x95,0xF9), MAKE_RGB(0xBA,0xA6,0xF9), \ + MAKE_RGB(0xCB,0xB7,0xF9), MAKE_RGB(0xDC,0xC8,0xF9), MAKE_RGB(0xED,0xD9,0xF9), MAKE_RGB(0xFE,0xEA,0xF9 ) #define NTSC_BLUE2 \ - MAKE_RGB(0x00,0x00,0x65), MAKE_RGB(0x00,0x0C,0x7A), MAKE_RGB(0x05,0x1D,0x8E), MAKE_RGB(0x16,0x2E,0x9F), \ - MAKE_RGB(0x27,0x3F,0xB0), MAKE_RGB(0x38,0x50,0xC1), MAKE_RGB(0x49,0x61,0xD2), MAKE_RGB(0x5A,0x72,0xE3), \ - MAKE_RGB(0x6B,0x83,0xF4), MAKE_RGB(0x7C,0x94,0xFF), MAKE_RGB(0x8D,0xA5,0xFF), MAKE_RGB(0x9E,0xB6,0xFF), \ - MAKE_RGB(0xAF,0xC7,0xFF), MAKE_RGB(0xC0,0xD8,0xFF), MAKE_RGB(0xD1,0xE9,0xFF), MAKE_RGB(0xE2,0xFA,0xFF ) + MAKE_RGB(0x00,0x00,0x65), MAKE_RGB(0x00,0x0C,0x7A), MAKE_RGB(0x05,0x1D,0x8E), MAKE_RGB(0x16,0x2E,0x9F), \ + MAKE_RGB(0x27,0x3F,0xB0), MAKE_RGB(0x38,0x50,0xC1), MAKE_RGB(0x49,0x61,0xD2), MAKE_RGB(0x5A,0x72,0xE3), \ + MAKE_RGB(0x6B,0x83,0xF4), MAKE_RGB(0x7C,0x94,0xFF), MAKE_RGB(0x8D,0xA5,0xFF), MAKE_RGB(0x9E,0xB6,0xFF), \ + MAKE_RGB(0xAF,0xC7,0xFF), MAKE_RGB(0xC0,0xD8,0xFF), MAKE_RGB(0xD1,0xE9,0xFF), MAKE_RGB(0xE2,0xFA,0xFF ) #define NTSC_LIGHT_BLUE \ - MAKE_RGB(0x00,0x0D,0x48), MAKE_RGB(0x00,0x1E,0x5E), MAKE_RGB(0x00,0x2F,0x74), MAKE_RGB(0x00,0x40,0x8A), \ - MAKE_RGB(0x11,0x51,0x9B), MAKE_RGB(0x22,0x62,0xAC), MAKE_RGB(0x33,0x73,0xBD), MAKE_RGB(0x44,0x84,0xCE), \ - MAKE_RGB(0x55,0x95,0xDF), MAKE_RGB(0x66,0xA6,0xF0), MAKE_RGB(0x77,0xB7,0xFF), MAKE_RGB(0x88,0xC8,0xFF), \ - MAKE_RGB(0x99,0xD9,0xFF), MAKE_RGB(0xAA,0xEA,0xFF), MAKE_RGB(0xBB,0xFB,0xFF), MAKE_RGB(0xCC,0xFF,0xFF ) + MAKE_RGB(0x00,0x0D,0x48), MAKE_RGB(0x00,0x1E,0x5E), MAKE_RGB(0x00,0x2F,0x74), MAKE_RGB(0x00,0x40,0x8A), \ + MAKE_RGB(0x11,0x51,0x9B), MAKE_RGB(0x22,0x62,0xAC), MAKE_RGB(0x33,0x73,0xBD), MAKE_RGB(0x44,0x84,0xCE), \ + MAKE_RGB(0x55,0x95,0xDF), MAKE_RGB(0x66,0xA6,0xF0), MAKE_RGB(0x77,0xB7,0xFF), MAKE_RGB(0x88,0xC8,0xFF), \ + MAKE_RGB(0x99,0xD9,0xFF), MAKE_RGB(0xAA,0xEA,0xFF), MAKE_RGB(0xBB,0xFB,0xFF), MAKE_RGB(0xCC,0xFF,0xFF ) #define NTSC_TURQUOISE \ - MAKE_RGB(0x00,0x1C,0x1C), MAKE_RGB(0x00,0x2D,0x32), MAKE_RGB(0x00,0x3E,0x49), MAKE_RGB(0x00,0x4F,0x5F), \ - MAKE_RGB(0x05,0x60,0x73), MAKE_RGB(0x16,0x71,0x84), MAKE_RGB(0x27,0x82,0x95), MAKE_RGB(0x38,0x93,0xA6), \ - MAKE_RGB(0x49,0xA4,0xB7), MAKE_RGB(0x5A,0xB5,0xC8), MAKE_RGB(0x6B,0xC6,0xD9), MAKE_RGB(0x7C,0xD7,0xEA), \ - MAKE_RGB(0x8D,0xE8,0xFB), MAKE_RGB(0x9E,0xF9,0xFF), MAKE_RGB(0xAF,0xFF,0xFF), MAKE_RGB(0xC0,0xFF,0xFF ) + MAKE_RGB(0x00,0x1C,0x1C), MAKE_RGB(0x00,0x2D,0x32), MAKE_RGB(0x00,0x3E,0x49), MAKE_RGB(0x00,0x4F,0x5F), \ + MAKE_RGB(0x05,0x60,0x73), MAKE_RGB(0x16,0x71,0x84), MAKE_RGB(0x27,0x82,0x95), MAKE_RGB(0x38,0x93,0xA6), \ + MAKE_RGB(0x49,0xA4,0xB7), MAKE_RGB(0x5A,0xB5,0xC8), MAKE_RGB(0x6B,0xC6,0xD9), MAKE_RGB(0x7C,0xD7,0xEA), \ + MAKE_RGB(0x8D,0xE8,0xFB), MAKE_RGB(0x9E,0xF9,0xFF), MAKE_RGB(0xAF,0xFF,0xFF), MAKE_RGB(0xC0,0xFF,0xFF ) #define NTSC_GREEN_BLUE \ - MAKE_RGB(0x00,0x25,0x0B), MAKE_RGB(0x00,0x36,0x10), MAKE_RGB(0x00,0x47,0x18), MAKE_RGB(0x00,0x58,0x2E), \ - MAKE_RGB(0x07,0x69,0x42), MAKE_RGB(0x18,0x7A,0x53), MAKE_RGB(0x29,0x8B,0x64), MAKE_RGB(0x3A,0x9C,0x75), \ - MAKE_RGB(0x4B,0xAD,0x86), MAKE_RGB(0x5C,0xBE,0x97), MAKE_RGB(0x6D,0xCF,0xA8), MAKE_RGB(0x7E,0xE0,0xB9), \ - MAKE_RGB(0x8F,0xF1,0xCA), MAKE_RGB(0xA0,0xFF,0xDA), MAKE_RGB(0xB1,0xFF,0xE6), MAKE_RGB(0xC2,0xFF,0xF2 ) + MAKE_RGB(0x00,0x25,0x0B), MAKE_RGB(0x00,0x36,0x10), MAKE_RGB(0x00,0x47,0x18), MAKE_RGB(0x00,0x58,0x2E), \ + MAKE_RGB(0x07,0x69,0x42), MAKE_RGB(0x18,0x7A,0x53), MAKE_RGB(0x29,0x8B,0x64), MAKE_RGB(0x3A,0x9C,0x75), \ + MAKE_RGB(0x4B,0xAD,0x86), MAKE_RGB(0x5C,0xBE,0x97), MAKE_RGB(0x6D,0xCF,0xA8), MAKE_RGB(0x7E,0xE0,0xB9), \ + MAKE_RGB(0x8F,0xF1,0xCA), MAKE_RGB(0xA0,0xFF,0xDA), MAKE_RGB(0xB1,0xFF,0xE6), MAKE_RGB(0xC2,0xFF,0xF2 ) #define NTSC_GREEN \ - MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x04,0x5A,0x1A), \ - MAKE_RGB(0x15,0x6B,0x1A), MAKE_RGB(0x26,0x7C,0x22), MAKE_RGB(0x37,0x8D,0x33), MAKE_RGB(0x48,0x9E,0x44), \ - MAKE_RGB(0x59,0xAF,0x55), MAKE_RGB(0x6A,0xC0,0x66), MAKE_RGB(0x7B,0xD1,0x77), MAKE_RGB(0x8C,0xE2,0x88), \ - MAKE_RGB(0x9D,0xF3,0x99), MAKE_RGB(0xAE,0xFF,0xA8), MAKE_RGB(0xBF,0xFF,0xB4), MAKE_RGB(0xD0,0xFF,0xC0 ) + MAKE_RGB(0x00,0x27,0x0C), MAKE_RGB(0x00,0x38,0x11), MAKE_RGB(0x00,0x49,0x16), MAKE_RGB(0x04,0x5A,0x1A), \ + MAKE_RGB(0x15,0x6B,0x1A), MAKE_RGB(0x26,0x7C,0x22), MAKE_RGB(0x37,0x8D,0x33), MAKE_RGB(0x48,0x9E,0x44), \ + MAKE_RGB(0x59,0xAF,0x55), MAKE_RGB(0x6A,0xC0,0x66), MAKE_RGB(0x7B,0xD1,0x77), MAKE_RGB(0x8C,0xE2,0x88), \ + MAKE_RGB(0x9D,0xF3,0x99), MAKE_RGB(0xAE,0xFF,0xA8), MAKE_RGB(0xBF,0xFF,0xB4), MAKE_RGB(0xD0,0xFF,0xC0 ) #define NTSC_YELLOW_GREEN \ - MAKE_RGB(0x00,0x21,0x0A), MAKE_RGB(0x00,0x32,0x0F), MAKE_RGB(0x0A,0x43,0x11), MAKE_RGB(0x1B,0x54,0x11), \ - MAKE_RGB(0x2C,0x65,0x11), MAKE_RGB(0x3D,0x76,0x11), MAKE_RGB(0x4E,0x87,0x11), MAKE_RGB(0x5F,0x98,0x1E), \ - MAKE_RGB(0x70,0xA9,0x2F), MAKE_RGB(0x81,0xBA,0x40), MAKE_RGB(0x92,0xCB,0x51), MAKE_RGB(0xA3,0xDC,0x62), \ - MAKE_RGB(0xB4,0xED,0x73), MAKE_RGB(0xC5,0xFE,0x84), MAKE_RGB(0xD6,0xFF,0x90), MAKE_RGB(0xE7,0xFF,0x9C ) + MAKE_RGB(0x00,0x21,0x0A), MAKE_RGB(0x00,0x32,0x0F), MAKE_RGB(0x0A,0x43,0x11), MAKE_RGB(0x1B,0x54,0x11), \ + MAKE_RGB(0x2C,0x65,0x11), MAKE_RGB(0x3D,0x76,0x11), MAKE_RGB(0x4E,0x87,0x11), MAKE_RGB(0x5F,0x98,0x1E), \ + MAKE_RGB(0x70,0xA9,0x2F), MAKE_RGB(0x81,0xBA,0x40), MAKE_RGB(0x92,0xCB,0x51), MAKE_RGB(0xA3,0xDC,0x62), \ + MAKE_RGB(0xB4,0xED,0x73), MAKE_RGB(0xC5,0xFE,0x84), MAKE_RGB(0xD6,0xFF,0x90), MAKE_RGB(0xE7,0xFF,0x9C ) #define NTSC_ORANGE_GREEN \ - MAKE_RGB(0x05,0x13,0x04), MAKE_RGB(0x16,0x24,0x04), MAKE_RGB(0x27,0x35,0x04), MAKE_RGB(0x38,0x46,0x04), \ - MAKE_RGB(0x49,0x57,0x04), MAKE_RGB(0x5A,0x68,0x04), MAKE_RGB(0x6B,0x79,0x04), MAKE_RGB(0x7C,0x8A,0x09), \ - MAKE_RGB(0x8D,0x9B,0x1A), MAKE_RGB(0x9E,0xAC,0x2B), MAKE_RGB(0xAF,0xBD,0x3C), MAKE_RGB(0xC0,0xCE,0x4D), \ - MAKE_RGB(0xD1,0xDF,0x5E), MAKE_RGB(0xE2,0xF0,0x6F), MAKE_RGB(0xF3,0xFF,0x80), MAKE_RGB(0xFF,0xFF,0x8D ) + MAKE_RGB(0x05,0x13,0x04), MAKE_RGB(0x16,0x24,0x04), MAKE_RGB(0x27,0x35,0x04), MAKE_RGB(0x38,0x46,0x04), \ + MAKE_RGB(0x49,0x57,0x04), MAKE_RGB(0x5A,0x68,0x04), MAKE_RGB(0x6B,0x79,0x04), MAKE_RGB(0x7C,0x8A,0x09), \ + MAKE_RGB(0x8D,0x9B,0x1A), MAKE_RGB(0x9E,0xAC,0x2B), MAKE_RGB(0xAF,0xBD,0x3C), MAKE_RGB(0xC0,0xCE,0x4D), \ + MAKE_RGB(0xD1,0xDF,0x5E), MAKE_RGB(0xE2,0xF0,0x6F), MAKE_RGB(0xF3,0xFF,0x80), MAKE_RGB(0xFF,0xFF,0x8D ) #define NTSC_LIGHT_ORANGE \ - MAKE_RGB(0x21,0x02,0x00), MAKE_RGB(0x32,0x13,0x00), MAKE_RGB(0x43,0x24,0x00), MAKE_RGB(0x54,0x35,0x00), \ - MAKE_RGB(0x65,0x46,0x00), MAKE_RGB(0x76,0x57,0x00), MAKE_RGB(0x87,0x68,0x00), MAKE_RGB(0x98,0x79,0x0C), \ - MAKE_RGB(0xA9,0x8A,0x1D), MAKE_RGB(0xBA,0x9B,0x2E), MAKE_RGB(0xCB,0xAC,0x3F), MAKE_RGB(0xDC,0xBD,0x50), \ - MAKE_RGB(0xED,0xCE,0x61), MAKE_RGB(0xFE,0xDF,0x72), MAKE_RGB(0xFF,0xF0,0x87), MAKE_RGB(0xFF,0xFF,0x9D ) + MAKE_RGB(0x21,0x02,0x00), MAKE_RGB(0x32,0x13,0x00), MAKE_RGB(0x43,0x24,0x00), MAKE_RGB(0x54,0x35,0x00), \ + MAKE_RGB(0x65,0x46,0x00), MAKE_RGB(0x76,0x57,0x00), MAKE_RGB(0x87,0x68,0x00), MAKE_RGB(0x98,0x79,0x0C), \ + MAKE_RGB(0xA9,0x8A,0x1D), MAKE_RGB(0xBA,0x9B,0x2E), MAKE_RGB(0xCB,0xAC,0x3F), MAKE_RGB(0xDC,0xBD,0x50), \ + MAKE_RGB(0xED,0xCE,0x61), MAKE_RGB(0xFE,0xDF,0x72), MAKE_RGB(0xFF,0xF0,0x87), MAKE_RGB(0xFF,0xFF,0x9D ) static const rgb_t a7800_palette[256*3] = { @@ -603,100 +603,100 @@ define NTSC_LIGHT_ORANGE define NTSC_GREY - MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \ - MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \ - MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \ - MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF ) + MAKE_RGB(0x00,0x00,0x00), MAKE_RGB(0x11,0x11,0x11), MAKE_RGB(0x22,0x22,0x22), MAKE_RGB(0x33,0x33,0x33), \ + MAKE_RGB(0x44,0x44,0x44), MAKE_RGB(0x55,0x55,0x55), MAKE_RGB(0x66,0x66,0x66), MAKE_RGB(0x77,0x77,0x77), \ + MAKE_RGB(0x88,0x88,0x88), MAKE_RGB(0x99,0x99,0x99), MAKE_RGB(0xAA,0xAA,0xAA), MAKE_RGB(0xBB,0xBB,0xBB), \ + MAKE_RGB(0xCC,0xCC,0xCC), MAKE_RGB(0xDD,0xDD,0xDD), MAKE_RGB(0xEE,0xEE,0xEE), MAKE_RGB(0xFF,0xFF,0xFF ) define NTSC_GOLD - MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \ - MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \ - MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \ - MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xFF,0x97 ) + MAKE_RGB(0x1A,0x07,0x00), MAKE_RGB(0x2B,0x18,0x00), MAKE_RGB(0x3C,0x29,0x00), MAKE_RGB(0x4D,0x3A,0x00), \ + MAKE_RGB(0x5E,0x4B,0x00), MAKE_RGB(0x6F,0x5C,0x00), MAKE_RGB(0x80,0x6D,0x00), MAKE_RGB(0x91,0x7E,0x09), \ + MAKE_RGB(0xA2,0x8F,0x1A), MAKE_RGB(0xB3,0xA0,0x2B), MAKE_RGB(0xC4,0xB1,0x3C), MAKE_RGB(0xD5,0xC2,0x4D), \ + MAKE_RGB(0xE6,0xD3,0x5E), MAKE_RGB(0xF7,0xE4,0x6F), MAKE_RGB(0xFF,0xF5,0x83), MAKE_RGB(0xFF,0xFF,0x97 ) define NTSC_ORANGE - MAKE_RGB(0x32,0x00,0x00), MAKE_RGB(0x43,0x06,0x00), MAKE_RGB(0x54,0x17,0x00), MAKE_RGB(0x65,0x28,0x00), \ - MAKE_RGB(0x79,0x39,0x00), MAKE_RGB(0x87,0x4A,0x00), MAKE_RGB(0x98,0x5B,0x0C), MAKE_RGB(0xA9,0x6C,0x1D), \ - MAKE_RGB(0xBA,0x7D,0x2E), MAKE_RGB(0xCB,0x8E,0x3F), MAKE_RGB(0xDC,0x9F,0x50), MAKE_RGB(0xED,0xB0,0x61), \ - MAKE_RGB(0xFE,0xC1,0x72), MAKE_RGB(0xFF,0xD2,0x87), MAKE_RGB(0xFF,0xE3,0x9E), MAKE_RGB(0xFF,0xF4,0xB4 ) + MAKE_RGB(0x32,0x00,0x00), MAKE_RGB(0x43,0x06,0x00), MAKE_RGB(0x54,0x17,0x00), MAKE_RGB(0x65,0x28,0x00), \ + MAKE_RGB(0x79,0x39,0x00), MAKE_RGB(0x87,0x4A,0x00), MAKE_RGB(0x98,0x5B,0x0C), MAKE_RGB(0xA9,0x6C,0x1D), \ + MAKE_RGB(0xBA,0x7D,0x2E), MAKE_RGB(0xCB,0x8E,0x3F), MAKE_RGB(0xDC,0x9F,0x50), MAKE_RGB(0xED,0xB0,0x61), \ + MAKE_RGB(0xFE,0xC1,0x72), MAKE_RGB(0xFF,0xD2,0x87), MAKE_RGB(0xFF,0xE3,0x9E), MAKE_RGB(0xFF,0xF4,0xB4 ) define NTSC_RED_ORANGE - MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x07,0x00), MAKE_RGB(0x71,0x18,0x00), \ - MAKE_RGB(0x82,0x29,0x10), MAKE_RGB(0x93,0x3A,0x21), MAKE_RGB(0xA4,0x4B,0x32), MAKE_RGB(0xB5,0x5C,0x43), \ - MAKE_RGB(0xC6,0x6D,0x54), MAKE_RGB(0xD7,0x7E,0x65), MAKE_RGB(0xE8,0x8F,0x76), MAKE_RGB(0xF9,0xA0,0x87), \ - MAKE_RGB(0xFF,0xB1,0x9C), MAKE_RGB(0xFF,0xC2,0xB2), MAKE_RGB(0xFF,0xD3,0xC8), MAKE_RGB(0xFF,0xE4,0xDE ) + MAKE_RGB(0x3E,0x00,0x00), MAKE_RGB(0x4F,0x00,0x00), MAKE_RGB(0x60,0x07,0x00), MAKE_RGB(0x71,0x18,0x00), \ + MAKE_RGB(0x82,0x29,0x10), MAKE_RGB(0x93,0x3A,0x21), MAKE_RGB(0xA4,0x4B,0x32), MAKE_RGB(0xB5,0x5C,0x43), \ + MAKE_RGB(0xC6,0x6D,0x54), MAKE_RGB(0xD7,0x7E,0x65), MAKE_RGB(0xE8,0x8F,0x76), MAKE_RGB(0xF9,0xA0,0x87), \ + MAKE_RGB(0xFF,0xB1,0x9C), MAKE_RGB(0xFF,0xC2,0xB2), MAKE_RGB(0xFF,0xD3,0xC8), MAKE_RGB(0xFF,0xE4,0xDE ) define NTSC_PINK - MAKE_RGB(0x3E,0x00,0x09), MAKE_RGB(0x4F,0x00,0x15), MAKE_RGB(0x60,0x00,0x21), MAKE_RGB(0x71,0x0E,0x31), \ - MAKE_RGB(0x82,0x1F,0x42), MAKE_RGB(0x93,0x30,0x53), MAKE_RGB(0xA4,0x41,0x64), MAKE_RGB(0xB5,0x52,0x75), \ - MAKE_RGB(0xC6,0x63,0x86), MAKE_RGB(0xD7,0x74,0x97), MAKE_RGB(0xE8,0x85,0xA8), MAKE_RGB(0xF9,0x96,0xB9), \ - MAKE_RGB(0xFF,0xA7,0xCE), MAKE_RGB(0xFF,0xB8,0xE4), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 ) + MAKE_RGB(0x3E,0x00,0x09), MAKE_RGB(0x4F,0x00,0x15), MAKE_RGB(0x60,0x00,0x21), MAKE_RGB(0x71,0x0E,0x31), \ + MAKE_RGB(0x82,0x1F,0x42), MAKE_RGB(0x93,0x30,0x53), MAKE_RGB(0xA4,0x41,0x64), MAKE_RGB(0xB5,0x52,0x75), \ + MAKE_RGB(0xC6,0x63,0x86), MAKE_RGB(0xD7,0x74,0x97), MAKE_RGB(0xE8,0x85,0xA8), MAKE_RGB(0xF9,0x96,0xB9), \ + MAKE_RGB(0xFF,0xA7,0xCE), MAKE_RGB(0xFF,0xB8,0xE4), MAKE_RGB(0xFF,0xC9,0xEF), MAKE_RGB(0xFF,0xDA,0xF4 ) define NTSC_PURPLE - MAKE_RGB(0x30,0x00,0x3D), MAKE_RGB(0x41,0x00,0x48), MAKE_RGB(0x52,0x00,0x54), MAKE_RGB(0x63,0x0C,0x64), \ - MAKE_RGB(0x74,0x1D,0x75), MAKE_RGB(0x85,0x2E,0x86), MAKE_RGB(0x96,0x3F,0x97), MAKE_RGB(0xA7,0x50,0xA8), \ - MAKE_RGB(0xB8,0x61,0xB9), MAKE_RGB(0xC9,0x72,0xCA), MAKE_RGB(0xDA,0x83,0xDB), MAKE_RGB(0xEB,0x94,0xE5), \ - MAKE_RGB(0xFC,0xA5,0xE5), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 ) + MAKE_RGB(0x30,0x00,0x3D), MAKE_RGB(0x41,0x00,0x48), MAKE_RGB(0x52,0x00,0x54), MAKE_RGB(0x63,0x0C,0x64), \ + MAKE_RGB(0x74,0x1D,0x75), MAKE_RGB(0x85,0x2E,0x86), MAKE_RGB(0x96,0x3F,0x97), MAKE_RGB(0xA7,0x50,0xA8), \ + MAKE_RGB(0xB8,0x61,0xB9), MAKE_RGB(0xC9,0x72,0xCA), MAKE_RGB(0xDA,0x83,0xDB), MAKE_RGB(0xEB,0x94,0xE5), \ + MAKE_RGB(0xFC,0xA5,0xE5), MAKE_RGB(0xFF,0xB6,0xE9), MAKE_RGB(0xFF,0xC7,0xEE), MAKE_RGB(0xFF,0xD8,0xF3 ) define NTSC_PURPLE_BLUE - MAKE_RGB(0x18,0x00,0x62), MAKE_RGB(0x29,0x00,0x6E), MAKE_RGB(0x3A,0x01,0x7A), MAKE_RGB(0x4B,0x12,0x8B), \ - MAKE_RGB(0x5C,0x23,0x9C), MAKE_RGB(0x6D,0x34,0xAD), MAKE_RGB(0x7E,0x45,0xBE), MAKE_RGB(0x8F,0x56,0xCF), \ - MAKE_RGB(0xA0,0x67,0xE0), MAKE_RGB(0xB1,0x78,0xEE), MAKE_RGB(0xC2,0x89,0xEE), MAKE_RGB(0xD3,0x9A,0xEE), \ - MAKE_RGB(0xE4,0xAB,0xEE), MAKE_RGB(0xF5,0xBC,0xEE), MAKE_RGB(0xFF,0xCD,0xE0), MAKE_RGB(0xFF,0xDE,0xF5 ) + MAKE_RGB(0x18,0x00,0x62), MAKE_RGB(0x29,0x00,0x6E), MAKE_RGB(0x3A,0x01,0x7A), MAKE_RGB(0x4B,0x12,0x8B), \ + MAKE_RGB(0x5C,0x23,0x9C), MAKE_RGB(0x6D,0x34,0xAD), MAKE_RGB(0x7E,0x45,0xBE), MAKE_RGB(0x8F,0x56,0xCF), \ + MAKE_RGB(0xA0,0x67,0xE0), MAKE_RGB(0xB1,0x78,0xEE), MAKE_RGB(0xC2,0x89,0xEE), MAKE_RGB(0xD3,0x9A,0xEE), \ + MAKE_RGB(0xE4,0xAB,0xEE), MAKE_RGB(0xF5,0xBC,0xEE), MAKE_RGB(0xFF,0xCD,0xE0), MAKE_RGB(0xFF,0xDE,0xF5 ) define NTSC_BLUE1 - MAKE_RGB(0x00,0x00,0x72), MAKE_RGB(0x0C,0x00,0x7F), MAKE_RGB(0x1D,0x0E,0x8F), MAKE_RGB(0x2E,0x1F,0xA0), \ - MAKE_RGB(0x3F,0x30,0xB1), MAKE_RGB(0x50,0x41,0xC2), MAKE_RGB(0x61,0x52,0xD3), MAKE_RGB(0x72,0x63,0xE4), \ - MAKE_RGB(0x83,0x74,0xF5), MAKE_RGB(0x94,0x85,0xFA), MAKE_RGB(0xA5,0x96,0xFA), MAKE_RGB(0xB6,0xA7,0xFA), \ - MAKE_RGB(0xC7,0xB8,0xFA), MAKE_RGB(0xD8,0xC9,0xFA), MAKE_RGB(0xE9,0xDA,0xFA), MAKE_RGB(0xFA,0xE8,0xFA ) + MAKE_RGB(0x00,0x00,0x72), MAKE_RGB(0x0C,0x00,0x7F), MAKE_RGB(0x1D,0x0E,0x8F), MAKE_RGB(0x2E,0x1F,0xA0), \ + MAKE_RGB(0x3F,0x30,0xB1), MAKE_RGB(0x50,0x41,0xC2), MAKE_RGB(0x61,0x52,0xD3), MAKE_RGB(0x72,0x63,0xE4), \ + MAKE_RGB(0x83,0x74,0xF5), MAKE_RGB(0x94,0x85,0xFA), MAKE_RGB(0xA5,0x96,0xFA), MAKE_RGB(0xB6,0xA7,0xFA), \ + MAKE_RGB(0xC7,0xB8,0xFA), MAKE_RGB(0xD8,0xC9,0xFA), MAKE_RGB(0xE9,0xDA,0xFA), MAKE_RGB(0xFA,0xE8,0xFA ) define NTSC_BLUE2 - MAKE_RGB(0x00,0x00,0x62), MAKE_RGB(0x00,0x0F,0x77), MAKE_RGB(0x01,0x20,0x8D), MAKE_RGB(0x12,0x31,0x9E), \ - MAKE_RGB(0x23,0x42,0xAF), MAKE_RGB(0x34,0x53,0xC0), MAKE_RGB(0x45,0x64,0xD1), MAKE_RGB(0x56,0x75,0xE2), \ - MAKE_RGB(0x67,0x86,0xF3), MAKE_RGB(0x78,0x97,0xFF), MAKE_RGB(0x89,0xA8,0xFF), MAKE_RGB(0x9A,0xB9,0xFF), \ - MAKE_RGB(0xAB,0xCA,0xFF), MAKE_RGB(0xBC,0xDB,0xFF), MAKE_RGB(0xCD,0xEC,0xFF), MAKE_RGB(0xDE,0xFD,0xFF ) + MAKE_RGB(0x00,0x00,0x62), MAKE_RGB(0x00,0x0F,0x77), MAKE_RGB(0x01,0x20,0x8D), MAKE_RGB(0x12,0x31,0x9E), \ + MAKE_RGB(0x23,0x42,0xAF), MAKE_RGB(0x34,0x53,0xC0), MAKE_RGB(0x45,0x64,0xD1), MAKE_RGB(0x56,0x75,0xE2), \ + MAKE_RGB(0x67,0x86,0xF3), MAKE_RGB(0x78,0x97,0xFF), MAKE_RGB(0x89,0xA8,0xFF), MAKE_RGB(0x9A,0xB9,0xFF), \ + MAKE_RGB(0xAB,0xCA,0xFF), MAKE_RGB(0xBC,0xDB,0xFF), MAKE_RGB(0xCD,0xEC,0xFF), MAKE_RGB(0xDE,0xFD,0xFF ) define NTSC_LIGHT_BLUE - MAKE_RGB(0x00,0x10,0x42), MAKE_RGB(0x00,0x21,0x58), MAKE_RGB(0x00,0x32,0x6E), MAKE_RGB(0x00,0x43,0x84), \ - MAKE_RGB(0x0E,0x54,0x96), MAKE_RGB(0x1F,0x65,0xA7), MAKE_RGB(0x30,0x76,0xB8), MAKE_RGB(0x41,0x87,0xC9), \ - MAKE_RGB(0x52,0x98,0xDA), MAKE_RGB(0x63,0xA9,0xEB), MAKE_RGB(0x74,0xBA,0xFC), MAKE_RGB(0x85,0xCB,0xFF), \ - MAKE_RGB(0x96,0xDC,0xFF), MAKE_RGB(0xA7,0xED,0xFF), MAKE_RGB(0xB8,0xFE,0xFF), MAKE_RGB(0xC9,0xFF,0xFF ) + MAKE_RGB(0x00,0x10,0x42), MAKE_RGB(0x00,0x21,0x58), MAKE_RGB(0x00,0x32,0x6E), MAKE_RGB(0x00,0x43,0x84), \ + MAKE_RGB(0x0E,0x54,0x96), MAKE_RGB(0x1F,0x65,0xA7), MAKE_RGB(0x30,0x76,0xB8), MAKE_RGB(0x41,0x87,0xC9), \ + MAKE_RGB(0x52,0x98,0xDA), MAKE_RGB(0x63,0xA9,0xEB), MAKE_RGB(0x74,0xBA,0xFC), MAKE_RGB(0x85,0xCB,0xFF), \ + MAKE_RGB(0x96,0xDC,0xFF), MAKE_RGB(0xA7,0xED,0xFF), MAKE_RGB(0xB8,0xFE,0xFF), MAKE_RGB(0xC9,0xFF,0xFF ) define NTSC_TURQUOISE - MAKE_RGB(0x00,0x1E,0x14), MAKE_RGB(0x00,0x2F,0x2A), MAKE_RGB(0x00,0x40,0x40), MAKE_RGB(0x00,0x51,0x56), \ - MAKE_RGB(0x04,0x62,0x6B), MAKE_RGB(0x15,0x73,0x7C), MAKE_RGB(0x26,0x84,0x8D), MAKE_RGB(0x37,0x95,0x9E), \ - MAKE_RGB(0x48,0xA6,0xAF), MAKE_RGB(0x59,0xB7,0xC0), MAKE_RGB(0x6A,0xC8,0xD1), MAKE_RGB(0x7B,0xD9,0xE2), \ - MAKE_RGB(0x8C,0xEA,0xF3), MAKE_RGB(0x9D,0xFB,0xFF), MAKE_RGB(0xAE,0xFF,0xFF), MAKE_RGB(0xBF,0xFF,0xFF ) + MAKE_RGB(0x00,0x1E,0x14), MAKE_RGB(0x00,0x2F,0x2A), MAKE_RGB(0x00,0x40,0x40), MAKE_RGB(0x00,0x51,0x56), \ + MAKE_RGB(0x04,0x62,0x6B), MAKE_RGB(0x15,0x73,0x7C), MAKE_RGB(0x26,0x84,0x8D), MAKE_RGB(0x37,0x95,0x9E), \ + MAKE_RGB(0x48,0xA6,0xAF), MAKE_RGB(0x59,0xB7,0xC0), MAKE_RGB(0x6A,0xC8,0xD1), MAKE_RGB(0x7B,0xD9,0xE2), \ + MAKE_RGB(0x8C,0xEA,0xF3), MAKE_RGB(0x9D,0xFB,0xFF), MAKE_RGB(0xAE,0xFF,0xFF), MAKE_RGB(0xBF,0xFF,0xFF ) define NTSC_GREEN_BLUE - MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x00,0x59,0x25), \ - MAKE_RGB(0x08,0x6A,0x38), MAKE_RGB(0x19,0x7B,0x49), MAKE_RGB(0x2A,0x8C,0x5A), MAKE_RGB(0x3B,0x9D,0x6B), \ - MAKE_RGB(0x4C,0xAE,0x7C), MAKE_RGB(0x5D,0xBF,0x8D), MAKE_RGB(0x6E,0xD0,0x9E), MAKE_RGB(0x7F,0xE1,0xAF), \ - MAKE_RGB(0x90,0xF2,0xC0), MAKE_RGB(0xA1,0xFF,0xD0), MAKE_RGB(0xB2,0xFF,0xDC), MAKE_RGB(0xC3,0xFF,0xE8 ) + MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x00,0x59,0x25), \ + MAKE_RGB(0x08,0x6A,0x38), MAKE_RGB(0x19,0x7B,0x49), MAKE_RGB(0x2A,0x8C,0x5A), MAKE_RGB(0x3B,0x9D,0x6B), \ + MAKE_RGB(0x4C,0xAE,0x7C), MAKE_RGB(0x5D,0xBF,0x8D), MAKE_RGB(0x6E,0xD0,0x9E), MAKE_RGB(0x7F,0xE1,0xAF), \ + MAKE_RGB(0x90,0xF2,0xC0), MAKE_RGB(0xA1,0xFF,0xD0), MAKE_RGB(0xB2,0xFF,0xDC), MAKE_RGB(0xC3,0xFF,0xE8 ) define NTSC_GREEN - MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x08,0x59,0x18), \ - MAKE_RGB(0x19,0x6A,0x18), MAKE_RGB(0x2A,0x7B,0x18), MAKE_RGB(0x3B,0x8C,0x29), MAKE_RGB(0x4C,0x9D,0x3A), \ - MAKE_RGB(0x5D,0xAE,0x4B), MAKE_RGB(0x6E,0xBF,0x5C), MAKE_RGB(0x7F,0xD0,0x6D), MAKE_RGB(0x90,0xE1,0x7E), \ - MAKE_RGB(0xA1,0xF2,0x8F), MAKE_RGB(0xB2,0xFF,0x9F), MAKE_RGB(0xC3,0xFF,0xAB), MAKE_RGB(0xD4,0xFF,0xB7 ) + MAKE_RGB(0x00,0x26,0x0B), MAKE_RGB(0x00,0x37,0x10), MAKE_RGB(0x00,0x48,0x16), MAKE_RGB(0x08,0x59,0x18), \ + MAKE_RGB(0x19,0x6A,0x18), MAKE_RGB(0x2A,0x7B,0x18), MAKE_RGB(0x3B,0x8C,0x29), MAKE_RGB(0x4C,0x9D,0x3A), \ + MAKE_RGB(0x5D,0xAE,0x4B), MAKE_RGB(0x6E,0xBF,0x5C), MAKE_RGB(0x7F,0xD0,0x6D), MAKE_RGB(0x90,0xE1,0x7E), \ + MAKE_RGB(0xA1,0xF2,0x8F), MAKE_RGB(0xB2,0xFF,0x9F), MAKE_RGB(0xC3,0xFF,0xAB), MAKE_RGB(0xD4,0xFF,0xB7 ) define NTSC_YELLOW_GREEN - MAKE_RGB(0x00,0x1E,0x09), MAKE_RGB(0x00,0x2F,0x0E), MAKE_RGB(0x11,0x40,0x0E), MAKE_RGB(0x22,0x51,0x0E), \ - MAKE_RGB(0x33,0x62,0x0E), MAKE_RGB(0x44,0x73,0x0E), MAKE_RGB(0x55,0x84,0x0E), MAKE_RGB(0x66,0x95,0x17), \ - MAKE_RGB(0x77,0xA6,0x28), MAKE_RGB(0x88,0xB7,0x39), MAKE_RGB(0x99,0xC8,0x4A), MAKE_RGB(0xAA,0xD9,0x5B), \ - MAKE_RGB(0xBB,0xEA,0x6C), MAKE_RGB(0xCC,0xFB,0x7D), MAKE_RGB(0xDD,0xFF,0x8A), MAKE_RGB(0xEE,0xFF,0x96 ) + MAKE_RGB(0x00,0x1E,0x09), MAKE_RGB(0x00,0x2F,0x0E), MAKE_RGB(0x11,0x40,0x0E), MAKE_RGB(0x22,0x51,0x0E), \ + MAKE_RGB(0x33,0x62,0x0E), MAKE_RGB(0x44,0x73,0x0E), MAKE_RGB(0x55,0x84,0x0E), MAKE_RGB(0x66,0x95,0x17), \ + MAKE_RGB(0x77,0xA6,0x28), MAKE_RGB(0x88,0xB7,0x39), MAKE_RGB(0x99,0xC8,0x4A), MAKE_RGB(0xAA,0xD9,0x5B), \ + MAKE_RGB(0xBB,0xEA,0x6C), MAKE_RGB(0xCC,0xFB,0x7D), MAKE_RGB(0xDD,0xFF,0x8A), MAKE_RGB(0xEE,0xFF,0x96 ) define NTSC_ORANGE_GREEN - MAKE_RGB(0x0D,0x0F,0x01), MAKE_RGB(0x1E,0x20,0x01), MAKE_RGB(0x2F,0x31,0x01), MAKE_RGB(0x40,0x42,0x01), \ - MAKE_RGB(0x51,0x53,0x01), MAKE_RGB(0x62,0x64,0x01), MAKE_RGB(0x73,0x75,0x01), MAKE_RGB(0x84,0x86,0x08), \ - MAKE_RGB(0x95,0x97,0x19), MAKE_RGB(0xA6,0xA8,0x2A), MAKE_RGB(0xB7,0xB9,0x3B), MAKE_RGB(0xC8,0xCA,0x4C), \ - MAKE_RGB(0xD9,0xDB,0x5D), MAKE_RGB(0xEA,0xEC,0x6E), MAKE_RGB(0xFB,0xFD,0x7F), MAKE_RGB(0xFF,0xFF,0x8F ) + MAKE_RGB(0x0D,0x0F,0x01), MAKE_RGB(0x1E,0x20,0x01), MAKE_RGB(0x2F,0x31,0x01), MAKE_RGB(0x40,0x42,0x01), \ + MAKE_RGB(0x51,0x53,0x01), MAKE_RGB(0x62,0x64,0x01), MAKE_RGB(0x73,0x75,0x01), MAKE_RGB(0x84,0x86,0x08), \ + MAKE_RGB(0x95,0x97,0x19), MAKE_RGB(0xA6,0xA8,0x2A), MAKE_RGB(0xB7,0xB9,0x3B), MAKE_RGB(0xC8,0xCA,0x4C), \ + MAKE_RGB(0xD9,0xDB,0x5D), MAKE_RGB(0xEA,0xEC,0x6E), MAKE_RGB(0xFB,0xFD,0x7F), MAKE_RGB(0xFF,0xFF,0x8F ) define NTSC_LIGHT_ORANGE - MAKE_RGB(0x28,0x00,0x00), MAKE_RGB(0x39,0x0E,0x00), MAKE_RGB(0x4A,0x1F,0x00), MAKE_RGB(0x5B,0x30,0x00), \ - MAKE_RGB(0x6C,0x41,0x00), MAKE_RGB(0x7D,0x52,0x00), MAKE_RGB(0x8E,0x63,0x00), MAKE_RGB(0x9F,0x74,0x10), \ - MAKE_RGB(0xB0,0x85,0x21), MAKE_RGB(0xC1,0x96,0x32), MAKE_RGB(0xD2,0xA7,0x43), MAKE_RGB(0xE3,0xB8,0x54), \ - MAKE_RGB(0xF4,0xC9,0x65), MAKE_RGB(0xFF,0xDA,0x78), MAKE_RGB(0xFF,0xEB,0x8E), MAKE_RGB(0xFF,0xFC,0xA4 ) + MAKE_RGB(0x28,0x00,0x00), MAKE_RGB(0x39,0x0E,0x00), MAKE_RGB(0x4A,0x1F,0x00), MAKE_RGB(0x5B,0x30,0x00), \ + MAKE_RGB(0x6C,0x41,0x00), MAKE_RGB(0x7D,0x52,0x00), MAKE_RGB(0x8E,0x63,0x00), MAKE_RGB(0x9F,0x74,0x10), \ + MAKE_RGB(0xB0,0x85,0x21), MAKE_RGB(0xC1,0x96,0x32), MAKE_RGB(0xD2,0xA7,0x43), MAKE_RGB(0xE3,0xB8,0x54), \ + MAKE_RGB(0xF4,0xC9,0x65), MAKE_RGB(0xFF,0xDA,0x78), MAKE_RGB(0xFF,0xEB,0x8E), MAKE_RGB(0xFF,0xFC,0xA4 ) ***************************************************************************/ @@ -929,7 +929,7 @@ static MACHINE_CONFIG_START( a7800_ntsc, a7800_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS( 7159090, 456, 0, 320, 262, 26, 26 + 192 + 30 ) + MCFG_SCREEN_RAW_PARAMS( 7159090, 456, 0, 320, 262, 26, 26 + 192 + 30 ) MCFG_SCREEN_UPDATE_DRIVER(a7800_state, screen_update_a7800) MCFG_PALETTE_LENGTH(ARRAY_LENGTH(a7800_palette)) @@ -966,7 +966,7 @@ static MACHINE_CONFIG_DERIVED( a7800_pal, a7800_ntsc ) // MCFG_TIMER_ADD_SCANLINE("scantimer", a7800_interrupt, "screen", 0, 1) MCFG_SCREEN_MODIFY( "screen" ) - MCFG_SCREEN_RAW_PARAMS( 7093788, 456, 0, 320, 312, 34, 34 + 228 + 30 ) + MCFG_SCREEN_RAW_PARAMS( 7093788, 456, 0, 320, 312, 34, 34 + 228 + 30 ) MCFG_PALETTE_INIT_OVERRIDE(a7800_state, a7800p ) /* sound hardware */ diff --git a/src/mess/drivers/apple2.c b/src/mess/drivers/apple2.c index ff1bf1e2e1d..1ff299c6bd4 100644 --- a/src/mess/drivers/apple2.c +++ b/src/mess/drivers/apple2.c @@ -835,7 +835,7 @@ static MACHINE_CONFIG_DERIVED( laba2p, apple2p ) MCFG_A2BUS_SLOT_REMOVE("sl3") MCFG_A2BUS_SLOT_REMOVE("sl6") -// MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LAB_80COL, NULL) +// MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl3", A2BUS_LAB_80COL, NULL) MCFG_A2BUS_ONBOARD_ADD("a2bus", "sl6", A2BUS_IWM_FDC, NULL) MACHINE_CONFIG_END diff --git a/src/mess/drivers/apricot.c b/src/mess/drivers/apricot.c index 9e17305de03..f5160df1987 100644 --- a/src/mess/drivers/apricot.c +++ b/src/mess/drivers/apricot.c @@ -2,8 +2,8 @@ ACT Apricot PC/Xi - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best - Error 29 (timer failed) - Dump of the keyboard MCU ROM needed (can be dumped using test mode) diff --git a/src/mess/drivers/astrocde.c b/src/mess/drivers/astrocde.c index 177e66d1817..e31abe09ffd 100644 --- a/src/mess/drivers/astrocde.c +++ b/src/mess/drivers/astrocde.c @@ -2,8 +2,8 @@ Bally Astrocade consumer hardware - license: MAME - copyright-holders: Nicola Salmoria, Mike Coates, Frank Palazzolo, Aaron Giles, Dirk Best + license: MAME + copyright-holders: Nicola Salmoria, Mike Coates, Frank Palazzolo, Aaron Giles, Dirk Best ****************************************************************************/ diff --git a/src/mess/drivers/bbc.c b/src/mess/drivers/bbc.c index 09a930b06e3..4153d09db23 100644 --- a/src/mess/drivers/bbc.c +++ b/src/mess/drivers/bbc.c @@ -3,7 +3,7 @@ ANA01 - Model A ANA02 - Model A with Econet interface - + ANB01 - Model B ANB02 - Model B with Econet interface ANB03 - Model B with Disc interface @@ -28,7 +28,7 @@ ARM1 - ARM Evaluation System ADB20 - Master Compact - + MESS Driver By: Gordon Jefferyes @@ -45,12 +45,12 @@ #include "cpu/m6502/m6502.h" #include "cpu/m6502/m65sc02.h" #include "machine/6522via.h" -#include "machine/mc146818.h" /* RTC & CMOS RAM */ +#include "machine/mc146818.h" /* RTC & CMOS RAM */ #include "machine/upd7002.h" #include "bus/centronics/ctronics.h" #include "bus/econet/econet.h" -#include "sound/tms5220.h" /* Speech */ -#include "video/saa5050.h" /* Teletext */ +#include "sound/tms5220.h" /* Speech */ +#include "video/saa5050.h" /* Teletext */ /* Devices */ #include "imagedev/flopdrv.h" @@ -67,7 +67,7 @@ A = BBC Model A B = BBC Model B B+ = BBC Model B+ M = BBC Master - + A B B+ M + &0000 + + + + | | | | | @@ -142,16 +142,16 @@ static ADDRESS_MAP_START( bbca_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank4") /* 8000-bfff Paged ROM */ AM_RANGE(0xc000, 0xfbff) AM_READ_BANK("bank7") /* c000-fbff OS ROM */ AM_RANGE(0xfc00, 0xfdff) AM_NOP /* fc00-fdff FRED & JIM Pages */ - /* fe00-feff Shiela Address Page */ + /* fe00-feff Shiela Address Page */ AM_RANGE(0xfe00, 0xfe07) AM_READWRITE(bbc_6845_r, bbc_6845_w) /* fe00-fe07 6845 CRTC Video controller */ AM_RANGE(0xfe08, 0xfe08) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, status_read, control_write) AM_RANGE(0xfe09, 0xfe09) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, data_read, data_write) AM_RANGE(0xfe10, 0xfe17) AM_READWRITE(bbc_fe_r, bbc_SerialULA_w) /* fe10-fe17 Serial ULA Serial system chip */ AM_RANGE(0xfe18, 0xfe1f) AM_NOP /* fe18-fe1f INTOFF/STATID # ECONET Interrupt Off / ID No. */ AM_RANGE(0xfe20, 0xfe2f) AM_WRITE(bbc_videoULA_w) /* R: fe20-fe2f INTON # ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ + /* W: fe20-fe2f Video ULA Video system chip */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selecta_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe40, 0xfe5f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) /* fe40-fe5f 6522 VIA SYSTEM VIA */ AM_RANGE(0xfe60, 0xfe7f) AM_NOP /* fe60-fe7f 6522 VIA # USER VIA */ AM_RANGE(0xfe80, 0xfe9f) AM_NOP /* fe80-fe9f 8271/1770 FDC # Floppy disc controller */ @@ -170,16 +170,16 @@ static ADDRESS_MAP_START( bbcb_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0x8000, 0xbfff) AM_READ_BANK("bank4") AM_WRITE(bbc_memoryb4_w) /* 8000-bfff Paged ROM */ AM_RANGE(0xc000, 0xfbff) AM_READ_BANK("bank7") /* c000-fbff OS ROM */ AM_RANGE(0xfc00, 0xfdff) AM_READWRITE(bbc_opus_read, bbc_opus_write) /* fc00-fdff OPUS Disc Controller */ - /* fe00-feff Shiela Address Page */ + /* fe00-feff Shiela Address Page */ AM_RANGE(0xfe00, 0xfe07) AM_READWRITE(bbc_6845_r, bbc_6845_w) /* fe00-fe07 6845 CRTC Video controller */ AM_RANGE(0xfe08, 0xfe08) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, status_read, control_write) AM_RANGE(0xfe09, 0xfe09) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, data_read, data_write) AM_RANGE(0xfe10, 0xfe17) AM_READWRITE(bbc_fe_r, bbc_SerialULA_w) /* fe10-fe17 Serial ULA Serial system chip */ AM_RANGE(0xfe18, 0xfe1f) AM_NOP /* fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No. */ AM_RANGE(0xfe20, 0xfe2f) AM_WRITE(bbc_videoULA_w) /* R: fe20-fe2f INTON ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ + /* W: fe20-fe2f Video ULA Video system chip */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectb_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe40, 0xfe5f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) /* fe40-fe5f 6522 VIA SYSTEM VIA */ AM_RANGE(0xfe60, 0xfe7f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) /* fe60-fe7f 6522 VIA USER VIA */ AM_RANGE(0xfe80, 0xfe9f) AM_READWRITE(bbc_disc_r, bbc_disc_w) /* fe80-fe9f 8271 FDC Floppy disc controller */ @@ -199,16 +199,16 @@ static ADDRESS_MAP_START( bbcbp_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0xb000, 0xbfff) AM_READ_BANK("bank6") /* b000-bfff Rest of paged ROM area */ AM_RANGE(0xc000, 0xfbff) AM_READ_BANK("bank7") /* c000-fbff OS ROM */ AM_RANGE(0xfc00, 0xfdff) AM_NOP /* fc00-fdff FRED & JIM Pages */ - /* fe00-feff Shiela Address Page */ + /* fe00-feff Shiela Address Page */ AM_RANGE(0xfe00, 0xfe07) AM_READWRITE(bbc_6845_r, bbc_6845_w) /* fe00-fe07 6845 CRTC Video controller */ AM_RANGE(0xfe08, 0xfe08) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, status_read, control_write) AM_RANGE(0xfe09, 0xfe09) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, data_read, data_write) AM_RANGE(0xfe10, 0xfe17) AM_READWRITE(bbc_fe_r, bbc_SerialULA_w) /* fe10-fe17 Serial ULA Serial system chip */ AM_RANGE(0xfe18, 0xfe1f) AM_NOP /* fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No. */ AM_RANGE(0xfe20, 0xfe2f) AM_WRITE(bbc_videoULA_w) /* R: fe20-fe2f INTON ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ + /* W: fe20-fe2f Video ULA Video system chip */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe40, 0xfe5f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) /* fe40-fe5f 6522 VIA SYSTEM VIA */ AM_RANGE(0xfe60, 0xfe7f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) /* fe60-fe7f 6522 VIA USER VIA */ AM_RANGE(0xfe80, 0xfe9f) AM_READWRITE(bbc_wd1770_read, bbc_wd1770_write) /* fe80-fe9f 1770 FDC Floppy disc controller */ @@ -228,7 +228,7 @@ static ADDRESS_MAP_START( bbcbp128_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0xb000, 0xbfff) AM_READ_BANK("bank6") AM_WRITE(bbc_memorybp6_128_w) /* b000-bfff Rest of paged ROM area */ AM_RANGE(0xc000, 0xfbff) AM_READ_BANK("bank7") /* c000-fbff OS ROM */ AM_RANGE(0xfc00, 0xfdff) AM_NOP /* fc00-fdff FRED & JIM Pages */ - /* fe00-feff Shiela Address Page */ + /* fe00-feff Shiela Address Page */ AM_RANGE(0xfe00, 0xfe07) AM_READWRITE(bbc_6845_r, bbc_6845_w) /* fe00-fe07 6845 CRTC Video controller */ AM_RANGE(0xfe08, 0xfe08) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, status_read, control_write) AM_RANGE(0xfe09, 0xfe09) AM_MIRROR(0x06) AM_DEVREADWRITE("acia6850", acia6850_device, data_read, data_write) @@ -236,9 +236,9 @@ static ADDRESS_MAP_START( bbcbp128_mem, AS_PROGRAM, 8, bbc_state ) AM_RANGE(0xfe10, 0xfe17) AM_NOP /* fe10-fe17 Serial ULA Serial system chip */ AM_RANGE(0xfe18, 0xfe1f) AM_NOP /* fe18-fe1f INTOFF/STATID ECONET Interrupt Off / ID No. */ AM_RANGE(0xfe20, 0xfe2f) AM_WRITE(bbc_videoULA_w) /* R: fe20-fe2f INTON ECONET Interrupt On */ - /* W: fe20-fe2f Video ULA Video system chip */ + /* W: fe20-fe2f Video ULA Video system chip */ AM_RANGE(0xfe30, 0xfe3f) AM_READWRITE(bbc_fe_r, bbc_page_selectbp_w) /* R: fe30-fe3f NC Not Connected */ - /* W: fe30-fe3f 84LS161 Paged ROM selector */ + /* W: fe30-fe3f 84LS161 Paged ROM selector */ AM_RANGE(0xfe40, 0xfe5f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) /* fe40-fe5f 6522 VIA SYSTEM VIA */ AM_RANGE(0xfe60, 0xfe7f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) /* fe60-fe7f 6522 VIA USER VIA */ AM_RANGE(0xfe80, 0xfe9f) AM_READWRITE(bbc_wd1770_read, bbc_wd1770_write) /* fe80-fe9f 1770 FDC Floppy disc controller */ @@ -466,10 +466,10 @@ INPUT_PORTS_END static INPUT_PORTS_START(bbc_config) PORT_START("BBCCONFIG") - -// PORT_CONFNAME( 0x01, 0x00, "Speech Upgrade" ) -// PORT_CONFSETTING( 0x00, DEF_STR( On ) ) -// PORT_CONFSETTING( 0x01, DEF_STR( Off ) ) + +// PORT_CONFNAME( 0x01, 0x00, "Speech Upgrade" ) +// PORT_CONFSETTING( 0x00, DEF_STR( On ) ) +// PORT_CONFSETTING( 0x01, DEF_STR( Off ) ) PORT_CONFNAME( 0x07, 0x00, "DFS Select" ) PORT_CONFSETTING( 0x00, "Acorn DFS 0.90 (read only)" ) @@ -486,7 +486,7 @@ static INPUT_PORTS_START(bbc_config) PORT_CONFSETTING( 0x08, "Solidisk 128K (fe62)" ) PORT_CONFSETTING( 0x10, "Acorn 64K (fe30)" ) PORT_CONFSETTING( 0x18, "Acorn 128K (fe30)" ) -// PORT_CONFSETTING( 0x20, "ATPL Sidewise 16K" ) +// PORT_CONFSETTING( 0x20, "ATPL Sidewise 16K" ) INPUT_PORTS_END static INPUT_PORTS_START(bbca) @@ -494,7 +494,7 @@ static INPUT_PORTS_START(bbca) INPUT_PORTS_END static INPUT_PORTS_START(bbcb) - PORT_INCLUDE(bbc_config) + PORT_INCLUDE(bbc_config) PORT_INCLUDE(bbc_keyboard) PORT_INCLUDE(bbc_joy) INPUT_PORTS_END @@ -728,7 +728,7 @@ static MACHINE_CONFIG_DERIVED( bbcb, bbca ) /* speech hardware */ // MCFG_SOUND_ADD("tms5220", TMS5220, 640000) -// MCFG_TMS52XX_SPEECHROM("vsm") +// MCFG_TMS52XX_SPEECHROM("vsm") /* devices */ MCFG_VIA6522_ADD("via6522_1", 1000000, bbcb_user_via) @@ -768,7 +768,7 @@ static MACHINE_CONFIG_DERIVED( bbcb_us, bbca ) /* speech hardware */ // MCFG_SOUND_ADD("tms5220", TMS5220, 640000) -// MCFG_TMS52XX_SPEECHROM("vsm") +// MCFG_TMS52XX_SPEECHROM("vsm") /* video hardware */ MCFG_SCREEN_MODIFY("screen") @@ -877,7 +877,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) /* cassette */ MCFG_CASSETTE_ADD( "cassette", bbc_cassette_interface ) - /* cartridges */ + /* cartridges */ MCFG_CARTSLOT_ADD("cart") MCFG_CARTSLOT_EXTENSION_LIST("bin") MCFG_CARTSLOT_NOT_MANDATORY @@ -888,7 +888,7 @@ static MACHINE_CONFIG_START( bbcm, bbc_state ) MCFG_SOFTWARE_LIST_ADD("cass_ls_m", "bbcm_cass") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_a", "bbca_cass") MCFG_SOFTWARE_LIST_COMPATIBLE_ADD("cass_ls_b", "bbcb_cass") - MCFG_SOFTWARE_LIST_ADD("cart_ls_m", "bbcm_cart") + MCFG_SOFTWARE_LIST_ADD("cart_ls_m", "bbcm_cart") /* acia */ MCFG_ACIA6850_ADD("acia6850", bbc_acia6850_interface) @@ -936,11 +936,11 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm ) /* Remove all devices not present in this model */ /* sound hardware */ -// MCFG_DEVICE_REMOVE("mono") -// MCFG_DEVICE_REMOVE("sn76489") +// MCFG_DEVICE_REMOVE("mono") +// MCFG_DEVICE_REMOVE("sn76489") /* printer */ -// MCFG_DEVICE_REMOVE("centronics") +// MCFG_DEVICE_REMOVE("centronics") /* cassette */ MCFG_DEVICE_REMOVE("cassette") @@ -951,15 +951,15 @@ static MACHINE_CONFIG_DERIVED( bbcmet, bbcm ) MCFG_SOFTWARE_LIST_REMOVE("cass_ls_b") /* acia */ -// MCFG_DEVICE_REMOVE("acia6850") +// MCFG_DEVICE_REMOVE("acia6850") MCFG_DEVICE_REMOVE(RS232_TAG) /* devices */ -// MCFG_DEVICE_REMOVE("upd7002") -// MCFG_DEVICE_REMOVE("via6522_1") +// MCFG_DEVICE_REMOVE("upd7002") +// MCFG_DEVICE_REMOVE("via6522_1") /* fdc */ -// MCFG_DEVICE_REMOVE("wd177x") +// MCFG_DEVICE_REMOVE("wd177x") MACHINE_CONFIG_END @@ -978,8 +978,8 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( bbcmc, bbcm ) - -// MCFG_DEVICE_REMOVE("rtc") + +// MCFG_DEVICE_REMOVE("rtc") /* fdc */ MCFG_DEVICE_REMOVE("wd177x") @@ -1005,29 +1005,29 @@ ROM_START(bbca) /* rom page 3 0c000 BASIC */ ROM_DEFAULT_BIOS("os12b2") ROM_SYSTEM_BIOS( 0, "os12b2", "OS 1.20 / BASIC2" ) - ROMX_LOAD("os12.rom", 0x10000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(1)) /* os */ - ROMX_LOAD("basic2.rom", 0x0c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(1)) /* rom page 3 0c000 */ + ROMX_LOAD("os12.rom", 0x10000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(1)) /* os */ + ROMX_LOAD("basic2.rom", 0x0c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(1)) /* rom page 3 0c000 */ ROM_SYSTEM_BIOS( 1, "os12b1", "OS 1.20 / BASIC1" ) - ROMX_LOAD("os12.rom", 0x10000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(2)) /* os */ - ROMX_LOAD("basic1.rom", 0x0c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(2)) /* rom page 3 0c000 */ + ROMX_LOAD("os12.rom", 0x10000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(2)) /* os */ + ROMX_LOAD("basic1.rom", 0x0c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(2)) /* rom page 3 0c000 */ ROM_SYSTEM_BIOS( 2, "os10b2", "OS 1.00 / BASIC2" ) - ROMX_LOAD("os10.rom", 0x10000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(3)) /* os */ - ROMX_LOAD("basic2.rom", 0x0c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(3)) /* rom page 3 0c000 */ + ROMX_LOAD("os10.rom", 0x10000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(3)) /* os */ + ROMX_LOAD("basic2.rom", 0x0c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(3)) /* rom page 3 0c000 */ ROM_SYSTEM_BIOS( 3, "os10b1", "OS 1.00 / BASIC1" ) - ROMX_LOAD("os10.rom", 0x10000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(4)) /* os */ - ROMX_LOAD("basic1.rom", 0x0c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(4)) /* rom page 3 0c000 */ + ROMX_LOAD("os10.rom", 0x10000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(4)) /* os */ + ROMX_LOAD("basic1.rom", 0x0c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(4)) /* rom page 3 0c000 */ ROM_SYSTEM_BIOS( 4, "os01b2", "OS 0.10 / BASIC2" ) - ROMX_LOAD("os01.rom", 0x10000, 0x4000, CRC(45ee0980) SHA1(4b0ece6dc139d5d3f4fabd023716fb6f25149b80), ROM_BIOS(5)) /* os */ - ROMX_LOAD("basic2.rom", 0x00000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 0 00000 */ - ROMX_LOAD("basic2.rom", 0x04000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 1 04000 */ - ROMX_LOAD("basic2.rom", 0x08000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 2 08000 */ - ROMX_LOAD("basic2.rom", 0x0c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 3 0c000 */ + ROMX_LOAD("os01.rom", 0x10000, 0x4000, CRC(45ee0980) SHA1(4b0ece6dc139d5d3f4fabd023716fb6f25149b80), ROM_BIOS(5)) /* os */ + ROMX_LOAD("basic2.rom", 0x00000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 0 00000 */ + ROMX_LOAD("basic2.rom", 0x04000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 1 04000 */ + ROMX_LOAD("basic2.rom", 0x08000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 2 08000 */ + ROMX_LOAD("basic2.rom", 0x0c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(5)) /* rom page 3 0c000 */ ROM_SYSTEM_BIOS( 5, "os01b1", "OS 0.10 / BASIC1" ) - ROMX_LOAD("os01.rom", 0x10000, 0x4000, CRC(45ee0980) SHA1(4b0ece6dc139d5d3f4fabd023716fb6f25149b80), ROM_BIOS(6)) /* os */ - ROMX_LOAD("basic1.rom", 0x00000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 0 00000 */ - ROMX_LOAD("basic1.rom", 0x04000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 1 04000 */ - ROMX_LOAD("basic1.rom", 0x08000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 2 08000 */ - ROMX_LOAD("basic1.rom", 0x0c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 3 0c000 */ + ROMX_LOAD("os01.rom", 0x10000, 0x4000, CRC(45ee0980) SHA1(4b0ece6dc139d5d3f4fabd023716fb6f25149b80), ROM_BIOS(6)) /* os */ + ROMX_LOAD("basic1.rom", 0x00000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 0 00000 */ + ROMX_LOAD("basic1.rom", 0x04000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 1 04000 */ + ROMX_LOAD("basic1.rom", 0x08000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 2 08000 */ + ROMX_LOAD("basic1.rom", 0x0c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(6)) /* rom page 3 0c000 */ ROM_END @@ -1059,18 +1059,18 @@ ROM_START(bbcb) /* rom page 15 3c000 BASIC */ ROM_DEFAULT_BIOS("os12b2") ROM_SYSTEM_BIOS( 0, "os12b2", "OS 1.20 / BASIC2" ) - ROMX_LOAD("os12.rom", 0x40000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(1)) /* os */ - ROMX_LOAD("basic2.rom", 0x3c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(1)) /* rom page 15 3c000 */ + ROMX_LOAD("os12.rom", 0x40000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(1)) /* os */ + ROMX_LOAD("basic2.rom", 0x3c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(1)) /* rom page 15 3c000 */ ROM_SYSTEM_BIOS( 1, "os12b1", "OS 1.20 / BASIC1" ) - ROMX_LOAD("os12.rom", 0x40000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(2)) /* os */ - ROMX_LOAD("basic1.rom", 0x3c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(2)) /* rom page 15 3c000 */ + ROMX_LOAD("os12.rom", 0x40000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d), ROM_BIOS(2)) /* os */ + ROMX_LOAD("basic1.rom", 0x3c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(2)) /* rom page 15 3c000 */ ROM_SYSTEM_BIOS( 2, "os10b2", "OS 1.00 / BASIC2" ) - ROMX_LOAD("os10.rom", 0x40000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(3)) /* os */ - ROMX_LOAD("basic2.rom", 0x3c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(3)) /* rom page 15 3c000 */ + ROMX_LOAD("os10.rom", 0x40000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(3)) /* os */ + ROMX_LOAD("basic2.rom", 0x3c000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281), ROM_BIOS(3)) /* rom page 15 3c000 */ ROM_SYSTEM_BIOS( 3, "os10b1", "OS 1.00 / BASIC1" ) - ROMX_LOAD("os10.rom", 0x40000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(4)) /* os */ - ROMX_LOAD("basic1.rom", 0x3c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(4)) /* rom page 15 3c000 */ - + ROMX_LOAD("os10.rom", 0x40000, 0x4000, CRC(9679b8f8) SHA1(d35f6723132aabe3c4d00fc16fd9ecc6768df753), ROM_BIOS(4)) /* os */ + ROMX_LOAD("basic1.rom", 0x3c000, 0x4000, CRC(b3364108) SHA1(890f6e3e7fab3340f75b85e93ff29332bc9ecb2e), ROM_BIOS(4)) /* rom page 15 3c000 */ + ROM_REGION(0x20000,"user2",0) /* DFS ROMS */ ROM_LOAD("dfs09.rom", 0x00000, 0x2000, CRC(3ce609cf) SHA1(5cc0f14b8f46855c70eaa653cca4ad079b458732)) ROM_RELOAD( 0x02000, 0x2000 ) @@ -1257,7 +1257,7 @@ ROM_START(bbcm) /* 34000 rom 13 ADFS */ /* 38000 rom 14 View + MOS code */ /* 3c000 rom 15 Terminal + Tube host + CFS */ -// ROM_LOAD("anfs424.rom", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) // TODO where to load this? +// ROM_LOAD("anfs424.rom", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) // TODO where to load this? ROM_REGION(0x40,"rtc",0) /* mc146818 */ /* Factory defaulted CMOS RAM, sets default language ROM, etc. */ @@ -1293,7 +1293,7 @@ ROM_START(bbcmt) /* 34000 rom 13 ADFS */ /* 38000 rom 14 View + MOS code */ /* 3c000 rom 15 Terminal + Tube host + CFS */ -// ROM_LOAD("anfs424.ic27", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) // TODO where to load this? +// ROM_LOAD("anfs424.ic27", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) // TODO where to load this? ROM_REGION(0x40,"rtc",0) /* mc146818 */ /* Factory defaulted CMOS RAM, sets default language ROM, etc. */ @@ -1395,7 +1395,7 @@ ROM_START(bbcm512) /* 34000 rom 13 ADFS */ /* 38000 rom 14 View + MOS code */ /* 3c000 rom 15 Terminal + Tube host + CFS */ -// ROM_LOAD("anfs424.ic27", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) +// ROM_LOAD("anfs424.ic27", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) ROM_REGION(0x40,"rtc",0) /* mc146818 */ /* Factory defaulted CMOS RAM, sets default language ROM, etc. */ @@ -1429,7 +1429,7 @@ ROM_START(bbcmarm) /* 34000 rom 13 ADFS */ /* 38000 rom 14 View + MOS code */ /* 3c000 rom 15 Terminal + Tube host + CFS */ -// ROM_LOAD("anfs424.ic27", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) +// ROM_LOAD("anfs424.ic27", 0x20000, 0x4000, CRC(1b9f75fd) SHA1(875f71edd48f87c3a55371409d0cc2015d8b5853) ) ROM_REGION(0x40,"rtc",0) /* mc146818 */ /* Factory defaulted CMOS RAM, sets default language ROM, etc. */ @@ -1446,7 +1446,7 @@ ROM_START(bbcmc) ROMX_LOAD("mos510.ic49", 0x30000, 0x10000, BAD_DUMP CRC(9a2a6086) SHA1(094ab37b0b6437c4f1653eaa0602ef102737adb6), ROM_BIOS(1)) /* Merged individual ROM bank dumps */ ROM_SYSTEM_BIOS( 1, "mos500", "Original MOS 5.00" ) ROMX_LOAD("mos500.ic49", 0x30000, 0x10000, BAD_DUMP CRC(f6170023) SHA1(140d002d2d9cd34b47197a2ba823505af2a84633), ROM_BIOS(2)) /* Merged individual ROM bank dumps */ - + ROM_COPY("user1", 0x30000, 0x40000, 0x4000) /* Move loaded roms into place */ ROM_FILL(0x30000, 0x4000, 0xFFFF) /* 00000 rom 0 EXTERNAL */ @@ -1466,9 +1466,9 @@ ROM_START(bbcmc) /* 38000 rom 14 BASIC */ /* 3c000 rom 15 Utils */ -// ROM_REGION(0x80,"mc146818",0) /* mc146818 */ +// ROM_REGION(0x80,"mc146818",0) /* mc146818 */ /* Factory defaulted CMOS RAM, sets default language ROM, etc. */ -// ROM_LOAD("mos500.cmos", 0x00, 0x80, CRC(d8458039) SHA1(72c056d493e74ceca41f48936012b012b496a226)) +// ROM_LOAD("mos500.cmos", 0x00, 0x80, CRC(d8458039) SHA1(72c056d493e74ceca41f48936012b012b496a226)) ROM_END @@ -1500,9 +1500,9 @@ ROM_START(bbcmc_ar) ROM_LOAD("international16.rom", 0x8000 , 0x4000, CRC(0ef527b1) SHA1(dc5149ccf588cd591a6ad47727474ef3313272ce) ) ROM_LOAD("arabian-c22.rom" , 0x20000, 0x4000, CRC(4f3aadff) SHA1(2bbf61ba68264ce5845aab9c54e750b0efe219c8) ) -// ROM_REGION(0x80,"mc146818",0) /* mc146818 */ +// ROM_REGION(0x80,"mc146818",0) /* mc146818 */ /* Factory defaulted CMOS RAM, sets default language ROM, etc. */ -// ROM_LOAD("mos500.cmos", 0x00, 0x80, CRC(d8458039) SHA1(72c056d493e74ceca41f48936012b012b496a226)) +// ROM_LOAD("mos500.cmos", 0x00, 0x80, CRC(d8458039) SHA1(72c056d493e74ceca41f48936012b012b496a226)) ROM_END diff --git a/src/mess/drivers/cat.c b/src/mess/drivers/cat.c index 4a0afbf6bf0..6f879f1d6de 100644 --- a/src/mess/drivers/cat.c +++ b/src/mess/drivers/cat.c @@ -7,29 +7,29 @@ Copyright (C) 2009-2013 Miodrag Milanovic and Jonathan Gevaryahu AKA Lord Nightmare With information and help from John "Sandy" Bumgarner, Dwight Elvey, Charles Springer, Terry Holmes, Jonathan Sand, Aza Raskin and others. - - + + This source file is dual-licensed under the following licenses: 1. The MAME license as of September 2013 2. The GNU LGPLv2.1: - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - + Please contact the authors if you require other licensing. - - + + This driver is dedicated in memory of Jef Raskin and Dave Boulton 12/06/2009 Skeleton driver. @@ -234,7 +234,7 @@ J9: unpopulated DIL 40-pin straight connector for a ROM debug/expansion/RAM-shad /HICE is most likely !(a19|a18)&!a15 pin 1 (GND) is in the lower left and the pins count low-high then to the right (gnd ? ? ? ? ? vcc a14 a13 a8 a9 a11 /OE a10 /LOCE d7 d6 d5 d4 d3 ) - (GND ? ? ? gnd ? vcc a12 a7 a6 a5 a4 a3 a2 a1 a0 d0 d1 d2 gnd) + (GND ? ? ? gnd ? vcc a12 a7 a6 a5 a4 a3 a2 a1 a0 d0 d1 d2 gnd) Jx: 4 pin on top side, 6 pin on bottom side edge ?debug? connector (doesn't have a Jx number) (trace me!) B1: a cut-able trace on the pcb. Not cut, affects one of the pins on the unpopulated J9 connector only. @@ -453,9 +453,9 @@ public: DECLARE_READ16_MEMBER(cat_2e80_r); DECLARE_READ16_MEMBER(cat_0080_r); DECLARE_READ16_MEMBER(cat_0000_r); - + DECLARE_READ8_MEMBER(swyft_d0000); - + DECLARE_READ8_MEMBER(swyft_via0_r); DECLARE_WRITE8_MEMBER(swyft_via0_w); DECLARE_READ8_MEMBER(via0_pa_r); @@ -471,7 +471,7 @@ public: DECLARE_READ_LINE_MEMBER(via0_cb2_r); DECLARE_WRITE_LINE_MEMBER(via0_cb2_w); DECLARE_WRITE_LINE_MEMBER(via0_int_w); - + DECLARE_READ8_MEMBER(swyft_via1_r); DECLARE_WRITE8_MEMBER(swyft_via1_w); DECLARE_READ8_MEMBER(via1_pa_r); @@ -1200,7 +1200,7 @@ rom: ...-0xC951: ? 0xC952: boot vector 0xC952-0xCAAE: binary code (purpose?) - 0xCD26-0xCD3B: ?init forth bytecode? + 0xCD26-0xCD3B: ?init forth bytecode? 0xCD3C-0xCEBA: 0xFF fill (unused?) 0xCEEB-0xFFFE: Forth dictionaries for compiling, with <word> then <3 bytes> afterward? (or before it? most likely afterward) @@ -1243,7 +1243,7 @@ Add A0 low word to itself Add A0 low word to itself again move the long word from address pointed to by A0 (i.e. the specific opcode's area at the 46xxx part of ram) to A1 Jump to A1(CD06) - + CD06: jump to A3 (E94) E94: subtract D5 from A5 (cd28 - cd22 = 0x0006) @@ -1358,8 +1358,8 @@ READ8_MEMBER( cat_state::swyft_d0000 ) // if bit is 1 enable: (obviously don't set more than one bit or you get bus contention!) // acia -// via0 -// via1 +// via0 +// via1 // x x x x 1 1 ?1? ?0? ? ^ ^ ^ ? ? * * * * ?*? ? ? ? ? ? // ^ ^ ^ ^ <- these four bits address the VIA registers? is this correct? static const char *const swyft_via_regnames[] = { "0: ORB/IRB", "1: ORA/IRA", "2: DDRB", "3: DDRA", "4: T1C-L", "5: T1C-H", "6: T1L-L", "7: T1L-H", "8: T2C-L" "9: T2C-H", "A: SR", "B: ACR", "C: PCR", "D: IFR", "E: IER", "F: ORA/IRA*" }; diff --git a/src/mess/drivers/compis.c b/src/mess/drivers/compis.c index ae4b9f59fc8..0331414b67d 100644 --- a/src/mess/drivers/compis.c +++ b/src/mess/drivers/compis.c @@ -96,7 +96,7 @@ READ16_MEMBER( compis_state::isbx1_tdma_r ) { if (ACCESSING_BITS_0_7) { - if (offset < 2) + if (offset < 2) return m_crtc->read(space, offset & 0x01); else return 0; @@ -280,8 +280,8 @@ static ADDRESS_MAP_START( compis_io, AS_IO, 16, compis_state ) AM_RANGE(0x0000, 0x0007) /* PCS0 */ AM_MIRROR(0x78) AM_DEVREADWRITE8(I8255_TAG, i8255_device, read, write, 0xff00) AM_RANGE(0x0080, 0x0087) /* PCS1 */ AM_MIRROR(0x78) AM_DEVREADWRITE8(I8253_TAG, pit8253_device, read, write, 0x00ff) AM_RANGE(0x0100, 0x011f) /* PCS2 */ AM_MIRROR(0x60) AM_DEVREADWRITE8(MM58174A_TAG, mm58274c_device, read, write, 0x00ff) - //AM_RANGE(0x0180, 0x0181) /* PCS3 */ AM_MIRROR(0x7e) - //AM_RANGE(0x0200, 0x0201) /* PCS4 */ AM_MIRROR(0x7e) + //AM_RANGE(0x0180, 0x0181) /* PCS3 */ AM_MIRROR(0x7e) + //AM_RANGE(0x0200, 0x0201) /* PCS4 */ AM_MIRROR(0x7e) AM_RANGE(0x0280, 0x028f) /* PCS5 */ AM_MIRROR(0x70) AM_DEVICE(I80130_TAG, i80130_device, io_map) AM_RANGE(0x0300, 0x0301) /* PCS6:0 */ AM_MIRROR(0xe) AM_WRITE8(tape_mon_w, 0x00ff) AM_RANGE(0x0310, 0x0311) /* PCS6:3 */ AM_MIRROR(0xc) AM_DEVREADWRITE8(I8251A_TAG, i8251_device, data_r, data_w, 0xff00) @@ -300,7 +300,7 @@ static ADDRESS_MAP_START( compis_io, AS_IO, 16, compis_state ) AM_RANGE(0x0330, 0x0333) /* PCS6:6 */ AM_DEVREADWRITE8("upd7220", upd7220_device, read, write, 0x00ff) AM_RANGE(0x0330, 0x0331) /* PCS6:7 */ AM_MIRROR(0xe) AM_READWRITE8(isbx1_tdma_r, isbx1_tdma_w, 0xff00) // DMA-TERMINATE J9 (iSBX1) AM_RANGE(0x0340, 0x034f) /* PCS6:8 */ AM_DEVREADWRITE8(ISBX_0_TAG, isbx_slot_device, mcs0_r, mcs0_w, 0x00ff) // 8272 CS0 (8/16-bit) J8 (iSBX0) - AM_RANGE(0x0340, 0x034f) /* PCS6:9 */ AM_DEVREADWRITE8(ISBX_0_TAG, isbx_slot_device, mcs1_r, mcs1_w, 0xff00) // CS1 (16-bit) J8 (iSBX0) + AM_RANGE(0x0340, 0x034f) /* PCS6:9 */ AM_DEVREADWRITE8(ISBX_0_TAG, isbx_slot_device, mcs1_r, mcs1_w, 0xff00) // CS1 (16-bit) J8 (iSBX0) AM_RANGE(0x0350, 0x035f) /* PCS6:10 */ AM_DEVREADWRITE8(ISBX_0_TAG, isbx_slot_device, mcs1_r, mcs1_w, 0x00ff) // CS1 (8-bit) J8 (iSBX0) AM_RANGE(0x0350, 0x035f) /* PCS6:11 */ AM_DEVREADWRITE8(ISBX_0_TAG, isbx_slot_device, mdack_r, mdack_w, 0xff00) // DMA-ACK J8 (iSBX0) AM_RANGE(0x0360, 0x036f) /* PCS6:13 */ AM_DEVREADWRITE8(ISBX_1_TAG, isbx_slot_device, mcs0_r, mcs0_w, 0x00ff) // CS0 (8/16-bit) J9 (iSBX1) @@ -483,7 +483,7 @@ READ8_MEMBER( compis_state::compis_irq_callback ) WRITE_LINE_MEMBER( compis_state::tmr0_w ) { m_tmr0 = state; - + m_cassette->output(m_tmr0 ? -1 : 1); m_maincpu->tmrin0_w(state); @@ -563,10 +563,10 @@ static const i8251_interface usart_intf = READ8_MEMBER( compis_state::ppi_pb_r ) { /* - + bit description - - 0 J5-4 + + 0 J5-4 1 J5-5 2 J6-3 Cassette read 3 J2-6 DSR / S8-4 Test @@ -574,7 +574,7 @@ READ8_MEMBER( compis_state::ppi_pb_r ) 5 J7-11 Centronics BUSY 6 J7-13 Centronics SELECT 7 Tmr0 - + */ UINT8 data = 0; @@ -598,9 +598,9 @@ READ8_MEMBER( compis_state::ppi_pb_r ) WRITE8_MEMBER( compis_state::ppi_pc_w ) { /* - + bit description - + 0 J5-1 1 J5-2 2 Select: 1=time measure, DSR from J2/J4 pin 6. 0=read cassette @@ -609,7 +609,7 @@ WRITE8_MEMBER( compis_state::ppi_pc_w ) 5 J7-1 Centronics STROBE 6 V2-4 Floppy Soft reset 7 V2-3 Floppy Terminal count - + */ m_isbx0->opt1_w(BIT(data, 4)); diff --git a/src/mess/drivers/ct486.c b/src/mess/drivers/ct486.c index cb32671e217..e314be7678a 100644 --- a/src/mess/drivers/ct486.c +++ b/src/mess/drivers/ct486.c @@ -2,8 +2,8 @@ PC/AT 486 with Chips & Technologies CS4031 chipset - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c index 02ddf719356..5a3d160f99c 100644 --- a/src/mess/drivers/dectalk.c +++ b/src/mess/drivers/dectalk.c @@ -21,12 +21,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. -* +* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA @@ -37,7 +37,7 @@ * This driver dedicated in memory of Dennis Klatt and Jonathan Allen, without whose * original work MITalk and hence KlattTalk and DECtalk would never have existed, * in memory of Martin Minow, who wrote much of the DECtalk DTC-01 code, and -* in memory of Tony Vitale, who was one of the architects of the DECtalk project. +* in memory of Tony Vitale, who was one of the architects of the DECtalk project. * * Staff behind DECtalk itself: (mostly from http://amhistory.si.edu/archives/speechsynthesis/ss_dec.htm ): * John C. Broihier @@ -131,7 +131,7 @@ DTC-01 LEDs * unknown date: Version 1.1 roms released to fix a bug with insufficient stack space, see ss_dec1 above * October 11 1983: Second half of Version 1.8 rom finalized * December 05 1983: First half of Version 1.8 rom finalized -* March 1984: Hardware version B done +* March 1984: Hardware version B done (integrates the output fifo sync error check onto the pcb; Version A units are retrofitted when sent in for firmware upgrades) (most of the schematics come from this time, and have the version 1.8 roms listed on them) @@ -738,7 +738,7 @@ READ16_MEMBER(dectalk_state::spc_infifo_data_r) // if fifo is empty (tail ptr == head ptr), do not increment the tail ptr, otherwise do. if (m_infifo_count > 0) { - m_infifo_tail_ptr++; + m_infifo_tail_ptr++; m_infifo_count--; } m_infifo_tail_ptr&=0x1F; diff --git a/src/mess/drivers/einstein.c b/src/mess/drivers/einstein.c index 12842eb5a63..a4fe2724291 100644 --- a/src/mess/drivers/einstein.c +++ b/src/mess/drivers/einstein.c @@ -2,8 +2,8 @@ Tatung Einstein - license: MAME - copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith + license: MAME + copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith TMS9129 VDP Graphics diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c index 8e641ede9db..c75d9aee0c3 100644 --- a/src/mess/drivers/esq5505.c +++ b/src/mess/drivers/esq5505.c @@ -917,7 +917,7 @@ ROM_END ROM_START( eps16p ) ROM_REGION(0x20000, "osrom", 0) - ROM_LOAD16_BYTE( "eps16plus-100f-lower.u27", 0x000000, 0x010000, CRC(78568d3f) SHA1(ac737e093f422e109e8f06d44548629a12d6418c) ) + ROM_LOAD16_BYTE( "eps16plus-100f-lower.u27", 0x000000, 0x010000, CRC(78568d3f) SHA1(ac737e093f422e109e8f06d44548629a12d6418c) ) ROM_LOAD16_BYTE( "eps16plus-100f-upper.u28", 0x000001, 0x010000, CRC(1264465f) SHA1(71604da091bd90a32f0d93698d70b9e114ec1697) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) // EPS-16 Plus has no ROM sounds @@ -979,4 +979,3 @@ CONS( 1990, sd1, 0, 0, vfxsd, vfx, esq5505_state, denib, "Ensoniq", "SD-1 ( CONS( 1990, sq1, 0, 0, sq1, vfx, esq5505_state, sq1, "Ensoniq", "SQ-1", GAME_NOT_WORKING ) // 2x16 LCD CONS( 1990, sqrack,sq1, 0, sq1, vfx, esq5505_state, sq1, "Ensoniq", "SQ-Rack", GAME_NOT_WORKING ) // 2x16 LCD CONS( 1991, sd132, sd1,0, vfx32, vfx, esq5505_state, denib, "Ensoniq", "SD-1 (32 voice)", GAME_NOT_WORKING ) // 2x40 VFD - diff --git a/src/mess/drivers/esqmr.c b/src/mess/drivers/esqmr.c index a1e234cb317..9376667c994 100644 --- a/src/mess/drivers/esqmr.c +++ b/src/mess/drivers/esqmr.c @@ -103,8 +103,8 @@ INPUT_PORTS_END ROM_START( mr61 ) ROM_REGION(0x100000, "maincpu", 0) - ROM_LOAD16_WORD_SWAP( "mrw-osf-11af-2.10.bin", 0x000000, 0x080000, CRC(5854314e) SHA1(8fb2e2ee2f5fb12eae8ea33cb18f757efaec6780) ) - ROM_LOAD16_WORD_SWAP( "mrw-romc-32ef-1.20.bin", 0x080000, 0x080000, CRC(68321347) SHA1(56cb96943ba42c35ba2787a49b5f4adf7c8dffb8) ) + ROM_LOAD16_WORD_SWAP( "mrw-osf-11af-2.10.bin", 0x000000, 0x080000, CRC(5854314e) SHA1(8fb2e2ee2f5fb12eae8ea33cb18f757efaec6780) ) + ROM_LOAD16_WORD_SWAP( "mrw-romc-32ef-1.20.bin", 0x080000, 0x080000, CRC(68321347) SHA1(56cb96943ba42c35ba2787a49b5f4adf7c8dffb8) ) ROM_REGION(0x200000, "waverom", ROMREGION_ERASE00) ROM_REGION(0x200000, "waverom2", ROMREGION_ERASE00) diff --git a/src/mess/drivers/ex800.c b/src/mess/drivers/ex800.c index 4a08f9c085e..e87a5558579 100644 --- a/src/mess/drivers/ex800.c +++ b/src/mess/drivers/ex800.c @@ -1,9 +1,9 @@ /****************************************************************************** - Epson EX-800 Dot Matrix printer + Epson EX-800 Dot Matrix printer - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best -- diff --git a/src/mess/drivers/hp48.c b/src/mess/drivers/hp48.c index e916de3850a..eadda806c14 100644 --- a/src/mess/drivers/hp48.c +++ b/src/mess/drivers/hp48.c @@ -932,9 +932,9 @@ static MACHINE_CONFIG_START( hp48_common, hp48_state ) MCFG_CPU_ADD ( "maincpu", SATURN, 3937007 ) /* almost 4 MHz */ MCFG_CPU_PROGRAM_MAP ( hp48) MCFG_SATURN_CONFIG( WRITE32(hp48_state, hp48_reg_out), READ32(hp48_state, hp48_reg_in), - WRITELINE(hp48_state, hp48_mem_reset), WRITE32(hp48_state, hp48_mem_config), - WRITE32(hp48_state, hp48_mem_unconfig), READ32(hp48_state, hp48_mem_id), - WRITE32(hp48_state, hp48_mem_crc), WRITELINE(hp48_state, hp48_rsi) ) + WRITELINE(hp48_state, hp48_mem_reset), WRITE32(hp48_state, hp48_mem_config), + WRITE32(hp48_state, hp48_mem_unconfig), READ32(hp48_state, hp48_mem_id), + WRITE32(hp48_state, hp48_mem_crc), WRITELINE(hp48_state, hp48_rsi) ) /* memory */ MCFG_NVRAM_ADD_0FILL("nvram") diff --git a/src/mess/drivers/ibmpc.c b/src/mess/drivers/ibmpc.c index 4c5e59ef698..c2424539a00 100644 --- a/src/mess/drivers/ibmpc.c +++ b/src/mess/drivers/ibmpc.c @@ -357,9 +357,9 @@ static MACHINE_CONFIG_START( ibm5160, ibmpc_state ) MCFG_RAM_ADD(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("640K") - /* software lists */ - MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") - MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") + /* software lists */ + MCFG_SOFTWARE_LIST_ADD("pc_disk_list","ibm5150") + MCFG_SOFTWARE_LIST_ADD("xt_disk_list","ibm5160_flop") MACHINE_CONFIG_END diff --git a/src/mess/drivers/instruct.c b/src/mess/drivers/instruct.c index a8d02eb548e..91fd3f9e7d3 100644 --- a/src/mess/drivers/instruct.c +++ b/src/mess/drivers/instruct.c @@ -373,7 +373,7 @@ QUICKLOAD_LOAD_MEMBER( instruct_state, instruct ) read_ = 0xfff; if (quick_length < 0xfff) read_ = quick_length; - m_p_ram[0] = 0x1f; // add jump for RST key + m_p_ram[0] = 0x1f; // add jump for RST key for (i = 1; i < read_; i++) m_p_ram[i] = quick_data[i]; diff --git a/src/mess/drivers/lx800.c b/src/mess/drivers/lx800.c index 7334695a395..c2d08a4cce8 100644 --- a/src/mess/drivers/lx800.c +++ b/src/mess/drivers/lx800.c @@ -2,8 +2,8 @@ Epson LX-800 dot matrix printer - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Skeleton driver diff --git a/src/mess/drivers/mc10.c b/src/mess/drivers/mc10.c index 04a15a2cd08..548e5261d6d 100644 --- a/src/mess/drivers/mc10.c +++ b/src/mess/drivers/mc10.c @@ -2,8 +2,8 @@ TRS-80 Radio Shack MicroColor Computer - license: MAME - copyright-holders: Nathan Woods, Dirk Best + license: MAME + copyright-holders: Nathan Woods, Dirk Best ***************************************************************************/ diff --git a/src/mess/drivers/modellot.c b/src/mess/drivers/modellot.c index 78f14bcae51..ba8ef5b177b 100644 --- a/src/mess/drivers/modellot.c +++ b/src/mess/drivers/modellot.c @@ -13,7 +13,7 @@ be 16, 32, or 48k. The FDC is a FD1791. All the articles and doco (what there is of it) is all in Italian. - + ***********************************************************************************/ #include "emu.h" diff --git a/src/mess/drivers/molecular.c b/src/mess/drivers/molecular.c index 1993b877f25..457a5a4b7f8 100644 --- a/src/mess/drivers/molecular.c +++ b/src/mess/drivers/molecular.c @@ -173,7 +173,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( molecula_file_io, AS_IO, 8, molecula_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x40, 0x43) AM_READWRITE(sio_r,sio_w) +// AM_RANGE(0x40, 0x43) AM_READWRITE(sio_r,sio_w) AM_RANGE(0x72, 0x73) AM_WRITE(file_output_w) // unknown ADDRESS_MAP_END @@ -257,7 +257,7 @@ static const gfx_layout charlayout = #endif static GFXDECODE_START( molecula ) -// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) +// GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 1 ) GFXDECODE_END @@ -293,10 +293,10 @@ static MACHINE_CONFIG_START( molecula, molecula_state ) MCFG_CPU_PROGRAM_MAP(molecula_app_map) MCFG_CPU_IO_MAP(molecula_app_io) -// MCFG_CPU_ADD("sub",I8086,I86_CLOCK/2) -// MCFG_CPU_PROGRAM_MAP(molecula_map) -// MCFG_CPU_IO_MAP(molecula_io) -// MCFG_DEVICE_DISABLE() +// MCFG_CPU_ADD("sub",I8086,I86_CLOCK/2) +// MCFG_CPU_PROGRAM_MAP(molecula_map) +// MCFG_CPU_IO_MAP(molecula_io) +// MCFG_DEVICE_DISABLE() /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mess/drivers/mtx.c b/src/mess/drivers/mtx.c index b948837717e..7d306e7736d 100644 --- a/src/mess/drivers/mtx.c +++ b/src/mess/drivers/mtx.c @@ -2,8 +2,8 @@ Memotech MTX 500, MTX 512 and RS 128 - license: MAME - copyright-holders: (Original Author?), Dirk Best, Curt Coder + license: MAME + copyright-holders: (Original Author?), Dirk Best, Curt Coder **************************************************************************/ diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c index a854f17fb09..5e5cdd00ee3 100644 --- a/src/mess/drivers/nascom1.c +++ b/src/mess/drivers/nascom1.c @@ -1,12 +1,12 @@ /************************************************************************ - Nascom 1 and Nascom 2 + Nascom 1 and Nascom 2 - license: MAME - copyright-holders: (Original Author?), Dirk Best + license: MAME + copyright-holders: (Original Author?), Dirk Best - Memory map + Memory map CPU: z80 0000-03ff ROM (Nascom1 Monitor) diff --git a/src/mess/drivers/ng_aes.c b/src/mess/drivers/ng_aes.c index 4f76ea53cdb..e24f1627d5e 100644 --- a/src/mess/drivers/ng_aes.c +++ b/src/mess/drivers/ng_aes.c @@ -1332,7 +1332,7 @@ static INPUT_PORTS_START( aes ) PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_SELECT ) PORT_PLAYER(2) PORT_BIT( 0x7000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(DEVICE_SELF, neogeo_state, get_memcard_status, NULL) PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* Hardware type (AES=0, MVS=1) Some games check this and show */ - /* a piracy warning screen if the hardware and BIOS don't match */ + /* a piracy warning screen if the hardware and BIOS don't match */ PORT_START("AUDIO") PORT_BIT( 0x0007, IP_ACTIVE_HIGH, IPT_UNUSED ) /* AES has no coin slots, it's a console */ diff --git a/src/mess/drivers/pc.c b/src/mess/drivers/pc.c index 56a25869079..76062c8a2f0 100644 --- a/src/mess/drivers/pc.c +++ b/src/mess/drivers/pc.c @@ -157,7 +157,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START(mc1502_io, AS_IO, 8, pc_state ) AM_RANGE(0x0020, 0x0021) AM_DEVREADWRITE("pic8259", pic8259_device, read, write) - AM_RANGE(0x0028, 0x0028) AM_DEVREADWRITE("upd8251", i8251_device, data_r, data_w) // not working yet + AM_RANGE(0x0028, 0x0028) AM_DEVREADWRITE("upd8251", i8251_device, data_r, data_w) // not working yet AM_RANGE(0x0029, 0x0029) AM_DEVREADWRITE("upd8251", i8251_device, status_r, control_w) AM_RANGE(0x0040, 0x0043) AM_DEVREADWRITE("pit8253", pit8253_device, read, write) // BIOS 5.31, 5.33 @@ -902,7 +902,7 @@ static INPUT_PORTS_START( ec1841 ) PORT_DIPSETTING( 0x00, DEF_STR( No ) ) PORT_DIPSETTING( 0x01, DEF_STR( Yes ) ) -// PORT_START("DSW1") /* SA2 */ +// PORT_START("DSW1") /* SA2 */ PORT_INCLUDE( pcvideo_cga ) INPUT_PORTS_END diff --git a/src/mess/drivers/pc1512.c b/src/mess/drivers/pc1512.c index 5f16e535ff5..7596aabcce8 100644 --- a/src/mess/drivers/pc1512.c +++ b/src/mess/drivers/pc1512.c @@ -1369,7 +1369,7 @@ static MACHINE_CONFIG_START( pc1640, pc1640_state ) MCFG_PIC8259_ADD(I8259A2_TAG, INPUTLINE(I8086_TAG, INPUT_LINE_IRQ0), VCC, NULL) MCFG_PIT8253_ADD(I8253_TAG, pit_intf) MCFG_MC146818_ADD(MC146818_TAG, XTAL_32_768kHz) - MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w)) + MCFG_MC146818_IRQ_HANDLER(DEVWRITELINE(I8259A2_TAG, pic8259_device, ir2_w)) MCFG_PC_FDC_XT_ADD(PC_FDC_XT_TAG) MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":0", pc1512_floppies, "525dd", pc1512_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD(PC_FDC_XT_TAG ":1", pc1512_floppies, NULL, pc1512_state::floppy_formats) diff --git a/src/mess/drivers/pt68k4.c b/src/mess/drivers/pt68k4.c index 4339c119f19..14904e68693 100644 --- a/src/mess/drivers/pt68k4.c +++ b/src/mess/drivers/pt68k4.c @@ -75,7 +75,7 @@ void pt68k4_state::machine_reset() //UINT32 pt68k4_state::screen_update_pt68k4(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect) //{ -// return 0; +// return 0; //} READ16_MEMBER( pt68k4_state::status_r ) diff --git a/src/mess/drivers/px4.c b/src/mess/drivers/px4.c index 068d22a9751..9395c5fe4dd 100644 --- a/src/mess/drivers/px4.c +++ b/src/mess/drivers/px4.c @@ -2,8 +2,8 @@ Epson PX-4 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Note: We are missing a dump of the slave 7508 CPU that controls the keyboard and some other things. diff --git a/src/mess/drivers/rmnimbus.c b/src/mess/drivers/rmnimbus.c index 8c685c8189d..53631c1674d 100644 --- a/src/mess/drivers/rmnimbus.c +++ b/src/mess/drivers/rmnimbus.c @@ -294,8 +294,8 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS( XTAL_4_433619MHz*2,650,0,640,260,0,250) -// MCFG_SCREEN_REFRESH_RATE(50) -// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(100)) +// MCFG_SCREEN_REFRESH_RATE(50) +// MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(100)) MCFG_SCREEN_UPDATE_DRIVER(rmnimbus_state, screen_update_nimbus) MCFG_SCREEN_VBLANK_DRIVER(rmnimbus_state, screen_eof_nimbus) @@ -303,8 +303,8 @@ static MACHINE_CONFIG_START( nimbus, rmnimbus_state ) MCFG_PALETTE_LENGTH(SCREEN_NO_COLOURS) -// MCFG_SCREEN_SIZE(650, 260) -// MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) +// MCFG_SCREEN_SIZE(650, 260) +// MCFG_SCREEN_VISIBLE_AREA(0, 639, 0, 249) /* Backing storage */ MCFG_WD2793_ADD(FDC_TAG, nimbus_wd17xx_interface ) diff --git a/src/mess/drivers/samcoupe.c b/src/mess/drivers/samcoupe.c index 1e51cba9fb3..1d56a33d73f 100644 --- a/src/mess/drivers/samcoupe.c +++ b/src/mess/drivers/samcoupe.c @@ -2,8 +2,8 @@ Miles Gordon Technology SAM Coupe - license: MAME - copyright-holders: Lee Hammerton, Dirk Best + license: MAME + copyright-holders: Lee Hammerton, Dirk Best Notes: ------ diff --git a/src/mess/drivers/saturn.c b/src/mess/drivers/saturn.c index 05459f01cad..4a06ae177c5 100644 --- a/src/mess/drivers/saturn.c +++ b/src/mess/drivers/saturn.c @@ -764,7 +764,7 @@ static MACHINE_CONFIG_START( saturn, sat_console_state ) MCFG_CPU_DATA_MAP(scudsp_data) MCFG_CPU_CONFIG(scudsp_config) -// SH-1 +// SH-1 // SMPC MCU, running at 4 MHz (+ custom RTC device that runs at 32.768 KHz) diff --git a/src/mess/drivers/socrates.c b/src/mess/drivers/socrates.c index 0befc44293c..9ebbaec775e 100644 --- a/src/mess/drivers/socrates.c +++ b/src/mess/drivers/socrates.c @@ -15,12 +15,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. -* +* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/src/mess/drivers/sym1.c b/src/mess/drivers/sym1.c index 1aba78536c3..a4b270739ff 100644 --- a/src/mess/drivers/sym1.c +++ b/src/mess/drivers/sym1.c @@ -2,8 +2,8 @@ Synertek Systems Corp. SYM-1 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ @@ -22,9 +22,9 @@ //************************************************************************** // SYM-1 main (and only) oscillator Y1 -#define SYM1_CLOCK XTAL_1MHz +#define SYM1_CLOCK XTAL_1MHz -#define LED_REFRESH_DELAY attotime::from_usec(70) +#define LED_REFRESH_DELAY attotime::from_usec(70) //************************************************************************** @@ -180,7 +180,7 @@ const ttl74145_interface sym1_ttl74145_intf = //************************************************************************** -// INPUT PORTS +// INPUT PORTS //************************************************************************** static INPUT_PORTS_START( sym1 ) @@ -246,10 +246,10 @@ INPUT_PORTS_END //************************************************************************** /* - PA0: Write protect R6532 RAM - PA1: Write protect RAM 0x400-0x7ff - PA2: Write protect RAM 0x800-0xbff - PA3: Write protect RAM 0xc00-0xfff + PA0: Write protect R6532 RAM + PA1: Write protect RAM 0x400-0x7ff + PA2: Write protect RAM 0x800-0xbff + PA3: Write protect RAM 0xc00-0xfff */ WRITE8_MEMBER( sym1_state::sym1_via2_a_w ) { @@ -358,16 +358,16 @@ const via6522_interface sym1_via2 = //************************************************************************** static ADDRESS_MAP_START( sym1_map, AS_PROGRAM, 8, sym1_state ) - AM_RANGE(0x0000, 0x03ff) AM_RAM // U12/U13 RAM + AM_RANGE(0x0000, 0x03ff) AM_RAM // U12/U13 RAM AM_RANGE(0x0400, 0x07ff) AM_RAMBANK("bank2") AM_SHARE("ram_1k") AM_RANGE(0x0800, 0x0bff) AM_RAMBANK("bank3") AM_SHARE("ram_2k") AM_RANGE(0x0c00, 0x0fff) AM_RAMBANK("bank4") AM_SHARE("ram_3k") - AM_RANGE(0x8000, 0x8fff) AM_ROM AM_SHARE("monitor") // U20 Monitor ROM - AM_RANGE(0xa000, 0xa00f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) // U25 VIA #1 - AM_RANGE(0xa400, 0xa40f) AM_DEVREADWRITE("riot", riot6532_device, read, write) // U27 RIOT - AM_RANGE(0xa600, 0xa67f) AM_RAMBANK("bank5") AM_SHARE("riot_ram") // U27 RIOT RAM - AM_RANGE(0xa800, 0xa80f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) // U28 VIA #2 - AM_RANGE(0xac00, 0xac0f) AM_DEVREADWRITE("via6522_2", via6522_device, read, write) // U29 VIA #3 + AM_RANGE(0x8000, 0x8fff) AM_ROM AM_SHARE("monitor") // U20 Monitor ROM + AM_RANGE(0xa000, 0xa00f) AM_DEVREADWRITE("via6522_0", via6522_device, read, write) // U25 VIA #1 + AM_RANGE(0xa400, 0xa40f) AM_DEVREADWRITE("riot", riot6532_device, read, write) // U27 RIOT + AM_RANGE(0xa600, 0xa67f) AM_RAMBANK("bank5") AM_SHARE("riot_ram") // U27 RIOT RAM + AM_RANGE(0xa800, 0xa80f) AM_DEVREADWRITE("via6522_1", via6522_device, read, write) // U28 VIA #2 + AM_RANGE(0xac00, 0xac0f) AM_DEVREADWRITE("via6522_2", via6522_device, read, write) // U29 VIA #3 AM_RANGE(0xb000, 0xefff) AM_ROM ADDRESS_MAP_END diff --git a/src/mess/drivers/tsispch.c b/src/mess/drivers/tsispch.c index 0b55f46045c..d4a91bbea14 100644 --- a/src/mess/drivers/tsispch.c +++ b/src/mess/drivers/tsispch.c @@ -15,12 +15,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. -* +* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/src/mess/drivers/vtech1.c b/src/mess/drivers/vtech1.c index 65dfd75e914..ea746262f64 100644 --- a/src/mess/drivers/vtech1.c +++ b/src/mess/drivers/vtech1.c @@ -12,8 +12,8 @@ Video Technology Laser 310 Dick Smith Electronics VZ-300 - license: MAME - copyright-holders: Juergen Buchmueller, Dirk Best + license: MAME + copyright-holders: Juergen Buchmueller, Dirk Best Thanks go to: diff --git a/src/mess/drivers/zexall.c b/src/mess/drivers/zexall.c index 4a99e80b604..7affabf258c 100644 --- a/src/mess/drivers/zexall.c +++ b/src/mess/drivers/zexall.c @@ -18,12 +18,12 @@ * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. -* +* * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. -* +* * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA diff --git a/src/mess/includes/apple2.h b/src/mess/includes/apple2.h index f27d0769035..fafd40c8a52 100644 --- a/src/mess/includes/apple2.h +++ b/src/mess/includes/apple2.h @@ -81,7 +81,7 @@ enum machine_type_t TK2000, // Microdigital TK2000 LASER128, // Laser 128/128EX/128EX2 SPACE84, // "Space 84" with flipped text mode - LABA2P // lab equipment (?) II Plus with flipped text mode + LABA2P // lab equipment (?) II Plus with flipped text mode }; enum bank_disposition_t diff --git a/src/mess/includes/at.h b/src/mess/includes/at.h index 32f1d024aca..001e57c1833 100644 --- a/src/mess/includes/at.h +++ b/src/mess/includes/at.h @@ -50,11 +50,11 @@ public: : driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu") { } required_device<cpu_device> m_maincpu; - + DECLARE_DRIVER_INIT(at586); - + UINT8 m_at_offset1; - + enum { TYPE_586 }; diff --git a/src/mess/includes/bbc.h b/src/mess/includes/bbc.h index e0c05a560f1..00e7a5d65e5 100644 --- a/src/mess/includes/bbc.h +++ b/src/mess/includes/bbc.h @@ -75,15 +75,15 @@ public: int m_SWRAMtype; // this stores the DIP switch setting for the SWRAM type being used int m_Speech; // this stores the CONF setting for Speech enabled/disabled int m_Master; // if 0 then we are emulating a BBC B style machine - // if 1 then we are emulating a BBC Master style machine + // if 1 then we are emulating a BBC Master style machine int m_ACCCON_IRR; // IRQ inputs int m_rombank; // This is the latch that holds the sideways ROM bank to read int m_userport; // This stores the sideways RAM latch type. - // Acorn and others use the bbc_rombank latch to select the write bank to be used.(type 0) - // Solidisc use the BBC's userport to select the write bank to be used (type 1) + // Acorn and others use the bbc_rombank latch to select the write bank to be used.(type 0) + // Solidisc use the BBC's userport to select the write bank to be used (type 1) int m_pagedRAM; // BBC B+ memory handling int m_vdusel; // BBC B+ memory handling diff --git a/src/mess/includes/compis.h b/src/mess/includes/compis.h index aab605126ee..813bdb40e75 100644 --- a/src/mess/includes/compis.h +++ b/src/mess/includes/compis.h @@ -32,41 +32,41 @@ #include "machine/z80dart.h" #include "video/upd7220.h" -#define I80186_TAG "ic1" -#define I80130_TAG "ic15" -#define I8251A_TAG "ic59" -#define I8253_TAG "ic60" +#define I80186_TAG "ic1" +#define I80130_TAG "ic15" +#define I8251A_TAG "ic59" +#define I8253_TAG "ic60" #define I8274_TAG "ic65" -#define MM58174A_TAG "ic66" -#define I8255_TAG "ic69" +#define MM58174A_TAG "ic66" +#define I8255_TAG "ic69" #define RS232_A_TAG "rs232a" #define RS232_B_TAG "rs232b" #define CASSETTE_TAG "cassette" #define CENTRONICS_TAG "centronics" -#define ISBX_0_TAG "isbx0" -#define ISBX_1_TAG "isbx1" -#define SCREEN_TAG "screen" +#define ISBX_0_TAG "isbx0" +#define ISBX_1_TAG "isbx1" +#define SCREEN_TAG "screen" class compis_state : public driver_device { public: compis_state(const machine_config &mconfig, device_type type, const char *tag) : driver_device(mconfig, type, tag), - m_maincpu(*this, I80186_TAG), - m_osp(*this, I80130_TAG), - m_pit(*this, I8253_TAG), - m_ppi(*this, I8255_TAG), - m_mpsc(*this, I8274_TAG), - m_centronics(*this, CENTRONICS_TAG), - m_uart(*this, I8251A_TAG), - m_rtc(*this, MM58174A_TAG), - m_crtc(*this, "upd7220"), - m_cassette(*this, CASSETTE_TAG), - m_isbx0(*this, ISBX_0_TAG), - m_isbx1(*this, ISBX_1_TAG), - m_ram(*this, RAM_TAG), - m_video_ram(*this, "video_ram"), - m_s8(*this, "S8") + m_maincpu(*this, I80186_TAG), + m_osp(*this, I80130_TAG), + m_pit(*this, I8253_TAG), + m_ppi(*this, I8255_TAG), + m_mpsc(*this, I8274_TAG), + m_centronics(*this, CENTRONICS_TAG), + m_uart(*this, I8251A_TAG), + m_rtc(*this, MM58174A_TAG), + m_crtc(*this, "upd7220"), + m_cassette(*this, CASSETTE_TAG), + m_isbx0(*this, ISBX_0_TAG), + m_isbx1(*this, ISBX_1_TAG), + m_ram(*this, RAM_TAG), + m_video_ram(*this, "video_ram"), + m_s8(*this, "S8") { } required_device<i80186_cpu_device> m_maincpu; diff --git a/src/mess/includes/einstein.h b/src/mess/includes/einstein.h index 39ac2a613bf..252d1a44e18 100644 --- a/src/mess/includes/einstein.h +++ b/src/mess/includes/einstein.h @@ -1,9 +1,9 @@ /*************************************************************************** - Tatung Einstein + Tatung Einstein - license: MAME - copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith + license: MAME + copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith ***************************************************************************/ diff --git a/src/mess/includes/mtx.h b/src/mess/includes/mtx.h index 2b84f0f2a0e..30e3eedf6e8 100644 --- a/src/mess/includes/mtx.h +++ b/src/mess/includes/mtx.h @@ -2,8 +2,8 @@ Memotech MTX 500, MTX 512 and RS 128 - license: MAME - copyright-holders: (Original Author?), Dirk Best, Curt Coder + license: MAME + copyright-holders: (Original Author?), Dirk Best, Curt Coder *************************************************************************/ diff --git a/src/mess/includes/nascom1.h b/src/mess/includes/nascom1.h index b2724449665..9e03e39d068 100644 --- a/src/mess/includes/nascom1.h +++ b/src/mess/includes/nascom1.h @@ -1,9 +1,9 @@ /*************************************************************************** - Nascom 1 and Nascom 2 + Nascom 1 and Nascom 2 - license: MAME - copyright-holders: (Original Author?), Dirk Best + license: MAME + copyright-holders: (Original Author?), Dirk Best ***************************************************************************/ diff --git a/src/mess/includes/rmnimbus.h b/src/mess/includes/rmnimbus.h index 0048db8cf63..6b6e6892d19 100644 --- a/src/mess/includes/rmnimbus.h +++ b/src/mess/includes/rmnimbus.h @@ -410,7 +410,7 @@ public: required_device<er59256_device> m_eeprom; UINT32 m_debug_machine; -// i186_state m_i186; +// i186_state m_i186; keyboard_t m_keyboard; nimbus_drives_t m_nimbus_drives; ipc_interface_t m_ipc_interface; diff --git a/src/mess/includes/thomson.h b/src/mess/includes/thomson.h index 52b1b10694c..b9d14a0c301 100644 --- a/src/mess/includes/thomson.h +++ b/src/mess/includes/thomson.h @@ -115,9 +115,9 @@ public: DECLARE_DEVICE_IMAGE_LOAD_MEMBER( to7_cartridge ); DECLARE_DEVICE_IMAGE_LOAD_MEMBER( mo5_cartridge ); - + optional_device<mc6854_device> m_mc6854; - + DECLARE_WRITE8_MEMBER( to7_set_cassette_motor ); DECLARE_WRITE8_MEMBER( mo5_set_cassette_motor ); DECLARE_WRITE_LINE_MEMBER( thom_dev_irq_0 ); @@ -322,7 +322,7 @@ protected: required_device<mea8000_device> m_mea8000; required_device<ram_device> m_ram; optional_device<mc6846_device> m_mc6846; - + /* bank logging and optimisations */ int m_old_cart_bank; int m_old_cart_bank_was_read_only; diff --git a/src/mess/machine/amigacd.c b/src/mess/machine/amigacd.c index 2785c3a5455..d2f3a0e7384 100644 --- a/src/mess/machine/amigacd.c +++ b/src/mess/machine/amigacd.c @@ -431,7 +431,7 @@ static const amiga_autoconfig_device dmac_device = READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ) { int ret = 0; - + tpi6525_device *tpi = space.machine().device<tpi6525_device>("tpi6525"); if ( (tpi->get_ddr_c() & 0x04) == 0 ) /* if pin 2 is set to input */ @@ -448,7 +448,7 @@ READ8_DEVICE_HANDLER( amigacd_tpi6525_portc_r ) WRITE8_DEVICE_HANDLER( amigacd_tpi6525_portb_w ) { tpi6525_device *tpi = space.machine().device<tpi6525_device>("tpi6525"); - + if ( tpi->get_ddr_b() & 0x01 ) /* if pin 0 is set to output */ matsucd_cmd_w( data & 1 ); /* write to the /CMD signal */ diff --git a/src/mess/machine/amstrad.c b/src/mess/machine/amstrad.c index a66e8bb604c..10217ea5d08 100644 --- a/src/mess/machine/amstrad.c +++ b/src/mess/machine/amstrad.c @@ -1428,7 +1428,7 @@ WRITE8_MEMBER(amstrad_state::amstrad_plus_asic_6000_w) } if(offset == 0x0800) // Programmable raster interrupt { - // logerror("ASIC: Wrote %02x to PRI\n",data); + // logerror("ASIC: Wrote %02x to PRI\n",data); m_asic.pri = data; } if(offset >= 0x0801 && offset <= 0x0803) // Split screen registers diff --git a/src/mess/machine/bbc.c b/src/mess/machine/bbc.c index a6585efa898..1d10857b366 100644 --- a/src/mess/machine/bbc.c +++ b/src/mess/machine/bbc.c @@ -574,7 +574,7 @@ READ8_MEMBER(bbc_state::bbcm_r) { via6522_device *via_0 = machine().device<via6522_device>("via6522_0"); via6522_device *via_1 = machine().device<via6522_device>("via6522_1"); - + myo = offset-0x200; if ((myo>=0x00) && (myo<=0x07)) return bbc_6845_r(space, myo-0x00); /* Video Controller */ if ((myo>=0x08) && (myo<=0x0f)) @@ -611,7 +611,7 @@ WRITE8_MEMBER(bbc_state::bbcm_w) { via6522_device *via_0 = machine().device<via6522_device>("via6522_0"); via6522_device *via_1 = machine().device<via6522_device>("via6522_1"); - + myo=offset-0x200; if ((myo>=0x00) && (myo<=0x07)) bbc_6845_w(space, myo-0x00, data); /* Video Controller */ if ((myo>=0x08) && (myo<=0x0f)) @@ -864,8 +864,8 @@ void bbc_state::bbcb_IC32_initialise(bbc_state *state) m_b0_sound=0x01; // Write Enable to the sound generator IC m_b1_speech_read=0x01; // READ select on the speech processor m_b2_speech_write=0x01; // WRITE select on the speech processor - m_b3_keyboard=0x01; // Keyboard write enable - m_b4_video0=0x01; // These two outputs define the number to be added to the start of screen address + m_b3_keyboard=0x01; // Keyboard write enable + m_b4_video0=0x01; // These two outputs define the number to be added to the start of screen address m_b5_video1=0x01; // in hardware to control hardware scrolling m_b6_caps_lock_led=0x01; // Operates the CAPS lock LED m_b7_shift_lock_led=0x01; // Operates the SHIFT lock LED diff --git a/src/mess/machine/compiskb.c b/src/mess/machine/compiskb.c index ba82291b725..19672df68d6 100644 --- a/src/mess/machine/compiskb.c +++ b/src/mess/machine/compiskb.c @@ -305,21 +305,21 @@ READ8_MEMBER( compis_keyboard_device::bus_r ) // bus_w - //------------------------------------------------- -WRITE8_MEMBER( compis_keyboard_device::bus_w ) +WRITE8_MEMBER( compis_keyboard_device::bus_w ) { /* - + bit description - + 0 keyboard row bit 0 1 keyboard row bit 1 2 keyboard row bit 2 3 keyboard row bit 3 - 4 + 4 5 speaker 6 CAPS LED 7 data out - + */ m_bus = data; diff --git a/src/mess/machine/compiskb.h b/src/mess/machine/compiskb.h index dba4a1dccc9..787065081fa 100644 --- a/src/mess/machine/compiskb.h +++ b/src/mess/machine/compiskb.h @@ -25,7 +25,7 @@ //************************************************************************** #define COMPIS_KEYBOARD_TAG "compiskb" -#define SPEAKER_TAG "speaker" +#define SPEAKER_TAG "speaker" diff --git a/src/mess/machine/cs4031.c b/src/mess/machine/cs4031.c index 5a758d97376..d93f349a96e 100644 --- a/src/mess/machine/cs4031.c +++ b/src/mess/machine/cs4031.c @@ -2,8 +2,8 @@ Chips & Technologies CS4031 chipset - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Chipset for 486 based PC/AT compatible systems. Consists of two individual chips: diff --git a/src/mess/machine/cs4031.h b/src/mess/machine/cs4031.h index 99815b7e048..9d1a95e6c14 100644 --- a/src/mess/machine/cs4031.h +++ b/src/mess/machine/cs4031.h @@ -2,8 +2,8 @@ Chips & Technologies CS4031 chipset - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Chipset for 486 based PC/AT compatible systems. Consists of two individual chips: diff --git a/src/mess/machine/e05a03.c b/src/mess/machine/e05a03.c index e7c52bcd59e..547dc1e4297 100644 --- a/src/mess/machine/e05a03.c +++ b/src/mess/machine/e05a03.c @@ -2,8 +2,8 @@ E05A03 Gate Array (used in the Epson LX-800) - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/mess/machine/e05a03.h b/src/mess/machine/e05a03.h index 025dfa16058..7a33c6b4f92 100644 --- a/src/mess/machine/e05a03.h +++ b/src/mess/machine/e05a03.h @@ -2,8 +2,8 @@ E05A03 Gate Array (used in the Epson LX-800) - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best ***************************************************************************/ diff --git a/src/mess/machine/einstein.c b/src/mess/machine/einstein.c index f7c29ad1cc5..7e587c64a6e 100644 --- a/src/mess/machine/einstein.c +++ b/src/mess/machine/einstein.c @@ -1,9 +1,9 @@ /*************************************************************************** - Tatung Einstein + Tatung Einstein - license: MAME - copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith + license: MAME + copyright-holders: Kevin Thacker, Dirk Best, Phill Harvey-Smith ***************************************************************************/ diff --git a/src/mess/machine/epson_sio.c b/src/mess/machine/epson_sio.c index 5bff0ec86bf..84848c47102 100644 --- a/src/mess/machine/epson_sio.c +++ b/src/mess/machine/epson_sio.c @@ -2,8 +2,8 @@ EPSON SIO port emulation - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/epson_sio.h b/src/mess/machine/epson_sio.h index 6e3c2bd16b2..145009bff87 100644 --- a/src/mess/machine/epson_sio.h +++ b/src/mess/machine/epson_sio.h @@ -2,8 +2,8 @@ EPSON SIO port emulation - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/isa_cards.c b/src/mess/machine/isa_cards.c index 04a3ad94818..bd69eb04162 100644 --- a/src/mess/machine/isa_cards.c +++ b/src/mess/machine/isa_cards.c @@ -2,8 +2,8 @@ ISA cards - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/isa_cards.h b/src/mess/machine/isa_cards.h index 222b448d70a..686a7812622 100644 --- a/src/mess/machine/isa_cards.h +++ b/src/mess/machine/isa_cards.h @@ -2,8 +2,8 @@ ISA cards - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best **********************************************************************/ diff --git a/src/mess/machine/kb_7007_3.h b/src/mess/machine/kb_7007_3.h index 1a53faa9045..35de2e98484 100644 --- a/src/mess/machine/kb_7007_3.h +++ b/src/mess/machine/kb_7007_3.h @@ -11,7 +11,7 @@ INPUT_PORTS_START( mc7007_3_keyboard ) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Right Shift") PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Left Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1) - PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 7") PORT_CODE(KEYCODE_7_PAD) // PORT_CODE(KEYCODE_HOME) + PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 7") PORT_CODE(KEYCODE_7_PAD) // PORT_CODE(KEYCODE_HOME) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 8") PORT_CODE(KEYCODE_8_PAD) // PORT_CODE(KEYCODE_UP) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Keypad 9") PORT_CODE(KEYCODE_9_PAD) // PORT_CODE(KEYCODE_PGUP) diff --git a/src/mess/machine/kb_ec1841.c b/src/mess/machine/kb_ec1841.c index 982e5492fb2..3c35f3f26ed 100644 --- a/src/mess/machine/kb_ec1841.c +++ b/src/mess/machine/kb_ec1841.c @@ -2,7 +2,7 @@ EC-1841 92-key keyboard emulation - Sends 9 non-standard scan codes (54..5C) and reassigns 3 standard + Sends 9 non-standard scan codes (54..5C) and reassigns 3 standard ones (2A, 36, 3A). EC-1841 BIOS converts scan codes into Cyrillic by default; 'Lat' key (mapped to F11) switches it to Latin mode. 'Rus' (F12) switches back. diff --git a/src/mess/machine/mtx.c b/src/mess/machine/mtx.c index 78aca733778..5593a2a3485 100644 --- a/src/mess/machine/mtx.c +++ b/src/mess/machine/mtx.c @@ -2,8 +2,8 @@ Memotech MTX 500, MTX 512 and RS 128 - license: MAME - copyright-holders: (Original Author?), Dirk Best, Curt Coder + license: MAME + copyright-holders: (Original Author?), Dirk Best, Curt Coder **************************************************************************/ diff --git a/src/mess/machine/nascom1.c b/src/mess/machine/nascom1.c index 7fd8c76240e..f9f3737050a 100644 --- a/src/mess/machine/nascom1.c +++ b/src/mess/machine/nascom1.c @@ -1,9 +1,9 @@ /********************************************************************** - Nascom 1 and Nascom 2 + Nascom 1 and Nascom 2 - license: MAME - copyright-holders: (Original Author?), Dirk Best + license: MAME + copyright-holders: (Original Author?), Dirk Best **********************************************************************/ diff --git a/src/mess/machine/pc.c b/src/mess/machine/pc.c index 50d620fe014..b2eff69e7c2 100644 --- a/src/mess/machine/pc.c +++ b/src/mess/machine/pc.c @@ -425,15 +425,15 @@ const struct pit8253_interface pcjr_pit8253_config = const i8251_interface mc1502_i8251_interface = { - DEVCB_NULL, /* XXX RxD data are accessible via PPI port C, bit 7 */ + DEVCB_NULL, /* XXX RxD data are accessible via PPI port C, bit 7 */ DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, DEVCB_NULL, - DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), /* default handler does nothing */ + DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), /* default handler does nothing */ DEVCB_DEVICE_LINE_MEMBER("pic8259", pic8259_device, ir7_w), DEVCB_NULL, - DEVCB_NULL /* XXX SYNDET triggers NMI */ + DEVCB_NULL /* XXX SYNDET triggers NMI */ }; WRITE_LINE_MEMBER(pc_state::mc1502_pit8253_out1_changed) @@ -1534,7 +1534,7 @@ MACHINE_RESET_MEMBER(pc_state,pc) m_speaker->level_w(0); // ec1841-specific code - m_memboards = m_ram->size()/(512*1024) - 1; + m_memboards = m_ram->size()/(512*1024) - 1; if (m_memboards > 3) m_memboards = 3; memset(m_memboard,0,sizeof(m_memboard)); diff --git a/src/mess/machine/pf10.c b/src/mess/machine/pf10.c index b996a77596a..ce499b8667c 100644 --- a/src/mess/machine/pf10.c +++ b/src/mess/machine/pf10.c @@ -2,8 +2,8 @@ EPSON PF-10 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Battery operated portable 3.5" floppy drive diff --git a/src/mess/machine/pf10.h b/src/mess/machine/pf10.h index 2c9dfeceddb..c2288599e1b 100644 --- a/src/mess/machine/pf10.h +++ b/src/mess/machine/pf10.h @@ -2,8 +2,8 @@ EPSON PF-10 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Battery operated portable 3.5" floppy drive diff --git a/src/mess/machine/samcoupe.c b/src/mess/machine/samcoupe.c index 516b8aa8961..e4598f8543f 100644 --- a/src/mess/machine/samcoupe.c +++ b/src/mess/machine/samcoupe.c @@ -2,8 +2,8 @@ Miles Gordon Technology SAM Coupe - license: MAME - copyright-holders: Lee Hammerton, Dirk Best + license: MAME + copyright-holders: Lee Hammerton, Dirk Best ***************************************************************************/ diff --git a/src/mess/machine/southbridge.c b/src/mess/machine/southbridge.c index 99fa97b9e46..0c495fa3dbf 100644 --- a/src/mess/machine/southbridge.c +++ b/src/mess/machine/southbridge.c @@ -217,8 +217,8 @@ void southbridge_device::device_start() spaceio.install_readwrite_handler(0x0170, 0x0177, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs0),&(*m_ide2)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs0), &(*m_ide2)),0xffffffff); spaceio.install_readwrite_handler(0x01f0, 0x01f7, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs0),&(*m_ide)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs0), &(*m_ide)),0xffffffff); // HACK: this works if you take out the (non working) fdc -// spaceio.install_readwrite_handler(0x0370, 0x0377, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide2)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide2)),0xffffffff); -// spaceio.install_readwrite_handler(0x03f0, 0x03f7, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide)),0xffffffff); +// spaceio.install_readwrite_handler(0x0370, 0x0377, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide2)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide2)),0xffffffff); +// spaceio.install_readwrite_handler(0x03f0, 0x03f7, read32_delegate(FUNC(bus_master_ide_controller_device::read_cs1),&(*m_ide)), write32_delegate(FUNC(bus_master_ide_controller_device::write_cs1), &(*m_ide)),0xffffffff); spaceio.install_readwrite_handler(0x0374, 0x0377, read8_delegate(FUNC(southbridge_device::ide2_read_cs1_r),this), write8_delegate(FUNC(southbridge_device::ide2_write_cs1_w), this),0xff0000); spaceio.install_readwrite_handler(0x03f4, 0x03f7, read8_delegate(FUNC(southbridge_device::ide_read_cs1_r),this), write8_delegate(FUNC(southbridge_device::ide_write_cs1_w), this),0xff0000); spaceio.nop_readwrite(0x00e0, 0x00ef); diff --git a/src/mess/machine/tf20.c b/src/mess/machine/tf20.c index ce344eedb47..1c7d7d3698e 100644 --- a/src/mess/machine/tf20.c +++ b/src/mess/machine/tf20.c @@ -2,8 +2,8 @@ EPSON TF-20 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Dual 5.25" floppy drive with HX-20 factory option diff --git a/src/mess/machine/tf20.h b/src/mess/machine/tf20.h index e0748cd2f31..8ba20b1a93a 100644 --- a/src/mess/machine/tf20.h +++ b/src/mess/machine/tf20.h @@ -2,8 +2,8 @@ EPSON TF-20 - license: MAME, GPL-2.0+ - copyright-holders: Dirk Best + license: MAME, GPL-2.0+ + copyright-holders: Dirk Best Dual 5.25" floppy drive with HX-20 factory option diff --git a/src/mess/mess.lst b/src/mess/mess.lst index aff62252fd7..7501c6351f8 100644 --- a/src/mess/mess.lst +++ b/src/mess/mess.lst @@ -178,7 +178,7 @@ sd132 // 1991 SD-1 32 sq1 // 1990 SQ-1 sqrack // 1990 SQ-Rack kt76 // 1996 KT-76 -mr61 // 1996 MR-61 +mr61 // 1996 MR-61 mrrack // 1996 MR-Rack // Fairchild diff --git a/src/mess/video/samcoupe.c b/src/mess/video/samcoupe.c index 51ee092219c..2376a676880 100644 --- a/src/mess/video/samcoupe.c +++ b/src/mess/video/samcoupe.c @@ -2,8 +2,8 @@ Miles Gordon Technology SAM Coupe - license: MAME - copyright-holders: Lee Hammerton, Dirk Best + license: MAME + copyright-holders: Lee Hammerton, Dirk Best ***************************************************************************/ |
