Previous 15994 Revisions Next

r3686 Thursday 27th November, 2008 at 21:47:33 UTC by Fabio Priuli
hopefully fixed atarist and re-enabled atari.a
[src/mess]mess.mak messdriv.c
[src/mess/audio]lmc1992.c
[src/mess/drivers]atarist.c
[src/mess/video]atarist.c

src/mess/audio/lmc1992.c
r3685r3686
136136static DEVICE_START( lmc1992 )
137137{
138138   lmc1992_t *lmc1992 = get_safe_token(device);
139   char unique_tag[30];
140139
141140   /* validate arguments */
142141   assert(device != NULL);
r3685r3686
148147//   assert(lmc1992->intf != NULL);
149148
150149   /* register for state saving */
151   state_save_combine_module_and_tag(unique_tag, "LMC1992", device->tag);
152150
153   state_save_register_item(unique_tag, 0, lmc1992->enable);
154   state_save_register_item(unique_tag, 0, lmc1992->data);
155   state_save_register_item(unique_tag, 0, lmc1992->clock);
156   state_save_register_item(unique_tag, 0, lmc1992->si);
157   state_save_register_item(unique_tag, 0, lmc1992->input);
158   state_save_register_item(unique_tag, 0, lmc1992->bass);
159   state_save_register_item(unique_tag, 0, lmc1992->treble);
160   state_save_register_item(unique_tag, 0, lmc1992->volume);
161   state_save_register_item(unique_tag, 0, lmc1992->fader_rf);
162   state_save_register_item(unique_tag, 0, lmc1992->fader_lf);
163   state_save_register_item(unique_tag, 0, lmc1992->fader_rr);
164   state_save_register_item(unique_tag, 0, lmc1992->fader_lr);
151   state_save_register_item("LMC1992", device->tag, 0, lmc1992->enable);
152   state_save_register_item("LMC1992", device->tag, 0, lmc1992->data);
153   state_save_register_item("LMC1992", device->tag, 0, lmc1992->clock);
154   state_save_register_item("LMC1992", device->tag, 0, lmc1992->si);
155   state_save_register_item("LMC1992", device->tag, 0, lmc1992->input);
156   state_save_register_item("LMC1992", device->tag, 0, lmc1992->bass);
157   state_save_register_item("LMC1992", device->tag, 0, lmc1992->treble);
158   state_save_register_item("LMC1992", device->tag, 0, lmc1992->volume);
159   state_save_register_item("LMC1992", device->tag, 0, lmc1992->fader_rf);
160   state_save_register_item("LMC1992", device->tag, 0, lmc1992->fader_lf);
161   state_save_register_item("LMC1992", device->tag, 0, lmc1992->fader_rr);
162   state_save_register_item("LMC1992", device->tag, 0, lmc1992->fader_lr);
165163   return DEVICE_START_OK;
166164}
167165
src/mess/video/atarist.c
r3685r3686
171171
172172   if ((y == shifter.vblank_start) && (x == 0))
173173   {
174      cpu_set_input_line(machine->cpu[0], MC68000_IRQ_4, HOLD_LINE);
174      cpu_set_input_line(machine->cpu[0], M68K_IRQ_4, HOLD_LINE);
175175      shifter.ofs = shifter.base;
176176   }
177177
178178   if (x == shifter.hblank_start)
179179   {
180      cpu_set_input_line(machine->cpu[0], MC68000_IRQ_2, HOLD_LINE);
180      cpu_set_input_line(machine->cpu[0], M68K_IRQ_2, HOLD_LINE);
181181      shifter.ofs += (shifter.lineofs * 2); // STe
182182   }
183183}
r3685r3686
282282   shifter.palette[offset] = data;
283283   logerror("SHIFTER Palette[%x] = %x\n", offset, data);
284284
285   palette_set_color_rgb(machine, offset, pal3bit(data >> 8), pal3bit(data >> 4), pal3bit(data));
285   palette_set_color_rgb(space->machine, offset, pal3bit(data >> 8), pal3bit(data >> 4), pal3bit(data));
286286}
287287
288288/* Atari STe Shifter */
r3685r3686
341341   shifter.palette[offset] = data;
342342   logerror("SHIFTER palette %x = %x\n", offset, data);
343343
344   palette_set_color_rgb(machine, offset, r, g, b);
344   palette_set_color_rgb(space->machine, offset, r, g, b);
345345}
346346
347347READ16_HANDLER( atariste_shifter_lineofs_r )
src/mess/messdriv.c
r3685r3686
4545   DRIVER( 3do_pal )
4646
4747   /* ATARI */
48//128u4   DRIVER( a2600 )      /* Atari 2600                              */
49//128u4   DRIVER( a2600p )   /* Atari 2600 PAL                           */
50//128u4   DRIVER( a5200 )      /* Atari 5200                              */
51//128u4   DRIVER( a5200a )   /* Atari 5200 alt                           */
52//128u4   DRIVER( a7800 )      /* Atari 7800 NTSC                           */
53//128u4   DRIVER( a7800p )   /* Atari 7800 PAL                           */
48   DRIVER( a2600 )      /* Atari 2600                              */
49   DRIVER( a2600p )   /* Atari 2600 PAL                           */
50   DRIVER( a5200 )      /* Atari 5200                              */
51   DRIVER( a5200a )   /* Atari 5200 alt                           */
52   DRIVER( a7800 )      /* Atari 7800 NTSC                           */
53   DRIVER( a7800p )   /* Atari 7800 PAL                           */
5454   DRIVER( lynx )      /* Atari Lynx Handheld                        */
5555   DRIVER( lynx2 )      /* Atari Lynx II Handheld redesigned, no additions   */
56//128u4   DRIVER( jaguar )   /* Atari Jaguar                              */
57//128u4   DRIVER( atarist )   /* Atari ST                                 */
58//128u4   DRIVER( megast )   /* Atari Mega ST                           */
56   DRIVER( jaguar )   /* Atari Jaguar                              */
57   DRIVER( atarist )   /* Atari ST                                 */
58   DRIVER( megast )   /* Atari Mega ST                           */
5959//   DRIVER( stacy )      /* Atari STacy                              */
60//128u4   DRIVER( atariste )   /* Atari STe                              */
61//128u4   DRIVER( stbook )   /* Atari STBook                              */
62//128u4   DRIVER( megaste )   /* Atari Mega STe                           */
60   DRIVER( atariste )   /* Atari STe                              */
61   DRIVER( stbook )   /* Atari STBook                              */
62   DRIVER( megaste )   /* Atari Mega STe                           */
6363//   DRIVER( stpad )      /* Atari STPad (prototype)                     */
6464//   DRIVER( tt030 )      /* Atari TT030                              */
6565//   DRIVER( fx1 )      /* Atari FX-1 (prototype)                     */
r3685r3686
188188   DRIVER( vc4000 )   /* Interton vc4000                           */
189189
190190   /* BANDAI */
191//128u4   DRIVER( wswan )      /* Bandai WonderSwan Handheld                  */
192//128u4   DRIVER( wscolor )   /* Bandai WonderSwan Color Handheld               */
191   DRIVER( wswan )      /* Bandai WonderSwan Handheld                  */
192   DRIVER( wscolor )   /* Bandai WonderSwan Color Handheld               */
193193
194194   /* EPOCH */
195195   DRIVER( gamepock )   /* Epoch Game Pocket Computer                  */
r3685r3686
2992994    XEGS    05/07/1987  0x1eaf4002  C101687
300300*/
301301
302//128u4   DRIVER( a400 )      /* 1979 Atari 400                           */
303//128u4   DRIVER( a400pal )   /* 1979 Atari 400 PAL                        */
304//128u4   DRIVER( a800 )      /* 1979 Atari 800                           */
305//128u4   DRIVER( a800pal )   /* 1979 Atari 800 PAL                        */
306//128u4   DRIVER( a800xl )   /* 1983 Atari 800 XL                        */
302   DRIVER( a400 )      /* 1979 Atari 400                           */
303   DRIVER( a400pal )   /* 1979 Atari 400 PAL                        */
304   DRIVER( a800 )      /* 1979 Atari 800                           */
305   DRIVER( a800pal )   /* 1979 Atari 800 PAL                        */
306   DRIVER( a800xl )   /* 1983 Atari 800 XL                        */
307307
308308   /* COMMODORE */
309309   DRIVER( kim1 )      /* Commodore (MOS) KIM-1 1975                  */
src/mess/mess.mak
r3685r3686
472472   $(MESSOBJ)/votrax.a \
473473   $(MESSOBJ)/vtech.a \
474474   $(MESSOBJ)/shared.a \
475   $(MESSOBJ)/atari.a \
475476
476#   $(MESSOBJ)/atari.a \
477477#   $(MESSOBJ)/coco.a \
478478#   $(MESSOBJ)/compis.a \
479479#   $(MESSOBJ)/dgn_beta.a \
r3685r3686
584584   $(MAME_MACHINE)/gdcrypt.o   \
585585   $(MAME_VIDEO)/dc.o      \
586586
587$(MESSOBJ)/atari.a:                  \
588   $(MAME_VIDEO)/tia.o         \
589   $(MAME_MACHINE)/atari.o         \
590   $(MAME_VIDEO)/atari.o         \
591   $(MAME_VIDEO)/antic.o         \
592   $(MAME_VIDEO)/gtia.o         \
587$(MESSOBJ)/atari.a:         \
588   $(MAME_VIDEO)/tia.o      \
589   $(MAME_MACHINE)/atari.o      \
590   $(MAME_VIDEO)/atari.o      \
591   $(MAME_VIDEO)/antic.o      \
592   $(MAME_VIDEO)/gtia.o      \
593593   $(MESS_MACHINE)/atarifdc.o   \
594594   $(MESS_DRIVERS)/atari.o      \
595595   $(MESS_MACHINE)/a7800.o      \
r3685r3686
597597   $(MESS_VIDEO)/a7800.o      \
598598   $(MESS_DRIVERS)/a2600.o      \
599599   $(MESS_DRIVERS)/jaguar.o   \
600   $(MAME_AUDIO)/jaguar.o         \
601   $(MAME_VIDEO)/jaguar.o         \
600   $(MAME_AUDIO)/jaguar.o      \
601   $(MAME_VIDEO)/jaguar.o      \
602602   $(MESS_FORMATS)/a26_cas.o   \
603   $(MESS_DRIVERS)/atarist.o \
604   $(MESS_VIDEO)/atarist.o \
605   $(MESS_AUDIO)/lmc1992.o
603   $(MESS_DRIVERS)/atarist.o    \
604   $(MESS_VIDEO)/atarist.o    \
605   $(MESS_AUDIO)/lmc1992.o      \
606606
607$(MESSOBJ)/gce.a:                        \
607$(MESSOBJ)/gce.a:                 \
608608   $(MESS_DRIVERS)/vectrex.o   \
609   $(MESS_VIDEO)/vectrex.o   \
609   $(MESS_VIDEO)/vectrex.o      \
610610   $(MESS_MACHINE)/vectrex.o   \
611611
612612$(MESSOBJ)/nintendo.a:         \
src/mess/drivers/atarist.c
r3685r3686
6969      {
7070         if (fdc.mode & ATARIST_FLOPPY_MODE_WRITE)
7171         {
72            wd17xx_data_w(machine, 0, RAM[fdc.dmabase]);
72            wd17xx_data_w(cputag_get_address_space(machine,"main",ADDRESS_SPACE_PROGRAM), 0, RAM[fdc.dmabase]);
7373         }
7474         else
7575         {
76            RAM[fdc.dmabase] = wd17xx_data_r(machine, 0);
76            RAM[fdc.dmabase] = wd17xx_data_r(cputag_get_address_space(machine,"main",ADDRESS_SPACE_PROGRAM), 0);
7777         }
7878
7979         fdc.dmabase++;
r3685r3686
136136      }
137137      else
138138      {
139         return wd17xx_r(machine, (fdc.mode & ATARIST_FLOPPY_MODE_ADDRESS_MASK) >> 1);
139         return wd17xx_r(space, (fdc.mode & ATARIST_FLOPPY_MODE_ADDRESS_MASK) >> 1);
140140      }
141141   }
142142}
r3685r3686
165165      }
166166      else
167167      {
168         wd17xx_w(machine, (fdc.mode & ATARIST_FLOPPY_MODE_ADDRESS_MASK) >> 1, data);
168         wd17xx_w(space, (fdc.mode & ATARIST_FLOPPY_MODE_ADDRESS_MASK) >> 1, data);
169169      }
170170   }
171171}
r3685r3686
287287
288288    */
289289
290   return (ikbd.tx << 3) | (input_port_read_safe(machine, "IKBD_JOY1", 0xff) & 0x06);
290   return (ikbd.tx << 3) | (input_port_read_safe(space->machine, "IKBD_JOY1", 0xff) & 0x06);
291291}
292292
293293static WRITE8_HANDLER( ikbd_port2_w )
r3685r3686
326326
327327   set_led_status(1, data & 0x01);
328328
329   if (~data & 0x02) ikbd.keylatch = input_port_read(machine, "P31");
330   if (~data & 0x04) ikbd.keylatch = input_port_read(machine, "P32");
331   if (~data & 0x08) ikbd.keylatch = input_port_read(machine, "P33");
332   if (~data & 0x10) ikbd.keylatch = input_port_read(machine, "P34");
333   if (~data & 0x20) ikbd.keylatch = input_port_read(machine, "P35");
334   if (~data & 0x40) ikbd.keylatch = input_port_read(machine, "P36");
335   if (~data & 0x80) ikbd.keylatch = input_port_read(machine, "P37");
329   if (~data & 0x02) ikbd.keylatch = input_port_read(space->machine, "P31");
330   if (~data & 0x04) ikbd.keylatch = input_port_read(space->machine, "P32");
331   if (~data & 0x08) ikbd.keylatch = input_port_read(space->machine, "P33");
332   if (~data & 0x10) ikbd.keylatch = input_port_read(space->machine, "P34");
333   if (~data & 0x20) ikbd.keylatch = input_port_read(space->machine, "P35");
334   if (~data & 0x40) ikbd.keylatch = input_port_read(space->machine, "P36");
335   if (~data & 0x80) ikbd.keylatch = input_port_read(space->machine, "P37");
336336}
337337
338338static READ8_HANDLER( ikbd_port4_r )
r3685r3686
352352
353353    */
354354
355   if (input_port_read(machine, "config") & 0x01)
355   if (input_port_read(space->machine, "config") & 0x01)
356356   {
357357      /*
358358
r3685r3686
363363
364364        */
365365
366      UINT8 data = input_port_read_safe(machine, "IKBD_JOY0", 0xff) & 0xf0;
367      UINT8 x = input_port_read_safe(machine, "IKBD_MOUSEX", 0x00);
368      UINT8 y = input_port_read_safe(machine, "IKBD_MOUSEY", 0x00);
366      UINT8 data = input_port_read_safe(space->machine, "IKBD_JOY0", 0xff) & 0xf0;
367      UINT8 x = input_port_read_safe(space->machine, "IKBD_MOUSEX", 0x00);
368      UINT8 y = input_port_read_safe(space->machine, "IKBD_MOUSEY", 0x00);
369369
370370      if (x == ikbd.mouse_x)
371371      {
r3685r3686
412412   }
413413   else
414414   {
415      return input_port_read_safe(machine, "IKBD_JOY0", 0xff);
415      return input_port_read_safe(space->machine, "IKBD_JOY0", 0xff);
416416   }
417417}
418418
r3685r3686
433433
434434    */
435435
436   if (~data & 0x01) ikbd.keylatch = input_port_read(machine, "P40");
437   if (~data & 0x02) ikbd.keylatch = input_port_read(machine, "P41");
438   if (~data & 0x04) ikbd.keylatch = input_port_read(machine, "P42");
439   if (~data & 0x08) ikbd.keylatch = input_port_read(machine, "P43");
440   if (~data & 0x10) ikbd.keylatch = input_port_read(machine, "P44");
441   if (~data & 0x20) ikbd.keylatch = input_port_read(machine, "P45");
442   if (~data & 0x40) ikbd.keylatch = input_port_read(machine, "P46");
443   if (~data & 0x80) ikbd.keylatch = input_port_read(machine, "P47");
436   if (~data & 0x01) ikbd.keylatch = input_port_read(space->machine, "P40");
437   if (~data & 0x02) ikbd.keylatch = input_port_read(space->machine, "P41");
438   if (~data & 0x04) ikbd.keylatch = input_port_read(space->machine, "P42");
439   if (~data & 0x08) ikbd.keylatch = input_port_read(space->machine, "P43");
440   if (~data & 0x10) ikbd.keylatch = input_port_read(space->machine, "P44");
441   if (~data & 0x20) ikbd.keylatch = input_port_read(space->machine, "P45");
442   if (~data & 0x40) ikbd.keylatch = input_port_read(space->machine, "P46");
443   if (~data & 0x80) ikbd.keylatch = input_port_read(space->machine, "P47");
444444}
445445
446446/* DMA Sound */
r3685r3686
588588   {
589589      if (!dmasound.active)
590590      {
591         atariste_dmasound_set_state(machine, 1);
591         atariste_dmasound_set_state(space->machine, 1);
592592         timer_adjust_periodic(dmasound_timer, attotime_zero, 0, ATTOTIME_IN_HZ(DMASOUND_RATE[dmasound.mode & 0x03]));
593593      }
594594   }
595595   else
596596   {
597      atariste_dmasound_set_state(machine, 0);
597      atariste_dmasound_set_state(space->machine, 0);
598598      timer_enable(dmasound_timer, 0);
599599   }
600600}
r3685r3686
737737static WRITE16_HANDLER( megaste_cache_w )
738738{
739739   megaste_cache = data;
740   cpunum_set_clock(machine, 0, (data & 0x01) ? Y2/2 : Y2/4);
740   cpu_set_clock(space->machine->cpu[0], (data & 0x01) ? Y2/2 : Y2/4);
741741}
742742
743743/* ST Book */
r3685r3686
767767
768768    */
769769
770   return (input_port_read(machine, "SW400") << 8) | 0xff;
770   return (input_port_read(space->machine, "SW400") << 8) | 0xff;
771771}
772772
773773static WRITE16_HANDLER( stbook_lcd_control_w )
r3685r3686
13661366
13671367static IRQ_CALLBACK( atarist_int_ack )
13681368{
1369   const device_config *mc68901 = device_list_find_by_tag(machine->config->devicelist, MC68901, MC68901_TAG);
1369   const device_config *mc68901 = device_list_find_by_tag(device->machine->config->devicelist, MC68901, MC68901_TAG);
13701370
1371   if (irqline == MC68000_IRQ_6)
1371   if (irqline == M68K_IRQ_6)
13721372   {
13731373      return mc68901_get_vector(mc68901);
13741374   }
13751375
1376   return MC68000_INT_ACK_AUTOVECTOR;
1376   return M68K_INT_ACK_AUTOVECTOR;
13771377}
13781378
13791379static MC68901_ON_IRQ_CHANGED( mfp_interrupt )
13801380{
1381   cpu_set_input_line(device->machine->cpu[0], MC68000_IRQ_6, level);
1381   cpu_set_input_line(device->machine->cpu[0], M68K_IRQ_6, level);
13821382}
13831383
13841384static UINT8 mfp_rx, mfp_tx;
r3685r3686
14121412   switch (mess_ram_size)
14131413   {
14141414   case 256 * 1024:
1415      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x03ffff, 0, 0, SMH_BANK1, SMH_BANK1);
1416      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x040000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1415      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x03ffff, 0, 0, SMH_BANK1, SMH_BANK1);
1416      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x040000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
14171417      break;
14181418   case 512 * 1024:
1419      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x07ffff, 0, 0, SMH_BANK1, SMH_BANK1);
1420      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x080000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1419      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x07ffff, 0, 0, SMH_BANK1, SMH_BANK1);
1420      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x080000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
14211421      break;
14221422   case 1024 * 1024:
1423      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x0fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1424      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x100000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1423      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x0fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1424      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x100000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
14251425      break;
14261426   case 2048 * 1024:
1427      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x1fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1428      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1427      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x1fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1428      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x200000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
14291429      break;
14301430   case 4096 * 1024:
1431      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x1fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1432      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x3fffff, 0, 0, SMH_BANK2, SMH_BANK2);
1431      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x1fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1432      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x200000, 0x3fffff, 0, 0, SMH_BANK2, SMH_BANK2);
14331433      break;
14341434   }
14351435
r3685r3686
14391439   memory_configure_bank(machine, 2, 0, 1, RAM + 0x200000, 0);
14401440   memory_set_bank(machine, 2, 0);
14411441
1442   memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xfa0000, 0xfbffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1442   memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfa0000, 0xfbffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
14431443
14441444   memory_configure_bank(machine, 3, 0, 1, RAM + 0xfa0000, 0);
1445   memory_set_bank(3, 0);
1445   memory_set_bank(machine, 3, 0);
14461446}
14471447
14481448static void atarist_state_save(void)
r3685r3686
14851485   acia6850_config(0, &acia_ikbd_intf);
14861486   acia6850_config(1, &acia_midi_intf);
14871487
1488   cpunum_set_irq_callback(0, atarist_int_ack);
1488   cpu_set_irq_callback(machine->cpu[0], atarist_int_ack);
14891489}
14901490
14911491static const struct rp5c15_interface rtc_intf =
r3685r3686
15721572   acia6850_config(0, &acia_ikbd_intf);
15731573   acia6850_config(1, &acia_midi_intf);
15741574
1575   cpunum_set_irq_callback(0, atarist_int_ack);
1575   cpu_set_irq_callback(machine->cpu[0], atarist_int_ack);
15761576
15771577   dmasound_timer = timer_alloc(atariste_dmasound_tick, NULL);
15781578   microwire_timer = timer_alloc(atariste_microwire_tick, NULL);
r3685r3686
15921592   switch (mess_ram_size)
15931593   {
15941594   case 1024 * 1024:
1595      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x07ffff, 0, 0x080000, SMH_BANK1, SMH_BANK1);
1596      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x100000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1595      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x07ffff, 0, 0x080000, SMH_BANK1, SMH_BANK1);
1596      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x100000, 0x3fffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
15971597      break;
15981598   case 4096 * 1024:
1599      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x000008, 0x1fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1600      memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x200000, 0x3fffff, 0, 0, SMH_BANK2, SMH_BANK2);
1599      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x000008, 0x1fffff, 0, 0, SMH_BANK1, SMH_BANK1);
1600      memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0x200000, 0x3fffff, 0, 0, SMH_BANK2, SMH_BANK2);
16011601      break;
16021602   }
16031603
r3685r3686
16071607   memory_configure_bank(machine, 2, 0, 1, RAM + 0x200000, 0);
16081608   memory_set_bank(machine, 2, 0);
16091609
1610   memory_install_readwrite16_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0xfa0000, 0xfbffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
1610   memory_install_readwrite16_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfa0000, 0xfbffff, 0, 0, SMH_UNMAP, SMH_UNMAP);
16111611
16121612   memory_configure_bank(machine, 3, 0, 1, RAM + 0xfa0000, 0);
1613   memory_set_bank(3, 0);
1613   memory_set_bank(machine, 3, 0);
16141614}
16151615
16161616static WRITE8_HANDLER( stbook_ym2149_port_a_w )
r3685r3686
17131713   acia6850_config(1, &acia_midi_intf);
17141714   rp5c15_init(machine, &rtc_intf);
17151715
1716   cpunum_set_irq_callback(0, atarist_int_ack);
1716   cpu_set_irq_callback(machine->cpu[0], atarist_int_ack);
17171717}
17181718
17191719static MACHINE_DRIVER_START( atarist )
r3685r3686
21052105   {
21062106      if (image_fread(image, ptr, filesize) == filesize)
21072107      {
2108         memory_install_readwrite16_handler(image->machine, 0, ADDRESS_SPACE_PROGRAM, 0xfa0000, 0xfbffff, 0, 0, SMH_BANK3, SMH_BANK3);
2108         memory_install_readwrite16_handler(cpu_get_address_space(image->machine->cpu[0], ADDRESS_SPACE_PROGRAM), 0xfa0000, 0xfbffff, 0, 0, SMH_BANK3, SMH_BANK3);
21092109
21102110         return INIT_PASS;
21112111      }

Previous 15994 Revisions Next


© 1998-2018 The MESS Team