[Vice-emu-commit] SF.net SVN: vice-emu: [18848] branches/marco/ports/vice/src

Revision: 18848
          http://vice-emu.svn.sourceforge.net/vice-emu/?rev=18848&view=rev
Author:   blackystardust
Date:     2008-06-08 14:56:20 -0700 (Sun, 08 Jun 2008)

Log Message:
-----------
Fixed some common code warnings/issues

Modified Paths:
--------------
    branches/marco/ports/vice/src/alarm.h
    branches/marco/ports/vice/src/c128/c128mem.c
    branches/marco/ports/vice/src/c1541.c
    branches/marco/ports/vice/src/c64/tfe.c
    branches/marco/ports/vice/src/cbmimage.c
    branches/marco/ports/vice/src/fsdevice/fsdevice-open.c
    branches/marco/ports/vice/src/pet/petmem.c
    branches/marco/ports/vice/src/plus4/ted-mem.c
    branches/marco/ports/vice/src/sid/sid-resources.c
    branches/marco/ports/vice/src/sounddrv/soundwmm.c
    branches/marco/ports/vice/src/vdrive/vdrive-command.c
    branches/marco/ports/vice/src/vdrive/vdrive-internal.c
    branches/marco/ports/vice/src/vicii/vicii-mem.c

Modified: branches/marco/ports/vice/src/alarm.h
===================================================================
--- branches/marco/ports/vice/src/alarm.h	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/alarm.h	2008-06-08 21:56:20 UTC (rev 18848)
@@ -139,9 +139,6 @@
 
     offset = (CLOCK)(cpu_clk - context->next_pending_alarm_clk);
 
-    if (offset < 0)
-        return;
-
     idx = context->next_pending_alarm_idx;
     alarm = context->pending_alarms[idx].alarm;
 

Modified: branches/marco/ports/vice/src/c128/c128mem.c
===================================================================
--- branches/marco/ports/vice/src/c128/c128mem.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/c128/c128mem.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -340,33 +340,43 @@
 
     switch ((BYTE)addr) {
       case 0:
-        if (/*vbank ==*/ 0) {
+#if 0
+        if (vbank == 0) {
             vicii_mem_vbank_store((WORD)0, vicii_read_phi1_lowlevel());
         } else {
+#endif
             mem_page_zero[0] = vicii_read_phi1_lowlevel();
             machine_handle_pending_alarms(maincpu_rmw_flag + 1);
+#if 0
         }
+#endif
         if (pport.dir != value) {
             pport.dir = value;
             mem_pla_config_changed();
         }
         break;
       case 1:
-        if (/*vbank ==*/ 0) {
+#if 0
+        if (vbank == 0) {
             vicii_mem_vbank_store((WORD)1, vicii_read_phi1_lowlevel());
         } else {
+#endif
             mem_page_zero[1] = vicii_read_phi1_lowlevel();
             machine_handle_pending_alarms(maincpu_rmw_flag + 1);
+#if 0
         }
+#endif
         if (pport.data != value) {
             pport.data = value;
             mem_pla_config_changed();
         }
         break;
       default:
-        if (/*vbank ==*/ 0)
+#if 0
+        if (vbank == 0)
             vicii_mem_vbank_store(addr, value);
         else
+#endif
             mem_page_zero[addr] = value;
     }
 }

Modified: branches/marco/ports/vice/src/c1541.c
===================================================================
--- branches/marco/ports/vice/src/c1541.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/c1541.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -2008,7 +2008,6 @@
                                 block[n++] = 0x00;
                             break;
                         }
-                        block[n] = c;
                     }
                     if (numBlks == 1) { /* last block */
                         block[0] = 0;

Modified: branches/marco/ports/vice/src/c64/tfe.c
===================================================================
--- branches/marco/ports/vice/src/c64/tfe.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/c64/tfe.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -1172,8 +1172,12 @@
 
             if(odd_address && (ppaddress == TFE_PP_ADDR_LOG_ADDR_FILTER+6))
                 log_message(tfe_log,"set hash filter: %02x:%02x:%02x:%02x:%02x:%02x",
-                            tfe_hash_mask[0],tfe_hash_mask[1],tfe_hash_mask[2],
-                            tfe_hash_mask[3],tfe_hash_mask[4],tfe_hash_mask[5]);
+                            (unsigned int)tfe_hash_mask[0],
+                            (unsigned int)tfe_hash_mask[1],
+                            (unsigned int)tfe_hash_mask[2],
+                            (unsigned int)tfe_hash_mask[3],
+                            (unsigned int)tfe_hash_mask[4],
+                            (unsigned int)tfe_hash_mask[5]);
         }
         break;
 

Modified: branches/marco/ports/vice/src/cbmimage.c
===================================================================
--- branches/marco/ports/vice/src/cbmimage.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/cbmimage.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -36,9 +36,7 @@
       case DISK_IMAGE_TYPE_TAP:
         return tape_image_create(name, type);
       default:
-        return disk_image_fsimage_create(name, type);
+        break;
     }
-
-    return -1;
+    return disk_image_fsimage_create(name, type);
 }
-

Modified: branches/marco/ports/vice/src/fsdevice/fsdevice-open.c
===================================================================
--- branches/marco/ports/vice/src/fsdevice/fsdevice-open.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/fsdevice/fsdevice-open.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -260,12 +260,10 @@
         bufinfo[secondary].fileio_info = finfo;
         fsdevice_error(vdrive, CBMDOS_IPE_OK);
         return FLOPPY_COMMAND_OK;
-    } else {
-        fsdevice_error(vdrive, CBMDOS_IPE_NOT_FOUND);
-        return FLOPPY_ERROR;
     }
 
-    return FLOPPY_COMMAND_OK;
+    fsdevice_error(vdrive, CBMDOS_IPE_NOT_FOUND);
+    return FLOPPY_ERROR;
 }
 
 int fsdevice_open(vdrive_t *vdrive, const BYTE *name, unsigned int length,

Modified: branches/marco/ports/vice/src/pet/petmem.c
===================================================================
--- branches/marco/ports/vice/src/pet/petmem.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/pet/petmem.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -822,25 +822,26 @@
       case 0x00:
         return addr >> 8;
       default:                  /* 0x30, 0x50, 0x60, 0x70, 0x90-0xf0 */
-        if (addr & 0x10)
-            v1 = pia1_peek(addr);
-        else
-            v1 = 0xff;
-        if (addr & 0x20)
-            v2 = pia2_peek(addr);
-        else
-            v2 = 0xff;
-        if (addr & 0x40)
-            v3 = via_peek(addr);
-        else
-            v3 = 0xff;
-        v4 = 0xff;
-        if ((addr & 0x80) && petres.crtc) {
-            v4 = crtc_read(addr);
-        }
-        return v1 & v2 & v3 & v4;
+        break;
     }
-    return 0xff;
+
+    if (addr & 0x10)
+        v1 = pia1_peek(addr);
+    else
+        v1 = 0xff;
+    if (addr & 0x20)
+        v2 = pia2_peek(addr);
+    else
+        v2 = 0xff;
+    if (addr & 0x40)
+        v3 = via_peek(addr);
+    else
+        v3 = 0xff;
+    v4 = 0xff;
+    if ((addr & 0x80) && petres.crtc) {
+        v4 = crtc_read(addr);
+    }
+    return v1 & v2 & v3 & v4;
 }
 
 /* Exported banked memory access functions for the monitor.  */

Modified: branches/marco/ports/vice/src/plus4/ted-mem.c
===================================================================
--- branches/marco/ports/vice/src/plus4/ted-mem.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/plus4/ted-mem.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -942,11 +942,9 @@
             return ted.irq_status | 0xa3;
         else
             return ted.irq_status | 0x23;
-    } else {
-        return ted.irq_status | 0x21;
     }
 
-    return ted.irq_status;
+    return ted.irq_status | 0x21;
 }
 
 BYTE REGPARM1 ted_peek(WORD addr)

Modified: branches/marco/ports/vice/src/sid/sid-resources.c
===================================================================
--- branches/marco/ports/vice/src/sid/sid-resources.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/sid/sid-resources.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -59,8 +59,8 @@
 unsigned int sid_stereo_address_end;
 static int sid_engine;
 #ifdef HAVE_HARDSID
-static unsigned int sid_hardsid_main;
-static unsigned int sid_hardsid_right;
+static int sid_hardsid_main;
+static int sid_hardsid_right;
 #endif
 #ifdef HAVE_PARSID
 int parsid_port=0;

Modified: branches/marco/ports/vice/src/sounddrv/soundwmm.c
===================================================================
--- branches/marco/ports/vice/src/sounddrv/soundwmm.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/sounddrv/soundwmm.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -435,8 +435,6 @@
 
         /* Wait until enough free space in the circular buffer */
         freebufspace = (play_cursor - write_cursor);
-        if (freebufspace < 0)
-            freebufspace += buffer_size;
         if (freebufspace >= worktodo)
             break;
         /* Also break out of loop if buffer stops playing */

Modified: branches/marco/ports/vice/src/vdrive/vdrive-command.c
===================================================================
--- branches/marco/ports/vice/src/vdrive/vdrive-command.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/vdrive/vdrive-command.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -445,7 +445,9 @@
       default:
         return CBMDOS_IPE_SYNTAX;
     }
+#if 0
     return CBMDOS_IPE_OK;
+#endif
 }
 
 static int vdrive_command_copy(vdrive_t *vdrive, char *dest, int length)

Modified: branches/marco/ports/vice/src/vdrive/vdrive-internal.c
===================================================================
--- branches/marco/ports/vice/src/vdrive/vdrive-internal.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/vdrive/vdrive-internal.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -98,11 +98,10 @@
       case 11:
         return open_rawimage(unit, read_only);
       default:
-        return open_fsimage(name, read_only);
-
+        break;
     }
 
-    return NULL;
+    return open_fsimage(name, read_only);
 }
 
 static int close_fsimage(vdrive_t *vdrive)
@@ -137,10 +136,10 @@
       case 11:
         return close_rawimage(vdrive);
       default:
-        return close_fsimage(vdrive);
+        break;
     }
 
-    return 0;
+    return close_fsimage(vdrive);
 }
 
 static int vdrive_internal_format_disk_image(const char *filename,

Modified: branches/marco/ports/vice/src/vicii/vicii-mem.c
===================================================================
--- branches/marco/ports/vice/src/vicii/vicii-mem.c	2008-06-08 04:17:02 UTC (rev 18847)
+++ branches/marco/ports/vice/src/vicii/vicii-mem.c	2008-06-08 21:56:20 UTC (rev 18848)
@@ -1350,11 +1350,9 @@
             return vicii.irq_status | 0xf1;
         else
             return vicii.irq_status | 0x71;
-    } else {
-        return vicii.irq_status | 0x70;
     }
 
-    return vicii.irq_status;
+    return vicii.irq_status | 0x70;
 }
 
 BYTE REGPARM1 vicii_peek(WORD addr)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.