Merge branch 'usrp_e' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp_e

1 files changed, 11 insertions, 62 deletions

diff --git a/host/lib/ic_reg_maps/gen_ad9510_regs.py b/host/lib/ic_reg_maps/gen_ad9510_regs.py
index 90230b8f9..2dc19c691 100755
--- a/host/lib/ic_reg_maps/gen_ad9510_regs.py
+++ b/host/lib/ic_reg_maps/gen_ad9510_regs.py
@@ -1,32 +1,23 @@
 #!/usr/bin/env python
 #
-# Copyright 2008,2009 Free Software Foundation, Inc.
-# 
-# This file is part of GNU Radio
-# 
-# GNU Radio is free software; you can redistribute it and/or modify
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either asversion 3, or (at your option)
-# any later version.
-# 
-# GNU Radio is distributed in the hope that it will be useful,
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street,
-# Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
-import re
-import os
 import sys
-from Cheetah.Template import Template
-def parse_tmpl(_tmpl_text, **kwargs):
-    return str(Template(_tmpl_text, kwargs))
-def safe_makedirs(path):
-    not os.path.isdir(path) and os.makedirs(path)
+from common import *
 
 ########################################################################
 # Template for raw text data describing registers
@@ -177,48 +168,6 @@ struct ad9510_regs_t{
 \#endif /* INCLUDED_AD9510_REGS_HPP */
 """
 
-class reg:
-    def __init__(self, reg_des):
-        x = re.match('^(\w*)\s*(\w*)\[(.*)\]\s*(\w*)\s*(.*)$', reg_des)
-        name, addr, bit_range, default, enums = x.groups()
-
-        #store variables
-        self._name = name
-        self._addr = int(addr, 16)
-        if ':' in bit_range: self._addr_spec = map(int, bit_range.split(':'))
-        else: self._addr_spec = int(bit_range), int(bit_range)
-        self._default = int(default, 16)
-
-        #extract enum
-        self._enums = list()
-        if enums:
-            enum_val = 0
-            for enum_str in map(str.strip, enums.split(',')):
-                if '=' in enum_str:
-                    enum_name, enum_val = enum_str.split('=')
-                    enum_val = int(enum_val)
-                else: enum_name = enum_str
-                self._enums.append((enum_name, enum_val))
-                enum_val += 1
-
-    def get_addr(self): return self._addr
-    def get_enums(self): return self._enums
-    def get_name(self): return self._name
-    def get_default(self):
-        for key, val in self.get_enums():
-            if val == self._default: return str.upper('%s_%s'%(self.get_name(), key))
-        return self._default
-    def get_stdint_type(self):
-        if self.get_bit_width() <=  8: return 'uint8_t'
-        if self.get_bit_width() <= 16: return 'uint16_t'
-        if self.get_bit_width() <= 32: return 'uint32_t'
-        if self.get_bit_width() <= 64: return 'uint64_t'
-        raise Exception, 'too damn big'
-    def get_shift(self): return self._addr_spec[0]
-    def get_mask(self): return hex(int('1'*self.get_bit_width(), 2))
-    def get_bit_width(self): return self._addr_spec[1] - self._addr_spec[0] + 1
-
 if __name__ == '__main__':
     regs = map(reg, parse_tmpl(REGS_DATA_TMPL).splitlines())
-    safe_makedirs(os.path.dirname(sys.argv[1]))
     open(sys.argv[1], 'w').write(parse_tmpl(HEADER_TEXT, regs=regs, file=__file__))