diff options
| author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:14:59 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:14:59 -0700 |
| commit | c5464757ad147f42089e6728eabb3906181be5fe (patch) | |
| tree | 274c8b52130e1c30e813a502c977fd5424a69b70 /heimdall/source/BridgeManager.cpp | |
| parent | 49a02b8c916e8ef011d9f56901d208eca626b85b (diff) | |
| download | external_heimdall-c5464757ad147f42089e6728eabb3906181be5fe.zip external_heimdall-c5464757ad147f42089e6728eabb3906181be5fe.tar.gz external_heimdall-c5464757ad147f42089e6728eabb3906181be5fe.tar.bz2 | |
Switch UsbLogLevel back to an int.
AOSP does not support C++11
Change-Id: Iaf2e09cc05f8f867fa776b62313af6774ce47a56
Diffstat (limited to 'heimdall/source/BridgeManager.cpp')
| -rw-r--r-- | heimdall/source/BridgeManager.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/heimdall/source/BridgeManager.cpp b/heimdall/source/BridgeManager.cpp index 5150788..8d4a9b6 100644 --- a/heimdall/source/BridgeManager.cpp +++ b/heimdall/source/BridgeManager.cpp @@ -467,7 +467,7 @@ BridgeManager::BridgeManager(bool verbose, int communicationDelay) fileTransferPacketSize = kFileTransferPacketSizeDefault; fileTransferSequenceTimeout = kFileTransferSequenceTimeoutDefault; - usbLogLevel = UsbLogLevel::Default; + usbLogLevel = Default; } BridgeManager::~BridgeManager() @@ -499,23 +499,23 @@ bool BridgeManager::DetectDevice(void) // Setup libusb log level. switch (usbLogLevel) { - case UsbLogLevel::None: + case None: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE); break; - case UsbLogLevel::Error: + case Error: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_ERROR); break; - case UsbLogLevel::Warning: + case Warning: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_WARNING); break; - case UsbLogLevel::Info: + case Info: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_INFO); break; - case UsbLogLevel::Debug: + case Debug: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_DEBUG); break; } @@ -588,23 +588,23 @@ int BridgeManager::Initialise(bool resume) // Setup libusb log level. switch (usbLogLevel) { - case UsbLogLevel::None: + case None: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE); break; - case UsbLogLevel::Error: + case Error: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_ERROR); break; - case UsbLogLevel::Warning: + case Warning: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_WARNING); break; - case UsbLogLevel::Info: + case Info: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_INFO); break; - case UsbLogLevel::Debug: + case Debug: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_DEBUG); break; } @@ -1366,7 +1366,7 @@ bool BridgeManager::SendFile(FILE *file, unsigned int destination, unsigned int return (true); } -void BridgeManager::SetUsbLogLevel(UsbLogLevel usbLogLevel) +void BridgeManager::SetUsbLogLevel(int usbLogLevel) { this->usbLogLevel = usbLogLevel; @@ -1374,23 +1374,23 @@ void BridgeManager::SetUsbLogLevel(UsbLogLevel usbLogLevel) { switch (usbLogLevel) { - case UsbLogLevel::None: + case None: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_NONE); break; - case UsbLogLevel::Error: + case Error: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_ERROR); break; - case UsbLogLevel::Warning: + case Warning: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_WARNING); break; - case UsbLogLevel::Info: + case Info: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_INFO); break; - case UsbLogLevel::Debug: + case Debug: libusb_set_debug(libusbContext, LIBUSB_LOG_LEVEL_DEBUG); break; } |