From e8dc360c6c9d8f6144eb5e9978e0b52ae0908776 Mon Sep 17 00:00:00 2001
From: Richard Cornwell <rich@sky-visions.com>
Date: Fri, 29 Oct 2021 21:27:01 -0400
Subject: [PATCH] IBM360: Reversed newline/carrage return to carrage
 return/newline

---
 IBM360/ibm360_dasd.c |  6 +++---
 IBM360/ibm360_mt.c   | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/IBM360/ibm360_dasd.c b/IBM360/ibm360_dasd.c
index 4867fc3..9eadcd4 100644
--- a/IBM360/ibm360_dasd.c
+++ b/IBM360/ibm360_dasd.c
@@ -1981,8 +1981,8 @@ dasd_format(UNIT * uptr, int flag) {
         data->ccyl = 0;
         set_devattn(addr, SNS_DEVEND);
         sim_activate(uptr, 100);
-        fputc('\n', stderr);
         fputc('\r', stderr);
+        fputc('\n', stderr);
         return 0;
     } else
         return 1;
@@ -2014,7 +2014,7 @@ dasd_attach(UNIT * uptr, CONST char *file)
     }
 
     isize = sim_fsize(uptr->fileref);
-    sim_messagef(SCPE_OK, "Drive %03x=%d %d %02x %02x %d\n\r",  addr,
+    sim_messagef(SCPE_OK, "Drive %03x=%d %d %02x %02x %d\r\n",  addr,
              hdr.heads, hdr.tracksize, hdr.devtype, hdr.fileseq, hdr.highcyl);
     for (i = 0; disk_type[i].name != 0; i++) {
          tsize = (disk_type[i].bpt | 0x1ff) + 1;
@@ -2023,7 +2023,7 @@ dasd_attach(UNIT * uptr, CONST char *file)
              hdr.heads == disk_type[i].heads && dsize == isize) {
              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;
diff --git a/IBM360/ibm360_mt.c b/IBM360/ibm360_mt.c
index 40ea033..a702c73 100644
--- a/IBM360/ibm360_mt.c
+++ b/IBM360/ibm360_mt.c
@@ -535,7 +535,7 @@ t_stat mt_srv(UNIT * uptr)
 
          /* Send character over to channel */
          if (chan_write_byte(addr, &ch)) {
-             sim_debug(DEBUG_DATA, dptr, "Read unit=%d EOR\n\r", unit);
+             sim_debug(DEBUG_DATA, dptr, "Read unit=%d EOR\n", unit);
              /* If not read whole record, skip till end */
              if ((t_addr)uptr->POS < uptr->hwmark) {
                  /* Send dummy character to force SLI */
@@ -553,7 +553,7 @@ t_stat mt_srv(UNIT * uptr)
                 chan_end(addr, SNS_CHNEND|SNS_DEVEND);
              }
          } else {
-              sim_debug(DEBUG_DATA, dptr, "Read data unit=%d %d %02x\n\r",
+              sim_debug(DEBUG_DATA, dptr, "Read data unit=%d %d %02x\n",
                        unit, uptr->POS, ch);
               if ((t_addr)uptr->POS >= uptr->hwmark) {       /* In IRG */
                   /* Handle end of record */
@@ -639,7 +639,7 @@ t_stat mt_srv(UNIT * uptr)
                 ch |= parity_table[ch] ^ mode;
              }
              mt_buffer[bufnum][uptr->POS++] = ch;
-             sim_debug(DEBUG_DATA, dptr, "Write data unit=%d %d %02o\n\r",
+             sim_debug(DEBUG_DATA, dptr, "Write data unit=%d %d %02o\n",
                       unit, uptr->POS, ch);
              uptr->hwmark = uptr->POS;
          }
@@ -695,7 +695,7 @@ t_stat mt_srv(UNIT * uptr)
          }
 
          if (chan_write_byte(addr, &ch)) {
-                   sim_debug(DEBUG_DATA, dptr, "Read unit=%d EOR\n\r", unit);
+                   sim_debug(DEBUG_DATA, dptr, "Read unit=%d EOR\n", unit);
               /* If not read whole record, skip till end */
               if (uptr->POS >= 0) {
                   sim_activate(uptr, (uptr->POS) * 20);
@@ -711,7 +711,7 @@ t_stat mt_srv(UNIT * uptr)
                  chan_end(addr, SNS_CHNEND|SNS_DEVEND);
               }
          } else {
-              sim_debug(DEBUG_DATA, dptr, "Read data unit=%d %d %02o\n\r",
+              sim_debug(DEBUG_DATA, dptr, "Read data unit=%d %d %02o\n",
                             unit, uptr->POS, ch);
               if (uptr->POS == 0) {      /* In IRG */
                   uptr->CMD &= ~MT_CMDMSK;