proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-15 04:23:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nitrokey: Convert to use FuHidDevice

Browse Source
This commit is contained in:
Richard Hughes 2020-03-27 18:58:53 +00:00
parent 355d5d545d
commit 461149e636
2 changed files with 14 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
plugins/nitrokey/fu-nitrokey-device.c
View File

@ -11,7 +11,7 @@
#include "fu-nitrokey-common.h" #include "fu-nitrokey-common.h"
#include "fu-nitrokey-device.h" #include "fu-nitrokey-device.h"
G_DEFINE_TYPE (FuNitrokeyDevice, fu_nitrokey_device, FU_TYPE_USB_DEVICE) G_DEFINE_TYPE (FuNitrokeyDevice, fu_nitrokey_device, FU_TYPE_HID_DEVICE)
typedef struct { typedef struct {
guint8 command; guint8 command;
@ -25,10 +25,7 @@ static gboolean
nitrokey_execute_cmd_cb (FuDevice *device, gpointer user_data, GError **error) nitrokey_execute_cmd_cb (FuDevice *device, gpointer user_data, GError **error)
{ {
NitrokeyRequest *req = (NitrokeyRequest *) user_data; NitrokeyRequest *req = (NitrokeyRequest *) user_data;
GUsbDevice *usb_device = fu_usb_device_get_dev (FU_USB_DEVICE (device));
NitrokeyHidResponse res; NitrokeyHidResponse res;
gboolean ret;
gsize actual_len = 0;
guint32 crc_tmp; guint32 crc_tmp;
guint8 buf[64]; guint8 buf[64];
@ -41,55 +38,21 @@ nitrokey_execute_cmd_cb (FuDevice *device, gpointer user_data, GError **error)
fu_common_write_uint32 (&buf[NITROKEY_REQUEST_DATA_LENGTH + 1], crc_tmp, G_LITTLE_ENDIAN); fu_common_write_uint32 (&buf[NITROKEY_REQUEST_DATA_LENGTH + 1], crc_tmp, G_LITTLE_ENDIAN);
/* send request */ /* send request */
if (g_getenv ("FWUPD_NITROKEY_VERBOSE") != NULL) if (!fu_hid_device_set_report (FU_HID_DEVICE (device),
fu_common_dump_raw (G_LOG_DOMAIN, "request", buf, sizeof(buf)); 0x0002, buf, sizeof(buf),
ret = g_usb_device_control_transfer (usb_device, NITROKEY_TRANSACTION_TIMEOUT,
G_USB_DEVICE_DIRECTION_HOST_TO_DEVICE, FU_HID_DEVICE_FLAG_IS_FEATURE,
G_USB_DEVICE_REQUEST_TYPE_CLASS, error))
G_USB_DEVICE_RECIPIENT_INTERFACE,
0x09, 0x0300, 0x0002,
buf, sizeof(buf),
&actual_len,
NITROKEY_TRANSACTION_TIMEOUT,
NULL,
error);
if (!ret) {
g_prefix_error (error, "failed to do HOST_TO_DEVICE: ");
return FALSE; return FALSE;
}
if (actual_len != sizeof(buf)) {
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"only wrote %" G_GSIZE_FORMAT "bytes", actual_len);
return FALSE;
}
/* get response */ /* get response */
memset (buf, 0x00, sizeof(buf)); memset (buf, 0x00, sizeof(buf));
ret = g_usb_device_control_transfer (usb_device, if (!fu_hid_device_get_report (FU_HID_DEVICE (device),
G_USB_DEVICE_DIRECTION_DEVICE_TO_HOST, 0x0002, buf, sizeof(buf),
G_USB_DEVICE_REQUEST_TYPE_CLASS, NITROKEY_TRANSACTION_TIMEOUT,
G_USB_DEVICE_RECIPIENT_INTERFACE, FU_HID_DEVICE_FLAG_IS_FEATURE,
0x01, 0x0300, 0x0002, error))
buf, sizeof(buf),
&actual_len,
NITROKEY_TRANSACTION_TIMEOUT,
NULL,
error);
if (!ret) {
g_prefix_error (error, "failed to do DEVICE_TO_HOST: ");
return FALSE; return FALSE;
}
if (actual_len != sizeof(res)) {
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"only wrote %" G_GSIZE_FORMAT "bytes", actual_len);
return FALSE;
}
if (g_getenv ("FWUPD_NITROKEY_VERBOSE") != NULL)
fu_common_dump_raw (G_LOG_DOMAIN, "response", buf, sizeof(buf));
/* verify this is the answer to the question we asked */ /* verify this is the answer to the question we asked */
memcpy (&res, buf, sizeof(buf)); memcpy (&res, buf, sizeof(buf));
@ -140,23 +103,6 @@ nitrokey_execute_cmd_full (FuDevice *device, guint8 command,
NITROKEY_NR_RETRIES, &req, error); NITROKEY_NR_RETRIES, &req, error);
} }
static gboolean
fu_nitrokey_device_open (FuUsbDevice *device, GError **error)
{
GUsbDevice *usb_device = fu_usb_device_get_dev (device);
/* claim interface */
if (!g_usb_device_claim_interface (usb_device, 0x02, /* idx */
G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
error)) {
g_prefix_error (error, "failed to do claim nitrokey: ");
return FALSE;
}
/* success */
return TRUE;
}
static gboolean static gboolean
fu_nitrokey_device_setup (FuDevice *device, GError **error) fu_nitrokey_device_setup (FuDevice *device, GError **error)
{ {
@ -183,21 +129,6 @@ fu_nitrokey_device_setup (FuDevice *device, GError **error)
return TRUE; return TRUE;
} }
static gboolean
fu_nitrokey_device_close (FuUsbDevice *device, GError **error)
{
GUsbDevice *usb_device = fu_usb_device_get_dev (device);
g_autoptr(GError) error_local = NULL;
/* reconnect kernel driver */
if (!g_usb_device_release_interface (usb_device, 0x02,
G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
&error_local)) {
g_warning ("failed to release interface: %s", error_local->message);
}
return TRUE;
}
static void static void
fu_nitrokey_device_init (FuNitrokeyDevice *device) fu_nitrokey_device_init (FuNitrokeyDevice *device)
{ {
@ -211,8 +142,5 @@ static void
fu_nitrokey_device_class_init (FuNitrokeyDeviceClass *klass) fu_nitrokey_device_class_init (FuNitrokeyDeviceClass *klass)
{ {
FuDeviceClass *klass_device = FU_DEVICE_CLASS (klass); FuDeviceClass *klass_device = FU_DEVICE_CLASS (klass);
FuUsbDeviceClass *klass_usb_device = FU_USB_DEVICE_CLASS (klass);
klass_device->setup = fu_nitrokey_device_setup; klass_device->setup = fu_nitrokey_device_setup;
klass_usb_device->open = fu_nitrokey_device_open;
klass_usb_device->close = fu_nitrokey_device_close;
} }

5
plugins/nitrokey/fu-nitrokey-device.h
View File

@ -7,11 +7,12 @@
#pragma once #pragma once
#include "fu-plugin.h" #include "fu-plugin.h"
#include "fu-hid-device.h"
#define FU_TYPE_NITROKEY_DEVICE (fu_nitrokey_device_get_type ()) #define FU_TYPE_NITROKEY_DEVICE (fu_nitrokey_device_get_type ())
G_DECLARE_DERIVABLE_TYPE (FuNitrokeyDevice, fu_nitrokey_device, FU, NITROKEY_DEVICE, FuUsbDevice) G_DECLARE_DERIVABLE_TYPE (FuNitrokeyDevice, fu_nitrokey_device, FU, NITROKEY_DEVICE, FuHidDevice)
struct _FuNitrokeyDeviceClass struct _FuNitrokeyDeviceClass
{ {
FuUsbDeviceClass parent_class; FuHidDeviceClass parent_class;
}; };