[tuxdroid-svn] r153 - in daemon/trunk: . libs
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r153 - in daemon/trunk: . libs
|
From: jaguarondi <c2m...@c2...> - 2007-03-14 12:03:54
|
Author: jaguarondi
Date: 2007-03-14 13:03:36 +0100 (Wed, 14 Mar 2007)
New Revision: 153
Modified:
daemon/trunk/libs/USBDaemon_command_tux.c
daemon/trunk/libs/USBDaemon_command_tux.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_usb_enum.c
daemon/trunk/libs/USBDaemon_usb_readWrite.c
daemon/trunk/main.c
Log:
- CLN: // comments changed to /* */
Modified: daemon/trunk/libs/USBDaemon_command_tux.c
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.c 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_command_tux.c 2007-03-14 12:03:36 UTC (rev 153)
@@ -30,173 +30,173 @@
#include "USBDaemon_tcp_server.h"
/*_____________________ F U N C T I O N S __________________________________*/
-// ***************************************************************************
-// COMMANDS FROM CLIENTS DISPATCHER
-// ***************************************************************************
+/************************************************************************** */
+/* COMMANDS FROM CLIENTS DISPATCHER */
+/************************************************************************** */
void commands_dispatcher(
- unsigned char client_id, // Client source
- unsigned char src_trame[16]) // Source trame
+ unsigned char client_id, /* Client source */
+ unsigned char src_trame[16]) /* Source trame */
{
- unsigned char ACK_DP; // daemon processing ack
- unsigned char data[12]; // data part of source trame
- unsigned char result[12]; // result data to return
- unsigned char tcp_trame[16];// tcp trame to send
+ unsigned char ACK_DP; /* daemon processing ack */
+ unsigned char data[12]; /* data part of source trame */
+ unsigned char result[12]; /* result data to return */
+ unsigned char tcp_trame[16];/* tcp trame to send */
unsigned char ack_dp_trame[16];
unsigned char i;
unsigned char no_ack;
no_ack = 0;
- // Cut data part of source trame
+ /* Cut data part of source trame */
for(i = 0; i < 12; i++)
{
result[i] = 0;
data[i] = src_trame[i + 4];
}
- // Make source header
- tcp_trame[0] = src_trame[0]; // return source
- tcp_trame[1] = src_trame[1]; // return sub source
+ /* Make source header */
+ tcp_trame[0] = src_trame[0]; /* return source */
+ tcp_trame[1] = src_trame[1]; /* return sub source */
- //--------------------Data disencapsulation---------------------- //
- ACK_DP = ACK_DP_OK; // Init ACK daemon processing
- // B1----: Destination
+ /*--------------------Data disencapsulation---------------------- // */
+ ACK_DP = ACK_DP_OK; /* Init ACK daemon processing */
+ /* B1----: Destination */
switch(src_trame[0])
{
- // To Master Daemon----------------------------------------------
+ /* To Master Daemon---------------------------------------------- */
case DEST_MASTER_DAEMON:
- // Not implemented
+ /* Not implemented */
ACK_DP = ACK_DP_NI;
break;
- // To Sub Daemon-------------------------------------------------
+ /* To Sub Daemon------------------------------------------------- */
case DEST_SUB_DAEMON:
- // B3----Data Type
+ /* B3----Data Type */
switch(src_trame[2])
{
- // Data type command
+ /* Data type command */
case DATA_TP_CMD:
- // B4----Command type
+ /* B4----Command type */
tcp_trame[2] = DATA_TP_ACK_CMD;
tcp_trame[3] = src_trame[3];
switch(src_trame[3])
{
- // Command type raw
+ /* Command type raw */
case SUBDATA_TP_RAW:
- // Not implemented
+ /* Not implemented */
ACK_DP = ACK_DP_NI;
break;
- // Command type structured
+ /* 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
+ /* Unknowed command type */
default:
ACK_DP = ACK_DP_UKN_SUBDATA_TP;
break;
}
break;
- // Data type request
+ /* Data type request */
case DATA_TP_REQ:
tcp_trame[2] = DATA_TP_RSP;
tcp_trame[3] = src_trame[3];
- // B4----Request type
+ /* B4----Request type */
switch(src_trame[3])
{
- // Request type status
+ /* Request type status */
case SUBDATA_TP_STATUS:
- // Not implemented
+ /* Not implemented */
ACK_DP = ACK_DP_NI;
break;
- // Request type information
+ /* Request type information */
case SUBDATA_TP_INFO:
sub_daemon_req_info(data, result, client_id);
break;
- // Unknowed request type
+ /* Unknowed request type */
default:
ACK_DP = ACK_DP_UKN_SUBDATA_TP;
break;
}
break;
- // Unknowed data type
+ /* Unknowed data type */
default:
ACK_DP = ACK_DP_UKN_DATA_TP;
break;
}
break;
- // To Tux--------------------------------------------------------
+ /* To Tux-------------------------------------------------------- */
case DEST_TUX:
- // TODO sub destinations
- // B3----Data Type
+ /* TODO sub destinations */
+ /* B3----Data Type */
switch(src_trame[2])
{
- // Data type command
+ /* Data type command */
case DATA_TP_CMD:
tcp_trame[2] = DATA_TP_ACK_CMD;
tcp_trame[3] = src_trame[3];
- // B4----Command type
+ /* B4----Command type */
switch(src_trame[3])
{
- // Command type raw
+ /* Command type raw */
case SUBDATA_TP_RAW:
tux_cmd_raw(data, result);
break;
- // Command type structured
+ /* Command type structured */
case SUBDATA_TP_STRUCT:
tux_cmd_struct(data, result);
break;
- // Unknowed command type
+ /* Unknowed command type */
default:
ACK_DP = ACK_DP_UKN_SUBDATA_TP;
break;
}
break;
- // Data type request
+ /* Data type request */
case DATA_TP_REQ:
tcp_trame[2] = DATA_TP_RSP;
tcp_trame[3] = src_trame[3];
- // B4----Request type
+ /* B4----Request type */
switch(src_trame[3])
{
- // Request type status
+ /* Request type status */
case SUBDATA_TP_STATUS:
tux_req_status(data, result);
break;
- // Request type information
+ /* Request type information */
case SUBDATA_TP_INFO:
tux_req_info(data, result);
break;
- // Unknowed request type
+ /* Unknowed request type */
default:
ACK_DP = ACK_DP_UKN_SUBDATA_TP;
break;
}
break;
- // Unknowed data type
+ /* Unknowed data type */
default:
ACK_DP = ACK_DP_UKN_DATA_TP;
break;
}
break;
- // To Resource---------------------------------------------------
+ /* To Resource--------------------------------------------------- */
case DEST_RESOURCE:
- // Not implemented
+ /* Not implemented */
ACK_DP = ACK_DP_NI;
break;
- // To Client-----------------------------------------------------
+ /* To Client----------------------------------------------------- */
case DEST_CLIENT:
- // Not implemented
+ /* Not implemented */
ACK_DP = ACK_DP_NI;
break;
- // Unknowed destination------------------------------------------
+ /* Unknowed destination------------------------------------------ */
default:
ACK_DP = ACK_DP_UKN_DEST;
break;
}
- // Paste result treatement into tcp trame
+ /* Paste result treatement into tcp trame */
for(i = 0; i < 12; i++)
tcp_trame[i + 4] = result[i];
- // Send daemon processing ack to client
+ /* Send daemon processing ack to client */
for(i = 0; i < 16; i++)ack_dp_trame[i] = 0;
ack_dp_trame[0] = src_trame[0];
ack_dp_trame[1] = src_trame[1];
@@ -206,7 +206,7 @@
if(!no_ack)
{
tcp_server_send_raw_to_client(client_id, ack_dp_trame, 16);
- // Send tcp trame to client
+ /* Send tcp trame to client */
if(ACK_DP == ACK_DP_OK)
{
tcp_server_send_raw_to_client(client_id, tcp_trame, 16);
@@ -214,13 +214,13 @@
}
}
-// ***********************************************************************
-// FOR Sub daemon
-// ***********************************************************************
+/************************************************************************ */
+/* FOR Sub daemon */
+/************************************************************************ */
-// *******************************************************************
-// sub_daemon_cmd_struct()
-// *******************************************************************
+/******************************************************************** */
+/* sub_daemon_cmd_struct() */
+/******************************************************************** */
void sub_daemon_cmd_struct(
unsigned char data[],
unsigned char result[],
@@ -230,11 +230,11 @@
unsigned char i;
int my_client_handle;
- switch(data[0])
+ switch (data[0])
{
case SUB_D_CMD_STRUC_DISCONNECT_CLIENT:
pthread_mutex_lock(&tcp_mutex);
- // Byte 2 equal id client to disconnect
+ /* Byte 2 equal id client to disconnect */
if (tcp_clients_handle[data[1]] != 0)
{
tcp_clients_handle[data[1]] = 0;
@@ -243,7 +243,7 @@
result[0] = ACK_CMD_OK;
}
else
- { // Bad id client
+ { /* Bad id client */
result[0] = ACK_CMD_KO;
}
pthread_mutex_unlock(&tcp_mutex);
@@ -273,9 +273,9 @@
}
}
-// ***********************************************************************
-// sub_daemon_req_info()
-// ***********************************************************************
+/************************************************************************ */
+/* sub_daemon_req_info() */
+/************************************************************************ */
void sub_daemon_req_info(
unsigned char data[],
unsigned char result[],
@@ -309,13 +309,13 @@
}
}
-// ***************************************************************************
-// FOR Tux droid
-// ***************************************************************************
+/************************************************************************** */
+/* FOR Tux droid */
+/************************************************************************** */
-// ***********************************************************************
-// tux_cmd_raw()
-// ***********************************************************************
+/************************************************************************ */
+/* tux_cmd_raw() */
+/************************************************************************ */
void tux_cmd_raw(
unsigned char data[],
unsigned char result[]
@@ -330,9 +330,9 @@
result[0] = usb_write_TuxDroid(usb_send);
}
-// ***********************************************************************
-// tux_cmd_struct()
-// ***********************************************************************
+/************************************************************************ */
+/* tux_cmd_struct() */
+/************************************************************************ */
void tux_cmd_struct(
unsigned char data[],
unsigned char result[]
@@ -340,7 +340,7 @@
{
unsigned char ACK;
- // Command type
+ /* Command type */
switch(data[0])
{
case TUX_CMD_STRUCT_EYES:
@@ -507,9 +507,9 @@
result[0] = ACK;
}
-// ***********************************************************************
-// tux_req_status()
-// ***********************************************************************
+/************************************************************************ */
+/* tux_req_status() */
+/************************************************************************ */
void tux_req_status(
unsigned char data[],
unsigned char result[]
@@ -616,9 +616,9 @@
}
}
-// ***********************************************************************
-// tux_req_info()
-// ***********************************************************************
+/************************************************************************ */
+/* tux_req_info() */
+/************************************************************************ */
void tux_req_info(
unsigned char data[],
unsigned char result[]
@@ -639,12 +639,12 @@
}
}
-// ***************************************************************************
-// TUX USB
-// ***************************************************************************
-// ***********************************************************************
-// send_usb_tuxcmd()
-// ***********************************************************************
+/************************************************************************** */
+/* TUX USB */
+/************************************************************************** */
+/************************************************************************ */
+/* send_usb_tuxcmd() */
+/************************************************************************ */
unsigned char send_usb_tux_cmd(
unsigned char cmd,
unsigned char param1,
@@ -660,9 +660,9 @@
return usb_write_TuxDroid(usb_trame);
}
-// ***********************************************************************
-// send_usb_donglecmd()
-// ***********************************************************************
+/************************************************************************ */
+/* send_usb_donglecmd() */
+/************************************************************************ */
unsigned char send_usb_dongle_cmd(
unsigned char cmd,
unsigned char param1,
Modified: daemon/trunk/libs/USBDaemon_command_tux.h
===================================================================
--- daemon/trunk/libs/USBDaemon_command_tux.h 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_command_tux.h 2007-03-14 12:03:36 UTC (rev 153)
@@ -22,7 +22,7 @@
/*_____________________ 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
+/* COMMANDS FROM CLIENTS DISPATCHER */
void commands_dispatcher(unsigned char client_id, unsigned char src_trame[16]);
void sub_daemon_cmd_struct(unsigned char data[], unsigned char result[], int id_client);
void sub_daemon_req_info(unsigned char data[], unsigned char result[], int id_client);
@@ -30,7 +30,7 @@
void tux_cmd_struct(unsigned char data[], unsigned char result[]);
void tux_req_status(unsigned char data[], unsigned char result[]);
void tux_req_info(unsigned char data[], unsigned char result[]);
-// TUX PHYSICAL CHANGES
+/* TUX PHYSICAL CHANGES */
unsigned char send_usb_tux_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 send_wave_wings(unsigned char count, unsigned char speed);
Modified: daemon/trunk/libs/USBDaemon_status_table.c
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.c 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_status_table.c 2007-03-14 12:03:36 UTC (rev 153)
@@ -29,9 +29,9 @@
unsigned char pong_received;
/*_____________________ F U N C T I O N S __________________________________*/
-// ***********************************************************************
-// update_raw_status_table()
-// ***********************************************************************
+/************************************************************************ */
+/* update_raw_status_table() */
+/************************************************************************ */
void update_raw_status_table(unsigned char new_status[TUX_RECV_LENGTH])
{
switch(new_status[0])
@@ -79,9 +79,9 @@
}
}
-// ***********************************************************************
-// update_system_status_table()
-// ***********************************************************************
+/************************************************************************ */
+/* update_system_status_table() */
+/************************************************************************ */
void update_system_status_table(unsigned char new_status[4])
{
unsigned char tcp_trame[16];
@@ -94,7 +94,7 @@
tcp_trame[3] = SUBDATA_TP_STATUS;
DONGLE_status = new_status[0];
- //RF status change
+ /*RF status change */
if(RF_status != new_status[1])
{
RF_status = new_status[1];
@@ -102,7 +102,7 @@
tcp_trame[5] = RF_status;
tcp_server_send_raw(tcp_trame, 16);
}
- // Command status change
+ /* Command status change */
if(CMD_status != new_status[2])
{
CMD_status = new_status[2];
@@ -112,9 +112,9 @@
NUMBER_trames = new_status[3];
}
-// ***********************************************************************
-// update_version_table()
-// ***********************************************************************
+/************************************************************************ */
+/* update_version_table() */
+/************************************************************************ */
void update_version_table(unsigned char new_status[4])
{
unsigned long tmp;
@@ -127,9 +127,9 @@
hw_version[last_cpu_ver] = *hw_ver;
}
-// ***********************************************************************
-// update_revision_table()
-// ***********************************************************************
+/************************************************************************ */
+/* update_revision_table() */
+/************************************************************************ */
void update_revision_table(unsigned char new_status[4])
{
unsigned long tmp;
@@ -141,9 +141,9 @@
hw_revision[last_cpu_ver] = *hw_rev;
}
-// ***********************************************************************
-// update_author_table()
-// ***********************************************************************
+/************************************************************************ */
+/* update_author_table() */
+/************************************************************************ */
void update_author_table(unsigned char new_status[4])
{
unsigned long tmp;
@@ -155,17 +155,17 @@
hw_author[last_cpu_ver] = *hw_aut;
}
-// ***********************************************************************
-// update_sound_flash_count()
-// ***********************************************************************
+/************************************************************************ */
+/* update_sound_flash_count() */
+/************************************************************************ */
void update_sound_flash_count(unsigned char new_status[4])
{
sound_flash_count = new_status[1];
}
-// ***********************************************************************
-// update_ir()
-// ***********************************************************************
+/************************************************************************ */
+/* update_ir() */
+/************************************************************************ */
void update_ir(unsigned char new_status[4])
{
unsigned char code;
@@ -211,9 +211,9 @@
}
}
-// ***********************************************************************
-// pong_event()
-// ***********************************************************************
+/************************************************************************ */
+/* pong_event() */
+/************************************************************************ */
void pong_event(unsigned char pong_number, unsigned char pong_received)
{
unsigned char tcp_trame[16];
@@ -231,9 +231,9 @@
tcp_server_send_raw(tcp_trame, 16);
}
-// ***********************************************************************
-// portb_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* portb_changed() */
+/************************************************************************ */
void portb_changed(unsigned char new_value)
{
unsigned char tcp_trame[16];
@@ -246,7 +246,7 @@
tcp_trame[2] = DATA_TP_RSP;
tcp_trame[3] = SUBDATA_TP_STATUS;
- // wings motor backward
+ /* wings motor backward */
if((portb.Byte & 0x01) != (new_value & 0x01))
{
tcp_trame[4] = DATA_STATUS_WINGS_MOTOR_BACKWARD;
@@ -262,7 +262,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // spin motor backward
+ /* spin motor backward */
if((portb.Byte & 0x02) != (new_value & 0x02))
{
tcp_trame[4] = DATA_STATUS_SPIN_MOTOR_BACKWARD;
@@ -278,7 +278,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // spin motor forward
+ /* spin motor forward */
if((portb.Byte & 0x04) != (new_value & 0x04))
{
tcp_trame[4] = DATA_STATUS_SPIN_MOTOR_FORWARD;
@@ -294,25 +294,25 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // mouth open position motor
+ /* mouth open position motor */
if((portb.Byte & 0x08) != (new_value & 0x08))
{
tcp_trame[4] = DATA_STATUS_MOUTH_OPEN_POSITION ;
if (portb.bits.PB3)
{
- // Up
+ /* Up */
printf("mouth open position 0\n");
tcp_trame[5] = 0;
}
else
{
- // Down
+ /* Down */
printf("mouth open position 1\n");
tcp_trame[5] = 1;
}
tcp_server_send_raw(tcp_trame, 16);
}
- // mouth close position motor
+ /* mouth close position motor */
if((portb.Byte & 0x10) != (new_value & 0x10))
{
tcp_trame[4] = DATA_STATUS_MOUTH_CLOSED_POSITION;
@@ -328,7 +328,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // charger inhibit signal
+ /* charger inhibit signal */
if((portb.Byte & 0x40) != (new_value & 0x40))
{
tcp_trame[4] = DATA_STATUS_CHARGER_INHIBIT_SIGNAL ;
@@ -347,9 +347,9 @@
portb.Byte = new_value;
}
-// ***********************************************************************
-// portc_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* portc_changed() */
+/************************************************************************ */
void portc_changed(unsigned char new_value)
{
unsigned char tcp_trame[16];
@@ -361,7 +361,7 @@
tcp_trame[1] = SS_DEFAULT;
tcp_trame[2] = DATA_TP_RSP;
tcp_trame[3] = SUBDATA_TP_STATUS;
- // wings position switch
+ /* wings position switch */
if((portc.Byte & 0x02) != (new_value & 0x02))
{
tcp_trame[4] = DATA_STATUS_WINGS_POSITION_SWITCH;
@@ -377,7 +377,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // right blue led
+ /* right blue led */
if((portc.Byte & 0x04) != (new_value & 0x04))
{
tcp_trame[4] = DATA_STATUS_RIGHT_BLUE_LED;
@@ -393,7 +393,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // left blue led
+ /* left blue led */
if((portc.Byte & 0x08) != (new_value & 0x08))
{
tcp_trame[4] = DATA_STATUS_LEFT_BLUE_LED;
@@ -412,9 +412,9 @@
portc.Byte = new_value;
}
-// ***********************************************************************
-// portd_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* portd_changed() */
+/************************************************************************ */
void portd_changed(unsigned char new_value)
{
unsigned char tcp_trame[16];
@@ -426,7 +426,7 @@
tcp_trame[1] = SS_DEFAULT;
tcp_trame[2] = DATA_TP_RSP;
tcp_trame[3] = SUBDATA_TP_STATUS;
- // head motor for eyes
+ /* head motor for eyes */
if((portd.Byte & 0x01) != (new_value & 0x01))
{
tcp_trame[4] = DATA_STATUS_HEAD_MOTOR_FOR_EYES;
@@ -442,7 +442,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // head motor for mouth
+ /* head motor for mouth */
if((portd.Byte & 0x02) != (new_value & 0x02))
{
tcp_trame[4] = DATA_STATUS_HEAD_MOTOR_FOR_MOUTH;
@@ -458,7 +458,7 @@
}
tcp_server_send_raw(tcp_trame, 16);;
}
- // spin position switch
+ /* spin position switch */
if((portd.Byte & 0x08) != (new_value & 0x08))
{
tcp_trame[4] = DATA_STATUS_SPIN_POSITION_SWITCH;
@@ -474,7 +474,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // wings motor forward
+ /* wings motor forward */
if((portd.Byte & 0x10) != (new_value & 0x10))
{
tcp_trame[4] = DATA_STATUS_WINGS_MOTOR_FORWARD;
@@ -490,7 +490,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // IR led
+ /* IR led */
if((portd.Byte & 0x20) != (new_value & 0x20))
{
tcp_trame[4] = DATA_STATUS_IR_LED;
@@ -506,7 +506,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // eyes open position switch
+ /* eyes open position switch */
if((portd.Byte & 0x40) != (new_value & 0x40))
{
tcp_trame[4] = DATA_STATUS_EYES_OPEN_POSITION_SWITCH;
@@ -522,7 +522,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // eyes closed position switch
+ /* eyes closed position switch */
if((portd.Byte & 0x80) != (new_value & 0x80))
{
tcp_trame[4] = DATA_STATUS_EYES_CLOSED_POSITION_SWITCH;
@@ -541,9 +541,9 @@
portd.Byte = new_value;
}
-// ***********************************************************************
-// sensors1_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* sensors1_changed() */
+/************************************************************************ */
void sensors1_changed(unsigned char new_value)
{
unsigned char tcp_trame[16];
@@ -555,7 +555,7 @@
tcp_trame[1] = SS_DEFAULT;
tcp_trame[2] = DATA_TP_RSP;
tcp_trame[3] = SUBDATA_TP_STATUS;
- // Left wing push
+ /* Left wing push */
if((sensors1.Byte & 0x01) != (new_value & 0x01))
{
tcp_trame[4] = DATA_STATUS_LEFT_WING_PUSH;
@@ -571,7 +571,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // Right wing push
+ /* Right wing push */
if((sensors1.Byte & 0x02) != (new_value & 0x02))
{
tcp_trame[4] = DATA_STATUS_RIGHT_WING_PUSH;
@@ -587,7 +587,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // power plug insertion switch
+ /* power plug insertion switch */
if((sensors1.Byte & 0x04) != (new_value & 0x04))
{
tcp_trame[4] = DATA_STATUS_POWER_PLUG_SWITCH;
@@ -603,7 +603,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // Head push
+ /* Head push */
if((sensors1.Byte & 0x08) != (new_value & 0x08))
{
tcp_trame[4] = DATA_STATUS_HEAD_PUSH_SWITCH;
@@ -619,7 +619,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // Led charger
+ /* Led charger */
if((sensors1.Byte & 0x10) != (new_value & 0x10))
{
tcp_trame[4] = DATA_STATUS_CHARGER_LED_STATUS;
@@ -635,7 +635,7 @@
}
tcp_server_send_raw(tcp_trame, 16);
}
- // mute status
+ /* mute status */
if((sensors1.Byte & 0x80) != (new_value & 0x80))
{
tcp_trame[4] = DATA_STATUS_MUTE_STATUS;
@@ -654,9 +654,9 @@
sensors1.Byte = new_value;
}
-// ***********************************************************************
-// sensors2_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* sensors2_changed() */
+/************************************************************************ */
void sensors2_changed(
unsigned char new_value_high,
unsigned char new_value_low,
@@ -680,9 +680,9 @@
tcp_trame[6] = new_value_low;
}
-// ***********************************************************************
-// position1_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* position1_changed() */
+/************************************************************************ */
void position1_changed(
unsigned char eyes_position,
unsigned char mouth_position,
@@ -721,9 +721,9 @@
}
}
-// ***********************************************************************
-// position2_changed()
-// ***********************************************************************
+/************************************************************************ */
+/* position2_changed() */
+/************************************************************************ */
void position2_changed(unsigned char spin_position)
{
unsigned char tcp_trame[16];
Modified: daemon/trunk/libs/USBDaemon_status_table.h
===================================================================
--- daemon/trunk/libs/USBDaemon_status_table.h 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_status_table.h 2007-03-14 12:03:36 UTC (rev 153)
@@ -22,67 +22,67 @@
/*_____________________ I N C L U D E S____________________________________ */
#include "../tuxdefs/commands.h"
/*_____________________ D E F I N E S ______________________________________*/
-// ------------------ Trame encapsulation --------------------------------- //
-// ------ Destination header ------//
-// Destinations
+/* ------------------ Trame encapsulation --------------------------------- // */
+/* ------ Destination header ------// */
+/* Destinations */
#define DEST_MASTER_DAEMON 0x00
#define DEST_SUB_DAEMON 0x01
#define DEST_TUX 0x02
#define DEST_RESOURCE 0x03
#define DEST_CLIENT 0x04
-// Sub destination
-#define SD_DEFAULT 0x00 // first sub dest
-#define SD_ALL 0xFF // all sub dest
-// ------ Source header ------/
-// Source
+/* Sub destination */
+#define SD_DEFAULT 0x00 /* first sub dest */
+#define SD_ALL 0xFF /* all sub dest */
+/* ------ Source header ------/ */
+/* Source */
#define SOURCE_MASTER_DAEMON 0x00
#define SOURCE_SUB_DAEMON 0x01
#define SOURCE_TUX 0x02
#define SOURCE_RESOURCE 0x03
#define SOURCE_CLIENT 0x04
-// Sub source
-#define SS_DEFAULT 0x00 // first sub source
-// ------ Data header ------//
-// Data types
+/* Sub source */
+#define SS_DEFAULT 0x00 /* first sub source */
+/* ------ Data header ------// */
+/* Data types */
#define DATA_TP_CMD 0x01
#define DATA_TP_REQ 0x02
#define DATA_TP_RSP 0x03
#define DATA_TP_ACK_CMD 0x04
#define DATA_TP_ACK_DP 0x05
-// Sub data types
+/* Sub data types */
#define SUBDATA_TP_RAW 0x01
#define SUBDATA_TP_STRUCT 0x02
#define SUBDATA_TP_STATUS 0x03
#define SUBDATA_TP_INFO 0x04
-// ------------------------------ ACK --------------------------------------//
-// ACK daemon processing
+/* ------------------------------ ACK --------------------------------------// */
+/* ACK daemon processing */
#define ACK_DP_OK 0x01
#define ACK_DP_UKN_DEST 0x02
#define ACK_DP_UKN_SUBDEST 0x03
#define ACK_DP_UKN_DATA_TP 0x04
#define ACK_DP_UKN_SUBDATA_TP 0x05
#define ACK_DP_NI 0xFF
-// ACK CMD
+/* ACK CMD */
#define ACK_CMD_DONGLE_NOT_PRESENT 0x00
#define ACK_CMD_TIMEOUT 0x01
#define ACK_CMD_OK 0x02
#define ACK_CMD_KO 0x03
#define ACK_CMD_NO_ACK 0x04
#define ACK_CMD_ERROR 0xFF
-// ----------------------------- Sub daemon const --------------------------//
-// Sub daemon commands
+/* ----------------------------- Sub daemon const --------------------------// */
+/* Sub daemon commands */
#define SUB_D_CMD_STRUC_DISCONNECT_CLIENT 0x01
#define SUB_D_CMD_STRUC_KILL_DAEMON 0x02
#define SUB_D_CMD_STRUC_DEFINE_CLIENT_NAME 0x03
#define SUB_D_CMD_STRUC_DISCONNECT_CLIENT_ME 0x04
-// Sub daemon infos
+/* Sub daemon infos */
#define SUB_D_REQ_INFO_VERSION 0x01
#define SUB_D_REQ_INFO_CLIENT_COUNT 0x02
#define SUB_D_REQ_INFO_CLIENT_NAME 0x03
#define SUB_D_REQ_INFO_MY_CLIENT_ID 0x04
#define SUB_D_REQ_INFO_PID 0x05
-// ----------------------------- TUX const ---------------------------------//
-// Tux structured commands
+/* ----------------------------- TUX const ---------------------------------// */
+/* Tux structured commands */
#define TUX_CMD_STRUCT_EYES 0x01
#define TUX_CMD_STRUCT_MOUTH 0x02
#define TUX_CMD_STRUCT_WINGS 0x03
@@ -96,7 +96,7 @@
#define TUX_CMD_STRUCT_PING 0x0B
#define TUX_CMD_STRUCT_SLEEP 0x0C
#define TUX_CMD_STRUCT_AUDIO_CHANNEL 0x0D
-// Tux structured sub commands
+/* Tux structured sub commands */
#define TUX_CMD_STRUCT_SUB_ON 0x01
#define TUX_CMD_STRUCT_SUB_OFF 0x02
#define TUX_CMD_STRUCT_SUB_ON_DURING 0x03
@@ -108,9 +108,9 @@
#define TUX_CMD_STRUCT_SUB_BLINK 0x09
#define TUX_CMD_STRUCT_SUB_CH_GENERAL 0x0A
#define TUX_CMD_STRUCT_SUB_CH_TTS 0x0B
-// Tux request information
+/* Tux request information */
#define TUX_REQ_INFO_VERSION 0x01
-// Tux structured data status
+/* Tux structured data status */
#define DATA_STATUS_WINGS_MOTOR_BACKWARD 0x01
#define DATA_STATUS_SPIN_MOTOR_BACKWARD 0x02
#define DATA_STATUS_SPIN_MOTOR_FORWARD 0x03
@@ -147,7 +147,7 @@
#define DATA_STATUS_IR_CODE 0x22
#define DATA_STATUS_SOUND_COUNT 0x23
#define DATA_STATUS_PONG 0x24
-// ------------------ Daemon to Application encapsulation ----------------- //
+/* ------------------ Daemon to Application encapsulation ----------------- // */
/*_____________________ T Y P E _ D E F ____________________________________*/
Modified: daemon/trunk/libs/USBDaemon_tcp_server.c
===================================================================
--- daemon/trunk/libs/USBDaemon_tcp_server.c 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_tcp_server.c 2007-03-14 12:03:36 UTC (rev 153)
@@ -34,9 +34,9 @@
pthread_mutex_t tcp_mutex;
/*_____________________ F U N C T I O N S __________________________________*/
-// ***********************************************************************
-// tcp_server_start_task()
-// ***********************************************************************
+/************************************************************************ */
+/* tcp_server_start_task() */
+/************************************************************************ */
void tcp_server_start_task()
{
int tmp_client;
@@ -74,7 +74,7 @@
fcntl(tcp_server_handle, F_SETFL, O_NONBLOCK);
while(tcp_server_handle)
{
- // Demande de connection d'un client
+ /* Demande de connection d'un client */
pthread_mutex_lock(&tcp_mutex);
if ((tmp_client = accept(tcp_server_handle, (struct sockaddr *) NULL, NULL)) >= 0)
{
@@ -103,18 +103,18 @@
tcp_clients_count++;
}
}
- // Reception de messages venant des clients
+ /* Reception de messages venant des clients */
if(tcp_clients_table_size > 0)
{
for(i = 0;i < tcp_clients_table_size;i++)
{
if(tcp_clients_handle[i] > 0)
{
- //rt_read = read(tcp_clients_handle[i], datas_recv, 16);
+ /*rt_read = read(tcp_clients_handle[i], datas_recv, 16); */
rt_read = recv(tcp_clients_handle[i], datas_recv, 16, 0);
if(rt_read < 0)
{
- // No datas
+ /* No datas */
}
else if(rt_read == 0)
{
@@ -141,9 +141,9 @@
}
}
-// ***********************************************************************
-// tcp_server_send_raw()
-// ***********************************************************************
+/************************************************************************ */
+/* tcp_server_send_raw() */
+/************************************************************************ */
void tcp_server_send_raw(
unsigned char datas[64],
unsigned char datas_count)
@@ -179,9 +179,9 @@
pthread_mutex_unlock(&tcp_mutex);
}
-// ***********************************************************************
-// tcp_server_send_raw_to_client()
-// ***********************************************************************
+/************************************************************************ */
+/* tcp_server_send_raw_to_client() */
+/************************************************************************ */
void tcp_server_send_raw_to_client(
int client_index,
unsigned char datas[64],
@@ -209,9 +209,9 @@
pthread_mutex_unlock(&tcp_mutex);
}
-// ***********************************************************************
-// send_daemon_disconnected
-// ***********************************************************************
+/************************************************************************ */
+/* send_daemon_disconnected */
+/************************************************************************ */
void send_daemon_disconnected()
{
unsigned char send_data[64];
Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c 2007-03-14 12:03:36 UTC (rev 153)
@@ -30,9 +30,9 @@
#include "USBDaemon_tcp_server.h"
/*_____________________ F U N C T I O N S __________________________________*/
-// ***********************************************************************
-// usb_find_TuxDroid()
-// ***********************************************************************
+/************************************************************************ */
+/* usb_find_TuxDroid() */
+/************************************************************************ */
struct usb_device* usb_find_TuxDroid()
{
struct usb_bus *bus;
@@ -55,22 +55,22 @@
return NULL;
}
-// ***********************************************************************
-// usb_open_TuxDroid()
-// ***********************************************************************
+/************************************************************************ */
+/* usb_open_TuxDroid() */
+/************************************************************************ */
struct usb_dev_handle* usb_open_TuxDroid(struct usb_device* tux_dev)
{
usb_dev_handle *tux_hdl;
int error;
- // Open usb device
+ /* Open usb device */
tux_hdl = usb_open(tux_dev);
if (!tux_hdl)
{
printf("Can't open device: %s (%d)\n", strerror(errno), errno);
return NULL;
}
- // Claim device interface
+ /* Claim device interface */
error = usb_claim_interface(tux_hdl, TUX_INTERFACE);
if (error != 0)
{
@@ -82,7 +82,7 @@
return NULL;
}
}
- // Set altinterface
+ /* Set altinterface */
error = usb_set_altinterface(tux_hdl, 0);
if (error != 0)
{
@@ -92,14 +92,14 @@
return tux_hdl;
}
-// ***********************************************************************
-// usb_start_task_TuxDroid()
-// ***********************************************************************
+/************************************************************************ */
+/* usb_start_task_TuxDroid() */
+/************************************************************************ */
void usb_start_task()
{
pthread_mutex_init(&usb_mutex, NULL);
TUX_USB_STATUS = TUX_USB_DISCONNECTED;
- // Find Tux
+ /* Find Tux */
do
{
tux_device = usb_find_TuxDroid();
@@ -110,18 +110,18 @@
sleep(1);
}while(!tux_device);
- // Old firmware should be discarded here
+ /* Old firmware should be discarded here */
if (tux_device->descriptor.bcdDevice < 0x100)
{
printf("\nERROR: Your dongle firmware is too old.\n"\
"This version is not compatible with this daemon, please update\n"\
"the firmware to version 1.00 or better.\n"\
- "Check http://www.tuxisalive.com/documentation/how-to/updating-the-firmware\n"\
+ "Check http:/*www.tuxisalive.com/documentation/how-to/updating-the-firmware\n"\ */
"for details.\n");
exit(1);
}
- // Get Device handle
+ /* Get Device handle */
tux_handle = usb_open_TuxDroid(tux_device);
if(tux_handle == NULL)
{
@@ -131,11 +131,11 @@
usleep(50000);
TUX_USB_STATUS = TUX_USB_CONNECTED;
- // Reinit audio channel
+ /* Reinit audio channel */
send_usb_dongle_cmd(0x02, 0, 0, 0);
current_audio_channel = 0;
busy_count = 0;
- // Read loop
+ /* Read loop */
while(tux_handle)
{
usb_get_status_TuxDroid();
Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-03-14 12:03:36 UTC (rev 153)
@@ -28,9 +28,9 @@
#include "USBDaemon_usb_readWrite.h"
/*_____________________ F U N C T I O N S __________________________________*/
-// ***********************************************************************
-// usb_read_TuxDroid()
-// ***********************************************************************
+/************************************************************************ */
+/* usb_read_TuxDroid() */
+/************************************************************************ */
void usb_read_TuxDroid()
{
unsigned char data[TUX_RECV_LENGTH];
@@ -50,9 +50,9 @@
}
}
-// ***********************************************************************
-// usb_get_status_TuxDroid()
-// ***********************************************************************
+/************************************************************************ */
+/* usb_get_status_TuxDroid() */
+/************************************************************************ */
void usb_get_status_TuxDroid()
{
unsigned char data[64];
@@ -115,9 +115,9 @@
}
pthread_mutex_unlock(&usb_mutex);
}
-// ***********************************************************************
-// usb_write_TuxDroid()
-// ***********************************************************************
+/************************************************************************ */
+/* usb_write_TuxDroid() */
+/************************************************************************ */
unsigned char usb_write_TuxDroid(unsigned char data[TUX_SEND_LENGTH])
{
int idx;
@@ -130,7 +130,7 @@
pthread_mutex_unlock(&usb_mutex);
return ACK_CMD_DONGLE_NOT_PRESENT;
}
- // Send data
+ /* Send data */
CMD_STATUS_FLAG = 1;
idx = usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char*)data, TUX_SEND_LENGTH, TUX_WRITE_TIMEOUT);
counter = 0;
Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c 2007-03-14 08:43:10 UTC (rev 152)
+++ daemon/trunk/main.c 2007-03-14 12:03:36 UTC (rev 153)
@@ -42,26 +42,25 @@
struct version_s version = {0, 0, 0, "\0", "\0", 0};
-// ***********************************************************************
-// Print_info_daemon
-// ***********************************************************************
-void
-print_info_daemon()
+/************************************************************************ */
+/* Print_info_daemon */
+/************************************************************************ */
+void print_info_daemon()
{
const char delimiters[] = " .-";
char cp[] = VERSION;
char *token;
- if ((token = strtok (cp, delimiters)) != NULL)
- version.major = atoi (token);
- if ((token = strtok (NULL, delimiters)) != NULL)
- version.minor = atoi (token);
- if ((token = strtok (NULL, delimiters)) != NULL)
- version.release = atoi (token);
- if ((token = strtok (NULL, delimiters)) != NULL)
- strncpy (version.maturity, token, 10);
- if ((token = strtok (NULL, delimiters)) != NULL)
- strncpy (version.release_status, token, 20);
+ if ((token = strtok(cp, delimiters)) != NULL)
+ version.major = atoi(token);
+ if ((token = strtok(NULL, delimiters)) != NULL)
+ version.minor = atoi(token);
+ if ((token = strtok(NULL, delimiters)) != NULL)
+ version.release = atoi(token);
+ if ((token = strtok(NULL, delimiters)) != NULL)
+ strncpy(version.maturity, token, 10);
+ if ((token = strtok(NULL, delimiters)) != NULL)
+ strncpy(version.release_status, token, 20);
printf("-----------------------------------\n");
printf("Tux USB Daemon version %s\n", VERSION);
@@ -69,22 +68,20 @@
printf("-----------------------------------\n");
}
-// ***********************************************************************
-// On_close_daemon
-// ***********************************************************************
-void
-on_close_daemon()
+/************************************************************************ */
+/* On_close_daemon */
+/************************************************************************ */
+void on_close_daemon()
{
send_daemon_disconnected();
printf("Daemon closed\n");
exit(0);
}
-// ***********************************************************************
-// Daemonizer
-// ***********************************************************************
-void
-daemonize(unsigned char shell_view)
+/************************************************************************ */
+/* Daemonizer */
+/************************************************************************ */
+void daemonize(unsigned char shell_view)
{
pid_t pid, sid;
@@ -93,7 +90,7 @@
{
case 0:
break;
- case -1: //erreur
+ case -1: /*erreur */
exit(1);
break;
default :
@@ -101,20 +98,20 @@
}
umask(0);
sid = setsid();
- if(sid < 0)
+ if (sid < 0)
{
perror("sid");
exit(1);
}
- if(chdir("/") < 0)
+ if (chdir("/") < 0)
{
perror("chdir");
exit(1);
}
DAEMON_PID = (unsigned short)getpid();
printf("Daemon started : pid = %d\n", (int)getpid());
- // No shell
- if(!shell_view)
+ /* No shell */
+ if (!shell_view)
{
close(STDIN_FILENO);
close(STDOUT_FILENO);
@@ -122,11 +119,10 @@
}
}
-// ***********************************************************************
-// Show usages of tux daemon
-// ***********************************************************************
-void
-usage()
+/************************************************************************ */
+/* Show usages of tux daemon */
+/************************************************************************ */
+void usage()
{
printf("usage : tuxdaemon [options]\n");
printf("options:\n");
@@ -138,11 +134,10 @@
printf(" -h show this usage list\n");
}
-// ***********************************************************************
-// USBDaemon main function
-// ***********************************************************************
-int
-main(int argc, char *argv[])
+/************************************************************************ */
+/* USBDaemon main function */
+/************************************************************************ */
+int main(int argc, char *argv[])
{
GMainLoop *loop;
GThread *UsbThread;
@@ -152,36 +147,36 @@
unsigned char shell_view;
unsigned char daemonized;
- // Print daemon informations
+ /* Print daemon informations */
print_info_daemon();
#ifdef USB_DEBUG
- // Set libusb debug level
+ /* Set libusb debug level */
usb_set_debug(LIBUSB_DEBUG_LEVEL);
usb_init();
#endif
- // Program arguments
+ /* Program arguments */
daemonized = 0;
shell_view = 0;
SHOW_TRAMES = 0;
SHOW_RAW_STATUS = 0;
SHOW_INVALID_RAW = 0;
- if(argc > 1)
+ if (argc > 1)
{
for (i = 1; i < argc; i++)
{
- if(!strcmp("-v", argv[i]))
+ if (!strcmp("-v", argv[i]))
shell_view = 1;
- else if(!strcmp("-d", argv[i]))
+ else if (!strcmp("-d", argv[i]))
daemonized = 1;
- else if(!strcmp("-st", argv[i]))
+ else if (!strcmp("-st", argv[i]))
SHOW_TRAMES = 1;
- else if(!strcmp("-sr", argv[i]))
+ else if (!strcmp("-sr", argv[i]))
SHOW_RAW_STATUS = 1;
- else if(!strcmp("-si", argv[i]))
+ else if (!strcmp("-si", argv[i]))
SHOW_INVALID_RAW = 1;
- else if(!strcmp("-h", argv[i]))
+ else if (!strcmp("-h", argv[i]))
{
usage();
exit(1);
@@ -193,13 +188,13 @@
}
}
}
- if(daemonized)
+ if (daemonized)
daemonize(shell_view);
- // On exiting
+ /* On exiting */
signal(SIGINT, on_close_daemon);
signal(SIGKILL, on_close_daemon);
- // Gestion Multithread
- if (!g_thread_supported())
+ /* Gestion Multithread */
+ if (!g_thread_supported())
{
g_thread_init(NULL);
}
@@ -216,14 +211,14 @@
last_toggle_key = 0xFF;
sound_flash_count = 0;
- // Start USB task thread
+ /* Start USB task thread */
if ((UsbThread = g_thread_create((GThreadFunc)usb_start_task, NULL, TRUE, &error)) == NULL )
{
printf("Thread creation failed: %s \n", error->message);
return 2;
}
- // Start TCP task thread
+ /* Start TCP task thread */
if ((TcpThread = g_thread_create((GThreadFunc)tcp_server_start_task, NULL, TRUE, &error)) == NULL )
{
printf("Thread creation failed: %s \n", error->message);
|
