origen_swd 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b399ee4c1b8351d8fa4cee70481f86ae8cd57de69c8ae13a8c96f7ff5775bf9e
-  data.tar.gz: 60a1823aff88c501b169a26b07a4d5c6de517c58bedda449cb189553689939da
+  metadata.gz: 51a97998eec9af382325c0f868198587bca8b8881c8508e2f57b9b9e5c252861
+  data.tar.gz: 95ae1faa26434393293358c049841a6fa64fece8aac409f300df2db5bb4cc1bb
 SHA512:
-  metadata.gz: 4ec8eb5d2530edf0b259d3aa834629bfbca20b96ada266bd398e020bb7b1b882d4869441972a538d91e6789d3abf6b6fb530edefed68097a252217d7ddd5982d
-  data.tar.gz: d200cc98d56717983494074c2633cb48080633544213c16168ee7944af078d0e93bf08ea9fcbe2a7ba86e8960e5abe2c50de684586058e8697196ace9ce1f13f
+  metadata.gz: 2a831ddbb5f522b5af31f3b78fb62c9fda0301125db220a74d4f88ef01c77564823f5bc5911f788ddd8522a9b92af5e32480dbec702e5924a67e8b03d1d18482
+  data.tar.gz: 51cd717bcd6c2bceca23fef362650cdab42a011566b6b3387b6d9629e447c4ca6b77b99ed914ff4bdc2e21241c036d460b4a5e2ea8508012f470fd2baee2ef02

data/config/version.rb

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

data/lib/origen_swd/driver.rb

@@ -14,6 +14,7 @@ module OrigenSWD
 
     # Customiz-ible 'turn-round cycle' (TRN) parameter (in cycles)
     attr_accessor :trn
+    attr_accessor :posedge_clk
 
     # Initialize class variables
     #
@@ -30,6 +31,7 @@ module OrigenSWD
       @current_apaddr = 0
       @orundetect = 0
       @trn = 0
+      @posedge_clk = '1'
     end
 
     # Write data from Debug Port
@@ -68,7 +70,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
@@ -143,6 +145,7 @@ module OrigenSWD
       return reg_or_val.address if reg_or_val.respond_to?(:address)
       return reg_or_val.addr if reg_or_val.respond_to?(:addr)
       return reg_or_val if reg_or_val && options[:use_reg_or_val_if_you_must]
+
       fail 'No address given, if supplying a data value instead of a register object, you must supply an :address option'
     end
 
@@ -158,13 +161,13 @@ module OrigenSWD
     # @param [Integer] address Address of register that is being accessed
     def send_header(apndp, rnw, address)
       addr = address >> 2
-      parity  = apndp ^ rnw ^ (addr >> 3) ^ (addr >> 2) & (0x01) ^ (addr >> 1) & (0x01) ^ addr & 0x01
+      parity = apndp ^ rnw ^ (addr >> 3) ^ (addr >> 2) & (0x01) ^ (addr >> 1) & (0x01) ^ addr & 0x01
 
       cc '[SWD] -----------------------------------------------------------------'
       cc '[SWD] | Start |  AP   | Read  | AD[2] | AD[3] |  Par  | Stop  | Park  |'
       cc "[SWD] |   1   |   #{apndp}   |   #{rnw}   |   #{addr[0]}   |   #{addr[1]}   |   #{parity[0]}   |   0   |   1   |"
       cc '[SWD] -----------------------------------------------------------------'
-      swd_clk.drive(1)
+      swd_clk.drive(posedge_clk)
       swd_dio.drive!(1)                                   # send start bit (always 1)
       swd_dio.drive!(apndp)                               # send apndp bit
       swd_dio.drive!(rnw)                                 # send rnw bit
@@ -177,11 +180,31 @@ 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(options = {})
+      confirm = options[:confirm] || :success
       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
 
@@ -260,7 +283,7 @@ module OrigenSWD
       end
 
       cc options[:arm_debug_comment] if options.key?(:arm_debug_comment)
-      swd_clk.drive(1)
+      swd_clk.drive(posedge_clk)
 
       reg_overlay = extract_reg_overlay(reg)
       if reg_overlay && !options[:no_subr] && !Origen.mode.simulation?

data/lib/origen_swd.rb

@@ -1,5 +1,5 @@
 require 'origen'
-require_relative '../config/application.rb'
+require_relative '../config/application'
 
 # Include this module to add a SWD driver to your class
 module OrigenSWD

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_swd
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -63,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Driver for single-wire-debug interface.