From fb4c3ee65341260783a066172ada2c1418d5ce7a Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Fri, 1 Jul 2022 09:39:52 -1000 Subject: [PATCH] SCP: Include unit based logical names in SHOW NAMES output --- scp.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/scp.c b/scp.c index d4a1e7f7..e93b911e 100644 --- a/scp.c +++ b/scp.c @@ -7008,10 +7008,20 @@ return SCPE_OK; t_stat show_dev_logicals (FILE *st, DEVICE *dptr, UNIT *uptr, int32 flag, CONST char *cptr) { +uint32 u; +t_bool found = FALSE; + +for (u = 0; u < dptr->numunits; u++) { + if (dptr->units[u].lname) { + found = TRUE; + fprintf (st, "%s -> %s%u\n", dptr->units[u].lname, dptr->name, u); + } + } if (dptr->lname) fprintf (st, "%s -> %s\n", dptr->lname, dptr->name); -else if (!flag) - fputs ("no logical name assigned\n", st); +else + if ((!flag) && (!found)) + fputs ("no logical name assigned\n", st); return SCPE_OK; }