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

PDP7: GRAPHICS2 cleanup, output side starting to work, but not input side?

Browse source
This commit is contained in:
Phil Budne 2016-03-19 13:36:07 -04:00 • committed by Mark Pizzolato
parent 40a3628173
commit 770c37309e
3 changed files with 197 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
PDP18B/pdp18b_defs.h
View file

@ -23,7 +23,7 @@
used in advertising or otherwise to promote the sale, use or other dealings used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik. in this Software without prior written authorization from Robert M Supnik.
17-Mar-16 PLB Start GRAPHICS-2 support for PDP-7 UNIX 17-Mar-16 PLB Start GRAPHICS-2 support for PDP-7 UNIX
10-Mar-16 RMS Added 3-cycle databreak set/show routines 10-Mar-16 RMS Added 3-cycle databreak set/show routines
26-Feb-16 RMS Added RB09 to PDP-7 for Unix "v0" and RM09 to PDP-9 26-Feb-16 RMS Added RB09 to PDP-7 for Unix "v0" and RM09 to PDP-9
13-Sep-15 RMS Added DR15C 13-Sep-15 RMS Added DR15C
@ -87,7 +87,7 @@
Type 550/555 DECtape Type 550/555 DECtape
Type 24 serial drum Type 24 serial drum
RB09 fixed head disk (Unix V0 only) RB09 fixed head disk (Unix V0 only)
Bell Labs GRAPHICS-2 (Unix V0 only) Bell Labs GRAPHICS-2 (Unix V0 only)
PDP9 32K KE09A EAE KSR-33 Teletype PDP9 32K KE09A EAE KSR-33 Teletype
KF09A auto pri intr PC09A paper tape reader and punch KF09A auto pri intr PC09A paper tape reader and punch
@ -148,7 +148,7 @@
#define TYPE550 0 /* DECtape */ #define TYPE550 0 /* DECtape */
#define DRM 0 /* drum */ #define DRM 0 /* drum */
#define RB 0 /* fixed head disk */ #define RB 0 /* fixed head disk */
#define GRAPHICS2 0 /* BTL display */ #define GRAPHICS2 0 /* BTL display */
#elif defined (PDP9) #elif defined (PDP9)
#define ADDRSIZE 15 #define ADDRSIZE 15
#define TYPE647 0 /* sixbit printer */ #define TYPE647 0 /* sixbit printer */
@ -295,20 +295,26 @@ typedef struct {
#define DEV_DTA 075 /* dectape */ #define DEV_DTA 075 /* dectape */
#ifdef GRAPHICS2 #ifdef GRAPHICS2
#define DEV_G2D1 005 /* Display Ctrl 1 */ /* Bell Telephone Labs GRAPHICS-2 Display System ("as large as the PDP-7")
#define DEV_G2D2 006 /* (Display Ctrl 2) */ * Used by PDP-7 UNIX as a "Glass TTY"
#define DEV_G2LP 007 /* (Light Pen) */ */
#define DEV_G2DS 010 /* (Display Status) */ #define DEV_G2D1 005 /* Display Ctrl 1 */
#define DEV_G2D3 014 /* (Display Ctrl 3) */ /*#define DEV_G2D 006 /* (Display Ctrl 2) */
#define DEV_G2D4 034 /* (Display Ctrl 4) */ /*#define DEV_G2LP 007 /* (Light Pen) */
/*#define DEV_G2DS 010 /* (Display Status) */
/*#define DEV_G2D3 014 /* (Display Ctrl 3) */
/*#define DEV_G2D4 034 /* (Display Ctrl 4) */
#define DEV_G2UNK 042 /* (???) */ /*#define DEV_G2UNK 042 /* (???) */
#define DEV_G2KB 043 /* Keyboard */ #define DEV_G2KB 043 /* Keyboard */
#define DEV_G2PB 044 /* Button Box */ #define DEV_G2BB 044 /* Button Box */
#define DEV_G2IM 045 /* (PDP7 int. mask) */ /*#define DEV_G2IM 045 /* (PDP7 int. mask) */
/* Bell Labs PDP-7/9 to 201A Data Phone Interface */ /* PDP-7/9 to 201A Data Phone Interface
#define DEV_BLGP 047 /* (Data Phone) */ * (status bits retrieved with G2DS IOT)
* used for UNIX to GCOS Remote Job Entry
*/
/*#define DEV_DP 047 /* (Data Phone) */
#endif #endif
/* Interrupt system /* Interrupt system

350
PDP18B/pdp18b_g2.c
View file

@ -1,4 +1,4 @@
/* pdp18b_g2.c: PDP-7/9 Bell Labs "GRAPHIC-2" subsystem (as a TTY!!) /* pdp18b_g2tty.c: PDP-7/9 Bell Labs "GRAPHIC-2" subsystem (as a TTY!!)
from 13-Sep-15 version of pdp18b_tt1.c from 13-Sep-15 version of pdp18b_tt1.c
Copyright (c) 1993-2015, Robert M Supnik Copyright (c) 1993-2015, Robert M Supnik
@ -25,7 +25,7 @@
used in advertising or otherwise to promote the sale, use or other dealings used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from Robert M Supnik. in this Software without prior written authorization from Robert M Supnik.
Doug McIlroy had this to say about the BTL PDP-7 Ken Thompson Doug McIlroy had this to say about the Bell Labs PDP-7 Ken Thompson
created UNIX on: created UNIX on:
The pdp7 was cast off by the visual and acoustics research department. The pdp7 was cast off by the visual and acoustics research department.
@ -35,35 +35,34 @@
realized that the axis was perpendicular to the loading dock 4 floors realized that the axis was perpendicular to the loading dock 4 floors
below. A 90-degree turn solved the problem. below. A 90-degree turn solved the problem.
The graphics system consists of eleven PDP-7 "devices", The graphics system responds as ten PDP-7 "devices";
UNIX only uses six, and only three of the six are simulated here UNIX only uses six, and only three of the six are simulated here
(and *JUST* enough of those to figure out the text being displayed)!! (and *JUST* enough of those to figure out the text being displayed),
as two SIMH DEVICES, G2OUT and G2IN:
G2D1 GRAPHICS-2 display output G2OUT:
G2DS GRAPHICS-2 display status G2D1 005 GRAPHICS-2 display output
G2KB GRAPHICS-2 keyboard G2IN:
G2PB GRAPHICS-2 push buttons G2KB 043 GRAPHICS-2 keyboard
G2BB 044 GRAPHICS-2 button box (lighted bush buttons)
17-Mar-16 PLB Cloned from 13-Sep-15 version of pdp18b_tt1.c 17-Mar-16 PLB Cloned from 13-Sep-15 version of pdp18b_tt1.c
*/ */
#include "pdp18b_defs.h" #include "pdp18b_defs.h"
#ifdef GRAPHICS2 #ifdef GRAPHICS2
#include "sim_sock.h"
#include "sim_tmxr.h" #include "sim_tmxr.h"
#include <ctype.h> #include <ctype.h>
uint32 g2do_buf = 0; /* output char */
uint8 g2kb_done = 0; /* keyboard flag */ uint8 g2kb_done = 0; /* keyboard flag */
uint32 g2kb_buf = 0; /* keyboard buffer */ uint32 g2kb_buf = 0; /* keyboard buffer */
uint8 g2pb_done = 0; /* button flag */ uint8 g2bb_flag = 0; /* button flag */
uint32 g2pb_bbuf = 0; /* button buffer */ uint32 g2bb_bbuf = 0; /* button buffer */
uint32 g2pb_lbuf = 0; /* button lights */ uint32 g2bb_lbuf = 0; /* button lights buffer */
uint32 g2_dpyaddr = 0; /* display address */ uint32 g2out_addr = 0; /* display address */
int32 g2_dpycount = 0; /* character count */ int32 g2out_count = 0; /* character count (not a hw reg) */
/* terminal mux data */ /* terminal mux data */
TMLN g2_ldsc = { 0 }; /* line descriptor */ TMLN g2_ldsc = { 0 }; /* line descriptor */
@ -82,51 +81,54 @@ extern int32 api_vec[API_HLVL][32];
extern int32 tmxr_poll; extern int32 tmxr_poll;
extern int32 stop_inst; extern int32 stop_inst;
int32 g2d1 (int32 dev, int32 pulse, int32 dat); /* SIMH G2IN DEVICE */
int32 g2kb (int32 dev, int32 pulse, int32 dat);
int32 g2pb (int32 dev, int32 pulse, int32 dat);
t_stat g2kb_svc (UNIT *uptr);
t_bool g2kb_test_done (); t_bool g2kb_test_done ();
void g2kb_set_done (); void g2kb_set_done ();
void g2kb_clr_done (); void g2kb_clr_done ();
int32 g2kb_iot (int32 dev, int32 pulse, int32 dat); /* device 043 */
t_bool g2pb_test_done (); t_bool g2bb_test_flag ();
void g2pb_set_done (); void g2bb_set_flag ();
void g2pb_clr_done (); void g2bb_clr_flag ();
int32 g2bb_iot (int32 dev, int32 pulse, int32 dat); /* device 044 */
t_stat g2d1_svc (UNIT *uptr); t_stat g2in_svc (UNIT *uptr);
/* SIMH G2OUT DEVICE */
int32 g2d1_iot (int32 dev, int32 pulse, int32 dat); /* device 05 */
/* both G2IN/G2OUT: */
t_stat g2_attach (UNIT *uptr, char *cptr); t_stat g2_attach (UNIT *uptr, char *cptr);
t_stat g2_detach (UNIT *uptr); t_stat g2_detach (UNIT *uptr);
t_stat g2_reset (DEVICE *dptr); t_stat g2_reset (DEVICE *dptr);
/* G2 keyboard data structures /****************************************************************
* SIMH G2IN (keyboard/buttons) DEVICE data structures
*
* g2in_dev G2IN device descriptor
* g2in_unit G2IN unit descriptor
* g2in_reg G2IN register list
* g2in_mod G2IN modifiers list
*/
g2kb_dev G2kb device descriptor DIB g2in_dib = { DEV_G2KB, 2, NULL, { &g2kb_iot, &g2bb_iot } };
g2kb_unit G2kb unit descriptor
g2kb_reg G2kb register list
g2kb_mod G2kb modifiers list
*/
/* push button device number is contiguous with keyboard */ UNIT g2in_unit = {
DIB g2kb_dib = { DEV_G2KB, 2, NULL, { &g2kb, &g2pb } }; UDATA (&g2in_svc, UNIT_IDLE|UNIT_ATTABLE, 0), KBD_POLL_WAIT
UNIT g2kb_unit = {
UDATA (&g2kb_svc, UNIT_IDLE|UNIT_ATTABLE, 0), KBD_POLL_WAIT
}; };
REG g2kb_reg[] = { REG g2in_reg[] = {
{ ORDATA (BUF, g2kb_buf, 1) }, { ORDATA (KBBUF, g2kb_buf, 1) },
{ ORDATA (DONE, g2kb_done, 1) }, { ORDATA (KBDONE, g2kb_done, 1) },
{ FLDATA (INT, int_hwre[API_G2], INT_V_G2) }, { FLDATA (INT, int_hwre[API_G2], INT_V_G2) },
{ DRDATA (TIME, g2kb_unit.wait, 24), REG_NZ + PV_LEFT }, { DRDATA (TIME, g2in_unit.wait, 24), REG_NZ + PV_LEFT },
{ ORDATA (BUTTONS, g2pb_bbuf, 1) }, { ORDATA (BBBBUF, g2bb_bbuf, 1) }, /* button box button buffer */
{ ORDATA (LITES, g2pb_lbuf, 1) }, { ORDATA (BBFLAG, g2bb_flag, 1) }, /* button box IRQ */
{ ORDATA (BBLBUF, g2bb_lbuf, 1) }, /* button box lights buffer */
{ NULL } { NULL }
}; };
MTAB g2kb_mod[] = { MTAB g2in_mod[] = {
{ UNIT_ATT, UNIT_ATT, "summary", NULL, { UNIT_ATT, UNIT_ATT, "summary", NULL,
NULL, &tmxr_show_summ, (void *) &g2_desc }, NULL, &tmxr_show_summ, (void *) &g2_desc },
{ MTAB_XTD | MTAB_VDV, 1, NULL, "DISCONNECT", { MTAB_XTD | MTAB_VDV, 1, NULL, "DISCONNECT",
@ -135,43 +137,6 @@ MTAB g2kb_mod[] = {
NULL, &tmxr_show_cstat, (void *) &g2_desc }, NULL, &tmxr_show_cstat, (void *) &g2_desc },
{ MTAB_XTD | MTAB_VDV | MTAB_NMO, 0, "STATISTICS", NULL, { MTAB_XTD | MTAB_VDV | MTAB_NMO, 0, "STATISTICS", NULL,
NULL, &tmxr_show_cstat, (void *) &g2_desc }, NULL, &tmxr_show_cstat, (void *) &g2_desc },
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO",
NULL, &show_devno, NULL },
{ 0 }
};
DEVICE g2kb_dev = {
"G2KB", /* name */
&g2kb_unit, /* units */
g2kb_reg, g2kb_mod, /* registers, modifiers */
1, /* numunits */
10, 31, /* aradix, awidth */
1, 8, 8, /* aincr, dradix, dwidth */
&tmxr_ex, &tmxr_dep, &g2_reset, /* examine, deposit, reset */
NULL, &g2_attach, &g2_detach, /* boot, attach, detach */
&g2kb_dib, DEV_MUX | DEV_DISABLE /* ctxt, flags */
};
/* G2 Display Output Device 1 data structures
g2d1_dev g2d1 device descriptor
g2d1_unit g2d1 unit descriptor
g2d1_reg g2d1 register list
*/
DIB g2d1_dib = { DEV_G2D1, 1, NULL, { &g2d1 } };
UNIT g2d1_unit = { UDATA (&g2d1_svc, 0, 0), SERIAL_OUT_WAIT };
REG g2d1_reg[] = {
{ ORDATA (DPYADDR, g2_dpyaddr, 1) },
{ FLDATA (INT, int_hwre[API_G2], INT_V_G2) },
{ URDATA (TIME, g2d1_unit.wait, 10, 24, 0, 1, PV_LEFT) },
{ NULL }
};
MTAB g2d1_mod[] = {
{ MTAB_XTD|MTAB_VUN, 0, NULL, "DISCONNECT",
&tmxr_dscln, NULL, &g2_desc },
{ MTAB_XTD|MTAB_VUN|MTAB_NC, 0, "LOG", "LOG", { MTAB_XTD|MTAB_VUN|MTAB_NC, 0, "LOG", "LOG",
&tmxr_set_log, &tmxr_show_log, &g2_desc }, &tmxr_set_log, &tmxr_show_log, &g2_desc },
{ MTAB_XTD|MTAB_VUN|MTAB_NC, 0, NULL, "NOLOG", { MTAB_XTD|MTAB_VUN|MTAB_NC, 0, NULL, "NOLOG",
@ -181,16 +146,58 @@ MTAB g2d1_mod[] = {
{ 0 } { 0 }
}; };
DEVICE g2d1_dev = { /* SIMH G2IN device descriptor (GRAPHICS-2 keyboard & button box) */
"G2D1", /* name */ DEVICE g2in_dev = {
&g2d1_unit, /* units */ "G2IN", /* name */
g2d1_reg, g2d1_mod, /* registers, modifiers */ &g2in_unit, /* units */
g2in_reg, g2in_mod, /* registers, modifiers */
1, /* numunits */
10, 31, /* aradix, awidth */
1, 8, 8, /* aincr, dradix, dwidth */
&tmxr_ex, &tmxr_dep, &g2_reset, /* examine, deposit, reset */
NULL, &g2_attach, &g2_detach, /* boot, attach, detach */
&g2in_dib, DEV_MUX | DEV_DISABLE /* ctxt, flags */
};
/****************************************************************
* SIMH G2OUT (display output) DEVICE data structures
* Only needed to hold "iot" routine, since DIB's can't represent
* devices with register sets as sparse as GRAPHICS-2
*
* g2out_dev G2OUT device descriptor
* g2out_unit G2OUT unit descriptor
* g2out_reg G2OUT register list
* g2out_mod G2OUT modifiers list
*/
DIB g2out_dib = { DEV_G2D1, 1, NULL, { &g2d1_iot } };
UNIT g2out_unit = { UDATA (NULL, 0, 0) };
REG g2out_reg[] = {
{ ORDATA (DPYADDR, g2out_addr, 1) },
{ NULL }
};
MTAB g2out_mod[] = {
{ MTAB_XTD|MTAB_VUN, 0, NULL, "DISCONNECT",
&tmxr_dscln, NULL, &g2_desc },
{ MTAB_XTD|MTAB_VDV, 0, "DEVNO", "DEVNO",
NULL, &show_devno, NULL },
{ 0 }
};
/* SIMH G2OUT device descriptor (simulates just one of many display IOTs!) */
DEVICE g2out_dev = {
"G2OUT", /* name */
&g2out_unit, /* units */
g2out_reg, g2out_mod, /* registers, modifiers */
1, /* numunits */ 1, /* numunits */
10, 31, /* aradix, awidth */ 10, 31, /* aradix, awidth */
1, 8, 8, /* aincr, dradix, dwidth */ 1, 8, 8, /* aincr, dradix, dwidth */
NULL, NULL, &g2_reset, /* examine, deposit, reset */ NULL, NULL, &g2_reset, /* examine, deposit, reset */
NULL, NULL, NULL, /* boot, attach, detach */ NULL, NULL, NULL, /* boot, attach, detach */
&g2d1_dib, DEV_DISABLE /* ctxt, flags */ &g2out_dib, DEV_DISABLE /* ctxt, flags */
}; };
/**************************************************************** /****************************************************************
@ -198,8 +205,8 @@ DEVICE g2d1_dev = {
*/ */
/* Keyboard input IOT routine */ /* Keyboard input IOT routine */
/* real device might have done bitwise decode?! */ /* real device could have done bitwise decode?! */
int32 g2kb (int32 dev, int32 pulse, int32 dat) int32 g2kb_iot (int32 dev, int32 pulse, int32 dat)
{ {
if (pulse == 001) { /* sck */ if (pulse == 001) { /* sck */
if (g2kb_done) { if (g2kb_done) {
@ -207,7 +214,6 @@ if (pulse == 001) { /* sck */
} }
} }
else if (pulse == 002) { /* lck */ else if (pulse == 002) { /* lck */
g2kb_clr_done (); /* clear flag */
dat = dat | g2kb_buf; /* return buffer */ dat = dat | g2kb_buf; /* return buffer */
} }
else if (pulse == 004) { /* cck */ else if (pulse == 004) { /* cck */
@ -216,54 +222,54 @@ else if (pulse == 004) { /* cck */
return dat; return dat;
} }
/* Push Button: IOT routine */ /* Button Box IOT routine */
int32 g2pb (int32 dev, int32 pulse, int32 dat) /* real device could have done bitwise decode? */
int32 g2bb_iot (int32 dev, int32 pulse, int32 dat)
{ {
if (pulse & 020) { /* wbl */ if (pulse == 001) { /* "spb" -- skip on push button flag */
/* XXX if light for pb 7, press button 7!! */ if (g2bb_flag)
printf("G2: wbl %#o\r\n", dat);
g2pb_lbuf = dat;
}
if (pulse & 001) { /* spb */
if (g2pb_done) {
dat = dat | IOT_SKP; dat = dat | IOT_SKP;
} }
} else if (pulse == 002) /* "lpb" -- load push buttons */
if (pulse & 002) { /* lpb */ dat = dat | g2bb_bbuf; /* return buttons */
g2pb_clr_done (); /* clear flag */ else if (pulse == 004) /* "cpb" -- clear push button flag */
dat = dat | g2pb_bbuf; /* return buttons */ g2bb_clr_flag (); /* clear flag */
} else if (pulse == 020) { /* "wbl" -- write buttons lights */
if (pulse & 004) { /* cpb */ printf("G2: wbl %#o\r\n", dat); /* TEMP */
g2pb_clr_done (); /* clear flag */ g2bb_lbuf = dat;
} }
return dat;
} }
/* Unit service */ /* Input side Unit service */
t_stat g2in_svc (UNIT *uptr)
t_stat g2kb_svc (UNIT *uptr)
{ {
int32 ln, c, temp; int32 ln, c, temp;
if ((uptr->flags & UNIT_ATT) == 0) /* attached? */ if ((uptr->flags & UNIT_ATT) == 0) /* attached? */
return SCPE_OK; return SCPE_OK;
/* XXX if light for button 7 lit (screen full), press button 7!! */
sim_clock_coschedule (uptr, tmxr_poll); /* continue poll */ sim_clock_coschedule (uptr, tmxr_poll); /* continue poll */
ln = tmxr_poll_conn (&g2_desc); /* look for connect */ ln = tmxr_poll_conn (&g2_desc); /* look for connect */
if (ln >= 0) /* got one? rcv enab */ if (ln >= 0) /* got one? rcv enab */
g2_ldsc.rcve = 1; g2_ldsc.rcve = 1;
tmxr_poll_rx (&g2_desc); /* poll for input */ tmxr_poll_rx (&g2_desc); /* poll for input */
if (g2_ldsc.conn) { /* connected? */ if (g2_ldsc.conn) { /* connected? */
tmxr_poll_tx (&g2_desc); /* PLB: poll xmt */
if ((temp = tmxr_getc_ln (&g2_ldsc))) { /* get char */ if ((temp = tmxr_getc_ln (&g2_ldsc))) { /* get char */
if (temp & SCPE_BREAK) /* break? */ if (temp & SCPE_BREAK) /* break? */
c = 0; c = 0;
else c = sim_tt_inpcvt (temp, TT_GET_MODE(g2d1_unit.flags) ); else if (c == '\r') /* translate CR but not ESC */
c = '\n';
g2kb_buf = c; g2kb_buf = c;
g2kb_set_done (); g2kb_set_done ();
} }
} } /* connected */
else
g2out_count = 0; /* not connected; next connections sees entire "screen" */
return SCPE_OK; return SCPE_OK;
} }
/****************************************************************/
/* Interrupt handling routines */ /* Interrupt handling routines */
t_bool g2kb_test_done () t_bool g2kb_test_done ()
@ -287,121 +293,113 @@ CLR_INT (G2);
return; return;
} }
/****************/ t_bool g2bb_test_flag ()
t_bool g2pb_test_done ()
{ {
if (g2pb_done) if (g2bb_flag)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
void g2pb_set_done () void g2bb_set_flag ()
{ {
g2pb_done = 1; g2bb_flag = 1;
SET_INT (G2); SET_INT (G2);
return; return;
} }
void g2pb_clr_done () void g2bb_clr_flag ()
{ {
g2pb_done = 0; g2bb_flag = 0;
CLR_INT (G2); CLR_INT (G2);
return; return;
} }
/****************************************************************/ /****************************************************************
/* Display Output: IOT routine */ * SIMH G2OUT (Display Output) DEVICE routines
*/
/* helper to put 7-bit display character:
* characters are only consumed if TELNET user connected & output ready/enabled
*/
static void g2out_putchar(char c)
{
if (g2_ldsc.conn && g2_ldsc.xmte) { /* connected, tx enabled? */
tmxr_putc_ln (&g2_ldsc, c);
g2out_count++; /* consumed */
}
}
/* Device 05 IOT routine */
int32 g2d1_iot (int32 dev, int32 pulse, int32 dat)
{
/* /*
* UNIX text display command lists always end with a TRAP * UNIX text display command lists always end with a TRAP
* and display output is restarted periodicly in timer PI service code * and display output is restarted periodicly in timer PI service code
*/ */
if (g2_ldsc.conn && g2_ldsc.xmte && pulse == 047) { /* conn&ready, "beg" */
static void g2_putchar(char c) int32 n = g2out_count, i;
{ g2out_addr = dat & 017777;
if (g2_ldsc.conn && g2_ldsc.xmte) { /* connected, tx enabled? */ for (i = g2out_addr; i < 020000; i++) {
tmxr_putc_ln (&g2_ldsc, c);
if (c == '\n')
tmxr_putc_ln (&g2_ldsc, '\r');
g2_dpycount++; /* only consume if connected+enabled! */
}
}
int32 g2d1 (int32 dev, int32 pulse, int32 dat)
{
if (g2_ldsc.conn && g2_ldsc.xmte && pulse == 047) { /* beg */
int32 n = g2_dpycount, i;
g2_dpyaddr = dat & 017777;
for (i = g2_dpyaddr; i < 020000; i++) {
uint32 w = M[i] & 0777777; uint32 w = M[i] & 0777777;
if (w & 0400000) /* TRAP? */ int offset = i - g2out_addr;
if (w & 0400000) /* TRAP (stops display engine)? */
break; break;
/* check first three words for expected setup commands */ /* check first three words for expected setup commands */
int o = i - g2_dpyaddr; if (offset < sizeof(g2_expect)/sizeof(g2_expect[0])) {
if (o < sizeof(g2_expect)/sizeof(g2_expect[0])) { if (w != g2_expect[offset]) {
if (w != g2_expect[o]) { /* TEMP: */
printf("g2: unexpected command at %#o: %#o expected %#o\r\n", printf("G2: unexpected command at %#o: %#o expected %#o\r\n",
i, w, g2_expect[o]); i, w, g2_expect[offset]);
break; break;
} }
continue; continue;
} }
if (w & 0300000) { /* not characters? */ if (w & 0300000) { /* not characters? */
printf("g2: unexpected command at %#o: %#o\r\n", i, w); printf("G2: unexpected command at %#o: %#o\r\n", i, w); /* TEMP */
break; break;
} }
if (--n < 0) /* new? */ if (--n < 0) /* new? */
g2_putchar( (w>>7) & 0177 ); g2out_putchar( (w>>7) & 0177 );
if ((w & 0177) && --n < 0) /* char2 & new? */ if ((w & 0177) && --n < 0) /* char2 & new? */
g2_putchar( w & 0177 ); g2out_putchar( w & 0177 );
} /* for loop */ } /* for loop */
fflush(stdout); /* TEMP */
if (n > 0) if (n > 0)
g2_dpycount = 0; /* didn't see as much as last time? */ g2out_count = 0; /* didn't see as much as last time? */
} /* beg IOT */ } /* beg IOT */
return dat; return dat;
} }
/* Unit service */ /****************************************************************
* subsystem common routines (used by both G2IN and G2OUT SIMH DEVICEs)
t_stat g2d1_svc (UNIT *uptr) */
{
if (g2_ldsc.conn) { /* connected? */
tmxr_poll_tx (&g2_desc); /* poll xmt */
if (!g2_ldsc.xmte) { /* tx not enabled? */
sim_activate (uptr, g2d1_unit.wait); /* wait */
}
}
return SCPE_OK;
}
/* Reset routine */ /* Reset routine */
t_stat g2_reset (DEVICE *dptr) t_stat g2_reset (DEVICE *dptr)
{ {
if (dptr->flags & DEV_DIS) { /* sync enables */ if (dptr->flags & DEV_DIS) { /* sync enables */
g2kb_dev.flags = g2kb_dev.flags | DEV_DIS; g2in_dev.flags = g2in_dev.flags | DEV_DIS;
g2d1_dev.flags = g2d1_dev.flags | DEV_DIS; g2out_dev.flags = g2out_dev.flags | DEV_DIS;
} }
else { else {
g2kb_dev.flags = g2kb_dev.flags & ~DEV_DIS; g2in_dev.flags = g2in_dev.flags & ~DEV_DIS;
g2d1_dev.flags = g2d1_dev.flags & ~DEV_DIS; g2out_dev.flags = g2out_dev.flags & ~DEV_DIS;
} }
if (g2kb_unit.flags & UNIT_ATT) /* if attached, */ if (g2in_unit.flags & UNIT_ATT) /* if attached, */
sim_activate (&g2kb_unit, tmxr_poll); /* activate */ sim_activate (&g2in_unit, tmxr_poll); /* activate */
else sim_cancel (&g2kb_unit); /* else stop */ else sim_cancel (&g2in_unit); /* else stop */
g2kb_buf = 0; /* clear buf */ g2kb_buf = 0; /* clear buf */
g2pb_bbuf = 0; /* clear buttons */
g2pb_lbuf = 0; /* clear lites */
g2_dpyaddr = 0;
g2_dpycount = 0;
g2kb_clr_done (); /* clear done */ g2kb_clr_done (); /* clear done */
g2pb_clr_done ();
sim_cancel (&g2d1_unit); /* stop poll */ g2bb_bbuf = 0; /* clear buttons */
g2bb_lbuf = 0; /* clear lights */
g2bb_clr_flag ();
g2out_addr = 0;
g2out_count = 0;
sim_cancel (&g2out_unit); /* stop poll */
return SCPE_OK; return SCPE_OK;
} }

5
PDP18B/pdp18b_sys.c
View file

@ -103,8 +103,7 @@ extern UNIT tti1_unit, tto1_unit;
extern DEVICE dr15_dev; extern DEVICE dr15_dev;
#endif #endif
#if defined (GRAPHICS2) #if defined (GRAPHICS2)
extern DEVICE g2kb_dev; extern DEVICE g2out_dev, g2in_dev;
extern DEVICE g2d1_dev;
#endif #endif
extern UNIT cpu_unit; extern UNIT cpu_unit;
extern REG cpu_reg[]; extern REG cpu_reg[];
@ -184,7 +183,7 @@ DEVICE *sim_devices[] = {
&dr15_dev, &dr15_dev,
#endif #endif
#if defined (GRAPHICS2) #if defined (GRAPHICS2)
&g2kb_dev, &g2d1_dev, &g2out_dev, &g2in_dev,
#endif #endif
NULL NULL
}; };