[tuxdroid-svn] r283 - svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment va
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r283 - 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 daemon/trunk/libs
|
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-22 17:48:42
|
Author: svnlook: warning: cannot set LC_CTYPE locale
Date: svnlook: warning: environment variable LANG is EN
New Revision: 283
Modified:
daemon/trunk/libs/USBDaemon_command_tux.c
daemon/trunk/libs/USBDaemon_command_tux.h
daemon/trunk/libs/USBDaemon_globals.h
daemon/trunk/libs/USBDaemon_pidfile.c
daemon/trunk/libs/USBDaemon_pidfile.h
daemon/trunk/libs/USBDaemon_status_table.c
daemon/trunk/libs/USBDaemon_status_table.h
daemon/trunk/libs/USBDaemon_tcp_server.c
daemon/trunk/libs/USBDaemon_tcp_server.h
daemon/trunk/libs/USBDaemon_usb_enum.c
daemon/trunk/libs/USBDaemon_usb_enum.h
daemon/trunk/libs/USBDaemon_usb_readWrite.c
daemon/trunk/libs/USBDaemon_usb_readWrite.h
daemon/trunk/main.c
Log:
doegox
2007-04-22 19:47:57 +0200 (Sun, 22 Apr 2007)
152
Reindent with:
indent -nut -i4 -bad -bap -bbb -sob -sc -bl -bli0 -cli0 -cbi4 -nce -ncdw -ss -bls -npsl -ncs -npcs -nprs -saf -sai -saw -nbfda -nhnl -l80
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-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_command_tux.c 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,6 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
@@ -29,24 +31,25 @@
#include "../tuxdefs/commands.h"
#include "USBDaemon_tcp_server.h"
#include "USBDaemon_pidfile.h"
+
/*_____________________ F U N C T I O N S __________________________________*/
/************************************************************************** */
+
/* COMMANDS FROM CLIENTS DISPATCHER */
+
/************************************************************************** */
-void commands_dispatcher(
- unsigned char client_id, /* Client source */
- tcp_frame_t src_frame) /* Source frame */
+void commands_dispatcher(unsigned char client_id, /* Client source */
+ tcp_frame_t src_frame) /* Source frame */
{
unsigned char ACK_DP; /* daemon processing ack */
unsigned char data[12]; /* data part of source frame */
unsigned char result[12]; /* result data to return */
- tcp_frame_t tcp_frame; /* tcp frame to send */
+ tcp_frame_t tcp_frame; /* tcp frame to send */
tcp_frame_t ack_dp_frame;
int i;
unsigned char no_ack;
-
no_ack = 0;
/* Cut data part of source frame */
for (i = 0; i < sizeof(tcp_frame_t) - 4; i++)
@@ -56,143 +59,144 @@
}
/* Make source header */
- tcp_frame[0] = src_frame[0]; /* return source */
- tcp_frame[1] = src_frame[1]; /* return sub source */
+ tcp_frame[0] = src_frame[0]; /* return source */
+ tcp_frame[1] = src_frame[1]; /* return sub source */
/*--------------------Frame and data processing---------------------- */
- ACK_DP = ACK_DP_OK; /* Init ACK daemon processing */
+ ACK_DP = ACK_DP_OK; /* Init ACK daemon processing */
/* B1----: Destination */
- switch(src_frame[0])
+ switch (src_frame[0])
{
/* To Master Daemon---------------------------------------------- */
- case DEST_MASTER_DAEMON:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
+ case DEST_MASTER_DAEMON:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* To Sub Daemon------------------------------------------------- */
+ case DEST_SUB_DAEMON:
+ /* B3----Data Type */
+ switch (src_frame[2])
+ {
+ /* Data type command */
+ case DATA_TP_CMD:
+ /* B4----Command type */
+ tcp_frame[2] = DATA_TP_ACK_CMD;
+ tcp_frame[3] = src_frame[3];
+ switch (src_frame[3])
+ {
+ /* Command type raw */
+ case SUBDATA_TP_RAW:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* Command type structured */
+ case SUBDATA_TP_STRUCT:
+ sub_daemon_cmd_struct(data, result, client_id);
+ if (result[0] == ACK_CMD_NO_ACK)
+ no_ack = 1;
+ break;
+ /* Unknowed command type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
+ }
break;
- /* To Sub Daemon------------------------------------------------- */
- case DEST_SUB_DAEMON:
- /* B3----Data Type */
- switch(src_frame[2])
+ /* Data type request */
+ case DATA_TP_REQ:
+ tcp_frame[2] = DATA_TP_RSP;
+ tcp_frame[3] = src_frame[3];
+ /* B4----Request type */
+ switch (src_frame[3])
{
- /* Data type command */
- case DATA_TP_CMD:
- /* B4----Command type */
- tcp_frame[2] = DATA_TP_ACK_CMD;
- tcp_frame[3] = src_frame[3];
- switch(src_frame[3])
- {
- /* Command type raw */
- case SUBDATA_TP_RAW:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
- break;
- /* Command type structured */
- case SUBDATA_TP_STRUCT:
- sub_daemon_cmd_struct(data, result, client_id);
- if(result[0] == ACK_CMD_NO_ACK) no_ack = 1;
- break;
- /* Unknowed command type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Data type request */
- case DATA_TP_REQ:
- tcp_frame[2] = DATA_TP_RSP;
- tcp_frame[3] = src_frame[3];
- /* B4----Request type */
- switch(src_frame[3])
- {
- /* Request type status */
- case SUBDATA_TP_STATUS:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
- break;
- /* Request type information */
- case SUBDATA_TP_INFO:
- sub_daemon_req_info(data, result, client_id);
- break;
- /* Unknowed request type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Unknowed data type */
- default:
- ACK_DP = ACK_DP_UKN_DATA_TP;
- break;
+ /* Request type status */
+ case SUBDATA_TP_STATUS:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* Request type information */
+ case SUBDATA_TP_INFO:
+ sub_daemon_req_info(data, result, client_id);
+ break;
+ /* Unknowed request type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
}
break;
- /* To Tux-------------------------------------------------------- */
- case DEST_TUX:
- /* TODO sub destinations */
- /* B3----Data Type */
- switch(src_frame[2])
+ /* Unknowed data type */
+ default:
+ ACK_DP = ACK_DP_UKN_DATA_TP;
+ break;
+ }
+ break;
+ /* To Tux-------------------------------------------------------- */
+ case DEST_TUX:
+ /* TODO sub destinations */
+ /* B3----Data Type */
+ switch (src_frame[2])
+ {
+ /* Data type command */
+ case DATA_TP_CMD:
+ tcp_frame[2] = DATA_TP_ACK_CMD;
+ tcp_frame[3] = src_frame[3];
+ /* B4----Command type */
+ switch (src_frame[3])
{
- /* Data type command */
- case DATA_TP_CMD:
- tcp_frame[2] = DATA_TP_ACK_CMD;
- tcp_frame[3] = src_frame[3];
- /* B4----Command type */
- switch(src_frame[3])
- {
- /* Command type raw */
- case SUBDATA_TP_RAW:
- tux_cmd_raw(data, result);
- break;
- /* Command type structured */
- case SUBDATA_TP_STRUCT:
- tux_cmd_struct(data, result);
- break;
- /* Unknowed command type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Data type request */
- case DATA_TP_REQ:
- tcp_frame[2] = DATA_TP_RSP;
- tcp_frame[3] = src_frame[3];
- /* B4----Request type */
- switch(src_frame[3])
- {
- /* Request type status */
- case SUBDATA_TP_STATUS:
- tux_req_status(data, result);
- break;
- /* Request type information */
- case SUBDATA_TP_INFO:
- tux_req_info(data, result);
- break;
- /* Unknowed request type */
- default:
- ACK_DP = ACK_DP_UKN_SUBDATA_TP;
- break;
- }
- break;
- /* Unknowed data type */
- default:
- ACK_DP = ACK_DP_UKN_DATA_TP;
- break;
+ /* Command type raw */
+ case SUBDATA_TP_RAW:
+ tux_cmd_raw(data, result);
+ break;
+ /* Command type structured */
+ case SUBDATA_TP_STRUCT:
+ tux_cmd_struct(data, result);
+ break;
+ /* Unknowed command type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
}
break;
- /* To Resource--------------------------------------------------- */
- case DEST_RESOURCE:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
+ /* Data type request */
+ case DATA_TP_REQ:
+ tcp_frame[2] = DATA_TP_RSP;
+ tcp_frame[3] = src_frame[3];
+ /* B4----Request type */
+ switch (src_frame[3])
+ {
+ /* Request type status */
+ case SUBDATA_TP_STATUS:
+ tux_req_status(data, result);
+ break;
+ /* Request type information */
+ case SUBDATA_TP_INFO:
+ tux_req_info(data, result);
+ break;
+ /* Unknowed request type */
+ default:
+ ACK_DP = ACK_DP_UKN_SUBDATA_TP;
+ break;
+ }
break;
- /* To Client----------------------------------------------------- */
- case DEST_CLIENT:
- /* Not implemented */
- ACK_DP = ACK_DP_NI;
- break;
- /* Unknowed destination------------------------------------------ */
+ /* Unknowed data type */
default:
- ACK_DP = ACK_DP_UKN_DEST;
+ ACK_DP = ACK_DP_UKN_DATA_TP;
break;
+ }
+ break;
+ /* To Resource--------------------------------------------------- */
+ case DEST_RESOURCE:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* To Client----------------------------------------------------- */
+ case DEST_CLIENT:
+ /* Not implemented */
+ ACK_DP = ACK_DP_NI;
+ break;
+ /* Unknowed destination------------------------------------------ */
+ default:
+ ACK_DP = ACK_DP_UKN_DEST;
+ break;
}
/* Paste result treatement into tcp frame */
@@ -213,7 +217,7 @@
{
tcp_server_send_raw_to_client(client_id, ack_dp_frame);
/* Send tcp frame to client */
- if(ACK_DP == ACK_DP_OK)
+ if (ACK_DP == ACK_DP_OK)
{
tcp_server_send_raw_to_client(client_id, tcp_frame);
}
@@ -221,401 +225,567 @@
}
/************************************************************************ */
+
/* FOR Sub daemon */
+
/************************************************************************ */
/******************************************************************** */
+
/* sub_daemon_cmd_struct() */
+
/******************************************************************** */
void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[],
int id_client)
{
switch (data[0])
{
- case SUB_D_CMD_STRUC_DISCONNECT_CLIENT:
- pthread_mutex_lock(&tcp_mutex);
- /* Byte 2 equal id client to disconnect */
- if (tcp_clients_handle[data[1]] >= 0)
- {
- tcp_remove_client(data[1]);
- result[0] = ACK_CMD_OK;
- }
- else
- { /* Bad id client */
- result[0] = ACK_CMD_KO;
- }
- pthread_mutex_unlock(&tcp_mutex);
- break;
- case SUB_D_CMD_STRUC_DISCONNECT_CLIENT_ME:
- pthread_mutex_lock(&tcp_mutex);
- tcp_remove_client(id_client);
- result[0] = ACK_CMD_NO_ACK;
- pthread_mutex_unlock(&tcp_mutex);
- break;
- case SUB_D_CMD_STRUC_KILL_DAEMON:
- printf("WARNING : daemon killed by user\n");
- send_daemon_disconnected();
+ case SUB_D_CMD_STRUC_DISCONNECT_CLIENT:
+ pthread_mutex_lock(&tcp_mutex);
+ /* Byte 2 equal id client to disconnect */
+ if (tcp_clients_handle[data[1]] >= 0)
+ {
+ tcp_remove_client(data[1]);
result[0] = ACK_CMD_OK;
- terminate(0);
- break;
- case SUB_D_CMD_STRUC_DEFINE_CLIENT_NAME:
- {
- int i;
- for (i = 0; i < 11; i++)
- tcp_clients_name[id_client][i] = data[i + 1];
- result[0] = ACK_CMD_OK;
- printf("Name of client %d is %s\n", id_client,
- tcp_clients_name[id_client]);
- }
- break;
+ }
+ else
+ { /* Bad id client */
+ result[0] = ACK_CMD_KO;
+ }
+ pthread_mutex_unlock(&tcp_mutex);
+ break;
+ case SUB_D_CMD_STRUC_DISCONNECT_CLIENT_ME:
+ pthread_mutex_lock(&tcp_mutex);
+ tcp_remove_client(id_client);
+ result[0] = ACK_CMD_NO_ACK;
+ pthread_mutex_unlock(&tcp_mutex);
+ break;
+ case SUB_D_CMD_STRUC_KILL_DAEMON:
+ printf("WARNING : daemon killed by user\n");
+ send_daemon_disconnected();
+ result[0] = ACK_CMD_OK;
+ terminate(0);
+ break;
+ case SUB_D_CMD_STRUC_DEFINE_CLIENT_NAME:
+ {
+ int i;
+
+ for (i = 0; i < 11; i++)
+ tcp_clients_name[id_client][i] = data[i + 1];
+ result[0] = ACK_CMD_OK;
+ printf("Name of client %d is %s\n", id_client,
+ tcp_clients_name[id_client]);
+ }
+ break;
}
}
/************************************************************************ */
+
/* sub_daemon_req_info() */
+
/************************************************************************ */
-void sub_daemon_req_info(
- unsigned char data[],
- unsigned char result[],
- int id_client
- )
+void sub_daemon_req_info(unsigned char data[], unsigned char result[],
+ int id_client)
{
unsigned char i;
result[0] = data[0];
- switch(data[0])
+ switch (data[0])
{
- case SUB_D_REQ_INFO_VERSION:
- result[1] = version.major;
- result[2] = version.minor;
- result[3] = version.release;
- break;
- case SUB_D_REQ_INFO_CLIENT_COUNT:
- result[1] = tcp_clients_count;
- break;
- case SUB_D_REQ_INFO_CLIENT_NAME:
- for(i = 0; i < 11; i++)
- result[i + 1] = tcp_clients_name[data[1]][i];
- break;
- case SUB_D_REQ_INFO_MY_CLIENT_ID:
- result[1] = id_client;
- break;
- case SUB_D_REQ_INFO_PID:
- result[1] = (daemon_pid & 0xFF00)>>8;
- result[2] = (daemon_pid & 0x00FF);
- break;
+ case SUB_D_REQ_INFO_VERSION:
+ result[1] = version.major;
+ result[2] = version.minor;
+ result[3] = version.release;
+ break;
+ case SUB_D_REQ_INFO_CLIENT_COUNT:
+ result[1] = tcp_clients_count;
+ break;
+ case SUB_D_REQ_INFO_CLIENT_NAME:
+ for (i = 0; i < 11; i++)
+ result[i + 1] = tcp_clients_name[data[1]][i];
+ break;
+ case SUB_D_REQ_INFO_MY_CLIENT_ID:
+ result[1] = id_client;
+ break;
+ case SUB_D_REQ_INFO_PID:
+ result[1] = (daemon_pid & 0xFF00) >> 8;
+ result[2] = (daemon_pid & 0x00FF);
+ break;
}
}
/************************************************************************** */
+
/* FOR Tux droid */
+
/************************************************************************** */
/************************************************************************ */
+
/* tux_cmd_raw() */
+
/************************************************************************ */
-void tux_cmd_raw(
- unsigned char data[],
- unsigned char result[]
- )
+void tux_cmd_raw(unsigned char data[], unsigned char result[])
{
unsigned char usb_send[5];
unsigned char i;
usb_send[0] = 0;
- for(i = 1; i < 5; i++)
+ for (i = 1; i < 5; i++)
usb_send[i] = data[i - 1];
result[0] = usb_write_TuxDroid(usb_send);
}
/************************************************************************ */
+
/* tux_cmd_struct() */
+
/************************************************************************ */
-void tux_cmd_struct(
- unsigned char data[],
- unsigned char result[]
- )
+void tux_cmd_struct(unsigned char data[], unsigned char result[])
{
unsigned char ACK;
/* Command type */
- switch(data[0])
+ switch (data[0])
{
- case TUX_CMD_STRUCT_EYES:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(BLINK_EYES_CMD, data[2], 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_EYES_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_EYES:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(BLINK_EYES_CMD, data[2], 0, 0);
break;
- case TUX_CMD_STRUCT_MOUTH:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(MOVE_MOUTH_CMD, data[2], 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_MOUTH_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_EYES_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_WINGS:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(WAVE_WINGS_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_WINGS_CMD, 0, 0, 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_MOUTH:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(MOVE_MOUTH_CMD, data[2], 0, 0);
break;
- case TUX_CMD_STRUCT_SPINL:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(SPIN_LEFT_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_MOUTH_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_SPINR:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(SPIN_RIGHT_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_WINGS:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(WAVE_WINGS_CMD, data[2], data[3], 0);
break;
- case TUX_CMD_STRUCT_IR:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(TURN_IR_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(TURN_IR_OFF_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_SEND:
- ACK = send_usb_tux_cmd(IR_SEND_RC5_CMD, data[2], data[3], 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_WINGS_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_LEDS:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(LED_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(LED_OFF_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_BLINK:
- ACK = send_usb_tux_cmd(LED_BLINK_CMD, data[2], data[3], 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_SPINL:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(SPIN_LEFT_CMD, data[2], data[3], 0);
break;
- case TUX_CMD_STRUCT_LEDL:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(LED_L_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(LED_L_OFF_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_LEDR:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(LED_R_ON_CMD, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(LED_R_OFF_CMD, 0, 0, 0);
- break;
- }
+ }
+ break;
+ case TUX_CMD_STRUCT_SPINR:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(SPIN_RIGHT_CMD, data[2], data[3], 0);
break;
- case TUX_CMD_STRUCT_SOUND:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_PLAY:
- ACK = send_usb_tux_cmd(PLAY_SOUND_CMD, data[2], data[3], 0);
- break;
- case TUX_CMD_STRUCT_SUB_STORING:
- ACK = send_usb_tux_cmd(STORE_SOUND_CMD, data[2], 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_STORE_INDEX:
- ACK = send_usb_tux_cmd(STORE_INDEX_CMD, data[2], data[3], data[4]);
- break;
- case TUX_CMD_STRUCT_SUB_TEST:
- ACK = send_usb_tux_cmd(TEST_SOUND_CMD, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(STOP_SPIN_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_PING:
- pong_received = 0;
- ACK = send_usb_tux_cmd(PING_CMD, data[2], 0, 0);
+ }
+ break;
+ case TUX_CMD_STRUCT_IR:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(TURN_IR_ON_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_SLEEP:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_ON:
- ACK = send_usb_tux_cmd(0x20, 0, 0, 0);
- break;
- case TUX_CMD_STRUCT_SUB_OFF:
- ACK = send_usb_tux_cmd(0x21, 0, 0, 0);
- break;
- }
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(TURN_IR_OFF_CMD, 0, 0, 0);
break;
- case TUX_CMD_STRUCT_AUDIO_CHANNEL:
- switch(data[1])
- {
- case TUX_CMD_STRUCT_SUB_CH_GENERAL:
- if(current_audio_channel != 0)
- {
- ACK = send_usb_dongle_cmd(0x02, 0, 0, 0);
- current_audio_channel = 0;
- }
- else
- ACK = ACK_CMD_OK;
- break;
- case TUX_CMD_STRUCT_SUB_CH_TTS:
- if(current_audio_channel != 1)
- {
- ACK = send_usb_dongle_cmd(0x02, 1, 0, 0);
- current_audio_channel = 1;
- }
- else
- ACK = ACK_CMD_OK;
- break;
- }
+ case TUX_CMD_STRUCT_SUB_SEND:
+ ACK = send_usb_tux_cmd(IR_SEND_RC5_CMD, data[2], data[3], 0);
break;
- }
- result[0] = ACK;
-}
-
-/************************************************************************ */
-/* tux_req_status() */
-/************************************************************************ */
-void tux_req_status(
- unsigned char data[],
- unsigned char result[]
- )
-{
- result[0] = data[0];
- switch(data[0])
- {
- case DATA_STATUS_WINGS_MOTOR_BACKWARD:
- if (portb.bits.PB0){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_LEDS:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(LED_ON_CMD, 0, 0, 0);
break;
- case DATA_STATUS_SPIN_MOTOR_BACKWARD:
- if (portb.bits.PB1){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(LED_OFF_CMD, 0, 0, 0);
break;
- case DATA_STATUS_SPIN_MOTOR_FORWARD:
- if (portb.bits.PB2){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_BLINK:
+ ACK = send_usb_tux_cmd(LED_BLINK_CMD, data[2], data[3], 0);
break;
- case DATA_STATUS_MOUTH_OPEN_POSITION:
- if (portb.bits.PB3){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_LEDL:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(LED_L_ON_CMD, 0, 0, 0);
break;
- case DATA_STATUS_MOUTH_CLOSED_POSITION:
- if (portb.bits.PB4){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(LED_L_OFF_CMD, 0, 0, 0);
break;
- case DATA_STATUS_HEAD_PUSH_POSITION:
- if (portb.bits.PB5){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_LEDR:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(LED_R_ON_CMD, 0, 0, 0);
break;
- case DATA_STATUS_CHARGER_INHIBIT_SIGNAL:
- result[0] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL;
- if (portb.bits.PB6){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(LED_R_OFF_CMD, 0, 0, 0);
break;
- case DATA_STATUS_WINGS_POSITION_SWITCH:
- if (portc.bits.PB0){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_SOUND:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_PLAY:
+ ACK = send_usb_tux_cmd(PLAY_SOUND_CMD, data[2], data[3], 0);
break;
- case DATA_STATUS_MOTOR_FOR_WINGS:
- if (portc.bits.PB1){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_STORING:
+ ACK = send_usb_tux_cmd(STORE_SOUND_CMD, data[2], 0, 0);
break;
- case DATA_STATUS_LEFT_BLUE_LED:
- if (portc.bits.PB2){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_STORE_INDEX:
+ ACK = send_usb_tux_cmd(STORE_INDEX_CMD, data[2], data[3], data[4]);
break;
- case DATA_STATUS_HEAD_MOTOR_FOR_MOUTH:
- if (portd.bits.PB1){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_TEST:
+ ACK = send_usb_tux_cmd(TEST_SOUND_CMD, 0, 0, 0);
break;
- case DATA_STATUS_HEAD_MOTOR_FOR_EYES:
- result[0] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
- if (portd.bits.PB0){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_PING:
+ pong_received = 0;
+ ACK = send_usb_tux_cmd(PING_CMD, data[2], 0, 0);
+ break;
+ case TUX_CMD_STRUCT_SLEEP:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_ON:
+ ACK = send_usb_tux_cmd(0x20, 0, 0, 0);
break;
- case DATA_STATUS_SPIN_POSITION_SWITCH:
- if (portd.bits.PB3){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_OFF:
+ ACK = send_usb_tux_cmd(0x21, 0, 0, 0);
break;
- case DATA_STATUS_WINGS_MOTOR_FORWARD:
- result[0] = DATA_STATUS_WINGS_MOTOR_FORWARD;
- if (portd.bits.PB4){result[1] = 1;}else{result[1] = 0;}
+ }
+ break;
+ case TUX_CMD_STRUCT_AUDIO_CHANNEL:
+ switch (data[1])
+ {
+ case TUX_CMD_STRUCT_SUB_CH_GENERAL:
+ if (current_audio_channel != 0)
+ {
+ ACK = send_usb_dongle_cmd(0x02, 0, 0, 0);
+ current_audio_channel = 0;
+ }
+ else
+ ACK = ACK_CMD_OK;
break;
- case DATA_STATUS_IR_LED:
- if (portd.bits.PB5){result[1] = 1;}else{result[1] = 0;}
+ case TUX_CMD_STRUCT_SUB_CH_TTS:
+ if (current_audio_channel != 1)
+ {
+ ACK = send_usb_dongle_cmd(0x02, 1, 0, 0);
+ current_audio_channel = 1;
+ }
+ else
+ ACK = ACK_CMD_OK;
break;
- case DATA_STATUS_EYES_OPEN_POSITION_SWITCH:
- if (portd.bits.PB6){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_EYES_CLOSED_POSITION_SWITCH:
- if (portd.bits.PB7){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_LEFT_WING_PUSH:
- if (sensors1.bits.PB0){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_RIGHT_WING_PUSH:
- if (sensors1.bits.PB1){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_POWER_PLUG_SWITCH:
- if (sensors1.bits.PB2){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_HEAD_PUSH_SWITCH:
- if (sensors1.bits.PB3){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_CHARGER_LED_STATUS:
- if (sensors1.bits.PB4){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_MUTE_STATUS:
- if (sensors1.bits.PB7){result[1] = 1;}else{result[1] = 0;}
- break;
- case DATA_STATUS_LIGHT_LEVEL:
- result[1] = sensors2.level_light_high.Byte;
- result[2] = sensors2.level_light_low.Byte;
- result[3] = sensors2.light_mode.Byte;
- break;
- case DATA_STATUS_EYES_POSITION_COUNTER:
- result[1] = position1.eyes_position.Byte;
- break;
- case DATA_STATUS_MOUTH_POSITION_COUNTER:
- result[1] = position1.mouth_position.Byte;
- break;
- case DATA_STATUS_WINGS_POSITION_COUNTER:
- result[1] = position1.wings_position.Byte;
- break;
- case DATA_STATUS_SPIN_POSITION_COUNTER:
- result[1] = position2.Byte;
- break;
- case DATA_STATUS_RF_CONNECTED:
- result[1] = RF_status;
- break;
- case DATA_STATUS_SOUND_COUNT:
- result[1] = sound_flash_count;
- break;
+ }
+ break;
}
+ result[0] = ACK;
}
/************************************************************************ */
+
+/* tux_req_status() */
+
+/************************************************************************ */
+void tux_req_status(unsigned char data[], unsigned char result[])
+{
+ result[0] = data[0];
+ switch (data[0])
+ {
+ case DATA_STATUS_WINGS_MOTOR_BACKWARD:
+ if (portb.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_SPIN_MOTOR_BACKWARD:
+ if (portb.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_SPIN_MOTOR_FORWARD:
+ if (portb.bits.PB2)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MOUTH_OPEN_POSITION:
+ if (portb.bits.PB3)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MOUTH_CLOSED_POSITION:
+ if (portb.bits.PB4)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_PUSH_POSITION:
+ if (portb.bits.PB5)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_CHARGER_INHIBIT_SIGNAL:
+ result[0] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL;
+ if (portb.bits.PB6)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_WINGS_POSITION_SWITCH:
+ if (portc.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MOTOR_FOR_WINGS:
+ if (portc.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_LEFT_BLUE_LED:
+ if (portc.bits.PB2)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_MOTOR_FOR_MOUTH:
+ if (portd.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_MOTOR_FOR_EYES:
+ result[0] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
+ if (portd.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_SPIN_POSITION_SWITCH:
+ if (portd.bits.PB3)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_WINGS_MOTOR_FORWARD:
+ result[0] = DATA_STATUS_WINGS_MOTOR_FORWARD;
+ if (portd.bits.PB4)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_IR_LED:
+ if (portd.bits.PB5)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_EYES_OPEN_POSITION_SWITCH:
+ if (portd.bits.PB6)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_EYES_CLOSED_POSITION_SWITCH:
+ if (portd.bits.PB7)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_LEFT_WING_PUSH:
+ if (sensors1.bits.PB0)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_RIGHT_WING_PUSH:
+ if (sensors1.bits.PB1)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_POWER_PLUG_SWITCH:
+ if (sensors1.bits.PB2)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_HEAD_PUSH_SWITCH:
+ if (sensors1.bits.PB3)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_CHARGER_LED_STATUS:
+ if (sensors1.bits.PB4)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_MUTE_STATUS:
+ if (sensors1.bits.PB7)
+ {
+ result[1] = 1;
+ }
+ else
+ {
+ result[1] = 0;
+ }
+ break;
+ case DATA_STATUS_LIGHT_LEVEL:
+ result[1] = sensors2.level_light_high.Byte;
+ result[2] = sensors2.level_light_low.Byte;
+ result[3] = sensors2.light_mode.Byte;
+ break;
+ case DATA_STATUS_EYES_POSITION_COUNTER:
+ result[1] = position1.eyes_position.Byte;
+ break;
+ case DATA_STATUS_MOUTH_POSITION_COUNTER:
+ result[1] = position1.mouth_position.Byte;
+ break;
+ case DATA_STATUS_WINGS_POSITION_COUNTER:
+ result[1] = position1.wings_position.Byte;
+ break;
+ case DATA_STATUS_SPIN_POSITION_COUNTER:
+ result[1] = position2.Byte;
+ break;
+ case DATA_STATUS_RF_CONNECTED:
+ result[1] = RF_status;
+ break;
+ case DATA_STATUS_SOUND_COUNT:
+ result[1] = sound_flash_count;
+ break;
+ }
+}
+
+/************************************************************************ */
+
/* tux_req_info() */
+
/************************************************************************ */
void tux_req_info(unsigned char data[], unsigned char result[])
{
@@ -638,40 +808,43 @@
}
/************************************************************************** */
+
/* TUX USB */
+
/************************************************************************** */
+
/************************************************************************ */
+
/* send_usb_tuxcmd() */
+
/************************************************************************ */
-unsigned char send_usb_tux_cmd(
- unsigned char cmd,
- unsigned char param1,
- unsigned char param2,
- unsigned char param3
- )
+unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1,
+ unsigned char param2, unsigned char param3)
{
unsigned char usb_frame[TUX_SEND_LENGTH];
usb_frame[0] = 0;
usb_frame[1] = cmd;
- usb_frame[2] = param1; usb_frame[3] = param2; usb_frame[4] = param3;
+ usb_frame[2] = param1;
+ usb_frame[3] = param2;
+ usb_frame[4] = param3;
return usb_write_TuxDroid(usb_frame);
}
/************************************************************************ */
+
/* send_usb_donglecmd() */
+
/************************************************************************ */
-unsigned char send_usb_dongle_cmd(
- unsigned char cmd,
- unsigned char param1,
- unsigned char param2,
- unsigned char param3
- )
+unsigned char send_usb_dongle_cmd(unsigned char cmd, unsigned char param1,
+ unsigned char param2, unsigned char param3)
{
unsigned char usb_frame[TUX_SEND_LENGTH];
usb_frame[0] = 1;
usb_frame[1] = cmd;
- usb_frame[2] = param1; usb_frame[3] = param2; usb_frame[4] = param3;
+ usb_frame[2] = param1;
+ usb_frame[3] = param2;
+ usb_frame[4] = param3;
return usb_write_TuxDroid(usb_frame);
}
Modified: daemon/trunk/libs/USBDaemon_command_tux.h
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_command_tux.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,22 +18,35 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
+
/*_____________________ D E F I N E S ______________________________________*/
+
/*_____________________ F U N C T I O N S __________________________________*/
+
/* COMMANDS FROM CLIENTS DISPATCHER */
-extern void commands_dispatcher(unsigned char client_id, unsigned char src_frame[16]);
-extern void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[], int id_client);
-extern void sub_daemon_req_info(unsigned char data[], unsigned char result[], int id_client);
+extern void commands_dispatcher(unsigned char client_id,
+ unsigned char src_frame[16]);
+extern void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[],
+ int id_client);
+extern void sub_daemon_req_info(unsigned char data[], unsigned char result[],
+ int id_client);
extern void tux_cmd_raw(unsigned char data[], unsigned char result[]);
extern void tux_cmd_struct(unsigned char data[], unsigned char result[]);
extern void tux_req_status(unsigned char data[], unsigned char result[]);
extern void tux_req_info(unsigned char data[], unsigned char result[]);
+
/* TUX PHYSICAL CHANGES */
-extern unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1, unsigned char param2, unsigned char param3);
-extern unsigned char send_usb_dongle_cmd(unsigned char cmd, unsigned char param1, unsigned char param2, unsigned char param3);
+extern unsigned char send_usb_tux_cmd(unsigned char cmd, unsigned char param1,
+ unsigned char param2,
+ unsigned char param3);
+extern unsigned char send_usb_dongle_cmd(unsigned char cmd,
+ unsigned char param1,
+ unsigned char param2,
+ unsigned char param3);
extern unsigned char send_wave_wings(unsigned char count, unsigned char speed);
extern unsigned char send_stop_wings();
extern unsigned char send_blink_eyes(unsigned char count);
@@ -50,5 +64,7 @@
extern unsigned char send_led_r_off();
extern unsigned char send_play_sound(unsigned char index, unsigned char volume);
extern unsigned char send_store_sound(unsigned char number);
-extern unsigned char send_store_index(unsigned char lower_add, unsigned char middle_add, unsigned char higher_add);
+extern unsigned char send_store_index(unsigned char lower_add,
+ unsigned char middle_add,
+ unsigned char higher_add);
extern unsigned char send_test_sound();
Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_globals.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,11 +18,13 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
#include <usb.h>
#include <pthread.h>
+
/*_____________________ D E F I N E S ______________________________________*/
#define TUX_PID 0xFF07
#define TUX_VID 0x03EB
@@ -35,6 +38,7 @@
#define LIBUSB_DEBUG_LEVEL 1
#define NEWUID 65534
#define NEWGID 65534
+
/*_____________________ G L O B A L S _ V A R I A B L E S _______________________*/
extern unsigned char show_frames;
extern unsigned char show_raw_status;
Modified: daemon/trunk/libs/USBDaemon_pidfile.c
===================================================================
--- daemon/trunk/libs/USBDaemon_pidfile.c 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_pidfile.c 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,6 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id: main.c 242 2007-04-13 08:48:33Z remi $ */
/*_____________________ I N C L U D E S____________________________________ */
@@ -33,9 +35,11 @@
#define PIDFILE "/var/run/tuxdaemon.pid"
/************************************************************************ */
+
/* Functions to deal with the pidfile
Their original version come from the sysklogd package, under GPL
Copyright (c) 1995 Martin Schulze <Mar...@Li...> */
+
/************************************************************************ */
/* read_pid
@@ -95,14 +99,14 @@
int fd;
int pid;
- if ((fd = open(PIDFILE, O_RDWR|O_CREAT|O_TRUNC, 0644)) == -1
+ if ((fd = open(PIDFILE, O_RDWR | O_CREAT | O_TRUNC, 0644)) == -1
|| (f = fdopen(fd, "r+")) == NULL)
{
fprintf(stderr, "Can't open or create %s: %m\n", PIDFILE);
return 0;
}
- if (flock(fd, LOCK_EX|LOCK_NB) == -1)
+ if (flock(fd, LOCK_EX | LOCK_NB) == -1)
{
fscanf(f, "%d", &pid);
fclose(f);
@@ -111,7 +115,7 @@
}
pid = getpid();
- if (!fprintf(f,"%d\n", pid))
+ if (!fprintf(f, "%d\n", pid))
{
fprintf(stderr, "Can't write pid: %m.\n");
close(fd);
@@ -143,7 +147,9 @@
}
/************************************************************************ */
+
/* Terminate */
+
/************************************************************************ */
void terminate(int ret)
{
Modified: daemon/trunk/libs/USBDaemon_pidfile.h
===================================================================
--- daemon/trunk/libs/USBDaemon_pidfile.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_pidfile.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,12 +18,15 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id: main.c 242 2007-04-13 08:48:33Z remi $ */
/************************************************************************ */
+
/* Functions to deal with the pidfile
Their original version come from the sysklogd package, under GPL
Copyright (c) 1995 Martin Schulze <Mar...@Li...> */
+
/************************************************************************ */
/* read_pid
Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_status_table.c 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,6 +18,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA.
*/
+
/* $Id$ */
/*_____________________ I N C L U D E S____________________________________ */
@@ -51,79 +53,83 @@
/*_____________________ F U N C T I O N S __________________________________*/
/************************************************************************ */
+
/* update_raw_status_table() */
+
/************************************************************************ */
void update_raw_status_table(unsigned char new_status[TUX_RECV_LENGTH])
{
switch (new_status[0])
{
- case STATUS_PORTS_CMD:
- if (portb.Byte != new_status[1])
- portb_changed(new_status[1]);
- if (portc.Byte != new_status[2])
- portc_changed(new_status[2]);
- if (portd.Byte != new_status[3])
- portd_changed(new_status[3]);
- break;
+ case STATUS_PORTS_CMD:
+ if (portb.Byte != new_status[1])
+ portb_changed(new_status[1]);
+ if (portc.Byte != new_status[2])
+ portc_changed(new_status[2]);
+ if (portd.Byte != new_status[3])
+ portd_changed(new_status[3]);
+ break;
- case STATUS_SENSORS1_CMD:
- if (sensors1.Byte != new_status[1])
- sensors1_changed(new_status[1]);
- break;
+ case STATUS_SENSORS1_CMD:
+ if (sensors1.Byte != new_status[1])
+ sensors1_changed(new_status[1]);
+ break;
- case STATUS_LIGHT_CMD:
- if (sensors2.level_light_high.Byte != new_status[1]
- || sensors2.level_light_low.Byte != new_status[2])
- sensors2_changed(new_status[1], new_status[2], new_status[3]);
- break;
+ case STATUS_LIGHT_CMD:
+ if (sensors2.level_light_high.Byte != new_status[1]
+ || sensors2.level_light_low.Byte != new_status[2])
+ sensors2_changed(new_status[1], new_status[2], new_status[3]);
+ break;
- case STATUS_POSITION1_CMD:
- if (position1.eyes_position.Byte != new_status[1]
- || position1.mouth_position.Byte != new_status[2]
- || position1.wings_position.Byte != new_status[3])
- position1_changed(new_status[1], new_status[2], new_status[3]);
- break;
+ case STATUS_POSITION1_CMD:
+ if (position1.eyes_position.Byte != new_status[1]
+ || position1.mouth_position.Byte != new_status[2]
+ || position1.wings_position.Byte != new_status[3])
+ position1_changed(new_status[1], new_status[2], new_status[3]);
+ break;
- case STATUS_POSITION2_CMD:
- if (position2.Byte != new_status[1])
- position2_changed(new_status[1]);
- break;
+ case STATUS_POSITION2_CMD:
+ if (position2.Byte != new_status[1])
+ position2_changed(new_status[1]);
+ break;
- case PONG_CMD:
- pong_received++;
- pong_event(new_status[1], pong_received);
- break;
+ case PONG_CMD:
+ pong_received++;
+ pong_event(new_status[1], pong_received);
+ break;
- case VERSION_CMD:
- update_version_table(new_status);
- break;
+ case VERSION_CMD:
+ update_version_table(new_status);
+ break;
- case REVISION_CMD:
- update_revision_table(new_status);
- break;
+ case REVISION_CMD:
+ update_revision_table(new_status);
+ break;
- case AUTHOR_CMD:
- update_author_table(new_status);
- break;
+ case AUTHOR_CMD:
+ update_author_table(new_status);
+ break;
- case SOUND_VAR_CMD:
- update_sound_flash_count(new_status);
- break;
+ case SOUND_VAR_CMD:
+ update_sound_flash_count(new_status);
+ break;
- case STATUS_IR_CMD:
- update_ir(new_status);
- break;
+ case STATUS_IR_CMD:
+ update_ir(new_status);
+ break;
- default:
- if (show_invalid_raw)
- printf("%.2x %.2x %.2x %.2x\n", new_status[0], new_status[1],
- new_status[2], new_status[3]);
- break;
+ default:
+ if (show_invalid_raw)
+ printf("%.2x %.2x %.2x %.2x\n", new_status[0], new_status[1],
+ new_status[2], new_status[3]);
+ break;
}
}
/************************************************************************ */
+
/* update_system_status_table() */
+
/************************************************************************ */
void update_system_status_table(unsigned char new_status[4])
{
@@ -161,50 +167,61 @@
}
/************************************************************************ */
+
/* update_version_table() */
+
/************************************************************************ */
void update_version_table(unsigned char new_status[4])
{
unsigned long tmp;
version_t *hw_ver;
- tmp = (new_status[3] << 24) + (new_status[2] << 16) +
- (new_status[1] << 8) + (new_status[0]);
- hw_ver = (version_t *) &tmp;
+ tmp =
+ (new_status[3] << 24) + (new_status[2] << 16) + (new_status[1] << 8) +
+ (new_status[0]);
+ hw_ver = (version_t *) & tmp;
last_cpu_ver = CPU_VER_MAJ(hw_ver->cpu_ver_maj);
hw_version[last_cpu_ver] = *hw_ver;
}
/************************************************************************ */
+
/* update_revision_table() */
+
/************************************************************************ */
void update_revision_table(unsigned char new_status[4])
{
unsigned long tmp;
revision_t *hw_rev;
- tmp = (new_status[3] << 24) + (new_status[2] << 16) +
- (new_status[1] << 8) + (new_status[0]);
- hw_rev = (revision_t *) &tmp;
+ tmp =
+ (new_status[3] << 24) + (new_status[2] << 16) + (new_status[1] << 8) +
+ (new_status[0]);
+ hw_rev = (revision_t *) & tmp;
hw_revision[last_cpu_ver] = *hw_rev;
}
/************************************************************************ */
+
/* update_author_table() */
+
/************************************************************************ */
void update_author_table(unsigned char new_status[4])
{
unsigned long tmp;
author_t *hw_aut;
- tmp = (new_status[3] << 24) + (new_status[2] << 16) +
- (new_status[1] << 8) + (new_status[0]);
- hw_aut = (author_t *) &tmp;
+ tmp =
+ (new_status[3] << 24) + (new_status[2] << 16) + (new_status[1] << 8) +
+ (new_status[0]);
+ hw_aut = (author_t *) & tmp;
hw_author[last_cpu_ver] = *hw_aut;
}
/************************************************************************ */
+
/* update_sound_flash_count() */
+
/************************************************************************ */
void update_sound_flash_count(unsigned char new_status[4])
{
@@ -212,7 +229,9 @@
}
/************************************************************************ */
+
/* update_ir() */
+
/************************************************************************ */
void update_ir(unsigned char new_status[4])
{
@@ -264,7 +283,9 @@
}
/************************************************************************ */
+
/* pong_event() */
+
/************************************************************************ */
void pong_event(unsigned char pong_number, unsigned char pong_received)
{
@@ -286,7 +307,9 @@
}
/************************************************************************ */
+
/* portb_changed() */
+
/************************************************************************ */
void portb_changed(unsigned char new_value)
{
@@ -409,7 +432,9 @@
}
/************************************************************************ */
+
/* portc_changed() */
+
/************************************************************************ */
void portc_changed(unsigned char new_value)
{
@@ -479,7 +504,9 @@
}
/************************************************************************ */
+
/* portd_changed() */
+
/************************************************************************ */
void portd_changed(unsigned char new_value)
{
@@ -597,7 +624,7 @@
}
/* eyes closed position switch */
- if((portd.Byte & 0x80) != (new_value & 0x80))
+ if ((portd.Byte & 0x80) != (new_value & 0x80))
{
tcp_frame[4] = DATA_STATUS_EYES_CLOSED_POSITION_SWITCH;
if (portd.bits.PB7)
@@ -617,7 +644,9 @@
}
/************************************************************************ */
+
/* sensors1_changed() */
+
/************************************************************************ */
void sensors1_changed(unsigned char new_value)
{
@@ -738,7 +767,9 @@
}
/************************************************************************ */
+
/* sensors2_changed() */
+
/************************************************************************ */
void sensors2_changed(unsigned char new_value_high, unsigned char new_value_low,
unsigned char new_light_mode)
@@ -765,7 +796,9 @@
}
/************************************************************************ */
+
/* position1_changed() */
+
/************************************************************************ */
void position1_changed(unsigned char eyes_position,
unsigned char mouth_position,
@@ -808,7 +841,9 @@
}
/************************************************************************ */
+
/* position2_changed() */
+
/************************************************************************ */
void position2_changed(unsigned char spin_position)
{
@@ -816,7 +851,7 @@
unsigned char i;
for (i = 0; i < sizeof(tcp_frame); i++)
- tcp_frame[i] = '\0';
+ tcp_frame[i] = '\0';
tcp_frame[0] = SOURCE_TUX;
tcp_frame[1] = SS_DEFAULT;
Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h 2007-04-20 14:07:18 UTC (rev 282)
+++ daemon/trunk/libs/USBDaemon_status_table.h 2007-04-22 17:47:57 UTC (rev 283)
@@ -1,3 +1,4 @@
+
/*
* Tux Droid - USB Daemon
* Copyright (C) 2007 C2ME Sa <rem...@c2...>
@@ -17,44 +18...
[truncated message content] |
