epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cast the return values of the void* returning functions

pre-master-46
rlar 16 years ago
parent
59d4e5d961
commit
d6d7fbde26
19 changed files with 145 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      ChangeLog
  2. 4
      src/xspice/icm/analog/d_dt/cfunc.mod
  3. 8
      src/xspice/icm/analog/hyst/cfunc.mod
  4. 4
      src/xspice/icm/analog/int/cfunc.mod
  5. 52
      src/xspice/icm/analog/oneshot/cfunc.mod
  6. 38
      src/xspice/icm/analog/s_xfer/cfunc.mod
  7. 6
      src/xspice/icm/analog/sine/cfunc.mod
  8. 16
      src/xspice/icm/analog/slew/cfunc.mod
  9. 28
      src/xspice/icm/analog/square/cfunc.mod
  10. 22
      src/xspice/icm/analog/triangle/cfunc.mod
  11. 6
      src/xspice/icm/digital/adc_bridge/cfunc.mod
  12. 14
      src/xspice/icm/digital/d_osc/cfunc.mod
  13. 10
      src/xspice/icm/digital/dac_bridge/cfunc.mod
  14. 4
      src/xspice/icm/xtradev/capacitor/cfunc.mod
  15. 8
      src/xspice/icm/xtradev/core/cfunc.mod
  16. 4
      src/xspice/icm/xtradev/inductor/cfunc.mod
  17. 8
      src/xspice/icm/xtradev/lcouple/cfunc.mod
  18. 6
      src/xspice/icm/xtraevt/real_delay/cfunc.mod
  19. 8
      src/xspice/icm/xtraevt/real_to_v/cfunc.mod

22
ChangeLog
View File

@ -1,3 +1,25 @@
2010-07-05 Robert Larice <Robert.Larice@t-online.de>
* src/xspice/icm/analog/d_dt/cfunc.mod ,
* src/xspice/icm/analog/hyst/cfunc.mod ,
* src/xspice/icm/analog/int/cfunc.mod ,
* src/xspice/icm/analog/oneshot/cfunc.mod ,
* src/xspice/icm/analog/s_xfer/cfunc.mod ,
* src/xspice/icm/analog/sine/cfunc.mod ,
* src/xspice/icm/analog/slew/cfunc.mod ,
* src/xspice/icm/analog/square/cfunc.mod ,
* src/xspice/icm/analog/triangle/cfunc.mod ,
* src/xspice/icm/digital/adc_bridge/cfunc.mod ,
* src/xspice/icm/digital/d_osc/cfunc.mod ,
* src/xspice/icm/digital/dac_bridge/cfunc.mod ,
* src/xspice/icm/xtradev/capacitor/cfunc.mod ,
* src/xspice/icm/xtradev/core/cfunc.mod ,
* src/xspice/icm/xtradev/inductor/cfunc.mod ,
* src/xspice/icm/xtradev/lcouple/cfunc.mod ,
* src/xspice/icm/xtraevt/real_delay/cfunc.mod ,
* src/xspice/icm/xtraevt/real_to_v/cfunc.mod :
cast the return values of the void* returning functions
cm_event_get_ptr() and cm_analog_get_ptr()
2010-07-04 Robert Larice
* src/frontend/evaluate.c : use void* instead of char* for anonymous data
* src/frontend/outitf.c : use a rescasted parameter

4
src/xspice/icm/analog/d_dt/cfunc.mod
View File

@ -176,9 +176,9 @@ void cm_d_dt(ARGS)
}
/* retrieve previous values */
in = cm_analog_get_ptr(TRUE,0); /* Set out pointer to current
in = (double *) cm_analog_get_ptr(TRUE,0); /* Set out pointer to current
time storage */
in_old = cm_analog_get_ptr(TRUE,1); /* Set old-output-state pointer
in_old = (double *) cm_analog_get_ptr(TRUE,1); /* Set old-output-state pointer
to previous time storage */

8
src/xspice/icm/analog/hyst/cfunc.mod
View File

