Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-26 08:32:20 +00:00
Code Issues Projects Releases Wiki Activity

direct addressing fixes to video.cpp way to handle the VSL service owner

Browse Source
This commit is contained in:
gbeauche 2004-12-19 23:05:34 +00:00
parent 3032cb417c
commit f2d7689435
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SheepShaver/src/include/video.h
View File

@ -123,7 +123,7 @@ struct VidLocals{
uint32 cursorSet; uint32 cursorSet;
uint32 vslServiceID; // VSL interrupt service ID uint32 vslServiceID; // VSL interrupt service ID
bool interruptsEnabled; // VBL interrupts on/off bool interruptsEnabled; // VBL interrupts on/off
uint32 regEntryID[4]; uint32 regEntryID; // Mac address of the service owner
}; };
extern VidLocals *private_data; // Pointer to driver local variables (there is only one display, so this is ok) extern VidLocals *private_data; // Pointer to driver local variables (there is only one display, so this is ok)

20
SheepShaver/src/video.cpp
View File

@ -169,7 +169,7 @@ static int16 VideoOpen(uint32 pb, VidLocals *csSave)
// Install and activate interrupt service // Install and activate interrupt service
SheepVar32 theServiceID = 0; SheepVar32 theServiceID = 0;
VSLNewInterruptService(Host2MacAddr((uint8 *)csSave->regEntryID), FOURCC('v','b','l',' '), theServiceID.addr()); VSLNewInterruptService(csSave->regEntryID, FOURCC('v','b','l',' '), theServiceID.addr());
csSave->vslServiceID = theServiceID.value(); csSave->vslServiceID = theServiceID.value();
D(bug(" Interrupt ServiceID %08lx\n", csSave->vslServiceID)); D(bug(" Interrupt ServiceID %08lx\n", csSave->vslServiceID));
csSave->interruptsEnabled = true; csSave->interruptsEnabled = true;
@ -885,6 +885,8 @@ int16 VideoDoDriverIO(uint32 spaceID, uint32 commandID, uint32 commandContents,
if (private_data != NULL) { // Might be left over from a reboot if (private_data != NULL) { // Might be left over from a reboot
if (private_data->gammaTable) if (private_data->gammaTable)
Mac_sysfree(private_data->gammaTable); Mac_sysfree(private_data->gammaTable);
if (private_data->regEntryID)
Mac_sysfree(private_data->regEntryID);
} }
delete private_data; delete private_data;
@ -926,14 +928,24 @@ int16 VideoDoDriverIO(uint32 spaceID, uint32 commandID, uint32 commandContents,
private_data = new VidLocals; private_data = new VidLocals;
private_data->gammaTable = 0; private_data->gammaTable = 0;
Mac2Host_memcpy(&private_data->regEntryID, commandContents + 2, 16); // DriverInitInfo.deviceEntry private_data->regEntryID = Mac_sysalloc(sizeof(RegEntryID));
if (private_data->regEntryID == 0) {
printf("FATAL: VideoDoDriverIO(): Can't allocate service owner\n");
err = -1;
break;
}
Mac2Mac_memcpy(private_data->regEntryID, commandContents + 2, 16); // DriverInitInfo.deviceEntry
private_data->interruptsEnabled = false; // Disable interrupts private_data->interruptsEnabled = false; // Disable interrupts
break; break;
case kFinalizeCommand: case kFinalizeCommand:
case kSupersededCommand: case kSupersededCommand:
if (private_data != NULL && private_data->gammaTable) if (private_data != NULL) {
Mac_sysfree(private_data->gammaTable); if (private_data->gammaTable)
Mac_sysfree(private_data->gammaTable);
if (private_data->regEntryID)
Mac_sysfree(private_data->regEntryID);
}
delete private_data; delete private_data;
private_data = NULL; private_data = NULL;
break; break;