From 30530668567c7bce29a6eb7519f9ffeaa864f176 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rcornwell@github.com>
Date: Sun, 16 Oct 2016 21:50:08 -0400
Subject: [PATCH] I7000: Updated help commands.

---
 I7000/i7000_cdp.c | 29 ++++++++++++++++++++++++-----
 I7000/i7000_cdr.c | 28 ++++++++++++++++++++++------
 I7000/i7000_lpr.c | 20 ++++++++++++++++----
 I7000/i7090_cdp.c |  2 +-
 I7000/i7090_cdr.c |  2 +-
 I7000/i7090_lpr.c |  2 +-
 6 files changed, 65 insertions(+), 18 deletions(-)

diff --git a/I7000/i7000_cdp.c b/I7000/i7000_cdp.c
index c58c06f..8c532de 100644
--- a/I7000/i7000_cdp.c
+++ b/I7000/i7000_cdp.c
@@ -133,8 +133,7 @@ UNIT stack_unit[] = {
 DEVICE stack_dev = {
     "STKR", stack_unit, NULL, NULL,
     NUM_DEVS_CDP * 10, 10, 31, 1, 8, 7,
-    NULL, NULL, NULL,
-    NULL, NULL, NULL
+    NULL, NULL, NULL, NULL, &sim_card_attach, &sim_card_detach
     };
 #endif
 
@@ -310,10 +309,22 @@ cdp_detach(UNIT * uptr)
 t_stat
 cdp_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 {
-   fprintf (st, "Card Punch\n\n");
+   fprintf (st, "%s\n\n", cdp_description(dptr));
+   sim_card_attach_help(st, dptr, uptr, flag, cptr);
 #ifdef STACK_DEV
-   fprintf (st, "stack device\n");
+   fprintf (st, "If the punch device is not attached and instead the %s", stack_dev.name);
+   fprintf (st, "device is attached, the cards\n will be sent out to the");
+   fprintf (st, "given stacker based on the flag set by the processor."); 
 #endif
+#ifdef I7070
+   fprintf (st, "Unit record devices can be configured to interrupt the CPU on\n");
+   fprintf (st, "one of two priority channels A or B, to set this\n\n");
+   fprintf (st, "    sim> set cp attena     to set device to raise Atten A\n\n");
+#endif
+#ifdef I7010
+   fprintf (st, "The card punch could be attached to either channel\n\n");
+   fprintf (st, "    sim> set cp chan=1     to set the punch on channel 1\n\n");
+#endif   
    fprint_set_help(st, dptr);
    fprint_show_help(st, dptr);
    return SCPE_OK;
@@ -322,7 +333,15 @@ cdp_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 const char *
 cdp_description(DEVICE *dptr)
 {
-   return "Card Punch";
+#ifdef I7010
+   return "1402 Card Punch";
+#endif
+#ifdef I7070
+   return "7550 Card Punch";
+#endif
+#ifdef I7080
+   return "721 Card Punch";
+#endif
 }
 
 #endif
diff --git a/I7000/i7000_cdr.c b/I7000/i7000_cdr.c
index 4ae3dac..aed6726 100644
--- a/I7000/i7000_cdr.c
+++ b/I7000/i7000_cdr.c
@@ -236,7 +236,7 @@ cdr_srv(UNIT *uptr) {
         }
 #ifdef I7070
         /* Check if load card. */
-        if (uptr->capac && (data->image[uptr->capac] & 0x800)) {
+        if (uptr->capac && (data->image[uptr->capac-1] & 0x800)) {
              uptr->u5 |= URCSTA_LOAD;
         } else {
              uptr->u5 &= ~URCSTA_LOAD;
@@ -360,14 +360,22 @@ cdr_getload(FILE *st, UNIT *uptr, int32 v, CONST void *desc)
 t_stat
 cdr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 {
-   fprintf (st, "Card Reader\n\n");
+   fprintf (st, "%s\n\n", cdr_description(dptr));
+   sim_card_attach_help(st, dptr, uptr, flag, cptr);
    fprintf (st, "The system supports up to two card readers.\n");
 #ifdef I7070
-   fprintf (st, " Atten and LCOL\n");
+   fprintf (st, "Unit record devices can be configured to interrupt the CPU on\n");
+   fprintf (st, "one of two priority channels A or B, to set this\n\n");
+   fprintf (st, "    sim> set cp attena     to set device to raise Atten A\n\n");
+   fprintf (st, "The 7500 Card reader supported a load mode, this was\n");
+   fprintf (st, "selected by use of a 12 punch in a given column. When this\n");
+   fprintf (st, "was seen the card was read into 8 words\n");
+   fprintf (st, "    sim> set cp lcol=72    sets column to select load mode\n\n");
 #endif
 #ifdef I7010
-   fprintf (st, " channel\n");
-#endif   
+   fprintf (st, "The card punch could be attached to either channel\n\n");
+   fprintf (st, "    sim> set cp chan=1     to set the punch on channel 1\n\n");
+#endif
    fprint_set_help(st, dptr);
    fprint_show_help(st, dptr);
    return SCPE_OK;
@@ -376,7 +384,15 @@ cdr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 const char *
 cdr_description(DEVICE *dptr)
 {
-   return "Card Reader";
+#ifdef I7010
+   return "1402 Card Punch";
+#endif
+#ifdef I7070
+   return "7500 Card Reader";
+#endif
+#ifdef I7080
+   return "711 Card Reader";
+#endif
 }
 
 #endif
diff --git a/I7000/i7000_lpr.c b/I7000/i7000_lpr.c
index bd697e2..034c183 100644
--- a/I7000/i7000_lpr.c
+++ b/I7000/i7000_lpr.c
@@ -493,7 +493,8 @@ lpr_detach(UNIT * uptr)
 t_stat
 lpr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 {
-   fprintf (st, "Line Printer\n\n");
+
+   fprintf (st, "%s\n\n", lpr_description(dptr));
    fprintf (st, "The line printer output can be echoed to the console to check the \n");
    fprintf (st, "progress of jobs being run. This can be done with the\n");
    fprintf (st, "    sim> SET LPn ECHO\n\n");
@@ -504,10 +505,13 @@ lpr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
    fprintf (st, "Spacing control\n");
 #endif
 #ifdef I7070
-   fprintf (st, "ATTEN CONTROL\n");
+   fprintf (st, "Unit record devices can be configured to interrupt the CPU on\n");
+   fprintf (st, "one of two priority channels A or B, to set this\n\n");
+   fprintf (st, "    sim> set cp attena     to set device to raise Atten A\n\n");
 #endif
 #ifdef I7010
-   fprintf (st, "Channel\n");
+   fprintf (st, "The card punch could be attached to either channel\n\n");
+   fprintf (st, "    sim> set cp chan=1     to set the punch on channel 1\n\n");
 #endif
    fprint_set_help(st, dptr);
    fprint_show_help(st, dptr);
@@ -517,7 +521,15 @@ lpr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 const char *
 lpr_description(DEVICE *dptr)
 {
-   return "Line Printer";
+#ifdef I7010
+   return "1403 Line Printer";
+#endif
+#ifdef I7070
+   return "7400 Line Printer";
+#endif
+#ifdef I7080
+   return "716 Line Printer";
+#endif
 }
 
 #endif
diff --git a/I7000/i7090_cdp.c b/I7000/i7090_cdp.c
index 6f76dca..7ca9271 100644
--- a/I7000/i7090_cdp.c
+++ b/I7000/i7090_cdp.c
@@ -283,7 +283,7 @@ cdp_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 const char *
 cdp_description(DEVICE *dptr)
 {
-   return "Card Punch";
+   return "721 Card Punch";
 }
 
 
diff --git a/I7000/i7090_cdr.c b/I7000/i7090_cdr.c
index 74e47e2..833262a 100644
--- a/I7000/i7090_cdr.c
+++ b/I7000/i7090_cdr.c
@@ -332,7 +332,7 @@ cdr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 const char *
 cdr_description(DEVICE *dptr)
 {
-   return "Card Reader";
+   return "711 Card Reader";
 }
 
 #endif 
diff --git a/I7000/i7090_lpr.c b/I7000/i7090_lpr.c
index 544c9d8..4ac50fc 100644
--- a/I7000/i7090_lpr.c
+++ b/I7000/i7090_lpr.c
@@ -613,7 +613,7 @@ lpr_help(FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, const char *cptr)
 const char *
 lpr_description(DEVICE *dptr)
 {
-   return "Line Printer";
+   return "716 Line Printer";
 }