Merge pull request #1 from qualcomm/topic/reset_drop

topic/reset_drop

Author: quic-kdybcio

cli/src/main.rs

@@ -217,7 +217,7 @@ fn main() -> Result<()> {
             // The remaining values are overwritten at runtime through a <configure> handshake
             ..Default::default()
         },
-        session_done: false,
+        reset_on_drop: false,
     };
 
     // In case another program on the system has already consumed the HELLO packet,
@@ -261,6 +261,9 @@ fn main() -> Result<()> {
         args.verbose_sahara,
     )?;
 
+    // If we're past Sahara, activate the Firehose reset-on-drop listener
+    fh_dev.reset_on_drop = true;
+
     // Get any "welcome" logs
     firehose_read(&mut fh_dev, firehose_parser_ack_nak)?;
 
@@ -377,7 +380,7 @@ fn main() -> Result<()> {
     };
 
     // Finally, reset the device
-    fh_dev.session_done = true;
+    fh_dev.reset_on_drop = false;
     firehose_reset(&mut fh_dev, &reset_mode, 0)?;
 
     println!(

qdl/src/types.rs

@@ -96,7 +96,7 @@ pub trait QdlReadWrite: Read + Write {}
 pub struct FirehoseDevice<'a> {
     pub rw: &'a mut dyn QdlReadWrite,
     pub fh_cfg: FirehoseConfiguration,
-    pub session_done: bool,
+    pub reset_on_drop: bool,
 }
 
 impl Read for FirehoseDevice<'_> {
@@ -129,7 +129,7 @@ impl Drop for FirehoseDevice<'_> {
     fn drop(&mut self) {
         // Avoid having the board be stuck in EDL limbo in case of errors
         // TODO: watch 'rawmode' and adjust accordingly
-        if !self.session_done {
+        if self.reset_on_drop {
             println!(
                 "Firehose {}. Resetting the board to {}, try again.",
                 "failed".bright_red(),

qramdump/src/main.rs

@@ -47,7 +47,7 @@ pub fn main() -> Result<()> {
     let mut fh_dev = FirehoseDevice {
         rw: rw_channel.as_mut(),
         fh_cfg: FirehoseConfiguration::default(),
-        session_done: true,
+        reset_on_drop: false,
     };
 
     sahara_run(