origen_jtag 0.22.1 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2fc35840e8e533688ae4f9228d3136022e8ce7d117452d91d48a8b782bc2e5c
-  data.tar.gz: e55c4dfebaa955af749c9219f7585c34568fe28fa2c976e4f75f6050278a43b7
+  metadata.gz: 1e408b1d8688221c536224742008b1e8816f175f7204a042f6227cfc92a3c938
+  data.tar.gz: 8038f326e6d212978e7f21404319b1178c89d3ee12a01fca74f5abbaa0b9536e
 SHA512:
-  metadata.gz: 3f7a129c33e581c1e8eeaf7d4ffd2c2a9722f91f15ed95139565a5d88a2bed9ff83c22a35a0ee34b12737f6348cd7c0455e067309f933eb9d3e0b74a269e9963
-  data.tar.gz: 0b97667c90159cddee69b72bb84819468ebf17767be8c47b3ce59301be6a15783b10c7f039c44950b3cc2217016baa4b488fe181a89f9d47b3a6a486fa12bfbd
+  metadata.gz: db3581cd8d7d7cababf02df48b7f8e3ad7478f657c9c88e8db68e7de88fa95693c107a06e0bc1bf6b7ad7bb0d4d47009283de60744d921db03a36f20347e4b3e
+  data.tar.gz: fa0a8fa73da0f59d2ea3f4fd23a352022b8498c925c901709b7fcc41ac18bc77ce8992aacb4a842eebfaf5803f11e729052d073775abad31eaf3bc3649dbbcfd

data/config/version.rb

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

data/lib/origen_jtag/driver.rb

@@ -416,7 +416,7 @@ module OrigenJTAG
           cc "#{options[:msg]}\n"
         end
         val = reg_or_val.respond_to?(:data) ? reg_or_val.data : reg_or_val
-        shift_dr(write: val.to_hex) do
+        shift_dr(options.merge(write: val.to_hex)) do
           shift(reg_or_val, options)
         end
       end
@@ -449,7 +449,7 @@ module OrigenJTAG
         if options[:msg]
           cc "#{options[:msg]}\n"
         end
-        shift_dr(read: Origen::Utility.read_hex(reg_or_val)) do
+        shift_dr(options.merge(read: Origen::Utility.read_hex(reg_or_val))) do
           shift(reg_or_val, options)
         end
       end
@@ -484,7 +484,7 @@ module OrigenJTAG
         if Origen.tester.respond_to?(:write_ir)
           Origen.tester.write_ir(reg_or_val, options)
         else
-          shift_ir(write: val.to_hex) do
+          shift_ir(options.merge(write: val.to_hex)) do
             shift(reg_or_val, options)
           end
         end
@@ -568,7 +568,7 @@ module OrigenJTAG
     def extract_size(reg_or_val, options = {})
       size = options[:size]
       unless size
-        if reg_or_val.is_a?(Fixnum) || !reg_or_val.respond_to?(:size)
+        if reg_or_val.is_a?(Integer) || !reg_or_val.respond_to?(:size)
           fail 'When suppling a value to JTAG::Driver#shift you must supply a :size in the options!'
         else
           size = reg_or_val.size

data/lib/origen_jtag/tap_controller.rb

@@ -4,22 +4,22 @@ module OrigenJTAG
   module TAPController
     # Map of internal state symbols to human readable names
     STATES = {
-      reset:      'Test-Logic-Reset',
-      idle:       'Run-Test/Idle',
-      select_dr:  'Select-DR',
-      capture_dr: 'Capture-DR',
-      shift_dr:   'Shift-DR',
-      exit1_dr:   'Exit1-DR',
-      pause_dr:   'Pause-DR',
-      exit2_dr:   'Exit2-DR',
-      update_dr:  'Update-DR',
-      select_ir:  'Select-IR',
-      capture_ir: 'Capture-IR',
-      shift_ir:   'Shift-IR',
-      exit1_ir:   'Exit1-IR',
-      pause_ir:   'Pause-IR',
-      exit2_ir:   'Exit2-IR',
-      update_ir:  'Update-IR'
+      reset:          'Test-Logic-Reset',
+      idle:           'Run-Test/Idle',
+      select_dr_scan: 'Select-DR-Scan',
+      capture_dr:     'Capture-DR',
+      shift_dr:       'Shift-DR',
+      exit1_dr:       'Exit1-DR',
+      pause_dr:       'Pause-DR',
+      exit2_dr:       'Exit2-DR',
+      update_dr:      'Update-DR',
+      select_ir_scan: 'Select-IR-Scan',
+      capture_ir:     'Capture-IR',
+      shift_ir:       'Shift-IR',
+      exit1_ir:       'Exit1-IR',
+      pause_ir:       'Pause-IR',
+      exit2_ir:       'Exit2-IR',
+      update_ir:      'Update-IR'
     }
 
     # Returns the current state of the JTAG TAP Controller
@@ -50,11 +50,27 @@ module OrigenJTAG
     #   end
     #   # State is Run-Test/Idle
     def shift_dr(options = {})
-      validate_state(:idle, :pause_dr)
+      options = {
+        start_state: :idle,   # Allowed start states: :idle, :select_dr_scan, :update_ir, :update_dr
+        end_state:   :idle    # Allowed end states: :idle, :update_dr
+      }.merge(options)
+
+      if options[:start_state] == :idle  # allow for pause_dr state also if called from pause_dr block
+        validate_state(:idle, :pause_dr)
+      elsif options[:state_state] == :select_dr_scan
+        validate_state(:select_dr_scan, :pause_dr)
+      elsif options[:state_state] == :update_dr
+        validate_state(:update_dr, :pause_dr)
+      elsif options[:state_state] == :update_ir
+        validate_state(:update_ir, :pause_dr)
+      end
       log 'Transition to Shift-DR...'
-      if state == :idle
-        tms!(1)  # => Select-DR-Scan
-        update_state :select_dr_scan
+      if state == :idle || state == :select_dr_scan || state == :update_ir || state == :update_dr
+        # Non-pause states
+        unless state == :select_dr_scan
+          tms!(1)  # => Select-DR-Scan
+          update_state :select_dr_scan
+        end
         tms!(0)  # => Capture-DR
         update_state :capture_dr
         tms!(0)  # => Shift-DR
@@ -78,8 +94,10 @@ module OrigenJTAG
         end
         tms!(1)  # => Update-DR
         update_state :update_dr
-        tms!(0)  # => Run-Test/Idle
-        update_state :idle
+        if options[:end_state] == :idle
+          tms!(0)  # => Run-Test/Idle
+          update_state :idle
+        end
       else # :pause_dr
         tms!(1)  # => Exit2-DR
         update_state :exit2_dr
@@ -175,13 +193,23 @@ module OrigenJTAG
     #   end
     #   # State is Run-Test/Idle
     def shift_ir(options = {})
-      validate_state(:idle, :pause_ir)
+      options = {
+        start_state: :idle,   # Allowed start states: :idle, :select_ir_scan
+        end_state:   :idle    # Allowed end states: :idle, :update_ir, :select_dr_scan
+      }.merge(options)
+      if options[:start_state] == :idle
+        validate_state(:idle, :pause_ir)
+      else
+        validate_state(:select_ir_scan, :pause_ir)
+      end
       log 'Transition to Shift-IR...'
-      if state == :idle
-        tms!(1)  # => Select-DR-Scan
-        update_state :select_dr_scan
-        tms!(1)  # => Select-IR-Scan
-        update_state :select_ir_scan
+      if state == :idle || state == :select_ir_scan
+        unless state == :select_ir_scan
+          tms!(1)  # => Select-DR-Scan
+          update_state :select_dr_scan
+          tms!(1)  # => Select-IR-Scan
+          update_state :select_ir_scan
+        end
         tms!(0)  # => Capture-IR
         update_state :capture_ir
         tms!(0)  # => Shift-IR
@@ -195,7 +223,13 @@ module OrigenJTAG
         end
         log msg, always: true do
           yield
-          log 'Transition to Run-Test/Idle...'
+          if options[:end_state] == :idle
+            log 'Transition to Run-Test/Idle...'
+          elsif options[:end_state] == :update_ir
+            log 'Transition to Update-IR...'
+          elsif options[:end_state] == :select_dr_scan
+            log 'Transition to Select-DR-Scan...'
+          end
           if @last_data_vector_shifted
             @last_data_vector_shifted = false
           else
@@ -205,8 +239,13 @@ module OrigenJTAG
         end
         tms!(1)  # => Update-IR
         update_state :update_ir
-        tms!(0)  # => Run-Test/Idle
-        update_state :idle
+        if options[:end_state] == :idle
+          tms!(0)  # => Run-Test/Idle
+          update_state :idle
+        elsif options[:end_state] == :select_dr_scan
+          tms!(1)  # => Select-DR-Scan
+          update_state :select_dr_scan
+        end
       else # :pause_ir
         tms!(1)  # => Exit2-IR
         update_state :exit2_ir

data/pattern/jtag_workout.rb

@@ -193,7 +193,13 @@ Pattern.create(options = { name: pat_name }) do
 
   test 'Unless forced'
   jtag.write_ir 0xF, size: 4, force: true
- 
+
+  test 'Write IR, starting with Idle, leave in Select-DR-Scan state'
+  jtag.write_ir(0x7, size: 8, end_state: :select_dr_scan, force: true)
+
+  test 'Write DR starting with Select-DR-Scan state, end with Idle'
+  jtag.write_dr(0x12345678, size: 32, start_state: :select_dr_scan)
+
   test 'Reset'
   jtag.reset
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_jtag
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.22.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2024-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -89,8 +89,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.4
 signing_key: 
 specification_version: 4
 summary: JTAG driver for the Origen SDK