origen_link 0.2.0.pre0 → 0.2.0

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 = 2
-  BUGFIX = 0
-  DEV = 0
-
-  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
-end
+module OrigenLink
+  MAJOR = 0
+  MINOR = 2
+  BUGFIX = 0
+  DEV = nil
+
+  VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
+end

data/lib/origen_link.rb

@@ -1,4 +1,4 @@
-require 'origen'
-require 'socket'
-require 'origen_link/vector_based'
-require 'origen_link/listener'
+require 'origen'
+require 'socket'
+require 'origen_link/vector_based'
+require 'origen_link/listener'

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

data/lib/origen_link/configuration_commands.rb

@@ -1,84 +1,84 @@
-module OrigenLink
-  module ConfigurationCommands
-    # pinmap=
-    #   This method is used to setup the pin map on the debugger device.
-    #   The argument should be a string with <pin name>, <gpio #>, <pin name>
-    #   <gpio #>, etc
-    #
-    #   example:
-    #     tester.pinmap = 'tclk,26,tms,19,tdi,16,tdo,23'
-    def pinmap=(pinmap)
-      @pinmap = pinmap.gsub(/\s+/, '')
-      response = send_cmd('pin_assign', @pinmap)
-      setup_cmd_response_logger('pin_assign', response)
-    end
-
-    # pinorder=
-    #   This method is used to setup the pin order on the debugger device.
-    #   The pin order will indicate the order that pin data appears in vector
-    #   data.
-    #
-    #   This is a duplicate of pattern_pin_order and can be handled behind the
-    #   scenes in the future.
-    #
-    #   example:
-    #     tester.pinorder = 'tclk,tms,tdi,tdo'
-    def pinorder=(pinorder)
-      @pinorder = pinorder.gsub(/\s+/, '')
-      response = send_cmd('pin_patternorder', @pinorder)
-      setup_cmd_response_logger('pin_patternorder', response)
-    end
-
-    # pinformat=
-    #   This method is used to setup the pin clock format on the debugger device.
-    #   The supported formats are rl and rh
-    #
-    #   example:
-    #     tester.pinformat = 'func_25mhz,tclk,rl'
-    def pinformat=(pinformat)
-      @pinformat = replace_tset_name_w_number(pinformat.gsub(/\s+/, ''))
-      response = send_cmd('pin_format', @pinformat)
-      setup_cmd_response_logger('pin_format', response)
-    end
-
-    # pintiming=
-    #   This method is used to setup the pin timing on the debugger device.
-    #   Timing is relative to the rise and fall of a clock
-    #
-    #   timing value:         0   1   2
-    #   clock waveform:      ___/***\___
-    #
-    #   example:
-    #     tester.pintiming = 'func_25mhz,tms,0,tdi,0,tdo,1'
-    def pintiming=(pintiming)
-      @pintiming = replace_tset_name_w_number(pintiming.gsub(/\s+/, ''))
-      response = send_cmd('pin_timing', @pintiming)
-      setup_cmd_response_logger('pin_timing', response)
-    end
-
-    # replace_tset_name_w_number(csl)
-    #  This method is used by pinformat= and pintiming=
-    #  This method receives a comma separated list of arguments
-    #  the first of which is a timeset name.  A comma
-    #  separated list is returned with the timeset name replaced
-    #  by it's lookup number.  If it is a new timset, a lookup
-    #  number is associated with the name.
-    def replace_tset_name_w_number(csl)
-      args = csl.split(',')
-      args[0] = get_tset_number(args[0])
-      args.join(',')
-    end
-
-    # get_tset_number(name)
-    #   This method returns the test number associated with the
-    #   passed in tset name.  If the name is unknown a new lookup
-    #   number is returned.
-    def get_tset_number(name)
-      unless @tsets_programmed.key?(name)
-        @tsets_programmed[name] = @tset_count
-        @tset_count += 1
-      end
-      @tsets_programmed[name]
-    end
-  end
-end
+module OrigenLink
+  module ConfigurationCommands
+    # pinmap=
+    #   This method is used to setup the pin map on the debugger device.
+    #   The argument should be a string with <pin name>, <gpio #>, <pin name>
+    #   <gpio #>, etc
+    #
+    #   example:
+    #     tester.pinmap = 'tclk,26,tms,19,tdi,16,tdo,23'
+    def pinmap=(pinmap)
+      @pinmap = pinmap.gsub(/\s+/, '')
+      response = send_cmd('pin_assign', @pinmap)
+      setup_cmd_response_logger('pin_assign', response)
+    end
+
+    # pinorder=
+    #   This method is used to setup the pin order on the debugger device.
+    #   The pin order will indicate the order that pin data appears in vector
+    #   data.
+    #
+    #   This is a duplicate of pattern_pin_order and can be handled behind the
+    #   scenes in the future.
+    #
+    #   example:
+    #     tester.pinorder = 'tclk,tms,tdi,tdo'
+    def pinorder=(pinorder)
+      @pinorder = pinorder.gsub(/\s+/, '')
+      response = send_cmd('pin_patternorder', @pinorder)
+      setup_cmd_response_logger('pin_patternorder', response)
+    end
+
+    # pinformat=
+    #   This method is used to setup the pin clock format on the debugger device.
+    #   The supported formats are rl and rh
+    #
+    #   example:
+    #     tester.pinformat = 'func_25mhz,tclk,rl'
+    def pinformat=(pinformat)
+      @pinformat = replace_tset_name_w_number(pinformat.gsub(/\s+/, ''))
+      response = send_cmd('pin_format', @pinformat)
+      setup_cmd_response_logger('pin_format', response)
+    end
+
+    # pintiming=
+    #   This method is used to setup the pin timing on the debugger device.
+    #   Timing is relative to the rise and fall of a clock
+    #
+    #   timing value:         0   1   2
+    #   clock waveform:      ___/***\___
+    #
+    #   example:
+    #     tester.pintiming = 'func_25mhz,tms,0,tdi,0,tdo,1'
+    def pintiming=(pintiming)
+      @pintiming = replace_tset_name_w_number(pintiming.gsub(/\s+/, ''))
+      response = send_cmd('pin_timing', @pintiming)
+      setup_cmd_response_logger('pin_timing', response)
+    end
+
+    # replace_tset_name_w_number(csl)
+    #  This method is used by pinformat= and pintiming=
+    #  This method receives a comma separated list of arguments
+    #  the first of which is a timeset name.  A comma
+    #  separated list is returned with the timeset name replaced
+    #  by it's lookup number.  If it is a new timset, a lookup
+    #  number is associated with the name.
+    def replace_tset_name_w_number(csl)
+      args = csl.split(',')
+      args[0] = get_tset_number(args[0])
+      args.join(',')
+    end
+
+    # get_tset_number(name)
+    #   This method returns the test number associated with the
+    #   passed in tset name.  If the name is unknown a new lookup
+    #   number is returned.
+    def get_tset_number(name)
+      unless @tsets_programmed.key?(name)
+        @tsets_programmed[name] = @tset_count
+        @tset_count += 1
+      end
+      @tsets_programmed[name]
+    end
+  end
+end