Skip to content

P
Production Test Suite - base
Commit 14302268 authored by Matthieu Cattin's avatar Matthieu Cattin
Browse files
Options

csr: Fix bug, register map index was wrong in several places.

parent fbe479dc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
common/csr.py
View file @ 14302268
...@@ -66,7 +66,7 @@ class CCSR: ...@@ -66,7 +66,7 @@ class CCSR:
# Get register's field value # Get register's field value
def get_field(self, reg, field): def get_field(self, reg, field):
if(reg in self.reg_map): # test if register exist in register map if(reg in self.reg_map[1]): # test if register exist in register map
if(field in self.reg_map[1][reg][2]): # test if field exist in register if(field in self.reg_map[1][reg][2]): # test if field exist in register
reg_addr = self.reg_map[1][reg][0] reg_addr = self.reg_map[1][reg][0]
...@@ -84,7 +84,7 @@ class CCSR: ...@@ -84,7 +84,7 @@ class CCSR:
# Set register's field value # Set register's field value
def set_field(self, reg, field, value): def set_field(self, reg, field, value):
if(reg in self.reg_map): # test if register exist in register map if(reg in self.reg_map[1]): # test if register exist in register map
if(field in self.reg_map[1][reg][2]): # test if field exist in register if(field in self.reg_map[1][reg][2]): # test if field exist in register
reg_addr = self.reg_map[1][reg][0] reg_addr = self.reg_map[1][reg][0]
...@@ -104,15 +104,15 @@ class CCSR: ...@@ -104,15 +104,15 @@ class CCSR:
# Get register value # Get register value
def get_reg(self, reg): def get_reg(self, reg):
if(reg in self.reg_map): # test if register exist in register map if(reg in self.reg_map[1]): # test if register exist in register map
return self.rd_reg(self.reg_map[1][reg][0]) return self.rd_reg(self.reg_map[1][reg][0])
else: else:
raise CSRDeviceOperationError(self.base_addr, self.reg_map, 'Requested register (%s) doesn\'t exist.'%reg) raise CSRDeviceOperationError(self.base_addr, self.reg_map, 'Requested register (%s) doesn\'t exist.'%reg)
# Set register value # Set register value
def set_reg(self, reg, value): def set_reg(self, reg, value):
if(reg in self.reg_map): # test if register exist in register map if(reg in self.reg_map[1]): # test if register exist in register map
self.wr_reg(self.reg_map[reg][0], value) self.wr_reg(self.reg_map[1][reg][0], value)
else: else:
raise CSRDeviceOperationError(self.base_addr, self.reg_map, 'Requested register (%s) doesn\'t exist.'%reg) raise CSRDeviceOperationError(self.base_addr, self.reg_map, 'Requested register (%s) doesn\'t exist.'%reg)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment