From fae991d592480a551b9eb0a5c513d152293cee03 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 10 Jan 2013 16:10:39 -0800
Subject: [PATCH] More compiler identified cleanups

---
 ALTAIR/altair_cpu.c     |  2 +-
 descrip.mms             |  6 +++---
 swtp6800/common/m6800.c |  2 +-
 swtp6800/common/mp-b2.c |  2 +-
 swtp6800/common/mp-s.c  | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ALTAIR/altair_cpu.c b/ALTAIR/altair_cpu.c
index cfde68dd..74a62635 100644
--- a/ALTAIR/altair_cpu.c
+++ b/ALTAIR/altair_cpu.c
@@ -297,7 +297,7 @@ DEVICE cpu_dev = {
     NULL, NULL, NULL
 };
 
-int32 sim_instr (void)
+t_stat sim_instr (void)
 {
     int32 PC, IR, OP, DAR, reason, hi, lo, carry, i;
 
diff --git a/descrip.mms b/descrip.mms
index 106027e2..68282a3f 100644
--- a/descrip.mms
+++ b/descrip.mms
@@ -925,7 +925,7 @@ $(SIMH_NONET_LIB) : $(SIMH_SOURCE)
         $!
         $! Building The $(SIMH_NONET_LIB) Library.
         $!
-        $ $(CC)/DEF=($(CC_DEFS) -
+        $ $(CC)/DEF=($(CC_DEFS)) -
                /OBJ=$(BLD_DIR) $(MMS$CHANGED_LIST)
         $ IF (F$SEARCH("$(MMS$TARGET)").EQS."") THEN -
              LIBRARY/CREATE $(MMS$TARGET)
@@ -1810,7 +1810,7 @@ $(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800MP
         $!
         $! Building The $(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE Simulator.
         $!
-        $ $(CC)$(SWTP_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
+        $ $(CC)$(SWTP6800MP_A_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SWTP6800MP-A-$(ARCH).EXE -
                $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
@@ -1822,7 +1822,7 @@ $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE : $(SIMH_MAIN) $(SIMH_NONET_LIB) $(SWTP6800M
         $!
         $! Building The $(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE Simulator.
         $!
-        $ $(CC)$(SWTP_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
+        $ $(CC)$(SWTP6800MP_A2_OPTIONS)/OBJ=$(BLD_DIR) SCP.C
         $ LINK $(LINK_DEBUG)/EXE=$(BIN_DIR)SWTP6800MP-A2-$(ARCH).EXE -
                $(BLD_DIR)SCP.OBJ,$(SWTP6800MP_A2_LIB)/LIBRARY,$(SIMH_NONET_LIB)/LIBRARY
         $ DELETE/NOLOG/NOCONFIRM $(BLD_DIR)*.OBJ;*
diff --git a/swtp6800/common/m6800.c b/swtp6800/common/m6800.c
index d2e1c552..794184c7 100644
--- a/swtp6800/common/m6800.c
+++ b/swtp6800/common/m6800.c
@@ -299,7 +299,7 @@ int32 oplen[256] = {
 3,3,3,0,3,3,3,3,3,3,3,3,0,0,3,3
 };
 
-int32 sim_instr (void)
+t_stat sim_instr (void)
 {
     int32 IR, OP, DAR, reason, hi, lo, op1;
 
diff --git a/swtp6800/common/mp-b2.c b/swtp6800/common/mp-b2.c
index 7b93d7d5..c5253ec9 100644
--- a/swtp6800/common/mp-b2.c
+++ b/swtp6800/common/mp-b2.c
@@ -76,7 +76,7 @@ address is here, 'nulldev' means no device is available
 */
 
 struct idev {
-        int32 (*routine)();
+        int32 (*routine)(int32, int32);
 };
 
 struct idev dev_table[32] = {
diff --git a/swtp6800/common/mp-s.c b/swtp6800/common/mp-s.c
index 13ba3b12..47394233 100644
--- a/swtp6800/common/mp-s.c
+++ b/swtp6800/common/mp-s.c
@@ -145,7 +145,7 @@ DEVICE ptp_dev = {
 
 /* console input service routine */
 
-int32 sio_svc (UNIT *uptr)
+t_stat sio_svc (UNIT *uptr)
 {
     int32 temp;
 
@@ -161,7 +161,7 @@ int32 sio_svc (UNIT *uptr)
 
 /* paper tape reader input service routine */
 
-int32 ptr_svc (UNIT *uptr)
+t_stat ptr_svc (UNIT *uptr)
 {
     int32 temp;
 
@@ -177,14 +177,14 @@ int32 ptr_svc (UNIT *uptr)
 
 /* paper tape punch output service routine */
 
-int32 ptp_svc (UNIT *uptr)
+t_stat ptp_svc (UNIT *uptr)
 {
     return SCPE_OK;
 }
 
 /* Reset console */
 
-int32 sio_reset (DEVICE *dptr)
+t_stat sio_reset (DEVICE *dptr)
 {
     sio_unit.buf = 0;                   // Data buffer
     sio_unit.u3 = 0x02;                 // Status buffer
@@ -195,7 +195,7 @@ int32 sio_reset (DEVICE *dptr)
 
 /* Reset paper tape reader */
 
-int32 ptr_reset (DEVICE *dptr)
+t_stat ptr_reset (DEVICE *dptr)
 {
     ptr_unit.buf = 0;
     ptr_unit.u3 = 0x02;
@@ -206,7 +206,7 @@ int32 ptr_reset (DEVICE *dptr)
 
 /* Reset paper tape punch */
 
-int32 ptp_reset (DEVICE *dptr)
+t_stat ptp_reset (DEVICE *dptr)
 {
     ptp_unit.buf = 0;
     ptp_unit.u3 = 0x02;