proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-05-29 23:26:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Richard Hughes 2017-11-11 20:29:17 +00:00
parent 0d7fdb3110
commit 37e124f3da
1 changed files with 95 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
plugins/unifying/fu-plugin-unifying.c
View File

@ -158,6 +158,101 @@ fu_plugin_unifying_attach_cb (gpointer user_data)
return FALSE; return FALSE;
} }
gboolean
fu_plugin_update_detach (FuPlugin *plugin, FuDevice *dev, GError **error)
{
FuPluginData *data = fu_plugin_get_data (plugin);
g_autoptr(LuDevice) device = NULL;
/* get device */
device = fu_plugin_unifying_get_device (plugin, dev, error);
if (device == NULL)
return FALSE;
if (!lu_device_open (device, error))
return FALSE;
/* switch to bootloader if required */
data->ignore_replug = TRUE;
if (!lu_device_has_flag (device, LU_DEVICE_FLAG_REQUIRES_DETACH))
return TRUE;
/* wait for device to come back */
fu_plugin_set_status (plugin, FWUPD_STATUS_DEVICE_RESTART);
if (lu_device_has_flag (device, LU_DEVICE_FLAG_DETACH_WILL_REPLUG)) {
g_debug ("doing detach in idle");
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
fu_plugin_unifying_detach_cb,
g_object_ref (device),
(GDestroyNotify) g_object_unref);
if (!lu_context_wait_for_replug (data->ctx,
device,
FU_DEVICE_TIMEOUT_REPLUG,
error))
return FALSE;
} else {
g_debug ("doing detach in main thread");
if (!lu_device_detach (device, error))
return FALSE;
}
return TRUE;
}
gboolean
fu_plugin_update_attach (FuPlugin *plugin, FuDevice *dev, GError **error)
{
FuPluginData *data = fu_plugin_get_data (plugin);
g_autoptr(LuDevice) device = NULL;
/* get device */
device = fu_plugin_unifying_get_device (plugin, dev, error);
if (device == NULL)
return FALSE;
if (!lu_device_open (device, error))
return FALSE;
/* wait for it to appear back in runtime mode if required */
if (!lu_device_has_flag (device, LU_DEVICE_FLAG_REQUIRES_ATTACH))
return TRUE;
/* wait for device to come back */
fu_plugin_set_status (plugin, FWUPD_STATUS_DEVICE_RESTART);
if (lu_device_has_flag (device, LU_DEVICE_FLAG_ATTACH_WILL_REPLUG)) {
g_debug ("doing attach in idle");
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
fu_plugin_unifying_attach_cb,
g_object_ref (device),
(GDestroyNotify) g_object_unref);
if (!lu_context_wait_for_replug (data->ctx,
device,
FU_DEVICE_TIMEOUT_REPLUG,
error))
return FALSE;
} else {
g_debug ("doing attach in main thread");
if (!lu_device_attach (device, error))
return FALSE;
}
data->ignore_replug = FALSE;
return TRUE;
}
gboolean
fu_plugin_update_reload (FuPlugin *plugin, FuDevice *dev, GError **error)
{
g_autoptr(LuDevice) device = NULL;
/* get device */
device = fu_plugin_unifying_get_device (plugin, dev, error);
if (device == NULL)
return FALSE;
if (!lu_device_open (device, error))
return FALSE;
/* set new version */
fu_device_set_version (dev, lu_device_get_version_fw (device));
return TRUE;
}
gboolean gboolean
fu_plugin_update (FuPlugin *plugin, fu_plugin_update (FuPlugin *plugin,
FuDevice *dev, FuDevice *dev,
@ -165,7 +260,6 @@ fu_plugin_update (FuPlugin *plugin,
FwupdInstallFlags flags, FwupdInstallFlags flags,
GError **error) GError **error)
{ {
FuPluginData *data = fu_plugin_get_data (plugin);
g_autoptr(LuDevice) device = NULL; g_autoptr(LuDevice) device = NULL;
/* get version */ /* get version */
@ -175,73 +269,14 @@ fu_plugin_update (FuPlugin *plugin,
if (!lu_device_open (device, error)) if (!lu_device_open (device, error))
return FALSE; return FALSE;
/* switch to bootloader */
data->ignore_replug = TRUE;
if (lu_device_has_flag (device, LU_DEVICE_FLAG_REQUIRES_DETACH)) {
/* wait for device to come back */
if (lu_device_has_flag (device, LU_DEVICE_FLAG_DETACH_WILL_REPLUG)) {
g_debug ("doing detach in idle");
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
fu_plugin_unifying_detach_cb,
g_object_ref (device),
(GDestroyNotify) g_object_unref);
if (!lu_context_wait_for_replug (data->ctx,
device,
FU_DEVICE_TIMEOUT_REPLUG,
error))
return FALSE;
g_object_unref (device);
device = fu_plugin_unifying_get_device (plugin, dev, error);
if (device == NULL)
return FALSE;
if (!lu_device_open (device, error))
return FALSE;
} else {
g_debug ("doing detach in main thread");
if (!lu_device_detach (device, error))
return FALSE;
}
}
/* write the firmware */ /* write the firmware */
fu_plugin_set_status (plugin, FWUPD_STATUS_DEVICE_WRITE); fu_plugin_set_status (plugin, FWUPD_STATUS_DEVICE_WRITE);
if (!lu_device_write_firmware (device, blob_fw, if (!lu_device_write_firmware (device, blob_fw,
lu_write_progress_cb, plugin, lu_write_progress_cb, plugin,
error)) error))
return FALSE; return FALSE;
fu_plugin_set_status (plugin, FWUPD_STATUS_DEVICE_RESTART);
/* wait for it to appear back in runtime mode */
if (lu_device_has_flag (device, LU_DEVICE_FLAG_REQUIRES_ATTACH)) {
if (lu_device_has_flag (device, LU_DEVICE_FLAG_ATTACH_WILL_REPLUG)) {
g_debug ("doing attach in idle");
g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
fu_plugin_unifying_attach_cb,
g_object_ref (device),
(GDestroyNotify) g_object_unref);
if (!lu_context_wait_for_replug (data->ctx,
device,
FU_DEVICE_TIMEOUT_REPLUG,
error))
return FALSE;
g_object_unref (device);
device = fu_plugin_unifying_get_device (plugin, dev, error);
if (device == NULL)
return FALSE;
if (!lu_device_open (device, error))
return FALSE;
} else {
g_debug ("doing attach in main thread");
if (!lu_device_attach (device, error))
return FALSE;
}
}
/* set new version */
fu_device_set_version (dev, lu_device_get_version_fw (device));
/* success */ /* success */
data->ignore_replug = FALSE;
return TRUE; return TRUE;
} }