diff options
Diffstat (limited to 'monero_libwallet2_api_c')
3 files changed, 31 insertions, 31 deletions
diff --git a/monero_libwallet2_api_c/monero_libwallet2_api_c.exp b/monero_libwallet2_api_c/monero_libwallet2_api_c.exp index 0c59e1a..2c014c1 100644 --- a/monero_libwallet2_api_c/monero_libwallet2_api_c.exp +++ b/monero_libwallet2_api_c/monero_libwallet2_api_c.exp @@ -122,7 +122,7 @@ _MONERO_MultisigState_total _MONERO_DeviceProgress_progress _MONERO_DeviceProgress_indeterminate _MONERO_Wallet_seed -_MONERO_Wallet_setLedgerCallback +_MONERO_Wallet_setDeviceCallback _MONERO_Wallet_serializeCacheToJson _MONERO_Wallet_getSeedLanguage _MONERO_Wallet_setSeedLanguage diff --git a/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.cpp b/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.cpp index b9ff95f..73a4b8b 100644 --- a/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.cpp +++ b/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.cpp @@ -2148,63 +2148,63 @@ uint64_t MONERO_Wallet_getBytesSent(void* wallet_ptr) { DEBUG_END() } -bool MONERO_Wallet_getStateIsConnected() { +bool MONERO_Wallet_getStateIsConnected(int device) { DEBUG_START() - return Monero::Wallet::getStateIsConnected(); + return Monero::Wallet::getStateIsConnected(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -unsigned char* MONERO_Wallet_getSendToDevice() { +unsigned char* MONERO_Wallet_getSendToDevice(int device) { DEBUG_START() - return Monero::Wallet::getSendToDevice(); + return Monero::Wallet::getSendToDevice(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -size_t MONERO_Wallet_getSendToDeviceLength() { +size_t MONERO_Wallet_getSendToDeviceLength(int device) { DEBUG_START() - return Monero::Wallet::getSendToDeviceLength(); + return Monero::Wallet::getSendToDeviceLength(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -unsigned char* MONERO_Wallet_getReceivedFromDevice() { +unsigned char* MONERO_Wallet_getReceivedFromDevice(int device) { DEBUG_START() - return Monero::Wallet::getReceivedFromDevice(); + return Monero::Wallet::getReceivedFromDevice(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -size_t MONERO_Wallet_getReceivedFromDeviceLength() { +size_t MONERO_Wallet_getReceivedFromDeviceLength(int device) { DEBUG_START() - return Monero::Wallet::getReceivedFromDeviceLength(); + return Monero::Wallet::getReceivedFromDeviceLength(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -bool MONERO_Wallet_getWaitsForDeviceSend() { +bool MONERO_Wallet_getWaitsForDeviceSend(int device) { DEBUG_START() - return Monero::Wallet::getWaitsForDeviceSend(); + return Monero::Wallet::getWaitsForDeviceSend(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -bool MONERO_Wallet_getWaitsForDeviceReceive() { +bool MONERO_Wallet_getWaitsForDeviceReceive(int device) { DEBUG_START() - return Monero::Wallet::getWaitsForDeviceReceive(); + return Monero::Wallet::getWaitsForDeviceReceive(static_cast<Monero::Wallet::Device>(device)); DEBUG_END() } -void MONERO_Wallet_setDeviceReceivedData(unsigned char* data, size_t len) { +void MONERO_Wallet_setDeviceReceivedData(int device, unsigned char* data, size_t len) { DEBUG_START() - Monero::Wallet::setDeviceReceivedData(data, len); + Monero::Wallet::setDeviceReceivedData(static_cast<Monero::Wallet::Device>(device), data, len); DEBUG_END() } -void MONERO_Wallet_setDeviceSendData(unsigned char* data, size_t len) { +void MONERO_Wallet_setDeviceSendData(int device, unsigned char* data, size_t len) { DEBUG_START() - Monero::Wallet::setDeviceSendData(data, len); + Monero::Wallet::setDeviceSendData(static_cast<Monero::Wallet::Device>(device), data, len); DEBUG_END() } -void MONERO_Wallet_setLedgerCallback(void (*sendToLedgerDevice)(unsigned char *command, unsigned int cmd_len)) { +void MONERO_Wallet_setDeviceCallback(int device, void (*sendToDeviceCallback)(unsigned char *command, unsigned int cmd_len)) { DEBUG_START() - Monero::Wallet::setLedgerCallback(sendToLedgerDevice); + Monero::Wallet::setDeviceCallback(static_cast<Monero::Wallet::Device>(device), sendToDeviceCallback); DEBUG_END() } diff --git a/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.h b/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.h index 39bca89..ad9c486 100644 --- a/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.h +++ b/monero_libwallet2_api_c/src/main/cpp/monero_wallet2_api_c.h @@ -837,16 +837,16 @@ extern ADDAPI uint64_t MONERO_Wallet_getBytesReceived(void* wallet_ptr); // virtual uint64_t getBytesSent() = 0; extern ADDAPI uint64_t MONERO_Wallet_getBytesSent(void* wallet_ptr); // HIDAPI_DUMMY -extern ADDAPI bool MONERO_Wallet_getStateIsConnected(); -extern ADDAPI unsigned char* MONERO_Wallet_getSendToDevice(); -extern ADDAPI size_t MONERO_Wallet_getSendToDeviceLength(); -extern ADDAPI unsigned char* MONERO_Wallet_getReceivedFromDevice(); -extern ADDAPI size_t MONERO_Wallet_getReceivedFromDeviceLength(); -extern ADDAPI bool MONERO_Wallet_getWaitsForDeviceSend(); -extern ADDAPI bool MONERO_Wallet_getWaitsForDeviceReceive(); -extern ADDAPI void MONERO_Wallet_setDeviceReceivedData(unsigned char* data, size_t len); -extern ADDAPI void MONERO_Wallet_setDeviceSendData(unsigned char* data, size_t len); -extern ADDAPI void MONERO_Wallet_setLedgerCallback(void (*sendToLedgerDevice)(unsigned char *command, unsigned int cmd_len)); +extern ADDAPI bool MONERO_Wallet_getStateIsConnected(int device); +extern ADDAPI unsigned char* MONERO_Wallet_getSendToDevice(int device); +extern ADDAPI size_t MONERO_Wallet_getSendToDeviceLength(int device); +extern ADDAPI unsigned char* MONERO_Wallet_getReceivedFromDevice(int device); +extern ADDAPI size_t MONERO_Wallet_getReceivedFromDeviceLength(int device); +extern ADDAPI bool MONERO_Wallet_getWaitsForDeviceSend(int device); +extern ADDAPI bool MONERO_Wallet_getWaitsForDeviceReceive(int device); +extern ADDAPI void MONERO_Wallet_setDeviceReceivedData(int device, unsigned char* data, size_t len); +extern ADDAPI void MONERO_Wallet_setDeviceSendData(int device, unsigned char* data, size_t len); +extern ADDAPI void MONERO_Wallet_setDeviceCallback(int device, void (*sendToDeviceCallback)(unsigned char *command, unsigned int cmd_len)); extern ADDAPI const char* MONERO_Wallet_serializeCacheToJson(void* wallet_ptr); // }; |