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

Comparing BasiliskII/src/cdrom.cpp (file contents):
Revision 1.7 by cebix, 2000-07-22T16:07:15Z vs.
Revision 1.9 by cebix, 2000-07-25T15:19:39Z

# Line 185 | Line 185 | static void find_hfs_partition(DriveInfo
185                  if (Sys_read(info->fh, map, i * 512, 512) != 512)
186                          break;
187  
188 <                // Skip driver descriptor
189 <                uint16 sig = ntohs(((uint16 *)map)[0]);
190 <                if (sig == 0x4552)
191 <                        continue;
192 <
193 <                // No partition map? Then look at next block
188 >                // Not a partition map block? Then look at next block
189 >                uint16 sig = (map[0] << 8) | map[1];
190                  if (sig != 0x504d)
191                          continue;
192  
193 <                // Partition map found, Apple HFS partition?
193 >                // Partition map block found, Apple HFS partition?
194                  if (strcmp((char *)(map + 48), "Apple_HFS") == 0) {
195                          info->start_byte = ntohl(((uint32 *)map)[2]) << 9;
196                          D(bug(" HFS partition found at %d, %d blocks\n", info->start_byte, ntohl(((uint32 *)map)[3])));
# Line 878 | Line 874 | int16 CDROMStatus(uint32 pb, uint32 dce)
874                                          WriteMacInt32(pb + csParam + 4, FOURCC('c','d','r','m'));
875                                          break;
876                                  case FOURCC('i','n','t','f'):   // Interface type
877 <                                        WriteMacInt32(pb + csParam + 4, FOURCC('b','a','s','i'));
877 >                                        WriteMacInt32(pb + csParam + 4, EMULATOR_ID_4);
878                                          break;
879                                  case FOURCC('s','y','n','c'):   // Only synchronous operation?
880                                          WriteMacInt32(pb + csParam + 4, 0x01000000);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines