Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2025-01-11 10:30:09 +00:00
Code Issues Projects Releases Wiki Activity

- fixed compilation problems

Browse Source
This commit is contained in:
cebix 2000-07-14 21:42:06 +00:00
parent de3164ecc0
commit b244cfb633
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/extfs.cpp
View File

@ -120,7 +120,7 @@ const int STACK_SIZE = 0x10000;
// Allocation block and clump size as reported to MacOS (these are of course // Allocation block and clump size as reported to MacOS (these are of course
// not the real values and have no meaning on the host OS) // not the real values and have no meaning on the host OS)
const int ALBLK_SIZE = 0x4000; const int AL_BLK_SIZE = 0x4000;
const int CLUMP_SIZE = 0x4000; const int CLUMP_SIZE = 0x4000;
// Drive number of our pseudo-drive // Drive number of our pseudo-drive
@ -1002,7 +1002,7 @@ static int16 fs_volume_mount(uint32 pb)
WriteMacInt16(vcb + vcbNmRtDirs, 1); //!! WriteMacInt16(vcb + vcbNmRtDirs, 1); //!!
WriteMacInt16(vcb + vcbNmAlBlks, 0xffff); //!! WriteMacInt16(vcb + vcbNmAlBlks, 0xffff); //!!
WriteMacInt32(vcb + vcbAlBlkSiz, AL_BLK_SIZE); WriteMacInt32(vcb + vcbAlBlkSiz, AL_BLK_SIZE);
WriteMacInt32(vcb + vcbClpSiz, CLUMPSIZE); WriteMacInt32(vcb + vcbClpSiz, CLUMP_SIZE);
WriteMacInt32(vcb + vcbNxtCNID, next_cnid); WriteMacInt32(vcb + vcbNxtCNID, next_cnid);
WriteMacInt16(vcb + vcbFreeBks, 0xffff); //!! WriteMacInt16(vcb + vcbFreeBks, 0xffff); //!!
Host2Mac_memcpy(vcb + vcbVN, VOLUME_NAME, 28); Host2Mac_memcpy(vcb + vcbVN, VOLUME_NAME, 28);

4
BasiliskII/src/include/macos_util.h
View File

@ -21,6 +21,8 @@
#ifndef MACOS_UTIL_H #ifndef MACOS_UTIL_H
#define MACOS_UTIL_H #define MACOS_UTIL_H
#include "cpu_emulation.h"
/* /*
* Queues * Queues
@ -249,7 +251,7 @@ extern int FindFreeDriveNumber(int num); // Find first free drive number, star
extern void MountVolume(void *fh); // Mount volume with given file handle (see sys.h) extern void MountVolume(void *fh); // Mount volume with given file handle (see sys.h)
extern void FileDiskLayout(loff_t size, uint8 *data, loff_t &start_byte, loff_t &real_size); // Calculate disk image file layout given file size and first 256 data bytes extern void FileDiskLayout(loff_t size, uint8 *data, loff_t &start_byte, loff_t &real_size); // Calculate disk image file layout given file size and first 256 data bytes
// Test if basic MacOS initializations are done // Test if basic MacOS initializations (of the ROM) are done
static inline bool HasMacStarted(void) static inline bool HasMacStarted(void)
{ {
return ReadMacInt32(0xcfc) == 'WLSC'; // Mac warm start flag return ReadMacInt32(0xcfc) == 'WLSC'; // Mac warm start flag

10
BasiliskII/src/macos_util.cpp
View File

@ -85,16 +85,6 @@ void MountVolume(void *fh)
} }
/*
* Test if basic MacOS initializations (of the ROM) are done
*/
bool HasMacStarted(void)
{
return ReadMacInt32(0xcfc) == 'WLSC'; // Mac warm start flag
}
/* /*
* Calculate disk image file layout given file size and first 256 data bytes * Calculate disk image file layout given file size and first 256 data bytes
*/ */