origen_jtag 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 300c822af7cb117a48ceea25d068f327d7a19186
-  data.tar.gz: 8e5eb5874aa781c3e55518c340d2433c0a5cca67
+  metadata.gz: bc7646634845207bbbc1605bc114acbcd95ee976
+  data.tar.gz: 1aee4f18b9d1e40acee402ee56262819a79b600d
 SHA512:
-  metadata.gz: b3e929d62e4ef0cf0b30f8c45071c9f9182514ce6f37eae8bf0274fe1a37c9717ab9a9666593a3a90781cf49562763e9fdaf32b263256fe810b17401769e9a31
-  data.tar.gz: cb077d873f3aae8a2cd941f9308eb7d0e61cb454e656c71c3ab19de13eb5edee7abb01b07dfaef2e996fbac285cc7fd35a3995ec2f2b15db39dcfdb6c26d41a6
+  metadata.gz: 4bc19f67dad01804c92e3c4125e313d718c56f2b6187aa61d102cadf90692c19b3b6b5edfcf80c6d43a9c23052e16288f396419b5618773542552518140c115c
+  data.tar.gz: 4f365c682bac5996de6d9db62b1c53b102891773a8ec40bdfac3c50490dff20894d5ef0495bf02f28360b54d2307ef2507b06688171f0e31e7389219292d2c00

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenJTAG
   MAJOR = 0
-  MINOR = 16
+  MINOR = 17
   BUGFIX = 0
   DEV = nil
 

data/lib/origen_jtag/driver.rb

@@ -525,6 +525,7 @@ module OrigenJTAG
       if reg_or_val.respond_to?(:data)
         if options[:read]
           tdo = reg_or_val.dup
+          tdo.read(options) unless options[:mask].nil?
         else
           tdo = Reg.dummy(size) unless options[:shift_out_data].is_a?(Origen::Registers::Reg)
         end
@@ -534,7 +535,7 @@ module OrigenJTAG
               tdo = options[:shift_out_data]
             else
               tdo.write(options[:shift_out_data])
-              tdo.read
+              tdo.read(options)
             end
           else
             tdo.write(0)
@@ -544,14 +545,14 @@ module OrigenJTAG
         tdo = Reg.dummy(size)
         if options[:read]
           tdo.write(reg_or_val)
-          tdo.read
+          tdo.read(options)
         else
           if options[:shift_out_data]
             if options[:shift_out_data].is_a?(Origen::Registers::Reg)
               tdo = options[:shift_out_data]
             else
               tdo.write(options[:shift_out_data])
-              tdo.read
+              tdo.read(options)
             end
           else
             tdo.write(0)

data/pattern/jtag_workout.rb

@@ -204,4 +204,17 @@ Pattern.create(options = { name: pat_name }) do
   end
   cc 'TDO should be H'
   jtag.read_dr 0xFFFF, size: 16, msg: 'Read value out of DR'
+
+  test 'Mask option for read_dr works'
+  cc 'TDO should be H'
+  jtag.read_dr 0xFFFF, size: 16, mask: 0x5555, msg: 'Read value out of DR'
+
+  test 'Write value into DR, with compare on TDO'
+  jtag.write_dr 0x5555, size: 16, shift_out_data: 0xAAAA, mask: 0x00FF, msg: 'Write value into DR'
+
+  test 'Shifting an explicit value out of TDO with mask'
+  jtag.shift 0x1234, size: 16, read: true, mask: 0xFF00
+
+  test 'Shifting an explicit value into TDI (and out of TDO)'
+  jtag.shift 0x1234, size: 16, cycle_last: true, shift_out_data: 0xAAAA, mask: 0x0F0F
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_jtag
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen