summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-06-22 18:49:19 -0700
committerJosh Blum <josh@joshknows.com>2010-06-22 18:49:19 -0700
commite74356ec5956d10d399969851fefd4a1f308ad7c (patch)
treef72df9139bf871cc723f675400f30d63f4143895
parent1c1d967ec73906d50ee6e7257a4153db4ab9c507 (diff)
downloaduhd-e74356ec5956d10d399969851fefd4a1f308ad7c.tar.gz
uhd-e74356ec5956d10d399969851fefd4a1f308ad7c.tar.bz2
uhd-e74356ec5956d10d399969851fefd4a1f308ad7c.zip
uhd: tweaks to ic regs maps common generator code
-rw-r--r--host/lib/ic_reg_maps/common.py4
-rwxr-xr-xhost/lib/ic_reg_maps/gen_ad9522_regs.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/ic_reg_maps/common.py b/host/lib/ic_reg_maps/common.py
index 173186eb1..47325a7e3 100644
--- a/host/lib/ic_reg_maps/common.py
+++ b/host/lib/ic_reg_maps/common.py
@@ -59,7 +59,7 @@ public:
delete _state;
}
-$body
+ $body
void save_state(void){
if (_state == NULL) _state = new $(name)_t();
@@ -181,7 +181,7 @@ def generate(name, regs_tmpl, body_tmpl='', file=__file__):
else: regs.append(reg(entry))
#evaluate the body template with the list of registers
- body = parse_tmpl(body_tmpl, regs=regs).replace('\n', '\n ').strip()
+ body = '\n '.join(parse_tmpl(body_tmpl, regs=regs).splitlines())
#evaluate the code template with the parsed registers and arguments
code = parse_tmpl(COMMON_TMPL,
diff --git a/host/lib/ic_reg_maps/gen_ad9522_regs.py b/host/lib/ic_reg_maps/gen_ad9522_regs.py
index 9da51205b..ed6b5f48d 100755
--- a/host/lib/ic_reg_maps/gen_ad9522_regs.py
+++ b/host/lib/ic_reg_maps/gen_ad9522_regs.py
@@ -32,9 +32,11 @@ cp_mode 0x010[3:2] 3 high_imp, force
pll_power_down 0x010[1:0] 1 normal=0, async=1, sync=3
r_counter_lsb 0x011[7:0] 1
r_counter_msb 0x012[5:0] 0
+~r_counter r_counter_lsb, r_counter_msb
a_counter 0x013[5:0] 0
b_counter_lsb 0x014[7:0] 3
b_counter_msb 0x015[4:0] 0
+~b_counter b_counter_lsb, b_counter_msb
set_cp_pin_to_vcp_2 0x016[7] 0 normal, vcp_2
reset_r_counter 0x016[6] 0
reset_a_and_b_counters 0x016[5] 0