origen_link 0.4.2 → 0.4.3

data/lib/origen_link/server_com.rb

@@ -1,154 +1,154 @@
-module OrigenLink
-  module ServerCom
-    # send a single command to the server
-    #
-    # send_cmd(cmdstr, argstr)
-    #   cmdstr is a valid command.  <category>_<command>
-    #     Ex: 'pin_assign'
-    #   argstr is a valid comma separated, no white space argument string.
-    #     Ex: 'tclk,26,tms,19,tdi,16,tdo,23'
-    #
-    #   returns: response from server
-    #
-    #   This method connects to the socket being served by the debugger, sends
-    #   the command and arguments separated by a semicolon (Ex: 'pin_cycle:110H'),
-    #   then waits for a response.  The response is returned to the caller.
-    #
-    #   In addition, this method also keeps track of time elapsed transfering data
-    #   and waiting for a response.
-    def send_cmd(cmdstr, argstr)
-      # objects have to be created outside of the block
-      # to be accessible outside of the block
-      t1 = 0
-      t2 = 0
-      t3 = 0
-      t4 = 0
-      t5 = 0
-      response = ''
-      user_status = ''
-      success = false
-
-      until success
-        t1 = Time.now
-
-        # open a connection to the server, send the command and wait for a response
-        TCPSocket.open(@address, @port) do |link|
-          t2 = Time.now
-          link.write(@user_name + "\n" + cmdstr + ':' + argstr + "\n\n")
-          t3 = Time.now
-          user_status = link.gets
-          response = link.gets
-          t4 = Time.now
-        end
-
-        t5 = Time.now
-
-        if @initial_comm_sent && ((user_status =~ /user_change/) || (response =~ /Busy:/))
-          # there has been a collision
-          Origen.log.error 'A collision (another user interrupted your link session) has occured'
-          Origen.log.error "When using debug mode ensure that you don't exceed the 20 minute communication time out"
-          exit
-        end
-
-        if response =~ /Busy:/
-          Origen.log.error response + ' retry in 1 second'
-          sleep(1)
-        else
-          success = true
-          @initial_comm_sent = true
-        end
-      end
-
-      @total_comm_time += (t5 - t1)
-      if @max_packet_time < (t5 - t1)
-        @max_packet_time = (t5 - t1)
-        @longest_packet = cmdstr + ':' + argstr
-      end
-      @total_connect_time += (t2 - t1)
-      @total_xmit_time += (t3 - t2)
-      @total_recv_time += (t4 - t3)
-      @max_receive_time = (t4 - t3) if @max_receive_time < (t4 - t3)
-      @total_packets += 1
-      Origen.log.error 'nil response from server (likely died) for command(' + cmdstr + ':' + argstr + ')' if response.nil?
-      @pattern_link_messages << "#{cmdstr}:#{argstr}"
-      response    # ensure the response is passed along
-    end
-
-    # Send the stored batch of vectors to the server
-    def send_batch(vector_batch)
-      vector_batch_str = @user_name + "\n" + vector_batch.join("\n") + "\n\n"
-      user_status = ''
-      success = false
-
-      until success
-        t1 = 0
-        t2 = 0
-        t3 = 0
-        t4 = 0
-        t5 = 0
-        response = []
-        t1 = Time.now
-        TCPSocket.open(@address, @port) do |link|
-          t2 = Time.now
-          link.write(vector_batch_str)
-          t3 =  Time.now
-          while line = link.gets
-            response << line.chomp
-          end
-          t4 = Time.now
-        end
-        t5 = Time.now
-
-        user_status = response.delete_at(0)
-        if @initial_comm_sent && ((user_status =~ /user_change/) || (response[0] =~ /Busy:/))
-          # there has been a collision
-          Origen.log.error 'A collision (another user interrupted your link session) has occured'
-          Origen.log.error "When using debug mode ensure that you don't exceed the 20 minute communication time out"
-          exit
-        end
-
-        if response[0] =~ /Busy:/
-          Origen.log.error response[0] + ' retry in 1 second'
-          sleep(1)
-        else
-          success = true
-          @initial_comm_sent = true
-        end
-
-      end
-
-      @total_comm_time += (t5 - t1)
-      @total_connect_time += (t2 - t1)
-      @total_xmit_time += (t3 - t2)
-      @total_recv_time += (t4 - t3)
-      @max_receive_time = (t4 - t3) if @max_receive_time < (t4 - t3)
-      @total_packets += 1
-      @pattern_link_messages.concat(vector_batch)
-      response
-    end
-
-    # Handle a server response (inform of Failures)
-    #
-    #   There are several setup commands that initialize the debugger device with
-    #   information about how to interact with the dut.  All of the setup commands
-    #   return pass or fail.  This method exists so that the code doesn't have to
-    #   be duplicated by every setup method.
-    def setup_cmd_response_logger(command, response)
-      if !response.nil?
-        # if the server died (which hopefully it never will) response is nil
-        case response.chr
-        when 'P'
-          Origen.log.debug command + ' setup was successful'
-        when 'F'
-          Origen.log.error command + ' setup FAILED with the following message:'
-          Origen.log.error response.chomp
-        else
-          Origen.log.error 'Non standard response from ' + command + ' setup: ' + response
-        end
-      else
-        # response was nil.  The server died
-        Origen.log.error command + ' caused a nil response.  The server likely died.'
-      end
-    end
-  end
-end
+module OrigenLink
+  module ServerCom
+    # send a single command to the server
+    #
+    # send_cmd(cmdstr, argstr)
+    #   cmdstr is a valid command.  <category>_<command>
+    #     Ex: 'pin_assign'
+    #   argstr is a valid comma separated, no white space argument string.
+    #     Ex: 'tclk,26,tms,19,tdi,16,tdo,23'
+    #
+    #   returns: response from server
+    #
+    #   This method connects to the socket being served by the debugger, sends
+    #   the command and arguments separated by a semicolon (Ex: 'pin_cycle:110H'),
+    #   then waits for a response.  The response is returned to the caller.
+    #
+    #   In addition, this method also keeps track of time elapsed transfering data
+    #   and waiting for a response.
+    def send_cmd(cmdstr, argstr)
+      # objects have to be created outside of the block
+      # to be accessible outside of the block
+      t1 = 0
+      t2 = 0
+      t3 = 0
+      t4 = 0
+      t5 = 0
+      response = ''
+      user_status = ''
+      success = false
+
+      until success
+        t1 = Time.now
+
+        # open a connection to the server, send the command and wait for a response
+        TCPSocket.open(@address, @port) do |link|
+          t2 = Time.now
+          link.write(@user_name + "\n" + cmdstr + ':' + argstr + "\n\n")
+          t3 = Time.now
+          user_status = link.gets
+          response = link.gets
+          t4 = Time.now
+        end
+
+        t5 = Time.now
+
+        if @initial_comm_sent && ((user_status =~ /user_change/) || (response =~ /Busy:/))
+          # there has been a collision
+          Origen.log.error 'A collision (another user interrupted your link session) has occured'
+          Origen.log.error "When using debug mode ensure that you don't exceed the 20 minute communication time out"
+          exit
+        end
+
+        if response =~ /Busy:/
+          Origen.log.error response + ' retry in 1 second'
+          sleep(1)
+        else
+          success = true
+          @initial_comm_sent = true
+        end
+      end
+
+      @total_comm_time += (t5 - t1)
+      if @max_packet_time < (t5 - t1)
+        @max_packet_time = (t5 - t1)
+        @longest_packet = cmdstr + ':' + argstr
+      end
+      @total_connect_time += (t2 - t1)
+      @total_xmit_time += (t3 - t2)
+      @total_recv_time += (t4 - t3)
+      @max_receive_time = (t4 - t3) if @max_receive_time < (t4 - t3)
+      @total_packets += 1
+      Origen.log.error 'nil response from server (likely died) for command(' + cmdstr + ':' + argstr + ')' if response.nil?
+      @pattern_link_messages << "#{cmdstr}:#{argstr}"
+      response    # ensure the response is passed along
+    end
+
+    # Send the stored batch of vectors to the server
+    def send_batch(vector_batch)
+      vector_batch_str = @user_name + "\n" + vector_batch.join("\n") + "\n\n"
+      user_status = ''
+      success = false
+
+      until success
+        t1 = 0
+        t2 = 0
+        t3 = 0
+        t4 = 0
+        t5 = 0
+        response = []
+        t1 = Time.now
+        TCPSocket.open(@address, @port) do |link|
+          t2 = Time.now
+          link.write(vector_batch_str)
+          t3 =  Time.now
+          while line = link.gets
+            response << line.chomp
+          end
+          t4 = Time.now
+        end
+        t5 = Time.now
+
+        user_status = response.delete_at(0)
+        if @initial_comm_sent && ((user_status =~ /user_change/) || (response[0] =~ /Busy:/))
+          # there has been a collision
+          Origen.log.error 'A collision (another user interrupted your link session) has occured'
+          Origen.log.error "When using debug mode ensure that you don't exceed the 20 minute communication time out"
+          exit
+        end
+
+        if response[0] =~ /Busy:/
+          Origen.log.error response[0] + ' retry in 1 second'
+          sleep(1)
+        else
+          success = true
+          @initial_comm_sent = true
+        end
+
+      end
+
+      @total_comm_time += (t5 - t1)
+      @total_connect_time += (t2 - t1)
+      @total_xmit_time += (t3 - t2)
+      @total_recv_time += (t4 - t3)
+      @max_receive_time = (t4 - t3) if @max_receive_time < (t4 - t3)
+      @total_packets += 1
+      @pattern_link_messages.concat(vector_batch)
+      response
+    end
+
+    # Handle a server response (inform of Failures)
+    #
+    #   There are several setup commands that initialize the debugger device with
+    #   information about how to interact with the dut.  All of the setup commands
+    #   return pass or fail.  This method exists so that the code doesn't have to
+    #   be duplicated by every setup method.
+    def setup_cmd_response_logger(command, response)
+      if !response.nil?
+        # if the server died (which hopefully it never will) response is nil
+        case response.chr
+        when 'P'
+          Origen.log.debug command + ' setup was successful'
+        when 'F'
+          Origen.log.error command + ' setup FAILED with the following message:'
+          Origen.log.error response.chomp
+        else
+          Origen.log.error 'Non standard response from ' + command + ' setup: ' + response
+        end
+      else
+        # response was nil.  The server died
+        Origen.log.error command + ' caused a nil response.  The server likely died.'
+      end
+    end
+  end
+end

