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

use allready defined enumerate Digital_State_t and Ipc_Status_t

pre-master-46
rlar 16 years ago
parent
de05abc7f6
commit
3a6540b584
13 changed files with 41 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      ChangeLog
  2. 4
      src/main.c
  3. 6
      src/xspice/icm/digital/d_and/cfunc.mod
  4. 4
      src/xspice/icm/digital/d_buffer/cfunc.mod
  5. 4
      src/xspice/icm/digital/d_fdiv/cfunc.mod
  6. 4
      src/xspice/icm/digital/d_inverter/cfunc.mod
  7. 4
      src/xspice/icm/digital/d_nand/cfunc.mod
  8. 4
      src/xspice/icm/digital/d_nor/cfunc.mod
  9. 4
      src/xspice/icm/digital/d_open_c/cfunc.mod
  10. 4
      src/xspice/icm/digital/d_open_e/cfunc.mod
  11. 4
      src/xspice/icm/digital/d_or/cfunc.mod
  12. 4
      src/xspice/icm/digital/d_xnor/cfunc.mod
  13. 4
      src/xspice/icm/digital/d_xor/cfunc.mod

16
ChangeLog
View File

@ -1,3 +1,19 @@
2010-06-24 Robert Larice
* src/main.c :
make use of allready defined enumerate Ipc_Status_t (IPC_STATUS_OK)
* src/xspice/icm/digital/d_and/cfunc.mod,
* src/xspice/icm/digital/d_buffer/cfunc.mod,
* src/xspice/icm/digital/d_fdiv/cfunc.mod,
* src/xspice/icm/digital/d_inverter/cfunc.mod,
* src/xspice/icm/digital/d_nand/cfunc.mod,,
* src/xspice/icm/digital/d_nor/cfunc.mod,
* src/xspice/icm/digital/d_open_c/cfunc.mod,
* src/xspice/icm/digital/d_open_e/cfunc.mod,
* src/xspice/icm/digital/d_or/cfunc.mod,,
* src/xspice/icm/digital/d_xnor/cfunc.mod,
* src/xspice/icm/digital/d_xor/cfunc.mod :
make use of allready defined enumerate Digital_State_t (ONE,ZERO)
2010-06-23 Holger Vogt 2010-06-23 Holger Vogt
* configure.in, INSTALL, DEVICES, bsim3/b3ld.c, bsim3/b3set.c, bsim3/bsim3def.f, * configure.in, INSTALL, DEVICES, bsim3/b3ld.c, bsim3/b3set.c, bsim3/bsim3def.f,
spinit.in: Multi-core support with OpenMP for BSIM3 vers. 3.3.0 spinit.in: Multi-core support with OpenMP for BSIM3 vers. 3.3.0

4
src/main.c
View File