@ -246,8 +246,8 @@ void cm_hyst(ARGS) /* structure holding parms,
cm_analog_alloc(TRUE,sizeof(Boolean_t));
hyst_state = cm_analog_get_ptr(TRUE,0);
old_hyst_state = cm_analog_get_ptr(TRUE,1);
hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,0);
old_hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,1);
if (in < x_rise_zero + input_domain) { /* Set state to X_RISING */
*old_hyst_state = X_RISING;
@ -258,9 +258,9 @@ void cm_hyst(ARGS) /* structure holding parms,
}
else { /* Allocation not necessary...retrieve previous values */
hyst_state = cm_analog_get_ptr(TRUE,0); /* Set out pointer to current
hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,0); /* Set out pointer to current
time storage */
old_hyst_state = cm_analog_get_ptr(TRUE,1); /* Set old-output-state pointer
old_hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,1); /* Set old-output-state pointer
to previous time storage */
}

4
src/xspice/icm/analog/int/cfunc.mod
View File

@ -168,8 +168,8 @@ void cm_int(ARGS) /* structure holding parms,
}
/* retrieve previous value */
in = cm_analog_get_ptr(INT1,0); /* Set out pointer to input storage location */
out = cm_analog_get_ptr(INT2,0); /* Set out pointer to output storage location */
in = (double *) cm_analog_get_ptr(INT1,0); /* Set out pointer to input storage location */
out = (double *) cm_analog_get_ptr(INT2,0); /* Set out pointer to output storage location */
/*** Read input value for current time, and calculate pseudo-input ***/

52
src/xspice/icm/analog/oneshot/cfunc.mod
View File

@ -242,14 +242,14 @@ void cm_oneshot(ARGS) /* structure holding parms,
/* for DC, initialize values and set the output = output_low */
t1 = cm_analog_get_ptr(T1,0);
t2 = cm_analog_get_ptr(T2,0);
t3 = cm_analog_get_ptr(T3,0);
t4 = cm_analog_get_ptr(T4,0);
set = cm_analog_get_ptr(SET,0);
state = cm_analog_get_ptr(STATE,0);
locked = cm_analog_get_ptr(LOCKED,0);
output_old = cm_analog_get_ptr(OUTPUT_OLD,0);
t1 = (double *) cm_analog_get_ptr(T1,0);
t2 = (double *) cm_analog_get_ptr(T2,0);
t3 = (double *) cm_analog_get_ptr(T3,0);
t4 = (double *) cm_analog_get_ptr(T4,0);
set = (int *) cm_analog_get_ptr(SET,0);
state = (int *) cm_analog_get_ptr(STATE,0);
locked = (int *) cm_analog_get_ptr(LOCKED,0);
output_old = (double *) cm_analog_get_ptr(OUTPUT_OLD,0);
/* initialize time and state values */
*t1 = -1;
@ -279,16 +279,16 @@ void cm_oneshot(ARGS) /* structure holding parms,
other variables because the previous values can't change-
can't rewrite the old values */
t1 = cm_analog_get_ptr(T1,1);
t2 = cm_analog_get_ptr(T2,1);
t3 = cm_analog_get_ptr(T3,1);
t4 = cm_analog_get_ptr(T4,1);
set = cm_analog_get_ptr(SET,1);
state = cm_analog_get_ptr(STATE,1);
locked = cm_analog_get_ptr(LOCKED,1);
clock = cm_analog_get_ptr(CLOCK,0);
old_clock = cm_analog_get_ptr(CLOCK,1);
output_old = cm_analog_get_ptr(OUTPUT_OLD,1);
t1 = (double *) cm_analog_get_ptr(T1,1);
t2 = (double *) cm_analog_get_ptr(T2,1);
t3 = (double *) cm_analog_get_ptr(T3,1);
t4 = (double *) cm_analog_get_ptr(T4,1);
set = (int*) cm_analog_get_ptr(SET,1);
state = (int *) cm_analog_get_ptr(STATE,1);
locked = (int *) cm_analog_get_ptr(LOCKED,1);
clock = (double *) cm_analog_get_ptr(CLOCK,0);
old_clock = (double *) cm_analog_get_ptr(CLOCK,1);
output_old = (double *) cm_analog_get_ptr(OUTPUT_OLD,1);
time1 = *t1;
time2 = *t2;
@ -532,14 +532,14 @@ if(trig_pos_edge){ /* for a positive edge trigger */
/* set the variables which need to be stored for the next iteration */
}
t1 = cm_analog_get_ptr(T1,0);
t2 = cm_analog_get_ptr(T2,0);
t3 = cm_analog_get_ptr(T3,0);
t4 = cm_analog_get_ptr(T4,0);
set = cm_analog_get_ptr(SET,0);
locked = cm_analog_get_ptr(LOCKED,0);
state = cm_analog_get_ptr(STATE,0);
output_old = cm_analog_get_ptr(OUTPUT_OLD,0);
t1 = (double *) cm_analog_get_ptr(T1,0);
t2 = (double *) cm_analog_get_ptr(T2,0);
t3 = (double *) cm_analog_get_ptr(T3,0);
t4 = (double *) cm_analog_get_ptr(T4,0);
set = (int *) cm_analog_get_ptr(SET,0);
locked = (int *) cm_analog_get_ptr(LOCKED,0);
state = (int *) cm_analog_get_ptr(STATE,0);
output_old = (double *) cm_analog_get_ptr(OUTPUT_OLD,0);
*t1 = time1;
*t2 = time2;

