[tuxdroid-svn] r228 - svnlook: warning: cannot set LC_CTYPE locale svnlook: warning: environment va
Status: Beta
Brought to you by:
ks156
From: svnlook:warning@affinitic.be:cannot s. L. l. <c2m...@c2...> - 2007-04-09 08:37:04
|
Author: svnlook: warning: cannot set LC_CTYPE locale Date: svnlook: warning: environment variable LANG is EN New Revision: 228 Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.c daemon/trunk/libs/USBDaemon_usb_readWrite.h Log: neimad 2007-04-09 10:37:02 +0200 (Mon, 09 Apr 2007) 144 * Fixed coding style of USBDaemon_usb_readWrite.h: only one instruction per line, spacing. * Make some function params (void) instead of (). 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_usb_readWrite.c =================================================================== --- daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-04-09 08:29:36 UTC (rev 227) +++ daemon/trunk/libs/USBDaemon_usb_readWrite.c 2007-04-09 08:37:02 UTC (rev 228) @@ -33,19 +33,23 @@ /************************************************************************ */ /* usb_read_TuxDroid() */ /************************************************************************ */ -void usb_read_TuxDroid() +void usb_read_TuxDroid(void) { unsigned char data[TUX_RECV_LENGTH]; int idx; int i; - if (TUX_USB_CONNECTED != TUX_USB_STATUS) return; - for(i = 0;i < 5;i++) + if (TUX_USB_CONNECTED != TUX_USB_STATUS) + return; + + for (i = 0; i < 5; i++) { pthread_mutex_lock(&usb_mutex); - idx = usb_interrupt_read(tux_handle, TUX_READ_EP, (char*)data, TUX_RECV_LENGTH, TUX_READ_TIMEOUT); + idx = usb_interrupt_read(tux_handle, TUX_READ_EP, (char*)data, + TUX_RECV_LENGTH, TUX_READ_TIMEOUT); pthread_mutex_unlock(&usb_mutex); - if(idx != TUX_RECV_LENGTH) + + if (idx != TUX_RECV_LENGTH) i = 0; else update_raw_status_table(data); @@ -55,7 +59,7 @@ /************************************************************************ */ /* usb_get_status_TuxDroid() */ /************************************************************************ */ -void usb_get_status_TuxDroid() +void usb_get_status_TuxDroid(void) { unsigned char data[64]; unsigned char cmd_send[5]; @@ -63,60 +67,84 @@ int idx; unsigned char i, j; - 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; + 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_CONNECTED != TUX_USB_STATUS) { pthread_mutex_unlock(&usb_mutex); return; } - idx = usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char*)cmd_send, 5, TUX_WRITE_TIMEOUT); + + idx = usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char*)cmd_send, + sizeof(cmd_send), TUX_WRITE_TIMEOUT); if (idx <= 0) { busy_count++; - if(busy_count > 9) + if (busy_count > 9) { printf("Error : Tux dongle is busy or disconnected\n"); send_daemon_disconnected(); + pthread_mutex_unlock(&usb_mutex); exit(1); } + pthread_mutex_unlock(&usb_mutex); return; } + busy_count = 0; - idx = usb_interrupt_read(tux_handle, TUX_READ_EP, (char*)data, 64, TUX_READ_TIMEOUT); + idx = usb_interrupt_read(tux_handle, TUX_READ_EP, (char*)data, sizeof(data), + TUX_READ_TIMEOUT); if (idx <= 0) { pthread_mutex_unlock(&usb_mutex); return; } - cmd_dispatch[0] = data[0];cmd_dispatch[1] = data[1]; - cmd_dispatch[2] = data[2];cmd_dispatch[3] = data[3]; + + cmd_dispatch[0] = data[0]; + cmd_dispatch[1] = data[1]; + cmd_dispatch[2] = data[2]; + cmd_dispatch[3] = data[3]; + update_system_status_table(cmd_dispatch); - if(SHOW_FRAMES) - printf("RF_st: %.2x CMD_st: %.2x NB_frames : %d idx : %d\n", RF_status, CMD_status, NUMBER_frames, idx); - if((NUMBER_frames > 0) && (NUMBER_frames < 16)) + if (SHOW_FRAMES) + printf("RF_st: %.2x CMD_st: %.2x NB_frames : %d idx : %d\n", RF_status, + CMD_status, NUMBER_frames, idx); + + if (NUMBER_frames > 0 && NUMBER_frames < 16) { - for(i = 0;i < NUMBER_frames;i++) + for (i = 0; i < NUMBER_frames; i++) { - cmd_dispatch[0] = data[((i + 1)*4) + 0]; - cmd_dispatch[1] = data[((i + 1)*4) + 1]; - cmd_dispatch[2] = data[((i + 1)*4) + 2]; - cmd_dispatch[3] = data[((i + 1)*4) + 3]; + cmd_dispatch[0] = data[(i + 1) * 4 + 0]; + cmd_dispatch[1] = data[(i + 1) * 4 + 1]; + cmd_dispatch[2] = data[(i + 1) * 4 + 2]; + cmd_dispatch[3] = data[(i + 1) * 4 + 3]; cmd_dispatch[4] = 0; - if(SHOW_RAW_STATUS) + + if (SHOW_RAW_STATUS) { - for(j = 0;j < 5;j++) + for (j = 0; j < 5; j++) printf("%.2x ", cmd_dispatch[j]); printf("\n"); } + update_raw_status_table(cmd_dispatch); } } + pthread_mutex_unlock(&usb_mutex); } + /************************************************************************ */ /* usb_write_TuxDroid() */ /************************************************************************ */ @@ -124,35 +152,42 @@ { int idx; unsigned char counter; - unsigned char CSF; + unsigned char csf; pthread_mutex_lock(&usb_mutex); + if (TUX_USB_CONNECTED != TUX_USB_STATUS) { pthread_mutex_unlock(&usb_mutex); return ACK_CMD_DONGLE_NOT_PRESENT; } + /* Send data */ CMD_STATUS_FLAG = 1; - idx = usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char*)data, TUX_SEND_LENGTH, TUX_WRITE_TIMEOUT); + idx = usb_interrupt_write(tux_handle, TUX_WRITE_EP, (char*)data, + TUX_SEND_LENGTH, TUX_WRITE_TIMEOUT); counter = 0; - CSF = CMD_STATUS_FLAG; + csf = CMD_STATUS_FLAG; + pthread_mutex_unlock(&usb_mutex); - while(CSF) + + while (csf) { pthread_mutex_lock(&usb_mutex); - CSF = CMD_STATUS_FLAG; + csf = CMD_STATUS_FLAG; pthread_mutex_unlock(&usb_mutex); + counter++; usleep(10000); - if(counter == 15) + if (counter == 15) { return ACK_CMD_TIMEOUT; } } - if(CMD_status == ACK_CMD_OK) + + if (CMD_status == ACK_CMD_OK) return ACK_CMD_OK; - else if(CMD_status == ACK_CMD_KO) + else if (CMD_status == ACK_CMD_KO) return ACK_CMD_KO; else return ACK_CMD_ERROR; Modified: daemon/trunk/libs/USBDaemon_usb_readWrite.h =================================================================== --- daemon/trunk/libs/USBDaemon_usb_readWrite.h 2007-04-09 08:29:36 UTC (rev 227) +++ daemon/trunk/libs/USBDaemon_usb_readWrite.h 2007-04-09 08:37:02 UTC (rev 228) @@ -24,6 +24,6 @@ /*_____________________ D E F I N E S ______________________________________*/ /*_____________________ V A R I A B L E S __________________________________*/ /*_____________________ F U N C T I O N S __________________________________*/ -extern void usb_read_TuxDroid(); -extern void usb_get_status_TuxDroid(); +extern void usb_read_TuxDroid(void); +extern void usb_get_status_TuxDroid(void); extern unsigned char usb_write_TuxDroid(unsigned char datas[]); |