origen_jtag 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e06b3dca12b20579f6fbfbc389dac204e960a93b
-  data.tar.gz: dc97efa495078334d68ce6ac8bd43fcea8b2467d
+  metadata.gz: ae69f91bc9e2535f91cecbcd30bef84b57c8a017
+  data.tar.gz: 25accfa2f3054119f0e3fec8efbbdb59f74f9f55
 SHA512:
-  metadata.gz: 43f03422ef2359a8e10a527300824d84e29f92cd97934b535d69f12e73aa480163790a06041b991bb25d5c05a76c491dcef9428db0cdaed7b5f3b7c33359e134
-  data.tar.gz: b84f766c5f4dd19cc111fad60e4f55c2162f2b09c4abff4c2d4016b5a97b0ff036e75393517e8488b87af9da552d26b0fc28a0e8fe48d1f9765f449bf15e0433
+  metadata.gz: 064956cbd19af58b772357f8b5a5c2ec8aede02531098192b239efbbaa466ded0febe18295b62d0f779d33652a59911857fea2778bdb01a88636cd6e717c054c
+  data.tar.gz: 468f70f9ee9a58ade048f191ad9468400f377c49ae3d77f95f69e7b3e63bcf95b3eb646ac32b1b8aad34c73684b7b3b88ddddf7c1cd34f597bdcdb436381590f

data/config/commands.rb

@@ -1,11 +1,8 @@
 # This file should be used to extend the origen command line tool with tasks 
 # specific to your application.
-# The comments below should help to get started and you can also refer to
-# lib/origen/commands.rb in your Origen core workspace for more examples and 
-# inspiration.
 #
 # Also see the official docs on adding commands:
-#   http://origen.freescale.net/origen/latest/guides/custom/commands/
+#   http://origen-sdk.org/origen/guides/custom/commands/
 
 # Map any command aliases here, for example to allow origen -x to refer to a 
 # command called execute you would add a reference as shown below: 