38
src/xspice/icm/analog/s_xfer/cfunc.mod
View File

@ -304,24 +304,24 @@ void cm_s_xfer(ARGS) /* structure holding parms, inputs, outputs, etc. */
// Retrieve pointers
for (i=0; i<den_size; i++) {
integrator[i] = cm_analog_get_ptr(i,0);
old_integrator[i] = cm_analog_get_ptr(i,0);
integrator[i] = (double *) cm_analog_get_ptr(i,0);
old_integrator[i] = (double *) cm_analog_get_ptr(i,0);
}
for(i=den_size;i<2*den_size;i++) {
den_coefficient[i-den_size] = cm_analog_get_ptr(i,0);
old_den_coefficient[i-den_size] = cm_analog_get_ptr(i,0);
den_coefficient[i-den_size] = (double *) cm_analog_get_ptr(i,0);
old_den_coefficient[i-den_size] = (double *) cm_analog_get_ptr(i,0);
}
for(i=2*den_size;i<2*den_size+num_size;i++) {
num_coefficient[i-2*den_size] = cm_analog_get_ptr(i,0);
old_num_coefficient[i-2*den_size] = cm_analog_get_ptr(i,0);
num_coefficient[i-2*den_size] = (double *) cm_analog_get_ptr(i,0);
old_num_coefficient[i-2*den_size] = (double *) cm_analog_get_ptr(i,0);
}
out = cm_analog_get_ptr(2*den_size+num_size, 0);
in = cm_analog_get_ptr(2*den_size+num_size+1, 0);
out = (double *) cm_analog_get_ptr(2*den_size+num_size, 0);
in = (double *) cm_analog_get_ptr(2*den_size+num_size+1, 0);
gain = cm_analog_get_ptr(2*den_size+num_size+2,0);
gain = (double *) cm_analog_get_ptr(2*den_size+num_size+2,0);
}else { /* Allocation was not necessary...retrieve previous values */
@ -331,12 +331,12 @@ void cm_s_xfer(ARGS) /* structure holding parms, inputs, outputs, etc. */
old_integrator = (double **) calloc(den_size,sizeof(double *));
for (i=0; i<den_size; i++) {
integrator[i] = cm_analog_get_ptr(i,0);
old_integrator[i] = cm_analog_get_ptr(i,1);
integrator[i] = (double *) cm_analog_get_ptr(i,0);
old_integrator[i] = (double *) cm_analog_get_ptr(i,1);
}
out = cm_analog_get_ptr(2*den_size+num_size,0);
in = cm_analog_get_ptr(2*den_size+num_size+1,0);
out = (double *) cm_analog_get_ptr(2*den_size+num_size,0);
in = (double *) cm_analog_get_ptr(2*den_size+num_size+1,0);
/* Set den_coefficient & gain pointers to ITP values */
@ -346,8 +346,8 @@ void cm_s_xfer(ARGS) /* structure holding parms, inputs, outputs, etc. */
den_coefficient = (double **) calloc(den_size,sizeof(double));
for(i=den_size;i<2*den_size;i++){
old_den_coefficient[i-den_size] = cm_analog_get_ptr(i,1);
den_coefficient[i-den_size] = cm_analog_get_ptr(i,0);
old_den_coefficient[i-den_size] = (double *) cm_analog_get_ptr(i,1);
den_coefficient[i-den_size] = (double *) cm_analog_get_ptr(i,0);
*(den_coefficient[i-den_size]) = *(old_den_coefficient[i-den_size]);
}
@ -355,8 +355,8 @@ void cm_s_xfer(ARGS) /* structure holding parms, inputs, outputs, etc. */
old_num_coefficient = (double **) calloc(num_size,sizeof(double));
for(i=2*den_size;i<2*den_size+num_size;i++){
old_num_coefficient[i-2*den_size] = cm_analog_get_ptr(i,1);
num_coefficient[i-2*den_size] = cm_analog_get_ptr(i,0);
old_num_coefficient[i-2*den_size] = (double *) cm_analog_get_ptr(i,1);
num_coefficient[i-2*den_size] = (double *) cm_analog_get_ptr(i,0);
*(num_coefficient[i-2*den_size]) = *(old_num_coefficient[i-2*den_size]);
}
@ -364,8 +364,8 @@ void cm_s_xfer(ARGS) /* structure holding parms, inputs, outputs, etc. */
if the highest order denominator coefficient isn't zero. This
is a hack until the ITP variables work */
old_gain = cm_analog_get_ptr(2*den_size+num_size+2,1);
gain = cm_analog_get_ptr(2*den_size+num_size+2,0);
old_gain = (double *) cm_analog_get_ptr(2*den_size+num_size+2,1);
gain = (double *) cm_analog_get_ptr(2*den_size+num_size+2,0);
*gain = *old_gain;

6
src/xspice/icm/analog/sine/cfunc.mod
View File

@ -167,15 +167,15 @@ void cm_sine(ARGS) /* structure holding parms,
OUTPUT(out) = (output_hi + output_low)/2;
PARTIAL(out,cntl_in) = 0;
phase = cm_analog_get_ptr(INT1,0);
phase = (double *) cm_analog_get_ptr(INT1,0);
*phase = 0;
}else
if(ANALYSIS == MIF_TRAN){
phase = cm_analog_get_ptr(INT1,0);
phase1 = cm_analog_get_ptr(INT1,1);
phase = (double *) cm_analog_get_ptr(INT1,0);
phase1 = (double *) cm_analog_get_ptr(INT1,1);
/* Allocate storage for breakpoint domain & freq. range values */
x = (double *) calloc(cntl_size, sizeof(double));

16
src/xspice/icm/analog/slew/cfunc.mod
View File

@ -158,10 +158,10 @@ void cm_slew(ARGS)
/* DC analysis, get old values */
ins= cm_analog_get_ptr(INT1,0);
outs= cm_analog_get_ptr(INT4,0);
in_old = cm_analog_get_ptr(INT1,0);
out_old = cm_analog_get_ptr(INT4,0);
ins= (double *) cm_analog_get_ptr(INT1,0);
outs= (double *) cm_analog_get_ptr(INT4,0);
in_old = (double *) cm_analog_get_ptr(INT1,0);
out_old = (double *) cm_analog_get_ptr(INT4,0);
*ins = *in_old = INPUT(in);
*outs = *out_old = *ins;
@ -183,11 +183,11 @@ void cm_slew(ARGS)
/* Allocation not necessary...retrieve previous values */
ins = cm_analog_get_ptr(INT1,0); /* Set out pointer to current
ins = (double *) cm_analog_get_ptr(INT1,0); /* Set out pointer to current
time storage */
in_old = cm_analog_get_ptr(INT1,1); /* Set old-output-state pointer */
outs = cm_analog_get_ptr(INT4,0);
out_old = cm_analog_get_ptr(INT4,1); /* Set old-output-state pointer
in_old = (double *) cm_analog_get_ptr(INT1,1); /* Set old-output-state pointer */
outs = (double *) cm_analog_get_ptr(INT4,0);
out_old = (double *) cm_analog_get_ptr(INT4,1); /* Set old-output-state pointer
previous time storage */

28
src/xspice/icm/analog/square/cfunc.mod
View File

@ -211,10 +211,10 @@ void cm_square(ARGS) /* structure holding parms,
if(ANALYSIS == MIF_DC){
/* initialize time values */
t1 = cm_analog_get_ptr(T1,0);
t2 = cm_analog_get_ptr(T2,0);
t3 = cm_analog_get_ptr(T3,0);
t4 = cm_analog_get_ptr(T4,0);
t1 = (double *) cm_analog_get_ptr(T1,0);
t2 = (double *) cm_analog_get_ptr(T2,0);
t3 = (double *) cm_analog_get_ptr(T3,0);
t4 = (double *) cm_analog_get_ptr(T4,0);
*t1 = -1;
*t2 = -1;
@ -230,12 +230,12 @@ void cm_square(ARGS) /* structure holding parms,
if(ANALYSIS == MIF_TRAN){
phase = cm_analog_get_ptr(INT1,0);
phase1 = cm_analog_get_ptr(INT1,1);
t1 = cm_analog_get_ptr(T1,1);
t2 = cm_analog_get_ptr(T2,1);
t3 = cm_analog_get_ptr(T3,1);
t4 = cm_analog_get_ptr(T4,1);
phase = (double *) cm_analog_get_ptr(INT1,0);
phase1 = (double *) cm_analog_get_ptr(INT1,1);
t1 = (double *) cm_analog_get_ptr(T1,1);
t2 = (double *) cm_analog_get_ptr(T2,1);
t3 = (double *) cm_analog_get_ptr(T3,1);
t4 = (double *) cm_analog_get_ptr(T4,1);
time1 = *t1;
time2 = *t2;
@ -391,10 +391,10 @@ void cm_square(ARGS) /* structure holding parms,
/* set the time values for storage */
t1 = cm_analog_get_ptr(T1,0);
t2 = cm_analog_get_ptr(T2,0);
t3 = cm_analog_get_ptr(T3,0);
t4 = cm_analog_get_ptr(T4,0);
t1 = (double *) cm_analog_get_ptr(T1,0);
t2 = (double *) cm_analog_get_ptr(T2,0);
t3 = (double *) cm_analog_get_ptr(T3,0);
t4 = (double *) cm_analog_get_ptr(T4,0);
*t1 = time1;
*t2 = time2;

22
src/xspice/icm/analog/triangle/cfunc.mod
View File

@ -204,9 +204,9 @@ void cm_triangle(ARGS) /* structure holding parms,
/* initialize time values */
t1 = cm_analog_get_ptr(T1,0);
t2 = cm_analog_get_ptr(T2,0);
t_end = cm_analog_get_ptr(T3,0);
t1 = (double *) cm_analog_get_ptr(T1,0);
t2 = (double *) cm_analog_get_ptr(T2,0);
t_end = (double *) cm_analog_get_ptr(T3,0);
*t1 = -1;
*t2 = -1;
@ -221,11 +221,11 @@ void cm_triangle(ARGS) /* structure holding parms,
/* Retrieve previous values and set equal to corresponding variables */
phase = cm_analog_get_ptr(INT1,0);
phase1 = cm_analog_get_ptr(INT1,1);
t1 = cm_analog_get_ptr(T1,1);
t2 = cm_analog_get_ptr(T2,1);
t_end = cm_analog_get_ptr(T3,1);
phase = (double *) cm_analog_get_ptr(INT1,0);
phase1 = (double *) cm_analog_get_ptr(INT1,1);
t1 = (double *) cm_analog_get_ptr(T1,1);
t2 = (double *) cm_analog_get_ptr(T2,1);
t_end = (double *) cm_analog_get_ptr(T3,1);
time1 = *t1;
time2 = *t2;
@ -346,9 +346,9 @@ void cm_triangle(ARGS) /* structure holding parms,
/* set the time values for storage */
t1 = cm_analog_get_ptr(T1,0);
t2 = cm_analog_get_ptr(T2,0);
t_end = cm_analog_get_ptr(T3,0);
t1 = (double *) cm_analog_get_ptr(T1,0);
t2 = (double *) cm_analog_get_ptr(T2,0);
t_end = (double *) cm_analog_get_ptr(T3,0);
*t1 = time1;
*t2 = time2;

6
src/xspice/icm/digital/adc_bridge/cfunc.mod
View File

@ -181,7 +181,7 @@ void cm_adc_bridge(ARGS)
cm_event_alloc(1,size * sizeof(Digital_State_t));
/* Get analog addresses */
in = in_old = cm_analog_get_ptr(0,0);
in = in_old = (double *) cm_analog_get_ptr(0,0);
/* Get discrete addresses */
out = out_old = (Digital_State_t *) cm_event_get_ptr(1,0);
@ -194,8 +194,8 @@ void cm_adc_bridge(ARGS)
/** Retrieve previous values... **/
/* assign discrete addresses */
in = cm_analog_get_ptr(0,0);
in_old = cm_analog_get_ptr(0,1);
in = (double *) cm_analog_get_ptr(0,0);
in_old = (double *) cm_analog_get_ptr(0,1);
/* assign analog addresses */
out = (Digital_State_t *) cm_event_get_ptr(1,0);

14
src/xspice/icm/digital/d_osc/cfunc.mod
View File

@ -214,11 +214,11 @@ void cm_d_osc(ARGS)
cm_analog_alloc(2, sizeof(double));
/* assign internal variables */
phase = phase_old = cm_analog_get_ptr(0,0);
phase = phase_old = (double *) cm_analog_get_ptr(0,0);
t1 = cm_analog_get_ptr(1,0);
t1 = (double *) cm_analog_get_ptr(1,0);
t3 = cm_analog_get_ptr(2,0);
t3 = (double *) cm_analog_get_ptr(2,0);
}
@ -230,12 +230,12 @@ void cm_d_osc(ARGS)
/* assign internal variables */
phase = cm_analog_get_ptr(0,0);
phase_old = cm_analog_get_ptr(0,1);
phase = (double *) cm_analog_get_ptr(0,0);
phase_old = (double *) cm_analog_get_ptr(0,1);
t1 = cm_analog_get_ptr(1,0);
t1 = (double *) cm_analog_get_ptr(1,0);
t3 = cm_analog_get_ptr(2,0);
t3 = (double *) cm_analog_get_ptr(2,0);
}

