Previous 15994 Revisions Next

r882 Tuesday 28th August, 2007 at 23:32:29 UTC by Nathan Woods
[AMIGA] Various changes on the MAME and MESS side [Ernesto Corvi]
[docs]messnew.txt
[src/mame/drivers]alg.c arcadia.c mquake.c upscope.c
[src/mame/includes]amiga.h
[src/mame/machine]6526cia.c amiga.c
[src/mess]mess.mak
[src/mess/drivers]amiga.c
[src/mess/machine]amigacrt.c* amigacrt.h* amigafdc.c amigakbd.c

src/mame/machine/amiga.c
r881r882
6565 *************************************/
6666
6767UINT16 *amiga_chip_ram;
68UINT32 *amiga_chip_ram32;
6869size_t amiga_chip_ram_size;
6970
70#if AMIGA_ACTION_REPLAY_1
71/* Action Replay 1 support */
72UINT16 *amiga_ar_ram;
73size_t amiga_ar_ram_size;
74#endif
75
7671UINT16 *amiga_custom_regs;
7772UINT16 *amiga_expansion_ram;
7873UINT16 *amiga_autoconfig_mem;
r881r882
10095   "BLTCON0",       "BLTCON1",       "BLTAFWM",       "BLTALWM",
10196   "BLTCPTH",       "BLTCPTL",       "BLTBPTH",       "BLTBPTL",
10297   "BLTAPTH",       "BLTAPTL",       "BLTDPTH",       "BLTDPTL",
103   "BLTSIZE",       "UNK05A",      "BLTSIZV",      "BLTSIZH",
98   "BLTSIZE",       "BLTCON0L",      "BLTSIZV",      "BLTSIZH",
10499   /* 0x060 */
105100   "BLTCMOD",       "BLTBMOD",       "BLTAMOD",       "BLTDMOD",
106101   "UNK068",      "UNK06A",      "UNK06C",      "UNK06E",
r881r882
183178static TIMER_CALLBACK( amiga_irq_proc );
184179static TIMER_CALLBACK( amiga_blitter_proc );
185180
181/*************************************
182 *
183 *  Chipmem 16/32 bit access
184 *
185 *************************************/
186 
187UINT16 (*amiga_chip_ram_r)(offs_t offset);
188void (*amiga_chip_ram_w)(offs_t offset, UINT16 data);
186189
190static UINT16 amiga_chip_ram16_r(offs_t offset)
191{
192   extern const amiga_machine_interface *amiga_intf;
193   offset &= amiga_intf->chip_ram_mask;
194   return (offset < amiga_chip_ram_size) ? amiga_chip_ram[offset/2] : 0xffff;
195}
196
197static UINT16 amiga_chip_ram32_r(offs_t offset)
198{
199   extern const amiga_machine_interface *amiga_intf;
200   offset &= amiga_intf->chip_ram_mask;
201
202   if ( offset < amiga_chip_ram_size )
203   {
204      UINT32   dat = amiga_chip_ram32[offset / 4];
205         
206      if ( offset & 2 )
207         return (dat & 0xffff);
208         
209      return (dat >> 16);
210   }
211   
212   return 0xffff;
213}
214
215static void amiga_chip_ram16_w(offs_t offset, UINT16 data)
216{
217   extern const amiga_machine_interface *amiga_intf;
218   offset &= amiga_intf->chip_ram_mask;
219   
220   if (offset < amiga_chip_ram_size)
221      amiga_chip_ram[offset/2] = data;
222}
223
224static void amiga_chip_ram32_w(offs_t offset, UINT16 data)
225{
226   extern const amiga_machine_interface *amiga_intf;
227   offset &= amiga_intf->chip_ram_mask;
228   
229   if ( offset < amiga_chip_ram_size )
230   {
231      UINT32   dat = amiga_chip_ram32[offset / 4];
232         
233      if ( offset & 2 )
234      {
235         dat &= 0xffff0000;
236         dat |= data;
237      }
238      else
239      {
240         dat &= 0x0000ffff;
241         dat |= ((UINT32)data) << 16;
242      }
243         
244      amiga_chip_ram32[offset / 4] = dat;
245   }
246}
247
248
187249/*************************************
188250 *
189251 *  Machine config/reset
r881r882
195257   cia6526_interface cia_intf[2];
196258
197259   amiga_intf = intf;
260   
261   /* setup chipmem handlers */
262   if ( IS_AGA(intf) )
263   {
264      amiga_chip_ram_r = amiga_chip_ram32_r;
265      amiga_chip_ram_w = amiga_chip_ram32_w;
266   }
267   else
268   {
269      amiga_chip_ram_r = amiga_chip_ram16_r;
270      amiga_chip_ram_w = amiga_chip_ram16_w;
271   }
198272
199273   /* set up CIA interfaces */
200274   memset(&cia_intf, 0, sizeof(cia_intf));
r881r882
10471121
10481122static void custom_reset(void)
10491123{
1050   UINT16   vidmode = (O2_CLOCK == 715909) ? 0x1000 : 0x0000; /* NTSC or PAL? */
1124   int clock = Machine->drv->cpu[0].cpu_clock;
1125   UINT16   vidmode = (clock == AMIGA_68000_NTSC_CLOCK || clock == AMIGA_68EC020_NTSC_CLOCK ) ? 0x1000 : 0x0000; /* NTSC or PAL? */
10511126
10521127   CUSTOM_REG(REG_DDFSTRT) = 0x18;
10531128   CUSTOM_REG(REG_DDFSTOP) = 0xd8;
r881r882
10641139      case ECS_CHIP_RAM_MASK:
10651140         CUSTOM_REG(REG_VPOSR) |= 0x2000;
10661141         CUSTOM_REG(REG_DENISEID) = 0xFFFC;
1142         if (IS_AGA(amiga_intf))
1143         {
1144            CUSTOM_REG(REG_VPOSR) |= 0x0300;
1145            CUSTOM_REG(REG_DENISEID) = 0xFFF8;
1146         }
10671147         break;
10681148   }
10691149}
r881r882
12181298         blitter_setup();
12191299         break;
12201300
1221      case REG_BLTSIZV:   /* ECS only */
1222         if ( amiga_intf->chip_ram_mask == ECS_CHIP_RAM_MASK )
1301      case REG_BLTSIZV:   /* ECS-AGA only */
1302         if ( IS_ECS_OR_AGA(amiga_intf) )
12231303         {
12241304            CUSTOM_REG(REG_BLTSIZV) = data & 0x7fff;
12251305            if ( CUSTOM_REG(REG_BLTSIZV) == 0 ) CUSTOM_REG(REG_BLTSIZV) = 0x8000;
12261306         }
12271307         break;
12281308
1229      case REG_BLTSIZH:   /* ECS only */
1230         if ( amiga_intf->chip_ram_mask == ECS_CHIP_RAM_MASK )
1309      case REG_BLTSIZH:   /* ECS-AGA only */
1310         if ( IS_ECS_OR_AGA(amiga_intf) )
12311311         {
12321312            CUSTOM_REG(REG_BLTSIZH) = data & 0x7ff;
12331313            if ( CUSTOM_REG(REG_BLTSIZH) == 0 ) CUSTOM_REG(REG_BLTSIZH) = 0x800;
12341314            blitter_setup();
12351315         }
12361316         break;
1317     
1318      case REG_BLTCON0L:   /* ECS-AGA only */
1319         if ( IS_ECS_OR_AGA(amiga_intf) )
1320         {
1321            CUSTOM_REG(REG_BLTCON0) &= 0xff00;
1322            CUSTOM_REG(REG_BLTCON0) |= data & 0xff;
1323         }
1324         break;
12371325
12381326      case REG_SPR0PTH:   case REG_SPR1PTH:   case REG_SPR2PTH:   case REG_SPR3PTH:
12391327      case REG_SPR4PTH:   case REG_SPR5PTH:   case REG_SPR6PTH:   case REG_SPR7PTH:
r881r882
14791567   if (!cur_autoconfig)
14801568   {
14811569      logerror("autoconfig_r(%02X) but no device selected\n", offset);
1482      return 0xffff;
1570      return 0;
14831571   }
14841572
14851573   /* switch off of the base offset */
src/mame/machine/6526cia.c
r881r882
615615      case CIA_TAHI:
616616      case CIA_TBHI:
617617         timer = &cia->timer[(offset >> 1) & 1];
618         cia_timer_update(timer, -1);
618619         data = timer->count >> 8;
619620         break;
620621
src/mame/includes/amiga.h
r881r882
1313#include "sound/custom.h"
1414
1515
16#define AMIGA_ACTION_REPLAY_1 0
17
1816/* A bit of a trick here: some registers are 32-bit. In order to efficiently */
1917/* read them on both big-endian and little-endian systems, we store the custom */
2018/* registers in 32-bit natural order. This means we need to XOR the register */
r881r882
7876#define REG_BLTDPTH      (0x054/2)   /* W  A      Blitter pointer to destination D (high 3 bits) */
7977#define REG_BLTDPTL      (0x056/2)   /* W  A      Blitter pointer to destination D (low 15 bits) */
8078#define REG_BLTSIZE      (0x058/2)   /* W  A      Blitter start and size (window width, height) */
79#define REG_BLTCON0L   (0x05A/2)   /* W  A      Blitter control 0, lower 8 bits (minterms) */
8180#define REG_BLTSIZV      (0x05C/2)   /* W  A      Blitter V size (for 15 bit vertical size) (ECS) */
8281#define REG_BLTSIZH      (0x05E/2)   /* W  A      Blitter H size and start (for 11 bit H size) (ECS) */
8382#define REG_BLTCMOD      (0x060/2)   /* W  A      Blitter modulo for source C */
r881r882
287286#define INTENA_INTEN   0x4000
288287#define INTENA_SETCLR   0x8000
289288
290
291289#define MAX_PLANES 6 /* 0 to 6, inclusive ( but we count from 0 to 5 ) */
292290
291/* Clock speeds */
292#define AMIGA_68000_NTSC_CLOCK      7159090 /* Hz */
293#define AMIGA_68000_PAL_CLOCK      7093790 /* Hz */
294#define AMIGA_68EC020_NTSC_CLOCK   14318180 /* Hz */
293295
296
294297#define ANGUS_CHIP_RAM_MASK      0x07fffe
295298#define FAT_ANGUS_CHIP_RAM_MASK   0x0ffffe
296299#define ECS_CHIP_RAM_MASK      0x1ffffe
300#define AGA_CHIP_RAM_MASK      0x1ffffe
297301
302#define FLAGS_AGA_CHIPSET   (1 << 0)
298303
299304typedef struct _amiga_machine_interface amiga_machine_interface;
300305struct _amiga_machine_interface
301306{
302307   UINT32 chip_ram_mask;
303
308   
304309   UINT8 (*cia_0_portA_r)(void);
305310   UINT8 (*cia_0_portB_r)(void);
306311   void (*cia_0_portA_w)(UINT8 data);
r881r882
322327
323328   void (*scanline0_callback)(void);
324329   void (*reset_callback)(void);
330   void (*nmi_callback)(void);
331   
332   UINT32 flags;
325333};
326334
335#define IS_AGA(intf) ( intf->chip_ram_mask == AGA_CHIP_RAM_MASK && (( intf->flags & FLAGS_AGA_CHIPSET) != 0))
336#define IS_ECS(intf) ( intf->chip_ram_mask == ECS_CHIP_RAM_MASK && (( intf->flags & FLAGS_AGA_CHIPSET) == 0))
337#define IS_ECS_OR_AGA(intf) ( intf->chip_ram_mask == ECS_CHIP_RAM_MASK)
327338
328339typedef struct _amiga_autoconfig_device amiga_autoconfig_device;
329340struct _amiga_autoconfig_device
r881r882
348359/*----------- defined in machine/amiga.c -----------*/
349360
350361extern UINT16 *amiga_chip_ram;
362extern UINT32 *amiga_chip_ram32;
351363extern size_t amiga_chip_ram_size;
352364
353#if AMIGA_ACTION_REPLAY_1
354/* Action Replay 1 support */
355extern UINT16 *amiga_ar_ram;
356extern size_t amiga_ar_ram_size;
357#endif
358
359365extern UINT16 *amiga_custom_regs;
360366extern UINT16 *amiga_expansion_ram;
361367extern UINT16 *amiga_autoconfig_mem;
r881r882
402408void amiga_sprite_dma_reset(int which);
403409void amiga_sprite_enable_comparitor(int which, int enable);
404410
411extern UINT16 (*amiga_chip_ram_r)(offs_t offset);
412extern void (*amiga_chip_ram_w)(offs_t offset, UINT16 data);
405413
406
407INLINE UINT16 amiga_chip_ram_r(offs_t offset)
408{
409   extern const amiga_machine_interface *amiga_intf;
410   offset &= amiga_intf->chip_ram_mask;
411   return (offset < amiga_chip_ram_size) ? amiga_chip_ram[offset/2] : 0xffff;
412}
413
414INLINE void amiga_chip_ram_w(offs_t offset, UINT16 data)
415{
416   extern const amiga_machine_interface *amiga_intf;
417   offset &= amiga_intf->chip_ram_mask;
418   if (offset < amiga_chip_ram_size)
419      amiga_chip_ram[offset/2] = data;
420}
421
422
423414#endif /* __AMIGA_H__ */
src/mame/drivers/alg.c
r881r882
452452static MACHINE_DRIVER_START( alg_r1 )
453453
454454   /* basic machine hardware */
455   MDRV_CPU_ADD_TAG("main", M68000, 7159090)        /* 7.15909 Mhz (NTSC) */
455   MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK)
456456   MDRV_CPU_PROGRAM_MAP(main_map_r1,0)
457457   MDRV_CPU_VBLANK_INT(amiga_scanline_callback, 262)
458458
r881r882
503503   MDRV_IMPORT_FROM(alg_r1)
504504
505505   /* adjust for PAL specs */
506   MDRV_CPU_REPLACE("main", M68000, 7093790)
506   MDRV_CPU_REPLACE("main", M68000, AMIGA_68000_PAL_CLOCK)
507507   MDRV_CPU_PROGRAM_MAP(main_map_picmatic,0)
508508   MDRV_CPU_VBLANK_INT(amiga_scanline_callback, 312)
509509
r881r882
715715      NULL, NULL, serial_w,
716716
717717      vsync_callback,
718      NULL
718      NULL,
719      NULL,
720      0
719721   };
720722   amiga_machine_config(&alg_intf);
721723
src/mame/drivers/arcadia.c
r881r882
666666      NULL, NULL,
667667      NULL, NULL, NULL,
668668      NULL, NULL, NULL,
669      NULL,  arcadia_reset_coins
669      NULL,  arcadia_reset_coins,
670      NULL,
671      0
670672   };
671673   UINT16 *biosrom;
672674
src/mame/drivers/upscope.c
r881r882
369369      upscope_cia_1_porta_w, NULL,
370370      NULL, NULL, NULL,
371371      NULL, NULL, NULL,
372      NULL, upscope_reset
372      NULL, upscope_reset,
373      NULL,
374      0
373375   };
374376   amiga_machine_config(&upscope_intf);
375377
src/mame/drivers/mquake.c
r881r882
437437   {
438438      ANGUS_CHIP_RAM_MASK,
439439      mquake_cia_0_porta_r, mquake_cia_0_portb_r,
440      mquake_cia_0_porta_w, mquake_cia_0_portb_w
440      mquake_cia_0_porta_w, mquake_cia_0_portb_w,
441      NULL, NULL,
442      NULL, NULL,
443      NULL, NULL, NULL,
444      NULL, NULL, NULL,
445      NULL, NULL,
446      NULL,
447      0
441448   };
442449   amiga_machine_config(&mquake_intf);
443450
src/mess/machine/amigafdc.c
r881r882
2626#include "amigafdc.h"
2727#include "machine/6526cia.h"
2828
29#define NUM_DRIVES 2
30
2931/* required prototype */
3032static void setup_fdc_buffer( int drive );
3133
r881r882
5254   offs_t ptr;
5355} fdc_def;
5456
55static fdc_def fdc_status[4];
57static fdc_def fdc_status[NUM_DRIVES];
5658/* signals */
5759static int fdc_sel = 0x0f;
5860static int fdc_dir = 0;
r881r882
201203   ret = ( ( CUSTOM_REG(REG_DSKLEN) >> 1 ) & 0x4000 ) & ( ( CUSTOM_REG(REG_DMACON) << 10 ) & 0x4000 );
202204   ret |= ( CUSTOM_REG(REG_DSKLEN) >> 1 ) & 0x2000;
203205
204   for ( i = 0; i < 4; i++ ) {
206   for ( i = 0; i < NUM_DRIVES; i++ ) {
205207      if ( !( fdc_sel & ( 1 << i ) ) )
206208         drive = i;
207209   }
r881r882
363365   int i, cur_pos, drive = -1, len_words = 0;
364366   int time = 0;
365367
366   for ( i = 0; i < 4; i++ ) {
368   for ( i = 0; i < NUM_DRIVES; i++ ) {
367369      if ( !( fdc_sel & ( 1 << i ) ) )
368370         drive = i;
369371   }
r881r882
697699      fdc_step = step_pulse;
698700
699701       if ( fdc_step == 0 ) {
700          for ( drive = 0; drive < 4; drive++ ) {
702          for ( drive = 0; drive < NUM_DRIVES; drive++ ) {
701703            if ( !( fdc_sel & ( 1 << drive ) ) )
702704                fdc_stepdrive( drive );
703705         }
704706      }
705707   }
706708
707   for ( drive = 0; drive < 4; drive++ ) {
709   for ( drive = 0; drive < NUM_DRIVES; drive++ ) {
708710      if ( !( fdc_sel & ( 1 << drive ) ) ) {
709711         fdc_motor( drive, ( data >> 7 ) & 1 );
710712         fdc_setup_leds( drive );
r881r882
715717int amiga_fdc_status_r( void ) {
716718   int drive = -1, ret = 0x3c;
717719
718   for ( drive = 0; drive < 4; drive++ ) {
720   for ( drive = 0; drive < NUM_DRIVES; drive++ ) {
719721      if ( !( fdc_sel & ( 1 << drive ) ) ) {
720722         
721723         if ( fdc_status[drive].motor_on ) {
r881r882
750752   {
751753      /* --- the following bits of info are returned as 64-bit signed integers --- */
752754      case DEVINFO_INT_TYPE:               info->i = IO_FLOPPY; break;
753      case DEVINFO_INT_COUNT:               info->i = 4; break;
755      case DEVINFO_INT_COUNT:               info->i = NUM_DRIVES; break;
754756      case DEVINFO_INT_READABLE:            info->i = 1; break;
755757      case DEVINFO_INT_WRITEABLE:            info->i = 0; break;
756758      case DEVINFO_INT_CREATABLE:            info->i = 0; break;
src/mess/machine/amigakbd.c
r881r882
1616static UINT8 *key_buf = NULL;
1717static int key_buf_pos = 0;
1818static int key_cur_pos = 0;
19static mame_timer *kbd_timer;
1920
2021static void kbd_sendscancode( UINT8 scancode )
2122{
r881r882
4748   
4849   /* if we still have more data, schedule another update */
4950   if ( key_buf_pos != key_cur_pos )
50      mame_timer_set(scale_down_mame_time(video_screen_get_frame_period(0),2), 0, kbd_update_callback);
51   {
52      mame_timer_adjust( kbd_timer, scale_down_mame_time(video_screen_get_frame_period(0),4), 0, time_zero);
53   }
5154}
5255
5356static void kbd_update( void *param, UINT32 oldvalue, UINT32 newvalue )
r881r882
5558   int   index = *( (int*)(param) ), i;
5659   UINT32   delta = oldvalue ^ newvalue;
5760
58#if AMIGA_ACTION_REPLAY_1
5961   /* Special case Page UP, which we will use as Action Replay button */
6062   if ( (index == 3) && ( delta & 0x80000000 ) && ( newvalue & 0x80000000 ) )
6163   {
62      /* copy custom regs */
63      for( i = 0; i < 256; i++ )
64      extern const amiga_machine_interface *amiga_intf;
65     
66      if ( amiga_intf != NULL && amiga_intf->nmi_callback )
6467      {
65         amiga_ar_ram[0x1800+i] = CUSTOM_REG(i);
68         (*amiga_intf->nmi_callback)();
6669      }
67   
68      amiga_chip_ram_w( 0x60, 0xC5F0 ); amiga_chip_ram_w( 0x62, 0x0008 );
69      amiga_chip_ram_w( 0x7c, 0xC5F0 ); amiga_chip_ram_w( 0x7e, 0x0006 );
70   
71      /* trigger NMI irq */
72      cpunum_set_input_line(0, 7, PULSE_LINE);
7370   }
7471   else
75#endif
7672   {
7773      int      key_buf_was_empty = ( key_buf_pos == key_cur_pos ) ? 1 : 0;
7874         
r881r882
9389      /* if the buffer was empty and we have new data, start a timer to send the keystrokes */
9490      if ( key_buf_was_empty && ( key_buf_pos != key_cur_pos ) )
9591      {
96         mame_timer_set(scale_down_mame_time(video_screen_get_frame_period(0),2), 0, kbd_update_callback);
92         mame_timer_adjust( kbd_timer, scale_down_mame_time(video_screen_get_frame_period(0),4), 0, time_zero);
9793      }
9894   }
9995}
r881r882
116112   key_buf = auto_malloc( KEYBOARD_BUFFER_SIZE );
117113   key_buf_pos = 0;
118114   key_cur_pos = 0;
115   kbd_timer = mame_timer_alloc(kbd_update_callback);
116   mame_timer_reset( kbd_timer, time_never );
119117}
120118
121119/*********************************************************************************************/
r881r882
255253   PORT_BIT( 0x10000000, 0x0000, IPT_UNUSED)               // 7C
256254   PORT_BIT( 0x20000000, 0x0000, IPT_UNUSED)               // 7D
257255   PORT_BIT( 0x40000000, 0x0000, IPT_UNUSED)               // 7E
258#if AMIGA_ACTION_REPLAY_1
259   PORT_BIT( 0x80000000, 0x0000, IPT_KEYBOARD)   PORT_CODE(KEYCODE_PGUP)      // 7F
260#else
261   PORT_BIT( 0x80000000, 0x0000, IPT_UNUSED)               // 7F
262#endif
256   PORT_BIT( 0x80000000, 0x0000, IPT_KEYBOARD)   PORT_CODE(KEYCODE_PGUP)      // 7F NMI button
263257   
264258INPUT_PORTS_END
src/mess/machine/amigacrt.c
r0r882
1/***************************************************************************
2
3   Amiga cartridge emulation
4   
5TODO:
6- Investigate why the AR2/3 sometimes garble the video on exit from the cart
7- Add Nordic Power and similar carts
8- Add HRTMon A1200 cart
9
10***************************************************************************/
11
12#include "mame.h"
13#include "driver.h"
14#include "amiga.h"
15#include "cpu/m68000/m68k.h"
16#include "machine/6526cia.h"
17
18enum
19{
20   /* supported cartridges */
21   ACTION_REPLAY            =   0,
22   ACTION_REPLAY_MKII,
23   ACTION_REPLAY_MKIII
24};
25
26static int amiga_cart_type;
27
28/***************************************************************************
29
30  Utilities
31
32***************************************************************************/
33
34static int check_kickstart_12_13( const char *cart_name )
35{
36   UINT16 * ksmem = (UINT16 *)memory_region( REGION_USER1 );
37   
38   if ( ksmem[2] == 0x00FC )
39      return 1;
40   
41   logerror( "%s requires Kickstart version 1.2 or 1.3 - Cart not installed\n", cart_name );
42   
43   return 0;   
44}
45
46/***************************************************************************
47
48  Amiga Action Replay 1
49 
50  Whenever you push the button, an NMI interrupt is generated.
51 
52  The cartridge protects itself from being removed from memory by
53  generating an interrupt whenever either the spurious interrupt
54  vector is written at $60, or the nmi interrupt vector is written at
55  $7c. If the spurious interrupt vector at $60 is written, then
56  a NMI is generated, and the spurious irq vector is restored. If the
57  NMI vector at $7c is written, then a spurious interrupt is generated,
58  and the NMI vector is restored.
59 
60  When breakpoints are set, the target address is replaced by a trap
61  instruction, and the original contents of the address are kept in
62  the cartridge's RAM. A trap handler is installed pointing to $40
63  in RAM, where code that clears memory address $60 followed by two
64  nops are written. There seems to be a small delay between the write
65  to $60 and until the actual NMI is generated, since the cart expects
66  the PC to be at $46 (at the second nop).
67
68***************************************************************************/
69
70static int amiga_ar1_spurious;
71
72static int amiga_ar1_irqack( int level )
73{
74   if ( level == 7 && amiga_ar1_spurious )
75   {
76      return M68K_INT_ACK_SPURIOUS;
77   }
78   
79   return (24+level);
80}
81
82static TIMER_CALLBACK( amiga_ar1_delayed_nmi )
83{
84   (void)param;
85   cpunum_set_input_line(0, 7, PULSE_LINE);
86}
87
88static void amiga_ar1_nmi( void )
89{
90   /* get the cart's built-in ram */
91   UINT16 *ar_ram = (UINT16 *)memory_get_write_ptr(0, ADDRESS_SPACE_PROGRAM, 0x9fc000);
92   
93   if ( ar_ram != NULL )
94   {
95      int i;
96     
97      /* copy custom register values */
98      for( i = 0; i < 256; i++ )
99         ar_ram[0x1800+i] = CUSTOM_REG(i);
100   
101      /* trigger NMI irq */
102      amiga_ar1_spurious = 0;
103      mame_timer_set( MAME_TIME_IN_CYCLES(28,0), 0, amiga_ar1_delayed_nmi );
104   }
105}
106
107static WRITE16_HANDLER( amiga_ar1_chipmem_w )
108{
109   int pc = safe_activecpu_get_pc();
110   
111   /* see if we're inside the AR1 rom */
112   if ( ((pc >> 16) & 0xff ) != 0xf0 )
113   {
114      /* if we're not, see if either the Spurious IRQ vector
115         or the NMI vector are being overwritten */
116      if ( offset == (0x60/2) || offset == (0x7c/2) )
117      {
118         /* trigger an NMI or spurious irq */
119         amiga_ar1_spurious = (offset == 0x60/2) ? 0 : 1;
120         mame_timer_set( MAME_TIME_IN_CYCLES(28,0), 0, amiga_ar1_delayed_nmi );
121      }
122   }
123   
124   amiga_chip_ram_w( offset * 2, data );
125}
126
127static void amiga_ar1_check_overlay( void )
128{
129   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x00007f, 0, 0, amiga_ar1_chipmem_w);
130}
131
132static void amiga_ar1_init( void )
133{
134   void *ar_ram;
135   
136   /* check kickstart version */
137   if ( !check_kickstart_12_13( "Amiga Action Replay" ) )
138   {
139      amiga_cart_type = -1;
140      return;
141   }
142     
143   /* setup the cart ram */
144   ar_ram = auto_malloc(0x4000);
145   memset(ar_ram, 0, 0x4000);
146     
147   /* Install ROM */
148   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00000, 0xf7ffff, 0, 0, MRA16_BANK2);
149   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xf00000, 0xf7ffff, 0, 0, MWA16_ROM);
150
151   /* Install RAM */
152   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x9fc000, 0x9fffff, 0, 0, MRA16_BANK3);
153   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x9fc000, 0x9fffff, 0, 0, MWA16_BANK3);
154
155   /* Configure Banks */
156   memory_set_bankptr(2, memory_region(REGION_USER2));
157   memory_set_bankptr(3, ar_ram);
158   
159   amiga_ar1_spurious = 0;
160   
161   /* Install IRQ ACK callback */
162   cpunum_set_irq_callback(0,amiga_ar1_irqack);
163}
164
165/***************************************************************************
166
167  Amiga Action Replay MKII/MKIII
168 
169  Whenever you push the button, an overlay of the cartridge appears
170  in RAM and an NMI interrupt is generated. Only reads are overlayed.
171  Writes go directly to chipmem (so that the CPU can write the stack
172  information for the NMI). Once the interrupt is taken, the cart
173  disables the ROM overlay and checks it's internal mode register
174  to see why it was invoked.
175 
176  When a breakpoint is set the cart replaces the target instruction
177  with a trap, and adds a trap handler that it locates in the $100-$120
178  area. The handler simply has one instruction: TST.B $BFE001. This cia
179  access is monitored, and the conditions match (PC < 120 and a previous
180  command requested the monitoring of the cia) then the cart is invoked.
181 
182***************************************************************************/
183
184static UINT16 amiga_ar23_mode;
185
186static void amiga_ar23_freeze( void );
187
188static READ16_HANDLER( amiga_ar23_cia_r )
189{
190   int pc = safe_activecpu_get_pc();
191   
192   if ( ACCESSING_LSB && offset == 2048 && pc >= 0x40 && pc < 0x120 )
193   {
194      amiga_ar23_freeze();
195   }
196   
197   return amiga_cia_r( offset, mem_mask );
198}
199
200static WRITE16_HANDLER( amiga_ar23_mode_w )
201{
202   if ( data & 2 )
203   {
204      memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xbfd000, 0xbfefff, 0, 0, amiga_ar23_cia_r);
205   }
206   else
207   {
208      memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xbfd000, 0xbfefff, 0, 0, amiga_cia_r);
209   }
210   
211   amiga_ar23_mode = (data&0x3);
212   if ( amiga_ar23_mode == 0 )
213      amiga_ar23_mode = 1;
214   
215}
216
217static READ16_HANDLER( amiga_ar23_mode_r )
218{
219   UINT16 *mem = (UINT16 *)memory_region( REGION_USER2 );
220   
221   if ( ACCESSING_LSB )
222   {
223      if ( offset < 2 )
224         return (mem[offset] | (amiga_ar23_mode&3));
225
226      if ( offset == 0x03 ) /* disable cart oberlay on chip mem */
227      {
228         UINT32 mirror_mask = amiga_chip_ram_size;
229         
230         memory_set_bank(1, 0);
231     
232         while( (mirror_mask<<1) < 0x100000 )
233         {
234            mirror_mask |= ( mirror_mask << 1 );
235         }
236     
237         /* overlay disabled, map RAM on 0x000000 */
238         memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, amiga_chip_ram_size - 1, 0, mirror_mask, MWA16_BANK1);
239      }
240   }
241   
242   return mem[offset];
243}
244
245static WRITE16_HANDLER( amiga_ar23_chipmem_w )
246{
247   if ( offset == (0x08/2) )
248   {
249      if ( amiga_ar23_mode & 1 )
250         amiga_ar23_freeze();
251   }
252   
253   amiga_chip_ram_w( offset * 2, data );
254}
255
256static void amiga_ar23_freeze( void )
257{
258   int pc = safe_activecpu_get_pc();
259   
260   /* only freeze if we're not inside the cart's ROM */
261   if ( ((pc >> 16) & 0xfe ) != 0x40 )
262   {
263      /* get the cart's built-in ram */
264      UINT16 *ar_ram = (UINT16 *)memory_get_write_ptr(0, ADDRESS_SPACE_PROGRAM, 0x440000);
265   
266      if ( ar_ram != NULL )
267      {
268         int      i;
269         
270         for( i = 0; i < 0x100; i++ )
271            ar_ram[0x7800+i] = CUSTOM_REG(i);
272      }
273     
274      /* overlay the cart rom's in chipram */
275      memory_set_bank(1, 2);
276           
277      /* writes go to chipram */
278      memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, amiga_chip_ram_size - 1, 0, 0, amiga_ar23_chipmem_w);
279     
280      /* trigger NMI irq */
281      cpunum_set_input_line(0, 7, PULSE_LINE);
282   }
283}
284
285static void amiga_ar23_nmi( void )
286{
287   amiga_ar23_mode = 0;
288   amiga_ar23_freeze();
289}
290
291#if 0
292static WRITE16_HANDLER( amiga_ar23_custom_w )
293{
294   int pc = safe_activecpu_get_pc();
295   
296   /* see if we're inside the AR2 rom */
297   if ( ((pc >> 16) & 0xfe ) != 0x40 )
298   {
299      /* get the cart's built-in ram */
300      UINT16 *ar_ram = (UINT16 *)memory_get_write_ptr(0, ADDRESS_SPACE_PROGRAM, 0x440000);
301   
302      if ( ar_ram != NULL )
303      {
304         ar_ram[0x7800+offset] = data;
305      }
306   }
307   
308   amiga_custom_w( offset, data, mem_mask );   
309}
310
311static READ16_HANDLER( amiga_ar23_custom_r )
312{
313   UINT16 data = amiga_custom_r( offset, mem_mask );   
314   
315   int pc = safe_activecpu_get_pc();
316   
317   /* see if we're inside the AR2 rom */
318   if ( ((pc >> 16) & 0xfe ) != 0x40 )
319   {
320      /* get the cart's built-in ram */
321      UINT16 *ar_ram = (UINT16 *)memory_get_write_ptr(0, ADDRESS_SPACE_PROGRAM, 0x440000);
322   
323      if ( ar_ram != NULL )
324      {
325         ar_ram[0x7800+offset] = data;
326      }
327   }
328
329   return data;
330}
331#endif
332
333static void amiga_ar23_check_overlay( void )
334{
335   amiga_ar23_mode = 3;
336   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x00000f, 0, 0, amiga_ar23_chipmem_w);
337}
338
339static void amiga_ar23_init( int ar3 )
340{
341   UINT32 mirror = 0x20000, size = 0x1ffff;
342   void *ar_ram;
343   
344   /* check kickstart version */
345   if ( !check_kickstart_12_13( "Action Replay MKII or MKIII" ) )
346   {
347      amiga_cart_type = -1;
348      return;
349   }
350   
351   /* setup the cart ram */
352   ar_ram = auto_malloc(0x10000);
353     
354   memset(ar_ram, 0, 0x10000);
355   
356   if ( ar3 )
357   {
358      mirror = 0;
359      size = 0x3ffff;
360   }
361     
362   /* Install ROM */
363   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x400000+size, 0, mirror, MRA16_BANK2);
364   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x400000+size, 0, mirror, MWA16_ROM);
365
366   /* Install RAM */
367   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x440000, 0x44ffff, 0, 0, MRA16_BANK3);
368   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x440000, 0x44ffff, 0, 0, MWA16_BANK3);
369   
370   /* Install Custom chip monitor */
371//   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0xdff000, 0xdff1ff, 0, 0, amiga_ar23_custom_r);
372//   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0xdff000, 0xdff1ff, 0, 0, amiga_ar23_custom_w);
373   
374   /* Install status/mode handlers */
375   memory_install_read16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x400007, 0, mirror, amiga_ar23_mode_r);
376   memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x400000, 0x400003, 0, mirror, amiga_ar23_mode_w);
377
378   /* Configure Banks */
379   memory_set_bankptr(2, memory_region(REGION_USER2));
380   memory_set_bankptr(3, ar_ram);
381   
382   memory_configure_bank(1, 0, 2, amiga_chip_ram, 0);
383   memory_configure_bank(1, 1, 2, memory_region(REGION_USER1), 0);
384   memory_configure_bank(1, 2, 2, memory_region(REGION_USER2), 0);
385   
386   amiga_ar23_mode = 3;
387}
388
389/***************************************************************************
390
391   MAME/MESS hooks
392
393***************************************************************************/
394
395void amiga_cart_init( void )
396{
397   /* see what is there */
398   UINT16 *mem = (UINT16 *)memory_region( REGION_USER2 );
399   
400   amiga_cart_type = -1;
401   
402   if ( mem != NULL )
403   {
404      if ( mem[0x00] == 0x1111 )
405      {
406         amiga_cart_type = ACTION_REPLAY;
407         amiga_ar1_init();
408      }
409      else if ( mem[0x0C] == 0x4D6B )
410      {
411         amiga_cart_type = ACTION_REPLAY_MKII;
412         amiga_ar23_init(0);
413      }
414      else if ( mem[0x0C] == 0x4D4B )
415      {
416         amiga_cart_type = ACTION_REPLAY_MKIII;
417         amiga_ar23_init(1);
418      }
419   }
420}
421
422void amiga_cart_check_overlay( void )
423{
424   if ( amiga_cart_type < 0 )
425      return;
426   
427   switch( amiga_cart_type )
428   {
429      case ACTION_REPLAY:
430         amiga_ar1_check_overlay();
431      break;
432         
433      case ACTION_REPLAY_MKII:
434      case ACTION_REPLAY_MKIII:
435         amiga_ar23_check_overlay();
436      break;
437   }
438}
439
440void amiga_cart_nmi( void )
441{
442   if ( amiga_cart_type < 0 )
443      return;
444   
445   switch( amiga_cart_type )
446   {
447      case ACTION_REPLAY:
448         amiga_ar1_nmi();
449      break;
450     
451      case ACTION_REPLAY_MKII:
452      case ACTION_REPLAY_MKIII:
453         amiga_ar23_nmi();
454      break;
455   }
456}
src/mess/machine/amigacrt.h
r0r882
1#ifndef AMIGACRT_H
2#define AMIGACRT_H
3
4void amiga_cart_init( void );
5void amiga_cart_check_overlay( void );
6void amiga_cart_nmi( void );
7
8#endif /* AMIGACRT_H */
src/mess/mess.mak
r881r882
571571   $(MAME_MACHINE)/amiga.o         \
572572   $(MAME_AUDIO)/amiga.o         \
573573   $(MESS_MACHINE)/amigafdc.o   \
574   $(MESS_MACHINE)/amigacrt.o   \
574575   $(MESS_MACHINE)/amigacd.o   \
575576   $(MESS_MACHINE)/matsucd.o   \
576577   $(MESS_MACHINE)/amigakbd.o   \
src/mess/drivers/amiga.c
r881r882
2323#include "machine/amigafdc.h"
2424#include "machine/amigakbd.h"
2525#include "machine/amigacd.h"
26#include "machine/amigacrt.h"
2627#include "machine/msm6242.h"
2728#include "devices/chd_cd.h"
29#include "devices/cartslot.h"
2830#include "inputx.h"
2931
3032/***************************************************************************
r881r882
4042static ADDRESS_MAP_START(amiga_mem, ADDRESS_SPACE_PROGRAM, 16)
4143   ADDRESS_MAP_FLAGS( AMEF_UNMAP(1) )
4244   AM_RANGE(0x000000, 0x07ffff) AM_MIRROR(0x80000) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size)
43#if AMIGA_ACTION_REPLAY_1
44   AM_RANGE(0x9fc000, 0x9fffff) AM_RAMBANK(2) AM_BASE(&amiga_ar_ram) AM_SIZE(&amiga_ar_ram_size)
45#endif
4645   AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
4746   AM_RANGE(0xc00000, 0xc7ffff) AM_RAM /* slow-mem */
4847   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);
4949   AM_RANGE(0xdf0000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs)   /* Custom Chips */
5050   AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w)
51#if AMIGA_ACTION_REPLAY_1
52   AM_RANGE(0xf00000, 0xf7ffff) AM_ROM AM_REGION(REGION_USER2, 0)   /* Cart ROM */
53#else
54   AM_RANGE(0xf00000, 0xf7ffff) AM_NOP
55#endif
5651   AM_RANGE(0xf80000, 0xffffff) AM_ROM AM_REGION(REGION_USER1, 0)   /* System ROM - mirror */
5752ADDRESS_MAP_END
5853
r881r882
9691   AM_RANGE(0x000000, 0x03ffff) AM_MIRROR(0xc0000) AM_RAMBANK(1) AM_BASE(&amiga_chip_ram) AM_SIZE(&amiga_chip_ram_size)
9792   AM_RANGE(0xbfd000, 0xbfefff) AM_READWRITE(amiga_cia_r, amiga_cia_w)
9893   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);
9995   AM_RANGE(0xdf0000, 0xdfffff) AM_READWRITE(amiga_custom_r, amiga_custom_w) AM_BASE(&amiga_custom_regs)   /* Custom Chips */
10096   AM_RANGE(0xe80000, 0xe8ffff) AM_READWRITE(amiga_autoconfig_r, amiga_autoconfig_w)
10197   AM_RANGE(0xf80000, 0xfbffff) AM_ROM AM_REGION(REGION_USER1, 0)   /* Bootstrap ROM */
10298   AM_RANGE(0xfc0000, 0xffffff) AM_RAMBANK(2)   /* Writable Control Store RAM */
10399ADDRESS_MAP_END
104100
105
106101/***************************************************************************
107102  Inputs
108103***************************************************************************/
109104
110
111INPUT_PORTS_START( amiga_common )
112   PORT_START_TAG("input")
105INPUT_PORTS_START( amiga )
106   PORT_START_TAG("config")
113107   PORT_CONFNAME( 0x20, 0x00, "Input Port 0 Device")
114108   PORT_CONFSETTING( 0x00, "Mouse" )
115109   PORT_CONFSETTING( 0x20, DEF_STR(Joystick) )
116110   PORT_CONFNAME( 0x10, 0x10, "Input Port 1 Device")
117111   PORT_CONFSETTING( 0x00, "Mouse" )
118112   PORT_CONFSETTING( 0x10, DEF_STR(Joystick) )
119
113   
120114   PORT_START_TAG("CIA0PORTA")
121115   PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_SPECIAL )
122116   PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
r881r882
165159     
166160INPUT_PORTS_END
167161
168
169INPUT_PORTS_START( amiga )
170   PORT_START_TAG("hardware")
171   PORT_CONFNAME( 0x08, 0x08, "Battery backed-up RTC")
172   PORT_CONFSETTING( 0x00, "Not Installed" )
173   PORT_CONFSETTING( 0x08, "Installed" )
174   
175   PORT_INCLUDE( amiga_common )
176INPUT_PORTS_END
177
178
179/* TODO: Support for the CDTV remote control */
180INPUT_PORTS_START( cdtv )
181   PORT_INCLUDE( amiga_common )
182INPUT_PORTS_END
183
184
185
186162/***************************************************************************
187163  Machine drivers
188164***************************************************************************/
r881r882
194170
195171static MACHINE_DRIVER_START( ntsc )
196172   /* basic machine hardware */
197   MDRV_CPU_ADD_TAG("main", M68000, 7159090)        /* 7.15909 Mhz (NTSC) */
173   MDRV_CPU_ADD_TAG("main", M68000, AMIGA_68000_NTSC_CLOCK)
198174   MDRV_CPU_PROGRAM_MAP(amiga_mem, 0)
199175   MDRV_CPU_VBLANK_INT(amiga_scanline_callback, 262)
176   
200177   MDRV_SCREEN_REFRESH_RATE(59.997)
201   MDRV_SCREEN_VBLANK_TIME(DEFAULT_60HZ_VBLANK_DURATION)
178   MDRV_SCREEN_VBLANK_TIME(USEC_TO_SUBSECONDS(0))
202179
203180   MDRV_MACHINE_RESET( amiga )
204181
205182    /* video hardware */
206183   MDRV_VIDEO_ATTRIBUTES(VIDEO_TYPE_RASTER | VIDEO_UPDATE_BEFORE_VBLANK)
207184   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
208   MDRV_SCREEN_SIZE(512*2, 262)
209   MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 244+8-1)
185   MDRV_SCREEN_SIZE(228*4, 262)
186   MDRV_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 262-1)
210187   MDRV_PALETTE_LENGTH(4096)
211188   MDRV_PALETTE_INIT( amiga )
212189
r881r882
246223   MDRV_IMPORT_FROM(ntsc)
247224
248225   /* adjust for PAL specs */
249   MDRV_CPU_REPLACE("main", M68000, 7093790)
226   MDRV_CPU_REPLACE("main", M68000, AMIGA_68000_PAL_CLOCK)
250227   MDRV_CPU_VBLANK_INT(amiga_scanline_callback, 312)
251228
252229   MDRV_SCREEN_REFRESH_RATE(50)
253230
254   MDRV_SCREEN_SIZE(512*2, 312)
255   MDRV_SCREEN_VISIBLE_AREA((129-8)*2, (449+8-1)*2, 44-8, 300+8-1)
231   MDRV_SCREEN_SIZE(228*4, 312)
232   MDRV_SCREEN_VISIBLE_AREA(214, (228*4)-1, 34, 312-1)
256233MACHINE_DRIVER_END
257234
258235static MACHINE_DRIVER_START( a1000p )
r881r882
289266     
290267      /* overlay disabled, map RAM on 0x000000 */
291268      memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, amiga_chip_ram_size - 1, 0, mirror_mask, MWA16_BANK1);
269     
270      amiga_cart_check_overlay();
292271   }
293272   else
294273      /* overlay enabled, map Amiga system ROM on 0x000000 */
295      memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, 0x07ffff, 0, 0, MWA16_ROM);
274      memory_install_write16_handler(0, ADDRESS_SPACE_PROGRAM, 0x000000, amiga_chip_ram_size - 1, 0, 0, MWA16_ROM);
296275
297276   set_led_status( 0, ( data & 2 ) ? 0 : 1 ); /* bit 2 = Power Led on Amiga */
298277   output_set_value("power_led", ( data & 2 ) ? 0 : 1);
r881r882
300279
301280static UINT16 amiga_read_joy0dat(void)
302281{
303   if ( readinputportbytag("input") & 0x20 ) {
282   if ( readinputportbytag("config") & 0x20 ) {
304283      /* Joystick */
305284      return readinputportbytag_safe("JOY0DAT", 0xffff);
306285   } else {
r881r882
314293
315294static UINT16 amiga_read_joy1dat(void)
316295{
317   if ( readinputportbytag("input") & 0x10 ) {
296   if ( readinputportbytag("config") & 0x10 ) {
318297      /* Joystick */
319298      return readinputportbytag_safe("JOY1DAT", 0xffff);
320299   } else {
r881r882
339318   }
340319}
341320
342static void amiga_reset(void)
321static DRIVER_INIT( amiga )
343322{
344   if (readinputportbytag("hardware") & 0x08)
323   static const amiga_machine_interface amiga_intf =
345324   {
346      /* Install RTC */
347      memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xdc0000, 0xdc003f, 0, 0, amiga_clock_r, amiga_clock_w);
348   }
349   else
350   {
351      /* No RTC support */
352      memory_install_readwrite16_handler(0, ADDRESS_SPACE_PROGRAM, 0xdc0000, 0xdc003f, 0, 0, MRA16_UNMAP, MWA16_UNMAP);
353   }
325      ANGUS_CHIP_RAM_MASK,
326      amiga_cia_0_portA_r, NULL,               /* CIA0 port A & B read */
327      amiga_cia_0_portA_w, NULL,               /* CIA0 port A & B write */
328      NULL, NULL,                              /* CIA1 port A & B read */
329      NULL, amiga_fdc_control_w,               /* CIA1 port A & B write */
330      amiga_read_joy0dat,   amiga_read_joy1dat,  /* joy0dat_r & joy1dat_r */
331      NULL,                                    /* potgo_w */
332      amiga_read_dskbytr,   amiga_write_dsklen,  /* dskbytr_r & dsklen_w */
333      NULL,                                    /* serdat_w */
334      NULL,                                    /* scanline0_callback */
335      NULL,                                    /* reset_callback */
336      amiga_cart_nmi,                          /* nmi_callback */
337      0                                        /* flags */
338   };
339
340   amiga_machine_config(&amiga_intf);
341
342   /* set up memory */
343   memory_configure_bank(1, 0, 1, amiga_chip_ram, 0);
344   memory_configure_bank(1, 1, 1, memory_region(REGION_USER1), 0);
345   
346   /* initialize cartridge (if present) */
347   amiga_cart_init();
348   
349   /* initialize keyboard */
350   amigakbd_init();
354351}
355352
356static DRIVER_INIT( amiga )
353static DRIVER_INIT( amiga_ecs )
357354{
358355   static const amiga_machine_interface amiga_intf =
359356   {
360      ANGUS_CHIP_RAM_MASK,
357      ECS_CHIP_RAM_MASK,
361358      amiga_cia_0_portA_r, NULL,               /* CIA0 port A & B read */
362359      amiga_cia_0_portA_w, NULL,               /* CIA0 port A & B write */
363360      NULL, NULL,                              /* CIA1 port A & B read */
r881r882
367364      amiga_read_dskbytr,   amiga_write_dsklen,  /* dskbytr_r & dsklen_w */
368365      NULL,                                    /* serdat_w */
369366      NULL,                                    /* scanline0_callback */
370      amiga_reset                              /* reset_callback */
367      NULL,                                    /* reset_callback */
368      amiga_cart_nmi,                          /* nmi_callback */
369      0                                        /* flags */
371370   };
372371
373372   amiga_machine_config(&amiga_intf);
r881r882
376375   memory_configure_bank(1, 0, 1, amiga_chip_ram, 0);
377376   memory_configure_bank(1, 1, 1, memory_region(REGION_USER1), 0);
378377   
378   /* initialize Action Replay (if present) */
379   amiga_cart_init();
380   
379381   /* initialize keyboard */
380382   amigakbd_init();
381383}
382384
385
383386static DRIVER_INIT( cdtv )
384387{
385388   static const amiga_machine_interface amiga_intf =
r881r882
394397      amiga_read_dskbytr,   amiga_write_dsklen,  /* dskbytr_r & dsklen_w */
395398      NULL,                                    /* serdat_w */
396399      NULL,                                    /* scanline0_callback */
397      NULL                                     /* reset_callback */
400      NULL,                                    /* reset_callback */
401      NULL,                                    /* nmi_callback */
402      0                                        /* flags */
398403   };
399404
400405   amiga_machine_config(&amiga_intf);
r881r882
407412   amigacd_init();
408413}
409414
410
411415/***************************************************************************
412  ROM definitions
416  ROM loading
413417***************************************************************************/
414418
419#define AMIGA_BIOS         \
420   ROM_REGION16_BE(0x080000, REGION_USER1, 0)   \
421   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))   \
423   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))   \
425   ROM_COPY(REGION_USER1, 0x000000, 0x040000, 0x040000)   \
426   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 */   \
428   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? */   \
430
431
432#define AMIGA_CART         \
433   ROM_REGION16_BE(0x080000, REGION_USER2, 0)   \
434   ROM_CART_LOAD(0, "rom,bin", 0x0000, 0x080000, ROM_NOMIRROR | ROM_FILL_FF | ROM_OPTIONAL)   \
435   
436   
437
415438ROM_START(a500n)
416   ROM_REGION16_BE(0x080000, REGION_USER1, 0)
417   ROM_SYSTEM_BIOS(0, "kick13",  "Kickstart 1.3 (34.5)")
418   ROMX_LOAD("315093-02.u6", 0x000000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD | ROM_BIOS(1))
419   ROM_SYSTEM_BIOS(1, "kick12",  "Kickstart 1.2 (33.180)")
420   ROMX_LOAD("315093-01.u6", 0x000000, 0x040000, CRC(a6ce1636) SHA1(11f9e62cf299f72184835b7b2a70a16333fc0d88), ROM_GROUPWORD | ROM_BIOS(2))
421   ROM_COPY(REGION_USER1, 0x000000, 0x040000, 0x040000)
422   ROM_SYSTEM_BIOS(2, "kick204", "Kickstart 2.04 (37.175)")
423   ROMX_LOAD("390979-01.u6", 0x000000, 0x080000, CRC(c3bdb240) SHA1(c5839f5cb98a7a8947065c3ed2f14f5f42e334a1), ROM_GROUPWORD | ROM_BIOS(3))   /* identical to 363968.01 */
424   ROM_SYSTEM_BIOS(3, "kick31",  "Kickstart 3.1 (40.63)")
425   ROMX_LOAD("kick40063.u6", 0x000000, 0x080000, CRC(fc24ae0d) SHA1(3b7f1493b27e212830f989f26ca76c02049f09ca), ROM_GROUPWORD | ROM_BIOS(4))   /* part number? */
439   AMIGA_BIOS
440   AMIGA_CART
441ROM_END
426442
427#if AMIGA_ACTION_REPLAY_1
428   ROM_REGION16_BE(0x080000, REGION_USER2, 0)
429   ROM_LOAD_OPTIONAL("ar1.bin", 0x000000, 0x010000, CRC(f82c4258) SHA1(843b433b2c56640e045d5fdc854dc6b1a4964e7c))
430#endif
443ROM_START(a500p)
444   AMIGA_BIOS
445   AMIGA_CART
431446ROM_END
432447
433#define rom_a500p    rom_a500n
434
435448ROM_START(a1000n)
436449   ROM_REGION16_BE(0x080000, REGION_USER1, 0)
437   ROM_LOAD16_BYTE("252179-01.u5n", 0x000000, 0x001000, CRC(42553bc4) SHA1(8855a97f7a44e3f62d1c88d938fee1f4c606af5b))
438   ROM_LOAD16_BYTE("252180-01.u5p", 0x000001, 0x001000, CRC(8e5b9a37) SHA1(d10f1564b99f5ffe108fa042362e877f569de2c3))
450   ROMX_LOAD("a1000.bin", 0x000000, 0x002000, CRC(62f11c04) SHA1(c87f9fada4ee4e69f3cca0c36193be822b9f5fe6), ROM_GROUPWORD)
439451ROM_END
440452
441#define rom_a1000p    rom_a1000n
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
442457
443458ROM_START(cdtv)
444459   ROM_REGION16_BE(0x100000, REGION_USER1, 0)
445   ROM_LOAD16_BYTE("391008-01.u34", 0x000000, 0x020000, CRC(791cb14b) SHA1(277a1778924496353ffe56be68063d2a334360e4))
446   ROM_LOAD16_BYTE("391009-01.u35", 0x000001, 0x020000, CRC(accbbc2e) SHA1(41b06d1679c6e6933c3378b7626025f7641ebc5c))
460   ROM_LOAD16_BYTE("391008.01", 0x000000, 0x020000, CRC(791cb14b) SHA1(277a1778924496353ffe56be68063d2a334360e4))
461   ROM_LOAD16_BYTE("391009.01", 0x000001, 0x020000, CRC(accbbc2e) SHA1(41b06d1679c6e6933c3378b7626025f7641ebc5c))
447462   ROM_COPY(REGION_USER1, 0x000000, 0x040000, 0x040000)
448   ROMX_LOAD(      "315093-02.u13", 0x080000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD)   
463   ROMX_LOAD(      "315093.02", 0x080000, 0x040000, CRC(c4f0f55f) SHA1(891e9a547772fe0c6c19b610baf8bc4ea7fcb785), ROM_GROUPWORD)   
449464   ROM_COPY(REGION_USER1, 0x080000, 0x0c0000, 0x040000)
450465ROM_END
451466
452
453467/***************************************************************************
454468  System config
455469***************************************************************************/
456470
457471SYSTEM_CONFIG_START(amiga)
472   CONFIG_DEVICE(cartslot_device_getinfo)
458473   CONFIG_DEVICE(amiga_floppy_getinfo)
459474SYSTEM_CONFIG_END
460475
476SYSTEM_CONFIG_START(a1000)
477   CONFIG_DEVICE(amiga_floppy_getinfo)
478SYSTEM_CONFIG_END
479
461480static void cdtv_cd_getinfo(const device_class *devclass, UINT32 state, union devinfo *info)
462481{
463482   /* CHD CD-ROM */
r881r882
478497  Game drivers
479498***************************************************************************/
480499
481/*     YEAR  NAME      PARENT   BIOS     COMPAT   MACHINE  INPUT    INIT     CONFIG   COMPANY                             FULLNAME             FLAGS */
482COMP(  1985, a1000n,   0,                0,       a1000n,  amiga,   amiga,   amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 1000 (NTSC-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
483COMP(  1985, a1000p,   a1000n,           0,       a1000p,  amiga,   amiga,   amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 1000 (PAL-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
484COMPB( 1987, a500n,    0,       amiga,   0,       ntsc,    amiga,   amiga,   amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 500 (NTSC-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
485COMPB( 1987, a500p,    a500n,   amiga,   0,       pal,     amiga,   amiga,   amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 500 (PAL-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
486COMP(  1991, cdtv,     0,                0,       cdtv,    cdtv,    cdtv,    cdtv,    "Commodore Business Machines Co.",  "Commodore Amiga CDTV 1.0 (NTSC)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
500/*     YEAR  NAME      PARENT   BIOS     COMPAT   MACHINE  INPUT    INIT       CONFIG   COMPANY                             FULLNAME             FLAGS */
501COMP(  1985, a1000n,   0,                0,       a1000n,  amiga,   amiga,     a1000,   "Commodore Business Machines Co.",  "Commodore Amiga 1000 (NTSC-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
502COMP(  1985, a1000p,   a1000n,           0,       a1000p,  amiga,   amiga,     a1000,   "Commodore Business Machines Co.",  "Commodore Amiga 1000 (PAL-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
503COMPB( 1987, a500n,    0,       amiga,   0,       ntsc,    amiga,   amiga,     amiga,   "Commodore Business Machines Co.",  "Commodore Amiga 500 (NTSC-OCS)", GAME_COMPUTER | GAME_IMPERFECT_GRAPHICS )
504COMPB( 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 )
docs/messnew.txt
r881r882
1111----------------------
1212- [3DO] Protection fixes.  [Ernesto Corvi]
1313
14- [AMIGA] Added cdrom support, marked as working but with imperfect graphics,
14- [AMIGA] Added CD-ROM and cartridge support, marked as working but with imperfect graphics,
1515  added CDDA audio.  Bug fix to FDC.  [Ernesto Corvi]
1616
1717- [AMIGA] Made battery backed-up RTC support configurable.  [Dirk Best]

Previous 15994 Revisions Next


© 1998-2018 The MESS Team