data/lib/origen_link/test/top_level.rb

@@ -1,48 +1,48 @@
-module OrigenLink
-  module Test
-    class TopLevel
-      include Origen::TopLevel
-
-      def initialize(options = {})
-        instantiate_pins(options)
-        instantiate_registers(options)
-        instantiate_sub_blocks(options)
-      end
-
-      def instantiate_pins(options = {})
-        options = {
-          jtag_comm_config:			     false,
-          invalid_pin_number_test:	false,
-          missing_pinmap_test:		   false
-        }.merge(options)
-        add_pin :tclk, meta: { link_io: 119 }
-        add_pin :tdi, meta: { link_io: 116 }
-        add_pin :tdo, meta: { link_io: 124 }
-        add_pin :tms, meta: { link_io: 6 }
-        add_pin :resetb
-        add_pins :port_a, size: 8
-
-        pin_pattern_order :tclk, :tms, :tdi, :tdo, only: true if options[:jtag_comm_config]
-
-        # if tester.link? #.to_s == 'OrigenLink::VectorBased'
-        if tester.to_s == 'OrigenLink::VectorBased'
-          if options[:invalid_pin_number_test]
-            tester.pinmap = 'tclk,119,tms,1900,tdi,116,tdo,124'
-          else
-            tester.pinmap = 'tclk,119,tms,6,tdi,116,tdo,124' unless options[:missing_pinmap_test]
-          end
-          # tester.pinorder = 'tclk,tms,tdi,tdo'
-        end
-      end
-
-      def instantiate_registers(options = {})
-        reg :testreg, 0 do |reg|
-          reg.bits 31..0,		:value
-        end
-      end
-
-      def instantiate_sub_blocks(options = {})
-      end
-    end
-  end
-end
+module OrigenLink
+  module Test
+    class TopLevel
+      include Origen::TopLevel
+
+      def initialize(options = {})
+        instantiate_pins(options)
+        instantiate_registers(options)
+        instantiate_sub_blocks(options)
+      end
+
+      def instantiate_pins(options = {})
+        options = {
+          jtag_comm_config:			     false,
+          invalid_pin_number_test:	false,
+          missing_pinmap_test:		   false
+        }.merge(options)
+        add_pin :tclk, meta: { link_io: 119 }
+        add_pin :tdi, meta: { link_io: 116 }
+        add_pin :tdo, meta: { link_io: 124 }
+        add_pin :tms, meta: { link_io: 6 }
+        add_pin :resetb
+        add_pins :port_a, size: 8
+
+        pin_pattern_order :tclk, :tms, :tdi, :tdo, only: true if options[:jtag_comm_config]
+
+        # if tester.link? #.to_s == 'OrigenLink::VectorBased'
+        if tester.to_s == 'OrigenLink::VectorBased'
+          if options[:invalid_pin_number_test]
+            tester.pinmap = 'tclk,119,tms,1900,tdi,116,tdo,124'
+          else
+            tester.pinmap = 'tclk,119,tms,6,tdi,116,tdo,124' unless options[:missing_pinmap_test]
+          end
+          # tester.pinorder = 'tclk,tms,tdi,tdo'
+        end
+      end
+
+      def instantiate_registers(options = {})
+        reg :testreg, 0 do |reg|
+          reg.bits 31..0,		:value
+        end
+      end
+
+      def instantiate_sub_blocks(options = {})
+      end
+    end
+  end
+end

