Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-12-01 11:50:43 +00:00
Code Issues Projects Releases Wiki Activity

Don't try to receive frames when eth is unloaded on the MacOS side as it will call uninitialized vectors

Browse Source
This commit is contained in:
Andrew Tonner 2020-02-11 03:14:23 -08:00
parent 28e0485156
commit 744df7adf3
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BasiliskII/src/Windows/ether_windows.cpp
View File

@ -101,6 +101,14 @@ static int net_if_type = -1; // Ethernet device type
#ifdef SHEEPSHAVER #ifdef SHEEPSHAVER
static bool net_open = false; // Flag: initialization succeeded, network device open static bool net_open = false; // Flag: initialization succeeded, network device open
uint8 ether_addr[6]; // Our Ethernet address uint8 ether_addr[6]; // Our Ethernet address
#else
const bool ether_driver_opened = true; // Flag: Driver is open on MacOS side
// so ether.h layer is ready for
// calls.
// B2 doesn't provide this
// but also calls don't need it
#endif #endif
// These are protected by queue_csection // These are protected by queue_csection
@ -1571,10 +1579,16 @@ unsigned int WINAPI ether_thread_feed_int(void *arg)
D(bug("Triggering\n")); D(bug("Triggering\n"));
looping = true; looping = true;
while(thread_active && looping) { while(thread_active && looping) {
trigger_queue(); if (ether_driver_opened) {
// Wait for interrupt acknowledge by EtherInterrupt() trigger_queue();
WaitForSingleObject(int_ack,INFINITE); // Wait for interrupt acknowledge by EtherInterrupt()
if(thread_active) looping = set_wait_request(); WaitForSingleObject(int_ack,INFINITE);
if(thread_active) looping = set_wait_request();
} else {
// Ether driver is closed on the MacOS side
// ether.h calls in this case are undefined
Delay_usec(20000);
}
} }
D(bug("Queue empty.\n")); D(bug("Queue empty.\n"));
} }