[tuxdroid-svn] r1074 - software_suite_v2/middleware/tuxdriver/trunk/src
Status: Beta
Brought to you by:
ks156
From: eFfeM <c2m...@c2...> - 2008-05-02 11:32:16
|
Author: eFfeM Date: 2008-05-02 13:32:19 +0200 (Fri, 02 May 2008) New Revision: 1074 Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c Log: final batch of const additions, again with some other small changes Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-05-02 11:29:33 UTC (rev 1073) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_driver.c 2008-05-02 11:32:19 UTC (rev 1074) @@ -47,7 +47,7 @@ static simple_callback_t dongle_connected_funct; static simple_callback_t dongle_disconnected_funct; -static void on_frame(unsigned char *data); +static void on_frame(const unsigned char *data); static void on_rf_state(unsigned char state); static void on_usb_connect(void); static void on_usb_disconnect(void); @@ -94,7 +94,7 @@ * @param data 4 bytes array of status. */ static void -on_frame(unsigned char *data) +on_frame(const unsigned char *data) { unsigned char header; int ret; @@ -275,7 +275,7 @@ * */ LIBEXPORT TuxDrvError -TuxDrv_PerformCommand(double delay, char *cmd_str) +TuxDrv_PerformCommand(double delay, const char *cmd_str) { if (delay == 0.0) { @@ -302,7 +302,7 @@ * */ LIBEXPORT TuxDrvError -TuxDrv_PerformMacroFile(char *file_path) +TuxDrv_PerformMacroFile(const char *file_path) { return tux_cmd_parser_parse_file(file_path); } @@ -311,7 +311,7 @@ * */ LIBEXPORT TuxDrvError -TuxDrv_PerformMacroText(char *macro) +TuxDrv_PerformMacroText(const char *macro) { return tux_cmd_parser_parse_macro(macro); } @@ -320,7 +320,7 @@ * */ LIBEXPORT TuxDrvError -TuxDrv_SoundReflash(char *tracks) +TuxDrv_SoundReflash(const char *tracks) { return tux_sound_flash_cmd_reflash(tracks); } @@ -365,7 +365,7 @@ * */ LIBEXPORT TuxDrvError -TuxDrv_GetStatusId(char *name, int *id) +TuxDrv_GetStatusId(const char *name, int *id) { return tux_sw_status_id_from_name(name, id); } Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-05-02 11:29:33 UTC (rev 1073) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.c 2008-05-02 11:32:19 UTC (rev 1074) @@ -502,12 +502,12 @@ int i, j; int rf_state; int packet_count; - char *data_buf; - char packet_data[4]; + unsigned char *data_buf; + unsigned char packet_data[4]; rf_state = data[1]; packet_count = data[3]; - data_buf = (char *)data; + data_buf = (unsigned char *)data; data_buf += 4; if (last_knowed_rf_state != rf_state) @@ -529,13 +529,13 @@ { for (j = 0; j < 4; j++) { - packet_data[j] = (unsigned char)data_buf[j]; + packet_data[j] = data_buf[j]; } #ifdef USE_MUTEX mutex_lock(__callback_mutex); #endif if (frame_callback_function) - frame_callback_function((unsigned char*)packet_data); + frame_callback_function(packet_data); #ifdef USE_MUTEX mutex_unlock(__callback_mutex); #endif Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h 2008-05-02 11:29:33 UTC (rev 1073) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_usb.h 2008-05-02 11:32:19 UTC (rev 1074) @@ -65,7 +65,7 @@ * Callback function for the frame receiving event * @param data A pointer to the frame */ -typedef void(*frame_callback_t)(unsigned char *data); +typedef void(*frame_callback_t)(const unsigned char *data); /** * Callback function prototype for the RF state event Modified: software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c =================================================================== --- software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-05-02 11:29:33 UTC (rev 1073) +++ software_suite_v2/middleware/tuxdriver/trunk/src/tux_user_inputs.c 2008-05-02 11:32:19 UTC (rev 1074) @@ -206,7 +206,7 @@ LIBLOCAL void tux_user_inputs_update_RC5(void) { - char *code_str = ""; + const char *code_str = ""; if (rc5_on_receiving) { |