claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reworked network and SCSI thread initialization and termination;

Browse Source 
Hard disk controller name and other related strings are now char * instead of fixed-size arrays.
This commit is contained in:
OBattler
2017-10-19 23:55:51 +02:00
parent 1d60a99ea3
commit b755b27304
18 changed files with 262 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/network/network.c
View File

@@ -86,8 +86,25 @@ void
network_wait_for_poll()
{
while (poll_data.busy)
thread_wait_event((event_t *) poll_data.poll_complete, -1);
thread_reset_event((event_t *) poll_data.poll_complete);
thread_wait_event((event_t *) poll_data.wake_poll_thread, -1);
thread_reset_event((event_t *) poll_data.wake_poll_thread);
}
void
network_wait_for_end(void *handle)
{
thread_wait((event_t *) handle, -1);
if (poll_data.wake_poll_thread) {
thread_destroy_event((event_t *) poll_data.wake_poll_thread);
poll_data.wake_poll_thread = NULL;
}
if (poll_data.poll_complete) {
thread_destroy_event((event_t *) poll_data.poll_complete);
poll_data.poll_complete = NULL;
}
}
@@ -103,6 +120,13 @@ network_busy(uint8_t set)
{
poll_data.busy = !!set;
if (!set)
thread_set_event((event_t *) poll_data.wake_poll_thread);
}
void
network_end(void)
{
thread_set_event((event_t *) poll_data.poll_complete);
}
@@ -187,6 +211,8 @@ network_attach(void *dev, uint8_t *mac, NETRXCB rx)
void
network_close(void)
{
thread_close_mutex((mutex_t *) netMutex);
switch(network_type) {
case NET_TYPE_PCAP:
network_pcap_close();
@@ -196,8 +222,6 @@ network_close(void)
network_slirp_close();
break;
}
thread_close_mutex((event_t *) netMutex);
}