Previous 15994 Revisions Next

r6436 Sunday 22nd November, 2009 at 05:20:07 UTC by R. Belmont
[MAC]
- Memory size options cleaned up to better reflect reality
- Beginnings of support for V8 and Sonora system controllers
- Beginnings of support for Egret ADB/PRAM chip
- Beginnings of support for PowerPC-based Macs
- IIx, IIcx, and SE/30 promoted to working
[src/mess/drivers]mac.c
[src/mess/includes]mac.h
[src/mess/machine]mac.c

src/mess/includes/mac.h
r6435r6436
3636   MODEL_MAC_LC_II,
3737   MODEL_MAC_LC_III,
3838   MODEL_MAC_CLASSIC_II,
39   MODEL_MAC_COLOR_CLASSIC
39   MODEL_MAC_COLOR_CLASSIC,
40
41   MODEL_MAC_POWERMAC_6100   // original PowerMac
4042} mac_model_t;
4143
4244// video parameters for classic Macs
r6435r6436
7375DRIVER_INIT(macse30);
7476DRIVER_INIT(macclassic2);
7577DRIVER_INIT(maclc2);
78DRIVER_INIT(maclc3);
79DRIVER_INIT(macpm6100);
7680
7781READ16_HANDLER ( mac_via_r );
7882WRITE16_HANDLER ( mac_via_w );
src/mess/machine/mac.c
r6435r6436
205205   write16_space_func wh;
206206   read32_space_func rh32;
207207   write32_space_func wh32;
208   read64_space_func rh64;
209   write64_space_func wh64;
208210
209211   memory_size = MIN(memory_size, (memory_end + 1 - memory_begin));
210212   memory_mask = memory_size - 1;
r6435r6436
219221      memory_install_write16_handler(space, memory_begin,
220222         memory_end, memory_mask, 0, wh);
221223   }
222   else
224   else if (mac_model < MODEL_MAC_POWERMAC_6100)
223225   {
224226      rh32 = (read32_space_func) (FPTR)bank;
225227      wh32 = is_rom ? SMH_UNMAP : (write32_space_func) (FPTR)bank;
r6435r6436
230232         memory_end, memory_mask, 0, wh32);
231233
232234   }
235   else
236   {
237      rh64 = (read64_space_func) (FPTR)bank;
238      wh64 = is_rom ? SMH_UNMAP : (write64_space_func) (FPTR)bank;
233239
240      memory_install_read64_handler(space, memory_begin,
241         memory_end, memory_mask, 0, rh64);
242      memory_install_write64_handler(space, memory_begin,
243         memory_end, memory_mask, 0, wh64);
244
245   }
246
234247   memory_set_bankptr(machine,bank, memory_data);
235248
236249   if (1) //LOG_MEMORY)
r6435r6436
263276         take_interrupt = 1;
264277      }
265278   }
266   else
279   else if (mac_model < MODEL_MAC_POWERMAC_6100)
267280   {
268281      if (scc_interrupt)
269282      {
r6435r6436
278291         take_interrupt = 1;
279292      }
280293   }
294   else
295   {
296      return;   // no interrupts for PowerPC yet
297   }
281298
282299   if (last_taken_interrupt != -1)
283300   {
r6435r6436
371388      }
372389
373390      /* install the memory */
374      if (((mac_model >= MODEL_MAC_LC) && (mac_model <= MODEL_MAC_COLOR_CLASSIC))|| (mac_model == MODEL_MAC_LC_II))
391      if (((mac_model >= MODEL_MAC_LC) && (mac_model <= MODEL_MAC_COLOR_CLASSIC))|| (mac_model == MODEL_MAC_LC_II) || (mac_model == MODEL_MAC_POWERMAC_6100) || (mac_model == MODEL_MAC_CLASSIC_II))
375392      {
376393         mac_install_memory(machine, 0x00000000, memory_size-1, memory_size, memory_data, is_rom, 1);
377394      }
r6435r6436
387404            mac_install_memory(machine, 0x00000000, 0x03ffffff, memory_size, memory_data, is_rom, 1);
388405         }
389406      }
390      else if ((mac_model == MODEL_MAC_CLASSIC_II) || ((mac_model == MODEL_MAC_II) && (mac_model <= MODEL_MAC_SE30)))
407      else if ((mac_model == MODEL_MAC_CLASSIC_II) || ((mac_model >= MODEL_MAC_II) && (mac_model <= MODEL_MAC_SE30)))
391408      {
392409         mac_install_memory(machine, 0x00000000, 0x3fffffff, memory_size, memory_data, is_rom, 1);
393410      }
411      else if (mac_model == MODEL_MAC_LC_III)   // up to 36 MB
412      {
413         mac_install_memory(machine, 0x00000000, 0x023fffff, memory_size, memory_data, is_rom, 1);
414      }
394415      else
395416      {
396417         mac_install_memory(machine, 0x00000000, 0x003fffff, memory_size, memory_data, is_rom, 1);
r6435r6436
14221443 * *************************************************************************/
14231444
14241445// Mac ADB state
1425static int adb_irq_pending, adb_waiting_cmd, adb_datasize, adb_buffer[16];
1446static int adb_irq_pending, adb_waiting_cmd, adb_datasize, adb_buffer[257];
14261447static int adb_state, adb_command, adb_send, adb_timer_ticks, adb_extclock, adb_direction;
14271448static int adb_listenreg, adb_listenaddr, adb_last_talk;
14281449
r6435r6436
18221843      }
18231844      else if (ADB_IS_EGRET)
18241845      {
1825         #if LOG_ADB
1826         printf("Egret ADB: got command byte %02x\n", adb_command);
1827         #endif
1846         // Egret sending a response to the 680x0?
1847         if (adb_state & 1)
1848         {
1849            adb_send = adb_buffer[adb_datasize];
1850            #if LOG_ADB
1851            printf("Egret ADB: done sending byte %02x, %d left\n", adb_send, adb_datasize);
1852            #endif
1853
1854            adb_datasize--;
1855            adb_timer_ticks = 8;
1856            timer_adjust_oneshot(mac_adb_timer, attotime_make(0, ATTOSECONDS_IN_USEC(100)), 0);
1857
1858            if (adb_datasize == 0)
1859            {
1860               #if LOG_ADB
1861               printf("Egret ADB: this is the last byte, dropping XS\n");
1862               #endif
1863               adb_state &= ~1;
1864            }
1865         }
1866         else
1867         {
1868            #if LOG_ADB
1869            printf("Egret ADB: got command byte %02x\n", adb_command);
1870            #endif
1871            adb_buffer[adb_datasize++] = adb_command;
1872            adb_command = 0;
1873         }
18281874      }
18291875   }
18301876   else
r6435r6436
19101956   }
19111957}
19121958
1959static void mac_egret_response_std(int type, int flag, int cmd)
1960{
1961   adb_send = 0xaa;
1962   adb_buffer[3] = type;
1963   adb_buffer[2] = flag;
1964   adb_buffer[1] = cmd;
1965   adb_state |= 1;
1966   adb_timer_ticks = 8;
1967   adb_datasize = 3;
1968   timer_adjust_oneshot(mac_adb_timer, attotime_make(0, ATTOSECONDS_IN_USEC(100)), 0);
1969}
1970
1971static void mac_egret_response_read_pram(int addr)
1972{
1973   int count = 0x100 - addr;   
1974
1975   adb_datasize = count+3;
1976
1977   adb_buffer[count+3] = 1;
1978   adb_buffer[count+2] = 0;
1979   adb_buffer[count+1] = 7;
1980   while (count)
1981   {
1982      adb_buffer[count] = rtc_ram[addr];
1983      addr++;
1984      count--;
1985   }
1986
1987   adb_send = 0xaa;
1988   adb_state |= 1;
1989   adb_timer_ticks = 8;
1990   timer_adjust_oneshot(mac_adb_timer, attotime_make(0, ATTOSECONDS_IN_USEC(100)), 0);
1991}
1992
1993static void mac_egret_mcu_exec(void)
1994{
1995   switch (adb_buffer[1])
1996   {
1997      case 0x01:   // enable/disable ADB auto-polling
1998         #if LOG_ADB
1999         if (adb_buffer[2])
2000         {
2001            printf("ADB: Egret enable ADB auto-poll\n");
2002         }
2003         else
2004         {
2005            printf("ADB: Egret disable ADB auto-poll\n");
2006         }
2007         #endif
2008
2009         mac_egret_response_std(1, 0, 1);
2010         break;
2011
2012      case 0x07: // read PRAM
2013         #if LOG_ADB
2014         printf("ADB: Egret read PRAM from %x\n", adb_buffer[2]<<8 | adb_buffer[3]);
2015          #endif
2016
2017         mac_egret_response_read_pram(adb_buffer[2]<<8 | adb_buffer[3]);
2018         break;
2019
2020      case 0x0e: // send to DFAC
2021         #if LOG_ADB
2022         printf("ADB: Egret send %02x to DFAC\n", adb_buffer[2]);
2023         #endif
2024
2025         mac_egret_response_std(1, 0, 0x0e);
2026         break;
2027
2028      case 0x1b: // set one-second interrupt
2029         #if LOG_ADB
2030         if (adb_buffer[2])
2031         {
2032            printf("ADB: Egret enable one-second IRQ\n");
2033         }
2034         else
2035         {
2036            printf("ADB: Egret disable one-second IRQ\n");
2037         }
2038         #endif
2039
2040         mac_egret_response_std(1, 0, 0x1b);
2041         break;
2042
2043      case 0x1c:   // enable/disable keyboard NMI
2044         #if LOG_ADB
2045         if (adb_buffer[2])
2046         {
2047            printf("ADB: Egret enable keyboard NMI\n");
2048         }
2049         else
2050         {
2051            printf("ADB: Egret disable keyboard NMI\n");
2052         }
2053         #endif
2054
2055         mac_egret_response_std(1, 0, 0x1c);
2056         break;
2057
2058      default:
2059         #if LOG_ADB
2060         printf("ADB: Unknown Egret MCU command %02x\n", adb_buffer[1]);
2061         #endif
2062         break;
2063   }
2064}
2065
19132066static void mac_egret_newaction(int state)
19142067{
19152068   if (state != adb_state)
19162069   {
19172070      #if LOG_ADB
1918      printf("ADB: New Egret state: SS %d VF %d XS %d\n", (state>>2)&1, (state>>1)&1, state&1);
2071      printf("ADB: New Egret state: SS %d VF %d XS %d\n", (state>>2)&1, (state>>1)&1, adb_state&1);
19192072      #endif
19202073     
1921      // rising edge of VIA bit 5 (bit 2 here) seems to mean the 68k wants to send something
1922      if ((state & 0x04) && !(adb_state & 0x4))
2074      // if bit 2 is high and stays high, the rising edge of bit 1 indicates the start of sending a command
2075      if ((state & 0x04) && (adb_state & 0x04) && (state & 0x02) && !(adb_state & 0x02))
19232076      {
19242077         adb_command = adb_send = 0;
19252078         adb_timer_ticks = 8;
19262079         timer_adjust_oneshot(mac_adb_timer, attotime_make(0, ATTOSECONDS_IN_USEC(100)), 0);
19272080      }
19282081
1929      adb_state = state;
2082      // if bit 2 drops and bit 1 is zero, execute the command
2083      if (!(state & 0x02) && !(state & 0x04) && (adb_state & 0x04) && (adb_datasize))
2084      {
2085         #if LOG_ADB
2086         int i;
2087
2088         printf("ADB: Egret exec command with %d bytes: ", adb_datasize);
2089
2090         for (i = 0; i < adb_datasize; i++)
2091         {
2092            printf("%02x ", adb_buffer[i]);
2093         }
2094
2095         printf("\n");
2096         #endif
2097
2098         // exec command here
2099         switch (adb_buffer[0])
2100         {
2101            case 0:   // ADB command
2102               adb_datasize = 0;
2103               break;
2104
2105            case 1: // general Egret MCU command
2106               mac_egret_mcu_exec();
2107               break;
2108
2109            case 2: // error
2110               adb_datasize = 0;
2111               break;
2112
2113            case 3: // one-second interrupt
2114               adb_datasize = 0;
2115               break;
2116         }
2117      }
2118
2119      adb_state &= ~0x6;
2120      adb_state |= state & 0x6;
19302121   }
19312122}
19322123
r6435r6436
19872178   adb_extclock = 0;
19882179   adb_send = 0;
19892180   adb_waiting_cmd = 0;
1990   adb_state = ADB_STATE_NOTINIT;
2181   if (ADB_IS_BITBANG)
2182   {
2183      adb_state = ADB_STATE_NOTINIT;
2184   }
2185   else if (ADB_IS_EGRET)
2186   {
2187      adb_state = 0;
2188   }
19912189   adb_direction = 0;
19922190   adb_datasize = 0;
19932191   adb_last_talk = -1;
r6435r6436
20502248
20512249   if ((mac_model == MODEL_MAC_CLASSIC) ||
20522250       (mac_model == MODEL_MAC_II) || (mac_model == MODEL_MAC_II_FDHD) ||
2053       (mac_model == MODEL_MAC_IIX))
2251       (mac_model == MODEL_MAC_IIX) || (mac_model == MODEL_MAC_POWERMAC_6100))
20542252   {
20552253      return 0x81;      // bit 0 must be set to avoid attempting to boot from AppleTalk
20562254   }
r6435r6436
20672265
20682266   if (mac_model == MODEL_MAC_IICI)
20692267   {
2070      return 0xc7;   // 0x40 = IIcx/IIci/IIfx/SE30 | 0x06 = IIci
2268      return 0x81 | PA6 | PA2 | PA1;
20712269   }
20722270
20732271   if (mac_model == MODEL_MAC_IISI)
r6435r6436
20772275
20782276   if (mac_model == MODEL_MAC_IIFX)
20792277   {
2080      return 0xc3;   // 0x40 = IIcx/IIci/IIfx/SE30 | 0x02 = IIfx
2278      return 0x81 | PA6 | PA1;
20812279   }
20822280
20832281   if (mac_model == MODEL_MAC_IICX)
20842282   {
2085      return 0xc1;   // 0x40 = IIcx/IIci/IIfx ID bit
2283      return 0x81 | PA6;
20862284   }
20872285
20882286   return 0x80;
r6435r6436
20962294   if (video_screen_get_vpos(device->machine->primary_screen) >= MAC_V_VIS)
20972295      val |= 0x40;
20982296
2099   if ((ADB_IS_BITBANG) || (ADB_IS_EGRET))
2297   if (ADB_IS_BITBANG)
21002298   {
21012299      val |= adb_state<<4;
21022300
r6435r6436
21052303         val |= 0x08;
21062304      }
21072305   }
2306   else if (ADB_IS_EGRET)
2307   {
2308      val |= adb_state<<3;
2309      val ^= 0x08;   // maybe it's reversed?
2310   }
21082311   else
21092312   {
21102313      if (mouse_bit_y)   /* Mouse Y2 */
r6435r6436
21972400   }
21982401   else if (ADB_IS_EGRET)
21992402   {
2200      mac_egret_newaction((data & 0x38) >> 3);
2403      mac_egret_newaction((data & 0x30) >> 3);
22012404   }
22022405}
22032406
r6435r6436
23332536   rtc_init();
23342537
23352538   /* setup the memory overlay */
2539   if (mac_model < MODEL_MAC_POWERMAC_6100)   // no overlay for PowerPC
23362540   set_memory_overlay(machine, 1);
23372541
23382542   /* setup videoram */
r6435r6436
24002604            mac_overlay = -1;
24012605         }
24022606      }
2403      else if ( ((mac_model >= MODEL_MAC_II) && (mac_model <= MODEL_MAC_SE30)) || (mac_model == MODEL_MAC_CLASSIC_II))
2607      else if ( (mac_model == MODEL_MAC_LC_III) || ((mac_model >= MODEL_MAC_II) && (mac_model <= MODEL_MAC_SE30)) || (mac_model == MODEL_MAC_CLASSIC_II))
24042608      {
24052609         if ((address >= 0x40000000) && (address <= 0x4fffffff))
24062610         {
r6435r6436
24282632      mac_install_memory(machine, 0x400000, (model >= MODEL_MAC_PLUS) ? 0x43ffff : 0x5fffff,
24292633         memory_region_length(machine, "user1"), memory_region(machine, "user1"), TRUE, 3);
24302634   }
2431   else if ((model == MODEL_MAC_LC) || (model == MODEL_MAC_LC_II))
2635   else if ((model == MODEL_MAC_LC) || (model == MODEL_MAC_LC_II) || (model == MODEL_MAC_LC_III))
24322636   {
24332637      mac_install_memory(machine, 0x000000, messram_get_size(devtag_get_device(machine, "messram"))-1, messram_get_size(devtag_get_device(machine, "messram")), messram_get_ptr(devtag_get_device(machine, "messram")), FALSE, 2);
24342638   }
r6435r6436
24382642   }
24392643
24402644   set_memory_overlay(machine, 1);
2645   mac_overlay = 1;
24412646
2647   memset(messram_get_ptr(devtag_get_device(machine, "messram")), 0, messram_get_size(devtag_get_device(machine, "messram")));
2648
24422649   if ((model == MODEL_MAC_SE) || (model == MODEL_MAC_CLASSIC) || (model == MODEL_MAC_CLASSIC_II) || (model == MODEL_MAC_LC) ||
2443       (model == MODEL_MAC_LC_II) || ((mac_model >= MODEL_MAC_II) && (mac_model <= MODEL_MAC_SE30)))
2650       (model == MODEL_MAC_LC_II) || (model == MODEL_MAC_LC_III) || ((mac_model >= MODEL_MAC_II) && (mac_model <= MODEL_MAC_SE30)))
24442651   {
2445      // classic will fail RAM test and try to boot appletalk if RAM is not all zero
2446      memset(messram_get_ptr(devtag_get_device(machine, "messram")), 0, messram_get_size(devtag_get_device(machine, "messram")));
2447
24482652      memory_set_direct_update_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), overlay_opbaseoverride);
2449      mac_overlay = 1;
24502653   }
24512654
24522655   /* setup keyboard */
r6435r6436
25252728   mac_driver_init(machine, MODEL_MAC_LC_II);
25262729}
25272730
2731DRIVER_INIT(maclc3)
2732{
2733   mac_driver_init(machine, MODEL_MAC_LC_III);
2734}
2735
25282736// make the appletalk init fail instead of hanging on the II FDHD/IIx/IIcx/SE30 ROM
25292737static void patch_appletalk_iix(running_machine *machine)
25302738{
r6435r6436
25852793   mac_driver_init(machine, MODEL_MAC_CLASSIC_II);
25862794}
25872795
2796DRIVER_INIT(macpm6100)
2797{
2798   mac_driver_init(machine, MODEL_MAC_POWERMAC_6100);
2799}
2800
25882801void mac_nubus_slot_interrupt(running_machine *machine, UINT8 slot, UINT32 state)
25892802{
25902803   UINT8 masks[6] = { 0x1, 0x2, 0x4, 0x8, 0x10, 0x20 };
25912804
25922805   // NuBus slot must be 9 through E
2593   assert((slot < 9) || (slot > 0xe));
2806   assert((slot >= 9) && (slot <= 0xe));
25942807
25952808   slot -= 9;
25962809
src/mess/drivers/mac.c
r6435r6436
3535           PB_EXT  from mouse Y circuitry
3636           PA_EXT  from mouse X circuitry
3737
38LC ram sizer: a46576, stores size at 7ffc
39
4038****************************************************************************/
4139
4240#include "driver.h"
4341#include "cpu/m68000/m68000.h"
42#include "cpu/powerpc/ppc.h"
4443#include "includes/mac.h"
4544#include "machine/6522via.h"
4645#include "machine/ncr5380.h"
r6435r6436
336335   return 0;
337336}
338337
338// LC III "Sonora" video
339
340static UINT8 sonora_regs[256];
341static UINT32 sonora_colors[3], sonora_count, sonora_clutoffs;
342static UINT32 sonora_palette[256];
343
344static READ16_HANDLER ( mac_sonora_r )
345{
346   int data, viaoffs;
347   const device_config *via_1 = devtag_get_device(space->machine, "via6522_1");
348
349   printf("sonora_r: %x, mask %x (PC %x)\n", offset*2, mem_mask, cpu_get_pc(space->cpu));
350
351   viaoffs = (offset >> 8) & 0x0f;
352
353   switch (offset)
354   {
355      case 0:
356         data = via_r(via_1, viaoffs);
357         return (data<<8) | sonora_regs[0];
358
359      default:
360         data = via_r(via_1, viaoffs);
361         return (data<<8)|data;
362   }
363
364}
365
366static WRITE16_HANDLER ( mac_sonora_w )
367{
368   const device_config *via_1 = devtag_get_device(space->machine, "via6522_1");
369   int viaoffs;
370
371   printf("sonora_w: %x to offset %x, mask %x (PC %x)\n", data, offset*2, mem_mask, cpu_get_pc(space->cpu));
372
373   viaoffs = (offset >> 8) & 0x0f;
374
375   switch (offset)
376   {
377      case 0:
378         if (ACCESSING_BITS_8_15)
379         {
380            via_w(via_1, viaoffs, (data >> 8) & 0xff);
381         }
382         else
383         {
384            sonora_regs[0] = data&0xe7;
385         }
386         break;
387
388      default:
389         if (ACCESSING_BITS_8_15)
390         {
391            via_w(via_1, viaoffs, (data >> 8) & 0xff);
392         }
393         break;
394   }
395}
396
397static WRITE32_HANDLER( mac_sonora_ramdac_w )
398{
399   if (mem_mask == 0xff000000)
400   {
401      sonora_clutoffs = data>>24;
402      sonora_count = 0;
403   }
404   else if (mem_mask == 0x00ff0000)
405   {
406      sonora_colors[sonora_count++] = data>>16;
407
408      if (sonora_count == 3)
409      {
410         sonora_count = 0;
411         palette_set_color(space->machine, sonora_clutoffs, MAKE_RGB(sonora_colors[0], sonora_colors[1], sonora_colors[2]));
412         sonora_palette[sonora_clutoffs] = MAKE_RGB(sonora_colors[0], sonora_colors[1], sonora_colors[2]);
413         sonora_clutoffs++;
414      }
415   }
416}
417
418static VIDEO_START( macsonora )
419{
420   memset(sonora_regs, 0, sizeof(sonora_regs));
421
422   sonora_regs[1] = 0x6;   // set init value
423}
424
425static VIDEO_UPDATE( macsonora )
426{
427   return 0;
428}
429
430static READ32_HANDLER(mac_lc3_id)
431{
432   printf("Sonora ID register read, PC=%x\n", cpu_get_pc(space->cpu));
433
434   return 0xa55a0001;   // 25 MHz LC III
435}
436
339437/***************************************************************************
340438    ADDRESS MAPS
341439***************************************************************************/
r6435r6436
374472   AM_RANGE(0x50f24000, 0x50f24003) AM_WRITE(mac_v8_ramdac_w)
375473   AM_RANGE(0x50f26000, 0x50f27fff) AM_READWRITE16(mac_v8_r, mac_v8_w, 0xffffffff)   // VIA2 (V8)
376474
475   AM_RANGE(0x50f40000, 0x50fbffff) AM_RAM   // V8 VRAM
476ADDRESS_MAP_END
477
478static ADDRESS_MAP_START(maclc3_map, ADDRESS_SPACE_PROGRAM, 32)
479   AM_RANGE(0x40000000, 0x4003ffff) AM_ROM AM_REGION("user1", 0) AM_MIRROR(0x0ffc0000)
480
481   AM_RANGE(0x50f00000, 0x50f01fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff)
482   AM_RANGE(0x50f04000, 0x50f05fff) AM_READWRITE16(mac_scc_r, mac_scc_2_w, 0xffffffff)
483   // 50f06000-7fff = SCSI handshake
484
485   // 50f10000-1fff = SCSI
486   // 50f12000-3fff = SCSI DMA
487   AM_RANGE(0x50f14000, 0x50f15fff) AM_READ8(mac_asc_r, 0xffffffff) AM_WRITE8(mac_asc_w, 0xffffffff)
488   AM_RANGE(0x50f16000, 0x50f17fff) AM_READ(mac_swim_r) AM_WRITENOP
489   // 50f18000-9fff = PWMs
490
491   // 50f24000-5fff = VDAC (palette)
492   AM_RANGE(0x50f24000, 0x50f24003) AM_WRITE(mac_sonora_ramdac_w)
493   AM_RANGE(0x50f26000, 0x50f27fff) AM_READWRITE16(mac_sonora_r, mac_sonora_w, 0xffffffff)   // VIA2 (Sonora)
494
495   AM_RANGE(0x5ffffffc, 0x5fffffff) AM_READ(mac_lc3_id)
496
377497   AM_RANGE(0xfeff8000, 0xfeffffff) AM_ROM AM_REGION("user1", 0x78000)
378498ADDRESS_MAP_END
379499
r6435r6436
485605   AM_RANGE(0x50f16000, 0x50f17fff) AM_READ(mac_swim_r) AM_WRITENOP
486606
487607   AM_RANGE(0x50f40000, 0x50f41fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff)   // mirror
608ADDRESS_MAP_END
488609
489   // mirror video declaration ROM
490   AM_RANGE(0xfeff8000, 0xfeffffff) AM_ROM AM_REGION("user1", 0x78000)
610static ADDRESS_MAP_START(pwrmac_map, ADDRESS_SPACE_PROGRAM, 64)
611   AM_RANGE(0x40000000, 0x4003ffff) AM_ROM AM_REGION("user1", 0) AM_MIRROR(0x0ffc0000)
612
613   // MMU remaps I/O without the F
614   AM_RANGE(0x50000000, 0x50001fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffffffffffff)
615   AM_RANGE(0x50002000, 0x50003fff) AM_READWRITE16(mac_via2_r, mac_via2_w, 0xffffffffffffffff)
616   AM_RANGE(0x50004000, 0x50005fff) AM_READWRITE16(mac_scc_r, mac_scc_2_w, 0xffffffffffffffff)
617   AM_RANGE(0x50006000, 0x50006007) AM_WRITE32(macii_scsi_drq_w,0xffffffffffffffff)
618   AM_RANGE(0x50006060, 0x50006067) AM_READ32(macii_scsi_drq_r,0xffffffffffffffff)
619   AM_RANGE(0x50010000, 0x50011fff) AM_READWRITE16(macplus_scsi_r, macii_scsi_w, 0xffffffffffffffff)
620   AM_RANGE(0x50012060, 0x50012067) AM_READ32(macii_scsi_drq_r,0xffffffffffffffff)
621   AM_RANGE(0x50014000, 0x50015fff) AM_READWRITE8(mac_asc_r, mac_asc_w, 0xffffffffffffffff)
622   AM_RANGE(0x50016000, 0x50017fff) AM_READWRITE16(mac_iwm_r, mac_iwm_w, 0xffffffffffffffff)
623
624   AM_RANGE(0x50f00000, 0x50f01fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffffffffffff)
625   AM_RANGE(0x50f02000, 0x50f03fff) AM_READWRITE16(mac_via2_r, mac_via2_w, 0xffffffffffffffff)
626   AM_RANGE(0x50f04000, 0x50f05fff) AM_READWRITE16(mac_scc_r, mac_scc_2_w, 0xffffffffffffffff)
627   AM_RANGE(0x50f06000, 0x50f06007) AM_WRITE32(macii_scsi_drq_w,0xffffffffffffffff)
628   AM_RANGE(0x50f06060, 0x50f06067) AM_READ32(macii_scsi_drq_r,0xffffffffffffffff)
629
630   AM_RANGE(0x50f10000, 0x50f11fff) AM_READWRITE16(macplus_scsi_r, macii_scsi_w, 0xffffffff)
631   AM_RANGE(0x50f12060, 0x50f12067) AM_READ32(macii_scsi_drq_r,0xffffffffffffffff)
632   AM_RANGE(0x50f14000, 0x50f15fff) AM_READ8(mac_asc_r, 0xffffffff) AM_WRITE8(mac_asc_w, 0xffffffff)
633   AM_RANGE(0x50f16000, 0x50f17fff) AM_READWRITE16(mac_iwm_r, mac_iwm_w, 0xffffffff)
634
635   AM_RANGE(0x50f40000, 0x50f41fff) AM_READWRITE16(mac_via_r, mac_via_w, 0xffffffff)   // mirror
636
637//   AM_RANGE(0xff000000, 0xff3fffff) AM_ROM AM_REGION("user1", 0)
638//   AM_RANGE(0xff400000, 0xff7fffff) AM_ROM AM_REGION("user1", 0)
639//   AM_RANGE(0xff800000, 0xffbfffff) AM_ROM AM_REGION("user1", 0)
640   AM_RANGE(0xffc00000, 0xffffffff) AM_ROM AM_REGION("user1", 0)
491641ADDRESS_MAP_END
492642
493643/***************************************************************************
r6435r6436
671821   /* internal ram */
672822   MDRV_RAM_ADD("messram")
673823   MDRV_RAM_DEFAULT_SIZE("2M")
674   MDRV_RAM_EXTRA_OPTIONS("4M,6M,8M,10M")   
824   MDRV_RAM_EXTRA_OPTIONS("8M,12M,16M,20M")
675825MACHINE_DRIVER_END
676826
677827static MACHINE_DRIVER_START( maclc )
r6435r6436
684834
685835   MDRV_VIDEO_START(maclc)
686836   MDRV_VIDEO_UPDATE(maclc)
837
838   MDRV_RAM_MODIFY("messram")
839   MDRV_RAM_DEFAULT_SIZE("2M")
840   MDRV_RAM_EXTRA_OPTIONS("4M,6M,8M,10M")   
687841MACHINE_DRIVER_END
688842
843static MACHINE_DRIVER_START( maclc2 )
844   MDRV_IMPORT_FROM(maclc)
845
846   MDRV_CPU_REPLACE("maincpu", M68030, 7833600*2)
847   MDRV_CPU_PROGRAM_MAP(maclc_map)
848
849   MDRV_RAM_MODIFY("messram")
850   MDRV_RAM_DEFAULT_SIZE("4M")
851   MDRV_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M")   
852MACHINE_DRIVER_END
853
854static MACHINE_DRIVER_START( maclc3 )
855   MDRV_IMPORT_FROM(maclc)
856
857   MDRV_CPU_REPLACE("maincpu", M68030, 25000000)
858   MDRV_CPU_PROGRAM_MAP(maclc3_map)
859
860   MDRV_VIDEO_START(macsonora)
861   MDRV_VIDEO_UPDATE(macsonora)
862
863   MDRV_RAM_MODIFY("messram")
864   MDRV_RAM_DEFAULT_SIZE("4M")
865   MDRV_RAM_EXTRA_OPTIONS("8M,12M,16M,20M,24M,28M,32M,36M")   
866MACHINE_DRIVER_END
867
689868static MACHINE_DRIVER_START( maciix )
690869   MDRV_IMPORT_FROM( macii )
691870
692871   MDRV_CPU_REPLACE("maincpu", M68030, 7833600*2)
693872   MDRV_CPU_PROGRAM_MAP(macii_map)
873
874   MDRV_RAM_MODIFY("messram")
875   MDRV_RAM_DEFAULT_SIZE("2M")
876   MDRV_RAM_EXTRA_OPTIONS("8M,16M,32M,48M,64M,96M,128M")
694877MACHINE_DRIVER_END
695878
696879static MACHINE_DRIVER_START( macse30 )
r6435r6436
748931   /* internal ram */
749932   MDRV_RAM_ADD("messram")
750933   MDRV_RAM_DEFAULT_SIZE("2M")
751   MDRV_RAM_EXTRA_OPTIONS("4M,6M,8M,10M")     
934   MDRV_RAM_EXTRA_OPTIONS("8M,16M,32M,48M,64M,96M,128M")
752935MACHINE_DRIVER_END
753936
754937static MACHINE_DRIVER_START( macclas2 )
755   MDRV_IMPORT_FROM( macse30 )
938   MDRV_IMPORT_FROM( maclc )
756939
757940   MDRV_CPU_REPLACE("maincpu", M68030, 7833600*2)
758941   MDRV_CPU_PROGRAM_MAP(macclas2_map)
759942
760943   MDRV_VIDEO_START(maclc)
761944   MDRV_VIDEO_UPDATE(maclc)
762   
763   /* internal ram */
764   MDRV_RAM_MODIFY("messram")
765   MDRV_RAM_DEFAULT_SIZE("4M")
766   MDRV_RAM_EXTRA_OPTIONS("6M,8M,10M")   
767945MACHINE_DRIVER_END
768946
769static MACHINE_DRIVER_START( maclc2 )
770   MDRV_IMPORT_FROM( maclc )
771
772   /* internal ram */
773   MDRV_RAM_MODIFY("messram")
774   MDRV_RAM_DEFAULT_SIZE("4M")
775   MDRV_RAM_EXTRA_OPTIONS("6M,8M,10M")   
776MACHINE_DRIVER_END
777
778947static MACHINE_DRIVER_START( maciici )
779948   MDRV_IMPORT_FROM( macii )
780949
r6435r6436
788957   
789958   /* internal ram */
790959   MDRV_RAM_MODIFY("messram")
791   MDRV_RAM_DEFAULT_SIZE("4M")
792   MDRV_RAM_EXTRA_OPTIONS("6M,8M,10M")   
960   MDRV_RAM_DEFAULT_SIZE("2M")
961   MDRV_RAM_EXTRA_OPTIONS("4M,8M,16M,32M,48M,64M")
793962MACHINE_DRIVER_END
794963
795964static MACHINE_DRIVER_START( maciisi )
r6435r6436
805974   
806975   /* internal ram */
807976   MDRV_RAM_MODIFY("messram")
808   MDRV_RAM_DEFAULT_SIZE("4M")
809   MDRV_RAM_EXTRA_OPTIONS("6M,8M,10M")     
977   MDRV_RAM_DEFAULT_SIZE("2M")
978   MDRV_RAM_EXTRA_OPTIONS("4M,8M,16M,32M,48M,64M")
810979MACHINE_DRIVER_END
811980
981static MACHINE_DRIVER_START( pwrmac )
982   /* basic machine hardware */
983   MDRV_CPU_ADD("maincpu", PPC601, 66000000)
984   MDRV_CPU_PROGRAM_MAP(pwrmac_map)
985
986   MDRV_SCREEN_ADD("screen", RASTER)
987   // dot clock, htotal, hstart, hend, vtotal, vstart, vend
988   MDRV_SCREEN_RAW_PARAMS(25175000, 800, 0, 640, 525, 0, 480)
989
990   MDRV_MACHINE_START(macscsi)
991   MDRV_MACHINE_RESET(mac)
992
993        /* video hardware */
994   MDRV_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
995   MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32)
996   MDRV_SCREEN_SIZE(1024, 768)
997   MDRV_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1)
998   MDRV_PALETTE_LENGTH(256)
999
1000   MDRV_VIDEO_START(maclc)
1001   MDRV_VIDEO_UPDATE(maclc)
1002
1003   /* sound hardware */
1004   MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
1005   MDRV_SOUND_ADD("ascal", DMADAC, 0)
1006   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
1007   MDRV_SOUND_ADD("ascar", DMADAC, 0)
1008   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
1009   MDRV_SOUND_ADD("ascbl", DMADAC, 0)
1010   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0)
1011   MDRV_SOUND_ADD("ascbr", DMADAC, 0)
1012   MDRV_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0)
1013
1014   /* nvram */
1015   MDRV_NVRAM_HANDLER(mac)
1016
1017   /* devices */
1018   MDRV_IWM_ADD("fdc", mac_iwm_interface)
1019   MDRV_FLOPPY_SONY_2_DRIVES_ADD(mac_floppy_config)
1020   
1021   MDRV_SCC8530_ADD("scc")
1022   MDRV_SCC8530_ACK(mac_scc_ack)
1023   MDRV_VIA6522_ADD("via6522_0", 1000000, mac_via6522_intf)
1024
1025   MDRV_DEVICE_REMOVE("via6522_0")
1026   MDRV_VIA6522_ADD("via6522_0", 1000000, mac_via6522_adb_intf)
1027   MDRV_VIA6522_ADD("via6522_1", 1000000, mac_via6522_2_intf)
1028
1029   MDRV_HARDDISK_ADD( "harddisk1" )
1030   MDRV_HARDDISK_ADD( "harddisk2" )
1031   
1032   /* internal ram */
1033   MDRV_RAM_ADD("messram")
1034   MDRV_RAM_DEFAULT_SIZE("8M")
1035   MDRV_RAM_EXTRA_OPTIONS("16M,32M,64M,128M")
1036MACHINE_DRIVER_END
1037
8121038static INPUT_PORTS_START( macplus )
8131039   PORT_START("MOUSE0") /* Mouse - button */
8141040   PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Mouse Button") PORT_CODE(MOUSECODE_BUTTON1)
r6435r6436
9491175   PORT_START("MOUSE2") /* Mouse - Y AXIS */
9501176   PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1)
9511177
952   /* R Nabet 000531 : pseudo-input ports with keyboard layout */
953   /* we only define US layout for keyboard - international layout is different! */
954   /* note : 16 bits at most per port! */
1178        /* This handles the standard (not Extended) Apple ADB keyboard, which is similar to the IIgs's */
1179   /* main keyboard */
9551180
956   /* main keyboard pad */
957
9581181   PORT_START("KEY0")
9591182   PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A')
9601183   PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S')
r6435r6436
11801403   ROM_LOAD( "35c28f5f.rom", 0x000000, 0x080000, CRC(a92145b3) SHA1(d5786182b62a8ffeeb9fd3f80b5511dba70318a0) )
11811404ROM_END
11821405
1406ROM_START( maclc3 )
1407   ROM_REGION32_BE(0x100000, "user1", 0)
1408        ROM_LOAD( "ecbbc41c.rom", 0x000000, 0x100000, CRC(e578f5f3) SHA1(c77df3220c861f37a2c553b6ee9241b202dfdffc) )
1409ROM_END
1410
1411ROM_START( pmac6100 )
1412   ROM_REGION64_BE(0x400000, "user1", 0)
1413        ROM_LOAD( "9feb69b3.rom", 0x000000, 0x400000, CRC(a43fadbc) SHA1(6fac1c4e920a077c077b03902fef9199d5e8f2c3) )
1414ROM_END
1415
11831416/*    YEAR  NAME      PARENT    COMPAT  MACHINE   INPUT     INIT    CONFIG   COMPANY        FULLNAME */
11841417COMP( 1984, mac128k,  0,    0,   mac128k,  macplus,  mac128k512k, 0,     "Apple Computer", "Macintosh 128k",  GAME_NOT_WORKING )
11851418COMP( 1984, mac512k,  mac128k,  0,   mac512ke, macplus,  mac128k512k, 0,     "Apple Computer", "Macintosh 512k",  GAME_NOT_WORKING )
r6435r6436
11891422COMP( 1987, macsefd,  0,   0,   macse,    macadb,   macse,    0,     "Apple Computer", "Macintosh SE (FDHD)",  0 )
11901423COMP( 1987, macii,    0,   0,   macii,    macadb,   macii,    0,     "Apple Computer", "Macintosh II",  GAME_NOT_WORKING )
11911424COMP( 1988, mac2fdhd, 0,   0,   macii,    macadb,   maciifdhd,    0,     "Apple Computer", "Macintosh II (FDHD)",  GAME_NOT_WORKING )
1192COMP( 1988, maciix,   mac2fdhd, 0,   maciix,   macadb,   maciix,    0,     "Apple Computer", "Macintosh IIx",  GAME_NOT_WORKING )
1193COMP( 1989, macse30,  mac2fdhd, 0,   macse30,  macadb,   macse30,    0,     "Apple Computer", "Macintosh SE/30",  GAME_NOT_WORKING )
1194COMP( 1989, maciicx,  mac2fdhd, 0,   maciix,   macadb,   maciicx,    0,     "Apple Computer", "Macintosh IIcx",  GAME_NOT_WORKING )
1425COMP( 1988, maciix,   mac2fdhd, 0,   maciix,   macadb,   maciix,    0,     "Apple Computer", "Macintosh IIx",  0 )
1426COMP( 1989, macse30,  mac2fdhd, 0,   macse30,  macadb,   macse30,    0,     "Apple Computer", "Macintosh SE/30",  0 )
1427COMP( 1989, maciicx,  mac2fdhd, 0,   maciix,   macadb,   maciicx,    0,     "Apple Computer", "Macintosh IIcx",  0 )
11951428COMP( 1989, maciici,  0,   0,   maciici,  macadb,   maciici,    0,     "Apple Computer", "Macintosh IIci",  GAME_NOT_WORKING )
11961429COMP( 1990, macclasc, 0,   0,   macse,    macadb,   macclassic,    0,     "Apple Computer", "Macintosh Classic",  GAME_NOT_WORKING )
11971430COMP( 1990, maclc,    0,   0,   maclc,    macadb,   maclc,    0,     "Apple Computer", "Macintosh LC",  GAME_NOT_WORKING )
11981431COMP( 1990, maciisi,  0,   0,   maciisi,  macadb,   maciici,    0,     "Apple Computer", "Macintosh IIsi",  GAME_NOT_WORKING )
11991432COMP( 1991, macclas2, 0,   0,   macclas2, macadb,   macclassic2, 0,     "Apple Computer", "Macintosh Classic II",  GAME_NOT_WORKING )
12001433COMP( 1991, maclc2,   0,   0,   maclc2,   macadb,   maclc2,    0,     "Apple Computer", "Macintosh LC II",  GAME_NOT_WORKING )
1434COMP( 1993, maclc3,   0,   0,   maclc3,   macadb,   maclc3,    0,     "Apple Computer", "Macintosh LC III",  GAME_NOT_WORKING )
1435COMP( 1994, pmac6100, 0,   0,   pwrmac,   macadb,   macpm6100,    0,     "Apple Computer", "Power Macintosh 6100",  GAME_NOT_WORKING )
1436

Previous 15994 Revisions Next


© 1998-2018 The MESS Team