Suppressed error messages during probe

Better verbose probe messages
balint256 · Apr 7, 2012 · bf12a4c · bf12a4c
1 parent 44461cb
commit bf12a4c
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/lib/rtl2832-tuner_e4000.cc b/lib/rtl2832-tuner_e4000.cc
@@ -147,7 +147,9 @@ int e4000::TUNER_PROBE_FN_NAME(demod* d)
 	I2C_REPEATER_SCOPE(d);
 
 	uint8_t reg = 0;
-	CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(E4K_I2C_ADDR, E4K_CHECK_ADDR, reg));
+	//CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(E4K_I2C_ADDR, E4K_CHECK_ADDR, reg));
+	int r = d->i2c_read_reg(E4K_I2C_ADDR, E4K_CHECK_ADDR, reg);
+	if (r <= 0) return r;
 	return ((reg == E4K_CHECK_VAL) ? SUCCESS : FAILURE);
 }
 

diff --git a/lib/rtl2832-tuner_fc0012.cc b/lib/rtl2832-tuner_fc0012.cc
@@ -217,7 +217,9 @@ int fc0012::TUNER_PROBE_FN_NAME(demod* d)
 	d->set_gpio_bit(5, 0);
 
 	uint8_t reg = 0;
-	CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(FC0012_I2C_ADDR, FC0012_CHECK_ADDR, reg));
+	//CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(FC0012_I2C_ADDR, FC0012_CHECK_ADDR, reg));
+	int r = d->i2c_read_reg(FC0012_I2C_ADDR, FC0012_CHECK_ADDR, reg);
+	if (r <= 0) return r;
 	return ((reg == FC0012_CHECK_VAL) ? SUCCESS : FAILURE);
 }
 

diff --git a/lib/rtl2832-tuner_fc0013.cc b/lib/rtl2832-tuner_fc0013.cc
@@ -173,7 +173,9 @@ int fc0013::TUNER_PROBE_FN_NAME(demod* d)
 	I2C_REPEATER_SCOPE(d);
 
 	uint8_t reg = 0;
-	CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(FC0013_I2C_ADDR, FC0013_CHECK_ADDR, reg));
+	//CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(FC0013_I2C_ADDR, FC0013_CHECK_ADDR, reg));
+	int r = d->i2c_read_reg(FC0013_I2C_ADDR, FC0013_CHECK_ADDR, reg);
+	if (r <= 0) return r;
 	return ((reg == FC0013_CHECK_VAL) ? SUCCESS : FAILURE);
 }
 

diff --git a/lib/rtl2832-tuner_fc2580.cc b/lib/rtl2832-tuner_fc2580.cc
@@ -83,7 +83,9 @@ int fc2580::TUNER_PROBE_FN_NAME(demod* d)
 	d->set_gpio_bit(5, 0);
 
 	uint8_t reg = 0;
-	CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(FC2580_I2C_ADDR, FC2580_CHECK_ADDR, reg));
+	//CHECK_LIBUSB_RESULT_RETURN_EX(d,d->i2c_read_reg(FC2580_I2C_ADDR, FC2580_CHECK_ADDR, reg));
+	int r = d->i2c_read_reg(FC2580_I2C_ADDR, FC2580_CHECK_ADDR, reg);
+	if (r <= 0) return r;
 	return ((reg == FC2580_CHECK_VAL) ? SUCCESS : FAILURE);
 }
 

diff --git a/lib/rtl2832.cc b/lib/rtl2832.cc
@@ -173,8 +173,9 @@ static struct _rtl2832_tuner_info
 	tuner::CreateTunerFn factory;
 	tuner::ProbeTunerFn probe;
 } _rtl2832_tuners[] = {
-	ADD_TUNER(e4000),
 	ADD_TUNER(fc0013),
+	ADD_TUNER(e4000),
+
 	ADD_TUNER(fc2580),
 	ADD_TUNER(fc0012)
 };
@@ -431,8 +432,6 @@ int demod::find_device()
 		else
 			factory = info->factory;
 	}
-	//else if (found == &custom)
-	//	log("Not attaching tuner as custom tuner name not given\n");
 
 	r = init_demod();
 	if (r != SUCCESS)
@@ -453,18 +452,28 @@ int demod::find_device()
 			if (info->probe)
 			{
 				if (m_params.verbose)
-					log("Probing \"%s\"...\n", info->name);
+					log("Probing \"%s\"...", info->name);
 
 				int r = (info->probe)(this);
 				if (r == SUCCESS)
 				{
 					if (m_params.verbose)
-						log("Successfully auto-probed tuner: \"%s\"\n", info->name);
+						log("found\n", info->name);
 
 					factory = info->factory;
 
 					break;
 				}
+				else
+				{
+					if (m_params.verbose)
+					{
+						if (r == FAILURE)
+							log("bad check value.\n");
+						else
+							log("not found.\n");
+					}
+				}
 			}
 		}
 
@@ -559,19 +568,26 @@ int demod::i2c_write_reg(uint8_t i2c_addr, uint8_t reg, uint8_t val)
 	data[0] = reg;
 	data[1] = val;
 
-	CHECK_LIBUSB_RESULT_RETURN(write_array(IICB, addr, (uint8_t *)&data, 2));
+	//CHECK_LIBUSB_RESULT_RETURN(write_array(IICB, addr, (uint8_t *)&data, 2));
+	//return SUCCESS;
 
-	return SUCCESS;
+	return write_array(IICB, addr, (uint8_t *)&data, 2);
 }
 
 int demod::i2c_read_reg(uint8_t i2c_addr, uint8_t reg, uint8_t& data)
 {
 	uint16_t addr = i2c_addr;
+	int r;
+
+	//CHECK_LIBUSB_RESULT_RETURN(write_array(IICB, addr, &reg, 1));
+	r = write_array(IICB, addr, &reg, 1);
+	if (r <= 0)
+		return r;
 
-	CHECK_LIBUSB_RESULT_RETURN(write_array(IICB, addr, &reg, 1));
-	CHECK_LIBUSB_RESULT_RETURN(read_array(IICB, addr, &data, 1));
+	//CHECK_LIBUSB_RESULT_RETURN(read_array(IICB, addr, &data, 1));
+	//return SUCCESS;
 
-	return SUCCESS;
+	return read_array(IICB, addr, &data, 1);
 }
 
 int demod::read_reg(uint8_t block, uint16_t addr, uint8_t len, uint16_t& reg)