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

Fixed from Sergey Oboguev relating to XU and XQ Auto Config issues with vector assignments.

Browse source
This commit is contained in:
Mark Pizzolato 2011-08-17 16:36:02 -07:00
parent 3a61487a2d
commit 706e07a746
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
PDP11/pdp11_xq.c
View file

@ -480,7 +480,7 @@ DEVICE xq_dev = {
2, XQ_RDX, 11, 1, XQ_RDX, 16, 2, XQ_RDX, 11, 1, XQ_RDX, 16,
&xq_ex, &xq_dep, &xq_reset, &xq_ex, &xq_dep, &xq_reset,
NULL, &xq_attach, &xq_detach, NULL, &xq_attach, &xq_detach,
&xqa_dib, DEV_DISABLE | DEV_QBUS | DEV_DEBUG, &xqa_dib, DEV_FLTA | DEV_DISABLE | DEV_QBUS | DEV_DEBUG,
0, xq_debug 0, xq_debug
}; };
@ -489,7 +489,7 @@ DEVICE xqb_dev = {
2, XQ_RDX, 11, 1, XQ_RDX, 16, 2, XQ_RDX, 11, 1, XQ_RDX, 16,
&xq_ex, &xq_dep, &xq_reset, &xq_ex, &xq_dep, &xq_reset,
NULL, &xq_attach, &xq_detach, NULL, &xq_attach, &xq_detach,
&xqb_dib, DEV_DISABLE | DEV_DIS | DEV_QBUS | DEV_DEBUG, &xqb_dib, DEV_FLTA | DEV_DISABLE | DEV_DIS | DEV_QBUS | DEV_DEBUG,
0, xq_debug 0, xq_debug
}; };
@ -2377,7 +2377,7 @@ t_stat xq_reset(DEVICE* dptr)
xq->var->sanity.quarter_secs = XQ_HW_SANITY_SECS * 4/*qsec*/; xq->var->sanity.quarter_secs = XQ_HW_SANITY_SECS * 4/*qsec*/;
} }
return SCPE_OK; return auto_config (0, 0); /* run autoconfig */
} }
void xq_reset_santmr(CTLR* xq) void xq_reset_santmr(CTLR* xq)

18
PDP11/pdp11_xu.c
View file

@ -144,14 +144,18 @@ struct xu_device xua = {
MTAB xu_mod[] = { MTAB xu_mod[] = {
#if defined (VM_PDP11) #if defined (VM_PDP11)
{ MTAB_XTD|MTAB_VDV, 004, "ADDRESS", "ADDRESS", { MTAB_XTD|MTAB_VDV, 004, "ADDRESS", "ADDRESS",
&set_addr, &show_addr, NULL }, &set_addr, &show_addr, NULL },
{ MTAB_XTD | MTAB_VDV, 0, NULL, "AUTOCONFIGURE",
&set_addr_flt, NULL, NULL },
{ MTAB_XTD|MTAB_VDV, 0, "VECTOR", NULL,
&set_vec, &show_vec, NULL },
#else #else
{ MTAB_XTD|MTAB_VDV, 004, "ADDRESS", NULL, { MTAB_XTD|MTAB_VDV, 004, "ADDRESS", NULL,
NULL, &show_addr, NULL }, NULL, &show_addr, NULL },
{ MTAB_XTD|MTAB_VDV, 0, "VECTOR", NULL,
NULL, &show_vec, NULL },
#endif #endif
{ MTAB_XTD|MTAB_VDV, 0, "VECTOR", NULL,
NULL, &show_vec, NULL },
{ MTAB_XTD | MTAB_VDV, 0, "MAC", "MAC=xx:xx:xx:xx:xx:xx", { MTAB_XTD | MTAB_VDV, 0, "MAC", "MAC=xx:xx:xx:xx:xx:xx",
&xu_setmac, &xu_showmac, NULL }, &xu_setmac, &xu_showmac, NULL },
{ MTAB_XTD | MTAB_VDV | MTAB_NMO, 0, "ETH", "ETH", { MTAB_XTD | MTAB_VDV | MTAB_NMO, 0, "ETH", "ETH",
@ -683,7 +687,7 @@ t_stat xu_reset(DEVICE* dptr)
/* software reset controller */ /* software reset controller */
xu_sw_reset(xu); xu_sw_reset(xu);
return SCPE_OK; return auto_config (0, 0); /* run autoconfig */
} }