diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-10-17 12:47:27 -0400 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-10-17 12:47:27 -0400 |
| commit | 343826ed1667030b1abeb161270e38cb34386a16 (patch) | |
| tree | d1720b8b8d484132b3136eec1d40397f5242a332 | |
| parent | beae496e16fe43bea4b27d3aac4f3aa73b3306e9 (diff) | |
fix last commit to use current flash setup
| -rw-r--r-- | flash.c | 40 |
1 files changed, 18 insertions, 22 deletions
@@ -14,8 +14,8 @@ #include <mhash.h> #include <glib.h> -#define MAINFILE "/root/flash.copy" -#define BACKUPFILE "/root/flash.bup" +#define MAINFILE "/root/mem->copy" +#define BACKUPFILE "/root/mem->bup" #define PERSIST_ERR_COULDNTREADHDR 1 #define PERSIST_ERR_HDRLENMISMATCH 2 @@ -435,40 +435,36 @@ static void initFlashValues(FlashStruct *mem) /* these values have been determined by experiment */ temp_int_pw_dly=dac_max; temp_int_prf=dac_max; - temp_int_rise_time=dac_max; - Flash.period_pwl_time[i][j][k][m]=(47e-9*power_of_ten)+41e-9; - Flash.pw_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+5e-9; - Flash.delay_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+7.6e-9; - Flash.burst_pwl_time[i][j][k][m]=(22e-9*power_of_ten)+25e-9; + mem->period_pwl_time[i][j][k][m]=(47e-9*power_of_ten)+41e-9; + mem->pw_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+5e-9; + mem->delay_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+7.6e-9; + mem->burst_pwl_time[i][j][k][m]=(22e-9*power_of_ten)+25e-9; } else if (m==1) { temp_int_pw_dly=dac_max/2.15; - temp_int_rise_time=dac_max/2; temp_int_prf=dac_max/2.15; - Flash.period_pwl_time[i][j][k][m]=(100e-9*power_of_ten)+50e-9; - Flash.pw_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+10e-9; - Flash.delay_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+17e-9; - Flash.burst_pwl_time[i][j][k][m]=(33e-9*power_of_ten)+10e-9; + mem->period_pwl_time[i][j][k][m]=(100e-9*power_of_ten)+50e-9; + mem->pw_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+10e-9; + mem->delay_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+17e-9; + mem->burst_pwl_time[i][j][k][m]=(33e-9*power_of_ten)+10e-9; } else if (m==2) { temp_int_pw_dly=dac_max/4.6; - temp_int_rise_time=1; /* not zero - confuses diag routines */; temp_int_prf=dac_max/4.6; - Flash.period_pwl_time[i][j][k][m]=(230e-9*power_of_ten)+100e-9; - Flash.pw_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+20e-9; - Flash.delay_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+30e-9; - Flash.burst_pwl_time[i][j][k][m]=(50e-9*power_of_ten)+10e-9; + mem->period_pwl_time[i][j][k][m]=(230e-9*power_of_ten)+100e-9; + mem->pw_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+20e-9; + mem->delay_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+30e-9; + mem->burst_pwl_time[i][j][k][m]=(50e-9*power_of_ten)+10e-9; } else if (m==3) { temp_int_pw_dly=dac_min; - temp_int_rise_time=0; temp_int_prf=dac_min; - Flash.period_pwl_time[i][j][k][m]=(470e-9*power_of_ten)+160e-9; - Flash.pw_pwl_time[i][j][k][m]=(60e-9*power_of_ten)+40e-9; - Flash.delay_pwl_time[i][j][k][m]=(60e-9*power_of_ten)+40e-9; - Flash.burst_pwl_time[i][j][k][m]=(110e-9*power_of_ten)+10e-9; + mem->period_pwl_time[i][j][k][m]=(470e-9*power_of_ten)+160e-9; + mem->pw_pwl_time[i][j][k][m]=(60e-9*power_of_ten)+40e-9; + mem->delay_pwl_time[i][j][k][m]=(60e-9*power_of_ten)+40e-9; + mem->burst_pwl_time[i][j][k][m]=(110e-9*power_of_ten)+10e-9; } else { temp_int_pw_dly=0; temp_int_prf=0; |