depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "device: Export kernel device from FpDevice"

Browse source 
This reverts commit 8f93aef122.
This commit is contained in:
Bastien Nocera 2021-09-06 17:34:22 +02:00
parent e22497d51b
commit 83541a2ddc
1 changed files with 3 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libfprint/fp-device.c
View file

@ -245,7 +245,6 @@ fp_device_get_property (GObject *object,
{ {
FpDevice *self = FP_DEVICE (object); FpDevice *self = FP_DEVICE (object);
FpDevicePrivate *priv = fp_device_get_instance_private (self); FpDevicePrivate *priv = fp_device_get_instance_private (self);
FpDeviceClass *cls = FP_DEVICE_GET_CLASS (self);
switch (prop_id) switch (prop_id)
{ {
@ -285,24 +284,6 @@ fp_device_get_property (GObject *object,
g_value_set_boolean (value, priv->is_removed); g_value_set_boolean (value, priv->is_removed);
break; break;
case PROP_FPI_USB_DEVICE:
g_value_set_object (value, priv->usb_device);
break;
case PROP_FPI_UDEV_DATA_SPIDEV:
if (cls->type == FP_DEVICE_TYPE_UDEV)
g_value_set_string (value, g_strdup (priv->udev_data.spidev_path));
else
g_value_set_string (value, NULL);
break;
case PROP_FPI_UDEV_DATA_HIDRAW:
if (cls->type == FP_DEVICE_TYPE_UDEV)
g_value_set_string (value, g_strdup (priv->udev_data.hidraw_path));
else
g_value_set_string (value, NULL);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
} }
@ -549,7 +530,7 @@ fp_device_class_init (FpDeviceClass *klass)
"USB Device", "USB Device",
"Private: The USB device for the device", "Private: The USB device for the device",
G_USB_TYPE_DEVICE, G_USB_TYPE_DEVICE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
/** /**
* FpDevice::fpi-udev-data-spidev: (skip) * FpDevice::fpi-udev-data-spidev: (skip)
* *
@ -562,7 +543,7 @@ fp_device_class_init (FpDeviceClass *klass)
"Udev data: spidev path", "Udev data: spidev path",
"Private: The path to /dev/spidevN.M", "Private: The path to /dev/spidevN.M",
NULL, NULL,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
/** /**
* FpDevice::fpi-udev-data-hidraw: (skip) * FpDevice::fpi-udev-data-hidraw: (skip)
* *
@ -575,7 +556,7 @@ fp_device_class_init (FpDeviceClass *klass)
"Udev data: hidraw path", "Udev data: hidraw path",
"Private: The path to /dev/hidrawN", "Private: The path to /dev/hidrawN",
NULL, NULL,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY); G_PARAM_STATIC_STRINGS | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY);
/** /**
* FpDevice::fpi-driver-data: (skip) * FpDevice::fpi-driver-data: (skip)