Previous 199869 Revisions Next

r18757 Monday 29th October, 2012 at 09:04:05 UTC by Miodrag Milanović
Put back amiga to use well known a500, a600, a1200,... names (no whatsnew)
[src/mess]mess.lst
[src/mess/drivers]amiga.c

trunk/src/mess/drivers/amiga.c
r18756r18757
7777
7878
7979
80class ami1200_state : public amiga_state
80class a1200_state : public amiga_state
8181{
8282public:
83   ami1200_state(const machine_config &mconfig, device_type type, const char *tag)
83   a1200_state(const machine_config &mconfig, device_type type, const char *tag)
8484      : amiga_state(mconfig, type, tag) { }
8585
8686   UINT16 m_potgo_value;
r18756r18757
166166   AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("user1", 0)   /* System ROM - mirror */
167167ADDRESS_MAP_END
168168
169static ADDRESS_MAP_START( a1200_map, AS_PROGRAM, 32, ami1200_state )
169static ADDRESS_MAP_START( a1200_map, AS_PROGRAM, 32, a1200_state )
170170   ADDRESS_MAP_UNMAP_HIGH
171171   AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram")
172172   AM_RANGE(0xbfa000, 0xbfa003) AM_WRITE(aga_overlay_w)
r18756r18757
176176   AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION("user1", 0)   /* Kickstart */
177177ADDRESS_MAP_END
178178
179static ADDRESS_MAP_START( amiga_mem32, AS_PROGRAM, 32, ami1200_state )
179static ADDRESS_MAP_START( amiga_mem32, AS_PROGRAM, 32, a1200_state )
180180   ADDRESS_MAP_UNMAP_HIGH
181181//   ADDRESS_MAP_GLOBAL_MASK(0xffffff) // not sure
182182   AM_RANGE(0x000000, 0x1fffff) AM_RAMBANK("bank1") AM_SHARE("chip_ram")
r18756r18757
349349***************************************************************************/
350350
351351
352static void handle_cd32_joystick_cia(ami1200_state *state, UINT8 pra, UINT8 dra);
352static void handle_cd32_joystick_cia(a1200_state *state, UINT8 pra, UINT8 dra);
353353
354WRITE32_MEMBER(ami1200_state::aga_overlay_w)
354WRITE32_MEMBER(a1200_state::aga_overlay_w)
355355{
356356   if (ACCESSING_BITS_16_23)
357357   {
r18756r18757
385385 *
386386 *************************************/
387387
388WRITE8_MEMBER(ami1200_state::ami1200_cia_0_porta_w)
388WRITE8_MEMBER(a1200_state::ami1200_cia_0_porta_w)
389389{
390390   device_t *device = machine().device("cia_0");
391391
r18756r18757
418418#if 0
419419static void cd32_potgo_w(running_machine &machine, UINT16 data)
420420{
421   ami1200_state *state = machine.driver_data<ami1200_state>();
421   a1200_state *state = machine.driver_data<a1200_state>();
422422   int i;
423423
424424   state->m_potgo_value = state->m_potgo_value & 0x5500;
r18756r18757
444444}
445445#endif
446446
447static void handle_cd32_joystick_cia(ami1200_state *state, UINT8 pra, UINT8 dra)
447static void handle_cd32_joystick_cia(a1200_state *state, UINT8 pra, UINT8 dra)
448448{
449449   int i;
450450
r18756r18757
471471
472472
473473
474READ8_MEMBER(ami1200_state::ami1200_cia_0_portb_r)
474READ8_MEMBER(a1200_state::ami1200_cia_0_portb_r)
475475{
476476   /* parallel port */
477477   logerror("%s:CIA0_portb_r\n", machine().describe_context());
478478   return 0xff;
479479}
480480
481WRITE8_MEMBER(ami1200_state::ami1200_cia_0_portb_w)
481WRITE8_MEMBER(a1200_state::ami1200_cia_0_portb_w)
482482{
483483   /* parallel port */
484484   logerror("%s:CIA0_portb_w(%02x)\n", machine().describe_context(), data);
r18756r18757
573573   DEVCB_NULL
574574};
575575
576READ8_MEMBER(ami1200_state::a1200_cia_0_portA_r)
576READ8_MEMBER(a1200_state::a1200_cia_0_portA_r)
577577{
578578   UINT8 ret = machine().root_device().ioport("CIA0PORTA")->read() & 0xc0;   /* Gameport 1 and 0 buttons */
579579   ret |= machine().device<amiga_fdc>("fdc")->ciaapra_r();
r18756r18757
587587   DEVCB_NULL,   /* pc_func */
588588   DEVCB_NULL,
589589   DEVCB_NULL,
590   DEVCB_DRIVER_MEMBER(ami1200_state,a1200_cia_0_portA_r),
591   DEVCB_DRIVER_MEMBER(ami1200_state,ami1200_cia_0_porta_w),      /* port A */
592   DEVCB_DRIVER_MEMBER(ami1200_state,ami1200_cia_0_portb_r),
593   DEVCB_DRIVER_MEMBER(ami1200_state,ami1200_cia_0_portb_w)      /* port B */
590   DEVCB_DRIVER_MEMBER(a1200_state,a1200_cia_0_portA_r),
591   DEVCB_DRIVER_MEMBER(a1200_state,ami1200_cia_0_porta_w),      /* port A */
592   DEVCB_DRIVER_MEMBER(a1200_state,ami1200_cia_0_portb_r),
593   DEVCB_DRIVER_MEMBER(a1200_state,ami1200_cia_0_portb_w)      /* port B */
594594};
595595
596596static const legacy_mos6526_interface a1200_cia_1_intf =
r18756r18757
674674   MCFG_AMIGA_KEYBOARD_ADD("kbd")
675675MACHINE_CONFIG_END
676676
677static MACHINE_CONFIG_DERIVED( a1000n, ntsc )
677static MACHINE_CONFIG_DERIVED( a1000ntsc, ntsc )
678678   MCFG_CPU_MODIFY("maincpu")
679679   MCFG_CPU_PROGRAM_MAP(a1000_mem)
680680MACHINE_CONFIG_END
681681
682static MACHINE_CONFIG_DERIVED( a500n, ntsc )
682static MACHINE_CONFIG_DERIVED( a500ntsc, ntsc )
683683   MCFG_FRAGMENT_ADD(amiga_cartslot)
684684   MCFG_SOFTWARE_LIST_ADD("flop_common","amiga_flop")
685685MACHINE_CONFIG_END
r18756r18757
766766
767767/* Amiga 1000 */
768768
769static MACHINE_CONFIG_DERIVED( ami1000, a1000p )
769static MACHINE_CONFIG_DERIVED( a1000, a1000p )
770770   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga1000_flop")
771771MACHINE_CONFIG_END
772772
773static MACHINE_CONFIG_DERIVED( ami1000n, a1000n )
773static MACHINE_CONFIG_DERIVED( a1000n, a1000ntsc )
774774   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga1000_flop")
775775MACHINE_CONFIG_END
776776
777777/* Amiga 500 */
778778
779static MACHINE_CONFIG_DERIVED( ami500, a500p )
779static MACHINE_CONFIG_DERIVED( a500, a500p )
780780   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga500_flop")
781781MACHINE_CONFIG_END
782782
783static MACHINE_CONFIG_DERIVED( ami500n, a500n )
783static MACHINE_CONFIG_DERIVED( a500n, a500ntsc )
784784   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga500_flop")
785785MACHINE_CONFIG_END
786786
787787/* Amiga 500 Plus */
788788
789static MACHINE_CONFIG_DERIVED( ami500pls, a500p )
789static MACHINE_CONFIG_DERIVED( a500pls, a500p )
790790   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga500plus_flop")
791791MACHINE_CONFIG_END
792792
793static MACHINE_CONFIG_DERIVED( ami500plsn, a500n )
793static MACHINE_CONFIG_DERIVED( a500plsn, a500ntsc )
794794   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga500plus_flop")
795795MACHINE_CONFIG_END
796796
797797/* Amiga 600 */
798798
799static MACHINE_CONFIG_DERIVED( ami600, a500p )
799static MACHINE_CONFIG_DERIVED( a600, a500p )
800800   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga600_flop")
801801MACHINE_CONFIG_END
802802
803static MACHINE_CONFIG_DERIVED( ami600n, a500n )
803static MACHINE_CONFIG_DERIVED( a600n, a500ntsc )
804804   MCFG_SOFTWARE_LIST_ADD("flop_list","amiga600_flop")
805805MACHINE_CONFIG_END
806806
807807
808808
809static MACHINE_CONFIG_START( a1200n, ami1200_state )
809static MACHINE_CONFIG_START( a1200n, a1200_state )
810810
811811   /* basic machine hardware */
812812   MCFG_CPU_ADD("maincpu", M68EC020, AMIGA_68EC020_NTSC_CLOCK) /* 14.3 Mhz */
r18756r18757
823823   MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0))
824824   MCFG_SCREEN_SIZE(512*2, 312)
825825   MCFG_SCREEN_VISIBLE_AREA((129-8-8)*2, (449+8-1+8)*2, 44-8, 300+8-1)
826   MCFG_SCREEN_UPDATE_DRIVER(ami1200_state, screen_update_amiga_aga)
826   MCFG_SCREEN_UPDATE_DRIVER(a1200_state, screen_update_amiga_aga)
827827
828   MCFG_VIDEO_START_OVERRIDE(ami1200_state,amiga_aga)
828   MCFG_VIDEO_START_OVERRIDE(a1200_state,amiga_aga)
829829
830830
831831   MCFG_PALETTE_LENGTH(4096)
r18756r18757
11071107   membank("bank1")->configure_entry(1, machine().root_device().memregion("user1")->base());
11081108}
11091109
1110DRIVER_INIT_MEMBER(ami1200_state,a1200)
1110DRIVER_INIT_MEMBER(a1200_state,a1200)
11111111{
11121112   static const amiga_machine_interface cd32_intf =
11131113   {
r18756r18757
11571157    ROM DEFINITIONS
11581158***************************************************************************/
11591159
1160ROM_START( ami1000 )
1160ROM_START( a1000 )
11611161   ROM_REGION16_BE(0x080000, "user1", 0)
11621162   ROM_LOAD16_BYTE("252179-01.u5n", 0x000000, 0x001000, CRC(42553bc4) SHA1(8855a97f7a44e3f62d1c88d938fee1f4c606af5b))
11631163   ROM_LOAD16_BYTE("252180-01.u5p", 0x000001, 0x001000, CRC(8e5b9a37) SHA1(d10f1564b99f5ffe108fa042362e877f569de2c3))
r18756r18757
11691169   ROM_LOAD("328191-01.bin", 0x000, 0x800, NO_DUMP)
11701170ROM_END
11711171
1172#define rom_ami1000n    rom_ami1000
1172#define rom_a1000n    rom_a1000
11731173
11741174
11751175
1176ROM_START( ami500 )
1176ROM_START( a500 )
11771177   ROM_REGION16_BE(0x080000, "user1", 0)
11781178   ROM_DEFAULT_BIOS("kick13")
11791179
r18756r18757
11971197   ROM_LOAD("328191-02.ic1", 0x000, 0x800, NO_DUMP)
11981198ROM_END
11991199
1200#define rom_ami500n    rom_ami500
1200#define rom_a500n    rom_a500
12011201
1202ROM_START( ami500pl )
1202ROM_START( a500pl )
12031203   ROM_REGION16_BE(0x080000, "user1", 0)
12041204   ROM_DEFAULT_BIOS("kick204")
12051205
r18756r18757
12151215   ROM_LOAD("328191-02.ic1", 0x000, 0x800, NO_DUMP)
12161216ROM_END
12171217
1218#define rom_ami500pln    rom_ami500pl
1218#define rom_a500pln    rom_a500pl
12191219
1220ROM_START( ami600 )
1220ROM_START( a600 )
12211221   ROM_REGION16_BE(0x080000, "user1", 0)
12221222   ROM_DEFAULT_BIOS("kick205")
12231223
r18756r18757
12391239   ROM_LOAD("328191-02.ic1", 0x000, 0x800, NO_DUMP)
12401240ROM_END
12411241
1242#define rom_ami600n    rom_ami600
1242#define rom_a600n    rom_a600
12431243
12441244
1245ROM_START( ami1200 )
1245ROM_START( a1200 )
12461246   ROM_REGION32_BE(0x080000, "user1", 0)
12471247   ROM_DEFAULT_BIOS("kick31")
12481248   ROM_SYSTEM_BIOS(0, "kick30", "Kickstart 3.0 (39.106)")
r18756r18757
12631263   ROM_LOAD("391508-02.u13", 0x0000, 0x2f40, NO_DUMP)
12641264ROM_END
12651265
1266#define rom_ami1200n    rom_ami1200
1266#define rom_a1200n    rom_a1200
12671267
12681268/* Note: I think those ROMs are correct, but they should be verified */
1269ROM_START( ami3000 )
1269ROM_START( a3000 )
12701270   ROM_REGION32_BE(0x80000, "user1", 0)
12711271   ROM_DEFAULT_BIOS("kick14")
12721272   ROM_SYSTEM_BIOS(0, "kick14", "Kickstart 1.4 (36.16)")
r18756r18757
12851285   ROM_LOAD("keyboard", 0x0000, 0x1040, NO_DUMP)
12861286ROM_END
12871287
1288#define rom_ami3000n    rom_ami3000
1288#define rom_a3000n    rom_a3000
12891289
12901290ROM_START( cdtv )
12911291   ROM_REGION16_BE(0x100000, "user1", 0)
r18756r18757
13121312
13131313/* High-end market line */
13141314
1315COMP( 1985, ami1000,   0,        0,      ami1000,  amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 1000 (PAL)",      GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1316COMP( 1985, ami1000n,  ami1000,  0,      ami1000n, amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 1000 (NTSC)",     GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1315COMP( 1985, a1000,   0,      0,     a1000,  amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 1000 (PAL)",      GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1316COMP( 1985, a1000n,  a1000,  0,     a1000n, amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 1000 (NTSC)",     GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
13171317
13181318
13191319
13201320/* Low-end market line */
13211321
1322COMP( 1987, ami500,    0,        0,      ami500,      amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500 (PAL, OCS)",  GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1323COMP( 1987, ami500n,   ami500,   0,      ami500n,     amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500 (NTSC, OCS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1322COMP( 1987, a500,    0,      0,      a500,      amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500 (PAL, OCS)",  GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1323COMP( 1987, a500n,   a500,   0,      a500n,     amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500 (NTSC, OCS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
13241324
1325COMP( 1991, ami500pl,  0,        0,      ami500pls,   amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500+ (PAL, ECS)",  GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1326COMP( 1991, ami500pln, ami500pl, 0,      ami500plsn,  amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500+ (NTSC, ECS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1325COMP( 1991, a500pl,  0,      0,      a500pls,   amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500+ (PAL, ECS)",  GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1326COMP( 1991, a500pln, a500pl, 0,      a500plsn,  amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 500+ (NTSC, ECS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
13271327
1328COMP( 1992, ami600,    0,        0,      ami600,      amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 600 (PAL, ECS)",  GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1329COMP( 1992, ami600n,   ami600,   0,      ami600n,     amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 600 (NTSC, ECS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1328COMP( 1992, a600,    0,      0,      a600,      amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 600 (PAL, ECS)",  GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1329COMP( 1992, a600n,   a600,   0,      a600n,     amiga, amiga_state,  amiga,  "Commodore Business Machines",  "Amiga 600 (NTSC, ECS)", GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
13301330
1331COMP( 1992, ami1200,   0,        0,      a1200,  amiga, ami1200_state,  a1200,  "Commodore Business Machines",  "Amiga 1200 (PAL, AGA)" , GAME_NOT_WORKING  )
1332COMP( 1992, ami1200n,  ami1200,  0,      a1200n, amiga, ami1200_state,  a1200,  "Commodore Business Machines",  "Amiga 1200 (NTSC, AGA)" , GAME_NOT_WORKING )
1331COMP( 1992, a1200,   0,      0,      a1200,     amiga, a1200_state,a1200,  "Commodore Business Machines",  "Amiga 1200 (PAL, AGA)" , GAME_NOT_WORKING  )
1332COMP( 1992, a1200n,  a1200,  0,      a1200n,   amiga, a1200_state,a1200,  "Commodore Business Machines",  "Amiga 1200 (NTSC, AGA)" , GAME_NOT_WORKING )
13331333
1334COMP( 1992, ami3000,   0,        0,      a3000,  amiga, amiga_state,  a3000,  "Commodore Business Machines",  "Amiga 3000 (PAL, ECS, 68030)" , GAME_NOT_WORKING  )
1335COMP( 1992, ami3000n,  ami3000,  0,      a3000n, amiga, amiga_state,  a3000,  "Commodore Business Machines",  "Amiga 3000 (NTSC, ECS, 68030)" , GAME_NOT_WORKING )
1334COMP( 1992, a3000,   0,      0,      a3000,     amiga, amiga_state,  a3000,  "Commodore Business Machines",  "Amiga 3000 (PAL, ECS, 68030)" , GAME_NOT_WORKING  )
1335COMP( 1992, a3000n,  a3000,  0,      a3000n,   amiga, amiga_state,  a3000,  "Commodore Business Machines",  "Amiga 3000 (NTSC, ECS, 68030)" , GAME_NOT_WORKING )
13361336
13371337
13381338
1339COMP( 1991, cdtv,   0,      0,      cdtv,  cdtv, amiga_state,   cdtv,   "Commodore Business Machines",  "CDTV (NTSC)",           GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
1339COMP( 1991, cdtv,   0,      0,      cdtv,     cdtv, amiga_state,   cdtv,   "Commodore Business Machines",  "CDTV (NTSC)",           GAME_NOT_WORKING | GAME_IMPERFECT_GRAPHICS )
13401340
13411341/* other official models */
13421342/* Amiga 2000 - similar to 1000 */
trunk/src/mess/mess.lst
r18756r18757
646646c128dcr_se
647647c128d81
648648
649ami1000     // Commodore Amiga 1000
650ami1000n  //
651ami500     // Commodore Amiga 500
652ami500n     //
653ami500pl  // Commodore Amiga 500+
654ami500pln //
655ami600    // Commodore Amiga 600
656ami600n   //
657ami3000   // Commodore Amiga 3000
658ami3000n  //
659ami1200     // Commodore Amiga 1200
660ami1200n  //
661cdtv     // Commodore CDTV
662cd32     // Commodore Amiga CD32
649a1000   // Commodore Amiga 1000
650a1000n  //
651a500   // Commodore Amiga 500
652a500n   //
653a500pl  // Commodore Amiga 500+
654a500pln //
655a600    // Commodore Amiga 600
656a600n   //
657a3000   // Commodore Amiga 3000
658a3000n  //
659a1200   // Commodore Amiga 1200
660a1200n  //
661cdtv   // Commodore CDTV
662cd32   // Commodore Amiga CD32
663663
664664c65      // 1991 C65 / C64DX (Prototype, NTSC)
665665c64dx    // 1991 C65 / C64DX (Prototype, German PAL)

Previous 199869 Revisions Next

© 1997-2024 The MAME Team