1 files changed, 16 insertions, 50 deletions
diff --git a/host/lib/ic_reg_maps/gen_ad5624_regs.py b/host/lib/ic_reg_maps/gen_ad5624_regs.py
index 9e8ae5be5..24401b878 100755
--- a/host/lib/ic_reg_maps/gen_ad5624_regs.py
+++ b/host/lib/ic_reg_maps/gen_ad5624_regs.py
@@ -16,67 +16,33 @@
 # 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="""\
 data             0[4:15]           0
 addr             0[16:18]          0       DAC_A=0, DAC_B=1, DAC_C=2, DAC_D=3, ALL=7
 cmd              0[19:21]          0       wr_input_n, up_dac_n, wr_input_n_up_all, wr_up_dac_chan_n, power_down, reset, load_ldac
 """
 
 ########################################################################
-# Header and Source templates below
+# Template for methods in the body of the struct
 ########################################################################
-HEADER_TEXT="""
-#import time
-
-/***********************************************************************
- * This file was generated by $file on $time.strftime("%c")
- **********************************************************************/
-
-\#ifndef INCLUDED_AD5624_REGS_HPP
-\#define INCLUDED_AD5624_REGS_HPP
-
-\#include <boost/cstdint.hpp>
-
-struct ad5624_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
-
-    ad5624_regs_t(void){
-#for $reg in $regs
-        $reg.get_name() = $reg.get_default();
-#end for
-    }
-
-    boost::uint32_t get_reg(void){
-        boost::uint32_t reg = 0;
-        #for $reg in filter(lambda r: r.get_addr() == 0, $regs)
-        reg |= (boost::uint32_t($reg.get_name()) & $reg.get_mask()) << $reg.get_shift();
-        #end for
-        return reg;
-    }
-
-};
-
-\#endif /* INCLUDED_AD5624_REGS_HPP */
+BODY_TMPL="""\
+boost::uint32_t get_reg(void){
+    boost::uint32_t reg = 0;
+    #for $reg in filter(lambda r: r.get_addr() == 0, $regs)
+    reg |= (boost::uint32_t($reg.get_name()) & $reg.get_mask()) << $reg.get_shift();
+    #end for
+    return reg;
+}
 """
 
 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='ad5624_regs',
+        regs_tmpl=REGS_TMPL,
+        body_tmpl=BODY_TMPL,
+        file=__file__,
+    )