origen_core_support 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290fcca268ca3c069c200a748557821636e133b6
-  data.tar.gz: 046d2695cbcf1dd6b9791a0664ba55285db379d4
+  metadata.gz: 999708ab9db10eccefefef06e4d559ab6074d81f
+  data.tar.gz: b8eb4b68081709f88536added176ae6b90e01ead
 SHA512:
-  metadata.gz: 8c8f8398b205cad773aad81a4677fe9d5f9c41e4490b5ad42462fb52448d9b769824be6154cf67973ffae6e86fee36a9b285d1d485a208bd171688faed79c0a8
-  data.tar.gz: 9cc88fade0064973a8f8aee1304c46d03a05b942fd34967409d8ea0f30609e31fc3491430c40d87b5b425814470d9b26c81bde41928ff44b60d5c8cd5e31c1ba
+  metadata.gz: 7dc948d060adfd2dc2dfd9c3d9b703d454a094a64aa79c0a591bf4e1f9e5f24949625e8c60c1264d690062b959834d57f458240e47dccee37c37d4854eaf54fe
+  data.tar.gz: 9b6375f3e9869122d4e06af6237982a734be0f25f0ae4e0be5c39a71c204085eb67ae4e218b274a575fa7ab7e798528bbae3460ac6e3d15e4dba0d2bc555552d

data/config/version.rb

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

data/lib/c99/nvm.rb

@@ -1,28 +1,30 @@
 module C99
   class NVM
-
     attr_accessor :blocks
 
     include Origen::Pins
     include Origen::Registers
 
     def initialize
-
-      add_reg :mclkdiv,   0x03,  16,  :osch       => { :pos => 15 },
-                                      :asel       => { :pos => 14 },
-                                      :failctl    => { :pos => 13 },
-                                      :parsel     => { :pos => 12 },
-                                      :eccen      => { :pos => 11 },
-                                      :cmdloc     => { :pos => 8, :bits => 3, :res => 0b001 },
-                                      :clkdiv     => { :pos => 0, :bits => 8, :res => 0x18 }
-
-      add_reg :data,      0x4,   16,  :d          => { :pos => 0, :bits => 16 }
+      reg :mclkdiv, 0x03, size: 16 do |reg|
+        reg.bit 15, :osch
+        reg.bit 14, :asel
+        reg.bit 13, :failctl
+        reg.bit 12, :parsel
+        reg.bit 11, :eccen
+        reg.bit 10..8, :cmdloc, res: 0b001
+        reg.bit 7..0, :clkdiv, res: 0x18
+      end
+
+      reg :data, 0x4, size: 16 do |reg|
+        reg.bits 15..0, :d
+      end
 
       @blocks = [Block.new(0, self), Block.new(1, self), Block.new(2, self)]
     end
 
     def find_block_by_id(id)
-      @blocks.select{ |block| block.id == id }.first
+      @blocks.find { |block| block.id == id }
     end
 
     def override_method
@@ -30,8 +32,7 @@ module C99
     end
 
     def reg_owner_alias
-      ["flash", "fmu"]
+      %w(flash fmu)
     end
-
   end
 end

data/lib/c99/soc.rb

@@ -5,21 +5,20 @@ module C99
     include Origen::TopLevel
 
     def initialize
+      add_pin :reset,   reset: :drive_hi,  name: 'nvm_reset'
+      add_pin :clk,     reset: :drive_hi,  name: 'nvm_clk'
+      add_pin :clk_mux, reset: :drive_hi,  name: 'nvm_clk_mux'
+      add_pins :porta,   reset: :drive_lo,  size: 8
+      add_pins :portb,   reset: :drive_lo,  size: 8, endian: :little
+      add_pin :invoke,  reset: :drive_lo,  name: 'nvm_invoke'
+      add_pin :done,    reset: :expect_hi, name: 'nvm_done'
+      add_pin :fail,    reset: :expect_lo, name: 'nvm_fail'
+      add_pin :alvtst,  reset: :dont_care, name: 'nvm_alvtst'
+      add_pin :ahvtst,  reset: :dont_care, name: 'nvm_ahvtst'
+      add_pin :dtst,    reset: :dont_care, name: 'nvm_dtst'
 
