儲存庫 vbox 的更動 62904

時間撮記:

2016-8-3 上午11:08:14 (8 年 以前)

作者:

vboxsync

訊息:

Devices: warnings

檔案:

• trunk/src/VBox/Devices/Storage/DevFdc.cpp (修改) (31 筆差異)

trunk/src/VBox/Devices/Storage/DevFdc.cpp

@@ -71 +71 @@
     #endif
 #else /* !VBOX */
-    # ifdef LOG_ENABLED
-        static void FLOPPY_DPRINTF (const char *fmt, ...)
-        {
-            if (LogIsEnabled ()) {
-                va_list args;
-                va_start (args, fmt);
-                RTLogLogger (NULL, NULL, "floppy: %N", fmt, &args); /* %N - nested va_list * type formatting call. */
-                va_end (args);
-            }
+# ifdef LOG_ENABLED
+    static void FLOPPY_DPRINTF(const char *fmt, ...)
+    {
+        if (LogIsEnabled()) {
+            va_list args;
+            va_start(args, fmt);
+            RTLogLogger(NULL, NULL, "floppy: %N", fmt, &args); /* %N - nested va_list * type formatting call. */
+            va_end(args);
         }
-    # else
-      DECLINLINE(void) FLOPPY_DPRINTF(const char *pszFmt, ...) {}
-    # endif
+    }
+# else
+#  define FLOPPY_DPRINTF(...) do { } while (0)
+# endif
 #endif /* !VBOX */
 
@@ -286 +286 @@
             return 4;
         }
+#else
+        RT_NOREF(enable_seek);
 #endif
         drv->head = head;
@@ -1160 +1162 @@
 static void fdctrl_unimplemented(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     FLOPPY_ERROR("unimplemented command 0x%02x\n", fdctrl->fifo[0]);
     fdctrl->fifo[0] = FD_SR0_INVCMD;
@@ -1483 +1486 @@
 static void fdctrl_start_transfer_del(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     FLOPPY_ERROR("fdctrl_start_transfer_del() unimplemented\n");
 
@@ -1541 +1545 @@
 #endif
 {
+    RT_NOREF(pDevIns, dma_pos);
     fdctrl_t *fdctrl;
     fdrive_t *cur_drv;
@@ -1708 +1713 @@
                 int rc2 = PDMDevHlpDMAReadMemory (fdctrl->pDevIns, nchan, tmpbuf,
                                                   fdctrl->data_pos, len, &read);
-                AssertMsg (RT_SUCCESS (rc2), ("DMAReadMemory -> %Rrc2\n", rc2));
+                AssertMsg(RT_SUCCESS(rc2), ("DMAReadMemory -> %Rrc2\n", rc2)); NOREF(rc2);
 #else
                 DMA_read_memory (nchan, tmpbuf, fdctrl->data_pos, len);
@@ -1894 +1899 @@
 static void fdctrl_handle_lock(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdctrl->lock = (fdctrl->fifo[0] & 0x80) ? 1 : 0;
     fdctrl->fifo[0] = fdctrl->lock << 4;
@@ -1901 +1907 @@
 static void fdctrl_handle_dumpreg(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -1926 +1933 @@
 static void fdctrl_handle_version(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     /* Controller's version */
     fdctrl->fifo[0] = fdctrl->version;
@@ -1933 +1941 @@
 static void fdctrl_handle_partid(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdctrl->fifo[0] = 0x01; /* Stepping 1 */
     fdctrl_set_fifo(fdctrl, 1, 0);
@@ -1939 +1948 @@
 static void fdctrl_handle_restore(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -1962 +1972 @@
 static void fdctrl_handle_save(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -1992 +2003 @@
 static void fdctrl_handle_readid(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -2008 +2020 @@
 static void fdctrl_handle_format_track(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv;
     uint8_t ns, dp;
@@ -2040 +2053 @@
 static void fdctrl_handle_specify(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdctrl->timer0 = (fdctrl->fifo[1] >> 4) & 0xF;
     fdctrl->timer1 = fdctrl->fifo[2] >> 1;
@@ -2052 +2066 @@
 static void fdctrl_handle_sense_drive_status(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv;
 
@@ -2068 +2083 @@
 static void fdctrl_handle_recalibrate(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv;
     uint8_t  st0;
@@ -2085 +2101 @@
 static void fdctrl_handle_sense_interrupt_status(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -2111 +2128 @@
 static void fdctrl_handle_seek(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv;
 
@@ -2141 +2159 @@
 static void fdctrl_handle_perpendicular_mode(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -2151 +2170 @@
 static void fdctrl_handle_configure(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdctrl->config = fdctrl->fifo[2];
     fdctrl->precomp_trk =  fdctrl->fifo[3];
@@ -2159 +2179 @@
 static void fdctrl_handle_powerdown_mode(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdctrl->pwrd = fdctrl->fifo[1];
     fdctrl->fifo[0] = fdctrl->fifo[1];
@@ -2166 +2187 @@
 static void fdctrl_handle_option(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     /* No result back */
     fdctrl_reset_fifo(fdctrl);
@@ -2172 +2194 @@
 static void fdctrl_handle_drive_specification_command(fdctrl_t *fdctrl, int direction)
 {
-    fdrive_t *cur_drv = get_cur_drv(fdctrl);
+    RT_NOREF(direction);
+    /* fdrive_t *cur_drv = get_cur_drv(fdctrl); - unused */
 
     /* This command takes a variable number of parameters. It can be terminated
@@ -2197 +2220 @@
 static void fdctrl_handle_relative_seek_out(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv;
 
@@ -2213 +2237 @@
 static void fdctrl_handle_relative_seek_in(fdctrl_t *fdctrl, int direction)
 {
+    RT_NOREF(direction);
     fdrive_t *cur_drv;
 
@@ -2378 +2403 @@
 static DECLCALLBACK(void) fdcTimerCallback(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser)
 {
+    RT_NOREF(pDevIns, pTimer);
     fdctrl_t *fdctrl = (fdctrl_t *)pvUser;
     fdctrl_result_timer(fdctrl);
@@ -2390 +2416 @@
 static DECLCALLBACK(int) fdcIoPortWrite(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t u32, unsigned cb)
 {
+    RT_NOREF(pDevIns);
     if (cb == 1)
         fdctrl_write (pvUser, Port & 7, u32);
@@ -2403 +2430 @@
 static DECLCALLBACK(int) fdcIoPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
+    RT_NOREF(pDevIns);
     if (cb == 1)
     {
@@ -2800 +2828 @@
 static DECLCALLBACK(void) fdcDetach(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags)
 {
+    RT_NOREF(fFlags);
     fdctrl_t *pThis = PDMINS_2_DATA(pDevIns, fdctrl_t *);
     LogFlow (("ideDetach: iLUN=%u\n", iLUN));
@@ -2847 +2876 @@
 static DECLCALLBACK(int) fdcConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
+    RT_NOREF(iInstance);
     fdctrl_t      *pThis = PDMINS_2_DATA(pDevIns, fdctrl_t *);
     int            rc;