origen_link 0.4.2 → 0.4.3

data/config/commands.rb

@@ -1,74 +1,74 @@
-# This file should be used to extend the origen with application specific commands
-
-# Map any command aliases here, for example to allow 'origen ex' to refer to a 
-# command called execute you would add a reference as shown below: 
-aliases ={
-#  "ex" => "execute",
-}
-
-# The requested command is passed in here as @command, this checks it against
-# the above alias table and should not be removed.
-@command = aliases[@command] || @command
-
-# Now branch to the specific task code
-case @command
-
-# Here is an example of how to implement a command, the logic can go straight
-# in here or you can require an external file if preferred.
-when "my_command"
-  puts "Doing something..."
-  #require "commands/my_command"    # Would load file lib/commands/my_command.rb
-  # You must always exit upon successfully capturing a command to prevent 
-  # control flowing back to Origen
-  exit 0
-
-## Example of how to make a command to run unit tests, this simply invokes RSpec on
-## the spec directory
-#when "specs"
-#  require "rspec"
-#  exit RSpec::Core::Runner.run(['spec'])
-
-## Example of how to make a command to run diff-based tests
-#when "examples", "test"
-#  Origen.load_application
-#  status = 0
-#
-#  # Compiler tests
-#  ARGV = %w(templates/example.txt.erb -t debug -r approved)
-#  load "origen/commands/compile.rb"
-#  # Pattern generator tests
-#  #ARGV = %w(some_pattern -t debug -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
-#    status = 1
-#  end
-#  puts
-#  if @command == "test"
-#    Origen.app.unload_target!
-#    require "rspec"
-#    result = RSpec::Core::Runner.run(['spec'])
-#    status = status == 1 ? 1 : result
-#  end
-#  exit status  # Exit with a 1 on the event of a failure per std unix result codes
-
-# Always leave an else clause to allow control to fall back through to the
-# Origen command handler.
-else
-  # You probably want to also add the your commands to the help shown via
-  # origen -h, you can do this be assigning the required text to @application_commands
-  # before handing control back to Origen. Un-comment the example below to get started.
-#  @application_commands = <<-EOT
-# specs        Run the specs (tests), -c will enable coverage
-# examples     Run the examples (tests), -c will enable coverage
-# test         Run both specs and examples, -c will enable coverage
-#  EOT
-
-end 
+# This file should be used to extend the origen with application specific commands
+
+# Map any command aliases here, for example to allow 'origen ex' to refer to a 
+# command called execute you would add a reference as shown below: 
+aliases ={
+#  "ex" => "execute",
+}
+
+# The requested command is passed in here as @command, this checks it against
+# the above alias table and should not be removed.
+@command = aliases[@command] || @command
+
+# Now branch to the specific task code
+case @command
+
+# Here is an example of how to implement a command, the logic can go straight
+# in here or you can require an external file if preferred.
+when "my_command"
+  puts "Doing something..."
+  #require "commands/my_command"    # Would load file lib/commands/my_command.rb
+  # You must always exit upon successfully capturing a command to prevent 
+  # control flowing back to Origen
+  exit 0
+
+## Example of how to make a command to run unit tests, this simply invokes RSpec on
+## the spec directory
+#when "specs"
+#  require "rspec"
+#  exit RSpec::Core::Runner.run(['spec'])
+
+## Example of how to make a command to run diff-based tests
+#when "examples", "test"
+#  Origen.load_application
+#  status = 0
+#
+#  # Compiler tests
+#  ARGV = %w(templates/example.txt.erb -t debug -r approved)
+#  load "origen/commands/compile.rb"
+#  # Pattern generator tests
+#  #ARGV = %w(some_pattern -t debug -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
+#    status = 1
+#  end
+#  puts
+#  if @command == "test"
+#    Origen.app.unload_target!
+#    require "rspec"
+#    result = RSpec::Core::Runner.run(['spec'])
+#    status = status == 1 ? 1 : result
+#  end
+#  exit status  # Exit with a 1 on the event of a failure per std unix result codes
+
+# Always leave an else clause to allow control to fall back through to the
+# Origen command handler.
+else
+  # You probably want to also add the your commands to the help shown via
+  # origen -h, you can do this be assigning the required text to @application_commands
+  # before handing control back to Origen. Un-comment the example below to get started.
+#  @application_commands = <<-EOT
+# specs        Run the specs (tests), -c will enable coverage
+# examples     Run the examples (tests), -c will enable coverage
+# test         Run both specs and examples, -c will enable coverage
+#  EOT
+
+end 

data/config/shared_commands.rb

@@ -1,40 +1,40 @@
-# The requested command is passed in here as @command
-case @command
-
-when "link:listen"
-  t = Thread.new do
-    OrigenLink::Listener.run!
-  end
-  Thread.new do
-    # Get the current host
-    host = `hostname`.strip.downcase
-    if Origen.os.windows?
-      domain = ''  # Not sure what to do in this case...
-    else
-      domain = `dnsdomainname`.strip
-    end
-    port = 20020
-    puts ''
-    sleep 0.5
-    puts
-    puts
-    puts "*************************************************************"
-    puts "Point your OrigenLink app to:  http://#{host}#{domain.empty? ? '' : '.' + domain}:#{port}"
-    puts "*************************************************************"
-    puts
-    puts
-  end
-
-  # Fall through to the Origen interactive command to open up a console
-  @command = "interactive"
-
-# Always leave an else clause to allow control to fall back through to the Origen command handler.
-# You probably want to also add the command details to the help shown via 'origen -h',
-# you can do this bb adding the required text to @plugin_commands before handing control back to
-# Origen.
-else
-  @plugin_commands << <<-EOT
- link:listen     Open a console and listen for OrigenLink requests over http (i.e. from a GUI)
-  EOT
-
-end
+# The requested command is passed in here as @command
+case @command
+
+when "link:listen"
+  t = Thread.new do
+    OrigenLink::Listener.run!
+  end
+  Thread.new do
+    # Get the current host
+    host = `hostname`.strip.downcase
+    if Origen.os.windows?
+      domain = ''  # Not sure what to do in this case...
+    else
+      domain = `dnsdomainname`.strip
+    end
+    port = 20020
+    puts ''
+    sleep 0.5
+    puts
+    puts
+    puts "*************************************************************"
+    puts "Point your OrigenLink app to:  http://#{host}#{domain.empty? ? '' : '.' + domain}:#{port}"
+    puts "*************************************************************"
+    puts
+    puts
+  end
+
+  # Fall through to the Origen interactive command to open up a console
+  @command = "interactive"
+
+# Always leave an else clause to allow control to fall back through to the Origen command handler.
+# You probably want to also add the command details to the help shown via 'origen -h',
+# you can do this bb adding the required text to @plugin_commands before handing control back to
+# Origen.
+else
+  @plugin_commands << <<-EOT
+ link:listen     Open a console and listen for OrigenLink requests over http (i.e. from a GUI)
+  EOT
+
+end

data/config/version.rb

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

data/lib/origen_link.rb

@@ -1,5 +1,5 @@
-require 'origen'
-require 'socket'
-require 'origen_link/vector_based'
-require 'origen_link/listener'
-require_relative '../config/version'
+require 'origen'
+require 'socket'
+require 'origen_link/vector_based'
+require 'origen_link/listener'
+require_relative '../config/version'

data/lib/origen_link/callback_handlers.rb

@@ -1,13 +1,13 @@
-module OrigenLink
-  class CallbackHandlers
-    include Origen::Callbacks
-
-    def pattern_generated(output_file)
-      tester.finalize_pattern(output_file)
-    end
-
-    def before_pattern(pattern_name)
-      tester.initialize_pattern
-    end
-  end
-end
+module OrigenLink
+  class CallbackHandlers
+    include Origen::Callbacks
+
+    def pattern_generated(output_file)
+      tester.finalize_pattern(output_file)
+    end
+
+    def before_pattern(pattern_name)
+      tester.initialize_pattern
+    end
+  end
+end

data/lib/origen_link/capture_support.rb

@@ -1,94 +1,94 @@
-module OrigenLink
-  module CaptureSupport
-    # Capture a vector
-    #
-    # This method applies a store vector request to the previous vector, note that is does
-    # not actually generate a new vector.
-    #
-    # The captured data is added to the captured_data array.
-    #
-    # This method is indended to be used by pin drivers, see the #capture method for the application
-    # level API.
-    #
-    # @example
-    #   $tester.cycle                # This is the vector you want to capture
-    #   $tester.store                # This applies the store request
-    def store(*pins)
-      options = pins.last.is_a?(Hash) ? pins.pop : {}
-      fail 'The store is not implemented yet on Link'
-    end
-
-    # Capture the next vector generated
-    #
-    # This method applies a store request to the next vector to be generated,
-    # note that is does not actually generate a new vector.
-    #
-    # The captured data is added to the captured_data array.
-    #
-    # This method is indended to be used by pin drivers, see the #capture method for the application
-    # level API.
-    #
-    # @example
-    #   tester.store_next_cycle
-    #   tester.cycle                # This is the vector that will be captured
-    def store_next_cycle(*pins)
-      options = pins.last.is_a?(Hash) ? pins.pop : {}
-      flush_vector
-      @store_pins = pins
-    end
-
-    # Capture any store data within the given block, return it and then internally clear the tester's
-    # capture memory.
-    #
-    # @example
-    #
-    #   v = tester.capture do
-    #     my_reg.store!
-    #   end
-    #   v      # => Data value read from my_reg on the DUT
-    def capture(*args)
-      if block_given?
-        yield
-        synchronize
-        d = @captured_data
-        @captured_data = []
-        d
-      else
-        # On other testers capture is an alias of store
-        store(*args)
-      end
-    end
-
-    private
-
-    def capture_data(response)
-      if @store_pins.size > 1
-        fail 'Data capture on multiple pins is not implemented yet'
-      else
-        captured_data[0] ||= 0
-        captured_data[0] = (captured_data[0] << 1) | extract_value(response, @store_pins[0])
-        @store_pins = []
-      end
-    end
-
-    def extract_value(response, pin)
-      v = response[index_of(pin) + 2]
-      if v == '`'
-        1
-      elsif v == '.'
-        0
-      else
-        fail "Failed to extract value for pin #{pin.name}, character in response is: #{v}"
-      end
-    end
-
-    # Returns the vector index (position) of the given pin
-    def index_of(pin)
-      i = @pinorder.split(',').index(pin.name.to_s)
-      unless i
-        fail "Data capture of pin #{pin.name} has been requested, but it has not been included in the Link pinmap!"
-      end
-      i
-    end
-  end
-end
+module OrigenLink
+  module CaptureSupport
+    # Capture a vector
+    #
+    # This method applies a store vector request to the previous vector, note that is does
+    # not actually generate a new vector.
+    #
+    # The captured data is added to the captured_data array.
+    #
+    # This method is indended to be used by pin drivers, see the #capture method for the application
+    # level API.
+    #
+    # @example
+    #   $tester.cycle                # This is the vector you want to capture
+    #   $tester.store                # This applies the store request
+    def store(*pins)
+      options = pins.last.is_a?(Hash) ? pins.pop : {}
+      fail 'The store is not implemented yet on Link'
+    end
+
+    # Capture the next vector generated
+    #
+    # This method applies a store request to the next vector to be generated,
+    # note that is does not actually generate a new vector.
+    #
+    # The captured data is added to the captured_data array.
+    #
+    # This method is indended to be used by pin drivers, see the #capture method for the application
+    # level API.
+    #
+    # @example
+    #   tester.store_next_cycle
+    #   tester.cycle                # This is the vector that will be captured
+    def store_next_cycle(*pins)
+      options = pins.last.is_a?(Hash) ? pins.pop : {}
+      flush_vector
+      @store_pins = pins
+    end
+
+    # Capture any store data within the given block, return it and then internally clear the tester's
+    # capture memory.
+    #
+    # @example
+    #
+    #   v = tester.capture do
+    #     my_reg.store!
+    #   end
+    #   v      # => Data value read from my_reg on the DUT
+    def capture(*args)
+      if block_given?
+        yield
+        synchronize
+        d = @captured_data
+        @captured_data = []
+        d
+      else
+        # On other testers capture is an alias of store
+        store(*args)
+      end
+    end
+
+    private
+
+    def capture_data(response)
+      if @store_pins.size > 1
+        fail 'Data capture on multiple pins is not implemented yet'
+      else
+        captured_data[0] ||= 0
+        captured_data[0] = (captured_data[0] << 1) | extract_value(response, @store_pins[0])
+        @store_pins = []
+      end
+    end
+
+    def extract_value(response, pin)
+      v = response[index_of(pin) + 2]
+      if v == '`'
+        1
+      elsif v == '.'
+        0
+      else
+        fail "Failed to extract value for pin #{pin.name}, character in response is: #{v}"
+      end
+    end
+
+    # Returns the vector index (position) of the given pin
+    def index_of(pin)
+      i = @pinorder.split(',').index(pin.name.to_s)
+      unless i
+        fail "Data capture of pin #{pin.name} has been requested, but it has not been included in the Link pinmap!"
+      end
+      i
+    end
+  end
+end