data/lib/origen_link/test/top_level_controller.rb

@@ -1,46 +1,46 @@
-require 'origen_jtag'
-
-module OrigenLink
-  module Test
-    class TopLevelController
-      include Origen::Controller
-
-      include OrigenJTAG
-
-      JTAG_CONFIG = {
-        tclk_format:	  :rl,
-        # tclk_format:     :rh,
-        tclk_multiple:	1,
-        # tclk_multiple:   4,
-        tdo_strobe:    :tclk_high,
-        # tdo_store_cycle: 3,
-        init_state:    :idle
-      }
-
-      def startup(options)
-        pp 'Enter test mode' do
-          # if tester.link?
-          if tester.to_s == 'OrigenLink::VectorBased'
-            # tester.initialize_pattern
-            # below is for testing return format timing, requires tclk to be rl and multiple of 1
-            tester.pinformat = 'func_25mhz,tclk,rl'
-            tester.pintiming = 'func_25mhz,tdi,0,tms,0,tdo,1'
-          end
-          tester.set_timeset('func_25mhz', 40)   # Where 40 is the period in ns
-          tester.wait time_in_us: 100
-        end
-      end
-
-      def shutdown(options)
-        pp 'Reset the device' do
-          pin(:resetb).drive!(0)
-          pin(:tclk).drive!(0)
-        end
-        # if tester.link?
-        if tester.to_s == 'OrigenLink::VectorBased'
-          # tester.finalize_pattern
-        end
-      end
-    end
-  end
-end
+require 'origen_jtag'
+
+module OrigenLink
+  module Test
+    class TopLevelController
+      include Origen::Controller
+
+      include OrigenJTAG
+
+      JTAG_CONFIG = {
+        tclk_format:	  :rl,
+        # tclk_format:     :rh,
+        tclk_multiple:	1,
+        # tclk_multiple:   4,
+        tdo_strobe:    :tclk_high,
+        # tdo_store_cycle: 3,
+        init_state:    :idle
+      }
+
+      def startup(options)
+        pp 'Enter test mode' do
+          # if tester.link?
+          if tester.to_s == 'OrigenLink::VectorBased'
+            # tester.initialize_pattern
+            # below is for testing return format timing, requires tclk to be rl and multiple of 1
+            tester.pinformat = 'func_25mhz,tclk,rl'
+            tester.pintiming = 'func_25mhz,tdi,0,tms,0,tdo,1'
+          end
+          tester.set_timeset('func_25mhz', 40)   # Where 40 is the period in ns
+          tester.wait time_in_us: 100
+        end
+      end
+
+      def shutdown(options)
+        pp 'Reset the device' do
+          pin(:resetb).drive!(0)
+          pin(:tclk).drive!(0)
+        end
+        # if tester.link?
+        if tester.to_s == 'OrigenLink::VectorBased'
+          # tester.finalize_pattern
+        end
+      end
+    end
+  end
+end