I7000: Fixed compiler warning in i7080 simulator.

open-simh · Dec 31, 2023 · 8cbb895 · 8cbb895
1 parent e03dc94
commit 8cbb895
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/I7000/i7080_chan.c b/I7000/i7080_chan.c
@@ -360,8 +360,8 @@ int chan_zero_reccnt(int chan) {
 
 /* Return next channel data address, advance address by 5 if channel */
 uint32  chan_next_addr(int chan) {
-    int         unit = 0;
-    int         s_unit = 0;
+    uint32      unit = 0;
+    uint32      s_unit = 0;
     uint32      addr = 0;
     switch(CHAN_G_TYPE(chan_unit[chan].flags)) {
     case CHAN_754:
@@ -910,7 +910,7 @@ chan_cmd(uint16 dev, uint16 dcmd, uint32 addr)
         chan_flags[chan] &= ~(CHS_EOF|CHS_ERR|CHS_ATTN);
     /* Activate channel if select raised */
     if (r == SCPE_OK && chan_flags[chan] & DEV_SEL) {
-        int    t_unit;
+        uint32    t_unit;
         chan_flags[chan] |= STA_ACTIVE;
         irqdev[chan] = dev;
         irqflags &= ~(1 << chan);

diff --git a/I7000/i7080_cpu.c b/I7000/i7080_cpu.c
@@ -120,8 +120,8 @@ const char          *cpu_description (DEVICE *dptr);
 
 uint32 read_addr(uint8 *reg, uint8 *zone);
 void write_addr(uint32 addr, uint8 reg, uint8 zone);
-uint32 load_addr(int *loc);
-void store_addr(uint32 addr, int *loc);
+uint32 load_addr(uint32 *loc);
+void store_addr(uint32 addr, uint32 *loc);
 void store_cpu(uint32 addr, int full);
 void load_cpu(uint32 addr, int full);
 uint16 get_acstart(uint8 reg);
@@ -2405,7 +2405,7 @@ void write_addr(uint32 addr, uint8 reg, uint8 zone) {
 }
 
 /* Store converted address in storage */
-void store_addr(uint32 addr, int *loc) {
+void store_addr(uint32 addr, uint32 *loc) {
     uint8       value[4];
     int         i;
 
@@ -2454,7 +2454,7 @@ void store_addr(uint32 addr, int *loc) {
 
 
 /* Read address from storage */
-uint32 load_addr(int *loc) {
+uint32 load_addr(uint32 *loc) {
     uint8       t;
     uint8       f;
     uint8       zone;
@@ -2507,7 +2507,7 @@ uint32 load_addr(int *loc) {
 }
 
 /* Store converted hex address in storage */
-void store_hex(uint32 addr, int *loc) {
+void store_hex(uint32 addr, uint32 *loc) {
    /* Convert address into BCD first */
     AC[*loc] = bin_bcd[addr & 0xf];
     *loc = next_addr[*loc];
@@ -2520,7 +2520,7 @@ void store_hex(uint32 addr, int *loc) {
 }
 
 /* Read hex address from storage */
-uint32 load_hex(int *loc) {
+uint32 load_hex(uint32 *loc) {
     uint8       t;
     uint8       f;
     uint32      addr;

diff --git a/I7000/i7080_defs.h b/I7000/i7080_defs.h
@@ -36,8 +36,8 @@ int chan_cmd(uint16 dev, uint16 cmd, uint32 addr);
 int chan_mapdev(uint16 dev);
 /* Process the CHR 3 13 command and abort all channel activity */
 void chan_chr_13();
-uint32 load_addr(int *loc);
-void store_addr(uint32 addr, int *loc);
+uint32 load_addr(uint32 *loc);
+void store_addr(uint32 addr, uint32 *loc);
 
 /* Opcode definitions. */
 #define OP_TR           CHR_1