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

Conditionally handle the SPICE signatures 

ngspice updated their function signatures, requiring us to test.  They
also don't provide an indicator that the signature is changed, so we
need to test based on the existence of a new version define.

Fixes https://gitlab.com/kicad/code/kicad/issues/8358
This commit is contained in:
Seth Hillbrand 2021-05-05 10:16:32 -07:00
parent 4a60da42d1
commit 36975c9cd0
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/sim/ngspice.cpp
View File

@ -632,7 +632,7 @@ int NGSPICE::cbSendStat( char* what, int id, void* user )
} }
int NGSPICE::cbBGThreadRunning( bool is_running, int id, void* user ) int NGSPICE::cbBGThreadRunning( NG_BOOL is_running, int id, void* user )
{ {
NGSPICE* sim = reinterpret_cast<NGSPICE*>( user ); NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );
@ -644,7 +644,7 @@ int NGSPICE::cbBGThreadRunning( bool is_running, int id, void* user )
} }
int NGSPICE::cbControlledExit( int status, bool immediate, bool exit_upon_quit, int id, void* user ) int NGSPICE::cbControlledExit( int status, NG_BOOL immediate, NG_BOOL exit_upon_quit, int id, void* user )
{ {
// Something went wrong, reload the dll // Something went wrong, reload the dll
NGSPICE* sim = reinterpret_cast<NGSPICE*>( user ); NGSPICE* sim = reinterpret_cast<NGSPICE*>( user );

14
eeschema/sim/ngspice.h
View File

@ -32,6 +32,15 @@
#include <wx/dynlib.h> #include <wx/dynlib.h>
#include <ngspice/sharedspice.h> #include <ngspice/sharedspice.h>
// We have an issue here where NGSPICE incorrectly used bool for years
// and defined it to be int when in C-mode. We cannot adjust the function
// signatures without re-writing sharedspice.h for KiCad.
// Instead, we maintain status-quo for older NGSPICE versions (<=34) and
// use the new signatures for newer versions
#ifndef NGSPICE_PACKAGE_VERSION
typedef bool NG_BOOL;
#endif
class wxDynamicLibrary; class wxDynamicLibrary;
class NGSPICE : public SPICE_SIMULATOR class NGSPICE : public SPICE_SIMULATOR
@ -113,6 +122,7 @@ private:
wxDynamicLibrary m_dll; wxDynamicLibrary m_dll;
///< Execute commands from a file ///< Execute commands from a file
bool loadSpinit( const std::string& aFileName ); bool loadSpinit( const std::string& aFileName );
@ -125,8 +135,8 @@ private:
// Callback functions // Callback functions
static int cbSendChar( char* what, int id, void* user ); static int cbSendChar( char* what, int id, void* user );
static int cbSendStat( char* what, int id, void* user ); static int cbSendStat( char* what, int id, void* user );
static int cbBGThreadRunning( bool is_running, int id, void* user ); static int cbBGThreadRunning( NG_BOOL is_running, int id, void* user );
static int cbControlledExit( int status, bool immediate, bool exit_upon_quit, int id, static int cbControlledExit( int status, NG_BOOL immediate, NG_BOOL exit_upon_quit, int id,
void* user ); void* user );
// 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