origen_swd 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b399ee4c1b8351d8fa4cee70481f86ae8cd57de69c8ae13a8c96f7ff5775bf9e
-  data.tar.gz: 60a1823aff88c501b169a26b07a4d5c6de517c58bedda449cb189553689939da
+  metadata.gz: bd15e69be465453cd575634e5ece39bf72ea58c1440f34fea544da421a319b87
+  data.tar.gz: 1314d65d5f8330d7c24ef59fbf26608a61df9d001bae0a72e5077a888fdee149
 SHA512:
-  metadata.gz: 4ec8eb5d2530edf0b259d3aa834629bfbca20b96ada266bd398e020bb7b1b882d4869441972a538d91e6789d3abf6b6fb530edefed68097a252217d7ddd5982d
-  data.tar.gz: d200cc98d56717983494074c2633cb48080633544213c16168ee7944af078d0e93bf08ea9fcbe2a7ba86e8960e5abe2c50de684586058e8697196ace9ce1f13f
+  metadata.gz: 22db0093fb1012b2bc0b93d349df06c04a0859914de886ac92290d2f602a754b0cabb3f4e284ecf88b1a233065fc8abc84a51959f1faeb23382326f66ecabfc5
+  data.tar.gz: 4adbf17759b6f65caff38fc7589582ddc41069183bbc2d9a3728cd1be2bbe9774ca03e8af5c0ca36444c8e4d06d66db6e64c170f6b995b77c46ef7432e71e39f

data/config/version.rb

@@ -1,7 +1,7 @@
 module OrigenSWD
   MAJOR = 1
   MINOR = 1
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen_swd/driver.rb

@@ -68,7 +68,7 @@ module OrigenSWD
     def read(ap_dp, reg_or_val, options = {})
       addr = extract_address(reg_or_val, options.merge(use_reg_or_val_if_you_must: true))
       send_header(ap_dp, 1, addr)       # send read-specific header (rnw = 1)
-      receive_acknowledgement
+      receive_acknowledgement(options)
       receive_payload(reg_or_val, options)
       swd_dio.drive(0)
     end
@@ -177,11 +177,30 @@ module OrigenSWD
     end
 
     # Waits appropriate number of cycles for the acknowledgement phase
-    def receive_acknowledgement
+    # @param confirm [Symbol] Indicates what type of acknowledgement confirmation should be used. Options are:
+    #   * [:ignore, :none, :skip] -> Ignore the acknowledgement completely.
+    #   * [:failure, :fail, :error] -> Verify that the acknowledgement failured; that is,
+    #   * [:success] (Default) -> Verify the acknowledgement as normal.
+    # @param options [Hash] Placeholder for other/future options.
+    # @raise [RuntimeError] When an unrecongized :confirm option is given.
+    def receive_acknowledgement(confirm: :success, **options)
       wait_trn
-      swd_dio.assert!(1)
-      swd_dio.assert!(0)
-      swd_dio.assert!(0)
+      if [:ignore, :none, :skip].include?(confirm)
+        log('Ignoring Acknowledgement Phase')
+        tester.cycle(repeat: 3)
+      elsif [:failure, :fail, :error].include?(confirm)
+        log('Confirming Error Encountered During Acknowledgement Phase')
+        swd_dio.assert!(0)
+        swd_dio.assert!(0)
+        swd_dio.assert!(1)
+      elsif confirm == :success
+        log('Confirming Success During Acknowledgement Phase')
+        swd_dio.assert!(1)
+        swd_dio.assert!(0)
+        swd_dio.assert!(0)
+      else
+        Origen.app!.fail!(message: "OrigenSWD: Origen SWD does not know how to confirm :#{confirm}")
+      end
       swd_dio.dont_care
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_swd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen