PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix else if and maxFileSize initializer.

Browse Source 
Change-Id: Iac7852a4fb2add5744d5ea424d6ad5a82828f102
This commit is contained in:
bigbiff
2014-12-22 04:52:56 +01:00
committed by Dees Troy
parent a3d31fbe38
commit 0c53203efe
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mtp/MtpServer.cpp
+1
View File
@@ -1001,6 +1001,7 @@ MtpResponseCode MtpServer::doSendObjectInfo() {
return MTP_RESPONSE_STORAGE_FULL;
uint64_t maxFileSize = storage->getMaxFileSize();
// check storage max file size
MTPD("maxFileSize: %ld\n", maxFileSize);
if (maxFileSize != 0) {
// if mSendObjectFileSize is 0xFFFFFFFF, then all we know is the file size
// is >= 0xFFFFFFFF
mtp/mtp_MtpServer.cpp
+1 -1
View File
@@ -130,7 +130,7 @@ void twmtp_MtpServer::add_storage()
int storageID = stores->at(i)->mtpid;
long reserveSpace = 1;
bool removable = false;
long maxFileSize = stores->at(i)->maxFileSize;
uint64_t maxFileSize = stores->at(i)->maxFileSize;
if (descriptionStr != "") {
MtpStorage* storage = new MtpStorage(storageID, &pathStr[0], &descriptionStr[0], reserveSpace, removable, maxFileSize, refserver);
server->addStorage(storage);
partition.cpp
+12 -13
View File
@@ -2056,19 +2056,18 @@ uint64_t TWPartition::Get_Max_FileSize() {
const uint64_t constTB = (uint64_t) constGB * 1024;
const uint64_t constPB = (uint64_t) constTB * 1024;
const uint64_t constEB = (uint64_t) constPB * 1024;
if (Current_File_System == "ext4")
maxFileSize = 16 * constTB; //16 TB
else if (Current_File_System == "vfat")
maxFileSize = 4 * constGB; //4 GB
else if (Current_File_System == "ntfs")
maxFileSize = 256 * constTB; //256 TB
if (Current_File_System == "exfat")
maxFileSize = 16 * constPB; //16 PB
else if (Current_File_System == "ext3")
maxFileSize = 2 * constTB; //2 TB
else if (Current_File_System == "f2fs")
maxFileSize = 3.94 * constTB; //3.94 TB
if (Current_File_System == "ext4")
maxFileSize = 16 * constTB; //16 TB
else if (Current_File_System == "vfat")
maxFileSize = 4 * constGB; //4 GB
else if (Current_File_System == "ntfs")
maxFileSize = 256 * constTB; //256 TB
else if (Current_File_System == "exfat")
maxFileSize = 16 * constPB; //16 PB
else if (Current_File_System == "ext3")
maxFileSize = 2 * constTB; //2 TB
else if (Current_File_System == "f2fs")
maxFileSize = 3.94 * constTB; //3.94 TB
else
maxFileSize = 100000000L;
return maxFileSize - 1;
partitionmanager.cpp
+1 -1
View File
@@ -1930,7 +1930,7 @@ bool TWPartitionManager::Enable_MTP(void) {
twrpMtp *mtp = new twrpMtp(DataManager::GetIntValue("tw_mtp_debug"));
for (iter = Partitions.begin(); iter != Partitions.end(); iter++) {
if ((*iter)->Is_Storage && (*iter)->Is_Present && (*iter)->Mount(false)) {
printf("twrp addStorage %s, mtpstorageid: %u\n", (*iter)->Storage_Path.c_str(), (*iter)->MTP_Storage_ID);
printf("twrp addStorage %s, mtpstorageid: %u, maxFileSize: %lld\n", (*iter)->Storage_Path.c_str(), (*iter)->MTP_Storage_ID, (*iter)->Get_Max_FileSize());
mtp->addStorage((*iter)->Storage_Name, (*iter)->Storage_Path, (*iter)->MTP_Storage_ID, (*iter)->Get_Max_FileSize());
count++;
}