diff options
| author | xmarvla <vlatko.markovic@seavus.com> | 2012-05-09 10:38:57 +0200 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2012-05-25 14:47:16 +0200 |
| commit | 4dae139e02676ddcc97544f91c87248141d2477a (patch) | |
| tree | eb1e418f5f1218490bb96bd281616a5e0e0bb6d0 /source | |
| parent | 3d6c24ee9d71c1880d758e80bfb76cea490edf9d (diff) | |
Dump command on UART channels sometimes fails.
Correct the Write Request handling on the host in the LCM bulk protocol.
Fix build with Visual Studio for development purposes.
ST-Ericsson ID: 432407
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: I3bbae61cace9a24ba59d634bcfda7fd0a9c683eb
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/58237
Tested-by: Aleksandar GASOSKI <aleksandar.gasoski@seavus.com>
Tested-by: Vlatko STENKOSKI
Reviewed-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Tested-by: Vlatko PISTOLOV <vlatko.pistolov@seavus.com>
Diffstat (limited to 'source')
| -rw-r--r-- | source/LCDriver.vcproj | 4 | ||||
| -rw-r--r-- | source/LCM/include/t_bulk_protocol.h | 2 | ||||
| -rw-r--r-- | source/LcmInterface.cpp | 4 | ||||
| -rw-r--r-- | source/LcmInterface.h | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/source/LCDriver.vcproj b/source/LCDriver.vcproj index ef7e7c4..44672e4 100644 --- a/source/LCDriver.vcproj +++ b/source/LCDriver.vcproj @@ -537,10 +537,6 @@ RelativePath=".\LCDriverThread.cpp"
>
</File>
- <File
- RelativePath=".\LcdVersion.cpp"
- >
- </File>
</Filter>
<Filter
Name="api_wrappers"
diff --git a/source/LCM/include/t_bulk_protocol.h b/source/LCM/include/t_bulk_protocol.h index 95c4dbd..67a1dab 100644 --- a/source/LCM/include/t_bulk_protocol.h +++ b/source/LCM/include/t_bulk_protocol.h @@ -121,6 +121,8 @@ typedef struct { TL_BulkProtocolState_t State; /** Current bulk session ID. */ uint16 SessionId; + /** Counter for Bulk Timer Retransmissions. */ + uint16 BulkRetransmissionNo; /** Length of the file transfered with bulk transfer. */ uint64 TotalLength; /** Length of payload data transfered with bulk transfer. */ diff --git a/source/LcmInterface.cpp b/source/LcmInterface.cpp index 6ddea57..a5f7baa 100644 --- a/source/LcmInterface.cpp +++ b/source/LcmInterface.cpp @@ -16,7 +16,9 @@ #endif char *LcmInterface::m_pchLCMLibPath = 0; -extern const char LCD_LCM_Compatibility[]; +#if !(defined(__MINGW32__) || defined(__linux__) || defined(__APPLE__)) +char LCD_LCM_Compatibility[] = "TestBuild"; // Generate Test String for unofficial builds in Windows environment +#endif // __MINGW32__ || __linux__ || __APPLE__ ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// diff --git a/source/LcmInterface.h b/source/LcmInterface.h index be1bc01..1619257 100644 --- a/source/LcmInterface.h +++ b/source/LcmInterface.h @@ -17,6 +17,8 @@ typedef void *HMODULE; #endif +extern char LCD_LCM_Compatibility[]; + typedef ErrorCode_e(*CommunicationInitialize_t)(void *Object_p, Communication_t **Communication_pp, Family_t Family, HashDevice_t *HashDevice_p, CommunicationDevice_t *CommunicationDevice_p, Do_CEH_Call_t CommandCallback_p, BuffersInterface_t *Buffers_p, TimersInterface_t *Timers_p, QueueInterface_t *Queue_p); typedef ErrorCode_e(*CommunicationShutdown_t)(Communication_t **Communication_pp); typedef ErrorCode_e(*CommunicationPoll_t)(Communication_t *Communication_p); |