Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #120 from asvitkine/fix_warnings 

Fix some compile warnings with Xcode project build.
This commit is contained in:
kanjitalk755 2022-04-05 10:24:49 +09:00 committed by GitHub
parent 6285165090 2ea84d86c7
commit 86665c4c30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BasiliskII/src/Unix/serial_unix.cpp
View File

@ -648,16 +648,16 @@ bool XSERDPort::configure(uint16 config)
// Set number of data bits
switch (config & 0x0c00) {
case data5:
mode.c_cflag = mode.c_cflag & ~CSIZE | CS5;
mode.c_cflag = (mode.c_cflag & ~CSIZE) | CS5;
break;
case data6:
mode.c_cflag = mode.c_cflag & ~CSIZE | CS6;
mode.c_cflag = (mode.c_cflag & ~CSIZE) | CS6;
break;
case data7:
mode.c_cflag = mode.c_cflag & ~CSIZE | CS7;
mode.c_cflag = (mode.c_cflag & ~CSIZE) | CS7;
break;
case data8:
mode.c_cflag = mode.c_cflag & ~CSIZE | CS8;
mode.c_cflag = (mode.c_cflag & ~CSIZE) | CS8;
break;
}

4
BasiliskII/src/sony.cpp
View File

@ -263,7 +263,7 @@ int16 SonyOpen(uint32 pb, uint32 dce)
// Set up DCE
WriteMacInt32(dce + dCtlPosition, 0);
WriteMacInt16(dce + dCtlQHdr + qFlags, ReadMacInt16(dce + dCtlQHdr + qFlags) & 0xff00 | 3); // Version number, must be >=3 or System 8 will replace us
WriteMacInt16(dce + dCtlQHdr + qFlags, (ReadMacInt16(dce + dCtlQHdr + qFlags) & 0xff00) | 3); // Version number, must be >=3 or System 8 will replace us
acc_run_called = false;
// Install driver again with refnum -2 (HD20)
@ -520,7 +520,7 @@ int16 SonyStatus(uint32 pb, uint32 dce)
break;
case 10: // Get disk type and MFM info
WriteMacInt32(pb + csParam, ReadMacInt32(info->status + dsMFMDrive) & 0xffffff00 | 0xfe); // 0xfe = SWIM2 controller
WriteMacInt32(pb + csParam, (ReadMacInt32(info->status + dsMFMDrive) & 0xffffff00) | 0xfe); // 0xfe = SWIM2 controller
break;
// case 0x4350: // Measure disk speed at a given track ('CP') (not supported)

2
SheepShaver/src/MacOSX/prefs_macosx.mm
View File

@ -52,7 +52,7 @@
return nil;
}
NSLog(@"%d objects loaded\n", [objects count]);
NSLog(@"%lu objects loaded\n", [objects count]);
// Release the raw nib data.
[nib release];

2
SheepShaver/src/timer.cpp
View File

@ -337,7 +337,7 @@ void TimerReset(void)
int16 InsTime(uint32 tm, uint16 trap)
{
D(bug("InsTime %08lx, trap %04x\n", tm, trap));
WriteMacInt16((uint32)tm + qType, ReadMacInt16((uint32)tm + qType) & 0x1fff | (trap << 4) & 0x6000);
WriteMacInt16((uint32)tm + qType, (ReadMacInt16((uint32)tm + qType) & 0x1fff) | ((trap << 4) & 0x6000));
if (find_desc(tm))
printf("WARNING: InsTime(%08x): Task re-inserted\n", tm);
else {