diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-09 16:42:15 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-09 16:44:01 +0200 |
| commit | e16982617b1c132caf582cda2d8fe1f0c94fbdbc (patch) | |
| tree | 92017086a2bd66a154fcae217497672c75691cc8 /src | |
| parent | Merge pull request #4532 (diff) | |
| download | monero-e16982617b1c132caf582cda2d8fe1f0c94fbdbc.tar.xz | |
Merge pull request #4538
bd7b800f device_io_hid: fix DEFAULT_* type (too short) and init time (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/device_io_hid.hpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/device/device_io_hid.hpp b/src/device/device_io_hid.hpp index 560208c77..6fd15a1d1 100644 --- a/src/device/device_io_hid.hpp +++ b/src/device/device_io_hid.hpp @@ -86,13 +86,13 @@ namespace hw { public: bool hid_verbose = false; - const unsigned int OR_SELECT = 1; - const unsigned int AND_SELECT = 2; + static const unsigned int OR_SELECT = 1; + static const unsigned int AND_SELECT = 2; - const unsigned char DEFAULT_CHANNEL = 0x0001; - const unsigned char DEFAULT_TAG = 0x01; - const unsigned int DEFAULT_PACKET_SIZE = 64; - const unsigned int DEFAULT_TIMEOUT = 120000; + static const unsigned short DEFAULT_CHANNEL = 0x0001; + static const unsigned char DEFAULT_TAG = 0x01; + static const unsigned int DEFAULT_PACKET_SIZE = 64; + 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(); |