diff --git a/hash/amigaocs_flop.xml b/hash/amigaocs_flop.xml index 6524a5a6d5f..823843c6622 100644 --- a/hash/amigaocs_flop.xml +++ b/hash/amigaocs_flop.xml @@ -1568,7 +1568,7 @@ ATK test: OK - + Alcatraz (Europe) @@ -1576,7 +1576,7 @@ ATK test: OK 1992 Infogrames @@ -1612,7 +1612,7 @@ ATK test: OK - + Alfred Chicken (Europe) @@ -1620,7 +1620,8 @@ ATK test: OK 1993 Mindscape @@ -2333,7 +2334,7 @@ ATK test: OK - + Amiga Encounter (Europe) @@ -2341,7 +2342,8 @@ ATK test: OK 1991 Novagen @@ -2359,7 +2361,8 @@ ATK test: failed 1989 Eidersoft @@ -2418,7 +2421,7 @@ ATK test: OK 1991 Psygnosis @@ -2655,7 +2658,7 @@ ATK test: C:0 H:U Bad - + Apidya (Europe) @@ -2664,7 +2667,7 @@ ATK test: C:0 H:U Bad Play Byte @@ -2842,6 +2845,7 @@ ATK test: failed 1993 Krisalis @@ -3295,7 +3299,7 @@ ATK test: OK - + Arnie 2 (Europe) @@ -3303,7 +3307,7 @@ ATK test: OK 1993 Zeppelin @@ -4605,7 +4609,7 @@ ATK test: failed - + Barbarian (Europe, v16.3.88, Palace) @@ -4613,7 +4617,7 @@ ATK test: failed 1988 Palace @@ -4632,7 +4636,8 @@ ATK test: OK 1991 Psygnosis @@ -4672,7 +4677,7 @@ ATK test: OK - + Barbarian II (Europe, Palace, v4.8.89) @@ -4680,7 +4685,7 @@ ATK test: OK 1989 Palace @@ -6127,7 +6132,7 @@ ATK test: C:0 H:U Bad 1990 Tynesoft @@ -6468,9 +6473,10 @@ ATK test: OK 1991 Electronic Arts + @@ -7795,6 +7801,7 @@ Fatal errors in ipf_decode::generate_timings type 4 1994 Psygnosis 1990 Image Works @@ -8613,7 +8620,8 @@ ATK test: OK 1990 Image Works @@ -8850,7 +8858,7 @@ ATK test: OK - + Cannon Fodder (Europe) @@ -8858,8 +8866,9 @@ ATK test: OK 1993 Virgin @@ -9021,7 +9030,7 @@ ATK test: C:0 H:U Bad - + Cannon Soccer (Europe) @@ -9029,8 +9038,7 @@ ATK test: C:0 H:U Bad 1993 <coverdisk> @@ -9291,6 +9299,7 @@ ATK test: failed Psygnosis @@ -9307,7 +9316,7 @@ ATK test: OK - + Carlos (Europe) @@ -9315,8 +9324,10 @@ ATK test: OK 1994 Microids + @@ -13639,7 +13650,7 @@ ATK test: failed - + The Deep (Europe) @@ -13647,7 +13658,7 @@ ATK test: failed 1988 U.S. Gold @@ -13858,7 +13869,7 @@ ATK test: failed 1987 Anco @@ -13992,7 +14003,7 @@ ATK test: C:0 H:U Bad - + Desert Strike - Return to the Gulf (Europe) @@ -14000,8 +14011,8 @@ ATK test: C:0 H:U Bad 1993 Electronic Arts @@ -14663,6 +14674,7 @@ ATK test: C:0 H:U Bad Virgin Mastertronic @@ -14709,7 +14721,7 @@ ATK test: failed - + Double Dragon 3 - The Rosetta Stone (Europe) @@ -14717,7 +14729,7 @@ ATK test: failed 1991 Storm @@ -15149,8 +15161,9 @@ ATK test: OK 1989 ReadySoft @@ -15199,8 +15212,8 @@ ATK test: failed 1991 ReadySoft @@ -15249,9 +15262,8 @@ ATK test: failed 1993 ReadySoft @@ -17037,7 +17049,7 @@ ATK test: OK 1990 Audiogenic 1989 Ubi Soft @@ -21439,7 +21451,8 @@ ATK test: C:79 Bad Gremlin Graphics 8" then fatalerrors after DSKDAT access -venus: asks to swap disk with incorrect pitch GFX then throws DSKDAT R and hangs +venus: asks to swap disk with incorrect pitch GFX then throws DSKDAT R and hangs (fixed) +venus: [Denise] offset bitplanes (game area, weapon bar, bonus stages) ATK test: OK ]]> @@ -21895,7 +21908,7 @@ ATK test: H:U 1 Sector Bad, C:0 H:L 1 Sector Bad 1991 Renegade @@ -22352,7 +22365,7 @@ ATK test: OK 1988 GO! @@ -26319,6 +26332,7 @@ ATK test: C:79 Bad Mirrorsoft @@ -27722,7 +27736,9 @@ ATK test: OK 1989 Anco @@ -29115,7 +29131,8 @@ ATK test: OK 1991 Elite @@ -31066,6 +31083,7 @@ ATK test: C:0 H:U 1 Sector Bad Ocean @@ -31600,6 +31618,7 @@ ATK test: OK 1990 Krisalis @@ -36971,7 +36990,8 @@ ATK test: C:even H:L 1 Sector Bad 1990 Ocean @@ -41527,7 +41547,8 @@ ATK test: failed 1992 Electronic Arts @@ -42486,7 +42507,7 @@ ATK test: OK 1989 Grandslam @@ -42733,8 +42754,8 @@ ATK test: OK 1989 Firebird @@ -43651,10 +43672,10 @@ ATK test: OK 1989 Psygnosis @@ -45741,6 +45762,7 @@ ATK test: C:79 Bad Krisalis @@ -46029,7 +46051,8 @@ ATK test: OK 1990 ReadySoft @@ -48820,7 +48843,7 @@ ATK test: OK 1991 U.S. Gold @@ -49225,7 +49248,7 @@ ATK test: OK 1993 Team 17 @@ -49448,7 +49471,7 @@ ATK test: failed - + SWIV (Europe, 19910228) @@ -49456,7 +49479,7 @@ ATK test: failed 1991 Storm @@ -49536,7 +49559,7 @@ ATK test: OK 1988 Discovery 1992 Hex + + @@ -52082,6 +52108,7 @@ ATK test: OK 1988 Digital Concepts @@ -52128,7 +52155,7 @@ ATK test: OK - + Torvak the Warrior (Europe) @@ -52136,6 +52163,7 @@ ATK test: OK 1990 Core Design @@ -54153,8 +54181,10 @@ ATK test: C:even H:L 1 Sector Bad 1991 Virgin Mastertronic @@ -55307,7 +55337,7 @@ ATK test: OK 1990 Titus @@ -56054,7 +56084,7 @@ ATK test: failed - World Championship Boxing Manager (Europe) + World Championship Boxing Manager (Europe, v3.01) 1990 diff --git a/src/devices/machine/amiga_copper.cpp b/src/devices/machine/amiga_copper.cpp index 6bc2b916e86..aa6bd60bc4a 100644 --- a/src/devices/machine/amiga_copper.cpp +++ b/src/devices/machine/amiga_copper.cpp @@ -245,10 +245,10 @@ int amiga_copper_device::execute_next(int xpos, int ypos, bool is_blitter_busy) if (m_pending_offset) { //LOGCHIPSET("%02X.%02X: Write to %s = %04x\n", ypos, xpos / 2, s_custom_reg_names[m_copper_pending_offset & 0xff], m_copper_pending_data); - LOGCHIPSET("%02X.%02X: Write to %s = %04x\n", + LOGCHIPSET("%02X.%02X: Write to $dff%03x = %04x\n", ypos, xpos / 2, - m_pending_offset << 1, + (m_pending_offset << 1), m_pending_data ); m_host_space->write_word(0xdff000 | (m_pending_offset << 1), m_pending_data); @@ -313,7 +313,7 @@ int amiga_copper_device::execute_next(int xpos, int ypos, bool is_blitter_busy) if (delay[word0] == 0) { //LOGCHIPSET("%02X.%02X: Write to %s = %04x\n", ypos, xpos / 2, s_custom_reg_names[word0 & 0xff], word1); - LOGCHIPSET("%02X.%02X: Write to %s = %04x\n", + LOGCHIPSET("%02X.%02X: Write to $dff%03x = %04x\n", ypos, xpos / 2, word0 << 1, diff --git a/src/mame/amiga/amiga.h b/src/mame/amiga/amiga.h index c7e424ebe2a..2edb68625e4 100644 --- a/src/mame/amiga/amiga.h +++ b/src/mame/amiga/amiga.h @@ -157,7 +157,7 @@ Ernesto Corvi & Mariusz Wojcieszek #define REG_BPLCON2 (0x104/2) /* W D Bit plane control reg. (priority control) */ #define REG_BPLCON3 (0x106/2) /* W D Bit plane control reg (enhanced features) */ #define REG_BPL1MOD (0x108/2) /* W A Bit plane modulo (odd planes) */ -#define REG_BPL2MOD (0x10A/2) /* W A Bit Plane modulo (even planes) */ +#define REG_BPL2MOD (0x10A/2) /* W A Bit plane modulo (even planes) */ #define REG_BPLCON4 (0x10C/2) /* W D Bit plane control reg. (display masks) */ #define REG_BPL1DAT (0x110/2) /* W D Bit plane 1 data (parallel-to-serial convert) */ #define REG_BPL2DAT (0x112/2) /* W D Bit plane 2 data (parallel-to-serial convert) */ diff --git a/src/mame/amiga/amiga_m.cpp b/src/mame/amiga/amiga_m.cpp index 222da2c62c7..042802cb56d 100644 --- a/src/mame/amiga/amiga_m.cpp +++ b/src/mame/amiga/amiga_m.cpp @@ -1278,7 +1278,7 @@ void amiga_state::bplcon0_w(u16 data) if ((data & (BPLCON0_BPU0 | BPLCON0_BPU1 | BPLCON0_BPU2)) == (BPLCON0_BPU0 | BPLCON0_BPU1 | BPLCON0_BPU2)) { /* planes go from 0 to 6, inclusive */ - popmessage( "This game is doing funky planes stuff. (planes > 6, %04x)", data ); + popmessage( "bplcon0_w: setting up planes > 6, %04x", data ); data &= ~BPLCON0_BPU0; } CUSTOM_REG(REG_BPLCON0) = data; @@ -1379,7 +1379,7 @@ uint16_t amiga_state::custom_chip_r(offs_t offset) return m_fdc->adkcon_r(); case REG_DSKDATR: - popmessage("DSKDAT R, contact MAMEdev"); + popmessage("DSKDAT R"); break; }