10
src/xspice/icm/digital/dac_bridge/cfunc.mod
View File

@ -222,8 +222,8 @@ void cm_dac_bridge(ARGS)
in = in_old = (Digital_State_t *) cm_event_get_ptr(0,0);
/* assign analog addresses */
out = out_old = cm_analog_get_ptr(0,0);
breakpoint = cm_analog_get_ptr(1,0);
out = out_old = (double *) cm_analog_get_ptr(0,0);
breakpoint = (double *) cm_analog_get_ptr(1,0);
/* read current input values */
@ -274,9 +274,9 @@ void cm_dac_bridge(ARGS)
/* assign analog addresses */
out = cm_analog_get_ptr(0,0);
out_old = cm_analog_get_ptr(0,1);
breakpoint = cm_analog_get_ptr(1,0);
out = (double *) cm_analog_get_ptr(0,0);
out_old = (double *) cm_analog_get_ptr(0,1);
breakpoint = (double *) cm_analog_get_ptr(1,0);
/* read current input values */

4
src/xspice/icm/xtradev/capacitor/cfunc.mod
View File

@ -58,11 +58,11 @@ void cm_capacitor (ARGS)
/* Initialize/access instance specific storage for capacitor voltage */
if(INIT) {
cm_analog_alloc(VC, sizeof(double));
vc = cm_analog_get_ptr(VC, 0);
vc = (double *) cm_analog_get_ptr(VC, 0);
*vc = PARAM(ic) * cm_analog_ramp_factor();
}
else {
vc = cm_analog_get_ptr(VC, 0);
vc = (double *) cm_analog_get_ptr(VC, 0);
}
/* Compute the output */

