diff options
author | Benjamin Dobell <benjamin.dobell@glassechidna.com.au> | 2011-07-17 19:50:07 +1000 |
---|---|---|
committer | Benjamin Dobell <benjamin.dobell@glassechidna.com.au> | 2011-07-17 19:50:07 +1000 |
commit | 8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35 (patch) | |
tree | 7b40d7e1a5c28b2e05b01cd9e348aabd60f2d19c /heimdall/source/BridgeManager.cpp | |
parent | a9ba51f99ec1181874e4d018ea3d4b19a3eff6f7 (diff) | |
download | external_heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.zip external_heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.gz external_heimdall-8cb7f6ee8f872938e257541c07d0e4b2ad0e3f35.tar.bz2 |
- Added Utilities tab to Heimdall Frontend.
- Fixed Heimdall command line support for PIT files without a reference to themselves.
- Added tool tips to Heimdall Frontend.
- Added heimdall 'info' and 'download-pit' actions.
- Made 'detect' action return 0 if a device is detected, 1 otherwise.
Diffstat (limited to 'heimdall/source/BridgeManager.cpp')
-rw-r--r-- | heimdall/source/BridgeManager.cpp | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/heimdall/source/BridgeManager.cpp b/heimdall/source/BridgeManager.cpp index af968a9..f58c4e2 100644 --- a/heimdall/source/BridgeManager.cpp +++ b/heimdall/source/BridgeManager.cpp @@ -885,7 +885,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to begin file transfer sequence!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to begin file transfer sequence!\n"); return (false); } @@ -895,7 +896,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to confirm beginning of file transfer sequence!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to confirm beginning of file transfer sequence!\n"); return (false); } @@ -911,7 +913,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to send file part packet!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to send file part packet!\n"); return (false); } @@ -931,11 +934,13 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to receive file part response!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to receive file part response!\n"); for (int retry = 0; retry < 4; retry++) { - Interface::PrintError("\nERROR: Retrying..."); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Retrying..."); // Send sendFilePartPacket = new SendFilePartPacket(file); @@ -944,7 +949,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to send file part packet!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to send file part packet!\n"); return (false); } @@ -964,8 +970,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (receivedPartIndex != filePartIndex) { - Interface::PrintError("\nERROR: Expected file part index: %d Received: %d\n", - filePartIndex, receivedPartIndex); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Expected file part index: %d Received: %d\n", filePartIndex, receivedPartIndex); return (false); } @@ -979,8 +985,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (receivedPartIndex != filePartIndex) { - Interface::PrintError("\nERROR: Expected file part index: %d Received: %d\n", - filePartIndex, receivedPartIndex); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Expected file part index: %d Received: %d\n", filePartIndex, receivedPartIndex); return (false); } @@ -1021,7 +1027,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to end phone file transfer sequence!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to end phone file transfer sequence!\n"); return (false); } } @@ -1035,7 +1042,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to end modem file transfer sequence!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to end modem file transfer sequence!\n"); return (false); } } @@ -1046,7 +1054,8 @@ bool BridgeManager::SendFile(FILE *file, int destination, int fileIdentifier) co if (!success) { - Interface::PrintError("\nERROR: Failed to confirm end of file transfer sequence!\n"); + Interface::PrintErrorSameLine("\n"); + Interface::PrintError("Failed to confirm end of file transfer sequence!\n"); return (false); } } |