jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use correct type for input bitmap construction

Browse source
This commit is contained in:
Simon Fels 2016-08-10 13:25:13 +02:00
commit 017aaaedf7
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/anbox/input/device.cpp
View file

@ -106,43 +106,43 @@ void Device::set_physical_location(const std::string &physical_location) {
snprintf(info_.physical_location, 80, "%s", physical_location.c_str()); snprintf(info_.physical_location, 80, "%s", physical_location.c_str());
} }
void Device::set_key_bit(const std::uint8_t &bit) { void Device::set_key_bit(const std::uint64_t &bit) {
set_bit(info_.key_bitmask, bit); set_bit(info_.key_bitmask, bit);
} }
void Device::set_abs_bit(const std::uint8_t &bit) { void Device::set_abs_bit(const std::uint64_t &bit) {
set_bit(info_.abs_bitmask, bit); set_bit(info_.abs_bitmask, bit);
} }
void Device::set_rel_bit(const std::uint8_t &bit) { void Device::set_rel_bit(const std::uint64_t &bit) {
set_bit(info_.rel_bitmask, bit); set_bit(info_.rel_bitmask, bit);
} }
void Device::set_sw_bit(const std::uint8_t &bit) { void Device::set_sw_bit(const std::uint64_t &bit) {
set_bit(info_.sw_bitmask, bit); set_bit(info_.sw_bitmask, bit);
} }
void Device::set_led_bit(const std::uint8_t &bit) { void Device::set_led_bit(const std::uint64_t &bit) {
set_bit(info_.led_bitmask, bit); set_bit(info_.led_bitmask, bit);
} }
void Device::set_ff_bit(const std::uint8_t &bit) { void Device::set_ff_bit(const std::uint64_t &bit) {
set_bit(info_.ff_bitmask, bit); set_bit(info_.ff_bitmask, bit);
} }
void Device::set_prop_bit(const std::uint8_t &bit) { void Device::set_prop_bit(const std::uint64_t &bit) {
set_bit(info_.prop_bitmask, bit); set_bit(info_.prop_bitmask, bit);
} }
void Device::set_abs_min(const std::uint8_t &bit, const std::uint32_t &value) { void Device::set_abs_min(const std::uint64_t &bit, const std::uint32_t &value) {
info_.abs_min[bit] = value; info_.abs_min[bit] = value;
} }
void Device::set_abs_max(const std::uint8_t &bit, const std::uint32_t &value) { void Device::set_abs_max(const std::uint64_t &bit, const std::uint32_t &value) {
info_.abs_max[bit] = value; info_.abs_max[bit] = value;
} }
void Device::set_bit(std::uint8_t *array, const std::uint8_t &bit) { void Device::set_bit(std::uint8_t *array, const std::uint64_t &bit) {
array[bit/8] |= (1 << (bit % 8)); array[bit/8] |= (1 << (bit % 8));
} }

20
src/anbox/input/device.h
View file

@ -50,16 +50,16 @@ public:
void set_input_id(const struct input_id &id); void set_input_id(const struct input_id &id);
void set_physical_location(const std::string &physical_location); void set_physical_location(const std::string &physical_location);
void set_unique_id(const std::string &unique_id); void set_unique_id(const std::string &unique_id);
void set_key_bit(const std::uint8_t &bit); void set_key_bit(const std::uint64_t &bit);
void set_abs_bit(const std::uint8_t &bit); void set_abs_bit(const std::uint64_t &bit);
void set_rel_bit(const std::uint8_t &bit); void set_rel_bit(const std::uint64_t &bit);
void set_sw_bit(const std::uint8_t &bit); void set_sw_bit(const std::uint64_t &bit);
void set_led_bit(const std::uint8_t &bit); void set_led_bit(const std::uint64_t &bit);
void set_ff_bit(const std::uint8_t &bit); void set_ff_bit(const std::uint64_t &bit);
void set_prop_bit(const std::uint8_t &bit); void set_prop_bit(const std::uint64_t &bit);
void set_abs_min(const std::uint8_t &bit, const std::uint32_t &value); void set_abs_min(const std::uint64_t &bit, const std::uint32_t &value);
void set_abs_max(const std::uint8_t &bit, const std::uint32_t &value); void set_abs_max(const std::uint64_t &bit, const std::uint32_t &value);
std::string socket_path() const; std::string socket_path() const;
@ -86,7 +86,7 @@ private:
std::uint32_t abs_min[ABS_CNT]; std::uint32_t abs_min[ABS_CNT];
}; };
void set_bit(std::uint8_t *array, const std::uint8_t &bit); void set_bit(std::uint8_t *array, const std::uint64_t &bit);
std::shared_ptr<network::PublishedSocketConnector> connector_; std::shared_ptr<network::PublishedSocketConnector> connector_;
std::atomic<int> next_connection_id_; std::atomic<int> next_connection_id_;