diff --git a/src/xspice/icm/analog/sine/cfunc.mod b/src/xspice/icm/analog/sine/cfunc.mod index 1419dd069..eb6a87685 100644 --- a/src/xspice/icm/analog/sine/cfunc.mod +++ b/src/xspice/icm/analog/sine/cfunc.mod @@ -51,13 +51,21 @@ NON-STANDARD FEATURES /*=== INCLUDE FILES ====================*/ -#include "sin.h" #include #include /*=== CONSTANTS ========================*/ +#define PI 3.14159265358979323846 + +#define INT1 1 + +char *allocation_error = "\n**** Error ****\nSINE: Error allocating sine block storage \n"; +char *limit_error = "\n**** Error ****\nSINE: Smoothing domain value too large \n"; +char *sine_freq_clamp = "\n**** Warning ****\nSINE: Extrapolated frequency limited to 1e-16 Hz \n"; +char *array_error = "\n**** Error ****\nSINE: Size of control array different than frequency array \n"; + /*=== MACROS ===========================*/ diff --git a/src/xspice/icm/analog/sine/sin.h b/src/xspice/icm/analog/sine/sin.h deleted file mode 100644 index 8c013d45f..000000000 --- a/src/xspice/icm/analog/sine/sin.h +++ /dev/null @@ -1,75 +0,0 @@ -/*.......1.........2.........3.........4.........5.........6.........7.........8 -================================================================================ - -FILE sine/sin.h - -Copyright 1991 -Georgia Tech Research Corporation, Atlanta, Ga. 30332 -All Rights Reserved - -PROJECT A-8503-405 - - -AUTHORS - - 20 Mar 1991 Harry Li - - -MODIFICATIONS - - 2 Oct 1991 Jeffrey P. Murray - - -SUMMARY - - This file contains additional header information for the - sine code model. - - -INTERFACES - - FILE ROUTINE CALLED - - N/A N/A - - -REFERENCED FILES - - NONE - - -NON-STANDARD FEATURES - - NONE - -===============================================================================*/ - -/*=== INCLUDE FILES ====================*/ - - - - -/*=== CONSTANTS ========================*/ - -#define PI 3.141592654; - -#define INT1 1 - -char *allocation_error = "\n**** Error ****\nSINE: Error allocating sine block storage \n"; -char *limit_error = "\n**** Error ****\nSINE: Smoothing domain value too large \n"; -char *sine_freq_clamp = "\n**** Warning ****\nSINE: Extrapolated frequency limited to 1e-16 Hz \n"; -char *array_error = "\n**** Error ****\nSINE: Size of control array different than frequency array \n"; - - - -/*=== MACROS ===========================*/ - - - - -/*=== LOCAL VARIABLES & TYPEDEFS =======*/ - - - - -/*=== FUNCTION PROTOTYPE DEFINITIONS ===*/ diff --git a/src/xspice/icm/analog/square/cfunc.mod b/src/xspice/icm/analog/square/cfunc.mod index c717f9896..e7f8f70c2 100644 --- a/src/xspice/icm/analog/square/cfunc.mod +++ b/src/xspice/icm/analog/square/cfunc.mod @@ -52,11 +52,21 @@ NON-STANDARD FEATURES /*=== INCLUDE FILES ====================*/ #include -#include "square.h" /*=== CONSTANTS ========================*/ +char *square_allocation_error = "\n**** Error ****\nSQUARE: Error allocating square block storage \n"; +char *square_limit_error = "\n**** Error ****\nSQUARE: Smoothing domain value too large \n"; +char *square_freq_clamp = "\n**** WARNING ****\nSQUARE: Frequency extrapolation limited to 1e-16 \n"; +char *square_array_error = "\n**** Error ****\nSQUARE: Size of control array different than frequency array \n"; + +#define INT1 1 +#define T1 2 +#define T2 3 +#define T3 4 +#define T4 5 + /*=== MACROS ===========================*/ diff --git a/src/xspice/icm/analog/square/square.h b/src/xspice/icm/analog/square/square.h deleted file mode 100644 index b3a964873..000000000 --- a/src/xspice/icm/analog/square/square.h +++ /dev/null @@ -1,83 +0,0 @@ -/*.......1.........2.........3.........4.........5.........6.........7.........8 -================================================================================ - -FILE square/square.h - -Copyright 1991 -Georgia Tech Research Corporation, Atlanta, Ga. 30332 -All Rights Reserved - -PROJECT A-8503-405 - - -AUTHORS - - 12 Apr 1991 Harry Li - - -MODIFICATIONS - - 2 Oct 1991 Jeffrey P. Murray - - -SUMMARY - - This file contains additional header information for the - square (controlled squarewave oscillator) code model. - - -INTERFACES - - FILE ROUTINE CALLED - - N/A N/A - - -REFERENCED FILES - - NONE - - -NON-STANDARD FEATURES - - NONE - -===============================================================================*/ - -/*=== INCLUDE FILES ====================*/ - - - - -/*=== CONSTANTS ========================*/ - -char *square_allocation_error = "\n**** Error ****\nSQUARE: Error allocating square block storage \n"; -char *square_limit_error = "\n**** Error ****\nSQUARE: Smoothing domain value too large \n"; -char *square_freq_clamp = "\n**** WARNING ****\nSQUARE: Frequency extrapolation limited to 1e-16 \n"; -char *square_array_error = "\n**** Error ****\nSQUARE: Size of control array different than frequency array \n"; - - -#define INT1 1 -#define T1 2 -#define T2 3 -#define T3 4 -#define T4 5 - - - -/*=== MACROS ===========================*/ - - - - -/*=== LOCAL VARIABLES & TYPEDEFS =======*/ - - - - -/*=== FUNCTION PROTOTYPE DEFINITIONS ===*/ - - - - - diff --git a/src/xspice/icm/analog/triangle/cfunc.mod b/src/xspice/icm/analog/triangle/cfunc.mod index e12a0c317..9bef9725c 100644 --- a/src/xspice/icm/analog/triangle/cfunc.mod +++ b/src/xspice/icm/analog/triangle/cfunc.mod @@ -53,11 +53,19 @@ NON-STANDARD FEATURES /*=== INCLUDE FILES ====================*/ #include -#include "triangle.h" /*=== CONSTANTS ========================*/ +char *triangle_allocation_error = "\n**** Error ****\nTRIANGLE: Error allocating triangle block storage \n"; +char *triangle_freq_clamp = "\n**** Warning ****\nTRIANGLE: Extrapolated Minimum Frequency Set to 1e-16 Hz \n"; +char *triangle_array_error = "\n**** Error ****\nTRIANGLE: Size of control array different than frequency array \n"; + +#define INT1 1 +#define T1 2 +#define T2 3 +#define T3 4 + /*=== MACROS ===========================*/ diff --git a/src/xspice/icm/analog/triangle/triangle.h b/src/xspice/icm/analog/triangle/triangle.h deleted file mode 100644 index 3bbc6b717..000000000 --- a/src/xspice/icm/analog/triangle/triangle.h +++ /dev/null @@ -1,80 +0,0 @@ -/*.......1.........2.........3.........4.........5.........6.........7.........8 -================================================================================ - -FILE triangle/triangle.h - -Copyright 1991 -Georgia Tech Research Corporation, Atlanta, Ga. 30332 -All Rights Reserved - -PROJECT A-8503-405 - - -AUTHORS - - 12 Apr 1991 Harry Li - - -MODIFICATIONS - - 2 Oct 1991 Jeffrey P. Murray - - -SUMMARY - - This file contains additional header information for the - triangle (controlled trianglewave oscillator) code model. - - -INTERFACES - - FILE ROUTINE CALLED - - N/A N/A - - -REFERENCED FILES - - NONE - - -NON-STANDARD FEATURES - - NONE - -===============================================================================*/ - -/*=== INCLUDE FILES ====================*/ - - - - -/*=== CONSTANTS ========================*/ - -char *triangle_allocation_error = "\n**** Error ****\nTRIANGLE: Error allocating triangle block storage \n"; -char *triangle_freq_clamp = "\n**** Warning ****\nTRIANGLE: Extrapolated Minimum Frequency Set to 1e-16 Hz \n"; -char *triangle_array_error = "\n**** Error ****\nTRIANGLE: Size of control array different than frequency array \n"; - - -#define INT1 1 -#define T1 2 -#define T2 3 -#define T3 4 - - - -/*=== MACROS ===========================*/ - - - - -/*=== LOCAL VARIABLES & TYPEDEFS =======*/ - - - - -/*=== FUNCTION PROTOTYPE DEFINITIONS ===*/ - - - - diff --git a/src/xspice/icm/xtradev/core/cfunc.mod b/src/xspice/icm/xtradev/core/cfunc.mod index bd2d0e09a..bf06d6e80 100644 --- a/src/xspice/icm/xtradev/core/cfunc.mod +++ b/src/xspice/icm/xtradev/core/cfunc.mod @@ -50,11 +50,16 @@ NON-STANDARD FEATURES /*=== INCLUDE FILES ====================*/ #include -#include "core.h" /*=== CONSTANTS ========================*/ +#define HYST 1 +#define X_RISING TRUE +#define X_FALLING FALSE +#define PWL 1 +#define HYSTERESIS 2 + /*=== MACROS ===========================*/ diff --git a/src/xspice/icm/xtradev/core/core.h b/src/xspice/icm/xtradev/core/core.h deleted file mode 100644 index 93c63f330..000000000 --- a/src/xspice/icm/xtradev/core/core.h +++ /dev/null @@ -1,38 +0,0 @@ - - -/******************************************************/ -/****** Structures, etc. for core model. ******/ -/****** 10/24/91 JPM ******/ -/******************************************************/ - -/***** Value Definitions ******************************************/ - -#define HYST 1 -#define X_RISING TRUE -#define X_FALLING FALSE -#define PWL 1 -#define HYSTERESIS 2 - - - - - -/***** Define Error Messages **************************************/ - - - - - - -/***** Structure Definitions *************************************/ - - - - - - -/***** Function Definitions ***************************************/ - - - -