diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-16 13:46:01 +0000 |
| commit | 578938f1cdd5a06dd6fa28167d575ec980322a5d (patch) | |
| tree | e31cf77fab7cc6e005b0e726e7951d7eef79550f /xorg-server/hw/xfree86/i2c | |
| parent | 0032f9b66d63a4b1c5222edb8603fb60da379fb0 (diff) | |
| download | vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.gz vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.tar.bz2 vcxsrv-578938f1cdd5a06dd6fa28167d575ec980322a5d.zip | |
Update to git master branch of xserver.
Diffstat (limited to 'xorg-server/hw/xfree86/i2c')
| -rw-r--r-- | xorg-server/hw/xfree86/i2c/fi1236.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/hw/xfree86/i2c/fi1236.c b/xorg-server/hw/xfree86/i2c/fi1236.c index 110563ed9..7c39edbee 100644 --- a/xorg-server/hw/xfree86/i2c/fi1236.c +++ b/xorg-server/hw/xfree86/i2c/fi1236.c @@ -225,7 +225,7 @@ m->f_ifbw=f_ifbw; m->f_step=f_step; m->f_lo1=f_rf+f_if1; -m->LO1I=(int)floor((m->f_lo1/f_ref)+0.5); +m->LO1I=lrint(m->f_lo1/f_ref); m->f_lo1=f_ref*m->LO1I; m->f_lo2=m->f_lo1-f_rf-f_if2; @@ -258,10 +258,10 @@ if(m->f_lo1<1890.0)m->SEL=1; m->SEL=0; /* calculate the rest of the registers */ -m->LO2I=(int)floor(m->f_lo2/f_ref); -m->STEP=(int)floor(3780.0*f_step/f_ref); -m->NUM=(int)floor(3780.0*(m->f_lo2/f_ref-m->LO2I)); -m->NUM=m->STEP*(int)floor((1.0*m->NUM)/(1.0*m->STEP)+0.5); +m->LO2I=floor(m->f_lo2/f_ref); +m->STEP=floor(3780.0*f_step/f_ref); +m->NUM=floor(3780.0*(m->f_lo2/f_ref-m->LO2I)); +m->NUM=m->STEP*lrint((1.0*m->NUM)/(1.0*m->STEP)); } static int MT2032_wait_for_lock(FI1236Ptr f) |