haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup ngspice calling signatures

This commit is contained in:
Seth Hillbrand 2021-05-05 10:49:40 -07:00
parent 36975c9cd0
commit 61289ab39a
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/sim/ngspice.cpp
View File

@ -608,46 +608,45 @@ bool NGSPICE::loadCodemodels( const string& aPath )
} }
int NGSPICE::cbSendChar( char* what, int id, void* user ) int NGSPICE::cbSendChar( char* aWhat, int aId, void* aUser )
{ {
NGSPICE* sim = reinterpret_cast<NGSPICE*>( user ); NGSPICE* sim = reinterpret_cast<NGSPICE*>( aUser );
if( sim->m_reporter ) if( sim->m_reporter )
{ {
// strip stdout/stderr from the line // strip stdout/stderr from the line
if( ( strncasecmp( what, "stdout ", 7 ) == 0 ) if( ( strncasecmp( aWhat, "stdout ", 7 ) == 0 )
|| ( strncasecmp( what, "stderr ", 7 ) == 0 ) ) || ( strncasecmp( aWhat, "stderr ", 7 ) == 0 ) )
what += 7; aWhat += 7;
sim->m_reporter->Report( what ); sim->m_reporter->Report( aWhat );
} }
return 0; return 0;
} }
int NGSPICE::cbSendStat( char* what, int id, void* user ) int NGSPICE::cbSendStat( char *aWhat, int aId, void* aUser )
{ {
return 0; return 0;
} }
int NGSPICE::cbBGThreadRunning( NG_BOOL is_running, int id, void* user ) int NGSPICE::cbBGThreadRunning( NG_BOOL aFinished, int aId, void* aUser )
{ {
NGSPICE* sim = reinterpret_cast<NGSPICE*>( user ); NGSPICE* sim = reinterpret_cast<NGSPICE*>( aUser );
if( sim->m_reporter ) if( sim->m_reporter )
// I know the test below seems like an error, but well, it works somehow.. sim->m_reporter->OnSimStateChange( sim, aFinished ? SIM_IDLE : SIM_RUNNING );
sim->m_reporter->OnSimStateChange( sim, is_running ? SIM_IDLE : SIM_RUNNING );
return 0; return 0;
} }
int NGSPICE::cbControlledExit( int status, NG_BOOL immediate, NG_BOOL exit_upon_quit, int id, void* user ) int NGSPICE::cbControlledExit( int aStatus, NG_BOOL aImmediate, NG_BOOL aExitOnQuit, int aId, void* aUser )
{ {
// Something went wrong, reload the dll // Something went wrong, reload the dll
NGSPICE* sim = reinterpret_cast<NGSPICE*>( user ); NGSPICE* sim = reinterpret_cast<NGSPICE*>( aUser );
sim->m_error = true; sim->m_error = true;
return 0; return 0;

10
eeschema/sim/ngspice.h
View File

@ -133,11 +133,11 @@ private:
bool loadCodemodels( const std::string& aPath ); bool loadCodemodels( const std::string& aPath );
// Callback functions // Callback functions
static int cbSendChar( char* what, int id, void* user ); static int cbSendChar( char* what, int aId, void* aUser );
static int cbSendStat( char* what, int id, void* user ); static int cbSendStat( char* what, int aId, void* aUser );
static int cbBGThreadRunning( NG_BOOL is_running, int id, void* user ); static int cbBGThreadRunning( NG_BOOL aFinished, int aId, void* aUser );
static int cbControlledExit( int status, NG_BOOL immediate, NG_BOOL exit_upon_quit, int id, static int cbControlledExit( int aStatus, NG_BOOL aImmediate, NG_BOOL aExitOnQuit, int aId,
void* user ); void* aUser );
// Assure ngspice is in a valid state and reinitializes it if need be // Assure ngspice is in a valid state and reinitializes it if need be
void validate(); void validate();