diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/monero/0006-add-dummy-device-for-ledger.patch | 33 | ||||
| -rw-r--r-- | patches/wownero/0008-add-dummy-device-for-ledger.patch | 37 |
2 files changed, 50 insertions, 20 deletions
diff --git a/patches/monero/0006-add-dummy-device-for-ledger.patch b/patches/monero/0006-add-dummy-device-for-ledger.patch index cb7266d..30261a4 100644 --- a/patches/monero/0006-add-dummy-device-for-ledger.patch +++ b/patches/monero/0006-add-dummy-device-for-ledger.patch @@ -22,23 +22,38 @@ Subject: [PATCH 06/17] add dummy device for ledger create mode 100644 src/device/device_io_dummy.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt -index c73b813d8..5c0f31cb8 100644 +index c73b813d8..ce5ef4bab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -692,8 +692,12 @@ include_directories(${LMDB_INCLUDE}) +@@ -692,16 +692,21 @@ include_directories(${LMDB_INCLUDE}) include_directories(${LIBUNWIND_INCLUDE}) link_directories(${LIBUNWIND_LIBRARY_DIRS}) +-# Final setup for hid +-if (HIDAPI_FOUND) +- message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}") +- add_definitions(-DHAVE_HIDAPI) +- include_directories(${HIDAPI_INCLUDE_DIR}) +- link_directories(${LIBHIDAPI_LIBRARY_DIRS}) +if (HIDAPI_DUMMY) + add_definitions(-DHIDAPI_DUMMY) -+endif() + else() +- message(STATUS "Could not find HIDAPI") ++ # Final setup for hid ++ if (HIDAPI_FOUND) ++ message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}") ++ add_definitions(-DHAVE_HIDAPI) ++ include_directories(${HIDAPI_INCLUDE_DIR}) ++ link_directories(${LIBHIDAPI_LIBRARY_DIRS}) ++ else() ++ message(STATUS "Could not find HIDAPI") ++ endif() + endif() + + - # Final setup for hid --if (HIDAPI_FOUND) -+if (HIDAPI_FOUND) - message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}") - add_definitions(-DHAVE_HIDAPI) - include_directories(${HIDAPI_INCLUDE_DIR}) + # Trezor support check + include(CheckTrezor) + diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index e4f1159b5..14d398f87 100644 --- a/src/device/CMakeLists.txt diff --git a/patches/wownero/0008-add-dummy-device-for-ledger.patch b/patches/wownero/0008-add-dummy-device-for-ledger.patch index 3c7a08f..47b0cc7 100644 --- a/patches/wownero/0008-add-dummy-device-for-ledger.patch +++ b/patches/wownero/0008-add-dummy-device-for-ledger.patch @@ -21,23 +21,38 @@ Subject: [PATCH 08/15] add dummy device for ledger create mode 100644 src/device/device_io_dummy.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt -index 88335ee9d..86000f811 100644 +index c73b813d8..ce5ef4bab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -693,8 +693,12 @@ include_directories(${LMDB_INCLUDE}) +@@ -692,16 +692,21 @@ include_directories(${LMDB_INCLUDE}) include_directories(${LIBUNWIND_INCLUDE}) link_directories(${LIBUNWIND_LIBRARY_DIRS}) +-# Final setup for hid +-if (HIDAPI_FOUND) +- message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}") +- add_definitions(-DHAVE_HIDAPI) +- include_directories(${HIDAPI_INCLUDE_DIR}) +- link_directories(${LIBHIDAPI_LIBRARY_DIRS}) +if (HIDAPI_DUMMY) + add_definitions(-DHIDAPI_DUMMY) -+endif() + else() +- message(STATUS "Could not find HIDAPI") ++ # Final setup for hid ++ if (HIDAPI_FOUND) ++ message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}") ++ add_definitions(-DHAVE_HIDAPI) ++ include_directories(${HIDAPI_INCLUDE_DIR}) ++ link_directories(${LIBHIDAPI_LIBRARY_DIRS}) ++ else() ++ message(STATUS "Could not find HIDAPI") ++ endif() + endif() + + - # Final setup for hid --if (HIDAPI_FOUND) -+if (HIDAPI_FOUND) - message(STATUS "Using HIDAPI include dir at ${HIDAPI_INCLUDE_DIR}") - add_definitions(-DHAVE_HIDAPI) - include_directories(${HIDAPI_INCLUDE_DIR}) + # Trezor support check + include(CheckTrezor) + diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index e4f1159b5..14d398f87 100644 --- a/src/device/CMakeLists.txt @@ -235,13 +250,13 @@ index 000000000..edb4beea3 + MDEBUG("exchange(): waitsForDeviceSend"); + // NOTE: waitsForDeviceSend should be changed by external code + while (waitsForDeviceSend) { -+ usleep(1000); ++ std::this_thread::sleep_for(std::chrono::microseconds(1000)); + MDEBUG("exchange(): waitsForDeviceSend (still)"); + } + + MDEBUG("exchange(): waitsForDeviceReceive"); + while (waitsForDeviceReceive) { -+ usleep(1000); ++ std::this_thread::sleep_for(std::chrono::microseconds(1000)); + MDEBUG("exchange(): waitsForDeviceReceive (still)"); + } + |