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

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

Author: eFfeM
Date: 2008-04-20 12:13:30 +0200 (Sun, 20 Apr 2008)
New Revision: 973

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c
Log:
sorted include files, curlies on separate line (yes I am a little bit a freak)


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c	2008-04-20 10:07:17 UTC (rev 972)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c	2008-04-20 10:13:30 UTC (rev 973)
@@ -19,30 +19,26 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <string.h>
-#include <errno.h>
-#include "tux_usb.h"
+#include "log.h"
+#include "tux_battery.h"
+#include "tux_cmd_parser.h"
+#include "tux_descriptor.h"
 #include "tux_error.h"
+#include "tux_eyes.h"
+#include "tux_firmware.h"
 #include "tux_hw_status.h"
-#include "tux_descriptor.h"
-#include "tux_firmware.h"
-#include "tux_wings.h"
-#include "tux_spinning.h"
-#include "tux_user_inputs.h"
+#include "tux_id.h"
+#include "tux_leds.h"
+#include "tux_light.h"
+#include "tux_misc.h"
 #include "tux_mouth.h"
-#include "tux_eyes.h"
-#include "tux_battery.h"
-#include "tux_light.h"
-#include "tux_leds.h"
-#include "tux_id.h"
 #include "tux_pong.h"
-#include "tux_cmd_parser.h"
 #include "tux_sound_flash.h"
+#include "tux_user_inputs.h"
+#include "tux_spinning.h"
+#include "tux_usb.h"
+#include "tux_wings.h"
 #include "version.h"
-#include "log.h"
-#include "tux_misc.h"
 
 static bool driver_started = false;
 static simple_callback_t end_cycle_funct;
@@ -104,7 +100,8 @@
     header = data[0];
     ret = tux_hw_status_parse_frame(data);
     
-    if (ret == -1) {
+    if (ret == -1)
+    {
         log_warning("STATUS FRAME : %.2x %.2x %.2x %.2x",    
             data[0], 
             data[1], 
@@ -112,7 +109,8 @@
             data[3]);
     }
     
-    switch (header) {
+    switch (header)
+    {
     /* Descriptor frames */
     case FRAME_HEADER_VERSION:
         tux_firmware_update_version();
@@ -128,27 +126,31 @@
         break;
     /* Status frames */
     case FRAME_HEADER_PORTS:
-        if (header == ret) {
+        if (header == ret)
+	{
             tux_spinning_update_direction();
             tux_mouth_update_position();
             tux_eyes_update_position();
         }
         break;
     case FRAME_HEADER_POSITION1:
-        if (header == ret) {
+        if (header == ret)
+	{
             tux_wings_update_movements_remaining();
             tux_mouth_update_movements_remaining();
             tux_eyes_update_movements_remaining();
         }
         break;
     case FRAME_HEADER_POSITION2:
-        if (header == ret) {
+        if (header == ret)
+	{
             tux_wings_update_position();
             tux_spinning_update_movements_remaining();
         }
         break;
     case FRAME_HEADER_SENSORS1:
-        if (header == ret) {
+        if (header == ret)
+	{
             tux_sound_flash_update_flash_play();
             tux_sound_flash_update_general_play();
             tux_user_inputs_update_head_button();
@@ -165,21 +167,27 @@
     case FRAME_HEADER_BATTERY:
         tux_user_inputs_update_charger_state();
         if (header == ret)
+	{
             tux_battery_update_level();
+	}
         break;
     case FRAME_HEADER_LIGHT:
         if (header == ret)
+	{
             tux_light_update_level();
+	}
         break;
     case FRAME_HEADER_LED:
-        if (header == ret) {
+        if (header == ret)
+	{
             tux_leds_update_left();
             tux_leds_update_right();
         }
         break;
     /* Don't work ...
     case FRAME_HEADER_FLASH_PROG:
-        if (header == ret) {
+        if (header == ret)
+	{
             tux_sound_flash_update_prog_current_track();
             tux_sound_flash_update_prog_last_track_size();
         }
@@ -199,7 +207,8 @@
 on_rf_state(unsigned char state)
 {
     tux_sw_status_set_value(SW_ID_RF_STATE, (void *)&state, true);
-    if (state) {
+    if (state)
+    {
         tux_descriptor_get();
         /* For reinitilizing the remote control task */
         tux_user_inputs_init();
@@ -221,7 +230,9 @@
     tux_cmd_parser_init();
     tux_sw_status_set_value(SW_ID_DONGLE_PLUG, (void *)&state, true);
     if (dongle_connected_funct)
+    {
         dongle_connected_funct();
+    }
 }
 
 /**
@@ -233,7 +244,9 @@
     bool state = false;
     tux_sw_status_set_value(SW_ID_DONGLE_PLUG, (void *)&state, true);
     if (dongle_disconnected_funct)
+    {
         dongle_disconnected_funct();
+    }
 }
 
 /**
@@ -249,7 +262,9 @@
     tux_hw_status_header_counter_check();
     
     if (end_cycle_funct)
+    {
         end_cycle_funct();
+    }
     
     tux_cmd_parser_delay_stack_perform();
 }
@@ -260,10 +275,13 @@
 LIBEXPORT TuxDrvError
 TuxDrv_PerformCommand(double delay, char *cmd_str)
 {
-    if (delay == 0.0) {
+    if (delay == 0.0)
+    {
         log_debug("Perform an instant command : [%s]", cmd_str);
         return tux_cmd_parser_parse_command(cmd_str);
-    } else {
+    }
+    else
+    {
         log_debug("Perform a delayed command : [%s], %f", cmd_str, delay);
         return tux_cmd_parser_insert_delay_command(delay, cmd_str, false);
     }
@@ -457,7 +475,8 @@
     tux_usb_set_loop_cycle_complete_callback(on_read_loop_cycle_complete);
     driver_started = true;
     
-    while (driver_started) {
+    while (driver_started)
+    {
         tux_usb_start();
         sleep(1);
     }