8
src/xspice/icm/xtradev/core/cfunc.mod
View File

@ -456,8 +456,8 @@ void cm_core(ARGS) /* structure holding parms,
cm_analog_alloc(TRUE,sizeof(Boolean_t));
hyst_state = cm_analog_get_ptr(TRUE,0);
old_hyst_state = cm_analog_get_ptr(TRUE,1);
hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,0);
old_hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,1);
if (in < x_rise_zero + input_domain) { /* Set state to X_RISING */
*old_hyst_state = X_RISING;
@ -468,9 +468,9 @@ void cm_core(ARGS) /* structure holding parms,
}
else { /* Allocation not necessary...retrieve previous values */
hyst_state = cm_analog_get_ptr(TRUE,0); /* Set out pointer to current
hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,0); /* Set out pointer to current
time storage */
old_hyst_state = cm_analog_get_ptr(TRUE,1); /* Set old-output-state pointer
old_hyst_state = (Boolean_t *) cm_analog_get_ptr(TRUE,1); /* Set old-output-state pointer
to previous time storage */
}

4
src/xspice/icm/xtradev/inductor/cfunc.mod
View File

@ -57,11 +57,11 @@ void cm_inductor (ARGS)
/* Initialize/access instance specific storage for capacitor voltage */
if(INIT) {
cm_analog_alloc(LI, sizeof(double));
li = cm_analog_get_ptr(LI, 0);
li = (double *) cm_analog_get_ptr(LI, 0);
*li = PARAM(ic) * ramp_factor;
}
else {
li = cm_analog_get_ptr(LI, 0);
li = (double *) cm_analog_get_ptr(LI, 0);
}
/* Compute the output */

8
src/xspice/icm/xtradev/lcouple/cfunc.mod
View File

@ -175,15 +175,15 @@ void cm_lcouple(ARGS) /* structure holding parms,
}
/* Allocation not necessary...retrieve previous values */
in_flux = cm_analog_get_ptr(1,0); /* Set out pointer to current
in_flux = (double *) cm_analog_get_ptr(1,0); /* Set out pointer to current
time storage */
in_flux_old = cm_analog_get_ptr(1,1); /* Set old-output-state pointer
in_flux_old = (double *) cm_analog_get_ptr(1,1); /* Set old-output-state pointer
to previous time storage */
/* retrieve fake input and output values for truncation
error checking */
in_flux_fake = cm_analog_get_ptr(2,0);
output_voltage_fake = cm_analog_get_ptr(3,0);
in_flux_fake = (double *) cm_analog_get_ptr(2,0);
output_voltage_fake = (double *) cm_analog_get_ptr(3,0);

6
src/xspice/icm/xtraevt/real_delay/cfunc.mod
View File

@ -16,13 +16,13 @@ void ucm_real_delay (ARGS)
if(INIT) {
cm_event_alloc(CLK_STATE, sizeof(Digital_State_t));
state = (void *) cm_event_get_ptr(CLK_STATE, 0);
state = (Digital_State_t *) cm_event_get_ptr(CLK_STATE, 0);
old_state = state;
*state = INPUT_STATE(clk);
}
else {
state = (void *) cm_event_get_ptr(CLK_STATE, 0);
old_state = (void *) cm_event_get_ptr(CLK_STATE, 1);
state = (Digital_State_t *) cm_event_get_ptr(CLK_STATE, 0);
old_state = (Digital_State_t *) cm_event_get_ptr(CLK_STATE, 1);
}
if(ANALYSIS != TRANSIENT)

8
src/xspice/icm/xtraevt/real_to_v/cfunc.mod
View File

@ -19,16 +19,16 @@ void ucm_real_to_v (ARGS)
if(INIT) {
cm_event_alloc(TS, 2 * sizeof(double));
cm_event_alloc(VS, 2 * sizeof(double));
t = (void *) cm_event_get_ptr(TS, 0);
v = (void *) cm_event_get_ptr(VS, 0);
t = (double *) cm_event_get_ptr(TS, 0);
v = (double *) cm_event_get_ptr(VS, 0);
t[0] = -2.0;
t[1] = -1.0;
v[0] = *in;
v[1] = *in;
}
else {
t = (void *) cm_event_get_ptr(TS, 0);
v = (void *) cm_event_get_ptr(VS, 0);
t = (double *) cm_event_get_ptr(TS, 0);
v = (double *) cm_event_get_ptr(VS, 0);
}
switch(CALL_TYPE) {

Write Preview
Loading…
Cancel
Save