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

Updated pdp11_dmc.c from Rob Jarratt

Browse source
This commit is contained in:
Mark Pizzolato 2013-01-05 14:38:56 -08:00
parent 375a02181e
commit 0c436c1515
1 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
PDP11/pdp11_dmc.c
View file

@ -233,7 +233,8 @@ BUFFER *dmc_buffer_queue_head(BUFFER_QUEUE *q);
int dmc_buffer_queue_full(BUFFER_QUEUE *q); int dmc_buffer_queue_full(BUFFER_QUEUE *q);
void dmc_buffer_queue_get_stats(BUFFER_QUEUE *q, int *available, int *contains_data, int *transfer_in_progress); void dmc_buffer_queue_get_stats(BUFFER_QUEUE *q, int *available, int *contains_data, int *transfer_in_progress);
void dmc_start_transfer_transmit_buffer(CTLR *controller); void dmc_start_transfer_transmit_buffer(CTLR *controller);
void dmc_error_and_close_receive(CTLR *controller, char *format); void dmc_error_and_close_socket(CTLR *controller, char *format);
void dmc_close_socket(CTLR *controller, char *reason);
void dmc_close_receive(CTLR *controller, char *reason, char *from); void dmc_close_receive(CTLR *controller, char *reason, char *from);
void dmc_close_transmit(CTLR *controller, char *reason); void dmc_close_transmit(CTLR *controller, char *reason);
int dmc_get_socket(CTLR *controller, int forRead); int dmc_get_socket(CTLR *controller, int forRead);
@ -1124,6 +1125,7 @@ void dmc_process_master_clear(CTLR *controller)
{ {
sim_debug(DBG_INF, controller->device, "Master clear\n"); sim_debug(DBG_INF, controller->device, "Master clear\n");
dmc_clear_master_clear(controller); dmc_clear_master_clear(controller);
dmc_close_socket(controller, "Master clear"); /* to resynch both ends */
controller->state = Initialised; controller->state = Initialised;
dmc_setreg(controller, 0, 0, 0); dmc_setreg(controller, 0, 0, 0);
if (controller->dev_type == DMR) if (controller->dev_type == DMR)
@ -1691,45 +1693,56 @@ int dmc_get_transmit_socket(CTLR *controller, int is_loopback, int forRead)
return ans; return ans;
} }
void dmc_close_receive(CTLR *controller, char *reason, char *from) void dmc_error_and_close_socket(CTLR *controller, char *format)
{
sim_debug(DBG_SOK, controller->device, "Closing receive socket on port %s, reason: %s%s%s\n", controller->line->receive_port, reason, from ? " from " : "", from ? from : "");
sim_close_sock(controller->line->socket, FALSE);
controller->line->socket = INVALID_SOCKET;
if (controller->line->receive_readable)
{
sim_debug(DBG_CON, controller->device, "Readable receive socket closed, reason: %s\n", reason);
}
controller->line->receive_readable = FALSE;
}
void dmc_error_and_close_receive(CTLR *controller, char *format)
{ {
int err = WSAGetLastError(); int err = WSAGetLastError();
char errmsg[80]; char errmsg[80];
sprintf(errmsg, format, err); sprintf(errmsg, format, err);
dmc_close_socket(controller, errmsg);
}
void dmc_close_socket(CTLR *controller, char *reason)
{
if (controller->line->isPrimary) if (controller->line->isPrimary)
{ {
dmc_close_transmit(controller, errmsg); dmc_close_transmit(controller, reason);
} }
else else
{ {
dmc_close_receive(controller, errmsg, NULL); dmc_close_receive(controller, reason, NULL);
}
}
void dmc_close_receive(CTLR *controller, char *reason, char *from)
{
if (controller->line->socket != INVALID_SOCKET)
{
sim_debug(DBG_SOK, controller->device, "Closing receive socket on port %s, reason: %s%s%s\n", controller->line->receive_port, reason, from ? " from " : "", from ? from : "");
sim_close_sock(controller->line->socket, FALSE);
controller->line->socket = INVALID_SOCKET;
if (controller->line->receive_readable)
{
sim_debug(DBG_CON, controller->device, "Readable receive socket closed, reason: %s\n", reason);
}
controller->line->receive_readable = FALSE;
} }
} }
void dmc_close_transmit(CTLR *controller, char *reason) void dmc_close_transmit(CTLR *controller, char *reason)
{ {
sim_debug(DBG_SOK, controller->device, "Closing transmit socket to port %s, socket %d, reason: %s\n", controller->line->peer, controller->line->socket, reason); if (controller->line->socket != INVALID_SOCKET)
sim_close_sock(controller->line->socket, FALSE);
controller->line->socket = INVALID_SOCKET;
if (controller->line->transmit_writeable)
{ {
sim_debug(DBG_CON, controller->device, "Writeable transmit socket closed, reason: %s\n", reason); sim_debug(DBG_SOK, controller->device, "Closing transmit socket to port %s, socket %d, reason: %s\n", controller->line->peer, controller->line->socket, reason);
sim_close_sock(controller->line->socket, FALSE);
controller->line->socket = INVALID_SOCKET;
if (controller->line->transmit_writeable)
{
sim_debug(DBG_CON, controller->device, "Writeable transmit socket closed, reason: %s\n", reason);
}
controller->line->transmit_writeable = FALSE;
} }
controller->line->transmit_writeable = FALSE;
} }
/* returns true if some data was received */ /* returns true if some data was received */
@ -1748,7 +1761,7 @@ int dmc_buffer_fill_receive_buffers(CTLR *controller)
bytes_read = sim_read_sock(socket, buffer, sizeof(buffer)); bytes_read = sim_read_sock(socket, buffer, sizeof(buffer));
if (bytes_read < 0) if (bytes_read < 0)
{ {
dmc_error_and_close_receive(controller, "read error, code=%d"); dmc_error_and_close_socket(controller, "read error, code=%d");
} }
else if (bytes_read > 0) else if (bytes_read > 0)
{ {
@ -1846,7 +1859,7 @@ int dmc_buffer_fill_receive_buffers(CTLR *controller)
/* Only close the socket if there was an error or no more data */ /* Only close the socket if there was an error or no more data */
if (bytes_read < 0) if (bytes_read < 0)
{ {
dmc_error_and_close_receive(controller, "read error, code=%d"); dmc_error_and_close_socket(controller, "read error, code=%d");
break; break;
} }
@ -2245,7 +2258,7 @@ int dmc_isattached(CTLR *controller)
t_stat dmc_detach (UNIT *uptr) t_stat dmc_detach (UNIT *uptr)
{ {
CTLR *controller = dmc_get_controller_from_unit(uptr); CTLR *controller = dmc_get_controller_from_unit(uptr);
dmc_error_and_close_receive(controller, "Detach"); dmc_error_and_close_socket(controller, "Detach");
dmc_close_master_socket(controller); dmc_close_master_socket(controller);
uptr->flags = uptr->flags & ~UNIT_ATT; /* clear unit attached flag */ uptr->flags = uptr->flags & ~UNIT_ATT; /* clear unit attached flag */
free(uptr->filename); free(uptr->filename);