Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c53203e authored by bigbiff's avatar bigbiff Committed by Dees Troy
Browse files

Fix else if and maxFileSize initializer. 

Change-Id: Iac7852a4fb2add5744d5ea424d6ad5a82828f102
parent a3d31fbe

mtp/MtpServer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2056,14 +2056,13 @@ 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")

	else if (Current_File_System == "exfat")

		maxFileSize = 16 * constPB; //16 PB

	else if (Current_File_System == "ext3")

		maxFileSize = 2 * constTB; //2 TB

partitionmanager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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++;

		}