1 files changed, 40 insertions, 73 deletions

diff --git a/host/lib/ic_reg_maps/gen_ad9862_regs.py b/host/lib/ic_reg_maps/gen_ad9862_regs.py
index 0d03c7bb6..c912403ef 100755
--- a/host/lib/ic_reg_maps/gen_ad9862_regs.py
+++ b/host/lib/ic_reg_maps/gen_ad9862_regs.py
@@ -16,14 +16,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-import sys
-from common import *
-
 ########################################################################
 # Template for raw text data describing registers
 # name addr[bit range inclusive] default optional enums
 ########################################################################
-REGS_DATA_TMPL="""\
+REGS_TMPL="""\
 ########################################################################
 ## General
 ########################################################################
@@ -204,82 +201,52 @@ chip_id                63[0:7]            0
 ########################################################################
 # Header and Source templates below
 ########################################################################
-HEADER_TEXT="""
-#import time
-
-/***********************************************************************
- * This file was generated by $file on $time.strftime("%c")
- **********************************************************************/
-
-\#ifndef INCLUDED_AD9862_REGS_HPP
-\#define INCLUDED_AD9862_REGS_HPP
-
-\#include <boost/cstdint.hpp>
-
-struct ad9862_regs_t{
-#for $reg in $regs
-    #if $reg.get_enums()
-    enum $(reg.get_name())_t{
-        #for $i, $enum in enumerate($reg.get_enums())
-        #set $end_comma = ',' if $i < len($reg.get_enums())-1 else ''
-        $(reg.get_name().upper())_$(enum[0].upper()) = $enum[1]$end_comma
-        #end for
-    } $reg.get_name();
-    #else
-    boost::$reg.get_stdint_type() $reg.get_name();
-    #end if
-#end for
-
-    ad9862_regs_t(void){
-#for $reg in $regs
-        $reg.get_name() = $reg.get_default();
-#end for
-    }
-
-    boost::uint8_t get_reg(boost::uint8_t addr){
-        boost::uint8_t reg = 0;
-        switch(addr){
-        #for $addr in range(0, 63+1)
-        case $addr:
-            #for $reg in filter(lambda r: r.get_addr() == addr, $regs)
-            reg |= (boost::uint16_t($reg.get_name()) & $reg.get_mask()) << $reg.get_shift();
-            #end for
-            break;
+BODY_TMPL="""
+boost::uint8_t get_reg(boost::uint8_t addr){
+    boost::uint8_t reg = 0;
+    switch(addr){
+    #for $addr in range(0, 63+1)
+    case $addr:
+        #for $reg in filter(lambda r: r.get_addr() == addr, $regs)
+        reg |= (boost::uint16_t($reg.get_name()) & $reg.get_mask()) << $reg.get_shift();
         #end for
-        }
-        return reg;
+        break;
+    #end for
     }
+    return reg;
+}
 
-    void set_reg(boost::uint16_t reg_word){
-        boost::uint8_t addr = (reg_word >> 8) & 0x1f;
-        boost::uint8_t reg  = (reg_word >> 0) & 0xff;
-        switch(addr){
-        #for $addr in range(0, 63+1)
-        case $addr:
-            #for $reg in filter(lambda r: r.get_addr() == addr, $regs)
-            #if $reg.get_enums()
-            $reg.get_name() = $(reg.get_name())_t((reg >> $reg.get_shift()) & $reg.get_mask());
-            #else
-            $reg.get_name() = (reg >> $reg.get_shift()) & $reg.get_mask();
-            #end if
-            #end for
-            break;
+void set_reg(boost::uint16_t reg_word){
+    boost::uint8_t addr = (reg_word >> 8) & 0x1f;
+    boost::uint8_t reg  = (reg_word >> 0) & 0xff;
+    switch(addr){
+    #for $addr in range(0, 63+1)
+    case $addr:
+        #for $reg in filter(lambda r: r.get_addr() == addr, $regs)
+        #if $reg.get_enums()
+        $reg.get_name() = $(reg.get_type())((reg >> $reg.get_shift()) & $reg.get_mask());
+        #else
+        $reg.get_name() = (reg >> $reg.get_shift()) & $reg.get_mask();
+        #end if
         #end for
-        }
+        break;
+    #end for
     }
+}
 
-    boost::uint16_t get_write_reg(boost::uint8_t addr){
-        return (boost::uint16_t(addr) << 8) | get_reg(addr);
-    }
-
-    boost::uint16_t get_read_reg(boost::uint8_t addr){
-        return (boost::uint16_t(addr) << 8) | (1 << 7);
-    }
-};
+boost::uint16_t get_write_reg(boost::uint8_t addr){
+    return (boost::uint16_t(addr) << 8) | get_reg(addr);
+}
 
-\#endif /* INCLUDED_AD9862_REGS_HPP */
+boost::uint16_t get_read_reg(boost::uint8_t addr){
+    return (boost::uint16_t(addr) << 8) | (1 << 7);
+}
 """
 
 if __name__ == '__main__':
-    regs = map(reg, parse_tmpl(REGS_DATA_TMPL).splitlines())
-    open(sys.argv[1], 'w').write(parse_tmpl(HEADER_TEXT, regs=regs, file=__file__))
+    import common; common.generate(
+        name='ad9862_regs',
+        regs_tmpl=REGS_TMPL,
+        body_tmpl=BODY_TMPL,
+        file=__file__,
+    )