Previous 15994 Revisions Next

r886 Wednesday 29th August, 2007 at 12:32:19 UTC by Dirk Best
[AMIGA] Recommited changesets 878 and 879 which were lost in the previous Amiga driver update. Also ran srcclean.exe on the file and changed the CDTV driver to use a clock derived from one of it's main oscillators.
[src/mame/includes]amiga.h
[src/mess/drivers]amiga.c

src/mame/includes/amiga.h
r885r886
292292#define AMIGA_68000_NTSC_CLOCK      7159090 /* Hz */
293293#define AMIGA_68000_PAL_CLOCK      7093790 /* Hz */
294294#define AMIGA_68EC020_NTSC_CLOCK   14318180 /* Hz */
295#define CDTV_CLOCK_X1               28636363
296#define CDTV_CLOCK_X5               28375160
295297
296298
297299#define ANGUS_CHIP_RAM_MASK      0x07fffe
src/mess/drivers/amiga.c
r885r886
4545   AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
4646   AM_RANGE(0xc00000, 0xc7ffff) AM_RAM /* slow-mem */
4747   AM_RANGE(0xc80000, 0xcfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w)   /* see Note 1 above */
48   AM_RANGE(0xdc0000, 0xdc003f) AM_READWRITE(amiga_clock_r, amiga_clock_w);
4948   AM_RANGE(0xdf0000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs)   /* Custom Chips */
5049   AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w)
5150   AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION(REGION_USER1, 0)   /* System ROM - mirror */
r885r886
5352
5453/*
5554 * CDTV memory map (source: http://www.l8r.net/technical/cdtv-technical.html)
56 *
55 *
5756 * 000000-0FFFFF Chip memory
5857 * 100000-1FFFFF Space for extra chip memory (Megachip)
5958 * 200000-9FFFFF Space for AutoConfig memory
r885r886
7372 * F40000-F7FFFF Space in CDTV ROM decoded area
7473 * F80000-FBFFFF Space in Kickstart ROM decoded area (used by Kickstart 2)
7574 * FC0000-FFFFFF Kickstart ROM
76 *
75 *
7776 */
7877
7978static ADDRESS_MAP_START(cdtv_mem, ADDRESS_SPACE_PROGRAM, 16)
r885r886
9190   AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0xc0000) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size)
9291   AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
9392   AM_RANGE(0xc00000, 0xc3ffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) /* See Note 1 above */
94   AM_RANGE(0xdc0000, 0xdc003f) AM_READWRITE(amiga_clock_r, amiga_clock_w);
9593   AM_RANGE(0xdf0000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs)   /* Custom Chips */
9694   AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w)
9795   AM_RANGE(0xf80000, 0xfbffff) AM_ROM AM_REGION(REGION_USER1, 0)   /* Bootstrap ROM */
9896   AM_RANGE(0xfc0000, 0xffffff) AM_RAMBANK(2)   /* Writable Control Store RAM */
9997ADDRESS_MAP_END
10098
99
101100/***************************************************************************
102101  Inputs
103102***************************************************************************/
104103
105INPUT_PORTS_START( amiga )
106   PORT_START_TAG("config")
104INPUT_PORTS_START( amiga_common )
105   PORT_START_TAG("input")
107106   PORT_CONFNAME( 0x20, 0x00, "Input Port 0 Device")
108107   PORT_CONFSETTING( 0x00, "Mouse" )
109108   PORT_CONFSETTING( 0x20, DEF_STR(Joystick) )
110109   PORT_CONFNAME( 0x10, 0x10, "Input Port 1 Device")
111110   PORT_CONFSETTING( 0x00, "Mouse" )
112111   PORT_CONFSETTING( 0x10, DEF_STR(Joystick) )
113   
112
114113   PORT_START_TAG("CIA0PORTA")
115114   PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL )
116115   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
r885r886
142141   PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
143142   PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
144143   PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
145   
144
146145   PORT_START_TAG("P0MOUSEX")
147   PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1)   
148   
146   PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1)
147
149148   PORT_START_TAG("P0MOUSEY")
150149   PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(1)
151150
152151   PORT_START_TAG("P1MOUSEX")
153   PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(2)   
154   
152   PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(2)
153
155154   PORT_START_TAG("P1MOUSEY")
156155   PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(5) PORT_MINMAX(0, 255) PORT_PLAYER(2)
157   
156
158157   PORT_INCLUDE( amiga_keyboard )
159     
158
160159INPUT_PORTS_END
161160
161
162INPUT_PORTS_START( amiga )
163   PORT_START_TAG("hardware")
164   PORT_CONFNAME( 0x08, 0x08, "Battery backed-up RTC")
165   PORT_CONFSETTING( 0x00, "Not Installed" )
166   PORT_CONFSETTING( 0x08, "Installed" )
167
168   PORT_INCLUDE( amiga_common )
169INPUT_PORTS_END
170
171
172/* TODO: Support for the CDTV remote control */
173INPUT_PORTS_START( cdtv )
174   PORT_INCLUDE( amiga_common )
175INPUT_PORTS_END
176
177
162178/***************************************************************************
163179  Machine drivers
164180***************************************************************************/
r885r886
173189   MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK)
174190   MDRV_CPU_PROGRAM_MAP(amiga_mem, 0)
175191   MDRV_CPU_VBLANK_INT(amiga_scanline_callback, 262)
176   
192
177193   MDRV_SCREEN_REFRESH_RATE(59.997)
178194   MDRV_SCREEN_VBLANK_TIME(USEC_TO_SUBSECONDS(0))
179195
r885r886
203219
204220static MACHINE_DRIVER_START( cdtv )
205221   MDRV_IMPORT_FROM(ntsc)
206   MDRV_CPU_MODIFY("main")
222   MDRV_CPU_REPLACE("main", M68000, CDTV_CLOCK_X1 / 4)
207223   MDRV_CPU_PROGRAM_MAP(cdtv_mem, 0)
208   
224
209225   MDRV_NVRAM_HANDLER(generic_0fill)
210   
226
211227   MDRV_SOUND_ADD( CDDA, 0 )
212228   MDRV_SOUND_ROUTE( 0, "left", 1.0 )
213229   MDRV_SOUND_ROUTE( 1, "right", 1.0 )
r885r886
259275   /* swap the write handlers between ROM and bank 1 based on the bit */
260276   if ((data & 1) == 0) {
261277      UINT32 mirror_mask = amiga_chip_ram_size;
262     
278
263279      while( (mirror_mask<<1) < 0x100000 ) {
264280         mirror_mask |= ( mirror_mask << 1 );
265281      }
266     
282
267283      /* overlay disabled, map RAM on 0x000000 */
268284      memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, amiga_chip_ram_size - 1, 0, mirror_mask, MWA16_BANK1);
269     
285
270286      amiga_cart_check_overlay();
271287   }
272288   else
r885r886
279295
280296static UINT16 amiga_read_joy0dat(void)
281297{
282   if ( readinputportbytag("config") & 0x20 ) {
298   if ( readinputportbytag("input") & 0x20 ) {
283299      /* Joystick */
284300      return readinputportbytag_safe("JOY0DAT", 0xffff);
285301   } else {
r885r886
293309
294310static UINT16 amiga_read_joy1dat(void)
295311{
296   if ( readinputportbytag("config") & 0x10 ) {
312   if ( readinputportbytag("input") & 0x10 ) {
297313      /* Joystick */
298314      return readinputportbytag_safe("JOY1DAT", 0xffff);
299315   } else {
r885r886
318334   }
319335}
320336
337static void amiga_reset(void)
338{
339   if (readinputportbytag("hardware") & 0x08)
340   {
341      /* Install RTC */
342      memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xdc0000, 0xdc003f, 0, 0, amiga_clock_r, amiga_clock_w);
343   }
344   else
345   {
346      /* No RTC support */
347      memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xdc0000, 0xdc003f, 0, 0, MRA16_UNMAP, MWA16_UNMAP);
348   }
349}
350
321351static DRIVER_INIT( amiga )
322352{
323353   static const amiga_machine_interface amiga_intf =
r885r886
332362      amiga_read_dskbytr,   amiga_write_dsklen,  /* dskbytr_r & dsklen_w */
333363      NULL,                                    /* serdat_w */
334364      NULL,                                    /* scanline0_callback */
335      NULL,                                    /* reset_callback */
365      amiga_reset,                             /* reset_callback */
336366      amiga_cart_nmi,                          /* nmi_callback */
337367      0                                        /* flags */
338368   };
r885r886
342372   /* set up memory */
343373   memory_configure_bank(1, 0, 1, amiga_chip_ram, 0);
344374   memory_configure_bank(1, 1, 1, memory_region(REGION_USER1), 0);
345   
375
346376   /* initialize cartridge (if present) */
347377   amiga_cart_init();
348   
378
349379   /* initialize keyboard */
350380   amigakbd_init();
351381}
r885r886
364394      amiga_read_dskbytr,   amiga_write_dsklen,  /* dskbytr_r & dsklen_w */
365395      NULL,                                    /* serdat_w */
366396      NULL,                                    /* scanline0_callback */
367      NULL,                                    /* reset_callback */
397      amiga_reset,                             /* reset_callback */
368398      amiga_cart_nmi,                          /* nmi_callback */
369399      0                                        /* flags */
370400   };
r885r886
374404   /* set up memory */
375405   memory_configure_bank(1, 0, 1, amiga_chip_ram, 0);
376406   memory_configure_bank(1, 1, 1, memory_region(REGION_USER1), 0);
377   
407
378408   /* initialize Action Replay (if present) */
379409   amiga_cart_init();
380   
410
381411   /* initialize keyboard */
382412   amigakbd_init();
383413}
r885r886
407437   /* set up memory */
408438   memory_configure_bank(1, 0, 1, amiga_chip_ram, 0);
409439   memory_configure_bank(1, 1, 1, memory_region(REGION_USER1), 0);
410   
440
411441   /* initialize the cdrom controller */
412442   amigacd_init();
413443}
414444
415445/***************************************************************************
416  ROM loading
446  ROM definitions
417447***************************************************************************/
418448
419449#define AMIGA_BIOS         \
420450   ROM_REGION16_BE(0x080000, REGION_USER1, 0)   \
421451   ROM_SYSTEM_BIOS(0, "kick13",  "Kickstart 1.3 (34.5)")   \
422   ROMX_LOAD("315093.02", 0x000000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD | ROM_BIOS(1))   \
452   ROMX_LOAD("315093-02.u6", 0x000000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD | ROM_BIOS(1))   \
423453   ROM_SYSTEM_BIOS(1, "kick12",  "Kickstart 1.2 (33.180)")   \
424   ROMX_LOAD("315093.01", 0x000000, 0x040000, CRC(a6ce1636) SHA1(11f9e62cf299f72184835b7b2a70a16333fc0d88), ROM_GROUPWORD | ROM_BIOS(2))   \
454   ROMX_LOAD("315093-01.u6", 0x000000, 0x040000, CRC(a6ce1636) SHA1(11f9e62cf299f72184835b7b2a70a16333fc0d88), ROM_GROUPWORD | ROM_BIOS(2))   \
425455   ROM_COPY(REGION_USER1, 0x000000, 0x040000, 0x040000)   \
426456   ROM_SYSTEM_BIOS(2, "kick204", "Kickstart 2.04 (37.175)")   \
427   ROMX_LOAD("390979.01", 0x000000, 0x080000, CRC(c3bdb240) SHA1(c5839f5cb98a7a8947065c3ed2f14f5f42e334a1), ROM_GROUPWORD | ROM_BIOS(3))   /* identical to 363968.01 */   \
457   ROMX_LOAD("390979-01.u6", 0x000000, 0x080000, CRC(c3bdb240) SHA1(c5839f5cb98a7a8947065c3ed2f14f5f42e334a1), ROM_GROUPWORD | ROM_BIOS(3))   /* identical to 363968.01 */   \
428458   ROM_SYSTEM_BIOS(3, "kick31",  "Kickstart 3.1 (40.63)")   \
429   ROMX_LOAD("kick40063", 0x000000, 0x080000, CRC(fc24ae0d) SHA1(3b7f1493b27e212830f989f26ca76c02049f09ca), ROM_GROUPWORD | ROM_BIOS(4))   /* part number? */   \
459   ROMX_LOAD("kick40063.u6", 0x000000, 0x080000, CRC(fc24ae0d) SHA1(3b7f1493b27e212830f989f26ca76c02049f09ca), ROM_GROUPWORD | ROM_BIOS(4))   /* part number? */   \
430460
431461
432462#define AMIGA_CART         \
433463   ROM_REGION16_BE(0x080000, REGION_USER2, 0)   \
434464   ROM_CART_LOAD(0, "rom,bin", 0x0000, 0x080000, ROM_NOMIRROR | ROM_FILL_FF | ROM_OPTIONAL)   \
435   
436   
437465
466
467
438468ROM_START(a500n)
439469   AMIGA_BIOS
440470   AMIGA_CART
441471ROM_END
442472
443ROM_START(a500p)
444   AMIGA_BIOS
445   AMIGA_CART
446ROM_END
473#define rom_a500p    rom_a500n
447474
448475ROM_START(a1000n)
449476   ROM_REGION16_BE(0x080000, REGION_USER1, 0)
450   ROMX_LOAD("a1000.bin", 0x000000, 0x002000, CRC(62f11c04) SHA1(c87f9fada4ee4e69f3cca0c36193be822b9f5fe6), ROM_GROUPWORD)
477   ROM_LOAD16_BYTE("252179-01.u5n", 0x000000, 0x001000, CRC(42553bc4) SHA1(8855a97f7a44e3f62d1c88d938fee1f4c606af5b))
478   ROM_LOAD16_BYTE("252180-01.u5p", 0x000001, 0x001000, CRC(8e5b9a37) SHA1(d10f1564b99f5ffe108fa042362e877f569de2c3))
451479ROM_END
452480
453ROM_START(a1000p)
454   ROM_REGION16_BE(0x080000, REGION_USER1, 0)
455   ROMX_LOAD("a1000.bin", 0x000000, 0x002000, CRC(62f11c04) SHA1(c87f9fada4ee4e69f3cca0c36193be822b9f5fe6), ROM_GROUPWORD)
456ROM_END
481#define rom_a1000p    rom_a1000n
457482
458483ROM_START(cdtv)
459484   ROM_REGION16_BE(0x100000, REGION_USER1, 0)
460   ROM_LOAD16_BYTE("391008.01", 0x000000, 0x020000, CRC(791cb14b) SHA1(277a1778924496353ffe56be68063d2a334360e4))
461   ROM_LOAD16_BYTE("391009.01", 0x000001, 0x020000, CRC(accbbc2e) SHA1(41b06d1679c6e6933c3378b7626025f7641ebc5c))
485   ROM_LOAD16_BYTE("391008-01.u34", 0x000000, 0x020000, CRC(791cb14b) SHA1(277a1778924496353ffe56be68063d2a334360e4))
486   ROM_LOAD16_BYTE("391009-01.u35", 0x000001, 0x020000, CRC(accbbc2e) SHA1(41b06d1679c6e6933c3378b7626025f7641ebc5c))
462487   ROM_COPY(REGION_USER1, 0x000000, 0x040000, 0x040000)
463   ROMX_LOAD(      "315093.02", 0x080000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD)   
488   ROMX_LOAD(      "315093-02.u13", 0x080000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD)
464489   ROM_COPY(REGION_USER1, 0x080000, 0x0c0000, 0x040000)
465490ROM_END
466491
492
467493/***************************************************************************
468494  System config
469495***************************************************************************/
r885r886
502528COMP(  1985, a1000p,   a1000n,           0,       a1000p,  amiga,   amiga,     a1000,   "Commodore Business Machines Co.",  "Commodore Amiga 1000 (PAL-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
503529COMPB( 1987, a500n,    0,       amiga,   0,       ntsc,    amiga,   amiga,     amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 500 (NTSC-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
504530COMPB( 1987, a500p,    a500n,   amiga,   0,       pal,     amiga,   amiga,     amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 500 (PAL-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
505COMP(  1991, cdtv,     0,                0,       cdtv,    amiga,   cdtv,      cdtv,    "Commodore Business Machines Co.",  "Commodore Amiga CDTV 1.0 (NTSC)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
531COMP(  1991, cdtv,     0,                0,       cdtv,    cdtv,    cdtv,      cdtv,    "Commodore Business Machines Co.",  "Commodore Amiga CDTV 1.0 (NTSC)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team