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

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

Author: eFfeM
Date: 2008-04-20 12:45:34 +0200 (Sun, 20 Apr 2008)
New Revision: 977

Modified:
   software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c
Log:
includes, layout


Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c
===================================================================
--- software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c	2008-04-20 10:31:21 UTC (rev 976)
+++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_hw_status.c	2008-04-20 10:45:34 UTC (rev 977)
@@ -19,11 +19,10 @@
  */
 
 #include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
+
+#include "log.h"
 #include "tux_hw_status.h"
 #include "tux_misc.h"
-#include "log.h"
 
 LIBLOCAL hw_status_table_t hw_status_table;
 LIBLOCAL unsigned char tux_hw_status_header_counter[16] = { 0, 0, 0, 0, 0, 0, 
@@ -169,10 +168,16 @@
     unsigned char p_count = 0;
     
     for (i = 0; i < 16; i++)
+    {
         p_count += tux_hw_status_header_counter[i];
+    }
    
+    /* as there is only debug code in this for loop it might make sense
+       to have a guarding ifdef around the for loop to save a few cycles */
     for (i = 0; i < 16; i++)
-        if ((tux_hw_status_header_counter[i] > 1) && (p_count > 12)) {
+    {
+        if ((tux_hw_status_header_counter[i] > 1) && (p_count > 12))
+	{
             log_debug("Frames counter (%d) :\n\t%s:[%d]\n\t%s:[%d]\n\
                     \r\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\
                     \r\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\t%s:[%d]\n\
@@ -196,9 +201,13 @@
                 tux_hw_status_id_to_str(15), tux_hw_status_header_counter[15]);
             break;
         }
+    }
     
+    // use memset instead ?
     for (i = 0; i < 16; i++)
+    {
         tux_hw_status_header_counter[i] = 0;
+    }
 }
 
 /**
@@ -210,11 +219,17 @@
     int ret = 0;
     
     if (hw_status_table.ports.portb.Byte != frame[1])
+    {
         ret = FRAME_HEADER_PORTS;
+    }
     if (hw_status_table.ports.portc.Byte != frame[2])
+    {
         ret = FRAME_HEADER_PORTS;
+    }
     if (hw_status_table.ports.portd.Byte != frame[3])
+    {
         ret = FRAME_HEADER_PORTS;
+    }
     
     hw_status_table.ports.portb.Byte = frame[1];
     hw_status_table.ports.portc.Byte = frame[2];
@@ -232,11 +247,17 @@
     int ret = 0;
     
     if (hw_status_table.sensors1.sensors.Byte != frame[1])
+    {
         ret = FRAME_HEADER_SENSORS1;
+    }
     if (hw_status_table.sensors1.play_internal_sound != frame[2])
+    {
         ret = FRAME_HEADER_SENSORS1;
+    }
     if (hw_status_table.sensors1.play_general_sound != frame[3])
+    {
         ret = FRAME_HEADER_SENSORS1;
+    }
     
     hw_status_table.sensors1.sensors.Byte = frame[1];
     hw_status_table.sensors1.play_internal_sound = frame[2];
@@ -254,11 +275,17 @@
     int ret = 0;
     
     if (hw_status_table.light.high_level != frame[1])
+    {
         ret = FRAME_HEADER_LIGHT;
+    }
     if (hw_status_table.light.low_level != frame[2])
+    {
         ret = FRAME_HEADER_LIGHT;
+    }
     if (hw_status_table.light.mode != frame[3])
+    {
         ret = FRAME_HEADER_LIGHT;
+    }
     
     hw_status_table.light.high_level = frame[1];
     hw_status_table.light.low_level = frame[2];
@@ -276,11 +303,17 @@
     int ret = 0;
     
     if (hw_status_table.position1.eyes_remaining_mvm != frame[1])
+    {
         ret = FRAME_HEADER_POSITION1;
+    }
     if (hw_status_table.position1.mouth_remaining_mvm != frame[2])
+    {
         ret = FRAME_HEADER_POSITION1;
+    }
     if (hw_status_table.position1.wings_remaining_mvm != frame[3])
+    {
         ret = FRAME_HEADER_POSITION1;
+    }
     
     hw_status_table.position1.eyes_remaining_mvm = frame[1];
     hw_status_table.position1.mouth_remaining_mvm = frame[2];
@@ -298,9 +331,13 @@
     int ret = 0;
     
     if (hw_status_table.position2.spin_remaining_mvm != frame[1])
+    {
         ret = FRAME_HEADER_POSITION2;
+    }
     if (hw_status_table.position2.wings_down != frame[2])
+    {
         ret = FRAME_HEADER_POSITION2;
+    }
     
     hw_status_table.position2.spin_remaining_mvm = frame[1];
     hw_status_table.position2.wings_down = frame[2];
@@ -317,7 +354,9 @@
     int ret = 0;
     
     if (hw_status_table.ir.rc5_code.Byte != frame[1])
+    {
         ret = FRAME_HEADER_IR;
+    }
     
     hw_status_table.ir.rc5_code.Byte = frame[1];
     
@@ -333,9 +372,13 @@
     int ret = 0;
     
     if (hw_status_table.id.msb_number != frame[1])
+    {
         ret = FRAME_HEADER_ID;
+    }
     if (hw_status_table.id.lsb_number != frame[2])
+    {
         ret = FRAME_HEADER_ID;
+    }
     
     hw_status_table.id.msb_number = frame[1];
     hw_status_table.id.lsb_number = frame[2];
@@ -352,11 +395,17 @@
     int ret = 0;
     
     if (hw_status_table.battery.high_level != frame[1])
+    {
         ret = FRAME_HEADER_BATTERY;
+    }
     if (hw_status_table.battery.low_level != frame[2])
+    {
         ret = FRAME_HEADER_BATTERY;
+    }
     if (hw_status_table.battery.motors_state != frame[3])
+    {
         ret = FRAME_HEADER_BATTERY;
+    }
     
     hw_status_table.battery.high_level = frame[1];
     hw_status_table.battery.low_level = frame[2];
@@ -374,11 +423,17 @@
     int ret = 0;
     
     if (hw_status_table.version.cm.Byte != frame[1])
+    {
         ret = FRAME_HEADER_VERSION;
+    }
     if (hw_status_table.version.minor != frame[2])
+    {
         ret = FRAME_HEADER_VERSION;
+    }
     if (hw_status_table.version.update != frame[3])
+    {
         ret = FRAME_HEADER_VERSION;
+    }
     
     hw_status_table.version.cm.Byte = frame[1];
     hw_status_table.version.minor = frame[2];
@@ -405,11 +460,17 @@
     int ret = 0;
     
     if (hw_status_table.revision.lsb_number != frame[1])
+    {
         ret = FRAME_HEADER_REVISION;
+    }
     if (hw_status_table.revision.msb_number != frame[2])
+    {
         ret = FRAME_HEADER_REVISION;
+    }
     if (hw_status_table.revision.release_type.Byte != frame[3])
+    {
         ret = FRAME_HEADER_REVISION;
+    }
     
     hw_status_table.revision.lsb_number = frame[1];
     hw_status_table.revision.msb_number = frame[2];
@@ -436,11 +497,17 @@
     int ret = 0;
     
     if (hw_status_table.author.lsb_id != frame[1])
+    {
         ret = FRAME_HEADER_AUTHOR;
+    }
     if (hw_status_table.author.msb_id != frame[2])
+    {
         ret = FRAME_HEADER_AUTHOR;
+    }
     if (hw_status_table.author.variation_number != frame[3])
+    {
         ret = FRAME_HEADER_AUTHOR;
+    }
     
     hw_status_table.author.lsb_id = frame[1];
     hw_status_table.author.msb_id = frame[2];
@@ -467,11 +534,17 @@
     int ret = 0;
     
     if (hw_status_table.audio.sound_track_played != frame[1])
+    {
         ret = FRAME_HEADER_AUDIO;
+    }
     if (hw_status_table.audio.programming_steps.Byte != frame[2])
+    {
         ret = FRAME_HEADER_AUDIO;
+    }
     if (hw_status_table.audio.programmed_sound_track != frame[3])
+    {
         ret = FRAME_HEADER_AUDIO;
+    }
 
     hw_status_table.audio.sound_track_played = frame[1];
     hw_status_table.audio.programming_steps.Byte = frame[2];
@@ -489,9 +562,13 @@
     int ret = 0;
     
     if (hw_status_table.sound_var.number_of_sounds != frame[1])
+    {
         ret = FRAME_HEADER_SOUND_VAR;
+    }
     if (hw_status_table.sound_var.flash_usage != frame[2])
+    {
         ret = FRAME_HEADER_SOUND_VAR;
+    }
 
     hw_status_table.sound_var.number_of_sounds = frame[1];
     hw_status_table.sound_var.flash_usage = frame[2];
@@ -508,9 +585,13 @@
     int ret = 0;
     
     if (hw_status_table.flash_prog.current_state != frame[1])
+    {
         ret = FRAME_HEADER_FLASH_PROG;
+    }
     if (hw_status_table.flash_prog.last_sound_size != frame[2])
+    {
         ret = FRAME_HEADER_FLASH_PROG;
+    }
     
     hw_status_table.flash_prog.current_state = frame[1];
     hw_status_table.flash_prog.last_sound_size = frame[2];
@@ -527,11 +608,17 @@
     int ret = 0;
     
     if (hw_status_table.led.left_led_intensity != frame[1])
+    {
         ret = FRAME_HEADER_LED;
+    }
     if (hw_status_table.led.right_led_intensity != frame[2])
+    {
         ret = FRAME_HEADER_LED;
+    }
     if (hw_status_table.led.effect_status.Byte != frame[3])
+    {
         ret = FRAME_HEADER_LED;
+    }
     
     hw_status_table.led.left_led_intensity = frame[1];
     hw_status_table.led.right_led_intensity = frame[2];
@@ -549,11 +636,17 @@
     int ret = 0;
     
     if (hw_status_table.pong.pongs_pending_number != frame[1])
+    {
         ret = FRAME_HEADER_PONG;
+    }
     if (hw_status_table.pong.pongs_lost_by_i2c_number != frame[2])
+    {
         ret = FRAME_HEADER_PONG;
+    }
     if (hw_status_table.pong.pongs_lost_by_rf_number != frame[3])
+    {
         ret = FRAME_HEADER_PONG;
+    }
     
     hw_status_table.pong.pongs_pending_number = frame[1];
     hw_status_table.pong.pongs_lost_by_i2c_number = frame[2];