Dumb

Author: playfulFence

espflash/src/connection/mod.rs

@@ -145,7 +145,7 @@ impl Connection {
     }
 
     /// Initialize a connection with a device
-    pub fn begin(&mut self) -> Result<bool, Error> {
+    pub fn begin(&mut self) -> Result<(), Error> {
         let port_name = self.serial.name().unwrap_or_default();
         let reset_sequence = construct_reset_strategy_sequence(
             &port_name,
@@ -156,14 +156,7 @@ impl Connection {
         for (_, reset_strategy) in zip(0..MAX_CONNECT_ATTEMPTS, reset_sequence.iter().cycle()) {
             match self.connect_attempt(reset_strategy) {
                 Ok(_) => {
-                    match self.read_reg(crate::flasher::stubs::CHIP_DETECT_MAGIC_REG_ADDR) {
-                        Ok(_) => return Ok(false),
-                        Err(_) => {
-                            log::warn!("Secure Download Mode is enabled on this chip");
-                            self.secure_download_mode = true;
-                            return Ok(true);
-                        }
-                    };
+                    return Ok(());
                 }
                 Err(e) => {
                     debug!("Failed to reset, error {:#?}, retrying", e);

espflash/src/flasher/mod.rs

@@ -674,7 +674,7 @@ impl Flasher {
         // Establish a connection to the device using the default baud rate of 115,200
         // and timeout of 3 seconds.
         let mut connection = Connection::new(serial, port_info, after_operation, before_operation);
-        let sdm = connection.begin()?;
+        connection.begin()?;
         connection.set_timeout(DEFAULT_TIMEOUT)?;
 
         let detected_chip = if before_operation != ResetBeforeOperation::NoResetNoSync {
@@ -696,6 +696,8 @@ impl Flasher {
             return Err(Error::ChipNotProvided);
         };
 
+        let sdm = connection.secure_download_mode;
+
         let mut flasher = Flasher {
             connection,
             chip: detected_chip,