diff --git a/src/apsctl/yaml2head.py b/src/apsctl/yaml2head.py index 82da48d7fd28da1ec79497c78437a214ceef127b..0c76a29c4538abdf7ff39ff364ac452b01083e08 100644 --- a/src/apsctl/yaml2head.py +++ b/src/apsctl/yaml2head.py @@ -59,7 +59,7 @@ for dev in D['device_registers']: # hf.write("const devreg %s {%i,%i,%i,%i,%i};\n" % (name2+'_'+reg['name'],addr,regR,regW,storex,devtype) ) devregname=name2+'_'+reg['name']; devreglist.append(devregname); - hf.write("const t_devreg %s {.address=%i,.register_R=%i,.register_W=%i,.store=%i,.driver=%i};\n" % (devregname,addr,regR,regW,storex,devtype) ) + hf.write("inline const t_devreg %s {.address=%i,.register_R=%i,.register_W=%i,.store=%i,.driver=%i};\n" % (devregname,addr,regR,regW,storex,devtype) ) hf.write("#define NumberStoreReg %i"%store) # int dim; @@ -94,7 +94,7 @@ for dev in D['variables']: devreg=s[:-1]+'}'; devreg=devreg.replace('.','_') print(devreg) - hf.write('const t_variable %s {.name="%s",.dim=%i,.dtype=%s,.driver=%i,.rw=%s,.bitoffset=%s,.width=%i,.scale=%s,.devreg=%s};\n' % ( + hf.write('inline const t_variable %s {.name="%s",.dim=%i,.dtype=%s,.driver=%i,.rw=%s,.bitoffset=%s,.width=%i,.scale=%s,.devreg=%s};\n' % ( name, name, dim, @@ -111,7 +111,7 @@ hf.write("#define number_vars %i\n" % len(varlist)) s=''; for v in varlist: s+=v+',' -hf.write("const t_variable variables[number_vars]={%s};\n" % s ) +hf.write("inline const t_variable variables[number_vars]={%s};\n" % s ) hf.write("\n/*** Driver Definitions ***/\n") hf.write("#define number_drivers %i\n" % len(D['drivers'])) @@ -155,7 +155,7 @@ for dev in D['drivers']: devreg=devreg.replace('.','_') else: devreg={} print(devreg) - hf.write('const t_driver %s {.name="%s",.type=%s,.parent=%i,.parameters=%s,.devreg=%s};\n' % ( + hf.write('inline const t_driver %s {.name="%s",.type=%s,.parent=%i,.parameters=%s,.devreg=%s};\n' % ( name, name, "drv_"+dev.get("type","i2c"), @@ -185,7 +185,7 @@ for dev in D['methods']: name=dev['name']; methodlist.append(name) - hf.write('const t_instruction %s[%i]={\n' % ( + hf.write('inline const t_instruction %s[%i]={\n' % ( name+'_inst', len(dev['instructions']) )) @@ -220,7 +220,7 @@ for dev in D['methods']: else: print('can not find ',key) hf.write(' };\n') - hf.write('const t_method %s {.name="%s",.len=%i,.instructions=%s};\n' % ( + hf.write('inline const t_method %s {.name="%s",.len=%i,.instructions=%s};\n' % ( name, name, len(dev['instructions']), @@ -230,7 +230,7 @@ for dev in D['methods']: s=''; for v in methodlist: s+=v+',' -hf.write("const t_method method_config[number_methods]={%s};\n\n" % s ) +hf.write("inline const t_method method_config[number_methods]={%s};\n\n" % s ) hf.write("\n#endif\n")