-      add_pin  :reset,   :reset => :drive_hi,  :name => "nvm_reset"
-      add_pin  :clk,     :reset => :drive_hi,  :name => "nvm_clk"
-      add_pin  :clk_mux, :reset => :drive_hi,  :name => "nvm_clk_mux"
-      add_port :porta,   :reset => :drive_lo,  :size => 8
-      add_port :portb,   :reset => :drive_lo,  :size => 8, :endian => :little
-      add_pin  :invoke,  :reset => :drive_lo,  :name => "nvm_invoke"
-      add_pin  :done,    :reset => :expect_hi, :name => "nvm_done"
-      add_pin  :fail,    :reset => :expect_lo, :name => "nvm_fail"
-      add_pin  :alvtst,  :reset => :dont_care, :name => "nvm_alvtst"
-      add_pin  :ahvtst,  :reset => :dont_care, :name => "nvm_ahvtst"
-      add_pin  :dtst,    :reset => :dont_care, :name => "nvm_dtst"
-
-      add_pin :tclk, :reset => :drive_lo
-      add_pin :trst, :reset => :drive_hi
+      add_pin :tclk, reset: :drive_lo
+      add_pin :trst, reset: :drive_hi
 
       add_pin_alias :extal,     :clk
       add_pin_alias :extal_mux, :clk_mux
@@ -28,39 +27,39 @@ module C99
       add_pin_alias :tdi,       :invoke
       add_pin_alias :resetb,    :ahvtst
 
-      add_pin_alias :pa5, :porta, :pin => 5
-      add_pin_alias :pa_lower, :porta, :pins => [3..0]
-      add_pin_alias :pa_upper, :porta, :pins => [7,6,5,4]
-      add_port_alias :porta_alias, :porta
+      add_pin_alias :pa5, :porta, pin: 5
+      add_pin_alias :pa_lower, :porta, pins: [3..0]
+      add_pin_alias :pa_upper, :porta, pins: [7, 6, 5, 4]
+      add_pin_alias :porta_alias, :porta
 
       @a = 2
     end
 
     def startup(options)
       if options[:add_additional_pins]
-        add_pin :late_added_pin, :reset => :drive_hi
+        add_pin :late_added_pin, reset: :drive_hi
       else
         # Test that rendering some vectors from a template works...
         if $tester.is_a?(OrigenTesters::J750)
-          $tester.render("#{Origen.root}/pattern/j750/_mode_entry.atp.erb", :hold_cycles => 5)
+          $tester.render("#{Origen.root}/pattern/j750/_mode_entry.atp.erb", hold_cycles: 5)
         end
       end
-      $tester.set_timeset("nvmbist", 40) if $tester.is_vector_based?
+      $tester.set_timeset('nvmbist', 40) if $tester.is_vector_based?
     end
 
     def has_margin0_bug?
       false
     end
 
-    def write_register(reg, options={})
+    def write_register(reg, options = {})
       reg
     end
 
-    def read_register(reg, options={})
+    def read_register(reg, options = {})
       reg
     end
 
-    def base_address(reg, options={})
+    def base_address(reg, options = {})
       if reg.owned_by?(:nvm)
         0x4000_0000
       else

data/lib/commands/test_command.rb

@@ -14,5 +14,3 @@ config.shared = {
 }
 
 EOT
-
-

data/lib/origen_core_support.rb

@@ -1,2 +1,2 @@
-require_relative "../config/application.rb"
-require_relative "../config/environment.rb"
+require_relative '../config/application.rb'
+require_relative '../config/environment.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_core_support
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen