diff options
-rw-r--r-- | lcmodule/source/LCM.rc | 6 | ||||
-rw-r--r-- | source/LCDriver.rc | 6 | ||||
-rw-r--r-- | source/utilities/MemMappedFile.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/lcmodule/source/LCM.rc b/lcmodule/source/LCM.rc index 819bd77..7060905 100644 --- a/lcmodule/source/LCM.rc +++ b/lcmodule/source/LCM.rc @@ -69,15 +69,15 @@ BEGIN BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Build date: 2011-08-16"
+ VALUE "Comments", "Build date: 2011-09-13"
VALUE "CompanyName", "STEricsson AB"
VALUE "FileDescription", "LCDriver Dynamic Link Library"
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "Loader Communication Driver"
VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"
- VALUE "PrivateBuild", "Change-Id: Ib3dee092ba3c16e550bc6d1e2335cf817b7e8ec8"
+ VALUE "PrivateBuild", "Change-Id: Ia28609e74901696c92ef23f95af44f730584804c"
VALUE "ProductName", "CXA1104507 Loader Communication Module"
- VALUE "ProductVersion", "PT2"
+ VALUE "ProductVersion", "PT3"
END
END
BLOCK "VarFileInfo"
diff --git a/source/LCDriver.rc b/source/LCDriver.rc index 5a97a1d..6969602 100644 --- a/source/LCDriver.rc +++ b/source/LCDriver.rc @@ -81,15 +81,15 @@ BEGIN BEGIN
BLOCK "000904b0"
BEGIN
- VALUE "Comments", "Build date: 2011-08-09"
+ VALUE "Comments", "Build date: 2011-09-13"
VALUE "CompanyName", "STEricsson AB"
VALUE "FileDescription", "LCDriver Dynamic Link Library"
VALUE "FileVersion", "1, 0, 0, 1"
VALUE "InternalName", "Loader Communication Driver"
VALUE "LegalCopyright", "Copyright (C) STEricsson AB 2011"
- VALUE "PrivateBuild", "Change-Id: Ib3dee092ba3c16e550bc6d1e2335cf817b7e8ec8"
+ VALUE "PrivateBuild", "Change-Id: Ia28609e74901696c92ef23f95af44f730584804c"
VALUE "ProductName", "CXC 173 0865, LCDriver DLL"
- VALUE "ProductVersion", "PT2"
+ VALUE "ProductVersion", "PT3"
END
END
BLOCK "VarFileInfo"
diff --git a/source/utilities/MemMappedFile.cpp b/source/utilities/MemMappedFile.cpp index 835e401..04a47f0 100644 --- a/source/utilities/MemMappedFile.cpp +++ b/source/utilities/MemMappedFile.cpp @@ -116,8 +116,8 @@ int MemMappedFile::LoadFileData(const char *path) size_ = fileStat.st_size; - /* 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)); + /* Map file in memory, BUT DON"T Reserve SWAP memory, use only physical memory */ + mappedData_ = static_cast<uint8 *>(mmap(0, size_, PROT_READ, MAP_PRIVATE | MAP_NORESERVE /*| MAP_POPULATE*/, descriptor_, 0)); if (MAP_FAILED != mappedData_) { isMapped_ = true; |