[tuxdroid-svn] r222 - svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment variable LANG is EN svnlook: warning: please check that your locale name is correct daemon/trunk/libs firmware/tuxdefs

[svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...>]

Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 222

Modified:
   
   
   
   daemon/trunk/libs/USBDaemon_command_tux.c
   daemon/trunk/libs/USBDaemon_status_table.c
   daemon/trunk/libs/USBDaemon_usb_enum.c
   firmware/tuxdefs/commands.h
Log:
jaguarondi
2007-04-03 20:28:01 +0200 (Tue, 03 Apr 2007)
227
- UPD: I didn't changed the daemon according to the last update made in tuxcore and commands.h for the version numbers, so the build was broken. Now the daemon should be OK though I couldn't test it (no tux on hands right now)


svnlook: warning: cannot set LC_CTYPE locale
svnlook: warning: environment variable LANG is EN
svnlook: warning: please check that your locale name is correct
Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c	2007-04-03 18:25:47 UTC (rev 221)
+++ daemon/trunk/libs/USBDaemon_command_tux.c	2007-04-03 18:28:01 UTC (rev 222)
@@ -628,7 +628,7 @@
     switch(data[0])
     {
         case TUX_REQ_INFO_VERSION:
-            result[1] = hw_version[data[1]].ver_major;
+            result[1] = CPU_VER_MAJ(hw_version[data[1]].cpu_ver_maj);
             result[2] = hw_version[data[1]].ver_minor;
             result[3] = hw_version[data[1]].ver_update;
             result[4] = (unsigned char)((hw_revision[data[1]].revision)&0xFF00)>>8;

Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c	2007-04-03 18:25:47 UTC (rev 221)
+++ daemon/trunk/libs/USBDaemon_status_table.c	2007-04-03 18:28:01 UTC (rev 222)
@@ -142,7 +142,7 @@
     tmp = (new_status[3] << 24) + (new_status[2] << 16) +
         (new_status[1] << 8) + (new_status[0]);
     hw_ver = (version_t *) &tmp;
-    last_cpu_ver = hw_ver->cpu_nbr;
+    last_cpu_ver = CPU_VER_MAJ(hw_ver->cpu_ver_maj);
     hw_version[last_cpu_ver] = *hw_ver;
 }
 

Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c	2007-04-03 18:25:47 UTC (rev 221)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c	2007-04-03 18:28:01 UTC (rev 222)
@@ -79,7 +79,7 @@
     error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
     if (error != 0)
     {
-        usb_detach_kernel_driver_np(tux_hdl, TUX_INTERFACE);
+        /*usb_detach_kernel_driver_np(tux_hdl, TUX_INTERFACE);*/
         error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
         if (error != 0)
         {

Modified: firmware/tuxdefs/commands.h
===================================================================
--- firmware/tuxdefs/commands.h	2007-04-03 18:25:47 UTC (rev 221)
+++ firmware/tuxdefs/commands.h	2007-04-03 18:28:01 UTC (rev 222)
@@ -95,11 +95,13 @@
 typedef struct
 {
     uint8_t version_cmd;
-    uint8_t bitfield; /* 3 lower bits are the CPU number, 5 higher bits are the major version number */
+    uint8_t cpu_ver_maj; /* 3 lower bits are the CPU number, 5 higher bits are the major version number */
     uint8_t ver_minor;
     uint8_t ver_update;
 } version_t;
 #define CPU_VER_JOIN(cpu_nbr, ver_major) ((cpu_nbr & 0x7) + (ver_major << 3))
+#define CPU_VER_CPU(cpu_ver_maj) (cpu_ver_maj & 0x07) /* cpu_nbr: 3 lower bits */
+#define CPU_VER_MAJ(cpu_ver_maj) ((cpu_ver_maj & 0xF8) >> 3) /* ver_major: 5 higher bits */
 
 #define REVISION_CMD            0xC9
 typedef struct