X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_dtt.c;h=cd94423d21910d61055bade1bc285dbed099b9f9;hb=61e129885a8fd6d36c25301e537d46e66b6c6e6a;hp=804d467f251f3aaa13fd4c00e642454d23c67f3b;hpb=0f8b8d0f4c1579a55aaebd1974517552766ab7e5;p=u-boot

diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c
index 804d467f25..cd94423d21 100644
--- a/common/cmd_dtt.c
+++ b/common/cmd_dtt.c
@@ -25,27 +25,61 @@
 #include <config.h>
 #include <command.h>
 
-#if defined(CONFIG_CMD_DTT)
-
 #include <dtt.h>
 #include <i2c.h>
 
-int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+static unsigned long sensor_initialized;
+
+static void _initialize_dtt(void)
 {
 	int i;
 	unsigned char sensors[] = CONFIG_DTT_SENSORS;
+
+	for (i = 0; i < sizeof(sensors); i++) {
+		if ((sensor_initialized & (1 << i)) == 0) {
+			if (dtt_init_one(sensors[i]) != 0) {
+				printf("DTT%d: Failed init!\n", i);
+				continue;
+			}
+			sensor_initialized |= (1 << i);
+		}
+	}
+}
+
+void dtt_init(void)
+{
 	int old_bus;
 
 	/* switch to correct I2C bus */
 	old_bus = I2C_GET_BUS();
-	I2C_SET_BUS(CFG_DTT_BUS_NUM);
+	I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM);
+
+	_initialize_dtt();
+
+	/* switch back to original I2C bus */
+	I2C_SET_BUS(old_bus);
+}
+
+int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
+{
+	int i;
+	unsigned char sensors[] = CONFIG_DTT_SENSORS;
+	int old_bus;
+
+	/* Force a compilation error, if there are more then 32 sensors */
+	BUILD_BUG_ON(sizeof(sensors) > 32);
+	/* switch to correct I2C bus */
+	old_bus = I2C_GET_BUS();
+	I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM);
+
+	_initialize_dtt();
 
 	/*
 	 * Loop through sensors, read
 	 * temperature, and output it.
 	 */
-	for (i = 0; i < sizeof (sensors); i++)
-		printf ("DTT%d: %i C\n", i + 1, dtt_get_temp (sensors[i]));
+	for (i = 0; i < sizeof(sensors); i++)
+		printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i]));
 
 	/* switch back to original I2C bus */
 	I2C_SET_BUS(old_bus);
@@ -57,8 +91,6 @@ int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
 	  dtt,	1,	1,	do_dtt,
-	  "dtt     - Digital Thermometer and Thermostat\n",
-	  "        - Read temperature from digital thermometer and thermostat.\n"
+	  "Read temperature from Digital Thermometer and Thermostat",
+	  ""
 );
-
-#endif