fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-04-20 05:00:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ei: remove obsolete device->id

Browse source
This commit is contained in:
Peter Hutterer 2023-02-28 14:14:55 +10:00
parent c998bae33f
commit 0ef1bb95d4
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/libei-device.c
View file

@ -60,7 +60,7 @@ ei_device_set_state(struct ei_device *device,
enum ei_device_state old_state = device->state;
device->state = state;
log_debug(ei_device_get_context(device), "device %#x: %s → %s",
device->id, ei_device_state_to_string(old_state),
ei_device_get_id(device), ei_device_state_to_string(old_state),
ei_device_state_to_string(state));
}
@ -109,9 +109,14 @@ _public_
OBJECT_IMPLEMENT_SETTER(ei_device, user_data, void *);
OBJECT_IMPLEMENT_GETTER(ei_device, width, uint32_t);
OBJECT_IMPLEMENT_GETTER(ei_device, height, uint32_t);
OBJECT_IMPLEMENT_GETTER(ei_device, id, object_id_t);
OBJECT_IMPLEMENT_GETTER_AS_REF(ei_device, proto_object, const struct brei_object *);
object_id_t
ei_device_get_id(struct ei_device *device)
{
return device->proto_object.id;
}
_public_ struct ei_seat *
ei_device_get_seat(struct ei_device *device)
{
@ -777,9 +782,8 @@ ei_device_new(struct ei_seat *seat, object_id_t deviceid, uint32_t version)
ei_register_object(ei, &device->proto_object);
device->capabilities = 0;
device->id = deviceid;
device->state = EI_DEVICE_STATE_NEW;
device->name = xaprintf("unnamed device %#x", device->id);
device->name = xaprintf("unnamed device %#x", deviceid);
list_init(&device->regions);
list_init(&device->pending_event_queue);

1
src/libei-device.h
View file

@ -64,7 +64,6 @@ struct ei_device {
struct ei_touchscreen *touchscreen;
struct list link;
uint32_t id; /* FIXME: remove this one */
enum ei_device_state state;
uint32_t capabilities;
char *name;