[tuxdroid-svn] r972 - software_suite_v2/middleware/tuxdriver/trunk/src

[eFfeM <c2m...@c2...>]

Author: eFfeM
Date: 2008-04-20 12:07:17 +0200 (Sun, 20 Apr 2008)
New Revision: 972

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.h
Log:
layout changes, removed unneeded includes


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c	2008-04-19 17:10:33 UTC (rev 971)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.c	2008-04-20 10:07:17 UTC (rev 972)
@@ -18,14 +18,13 @@
  * 02111-1307, USA.
  */
 
+#include <errno.h>
 #include <stdio.h>
-#include <errno.h>
 #include <string.h>
-#include <stdlib.h>
+
+#include "tux_descriptor.h"
 #include "tux_usb.h"
-#include "tux_descriptor.h"
 #include "tux_sw_status.h"
-#include "log.h"
 
 /**
  *
@@ -64,21 +63,25 @@
     sprintf(descriptor, "Tux droid descriptor\n--------------------\n\n");
     
     /* Firmware descriptors */
-	tux_firmware_dump_descriptor(descriptor);
+    tux_firmware_dump_descriptor(descriptor);
     
     /* Sound flash descriptor */
-	tux_sound_flash_dump_descriptor(descriptor);
+    tux_sound_flash_dump_descriptor(descriptor);
     
     /* ID connection descriptor */
-	tux_id_dump_descriptor(descriptor);
+    tux_id_dump_descriptor(descriptor);
     
     desc_file = fopen(DESCRIPTOR_FILE_PATH, "w");
 	
-    if (desc_file) {
+    if (desc_file)
+    {
         fprintf(desc_file, "%s\n", descriptor);
         fclose(desc_file);
-    } else
-		printf("file error %s\n", strerror(errno));
+    }
+    else
+    {
+	printf("file error %s\n", strerror(errno));
+    }
 }
 
 /**
@@ -91,11 +94,17 @@
     
     f = fopen("./lock_tux", "r");
     
-    if (f) {
-        if (tux_firmware_check_new_descriptor(false) || tux_sound_flash_check_new_descriptor(false))
+    if (f)
+    {
+        if (tux_firmware_check_new_descriptor(false)
+		|| tux_sound_flash_check_new_descriptor(false))
+	{
             tux_usb_reset();
+	}
         fclose(f);
-    } else {
+    }
+    else
+    {
         tux_firmware_check_new_descriptor(true);
         tux_sound_flash_check_new_descriptor(true);
     }

Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.h
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.h	2008-04-19 17:10:33 UTC (rev 971)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_descriptor.h	2008-04-20 10:07:17 UTC (rev 972)
@@ -21,7 +21,6 @@
 #ifndef _TUX_DESCRIPTOR_H_
 #define _TUX_DESCRIPTOR_H_
 
-#include "tux_misc.h"
 #include "tux_firmware.h"
 #include "tux_sound_flash.h"
 #include "tux_id.h"