[tuxdroid-svn] r151 - in daemon/trunk: . libs

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

Author: srikanta
Date: 2007-03-13 16:18:53 +0100 (Tue, 13 Mar 2007)
New Revision: 151

Modified:
   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/main.c
Log:
Added enums for USB and TCP status for better readability

Modified: daemon/trunk/libs/USBDaemon_tcp_server.c
===================================================================
--- daemon/trunk/libs/USBDaemon_tcp_server.c	2007-03-13 14:09:44 UTC (rev 150)
+++ daemon/trunk/libs/USBDaemon_tcp_server.c	2007-03-13 15:18:53 UTC (rev 151)
@@ -47,7 +47,7 @@
     int tmp_handle;
 
     pthread_mutex_init(&tcp_mutex, NULL);
-    TUX_TCP_STATUS = 0;
+    TUX_TCP_STATUS = TUX_TCP_STATUS_DOWN;
     if ((tcp_server_handle = socket(AF_INET, SOCK_STREAM, 0))  <  0 )
     {
         printf("TCP socket : server error\n");
@@ -68,7 +68,7 @@
         return;
     }
     printf("TCP socket : opened\n");
-    TUX_TCP_STATUS = 1;
+    TUX_TCP_STATUS = TUX_TCP_STATUS_UP;
     tcp_clients_table_size = 0;
     tcp_clients_count = 0;
     fcntl(tcp_server_handle, F_SETFL, O_NONBLOCK);
@@ -152,7 +152,7 @@
     int tmp_handle;
 
     pthread_mutex_lock(&tcp_mutex);
-    if(TUX_TCP_STATUS == 0)
+    if(TUX_TCP_STATUS == TUX_TCP_STATUS_DOWN)
     {
         pthread_mutex_unlock(&tcp_mutex);
         return;
@@ -190,7 +190,7 @@
     int tmp_handle;
 
     pthread_mutex_lock(&tcp_mutex);
-    if(TUX_TCP_STATUS == 0)
+    if(TUX_TCP_STATUS == TUX_TCP_STATUS_DOWN)
     {
         pthread_mutex_unlock(&tcp_mutex);
         return;

Modified: daemon/trunk/libs/USBDaemon_tcp_server.h
===================================================================
--- daemon/trunk/libs/USBDaemon_tcp_server.h	2007-03-13 14:09:44 UTC (rev 150)
+++ daemon/trunk/libs/USBDaemon_tcp_server.h	2007-03-13 15:18:53 UTC (rev 151)
@@ -28,6 +28,12 @@
 /*_____________________ D E F I N E S ______________________________________*/
 #define TUX_SERVER_MAXLINES                 4096
 #define TUX_SERVER_PORT                     5000
+/*_____________________ D E F I N E S ______________________________________*/
+typedef enum
+{
+    TUX_TCP_STATUS_DOWN = 0,
+    TUX_TCP_STATUS_UP = 1
+} TUX_TCP_CONN_STATUS;
 /*_____________________ T Y P E _ D E F ____________________________________*/
 typedef unsigned char _client_name[16];
 /*_____________________ V A R I A B L E S ___________________________________*/
@@ -37,7 +43,7 @@
 unsigned char tcp_clients_count;
 _client_name tcp_clients_name[256];
 struct sockaddr_in tcp_server_sockaddr;
-int TUX_TCP_STATUS;
+TUX_TCP_CONN_STATUS TUX_TCP_STATUS;
 pthread_mutex_t tcp_mutex;
 /*_____________________ F U N C T I O N S __________________________________*/
 void tcp_server_start_task();

Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c	2007-03-13 14:09:44 UTC (rev 150)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c	2007-03-13 15:18:53 UTC (rev 151)
@@ -98,7 +98,7 @@
 void usb_start_task()
 {
     pthread_mutex_init(&usb_mutex, NULL);
-    TUX_USB_STATUS = 0;
+    TUX_USB_STATUS = TUX_USB_DISCONNECTED;
     // Find Tux
     do
     {
@@ -130,7 +130,7 @@
     }
 
     usleep(50000);
-    TUX_USB_STATUS = 1;
+    TUX_USB_STATUS = TUX_USB_CONNECTED;
     // Reinit audio channel
     send_usb_dongle_cmd(0x02, 0, 0, 0);
     current_audio_channel = 0;

Modified: daemon/trunk/libs/USBDaemon_usb_enum.h
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.h	2007-03-13 14:09:44 UTC (rev 150)
+++ daemon/trunk/libs/USBDaemon_usb_enum.h	2007-03-13 15:18:53 UTC (rev 151)
@@ -22,10 +22,17 @@
 /*_____________________ I N C L U D E S____________________________________ */
 #include <usb.h>
 /*_____________________ D E F I N E S ______________________________________*/
+/*_____________________ E N U M S ______________________________________*/
+typedef enum
+{
+    TUX_USB_DISCONNECTED = 0,
+    TUX_USB_CONNECTED = 1
+} TUX_USB_CONN_STATUS;
+
 /*_____________________ V A R I A B L E S __________________________________*/
 usb_dev_handle *tux_handle;
 struct usb_device* tux_device;
-int TUX_USB_STATUS;
+TUX_USB_CONN_STATUS TUX_USB_STATUS;
 pthread_mutex_t usb_mutex;
 /*_____________________ F U N C T I O N S __________________________________*/
 struct usb_device* usb_find_TuxDroid() ;

Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-13 14:09:44 UTC (rev 150)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c	2007-03-13 15:18:53 UTC (rev 151)
@@ -37,7 +37,7 @@
     int idx;
     int i;
 
-    if (!TUX_USB_STATUS) return;
+    if (TUX_USB_CONNECTED != TUX_USB_STATUS) return;
     for(i = 0;i < 5;i++)
     {
         pthread_mutex_lock(&usb_mutex);
@@ -64,7 +64,7 @@
     for(i = 0;i < 64;i++)data[i] = 0;
     cmd_send[0] = 0x01;cmd_send[1] = 0x01;cmd_send[2] = 0x00;cmd_send[3] = 0x00;cmd_send[4] = 0x00;
     pthread_mutex_lock(&usb_mutex);
-    if (!TUX_USB_STATUS)
+    if (TUX_USB_CONNECTED != TUX_USB_STATUS)
     {
         pthread_mutex_unlock(&usb_mutex);
         return;
@@ -125,7 +125,7 @@
     unsigned char CSF;
 
     pthread_mutex_lock(&usb_mutex);
-    if (!TUX_USB_STATUS)
+    if (TUX_USB_CONNECTED != TUX_USB_STATUS)
     {
         pthread_mutex_unlock(&usb_mutex);
         return ACK_CMD_DONGLE_NOT_PRESENT;

Modified: daemon/trunk/main.c
===================================================================
--- daemon/trunk/main.c	2007-03-13 14:09:44 UTC (rev 150)
+++ daemon/trunk/main.c	2007-03-13 15:18:53 UTC (rev 151)
@@ -209,8 +209,8 @@
         return 1;
     }
 
-    TUX_USB_STATUS = 0;
-    TUX_TCP_STATUS = 0;
+    TUX_USB_STATUS = TUX_USB_DISCONNECTED;
+    TUX_TCP_STATUS = TUX_TCP_STATUS_DOWN;
     CLOSE_DAEMON = 0;
     last_remote_key = 0xFF;
     last_toggle_key = 0xFF;