diff --git a/ChangeLog b/ChangeLog index 5c4f4487e..10ac4b884 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * 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 diff --git a/src/main.c b/src/main.c index d179891f4..6fafd2529 100644 --- a/src/main.c +++ b/src/main.c @@ -308,11 +308,11 @@ void com_savesnap(wordlist *wl) { return; } /* saj to get nutmeg to compile, not nice but necessary */ Ipc_Tiein_t g_ipc; Ipc_Status_t ipc_send_errchk(void ) { - Ipc_Status_t x=0; + Ipc_Status_t x = IPC_STATUS_OK; return(x); } 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); } struct line *ENHtranslate_poly(struct line *deck){ diff --git a/src/xspice/icm/digital/d_and/cfunc.mod b/src/xspice/icm/digital/d_and/cfunc.mod index 7d4947ac7..32d61947b 100644 --- a/src/xspice/icm/digital/d_and/cfunc.mod +++ b/src/xspice/icm/digital/d_and/cfunc.mod @@ -169,7 +169,7 @@ void cm_d_and(ARGS) /*** Calculate new output value based on inputs ***/ - *out = 1; + *out = ONE; for (i=0; i *count) ) { - *count = 0; + *count = 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, need to normalize count to "1", and raise output */ if ( ((div_factor+1) == *count)||(1 == *count) ) { - *count = 1; + *count = ONE; OUTPUT_STATE(freq_out) = *freq_out = ONE; OUTPUT_DELAY(freq_out) = PARAM(rise_delay); } diff --git a/src/xspice/icm/digital/d_inverter/cfunc.mod b/src/xspice/icm/digital/d_inverter/cfunc.mod index 08a89ea34..4a26e2f2b 100644 --- a/src/xspice/icm/digital/d_inverter/cfunc.mod +++ b/src/xspice/icm/digital/d_inverter/cfunc.mod @@ -182,12 +182,12 @@ void cm_d_inverter(ARGS) switch ( INPUT_STATE(in) ) { /* fall to zero value */ - case 1: OUTPUT_STATE(out) = *out = 0; + case 1: OUTPUT_STATE(out) = *out = ZERO; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 0: OUTPUT_STATE(out) = *out = 1; + case 0: OUTPUT_STATE(out) = *out = ONE; OUTPUT_DELAY(out) = PARAM(rise_delay); break; diff --git a/src/xspice/icm/digital/d_nand/cfunc.mod b/src/xspice/icm/digital/d_nand/cfunc.mod index f5ec353ae..533885968 100644 --- a/src/xspice/icm/digital/d_nand/cfunc.mod +++ b/src/xspice/icm/digital/d_nand/cfunc.mod @@ -207,12 +207,12 @@ void cm_d_nand(ARGS) switch ( *out ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = 0; + case 0: OUTPUT_STATE(out) = ZERO; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = 1; + case 1: OUTPUT_STATE(out) = ONE; OUTPUT_DELAY(out) = PARAM(rise_delay); break; diff --git a/src/xspice/icm/digital/d_nor/cfunc.mod b/src/xspice/icm/digital/d_nor/cfunc.mod index a57da2da4..a24056fcc 100644 --- a/src/xspice/icm/digital/d_nor/cfunc.mod +++ b/src/xspice/icm/digital/d_nor/cfunc.mod @@ -207,12 +207,12 @@ void cm_d_nor(ARGS) switch ( *out ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = 0; + case 0: OUTPUT_STATE(out) = ZERO; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = 1; + case 1: OUTPUT_STATE(out) = ONE; OUTPUT_DELAY(out) = PARAM(rise_delay); break; diff --git a/src/xspice/icm/digital/d_open_c/cfunc.mod b/src/xspice/icm/digital/d_open_c/cfunc.mod index 10e2316a4..649474255 100644 --- a/src/xspice/icm/digital/d_open_c/cfunc.mod +++ b/src/xspice/icm/digital/d_open_c/cfunc.mod @@ -177,13 +177,13 @@ void cm_d_open_c(ARGS) switch ( INPUT_STATE(in) ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = *out = 0; + case 0: OUTPUT_STATE(out) = *out = ZERO; OUTPUT_STRENGTH(out) = STRONG; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = *out = 1; + case 1: OUTPUT_STATE(out) = *out = ONE; OUTPUT_STRENGTH(out) = HI_IMPEDANCE; OUTPUT_DELAY(out) = PARAM(open_delay); break; diff --git a/src/xspice/icm/digital/d_open_e/cfunc.mod b/src/xspice/icm/digital/d_open_e/cfunc.mod index 1937efbab..88db92edb 100644 --- a/src/xspice/icm/digital/d_open_e/cfunc.mod +++ b/src/xspice/icm/digital/d_open_e/cfunc.mod @@ -177,13 +177,13 @@ void cm_d_open_e(ARGS) switch ( INPUT_STATE(in) ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = *out = 0; + case 0: OUTPUT_STATE(out) = *out = ZERO; OUTPUT_STRENGTH(out) = HI_IMPEDANCE; OUTPUT_DELAY(out) = PARAM(open_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = *out = 1; + case 1: OUTPUT_STATE(out) = *out = ONE; OUTPUT_STRENGTH(out) = STRONG; OUTPUT_DELAY(out) = PARAM(rise_delay); break; diff --git a/src/xspice/icm/digital/d_or/cfunc.mod b/src/xspice/icm/digital/d_or/cfunc.mod index ed6289cc0..f55bec815 100644 --- a/src/xspice/icm/digital/d_or/cfunc.mod +++ b/src/xspice/icm/digital/d_or/cfunc.mod @@ -207,12 +207,12 @@ void cm_d_or(ARGS) switch ( *out ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = 0; + case 0: OUTPUT_STATE(out) = ZERO; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = 1; + case 1: OUTPUT_STATE(out) = ONE; OUTPUT_DELAY(out) = PARAM(rise_delay); break; diff --git a/src/xspice/icm/digital/d_xnor/cfunc.mod b/src/xspice/icm/digital/d_xnor/cfunc.mod index 981c37032..e282e8d68 100644 --- a/src/xspice/icm/digital/d_xnor/cfunc.mod +++ b/src/xspice/icm/digital/d_xnor/cfunc.mod @@ -287,12 +287,12 @@ void cm_d_xnor(ARGS) switch ( *out ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = 0; + case 0: OUTPUT_STATE(out) = ZERO; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = 1; + case 1: OUTPUT_STATE(out) = ONE; OUTPUT_DELAY(out) = PARAM(rise_delay); break; diff --git a/src/xspice/icm/digital/d_xor/cfunc.mod b/src/xspice/icm/digital/d_xor/cfunc.mod index c1b49c2c1..8423bc2c9 100644 --- a/src/xspice/icm/digital/d_xor/cfunc.mod +++ b/src/xspice/icm/digital/d_xor/cfunc.mod @@ -261,12 +261,12 @@ void cm_d_xor(ARGS) switch ( *out ) { /* fall to zero value */ - case 0: OUTPUT_STATE(out) = 0; + case 0: OUTPUT_STATE(out) = ZERO; OUTPUT_DELAY(out) = PARAM(fall_delay); break; /* rise to one value */ - case 1: OUTPUT_STATE(out) = 1; + case 1: OUTPUT_STATE(out) = ONE; OUTPUT_DELAY(out) = PARAM(rise_delay); break;