diff --git a/PDP10/ka10_dpy.c b/PDP10/ka10_dpy.c index b3900f4..45ccec3 100644 --- a/PDP10/ka10_dpy.c +++ b/PDP10/ka10_dpy.c @@ -244,7 +244,7 @@ t_stat dpy_devio(uint32 dev, uint64 *data) { uptr->STAT_REG &= ~CONO_MASK; uptr->STAT_REG |= *data & CONO_MASK; if (*data & CONO_INIT) - dpy_update_status( uptr, ty340_reset(), 1); + dpy_update_status( uptr, ty340_reset(&dpy_dev), 1); sim_debug(DEBUG_CONO, &dpy_dev, "DPY %03o CONO %06o PC=%06o %06o\n", dev, (uint32)*data, PC, uptr->STAT_REG & ~STAT_VALID); break; @@ -298,7 +298,7 @@ t_stat dpy_reset (DEVICE *dptr) { if (!(dptr->flags & DEV_DIS)) { display_reset(); - ty340_reset(); + ty340_reset(dptr); } sim_cancel (&dpy_unit[0]); /* deactivate unit */ return SCPE_OK; diff --git a/makefile b/makefile index 6acb6e1..2b6d28c 100644 --- a/makefile +++ b/makefile @@ -95,6 +95,10 @@ ifneq (,$(findstring besm6,$(MAKECMDGOALS))) VIDEO_USEFUL = true BESM6_BUILD = true endif +# building the KA10 needs video support +ifneq (,$(findstring ka10,$(MAKECMDGOALS))) + VIDEO_USEFUL = true +endif # building the pdp11, pdp10, or any vax simulator could use networking support ifneq (,$(or $(findstring pdp11,$(MAKECMDGOALS)),$(findstring pdp10,$(MAKECMDGOALS)),$(findstring vax,$(MAKECMDGOALS)),$(findstring pdp10-ka,$(MAKECMDGOALS)),$(findstring pdp10-ki,$(MAKECMDGOALS)),$(findstring all,$(MAKECMDGOALS)))) NETWORK_USEFUL = true @@ -1118,10 +1122,10 @@ KA10_OPT = -DKA=1 -DUSE_INT64 -I $(KA10D) -DUSE_SIM_CARD ${NETWORK_OPT} ifneq ($(TYPE340),) # ONLY tested on Ubuntu 16.04, using X11 display support: -KA10_DPY=-DUSE_DISPLAY \ +KA10_DPY=-DUSE_DISPLAY -DHAVE_LIBSDL -DUSE_SIM_VIDEO `$(SDLX_CONFIG) --cflags` \ ${KA10D}/ka10_dpy.c display/type340.c display/display.c \ - display/x11.c -KA10_DPY_LDFLAGS =-lm -lX11 -lXt + display/sim_ws.c +KA10_DPY_LDFLAGS =-lm -lX11 -lXt `$(SDLX_CONFIG) --libs` endif ifneq ($(PANDA_LIGHTS),) # ONLY for Panda display.