diff options
| author | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-06-21 17:51:15 +0200 |
|---|---|---|
| committer | Viktor Mladenovski <viktor.mladenovski@seavus.com> | 2011-06-21 17:51:15 +0200 |
| commit | 12da7d3751c8b7bd088587c8323123019680efff (patch) | |
| tree | 6e1e3f6a65e260ba8ffe2e1336a0cc4f0be145ba /source/utilities/MemMappedFile.cpp | |
| parent | f7e95217e936da34d7124aaced590692eb515923 (diff) | |
Flashing procedure stops at different stages
Adds fix for retransmission in LCM transport layer
ST-Ericsson ID: 325725
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10204
Change-Id: Ie6b32dcf6bf7b3023237920204e3c55ac0624a79
Diffstat (limited to 'source/utilities/MemMappedFile.cpp')
| -rw-r--r-- | source/utilities/MemMappedFile.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/utilities/MemMappedFile.cpp b/source/utilities/MemMappedFile.cpp index 287c5b9..8d5905d 100644 --- a/source/utilities/MemMappedFile.cpp +++ b/source/utilities/MemMappedFile.cpp @@ -71,7 +71,10 @@ int MemMappedFile::LoadFileData(const char *path) return FILE_OPENING_ERROR; } - size_ = ::GetFileSize(handle_, NULL); + uint64 SizeHigh = 0; + + size_ = ::GetFileSize(handle_, (LPDWORD)&SizeHigh); + size_ = (SizeHigh << 32) | size_; if (0 == size_) { return 0; @@ -113,8 +116,9 @@ int MemMappedFile::LoadFileData(const char *path) size_ = fileStat.st_size; - mappedData_ = static_cast<uint8 *>(mmap(0, size_, PROT_READ, MAP_PRIVATE | MAP_POPULATE, descriptor_, 0)); - + /* alway return MAP_FAILED to prevent memory consumption */ + mappedData_ = (uint8 *)MAP_FAILED; //static_cast<uint8 *>(mmap(0, size_, PROT_READ, MAP_PRIVATE /*| MAP_POPULATE*/, descriptor_, 0)); + if (MAP_FAILED != mappedData_) { isMapped_ = true; } else { |