ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/rom_patches.cpp
(Generate patch)

Comparing BasiliskII/src/rom_patches.cpp (file contents):
Revision 1.11 by cebix, 1999-10-27T16:59:38Z vs.
Revision 1.15 by cebix, 2000-07-22T16:07:17Z

# Line 1 | Line 1
1   /*
2   *  rom_patches.cpp - ROM patches
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2000 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 47 | Line 47 | bool PrintROMInfo = false;     // Flag: prin
47   static uint32 sony_offset;                              // ROM offset of .Sony driver
48   static uint32 serd_offset;                              // ROM offset of SERD resource (serial drivers)
49   static uint32 microseconds_offset;              // ROM offset of Microseconds() replacement routine
50 static uint32 memory_dispatch_offset;   // ROM offset of MemoryDispatch() replacement routine
50  
51   // Prototypes
52   uint16 ROMVersion;
# Line 82 | Line 81 | static uint32 find_rom_resource(uint32 s
81  
82          if (!cont)
83                  rsrc_ptr = x;
84 +        else
85 +                rsrc_ptr = ReadMacInt32(ROMBaseMac + rsrc_ptr + 8);
86  
87          for (;;) {
88                  lp = ROMBaseMac + rsrc_ptr;
# Line 269 | Line 270 | static void list_universal_infos(void)
270                                  printf("Universal Table at %08x:\n", q);
271                                  printf("Offset\t ID\tHWCfg\tROM85\tModel\n");
272                                  printf("------------------------------------------------\n");
273 <                                while (ofs = ReadMacInt32(ROMBaseMac + q)) {
273 >                                while ((ofs = ReadMacInt32(ROMBaseMac + q))) {
274                                          print_universal_info(ROMBaseMac + ofs + q);
275                                          q += 4;
276                                  }
# Line 692 | Line 693 | static const uint8 adbop_patch[] = {   //
693  
694   void InstallDrivers(uint32 pb)
695   {
696 <        D(bug("InstallDrivers\n"));
696 >        D(bug("InstallDrivers, pb %08x\n", pb));
697          M68kRegisters r;
698  
699          // Install Microseconds() replacement routine
# Line 700 | Line 701 | void InstallDrivers(uint32 pb)
701          r.d[0] = 0xa093;
702          Execute68kTrap(0xa247, &r);             // SetOSTrapAddress()
703  
703        // Install MemoryDispatch() replacement routine
704        r.a[0] = ROMBaseMac + memory_dispatch_offset;
705        r.d[0] = 0xa05c;
706        Execute68kTrap(0xa247, &r);             // SetOSTrapAddress()
707
704          // Install disk driver
705          r.a[0] = ROMBaseMac + sony_offset + 0x100;
706          r.d[0] = (uint32)DiskRefNum;
# Line 1219 | Line 1215 | static bool patch_rom_32(void)
1215   #endif
1216  
1217   #if !ROM_IS_WRITE_PROTECTED
1218 < #if defined(AMIGA)
1218 > #if defined(AMIGA) || defined(__NetBSD__)
1219          // Set fake handle at 0x0000 to scratch memory area (so broken Mac programs won't write into Mac ROM)
1220          extern uint32 ScratchMem;
1221          wp = (uint16 *)(ROMBaseHost + 0xccaa);
# Line 1459 | Line 1455 | static bool patch_rom_32(void)
1455          static const uint8 memdisp_dat[] = {0x30, 0x3c, 0xa8, 0x9f, 0xa7, 0x46, 0x30, 0x3c, 0xa0, 0x5c, 0xa2, 0x47};
1456          base = find_rom_data(0x4f100, 0x4f180, memdisp_dat, sizeof(memdisp_dat));
1457          D(bug("memdisp %08lx\n", base));
1458 <        if (base) {     // ROM15/32
1458 >        if (base) {     // ROM15/22/23/26/27/32
1459                  wp = (uint16 *)(ROMBaseHost + base + 10);
1460                  *wp = htons(M68K_NOP);
1461          }
1462  
1463          // Patch .EDisk driver (don't scan for EDisks in the area ROMBase..0xe00000)
1464 <        uint32 edisk_offset = find_rom_resource('DRVR', 51);
1464 >        uint32 edisk_offset = find_rom_resource(FOURCC('D','R','V','R'), 51);
1465          if (edisk_offset) {
1466                  static const uint8 edisk_dat[] = {0xd5, 0xfc, 0x00, 0x01, 0x00, 0x00, 0xb5, 0xfc, 0x00, 0xe0, 0x00, 0x00};
1467                  base = find_rom_data(edisk_offset, edisk_offset + 0x10000, edisk_dat, sizeof(edisk_dat));
# Line 1478 | Line 1474 | static bool patch_rom_32(void)
1474          }
1475  
1476          // Replace .Sony driver
1477 <        sony_offset = find_rom_resource('DRVR', 4);
1477 >        sony_offset = find_rom_resource(FOURCC('D','R','V','R'), 4);
1478          D(bug("sony %08lx\n", sony_offset));
1479          memcpy(ROMBaseHost + sony_offset, sony_driver, sizeof(sony_driver));
1480  
# Line 1497 | Line 1493 | static bool patch_rom_32(void)
1493          memcpy(ROMBaseHost + sony_offset + 0xa00, CDROMIcon, sizeof(CDROMIcon));
1494  
1495          // Install SERD patch and serial drivers
1496 <        serd_offset = find_rom_resource('SERD', 0);
1496 >        serd_offset = find_rom_resource(FOURCC('S','E','R','D'), 0);
1497          D(bug("serd %08lx\n", serd_offset));
1498          wp = (uint16 *)(ROMBaseHost + serd_offset + 12);
1499          *wp++ = htons(M68K_EMUL_OP_SERD);
# Line 1565 | Line 1561 | static bool patch_rom_32(void)
1561          *wp++ = htons(base >> 16);
1562          *wp = htons(base & 0xffff);
1563  
1568        // Install MemoryDispatch() replacement routine (activated in PatchAfterStartup())
1569        memory_dispatch_offset = sony_offset + 0xc20;
1570        wp = (uint16 *)(ROMBaseHost + memory_dispatch_offset);
1571        *wp++ = htons(M68K_EMUL_OP_MEMORY_DISPATCH);
1572        *wp = htons(M68K_RTS);
1573
1564   #if EMULATED_68K
1565          // Replace BlockMove()
1566          wp = (uint16 *)(ROMBaseHost + find_rom_trap(0xa02e));   // BlockMove()
# Line 1579 | Line 1569 | static bool patch_rom_32(void)
1569          *wp = htons(M68K_RTS);
1570   #endif
1571  
1572 +        // Look for double PACK 4 resources
1573 +        if ((base = find_rom_resource(FOURCC('P','A','C','K'), 4)) == 0) return false;
1574 +        if ((base = find_rom_resource(FOURCC('P','A','C','K'), 4, true)) == 0 && FPUType == 0)
1575 +                printf("WARNING: This ROM seems to require an FPU\n");
1576 +
1577          // Patch VIA interrupt handler
1578          wp = (uint16 *)(ROMBaseHost + 0x9bc4);  // Level 1 handler
1579          *wp++ = htons(0x7002);          // moveq        #2,d0 (always 60Hz interrupt)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines