origen_jtag 0.21.1 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f63bbad6eac9c0d88a2e7970a16d2746375a25575bbae735b2f2626a457ebf4
-  data.tar.gz: 8ba113303e5906a9da5c739663600828a57cb74a8953f0d1a967bb655848d6f1
+  metadata.gz: 17c3bc0c7a9b380a76c4f69ee0ebf6434d43a5c42456c0fca4c242ad192bb4ce
+  data.tar.gz: f828a940f8d87d5fd048aeac363238323df7cadc4b7b9405d6bbcf3601164bc9
 SHA512:
-  metadata.gz: 9488fbea2784700dd849ce1eff4c279ff413f7c006dbb358a3cdcd1e7a8955ce42851aea7873c2818eb20821ad3f181f74c556801e6540dec93ec00462f606b2
-  data.tar.gz: 37709e182313b91c0e4da8464a39e0161e5d89a287ed1eee632ebef60c744f22eb3b875b8a4262b97b15ac50ffb5944d522de2ec5aaa3e83ac5747b89f0fbd3d
+  metadata.gz: df5618e789ac6b000b6fa71cf52611df7bb56e5fc4965afeb57fcfc242a456d402c214c48823eccea4f97ccf7cdf036f47e145b871da18cd1fad7e2030cffb76
+  data.tar.gz: 6c751a233f7d80c8e2b607b2024fdfb556661d3e34a85dfa92a5728fac1bbfc9581f07dfc3aac856e2015cdf87e458785d4aa4fd934400cc4cb3f05699a60f8b

data/config/version.rb

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

data/lib/origen_jtag/driver.rb

@@ -35,7 +35,8 @@ module OrigenJTAG
     alias_method :tclk_format, :tck_format
     alias_method :tclk_format=, :tck_format=
 
-    attr_reader :tdo_strobe
+    attr_accessor :tdo_strobe
+    attr_accessor :tdo_store_cycle
 
     # Set true to print out debug comments about all state transitions
     attr_accessor :verbose
@@ -57,7 +58,7 @@ module OrigenJTAG
       end
 
       @cycle_callback = options[:cycle_callback]
