origen_arm_debug 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f50266e035670b3ac7a2b858f74f9a987d21bd6
-  data.tar.gz: 88b441e54768ee950c6e16934c90fde80b358261
+  metadata.gz: 10a26d1f0559e342aac9aa18777bb2bc3f04b9ff
+  data.tar.gz: acbe130cdb99f062be4629eed0ab73569b960928
 SHA512:
-  metadata.gz: 3c3c25cb4296551f118f3684aad4ae4d325b444b916ac0199b47ff3f9e3c60175c7b26ee1fdd748ddf1e803219ed343acae7bf6dd00ddb6ae521693022f2b1d7
-  data.tar.gz: 4179c41fd7637a0608442bb3dbb96f0e35dc7005e0ac592140657a78c0ed6757be6cd821d1b7608b5b086222e06d2c702ce66ba14987016544ee8284e9f27cb8
+  metadata.gz: d400af4575b1daa231314c17391e13aeb937b04bb066e95e229917ea909a113090938f95f8c9194f66642abff9be001da811a535d1b87eecabbf4d24b1d5bbe0
+  data.tar.gz: 53b6447b770c98bd639ed62f34fe13d39c60e32c9414e06057ecce46995ed3ff80e100b768ffe95077c3bea320eadd15cebdd467d9f440216932a9f0124ed3ac

data/config/application.rb

@@ -57,4 +57,11 @@ class OrigenARMDebugApplication < Origen::Application
     end 
   end 
 
+  # def after_web_site_compile(options)
+  #   # Build the model documentation
+  #   OrigenDocHelpers.generate_model_docs layout: "#{Origen.root}/templates/web/layouts/_basic.html.erb", tab: :model do |d|
+  #     d.page model: $dut.arm_debug
+  #   end
+  # end
+
 end

data/config/version.rb

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

data/lib/origen_arm_debug/ap.rb

@@ -1,4 +1,3 @@
-require 'origen_arm_debug/ap_controller'
 module OrigenARMDebug
   # Generic Access Port (AP)
   class AP

data/lib/origen_arm_debug/ap_controller.rb

@@ -23,5 +23,9 @@ module OrigenARMDebug
         fail 'No Resource-specific transport defined for MDM-AP (#model.name})'
       end
     end
+
+    def base_address
+      model.base_address
+    end
   end
 end

data/lib/origen_arm_debug/dap.rb

@@ -1,4 +1,3 @@
-require 'origen_arm_debug/dap_controller'
 module OrigenARMDebug
   # This is the top-level model that instantiates the DP and APs
   class DAP
@@ -11,23 +10,24 @@ module OrigenARMDebug
       @mem_aps = []         # Array of MEM-APs
       @jtag_aps = []        # Array of JTAG-APs
       @ext_aps = []         # Array of 'extension' APs
+
       instantiate_subblocks(options)
     end
 
     def instantiate_subblocks(options = {})
       if options[:swd] || parent.respond_to?(:swd)
-        dps << sub_block(:sw_dp, class_name: 'OrigenARMDebug::SW_DP')
+        dps << sub_block(:sw_dp, class_name: 'SW_DP')
       end
 
       if options[:jtag] || parent.respond_to?(:jtag)
-        dps << sub_block(:jtag_dp, class_name: 'OrigenARMDebug::JTAG_DP')
+        dps << sub_block(:jtag_dp, class_name: 'JTAG_DP')
       end
 
       Array(options[:mem_aps]).each do |name, base_address|
         if base_address.is_a?(Hash)
-          ap_opts = { class_name: 'OrigenARMDebug::MemAP' }.merge(base_address)
+          ap_opts = { class_name: 'MemAP' }.merge(base_address)
         else
-          ap_opts = { class_name: 'OrigenARMDebug::MemAP', base_address: base_address }
+          ap_opts = { class_name: 'MemAP', base_address: base_address }
         end
 
         add_ap(name, ap_opts)
@@ -35,9 +35,9 @@ module OrigenARMDebug
 
       Array(options[:jtag_aps]).each do |name, base_address|
         if base_address.is_a?(Hash)
-          ap_opts = { class_name: 'OrigenARMDebug::JTAGAP' }.merge(base_address)
+          ap_opts = { class_name: 'JTAGAP' }.merge(base_address)
         else
-          ap_opts = { class_name: 'OrigenARMDebug::JTAGAP', base_address: base_address }
+          ap_opts = { class_name: 'JTAGAP', base_address: base_address }
         end
 
         add_ap(name, ap_opts)
@@ -71,9 +71,9 @@ module OrigenARMDebug
       domain name.to_sym
       ap = sub_block(name.to_sym, options)
 
-      if options[:class_name] == 'OrigenARMDebug::MemAP'
+      if options[:class_name] == 'MemAP'
         mem_aps << ap
-      elsif options[:class_name] == 'OrigenARMDebug::JTAGAP'
+      elsif options[:class_name] == 'JTAGAP'
         jtag_aps << ap
       else
         ext_aps << ap

data/lib/origen_arm_debug/jtag_ap.rb

@@ -1,8 +1,5 @@
-require 'origen_arm_debug/jtag_ap_controller'
 module OrigenARMDebug
   class JTAGAP < AP
-    include Origen::Model
-
     def initialize(options = {})
       super
     end

data/lib/origen_arm_debug/jtag_ap_controller.rb

@@ -1,6 +1,5 @@
 module OrigenARMDebug
-  class JTAGAPController
-    include Origen::Controller
-    include Helpers
+  class JTAGAPController < APController
+    # Placeholder
   end
 end

data/lib/origen_arm_debug/jtag_dp.rb

@@ -1,4 +1,3 @@
-require 'origen_arm_debug/jtag_dp_controller'
 module OrigenARMDebug
   class JTAG_DP
     include Origen::Model

data/lib/origen_arm_debug/jtag_dp_controller.rb

@@ -1,4 +1,3 @@
-require 'origen_arm_debug/dp_controller'
 module OrigenARMDebug
   class JTAG_DPController
     include Origen::Controller
@@ -136,5 +135,9 @@ module OrigenARMDebug
         dut.jtag.read_dr(dr, options)
       end
     end
+
+    def base_address
+      model.base_address
+    end
   end
 end

data/lib/origen_arm_debug/mem_ap.rb

@@ -1,9 +1,6 @@
-require 'origen_arm_debug/mem_ap_controller'
 module OrigenARMDebug
   # Memory Access Port (MEM-AP)
   class MemAP < AP
-    include Origen::Model
-
     # Latency to write a memory resource
     attr_reader :latency
 
@@ -14,6 +11,7 @@ module OrigenARMDebug
 
     def initialize(options = {})
       super
+
       @latency = options[:latency] || 0
       @apmem_access_wait = options[:apmem_access_wait] || 0
 

data/lib/origen_arm_debug/sw_dp.rb

@@ -1,4 +1,3 @@
-require 'origen_arm_debug/sw_dp_controller'
 module OrigenARMDebug
   class SW_DP
     include Origen::Model

data/lib/origen_arm_debug/sw_dp_controller.rb

@@ -1,4 +1,3 @@
-require 'origen_arm_debug/dp_controller'
 module OrigenARMDebug
   class SW_DPController
     include Origen::Controller

data/lib/origen_arm_debug.rb

@@ -3,10 +3,18 @@ require_relative '../config/application.rb'
 require 'origen_jtag'
 require 'origen_swd'
 
-require 'origen_arm_debug/helpers'
-require 'origen_arm_debug/dap'
-require 'origen_arm_debug/jtag_dp'
-require 'origen_arm_debug/sw_dp'
-require 'origen_arm_debug/ap.rb'
-require 'origen_arm_debug/mem_ap'
-require 'origen_arm_debug/jtag_ap'
+module OrigenARMDebug
+  require 'origen_arm_debug/helpers'
+  require 'origen_arm_debug/dap'
+  require 'origen_arm_debug/dap_controller'
+  require 'origen_arm_debug/dp_controller'
+  require 'origen_arm_debug/jtag_dp'
+  require 'origen_arm_debug/jtag_dp_controller'
+  require 'origen_arm_debug/sw_dp'
+  require 'origen_arm_debug/sw_dp_controller'
+  require 'origen_arm_debug/ap'
+  require 'origen_arm_debug/ap_controller'
+  require 'origen_arm_debug/mem_ap'
+  require 'origen_arm_debug/mem_ap_controller'
+  require 'origen_arm_debug/jtag_ap'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_arm_debug
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-12 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen