github.com/rcornwell.sims
1
0
Fork 0
mirror of https://github.com/rcornwell/sims.git synced 2026-01-11 23:52:48 +00:00
Code Releases Activity

SCP: Updated to current.

Browse Source
This commit is contained in:
Richard Cornwell 2019-09-03 20:27:03 -04:00
parent 0f3024b6ba
commit 2fa0ae4fe4
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
display/type340.c
View File

@ -115,7 +115,9 @@ enum jump_type { DJP=2, DJS=3, DDS=1 }; /* type 347 */
/* put all the state in a struct "just in case" */
static struct type340 {
/* ty340word DAC; /* Display Address Counter */
#ifdef NOTYET
ty340word DAC; /* Display Address Counter */
#endif
ty340word status; /* see ST340_XXX in type340.h */
signed short xpos, ypos; /* 10 bits, signed (for OOB checks) */
char initialized; /* 0 before display_init */
@ -174,7 +176,7 @@ ty340_reset(void *dptr)
#if TYPE342
u->shift = 0;
u->width = 6;
u->height = 11;
u->height = 11;
#endif
#if TYPE347
u->SAVE_FF = 0;

8
sim_ether.c
View File

@ -2118,7 +2118,9 @@ else { /* !tap: */
while (isspace(*devname))
++devname;
if ((*handle = (void*) sim_slirp_open(devname, opaque, &_slirp_callback, dptr, dbit, errbuf, PCAP_ERRBUF_SIZE))) {
if (!(*handle = (void*) sim_slirp_open(devname, opaque, &_slirp_callback, dptr, dbit)))
strlcpy(errbuf, strerror(errno), PCAP_ERRBUF_SIZE);
else {
*eth_api = ETH_API_NAT;
*fd_handle = 0;
}
@ -2438,7 +2440,11 @@ return SCPE_OK;
const char *eth_version (void)
{
#if defined(HAVE_PCAP_NETWORK)
return pcap_lib_version();
#else
return NULL;
#endif
}
t_stat eth_attach_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)