origen_arm_debug 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 528eb3303524b33d1916c73c72a003e9ab5b2880
-  data.tar.gz: fb08b4c3360b61dc8732ad9bcf6065896fc638c3
+  metadata.gz: 7a971ee291955da63aad29feded042b58cc95a3b
+  data.tar.gz: 1f85f6436f5ebb91afc63ce5807ac4618378cfbf
 SHA512:
-  metadata.gz: 19abcb44c8b1fed4d00f1cab8828dccd640b2ee2bdf0f903867fd179e720e5d1ada1fcaf57691735238e606eac71237ee0cbc0f0991840b533e82433b4005345
-  data.tar.gz: a8daf8a46d1d3f2c9c68bc66a1ab94aa828c074e24e7d05e26749cd774bca47a30b8fc57bda31b08614a05e05925b2639efb080408fb8afa02c7c90b5f304d1b
+  metadata.gz: 7068b2563708fbf0f5d653e1930c2f32bdb75beff76d96838e57e7a96f2e4bf6b4b593ae166e98aef45c4779669ab9612b83f81fe457101e351a797b3ec340a7
+  data.tar.gz: 178ab04e89d5b436f826d1f31d13083a3465ed72717bd0dc6dfdf01924d78d31e6ab374963e6e35d0df7d03913ab05d25d28621e250a1fffb4fdf180c2c491e5

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenARMDebug
   MAJOR = 0
-  MINOR = 7
+  MINOR = 8
   BUGFIX = 0
   DEV = nil
 

data/lib/origen_arm_debug/swj_dp.rb

@@ -307,6 +307,7 @@ module OrigenARMDebug
         set_apselect(@current_apaddr & 0xFFFFFFFE, options)
       end
       set_ir(name) if @imp == :jtag
+      options = { name: name }.merge(options)
       acc_access(addr, rwb, 0, wdata, options)
     end
 
@@ -324,6 +325,7 @@ module OrigenARMDebug
       else
         set_ir('APACC')
       end
+      options = { name: 'APACC' }.merge(options)
       acc_access((addr & 0xC), rwb, 1, wdata, options)
     end
 
@@ -350,6 +352,7 @@ module OrigenARMDebug
     # @param [Integer] wdata Value of data to be written
     # @param [Hash] options Options to customize the operation
     def acc_access_swd(addr, rwb, ap_dp, wdata, options = {})
+      _name = options.delete(:name)
       if (rwb == 1)
         if options[:reg].nil?
           swd.read(ap_dp, addr, options)
@@ -373,6 +376,7 @@ module OrigenARMDebug
     # @param [Integer] wdata Value of data to be written
     # @param [Hash] options Options to customize the operation
     def acc_access_jtag(addr, rwb, ap_dp, wdata, options = {})
+      _name = options.delete(:name)
       if !options[:r_attempts].nil?
         attempts = options[:r_attempts]
       elsif !options[:r_attempts].nil?
@@ -382,7 +386,7 @@ module OrigenARMDebug
       end
 
       attempts.times do
-        if rwb == 1
+        if _name == 'RBUFF'
           if options[:reg].nil?
             r = $dut.reg(:dap)
             if options[:r_mask] == 'store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_arm_debug
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ronnie Lajaunie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen