Clean up jtag

Author: bugadani

src/dap.rs

@@ -824,7 +824,7 @@ where
 
         let mut post_read = false;
         let mut ir = 0;
-        let mut response_value = TransferResult::Nack;
+        let mut response_value = TransferResult::Fault;
         let retry = transfer_config.wait_retries;
         let mut response_count = 0;
         let wait_retries = transfer_config.wait_retries;
@@ -1171,7 +1171,7 @@ where
         };
         jtag.shift_ir(ir);
 
-        let mut response_value = jtag::TransferResult::Nack;
+        let mut response_value = jtag::TransferResult::Fault;
         if request_value.r_nw == RnW::R {
             // Post read
             debug!("Posting read for {} transfers", request_count);
@@ -1279,22 +1279,22 @@ impl<T> CheckResult<T> for swd::Result<T> {
 
 fn transfer_with_retry<DEPS>(
     jtag: &mut impl jtag::Jtag<DEPS>,
-    request_value: jtag::TransferInfo,
+    info: jtag::TransferInfo,
     transfer_config: &TransferConfig,
     data: u32,
     mut retry: usize,
 ) -> jtag::TransferResult {
     let mut response_value;
 
-    if request_value.r_nw == RnW::W {
-        debug!("Transfer: {:?} ({:x})", request_value, data);
+    if info.r_nw == RnW::W {
+        debug!("Transfer: {:?} ({:x})", info, data);
     } else {
-        debug!("Transfer: {:?}", request_value);
+        debug!("Transfer: {:?}", info);
     }
 
     loop {
         // Read register until retry counter expires or the read returns !Wait
-        response_value = jtag.transfer(request_value, transfer_config, data);
+        response_value = jtag.transfer(info.r_nw, info.a2a3 as u8, transfer_config, data);
         if response_value != jtag::TransferResult::Wait || retry == 0 {
             debug!("Transfer result: {:x}", response_value);
             break;