luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

next step

This commit is contained in:
rlar 2012-04-12 15:27:34 +02:00
parent ed86b1cfde
commit 4ba8ef34f0
1 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/spicelib/devices/dev.c
View File

@ -170,10 +170,32 @@ int DEVflag(int type){
#include "ngspice/cktdefs.h" /* for DEVmaxnum */ #include "ngspice/cktdefs.h" /* for DEVmaxnum */
#include <dlfcn.h> #include <dlfcn.h>
struct admsaux {
bool is_adms;
};
int n_admsaux;
struct admsaux *a_admsaux;
void
mark_adms(int type)
{
if(type >= n_admsaux) {
int i;
a_admsaux = TREALLOC(struct admsaux, a_admsaux, type+1);
for(i=n_admsaux; i<type+1; i++)
a_admsaux[i].is_adms = FALSE;
n_admsaux = type+1;
}
a_admsaux[type].is_adms = TRUE;
}
int int
is_adms_type_(int type) is_adms_type_(int type)
{ {
return !strcmp("hicum0", DEVices[type]->DEVpublic.name); bool is_adms = type <= n_admsaux && a_admsaux[type].is_adms;
printf("%s(%d) --> %d\n", __func__, type, is_adms);
return is_adms;
} }
int int
@ -181,18 +203,16 @@ is_adms_type(const char *type_name)
{ {
int i; int i;
if(strcmp(type_name, "hicum0"))
return -1;
for(i=0; i<DEVNUM; i++) { for(i=0; i<DEVNUM; i++) {
if(!DEVices[i]) if(!DEVices[i])
continue; continue;
if(!strcmp(type_name, DEVices[i]->DEVpublic.name)) { if(!strcmp(type_name, DEVices[i]->DEVpublic.name)) {
printf("found %d\n", i); printf("%s(%s) --> type = %d\n", __func__, type_name, i);
return i; return is_adms_type_(i) ? i : -1;
} }
} }
printf("%s(%s) --> type = <not found>\n", __func__, type_name);
return -1; return -1;
} }
@ -252,6 +272,23 @@ int load_vadev(char *name)
DEVices = TREALLOC(SPICEdev *, DEVices, DEVNUM + 1); DEVices = TREALLOC(SPICEdev *, DEVices, DEVNUM + 1);
printf("Added device: %s from dynamic library %s\n", device->spicedev.DEVpublic.name, libname); printf("Added device: %s from dynamic library %s\n", device->spicedev.DEVpublic.name, libname);
{
int i;
printf(" name = %s\n"
" description = %s\n"
" number of terminals = %d\n",
device->spicedev.DEVpublic.name,
device->spicedev.DEVpublic.description,
*device->spicedev.DEVpublic.terms
);
for(i=0; i<*device->spicedev.DEVpublic.numNames; i++)
printf(" terminal[%d] %s\n", i, device->spicedev.DEVpublic.termNames[i]);
}
mark_adms(DEVNUM);
DEVices[DEVNUM++] = & (device->spicedev); DEVices[DEVNUM++] = & (device->spicedev);
relink_fixme(); relink_fixme();
return 0; return 0;