Hardware/litex
1
0
Fork 0
mirror of https://github.com/enjoy-digital/litex.git synced 2025-01-04 09:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

software/videomixer: improve phase calibration

Browse source
This commit is contained in:
Sebastien Bourdeauducq 2013-05-30 21:40:16 +02:00
parent 30f5ef8895
commit 7c95d253d9
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
software/videomixer/dvisamplerX.c
View file

@ -106,11 +106,13 @@ void dvisamplerX_adjust_phase(void)
switch(dvisamplerX_data0_cap_phase_read()) { switch(dvisamplerX_data0_cap_phase_read()) {
case DVISAMPLER_TOO_LATE: case DVISAMPLER_TOO_LATE:
dvisamplerX_data0_cap_dly_ctl_write(DVISAMPLER_DELAY_DEC); dvisamplerX_data0_cap_dly_ctl_write(DVISAMPLER_DELAY_DEC);
while(dvisamplerX_data0_cap_dly_busy_read());
dvisamplerX_d0--; dvisamplerX_d0--;
dvisamplerX_data0_cap_phase_reset_write(1); dvisamplerX_data0_cap_phase_reset_write(1);
break; break;
case DVISAMPLER_TOO_EARLY: case DVISAMPLER_TOO_EARLY:
dvisamplerX_data0_cap_dly_ctl_write(DVISAMPLER_DELAY_INC); dvisamplerX_data0_cap_dly_ctl_write(DVISAMPLER_DELAY_INC);
while(dvisamplerX_data0_cap_dly_busy_read());
dvisamplerX_d0++; dvisamplerX_d0++;
dvisamplerX_data0_cap_phase_reset_write(1); dvisamplerX_data0_cap_phase_reset_write(1);
break; break;
@ -118,11 +120,13 @@ void dvisamplerX_adjust_phase(void)
switch(dvisamplerX_data1_cap_phase_read()) { switch(dvisamplerX_data1_cap_phase_read()) {
case DVISAMPLER_TOO_LATE: case DVISAMPLER_TOO_LATE:
dvisamplerX_data1_cap_dly_ctl_write(DVISAMPLER_DELAY_DEC); dvisamplerX_data1_cap_dly_ctl_write(DVISAMPLER_DELAY_DEC);
while(dvisamplerX_data1_cap_dly_busy_read());
dvisamplerX_d1--; dvisamplerX_d1--;
dvisamplerX_data1_cap_phase_reset_write(1); dvisamplerX_data1_cap_phase_reset_write(1);
break; break;
case DVISAMPLER_TOO_EARLY: case DVISAMPLER_TOO_EARLY:
dvisamplerX_data1_cap_dly_ctl_write(DVISAMPLER_DELAY_INC); dvisamplerX_data1_cap_dly_ctl_write(DVISAMPLER_DELAY_INC);
while(dvisamplerX_data1_cap_dly_busy_read());
dvisamplerX_d1++; dvisamplerX_d1++;
dvisamplerX_data1_cap_phase_reset_write(1); dvisamplerX_data1_cap_phase_reset_write(1);
break; break;
@ -130,11 +134,13 @@ void dvisamplerX_adjust_phase(void)
switch(dvisamplerX_data2_cap_phase_read()) { switch(dvisamplerX_data2_cap_phase_read()) {
case DVISAMPLER_TOO_LATE: case DVISAMPLER_TOO_LATE:
dvisamplerX_data2_cap_dly_ctl_write(DVISAMPLER_DELAY_DEC); dvisamplerX_data2_cap_dly_ctl_write(DVISAMPLER_DELAY_DEC);
while(dvisamplerX_data2_cap_dly_busy_read());
dvisamplerX_d2--; dvisamplerX_d2--;
dvisamplerX_data2_cap_phase_reset_write(1); dvisamplerX_data2_cap_phase_reset_write(1);
break; break;
case DVISAMPLER_TOO_EARLY: case DVISAMPLER_TOO_EARLY:
dvisamplerX_data2_cap_dly_ctl_write(DVISAMPLER_DELAY_INC); dvisamplerX_data2_cap_dly_ctl_write(DVISAMPLER_DELAY_INC);
while(dvisamplerX_data2_cap_dly_busy_read());
dvisamplerX_d2++; dvisamplerX_d2++;
dvisamplerX_data2_cap_phase_reset_write(1); dvisamplerX_data2_cap_phase_reset_write(1);
break; break;
@ -158,13 +164,36 @@ int dvisamplerX_init_phase(void)
return 0; return 0;
} }
int dvisamplerX_phase_startup(void)
{
int ret;
int attempts;
attempts = 0;
while(1) {
attempts++;
dvisamplerX_calibrate_delays();
printf("dvisamplerX: delays calibrated\n");
ret = dvisamplerX_init_phase();
if(ret) {
printf("dvisamplerX: phase init OK\n");
return 1;
} else {
printf("dvisamplerX: phase did not settle\n");
if(attempts > 3) {
printf("dvisamplerX: giving up\n");
dvisamplerX_calibrate_delays();
return 0;
}
}
}
}
static int dvisamplerX_locked; static int dvisamplerX_locked;
static int dvisamplerX_last_event; static int dvisamplerX_last_event;
void dvisamplerX_service(void) void dvisamplerX_service(void)
{ {
int ret;
if(dvisamplerX_locked) { if(dvisamplerX_locked) {
if(dvisamplerX_clocking_locked_read()) { if(dvisamplerX_clocking_locked_read()) {
if(elapsed(&dvisamplerX_last_event, identifier_frequency_read()/2)) { if(elapsed(&dvisamplerX_last_event, identifier_frequency_read()/2)) {
@ -178,13 +207,7 @@ void dvisamplerX_service(void)
} else { } else {
if(dvisamplerX_clocking_locked_read()) { if(dvisamplerX_clocking_locked_read()) {
printf("dvisamplerX: PLL locked\n"); printf("dvisamplerX: PLL locked\n");
dvisamplerX_calibrate_delays(); dvisamplerX_phase_startup();
printf("dvisamplerX: delays calibrated\n");
ret = dvisamplerX_init_phase();
if(ret)
printf("dvisamplerX: phase init OK\n");
else
printf("dvisamplerX: phase did not settle\n");
dvisamplerX_print_status(); dvisamplerX_print_status();
dvisamplerX_locked = 1; dvisamplerX_locked = 1;
} }

1
software/videomixer/dvisamplerX.h
View file

@ -7,6 +7,7 @@ void dvisamplerX_print_status(void);
void dvisamplerX_calibrate_delays(void); void dvisamplerX_calibrate_delays(void);
void dvisamplerX_adjust_phase(void); void dvisamplerX_adjust_phase(void);
int dvisamplerX_init_phase(void); int dvisamplerX_init_phase(void);
int dvisamplerX_phase_startup(void);
void dvisamplerX_service(void); void dvisamplerX_service(void);
#endif #endif