[tuxdroid-svn] r86 - daemon/trunk/libs
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
[tuxdroid-svn] r86 - daemon/trunk/libs
|
From: remi <c2m...@c2...> - 2007-02-27 11:50:30
|
Author: remi
Date: 2007-02-27 12:44:07 +0100 (Tue, 27 Feb 2007)
New Revision: 86
Modified:
daemon/trunk/libs/USBDaemon_globals.h
daemon/trunk/libs/USBDaemon_tcp_server.c
daemon/trunk/libs/USBDaemon_usb_enum.c
daemon/trunk/libs/USBDaemon_usb_enum.h
daemon/trunk/libs/USBDaemon_usb_readWrite.c
Log:
ADD : The "handle" and "device" variables for the USB element are renamed for deleting the ambiguous compilation.
Modified: daemon/trunk/libs/USBDaemon_globals.h
===================================================================
--- daemon/trunk/libs/USBDaemon_globals.h 2007-02-27 11:02:57 UTC (rev 85)
+++ daemon/trunk/libs/USBDaemon_globals.h 2007-02-27 11:44:07 UTC (rev 86)
@@ -22,22 +22,19 @@
#include <usb.h>
#include <pthread.h>
/*_____________________ D E F I N E S ______________________________________*/
-#define VERSION_MAJOR 0
-#define VERSION_MINOR 1
-#define VERSION_RELEASE 7
-#define TUX_PID 0xFF07 // Product ID
-#define TUX_VID 0x03EB // Vendor ID
-#define TUX_INTERFACE 0x03
-#define TUX_INTERFACECONFIG 0x01
-#define TUX_RECV_LENGTH 0x05
-#define TUX_SEND_LENGTH 0x05
-#define TUX_WRITE_EP 0x05
-#define TUX_READ_EP 0x84
-#define TUX_WRITE_TIMEOUT 1000
-#define TUX_READ_TIMEOUT 1000
+#define VERSION_MAJOR 0
+#define VERSION_MINOR 1
+#define VERSION_RELEASE 7
+#define TUX_PID 0xFF07
+#define TUX_VID 0x03EB
+#define TUX_INTERFACE 0x03
+#define TUX_RECV_LENGTH 0x05
+#define TUX_SEND_LENGTH 0x05
+#define TUX_WRITE_EP 0x05
+#define TUX_READ_EP 0x84
+#define TUX_WRITE_TIMEOUT 1000
+#define TUX_READ_TIMEOUT 1000
/*_____________________ G L O B A L S _ V A R I A B L E S _______________________*/
-usb_dev_handle *handle;
-struct usb_device* device;
unsigned char CLOSE_DAEMON;
unsigned char SHOW_TRAMES;
unsigned char SHOW_RAW_STATUS;
Modified: daemon/trunk/libs/USBDaemon_tcp_server.c
===================================================================
--- daemon/trunk/libs/USBDaemon_tcp_server.c 2007-02-27 11:02:57 UTC (rev 85)
+++ daemon/trunk/libs/USBDaemon_tcp_server.c 2007-02-27 11:44:07 UTC (rev 86)
@@ -135,7 +135,6 @@
{
int i;
int tmp_handle;
- unsigned char datas_recv[16];
pthread_mutex_lock(&tcp_mutex);
if(TUX_TCP_STATUS==0){
@@ -171,7 +170,6 @@
)
{
int tmp_handle;
- unsigned char datas_recv[16];
pthread_mutex_lock(&tcp_mutex);
if(TUX_TCP_STATUS==0){
Modified: daemon/trunk/libs/USBDaemon_usb_enum.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.c 2007-02-27 11:02:57 UTC (rev 85)
+++ daemon/trunk/libs/USBDaemon_usb_enum.c 2007-02-27 11:44:07 UTC (rev 86)
@@ -35,16 +35,16 @@
usb_find_TuxDroid()
{
struct usb_bus *bus;
- struct usb_device *device;
+ struct usb_device *tux_dev;
usb_init();
usb_find_busses();
usb_find_devices();
for(bus=usb_busses;bus;bus=bus->next){
- for (device = bus->devices;device;device=device->next){
- if ((device->descriptor.idVendor == TUX_VID) &&(device->descriptor.idProduct == TUX_PID)){
- return device;
+ for (tux_dev = bus->devices;tux_dev;tux_dev=tux_dev->next){
+ if ((tux_dev->descriptor.idVendor == TUX_VID) &&(tux_dev->descriptor.idProduct == TUX_PID)){
+ return tux_dev;
}
}
}
@@ -56,29 +56,29 @@
// ***********************************************************************
struct usb_dev_handle*
usb_open_TuxDroid(
- struct usb_device* device
+ struct usb_device* tux_dev
)
{
- usb_dev_handle *handle;
+ usb_dev_handle *tux_hdl;
int error;
// Open usb device
- if (!(handle=usb_open(device))){
+ if (!(tux_hdl=usb_open(tux_dev))){
printf("Open USB error\n");
return NULL;
}
// Claim device interface
- error=usb_claim_interface(handle,TUX_INTERFACE);
+ error=usb_claim_interface(tux_hdl,TUX_INTERFACE);
if (error!=0){
- usb_detach_kernel_driver_np(handle,TUX_INTERFACE);
- error=usb_claim_interface(handle,TUX_INTERFACE);
+ usb_detach_kernel_driver_np(tux_hdl,TUX_INTERFACE);
+ error=usb_claim_interface(tux_hdl,TUX_INTERFACE);
if (error!=0){
printf("Claim interface error\n");
return NULL;
}
}
- return handle;
+ return tux_hdl;
}
// ***********************************************************************
@@ -91,16 +91,16 @@
TUX_USB_STATUS=0;
// Find Tux
do{
- device=usb_find_TuxDroid() ;
- if (device==NULL){
+ tux_device=usb_find_TuxDroid() ;
+ if (tux_device==NULL){
printf("Tux dongle not found\n");
}
sleep(1);
- }while(!device);
+ }while(!tux_device);
// Get Device handle
- handle=usb_open_TuxDroid(device);
- if(handle==NULL){
+ tux_handle=usb_open_TuxDroid(tux_device);
+ if(tux_handle==NULL){
printf("You must load the daemon in root mode\n");
exit(1);
}
@@ -110,7 +110,7 @@
send_usb_dongle_cmd(0x02,0,0,0);
current_audio_channel=0;
// Read loop
- while(handle){
+ while(tux_handle){
usb_get_status_TuxDroid();
usleep(50000);
}
Modified: daemon/trunk/libs/USBDaemon_usb_enum.h
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_enum.h 2007-02-27 11:02:57 UTC (rev 85)
+++ daemon/trunk/libs/USBDaemon_usb_enum.h 2007-02-27 11:44:07 UTC (rev 86)
@@ -22,6 +22,8 @@
#include <usb.h>
/*_____________________ D E F I N E S ______________________________________*/
/*_____________________ V A R I A B L E S ___________________________________*/
+usb_dev_handle *tux_handle;
+struct usb_device* tux_device;
int TUX_USB_STATUS;
pthread_mutex_t usb_mutex;
/*_____________________ F U N C T I O N S __________________________________*/
Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c
===================================================================
--- daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-02-27 11:02:57 UTC (rev 85)
+++ daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-02-27 11:44:07 UTC (rev 86)
@@ -39,7 +39,7 @@
if (!TUX_USB_STATUS) return;
for(i=0;i<5;i++){
pthread_mutex_lock(&usb_mutex);
- idx=usb_bulk_read(handle,TUX_READ_EP,(char*)datas,TUX_RECV_LENGTH,TUX_READ_TIMEOUT);
+ idx=usb_bulk_read(tux_handle,TUX_READ_EP,(char*)datas,TUX_RECV_LENGTH,TUX_READ_TIMEOUT);
pthread_mutex_unlock(&usb_mutex);
if(idx!=TUX_RECV_LENGTH)
i=0;
@@ -68,14 +68,14 @@
pthread_mutex_unlock(&usb_mutex);
return;
}
- idx=usb_bulk_write(handle,TUX_WRITE_EP,(char*)cmd_send,5,TUX_WRITE_TIMEOUT);
+ idx=usb_bulk_write(tux_handle,TUX_WRITE_EP,(char*)cmd_send,5,TUX_WRITE_TIMEOUT);
if (idx<=0) {
printf("Error : Tux dongle is busy or disconnected\n");
send_daemon_disconnected();
pthread_mutex_unlock(&usb_mutex);
exit(1);
}
- idx=usb_bulk_read(handle,TUX_READ_EP,(char*)datas,64,TUX_READ_TIMEOUT);
+ idx=usb_bulk_read(tux_handle,TUX_READ_EP,(char*)datas,64,TUX_READ_TIMEOUT);
if (idx<=0){
pthread_mutex_unlock(&usb_mutex);
return;
@@ -122,7 +122,7 @@
}
// Send datas
CMD_STATUS_FLAG=1;
- idx=usb_bulk_write(handle,TUX_WRITE_EP,(char*)datas,TUX_SEND_LENGTH,TUX_WRITE_TIMEOUT);
+ idx=usb_bulk_write(tux_handle,TUX_WRITE_EP,(char*)datas,TUX_SEND_LENGTH,TUX_WRITE_TIMEOUT);
counter=0;
CSF=CMD_STATUS_FLAG;
pthread_mutex_unlock(&usb_mutex);
|