@ -308,11 +308,11 @@ void com_savesnap(wordlist *wl) { return; }
/* saj to get nutmeg to compile, not nice but necessary */ /* saj to get nutmeg to compile, not nice but necessary */
Ipc_Tiein_t g_ipc; Ipc_Tiein_t g_ipc;
Ipc_Status_t ipc_send_errchk(void ) { Ipc_Status_t ipc_send_errchk(void ) {
Ipc_Status_t x=0;
Ipc_Status_t x = IPC_STATUS_OK;
return(x); return(x);
} }
Ipc_Status_t ipc_get_line(char *str , int *len , Ipc_Wait_t wait ){ Ipc_Status_t ipc_get_line(char *str , int *len , Ipc_Wait_t wait ){
Ipc_Status_t x=0;
Ipc_Status_t x = IPC_STATUS_OK;
return(x); return(x);
} }
struct line *ENHtranslate_poly(struct line *deck){ struct line *ENHtranslate_poly(struct line *deck){

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

@ -169,7 +169,7 @@ void cm_d_and(ARGS)
/*** Calculate new output value based on inputs ***/ /*** Calculate new output value based on inputs ***/
*out = 1;
*out = ONE;
for (i=0; i<size; i++) { for (i=0; i<size; i++) {
/* make sure this input isn't floating... */ /* make sure this input isn't floating... */
@ -212,12 +212,12 @@ void cm_d_and(ARGS)
switch ( *out ) { switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = 0;
case 0: OUTPUT_STATE(out) = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = 1;
case 1: OUTPUT_STATE(out) = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_buffer/cfunc.mod
View File

@ -166,12 +166,12 @@ void cm_d_buffer(ARGS)
switch ( INPUT_STATE(in) ) { switch ( INPUT_STATE(in) ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = *out = 0;
case 0: OUTPUT_STATE(out) = *out = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = *out = 1;
case 1: OUTPUT_STATE(out) = *out = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_fdiv/cfunc.mod
View File

@ -191,7 +191,7 @@ void cm_d_fdiv(ARGS)
bounds, set to "zero" equivalent */ bounds, set to "zero" equivalent */
*count = PARAM(i_count); *count = PARAM(i_count);
if ( (div_factor <= *count) || (0 > *count) ) { if ( (div_factor <= *count) || (0 > *count) ) {
*count = 0;
*count = ZERO;
OUTPUT_STATE(freq_out) = *freq_out = *freq_out_old = ZERO; OUTPUT_STATE(freq_out) = *freq_out = *freq_out_old = ZERO;
} }
@ -216,7 +216,7 @@ void cm_d_fdiv(ARGS)
/* If new count value is equal to the div_factor+1 value, /* If new count value is equal to the div_factor+1 value,
need to normalize count to "1", and raise output */ need to normalize count to "1", and raise output */
if ( ((div_factor+1) == *count)||(1 == *count) ) { if ( ((div_factor+1) == *count)||(1 == *count) ) {
*count = 1;
*count = ONE;
OUTPUT_STATE(freq_out) = *freq_out = ONE; OUTPUT_STATE(freq_out) = *freq_out = ONE;
OUTPUT_DELAY(freq_out) = PARAM(rise_delay); OUTPUT_DELAY(freq_out) = PARAM(rise_delay);
} }

4
src/xspice/icm/digital/d_inverter/cfunc.mod
View File

@ -182,12 +182,12 @@ void cm_d_inverter(ARGS)
switch ( INPUT_STATE(in) ) { switch ( INPUT_STATE(in) ) {
/* fall to zero value */ /* fall to zero value */
case 1: OUTPUT_STATE(out) = *out = 0;
case 1: OUTPUT_STATE(out) = *out = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 0: OUTPUT_STATE(out) = *out = 1;
case 0: OUTPUT_STATE(out) = *out = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_nand/cfunc.mod
View File

@ -207,12 +207,12 @@ void cm_d_nand(ARGS)
switch ( *out ) { switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = 0;
case 0: OUTPUT_STATE(out) = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = 1;
case 1: OUTPUT_STATE(out) = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_nor/cfunc.mod
View File

@ -207,12 +207,12 @@ void cm_d_nor(ARGS)
switch ( *out ) { switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = 0;
case 0: OUTPUT_STATE(out) = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = 1;
case 1: OUTPUT_STATE(out) = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_open_c/cfunc.mod
View File

@ -177,13 +177,13 @@ void cm_d_open_c(ARGS)
switch ( INPUT_STATE(in) ) { switch ( INPUT_STATE(in) ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = *out = 0;
case 0: OUTPUT_STATE(out) = *out = ZERO;
OUTPUT_STRENGTH(out) = STRONG; OUTPUT_STRENGTH(out) = STRONG;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = *out = 1;
case 1: OUTPUT_STATE(out) = *out = ONE;
OUTPUT_STRENGTH(out) = HI_IMPEDANCE; OUTPUT_STRENGTH(out) = HI_IMPEDANCE;
OUTPUT_DELAY(out) = PARAM(open_delay); OUTPUT_DELAY(out) = PARAM(open_delay);
break; break;

4
src/xspice/icm/digital/d_open_e/cfunc.mod
View File

@ -177,13 +177,13 @@ void cm_d_open_e(ARGS)
switch ( INPUT_STATE(in) ) { switch ( INPUT_STATE(in) ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = *out = 0;
case 0: OUTPUT_STATE(out) = *out = ZERO;
OUTPUT_STRENGTH(out) = HI_IMPEDANCE; OUTPUT_STRENGTH(out) = HI_IMPEDANCE;
OUTPUT_DELAY(out) = PARAM(open_delay); OUTPUT_DELAY(out) = PARAM(open_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = *out = 1;
case 1: OUTPUT_STATE(out) = *out = ONE;
OUTPUT_STRENGTH(out) = STRONG; OUTPUT_STRENGTH(out) = STRONG;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_or/cfunc.mod
View File

@ -207,12 +207,12 @@ void cm_d_or(ARGS)
switch ( *out ) { switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = 0;
case 0: OUTPUT_STATE(out) = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = 1;
case 1: OUTPUT_STATE(out) = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_xnor/cfunc.mod
View File

@ -287,12 +287,12 @@ void cm_d_xnor(ARGS)
switch ( *out ) { switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = 0;
case 0: OUTPUT_STATE(out) = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = 1;
case 1: OUTPUT_STATE(out) = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

4
src/xspice/icm/digital/d_xor/cfunc.mod
View File

@ -261,12 +261,12 @@ void cm_d_xor(ARGS)
switch ( *out ) { switch ( *out ) {
/* fall to zero value */ /* fall to zero value */
case 0: OUTPUT_STATE(out) = 0;
case 0: OUTPUT_STATE(out) = ZERO;
OUTPUT_DELAY(out) = PARAM(fall_delay); OUTPUT_DELAY(out) = PARAM(fall_delay);
break; break;
/* rise to one value */ /* rise to one value */
case 1: OUTPUT_STATE(out) = 1;
case 1: OUTPUT_STATE(out) = ONE;
OUTPUT_DELAY(out) = PARAM(rise_delay); OUTPUT_DELAY(out) = PARAM(rise_delay);
break; break;

Write Preview
Loading…
Cancel
Save