@@ -17,65 +14,45 @@ aliases ={
 # the above alias table and should not be removed.
 @command = aliases[@command] || @command
 
-def path_to_coverage_report
-  require 'pathname'
-  Pathname.new("#{Origen.root}/coverage/index.html").relative_path_from(Pathname.pwd)
-end
-
-def enable_coverage(name, merge=true)
-  if ARGV.delete("-c") || ARGV.delete("--coverage")
-    require 'simplecov'
-    SimpleCov.start do
-      command_name name
-
-      at_exit do
-        SimpleCov.result.format!
-        puts ""
-        puts "To view coverage report:"
-        puts "  firefox #{path_to_coverage_report} &"
-        puts ""
-      end
-    end
-    yield
-  else
-    yield
-  end
-end
-
 # Now branch to the specific task code
 case @command
 
+## Run the unit tests  
+#when "specs"
+#  require "rspec"
+#  exit RSpec::Core::Runner.run(['spec'])
+
 when "examples"  
   Origen.load_application
-  enable_coverage("examples") do 
+  status = 0
 
-    # Pattern generator tests
-    ARGV = %w(jtag_workout -t v93k.rb -r approved)
-    load "#{Origen.top}/lib/origen/commands/generate.rb"
-    ARGV = %w(jtag_workout -t debug_RH1 -r approved)
-    load "#{Origen.top}/lib/origen/commands/generate.rb"
-    ARGV = %w(jtag_workout -t debug_RL1 -r approved)
-    load "#{Origen.top}/lib/origen/commands/generate.rb"
+  # Pattern generator tests
+  ARGV = %w(jtag_workout -t v93k.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t debug_RH1 -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t debug_RL1 -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
 
-    ARGV = %w(jtag_workout -t v93k_RH4.rb -r approved)
-    load "#{Origen.top}/lib/origen/commands/generate.rb"
-    ARGV = %w(jtag_workout -t debug_RH4 -r approved)
-    load "#{Origen.top}/lib/origen/commands/generate.rb"
-    ARGV = %w(jtag_workout -t debug_RL4 -r approved)
-    load "#{Origen.top}/lib/origen/commands/generate.rb"
-    
-    if Origen.app.stats.changed_files == 0 &&
-       Origen.app.stats.new_files == 0 &&
-       Origen.app.stats.changed_patterns == 0 &&
-       Origen.app.stats.new_patterns == 0
+  ARGV = %w(jtag_workout -t v93k_RH4.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t debug_RH4 -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  ARGV = %w(jtag_workout -t debug_RL4 -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+  
+  if Origen.app.stats.changed_files == 0 &&
+     Origen.app.stats.new_files == 0 &&
+     Origen.app.stats.changed_patterns == 0 &&
+     Origen.app.stats.new_patterns == 0
 
-      Origen.app.stats.report_pass
-    else
-      Origen.app.stats.report_fail
-    end
-    puts ""
+    Origen.app.stats.report_pass
+  else
+    Origen.app.stats.report_fail
+    status = 1
   end
-  exit 0
+  puts
+  exit status
 
 # Always leave an else clause to allow control to fall back through to the
 # Origen command handler.

data/config/version.rb

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

data/lib/origen_jtag/driver.rb

@@ -303,7 +303,8 @@ module OrigenJTAG
         if options[:msg]
           cc "#{options[:msg]}\n"
         end
-        shift_dr do
+        val = reg_or_val.respond_to?(:data) ? reg_or_val.data : reg_or_val
+        shift_dr(write: val.to_hex) do
           if options[:overlay] == true
             $tester.label(options[:overlay_label], true) # apply global label
           end
@@ -339,7 +340,7 @@ module OrigenJTAG
         if options[:msg]
           cc "#{options[:msg]}\n"
         end
-        shift_dr do
+        shift_dr(read: Origen::Utility.read_hex(reg_or_val)) do
           if options[:overlay] == true
             $tester.label(options[:overlay_label], true) # apply global label
           end
@@ -377,7 +378,7 @@ module OrigenJTAG
           if options[:msg]
             cc "#{options[:msg]}\n"
           end
-          shift_ir do
+          shift_ir(write: val.to_hex) do
             shift(reg_or_val, options)
           end
           @ir_value = val
@@ -412,7 +413,7 @@ module OrigenJTAG
         if options[:msg]
           cc "#{options[:msg]}\n"
         end
-        shift_ir do
+        shift_ir(read: Origen::Utility.read_hex(reg_or_val)) do
           shift(reg_or_val, options)
         end
       end

data/lib/origen_jtag/tap_controller.rb

@@ -49,7 +49,7 @@ module OrigenJTAG
     #     # State is Pause-DR
     #   end
     #   # State is Run-Test/Idle
-    def shift_dr
+    def shift_dr(options = {})
       validate_state(:idle, :pause_dr)
       log 'Transition to Shift-DR...'
       if state == :idle
@@ -57,15 +57,22 @@ module OrigenJTAG
         tms!(0)  # => Capture-DR
         tms!(0)  # => Shift-DR
         update_state :shift_dr
-        log '**** Data start ****', always: true
-        yield
-        log 'Transition to Run-Test/Idle...'
-        if @last_data_vector_shifted
-          @last_data_vector_shifted = false
+        if options[:write]
+          msg = "Write DR: #{options[:write]}"
+        elsif options[:read]
+          msg = "Read DR: #{options[:read]}"
         else
-          tms!(1)  # => Exit1-DR
+          msg = 'DR Data'
+        end
+        log msg, always: true do
+          yield
+          log 'Transition to Run-Test/Idle...'
+          if @last_data_vector_shifted
+            @last_data_vector_shifted = false
+          else
+            tms!(1)  # => Exit1-DR
+          end
         end
-        log '**** Data stop ****', always: true
         tms!(1)  # => Update-DR
         tms!(0)  # => Run-Test/Idle
         update_state :idle
@@ -154,7 +161,7 @@ module OrigenJTAG
     #     # State is Pause-IR
     #   end
     #   # State is Run-Test/Idle
-    def shift_ir
+    def shift_ir(options = {})
       validate_state(:idle, :pause_ir)
       log 'Transition to Shift-IR...'
       if state == :idle
@@ -163,15 +170,22 @@ module OrigenJTAG
         tms!(0)  # => Capture-IR
         tms!(0)  # => Shift-IR
         update_state :shift_ir
-        log '**** Data start ****', always: true
-        yield
-        log 'Transition to Run-Test/Idle...'
-        if @last_data_vector_shifted
-          @last_data_vector_shifted = false
+        if options[:write]
+          msg = "Write IR: #{options[:write]}"
+        elsif options[:read]
+          msg = "Read IR: #{options[:read]}"
         else
-          tms!(1)  # => Exit1-DR
+          msg = 'IR Data'
+        end
+        log msg, always: true do
+          yield
+          log 'Transition to Run-Test/Idle...'
+          if @last_data_vector_shifted
+            @last_data_vector_shifted = false
+          else
+            tms!(1)  # => Exit1-DR
+          end
         end
-        log '**** Data stop ****', always: true
         tms!(1)  # => Update-IR
         tms!(0)  # => Run-Test/Idle
         update_state :idle
@@ -265,6 +279,11 @@ module OrigenJTAG
       6.times { tms!(1) }
     end
 
+    def update_state(state)
+      @state = state
+      log "Current state: #{state_str}"
+    end
+
     private
 
     def init_tap_controller(options = {})
@@ -272,11 +291,6 @@ module OrigenJTAG
       }.merge(options)
     end
 
-    def update_state(state)
-      @state = state
-      log "Current state: #{state_str}"
-    end
-
     # Ensures that the current state matches one of the given acceptable
     # states.
     #
@@ -293,7 +307,11 @@ module OrigenJTAG
     end
 
     def log(msg, options = {})
-      cc "JTAG::TAPController - #{msg}" if verbose? || options[:always]
+      cc "[JTAG] #{msg}" if verbose? || options[:always]
+      if block_given?
+        yield
+        cc "[JTAG] /#{msg}" if verbose? || options[:always]
+      end
     end
   end
 end

data/templates/web/index.md.erb

@@ -135,5 +135,6 @@ any changes!
 origen examples
 ~~~
 
+<%= disqus_comments %>
 
 % end

data/templates/web/layouts/_basic.html.erb

@@ -1,5 +1,6 @@
 ---
 title: <%= options[:title] || Origen.config.name %>
+analytics: UA-64455560-1
 ---
 <%= render "templates/web/partials/navbar.html", :tab => options[:tab] %>
 
@@ -9,5 +10,7 @@ title: <%= options[:title] || Origen.config.name %>
   <div class="span12" markdown="1">
 <%= yield %>    
 
+<%= disqus_comments %>
+
 </div>
 </div>

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: origen_jtag
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.7.35
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.7.35
 description: 
 email:
 - stephen.f.mcginty@gmail.com
@@ -70,4 +70,3 @@ signing_key:
 specification_version: 4
 summary: JTAG driver for the Origen SDK
 test_files: []
-has_rdoc: