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

dfu: Use the new update_detach() and update_attach() vfuncs

Browse Source
This commit is contained in:
Richard Hughes 2017-11-11 20:52:32 +00:00
parent 09ff4c905d
commit 2adee9082b
1 changed files with 105 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
plugins/dfu/fu-plugin-dfu.c
View File

@ -235,32 +235,20 @@ fu_plugin_dfu_percentage_changed_cb (DfuDevice *device,
} }
gboolean gboolean
fu_plugin_update (FuPlugin *plugin, fu_plugin_update_detach (FuPlugin *plugin, FuDevice *dev, GError **error)
FuDevice *dev,
GBytes *blob_fw,
FwupdInstallFlags flags,
GError **error)
{ {
FuPluginData *data = fu_plugin_get_data (plugin); FuPluginData *data = fu_plugin_get_data (plugin);
DfuDevice *device; DfuDevice *device;
const gchar *platform_id;
g_autoptr(DfuFirmware) dfu_firmware = NULL; g_autoptr(DfuFirmware) dfu_firmware = NULL;
g_autoptr(FuDeviceLocker) locker = NULL; g_autoptr(FuDeviceLocker) locker = NULL;
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
/* get device */ /* get device */
platform_id = fu_device_get_id (dev);
device = dfu_context_get_device_by_platform_id (data->context, device = dfu_context_get_device_by_platform_id (data->context,
platform_id, fu_device_get_id (dev),
&error_local); error);
if (device == NULL) { if (device == NULL)
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_INTERNAL,
"cannot find device %s: %s",
platform_id, error_local->message);
return FALSE; return FALSE;
}
/* open it */ /* open it */
locker = fu_device_locker_new_full (device, locker = fu_device_locker_new_full (device,
@ -272,7 +260,105 @@ fu_plugin_update (FuPlugin *plugin,
FWUPD_ERROR, FWUPD_ERROR,
FWUPD_ERROR_INTERNAL, FWUPD_ERROR_INTERNAL,
"failed to open DFU device %s: %s", "failed to open DFU device %s: %s",
platform_id, error_local->message); fu_device_get_id (dev),
error_local->message);
return FALSE;
}
/* already in DFU mode */
if (dfu_device_get_mode (device) == DFU_MODE_DFU)
return TRUE;
/* detach and USB reset */
if (!dfu_device_detach (device, NULL, error))
return FALSE;
if (!dfu_device_wait_for_replug (device, 5000, NULL, error))
return FALSE;
/* success */
return TRUE;
}
gboolean
fu_plugin_update_attach (FuPlugin *plugin, FuDevice *dev, GError **error)
{
FuPluginData *data = fu_plugin_get_data (plugin);
DfuDevice *device;
g_autoptr(DfuFirmware) dfu_firmware = NULL;
g_autoptr(FuDeviceLocker) locker = NULL;
g_autoptr(GError) error_local = NULL;
/* get device */
device = dfu_context_get_device_by_platform_id (data->context,
fu_device_get_id (dev),
error);
if (device == NULL)
return FALSE;
/* open it */
locker = fu_device_locker_new_full (device,
(FuDeviceLockerFunc) dfu_device_open,
(FuDeviceLockerFunc) dfu_device_close,
&error_local);
if (locker == NULL) {
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_INTERNAL,
"failed to open DFU device %s: %s",
fu_device_get_id (dev),
error_local->message);
return FALSE;
}
/* already in runtime mode */
if (dfu_device_get_mode (device) == DFU_MODE_RUNTIME)
return TRUE;
/* attach it */
if (!dfu_device_attach (device, error))
return FALSE;
/* boot to runtime */
g_debug ("booting to runtime");
if (!dfu_device_wait_for_replug (device, 5000, NULL, error))
return FALSE;
/* success */
return TRUE;
}
gboolean
fu_plugin_update (FuPlugin *plugin,
FuDevice *dev,
GBytes *blob_fw,
FwupdInstallFlags flags,
GError **error)
{
FuPluginData *data = fu_plugin_get_data (plugin);
DfuDevice *device;
g_autoptr(DfuFirmware) dfu_firmware = NULL;
g_autoptr(FuDeviceLocker) locker = NULL;
g_autoptr(GError) error_local = NULL;
/* get device */
device = dfu_context_get_device_by_platform_id (data->context,
fu_device_get_id (dev),
error);
if (device == NULL)
return FALSE;
/* open it */
locker = fu_device_locker_new_full (device,
(FuDeviceLockerFunc) dfu_device_open,
(FuDeviceLockerFunc) dfu_device_close,
&error_local);
if (locker == NULL) {
g_set_error (error,
FWUPD_ERROR,
FWUPD_ERROR_INTERNAL,
"failed to open DFU device %s: %s",
fu_device_get_id (dev),
error_local->message);
return FALSE; return FALSE;
} }
g_signal_connect (device, "state-changed", g_signal_connect (device, "state-changed",
@ -286,11 +372,8 @@ fu_plugin_update (FuPlugin *plugin,
DFU_FIRMWARE_PARSE_FLAG_NONE, error)) DFU_FIRMWARE_PARSE_FLAG_NONE, error))
return FALSE; return FALSE;
if (!dfu_device_download (device, dfu_firmware, if (!dfu_device_download (device, dfu_firmware,
DFU_TARGET_TRANSFER_FLAG_DETACH | DFU_TARGET_TRANSFER_FLAG_VERIFY,
DFU_TARGET_TRANSFER_FLAG_VERIFY | NULL, error))
DFU_TARGET_TRANSFER_FLAG_WAIT_RUNTIME,
NULL,
error))
return FALSE; return FALSE;
/* we're done */ /* we're done */