From 93e5e89401c0c58a2617b019f86e2fcdcb2ae919 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Fri, 29 Oct 2021 21:26:16 -0400 Subject: [PATCH] KA10: Reversed newline/carrage return to carrage return/newline. --- PDP10/ka10_pmp.c | 8 ++++---- PDP10/kl10_dn.c | 2 +- PDP10/kl10_fe.c | 2 +- PDP10/kl10_nia.c | 6 +++--- PDP10/ks10_rh.c | 2 +- PDP10/ks10_uba.c | 4 ++-- PDP10/kx10_imp.c | 6 +++--- PDP10/kx10_pt.c | 12 ++++++------ PDP10/kx10_rh.c | 2 +- PDP10/kx10_rp.c | 2 +- PDP10/kx10_tu.c | 2 +- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/PDP10/ka10_pmp.c b/PDP10/ka10_pmp.c index 828deca..6528ba2 100644 --- a/PDP10/ka10_pmp.c +++ b/PDP10/ka10_pmp.c @@ -2212,8 +2212,8 @@ pmp_format(UNIT * uptr, int flag) { uptr->CMD |= DK_ATTN; pmp_statusb |= REQ_CH; sim_activate(uptr, 100); - fputc('\n', stderr); fputc('\r', stderr); + fputc('\n', stderr); return 0; } else return 1; @@ -2243,7 +2243,7 @@ pmp_attach(UNIT * uptr, CONST char *file) return SCPE_OK; } - sim_messagef(SCPE_OK, "Drive %03x=%d %d %02x %d\n\r", addr, + sim_messagef(SCPE_OK, "Drive %03x=%d %d %02x %d\r\n", addr, hdr.heads, hdr.tracksize, hdr.devtype, hdr.highcyl); for (i = 0; disk_type[i].name != 0; i++) { tsize = (uint32)((disk_type[i].bpt | 0x1ff) + 1); @@ -2251,7 +2251,7 @@ pmp_attach(UNIT * uptr, CONST char *file) hdr.heads == disk_type[i].heads && hdr.highcyl == disk_type[i].cyl) { if (GET_TYPE(uptr->flags) != i) { /* Ask if we should change */ - fprintf(stderr, "Wrong type %s\n\r", disk_type[i].name); + fprintf(stderr, "Wrong type %s\r\n", disk_type[i].name); if (!get_yn("Update dasd type? [N] ", FALSE)) { detach_unit(uptr); return SCPE_FMT; @@ -2367,7 +2367,7 @@ pmp_set_dev_addr(UNIT * uptr, int32 val, CONST char *cptr, void *desc) /* Update device entry */ uptr->flags &= ~UNIT_ADDR(0xff); uptr->flags |= UNIT_ADDR(newdev); - fprintf(stderr, "Set dev %x\n\r", GET_UADDR(uptr->flags)); + fprintf(stderr, "Set dev %x\r\n", GET_UADDR(uptr->flags)); return r; } diff --git a/PDP10/kl10_dn.c b/PDP10/kl10_dn.c index d464d1b..0283be0 100644 --- a/PDP10/kl10_dn.c +++ b/PDP10/kl10_dn.c @@ -528,7 +528,7 @@ error: if ((word & PRI_CMT_IP) != 0) { /* Transfer from 10 */ if ((uptr->STATUS & DTE_IND) == 0) { - fprintf(stderr, "DTE out of sync\n\r"); + fprintf(stderr, "DTE out of sync\r\n"); return; } /* Get size of transfer */ diff --git a/PDP10/kl10_fe.c b/PDP10/kl10_fe.c index 8ec4891..760914f 100644 --- a/PDP10/kl10_fe.c +++ b/PDP10/kl10_fe.c @@ -896,7 +896,7 @@ error: if ((word & PRI_CMT_IP) != 0) { /* Transfer from 10 */ if ((uptr->STATUS & DTE_IND) == 0) { - fprintf(stderr, "DTE out of sync\n\r"); + fprintf(stderr, "DTE out of sync\r\n"); return; } /* Get size of transfer */ diff --git a/PDP10/kl10_nia.c b/PDP10/kl10_nia.c index b1972e6..82d9765 100644 --- a/PDP10/kl10_nia.c +++ b/PDP10/kl10_nia.c @@ -874,7 +874,7 @@ void nia_load_ptt() nia_error(EBSERR); return; } - sim_debug(DEBUG_DETAIL, &nia_dev, "NIA load ptt%d: %012llo %012llo\n\r", + sim_debug(DEBUG_DETAIL, &nia_dev, "NIA load ptt%d: %012llo %012llo\n", n, word1, word2); if (word1 & SMASK) { uint16 type; @@ -887,7 +887,7 @@ void nia_load_ptt() addr++; } for (i = 0; i < n; i++) - sim_debug(DEBUG_DETAIL, &nia_dev, "NIA load ptt%d: %04x %010o\n\r", + sim_debug(DEBUG_DETAIL, &nia_dev, "NIA load ptt%d: %04x %010o\n", n, nia_data.ptt_proto[i], nia_data.ptt_head[i]); nia_data.ptt_n = n; } @@ -925,7 +925,7 @@ void nia_load_mcast() } for(i = 0; i< n; i++) { eth_mac_fmt(&nia_data.macs[i], buffer); - sim_debug(DEBUG_DETAIL, &nia_dev, "NIA load mcast%d: %s\n\r",i,buffer); + sim_debug(DEBUG_DETAIL, &nia_dev, "NIA load mcast%d: %s\n",i,buffer); } nia_data.macs_n = n - 2; if (nia_recv_uptr->flags & UNIT_ATT) diff --git a/PDP10/ks10_rh.c b/PDP10/ks10_rh.c index 108296a..1425b8e 100644 --- a/PDP10/ks10_rh.c +++ b/PDP10/ks10_rh.c @@ -298,7 +298,7 @@ rh_devirq(uint32 dev, t_addr addr) { else if (rhc->imode == 2) /* RH20 style */ addr = rhc->ivect; } else { - sim_printf("Unable to find device %03o\n\r", dev); + sim_printf("Unable to find device %03o\r\n", dev); } return addr; } diff --git a/PDP10/ks10_uba.c b/PDP10/ks10_uba.c index 05ae82a..b5e1b8f 100644 --- a/PDP10/ks10_uba.c +++ b/PDP10/ks10_uba.c @@ -144,7 +144,7 @@ uba_write(t_addr addr, int ctl, uint64 data, int access) uint32 map = (uint32)(data & 03777) << 9; map |= (uint32)(data & 0740000) << 13; uba_map[ubm][addr & 077] = map; - sim_debug(DEBUG_EXP, &cpu_dev, "Wr MAP %02o %012llo %06o\n\r", + sim_debug(DEBUG_EXP, &cpu_dev, "Wr MAP %02o %012llo %06o\n", addr & 077, data, map); return 0; } else if ((addr & 077) == 0) { @@ -217,7 +217,7 @@ uba_write_npr(t_addr addr, uint16 ctl, uint64 data) addr = (map & PAGE_MASK) | (addr >> 2) & 0777; if (map & MAP_EN16) data &= 0177777177777; - sim_debug(DEBUG_DATA, &cpu_dev, "Wr NPR %08o %08o %012llo\n\r", oaddr, addr, data); + sim_debug(DEBUG_DATA, &cpu_dev, "Wr NPR %08o %08o %012llo\n", oaddr, addr, data); M[addr] = data; return 1; } diff --git a/PDP10/kx10_imp.c b/PDP10/kx10_imp.c index c4bcc71..13f0cea 100644 --- a/PDP10/kx10_imp.c +++ b/PDP10/kx10_imp.c @@ -1214,7 +1214,7 @@ imp_send_packet (struct imp_device *imp, int len) case 1: /* Error */ break; case 2: /* Host going down */ -fprintf(stderr, "IMP: Host shutdown\n\r"); +fprintf(stderr, "IMP: Host shutdown\r\n"); break; case 4: /* Nop */ if (imp->init_state < 3) @@ -2027,7 +2027,7 @@ imp_do_dhcp_client(struct imp_device *imp, ETH_PACK *read_buffer) ip_checksum((uint8 *)&sum, (uint8 *)ip_hdr, hl); if (sum != 0) { - sim_printf("IP checksum error %x\n\r", sum); + sim_printf("IP checksum error %x\r\n", sum); return; } ip_checksum((uint8 *)(&sum), (uint8 *)(upkt), ntohs(upkt->len)); @@ -2038,7 +2038,7 @@ imp_do_dhcp_client(struct imp_device *imp, ETH_PACK *read_buffer) udp_hdr.hlen = upkt->len; checksumadjust((uint8 *)&sum, 0, 0, (uint8 *)(&udp_hdr), sizeof(udp_hdr)); if (sum != 0) { - sim_printf("UDP checksum error %x\n\r", sum); + sim_printf("UDP checksum error %x\r\n", sum); return; } diff --git a/PDP10/kx10_pt.c b/PDP10/kx10_pt.c index 6a326e3..35b7eca 100644 --- a/PDP10/kx10_pt.c +++ b/PDP10/kx10_pt.c @@ -130,7 +130,7 @@ t_stat ptp_devio(uint32 dev, uint64 *data) { if (cpu_unit[0].flags & UNIT_WAITS) *data |= 0200; #endif - sim_debug(DEBUG_CONI, &ptp_dev, "PP: CONI %012llo\n\r", *data); + sim_debug(DEBUG_CONI, &ptp_dev, "PP: CONI %012llo\n", *data); break; case CONO: @@ -144,7 +144,7 @@ t_stat ptp_devio(uint32 dev, uint64 *data) { } if (uptr->STATUS & DONE_FLG) set_interrupt(dev, uptr->STATUS); - sim_debug(DEBUG_CONO, &ptp_dev, "PP: CONO %012llo\n\r", *data); + sim_debug(DEBUG_CONO, &ptp_dev, "PP: CONO %012llo\n", *data); break; case DATAO: @@ -159,7 +159,7 @@ t_stat ptp_devio(uint32 dev, uint64 *data) { clr_interrupt(dev); sim_activate (&ptp_unit, ptp_unit.wait); } - sim_debug(DEBUG_DATAIO, &ptp_dev, "PP: DATAO %012llo\n\r", *data); + sim_debug(DEBUG_DATAIO, &ptp_dev, "PP: DATAO %012llo\n", *data); break; case DATAI: *data = 0; @@ -230,7 +230,7 @@ t_stat ptr_devio(uint32 dev, uint64 *data) { switch(dev & 3) { case CONI: *data = uptr->STATUS; - sim_debug(DEBUG_CONI, &ptr_dev, "PT: CONI %012llo\n\r", *data); + sim_debug(DEBUG_CONI, &ptr_dev, "PT: CONI %012llo\n", *data); break; case CONO: @@ -245,7 +245,7 @@ t_stat ptr_devio(uint32 dev, uint64 *data) { } if (uptr->STATUS & DONE_FLG) set_interrupt(dev, uptr->STATUS); - sim_debug(DEBUG_CONO, &ptr_dev, "PT: CONO %012llo\n\r", *data); + sim_debug(DEBUG_CONO, &ptr_dev, "PT: CONO %012llo\n", *data); break; case DATAI: @@ -257,7 +257,7 @@ t_stat ptr_devio(uint32 dev, uint64 *data) { sim_activate (&ptr_unit, ptr_unit.wait); } uptr->STATUS |= BUSY_FLG; - sim_debug(DEBUG_DATAIO, &ptr_dev, "PT: DATAI %012llo\n\r", *data); + sim_debug(DEBUG_DATAIO, &ptr_dev, "PT: DATAI %012llo\n", *data); break; case DATAO: break; diff --git a/PDP10/kx10_rh.c b/PDP10/kx10_rh.c index 28bc278..1a76c3a 100644 --- a/PDP10/kx10_rh.c +++ b/PDP10/kx10_rh.c @@ -771,7 +771,7 @@ rh_devirq(uint32 dev, t_addr addr) { else if (rhc->imode == 2) /* RH20 style */ addr = rhc->ivect; } else { - sim_printf("Unable to find device %03o\n\r", dev); + sim_printf("Unable to find device %03o\r\n", dev); } return addr; } diff --git a/PDP10/kx10_rp.c b/PDP10/kx10_rp.c index e2142e7..da6af3e 100644 --- a/PDP10/kx10_rp.c +++ b/PDP10/kx10_rp.c @@ -642,7 +642,7 @@ rp_write(DEVICE *dptr, struct rh_if *rhc, int reg, uint32 data) { regs[RPLA] = 0; } regs[RPMR] = data; - fprintf(stderr, "Write %o MR=%06o\n\r", unit, data); + fprintf(stderr, "Write %o MR=%06o\r\n", unit, data); } else regs[RPMR] = 0; break; diff --git a/PDP10/kx10_tu.c b/PDP10/kx10_tu.c index 444f0a9..d522642 100644 --- a/PDP10/kx10_tu.c +++ b/PDP10/kx10_tu.c @@ -377,7 +377,7 @@ tu_write(DEVICE *dptr, struct rh_if *rhc, int reg, uint32 data) { break; case 003: /* maintenance */ regs[TUMR] = data; - fprintf(stderr, "TU MR=%06o\n\r", data); + fprintf(stderr, "TU MR=%06o\r\n", data); break; case 004: /* atten summary */ rhc->attn = 0;