Permalink
Browse files

Printf debugging

  • Loading branch information...
1 parent 48c57ab commit d5f371be5ccea137a67f8e4efa8b4f291e56e7af Andreas Heider committed Mar 31, 2012
Showing with 68 additions and 38 deletions.
  1. +39 −26 config.sub
  2. +2 −1 lib/baz_rtl_source_c.cc
  3. +27 −11 lib/rtl2832-tuner_e4000.cc
View
65 config.sub 100644 → 100755
@@ -2,9 +2,9 @@
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
+# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2011-03-23'
+timestamp='2012-02-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@ timestamp='2011-03-23'
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@ version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,6 +130,10 @@ case $maybe_os in
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
+ android-linux)
+ os=-linux-android
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+ ;;
*)
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
if [ $basic_machine != $1 ]
@@ -247,17 +249,22 @@ case $basic_machine in
# Some are omitted here because they have special meanings below.
1750a | 580 \
| a29k \
+ | aarch64 | aarch64_be \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | hexagon \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
- | rx \
+ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
@@ -300,7 +307,7 @@ case $basic_machine in
| spu \
| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
| ubicom32 \
- | v850 | v850e \
+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
@@ -315,8 +322,7 @@ case $basic_machine in
c6x)
basic_machine=tic6x-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
basic_machine=$basic_machine-unknown
os=-none
;;
@@ -329,7 +335,10 @@ case $basic_machine in
strongarm | thumb | xscale)
basic_machine=arm-unknown
;;
-
+ xgate)
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
xscaleeb)
basic_machine=armeb-unknown
;;
@@ -352,11 +361,13 @@ case $basic_machine in
# Recognize the basic CPU types with company name.
580-* \
| a29k-* \
+ | aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
+ | be32-* | be64-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* \
| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@ case $basic_machine in
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -400,18 +413,19 @@ case $basic_machine in
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* | rx-* \
+ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
| tahoe-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tile-* | tilegx-* \
+ | tile*-* \
| tron-* \
| ubicom32-* \
- | v850-* | v850e-* | vax-* \
+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+ | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@ case $basic_machine in
i370-ibm* | ibm*)
basic_machine=i370-ibm
;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i*86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-sysv32
@@ -808,10 +821,18 @@ case $basic_machine in
ms1-*)
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
+ msys)
+ basic_machine=i386-pc
+ os=-msys
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
;;
+ nacl)
+ basic_machine=le32-unknown
+ os=-nacl
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
@@ -1120,13 +1141,8 @@ case $basic_machine in
basic_machine=t90-cray
os=-unicos
;;
- # This must be matched before tile*.
- tilegx*)
- basic_machine=tilegx-unknown
- os=-linux-gnu
- ;;
tile*)
- basic_machine=tile-unknown
+ basic_machine=$basic_machine-unknown
os=-linux-gnu
;;
tx39)
@@ -1336,7 +1352,7 @@ case $os in
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1564,6 @@ case $basic_machine in
;;
m68000-sun)
os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
;;
m68*-cisco)
os=-aout
View
@@ -969,7 +969,8 @@ bool baz_rtl_source_c::set_gain(/*double*/float dGain)
bool baz_rtl_source_c::set_frequency(/*double*/float dFreq)
{
- //gruel::scoped_lock lock(d_mutex); // Switched off to improve responsiveness (just don't call this from different threads!)
+ gruel::scoped_lock lock(d_mutex); // Switched off to improve responsiveness (just don't call this from different threads!)
+ fprintf(stderr, _T("set_frequency"));
set_i2c_repeater(1);
View
@@ -3,6 +3,7 @@
#endif
#include "baz_rtl_source_c.h"
+#include <stdio.h>
/*
* Elonics E4000 tuner driver, taken from the kernel driver that can be found
* on http://linux.terratec.de/tv_en.html
@@ -158,22 +159,32 @@ e4000_SetRfFreqHz(
// if(Gainmanual(pTuner) != E4000_1_SUCCESS)
// goto error_status_execute_function;
+ fprintf(stderr, "e4000_SetRfFreqHz 1\n");
if(E4000_gain_freq(pTuner, RfFreqKhz) != E4000_1_SUCCESS)
goto error_status_execute_function;
+ fprintf(stderr, "e4000_SetRfFreqHz 2\n");
+
if(PLL(pTuner, CrystalFreqKhz, RfFreqKhz) != E4000_1_SUCCESS)
goto error_status_execute_function;
+ fprintf(stderr, "e4000_SetRfFreqHz 3\n");
+
if(LNAfilter(pTuner, RfFreqKhz) != E4000_1_SUCCESS)
goto error_status_execute_function;
+ fprintf(stderr, "e4000_SetRfFreqHz 4\n");
+
if(freqband(pTuner, RfFreqKhz) != E4000_1_SUCCESS)
goto error_status_execute_function;
+ fprintf(stderr, "e4000_SetRfFreqHz 5\n");
+
if(DCoffLUT(pTuner) != E4000_1_SUCCESS) // Enabling this results in big increase in noise floor
goto error_status_execute_function;
+ fprintf(stderr, "e4000_SetRfFreqHz 6\n");
// if(GainControlauto(pTuner) != E4000_1_SUCCESS) // CHANGED: Leaving it manual
// goto error_status_execute_function;
@@ -303,7 +314,7 @@ int tunerreset(baz_rtl_source_c* pTuner)
// For dummy I2C command, don't check executing status.
status=I2CWriteByte (pTuner, 200,2,writearray[0]);
status=I2CWriteByte (pTuner, 200,2,writearray[0]);
- //printf("\nRegister 0=%d", writearray[0]);
+ //printf("\nRegister 0=%d", writearray[0]);
if(status != E4000_I2C_SUCCESS)
{
return E4000_1_FAIL;
@@ -926,17 +937,17 @@ int PLL(baz_rtl_source_c* pTuner, int Ref_clk, int Freq)
VCO_freq=Freq*2;
}
- //printf("\nVCOfreq=%d", VCO_freq);
+ printf("\nVCOfreq=%d", VCO_freq);
// divider = VCO_freq * 1000 / Ref_clk;
divider = VCO_freq / Ref_clk;
- //printf("\ndivider=%d", divider);
+ printf("\ndivider=%d", divider);
writearray[0]= divider;
// intVCOfreq = divider * Ref_clk /1000;
intVCOfreq = divider * Ref_clk;
- //printf("\ninteger VCO freq=%d", intVCOfreq);
+ printf("\ninteger VCO freq=%d", intVCOfreq);
// SigDel=65536 * 1000 * (VCO_freq - intVCOfreq) / Ref_clk;
SigDel=65536 * (VCO_freq - intVCOfreq) / Ref_clk;
- //printf("\nSigma delta=%d", SigDel);
+ printf("\nSigma delta=%d", SigDel);
if (SigDel<=1024)
{
SigDel = 1024;
@@ -946,17 +957,17 @@ int PLL(baz_rtl_source_c* pTuner, int Ref_clk, int Freq)
SigDel=64512;
}
SigDel2 = SigDel / 256;
- //printf("\nSigdel2=%d", SigDel2);
+ printf("\nSigdel2=%d", SigDel2);
writearray[2] = (unsigned char)SigDel2;
SigDel3 = SigDel - (256 * SigDel2);
- //printf("\nSig del3=%d", SigDel3);
+ printf("\nSig del3=%d", SigDel3);
writearray[1]= (unsigned char)SigDel3;
writearray[3]=(unsigned char)0;
status=I2CWriteArray(pTuner, 200,9,5,writearray);
- //printf("\nRegister 9=%d", writearray[0]);
- //printf("\nRegister a=%d", writearray[1]);
- //printf("\nRegister b=%d", writearray[2]);
- //printf("\nRegister d=%d", writearray[4]);
+ printf("\nRegister 9=%d", writearray[0]);
+ printf("\nRegister a=%d", writearray[1]);
+ printf("\nRegister b=%d", writearray[2]);
+ printf("\nRegister d=%d", writearray[4]);
if(status != E4000_I2C_SUCCESS)
{
return E4000_1_FAIL;
@@ -1173,13 +1184,18 @@ int PLL(baz_rtl_source_c* pTuner, int Ref_clk, int Freq)
writearray[2]=7;
}
+ printf("\nbefore write 7");
status=I2CWriteByte (pTuner, 200,7,writearray[2]);
+ printf("\nafter write 7");
if(status != E4000_I2C_SUCCESS)
{
return E4000_1_FAIL;
}
+ printf("\nbefore write 5");
status=I2CWriteByte (pTuner, 200,5,writearray[0]);
+ printf("\nafter write 5");
+ if(status != E4000_I2C_SUCCESS)
if(status != E4000_I2C_SUCCESS)
{
return E4000_1_FAIL;

0 comments on commit d5f371b

Please sign in to comment.