Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68f73555 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am ddbcce3a: Merge "resolved conflicts for merge of be50507b to... 

am ddbcce3a: Merge "resolved conflicts for merge of be50507b to gingerbread-plus-aosp" into gingerbread-plus-aosp

Merge commit 'ddbcce3afbb38680fb84583f7bad5209307e6459'

* commit 'ddbcce3afbb38680fb84583f7bad5209307e6459':
  Keep track of remaining fd when devices are removed
parents 6f49ef82 dfc97b4a

include/ui/EventHub.h

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ private: 
        uint8_t*        keyBitmask;

        KeyLayoutMap*   layoutMap;

        String8         keylayoutFilename;

        int             fd;

        device_t*       next;

        

        device_t(int32_t _id, const char* _path, const char* name);

libs/ui/EventHub.cpp

+7 −8
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
#define ID_MASK  0x0000ffff

#define SEQ_MASK 0x7fff0000

#define SEQ_SHIFT 16

#define id_to_index(id)         ((id&ID_MASK)+1)



#ifndef ABS_MT_TOUCH_MAJOR

#define ABS_MT_TOUCH_MAJOR      0x30    /* Major axis of touching ellipse */
@@ -87,7 +86,7 @@ static inline int max(int v1, int v2) 


EventHub::device_t::device_t(int32_t _id, const char* _path, const char* name)

    : id(_id), path(_path), name(name), classes(0)

    , keyBitmask(NULL), layoutMap(new KeyLayoutMap()), next(NULL) {

    , keyBitmask(NULL), layoutMap(new KeyLayoutMap()), fd(-1), next(NULL) {

}



EventHub::device_t::~device_t() {
@@ -151,9 +150,9 @@ status_t EventHub::getAbsoluteAxisInfo(int32_t deviceId, int axis, 


    struct input_absinfo info;



    if(ioctl(mFDs[id_to_index(device->id)].fd, EVIOCGABS(axis), &info)) {

    if(ioctl(device->fd, EVIOCGABS(axis), &info)) {

        LOGW("Error reading absolute controller %d for device %s fd %d\n",

             axis, device->name.string(), mFDs[id_to_index(device->id)].fd);

             axis, device->name.string(), device->fd);

        return -errno;

    }
@@ -182,7 +181,7 @@ int32_t EventHub::getScanCodeState(int32_t deviceId, int32_t scanCode) const { 
int32_t EventHub::getScanCodeStateLocked(device_t* device, int32_t scanCode) const {

    uint8_t key_bitmask[sizeof_bit_array(KEY_MAX + 1)];

    memset(key_bitmask, 0, sizeof(key_bitmask));

    if (ioctl(mFDs[id_to_index(device->id)].fd,

    if (ioctl(device->fd,

               EVIOCGKEY(sizeof(key_bitmask)), key_bitmask) >= 0) {

        return test_bit(scanCode, key_bitmask) ? AKEY_STATE_DOWN : AKEY_STATE_UP;

    }
@@ -205,8 +204,7 @@ int32_t EventHub::getKeyCodeStateLocked(device_t* device, int32_t keyCode) const 


    uint8_t key_bitmask[sizeof_bit_array(KEY_MAX + 1)];

    memset(key_bitmask, 0, sizeof(key_bitmask));

    if (ioctl(mFDs[id_to_index(device->id)].fd,

               EVIOCGKEY(sizeof(key_bitmask)), key_bitmask) >= 0) {

    if (ioctl(device->fd, EVIOCGKEY(sizeof(key_bitmask)), key_bitmask) >= 0) {

        #if 0

        for (size_t i=0; i<=KEY_MAX; i++) {

            LOGI("(Scan code %d: down=%d)", i, test_bit(i, key_bitmask));
@@ -242,7 +240,7 @@ int32_t EventHub::getSwitchState(int32_t deviceId, int32_t sw) const { 
int32_t EventHub::getSwitchStateLocked(device_t* device, int32_t sw) const {

    uint8_t sw_bitmask[sizeof_bit_array(SW_MAX + 1)];

    memset(sw_bitmask, 0, sizeof(sw_bitmask));

    if (ioctl(mFDs[id_to_index(device->id)].fd,

    if (ioctl(device->fd,

               EVIOCGSW(sizeof(sw_bitmask)), sw_bitmask) >= 0) {

        return test_bit(sw, sw_bitmask) ? AKEY_STATE_DOWN : AKEY_STATE_UP;

    }
@@ -638,6 +636,7 @@ int EventHub::open_device(const char *deviceName) 
        return -1;

    }



    device->fd = fd;

    mFDs[mFDCount].fd = fd;

    mFDs[mFDCount].events = POLLIN;