folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ETHER: Make sure SET NOASYNC is effective for Ethernet devices

Browse source 
- Make sure that asynchronous mode can't be changed if devices using
   sim_ether are already attached.
- Add missing DEV_ETHER type flag for the only sim_ether using device
   that didn't already have it.
This commit is contained in:
Mark Pizzolato 2024-01-06 14:43:21 -10:00 • committed by Paul Koning
parent b273cac59e
commit 7a6a325580
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VAX/vax_xs.c
View file

@ -130,7 +130,7 @@ DEVICE xs_dev = {
1, DEV_RDX, 20, 1, DEV_RDX, 8,
NULL, NULL, &xs_reset,
NULL, &xs_attach, &xs_detach,
&xs_dib, DEV_DEBUG | XS_FLAGS, 0,
&xs_dib, DEV_DEBUG | XS_FLAGS | DEV_ETHER, 0,
xs_debug, NULL, NULL, &xs_help, NULL, NULL,
&xs_description
};

10
scp.c
View file

@ -5767,6 +5767,16 @@ if (cptr && (*cptr != 0)) /* now eol? */
#ifdef SIM_ASYNCH_IO
if (flag == sim_asynch_enabled) /* already set correctly? */
return SCPE_OK;
if (1) {
uint32 i;
DEVICE *dptr;
for (i = 1; (dptr = sim_devices[i]) != NULL; i++) { /* flush attached files */
if ((DEV_TYPE(dptr) == DEV_ETHER) &&
(dptr->units->flags & UNIT_ATT))
return sim_messagef (SCPE_ALATT, "Can't change asynch mode with %s device attached\n", dptr->name);
}
}
sim_asynch_enabled = flag;
tmxr_change_async ();
sim_timer_change_asynch ();

10
sim_ether.c
View file

@ -2177,6 +2177,10 @@ return NULL;
}
#endif
/* eth_set_async
*
* Turn on reciever processing which can be either asynchronous or polled
*/
t_stat eth_set_async (ETH_DEV *dev, int latency)
{
#if !defined(USE_READER_THREAD) || !defined(SIM_ASYNCH_IO)
@ -2186,7 +2190,7 @@ return sim_messagef (SCPE_NOFNC, "%s", msg);
#else
int wakeup_needed;
dev->asynch_io = 1;
dev->asynch_io = sim_asynch_enabled;
dev->asynch_io_latency = latency;
pthread_mutex_lock (&dev->lock);
wakeup_needed = (dev->read_queue.count != 0);
@ -2199,6 +2203,10 @@ if (wakeup_needed) {
return SCPE_OK;
}
/* eth_clr_async
*
* Turn off reciever processing
*/
t_stat eth_clr_async (ETH_DEV *dev)
{
#if !defined(USE_READER_THREAD) || !defined(SIM_ASYNCH_IO)