Ticket #287: dice-restart.patch

src/dice/dice_avdevice.cpp

@@ -1149 +1149 @@
-            return false;
-        }
-    
-
+ && result != swap_value
-            debugWarning("Could not register ourselves as device owner, unexpected register value: 0x%016"PRIX64"\n", result);
-            return false;
-        }
@@ -1304 +1304 @@
-            }
-            if(reg_isoch != 0xFFFFFFFFUL) {
-                debugError("ISO_CHANNEL register != 0xFFFFFFFF (=0x%08"PRIX32") for ATX %d\n", reg_isoch, n);
-
+
+
+
+
+
+
+
+
-                deallocateIsoChannel(isochannel);
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-    
-            // write value of ISO_CHANNEL register
@@ -1355 +1372 @@
-            }
-            if(reg_isoch != 0xFFFFFFFFUL) {
-                debugError("ISO_CHANNEL register != 0xFFFFFFFF (=0x%08"PRIX32") for ARX %d\n", reg_isoch, n);
-
+
+
+
+
+
+
+
+
-                deallocateIsoChannel(isochannel);
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-    
-            // write value of ISO_CHANNEL register
@@ -1690 +1724 @@
-        }
-    }
-
+    // FIXME: after a crash, the device might still be streaming. We
+    // simply force a stop now (unless in snoopMode) to return to a
+    // clean state.
+    bool snoopMode = false;
+    if(!getOption("snoopMode", snoopMode)) {
+        debugWarning("Could not retrieve snoopMode parameter, defauling to false\n");
+    }
+
+    if (!snoopMode) {
+        disableIsoStreaming();
+    }
+
-    debugOutput(DEBUG_LEVEL_VERBOSE,"DICE Parameter Space info:\n");
-    debugOutput(DEBUG_LEVEL_VERBOSE," Global  : offset=%04X size=%04d\n", m_global_reg_offset, m_global_reg_size);
-    debugOutput(DEBUG_LEVEL_VERBOSE," TX      : offset=%04X size=%04d\n", m_tx_reg_offset, m_tx_reg_size);