Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4538 

bd7b800f device_io_hid: fix DEFAULT_* type (too short) and init time (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-09 16:42:15 +02:00
parent eca27122df
commit e16982617b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/device/device_io_hid.hpp
View File

@ -86,13 +86,13 @@ namespace hw {
public: public:
bool hid_verbose = false; bool hid_verbose = false;
const unsigned int OR_SELECT = 1; static const unsigned int OR_SELECT = 1;
const unsigned int AND_SELECT = 2; static const unsigned int AND_SELECT = 2;
const unsigned char DEFAULT_CHANNEL = 0x0001; static const unsigned short DEFAULT_CHANNEL = 0x0001;
const unsigned char DEFAULT_TAG = 0x01; static const unsigned char DEFAULT_TAG = 0x01;
const unsigned int DEFAULT_PACKET_SIZE = 64; static const unsigned int DEFAULT_PACKET_SIZE = 64;
const unsigned int DEFAULT_TIMEOUT = 120000; static const unsigned int DEFAULT_TIMEOUT = 120000;
device_io_hid(unsigned short channel, unsigned char tag, unsigned int packet_zize, unsigned int timeout); device_io_hid(unsigned short channel, unsigned char tag, unsigned int packet_zize, unsigned int timeout);
device_io_hid(); device_io_hid();