Index: Plug.tmpasm =================================================================== --- Plug.tmpasm (revision 29471) +++ Plug.tmpasm (revision 29472) @@ -1,6 +1,8 @@ put /local/pcb/mod {import_gnetlist} append /local/pcb/mod/OBJS [@ $(PLUGDIR)/import_gnetlist/import_gnetlist.o @] +put /local/pcb/mod/CONF {$(PLUGDIR)/import_gnetlist/import_gnetlist_conf.h} + switch /local/pcb/import_gnetlist/controls case {buildin} include /local/pcb/tmpasm/buildin; end; case {plugin} include /local/pcb/tmpasm/plugin; end; Index: import_gnetlist.c =================================================================== --- import_gnetlist.c (revision 29471) +++ import_gnetlist.c (revision 29472) @@ -38,6 +38,10 @@ #include "board.h" #include "plug_import.h" +#include "import_gnetlist_conf.h" + +conf_import_gnetlist_t conf_import_gnetlist; + static pcb_plug_import_t import_gnetlist; @@ -65,8 +69,7 @@ cmd = malloc((numfns+9) * sizeof(char *)); -TODO("local conf"); - cmd[0] = "conf_import_sch.plugins.import_sch.gnetlist_program"; + cmd[0] = conf_import_gnetlist.plugins.import_gnetlist.gnetlist_program; cmd[1] = "-L"; cmd[2] = PCBLIBDIR; cmd[3] = "-g"; @@ -107,6 +110,7 @@ void pplg_uninit_import_gnetlist(void) { PCB_HOOK_UNREGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); + pcb_conf_unreg_fields("plugins/import_gnetlist/"); } int pplg_init_import_gnetlist(void) @@ -122,6 +126,10 @@ PCB_HOOK_REGISTER(pcb_plug_import_t, pcb_plug_import_chain, &import_gnetlist); +#define conf_reg(field,isarray,type_name,cpath,cname,desc,flags) \ + pcb_conf_reg_field(conf_import_gnetlist, field,isarray,type_name,cpath,cname,desc,flags); +#include "import_gnetlist_conf_fields.h" + return 0; } Index: import_gnetlist_conf.h =================================================================== --- import_gnetlist_conf.h (nonexistent) +++ import_gnetlist_conf.h (revision 29472) @@ -0,0 +1,14 @@ +#ifndef PCB_IMPORT_GNETLIST_CONF_H +#define PCB_IMPORT_GNETLIST_CONF_H + +#include + +typedef struct { + const struct { + const struct { + CFT_STRING gnetlist_program; /* gnetlist program name */ + } import_gnetlist; + } plugins; +} conf_import_gnetlist_t; + +#endif