[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-320-g49c8fe0

[Nicolas <th...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  49c8fe03bc31155369e38de0f2621ad5300f094a (commit)
      from  70bc3b3b30a511848f51092e16faafe4638ef047 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 49c8fe03bc31155369e38de0f2621ad5300f094a
Author: Nicolas Colombain <nic...@ar...>
Date:   Wed Feb 16 12:39:20 2011 +0100

    [BUILDROOT] cleanup tftp410ctrl after review

-----------------------------------------------------------------------

Summary of changes:
 buildroot/package/armadeus/Config.in            |    2 +-
 buildroot/package/armadeus/tfp410ctrl/Config.in |    1 -
 target/packages/tfp410ctrl/tfp410ctrl.c         |   56 +++++++++++-----------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/buildroot/package/armadeus/Config.in b/buildroot/package/armadeus/Config.in
index 11e7d09..e407932 100644
--- a/buildroot/package/armadeus/Config.in
+++ b/buildroot/package/armadeus/Config.in
@@ -1,7 +1,6 @@
 menu "Armadeus specific tools/utilities"
 
 source package/armadeus/ad9889ctrl/Config.in
-source package/armadeus/tfp410ctrl/Config.in
 source package/armadeus/as_devices/Config.in
 source package/armadeus/ch7024ctrl/Config.in
 source package/armadeus/demos/Config.in
@@ -11,5 +10,6 @@ source package/armadeus/imxssi/Config.in
 source package/armadeus/max5821ctrl/Config.in
 source package/armadeus/pps/Config.in
 source package/armadeus/testsuite/Config.in
+source package/armadeus/tfp410ctrl/Config.in
 
 endmenu
diff --git a/buildroot/package/armadeus/tfp410ctrl/Config.in b/buildroot/package/armadeus/tfp410ctrl/Config.in
index e60d138..8162cf6 100644
--- a/buildroot/package/armadeus/tfp410ctrl/Config.in
+++ b/buildroot/package/armadeus/tfp410ctrl/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_TFP410CTRL
 	bool "tfp410ctrl"
 	depends on BR2_TARGET_ARMADEUS
-	default n
 	help
 	  Build TFP410 control tool. It allows you to configure the HDMI/DVI
 	  output of the APF51Dev directly from Linux userspace (command tfp410ctrl).
diff --git a/target/packages/tfp410ctrl/tfp410ctrl.c b/target/packages/tfp410ctrl/tfp410ctrl.c
index 087abf0..1282063 100644
--- a/target/packages/tfp410ctrl/tfp410ctrl.c
+++ b/target/packages/tfp410ctrl/tfp410ctrl.c
@@ -221,34 +221,34 @@ void dump(int fd, FILE* destFile)
  */
 void load(int fd, char* fileName)
 {
-    char line[MAX_DUMP_LINE];
-    char tempFileName[MAX_DUMP_LINE];
-    FILE *fd_conf = NULL;
-    unsigned int regAddr, val;
-
-    if (strlen(fileName) == 0) {
-        printf("Enter file name: ");
-        fgets(tempFileName, sizeof(tempFileName), stdin);
-        tempFileName[strlen(tempFileName)-1] = '\0'; /* suppress \n */
-    }
-    else {
-        strcpy(tempFileName, fileName);
-    }
- 
-    if ((fd_conf = fopen(tempFileName, "r")) == NULL) {
-        perror("Open error: ");
-        exit (1);
-    }
-    while (fgets(line, MAX_DUMP_LINE, fd_conf) != NULL) {
-        sscanf(line,"%2X%*c%4X", &regAddr, &val);
-	printf("reg %02x, value %04x\n", regAddr, val);
-	if (regAddr > DE_TOP_REG)
-	            write_word (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
-	else
-	            write_byte (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
-    }
-    if (fd_conf != NULL)
-        fclose(fd_conf);
+	char line[MAX_DUMP_LINE];
+	char tempFileName[MAX_DUMP_LINE];
+	FILE *fd_conf = NULL;
+	unsigned int regAddr, val;
+
+	if (strlen(fileName) == 0) {
+		printf("Enter file name: ");
+		fgets(tempFileName, sizeof(tempFileName), stdin);
+		tempFileName[strlen(tempFileName)-1] = '\0'; /* suppress \n */
+	}
+	else {
+		strcpy(tempFileName, fileName);
+	}
+
+	if ((fd_conf = fopen(tempFileName, "r")) == NULL) {
+		perror("Open error: ");
+		exit (1);
+	}
+	while (fgets(line, MAX_DUMP_LINE, fd_conf) != NULL) {
+        	sscanf(line,"%2X%*c%4X", &regAddr, &val);
+		printf("reg %02x, value %04x\n", regAddr, val);
+		if (regAddr > DE_TOP_REG
+			write_word (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
+		else
+			write_byte (fd, TFP410_I2C_SLAVE_ADDR, regAddr, val);
+    	}
+	if (fd_conf != NULL)
+        	fclose(fd_conf);
 }
 
 void modifyRegister(int fd, int regAddr)


hooks/post-receive
-- 
armadeus