-      validate_pins(options) unless @cycle_callback
+      @given_options = options.dup  # Save these for later use in the pins method
 
       # Fallback defaults
       options = {
@@ -211,7 +212,7 @@ module OrigenJTAG
         overlay_options = {}
         if tester.respond_to?(:source_memory) && !cycle_callback?
           if ovl_reg[i] && ovl_reg[i].has_overlay? && !Origen.mode.simulation?
-            overlay_options[:pins] = @pins[:tdi]
+            overlay_options[:pins] = pins[:tdi]
             if global_ovl
               overlay_options[:overlay_str] = global_ovl
             else
@@ -280,7 +281,7 @@ module OrigenJTAG
                 overlay_options[:change_data] = false			# data change only on first cycle if overlay
               end
             end
-            @pins[:tdo].dont_care unless cycle_callback?
+            pins[:tdo].dont_care unless cycle_callback?
           else
             @deferred_compare = true
             @deferred_store = true if store_tdo_this_tck
@@ -323,7 +324,7 @@ module OrigenJTAG
 
         # If TDO is already suspended (by an application) then don't do the
         # suspends below since the resume will clear the application's suspend
-        tdo_already_suspended = !cycle_callback? && @pins[:tdo].suspended? && !@tdo_suspended_by_driver
+        tdo_already_suspended = !cycle_callback? && pins[:tdo].suspended? && !@tdo_suspended_by_driver
 
         @tck_multiple.times do |i|
           # 50% duty cycle if @tck_multiple is even, otherwise slightly off
@@ -332,26 +333,26 @@ module OrigenJTAG
 
           if i < (@tck_multiple + 1) / 2
             # first half of cycle
-            @pins[:tck].drive(@tck_vals ? @tck_vals[:on] : tck_val)
+            pins[:tck].drive(@tck_vals ? @tck_vals[:on] : tck_val)
             unless tdo_already_suspended
               if mask_tdo_half0
                 @tdo_suspended_by_driver = true
-                @pins[:tdo].suspend
+                pins[:tdo].suspend
               else
                 @tdo_suspended_by_driver = false
-                @pins[:tdo].resume
+                pins[:tdo].resume
               end
             end
           else
             # second half of cycle
-            @pins[:tck].drive(@tck_vals ? @tck_vals[:off] : (1 - tck_val))
+            pins[:tck].drive(@tck_vals ? @tck_vals[:off] : (1 - tck_val))
             unless tdo_already_suspended
               if mask_tdo_half1
                 @tdo_suspended_by_driver = true
-                @pins[:tdo].suspend
+                pins[:tdo].suspend
               else
                 @tdo_suspended_by_driver = false
-                @pins[:tdo].resume
+                pins[:tdo].resume
               end
             end
           end
@@ -359,7 +360,7 @@ module OrigenJTAG
         end
         if @tdo_suspended_by_driver
           @tdo_suspended_by_driver = false
-          @pins[:tdo].resume
+          pins[:tdo].resume
         end
       end
     end
@@ -548,10 +549,10 @@ module OrigenJTAG
         if cycle_callback?
           @owner.send(@cycle_callback, @actions, options)
         else
-          apply_action(@pins[:tms], @actions[:tms])
-          apply_action(@pins[:tdi], @actions[:tdi])
-          apply_action(@pins[:tdo], @actions[:tdo])
-          tester.store_next_cycle(@pins[:tdo]) if @actions[:store]
+          apply_action(pins[:tms], @actions[:tms])
+          apply_action(pins[:tdi], @actions[:tdi])
+          apply_action(pins[:tdo], @actions[:tdo])
+          tester.store_next_cycle(pins[:tdo]) if @actions[:store]
           tester.cycle(options)
         end
         clear_actions
@@ -665,30 +666,42 @@ module OrigenJTAG
       tdo
     end
 
-    # Validates that the parent object (the owner) has defined the necessary
-    # pins to implement the JTAG
-    def validate_pins(options)
-      @pins = {}
-      @pins[:tck] = options[:tck_pin]
-      @pins[:tdi] = options[:tdi_pin]
-      @pins[:tdo] = options[:tdo_pin]
-      @pins[:tms] = options[:tms_pin]
-
-      # Support legacy implementation where tck was incorrectly called tclk, in case of both being
-      # defined then :tck has priority
-      @pins[:tck] ||= @owner.pin(:tck) if @owner.has_pin?(:tck)
-      @pins[:tck] ||= @owner.pin(:tclk)
-      @pins[:tdi] ||= @owner.pin(:tdi)
-      @pins[:tdo] ||= @owner.pin(:tdo)
-      @pins[:tms] ||= @owner.pin(:tms)
+    def to_pin(pin_or_id)
+      if pin_or_id
+        if pin_or_id.is_a?(Symbol) || pin_or_id.is_a?(String)
+          @owner.pin(pin_or_id)
+        else
+          pin_or_id
+        end
+      end
+    end
+
+    def pins
+      @pins ||= begin
+        pins = {}
+        pins[:tck] = to_pin(@given_options[:tck_pin])
+        pins[:tdi] = to_pin(@given_options[:tdi_pin])
+        pins[:tdo] = to_pin(@given_options[:tdo_pin])
+        pins[:tms] = to_pin(@given_options[:tms_pin])
+
+        # Support legacy implementation where tck was incorrectly called tclk, in case of both being
+        # defined then :tck has priority
+        pins[:tck] ||= @owner.pin(:tck) if @owner.has_pin?(:tck)
+        pins[:tck] ||= @owner.pin(:tclk)
+        pins[:tdi] ||= @owner.pin(:tdi)
+        pins[:tdo] ||= @owner.pin(:tdo)
+        pins[:tms] ||= @owner.pin(:tms)
+
+        pins
+      end
     rescue
       puts 'Missing JTAG pins!'
       puts "In order to use the JTAG driver your #{owner.class} class must either define"
       puts 'the following pins (an alias is fine):'
       puts REQUIRED_PINS
       puts '-- or --'
-      puts 'Pass the pins in the initialization options:'
-      puts "sub_block :jtag, class_name: 'OrigenJTAG::Driver', tck_pin: dut.pin(:tck), tdi_pin: dut.pin(:tdi), tdo_pin: dut.pin(:tdo), tms_pin: dut.pin(:tms)"
+      puts 'Pass the pin IDs to be used instead in the initialization options:'
+      puts "sub_block :jtag, class_name: 'OrigenJTAG::Driver', tck_pin: :clk, tdi_pin: :gpio1, tdo_pin: :gpio2, tms_pin: :gpio3"
       raise 'JTAG driver error!'
     end
   end

data/lib/origen_jtag_dev/new_style.rb

@@ -30,7 +30,8 @@ module OrigenJTAGDev
       instantiate_pins(options)
       sub_block :jtag, { class_name: 'OrigenJTAG::Driver' }.merge(@jtag_config)
       if options[:extra_port]
-        sub_block :jtag2, { class_name: 'OrigenJTAG::Driver', tck_pin: pin(:tck_2), tdi_pin: pin(:tdi_2), tdo_pin: pin(:tdo_2), tms_pin: pin(:tms_2) }.merge(@jtag_config)
+        # Test supplying both pin IDs (recommended) and pin objects (legacy)
+        sub_block :jtag2, { class_name: 'OrigenJTAG::Driver', tck_pin: :tck_2, tdi_pin: :tdi_2, tdo_pin: pin(:tdo_2), tms_pin: pin(:tms_2) }.merge(@jtag_config)
       end
     end
 

data/templates/web/index.md.erb

@@ -89,10 +89,10 @@ class MyApp::MyDUT
                      tck_multiple:      2,
                      tdo_strobe:        :tck_high,
                      tdo_store_cycle:   1,
-                     tck_pin:           pin(:tck2),
-                     tdi_pin:           pin(:tdi2),
-                     tdo_pin:           pin(:tdo2),
-                     tms_pin:           pin(:tms2)
+                     tck_pin:           :tck2,
+                     tdi_pin:           :tdi2,
+                     tdo_pin:           :tdo2,
+                     tms_pin:           :tms2
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_jtag
 version: !ruby/object:Gem::Version
-  version: 0.21.1
+  version: 0.22.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen