From 900161750ee5c21a56868bc0d56c755083afbe32 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Sun, 18 May 2014 05:45:39 +1000
Subject: Fixed regression that broke support for GT-I9100 etc.

---
 heimdall/source/BridgeManager.h | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'heimdall/source/BridgeManager.h')

diff --git a/heimdall/source/BridgeManager.h b/heimdall/source/BridgeManager.h
index 6b967fa..7028003 100644
--- a/heimdall/source/BridgeManager.h
+++ b/heimdall/source/BridgeManager.h
@@ -73,9 +73,15 @@ namespace Heimdall
 
 			enum
 			{
-				kPidGalaxyS		    = 0x6601,
-				kPidGalaxyS2        = 0x685D,
-				kPidDroidCharge     = 0x68C3
+				kPidGalaxyS = 0x6601,
+				kPidGalaxyS2 = 0x685D,
+				kPidDroidCharge = 0x68C3
+			};
+
+			enum
+			{
+				kDefaultTimeoutSend = 3000,
+				kDefaultTimeoutReceive = 3000
 			};
 
 			enum class UsbLogLevel
@@ -89,6 +95,14 @@ namespace Heimdall
 				Default = Error
 			};
 
+			enum
+			{
+				kSendEmptyTransferNone = 0,
+				kSendEmptyTransferBefore = 1,
+				kSendEmptyTransferAfter = 1 << 1,
+				kSendEmptyTransferBeforeAndAfter = kSendEmptyTransferBefore | kSendEmptyTransferAfter
+			};
+
 		private:
 
 			static const DeviceIdentifier supportedDevices[kSupportedDeviceCount];
@@ -125,7 +139,7 @@ namespace Heimdall
 
 			bool InitialiseProtocol(void);
 
-			bool SendBulkTransfer(unsigned char *data, int length, int timeout = 3000) const;
+			bool SendBulkTransfer(unsigned char *data, int length, int timeout) const;
 
 		public:
 
@@ -138,8 +152,8 @@ namespace Heimdall
 			bool BeginSession(void);
 			bool EndSession(bool reboot) const;
 
-			bool SendPacket(OutboundPacket *packet, int timeout = 3000) const;
-			bool ReceivePacket(InboundPacket *packet, int timeout = 3000) const;
+			bool SendPacket(OutboundPacket *packet, int timeout = kDefaultTimeoutSend, int sendEmptyTransferFlags = kSendEmptyTransferAfter) const;
+			bool ReceivePacket(InboundPacket *packet, int timeout = kDefaultTimeoutReceive) const;
 
 			bool RequestDeviceType(unsigned int request, int *result) const;
 
-- 
cgit v1.1