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

Rescan the DFU device after firmware has been updated

Browse Source
This commit is contained in:
Richard Hughes 2015-11-25 15:01:18 +00:00
parent a2b2b1cc68
commit 922dbc721a
1 changed files with 67 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/fu-provider-dfu.c
View File

@ -52,35 +52,25 @@ fu_provider_dfu_get_name (FuProvider *provider)
} }
/** /**
* fu_provider_dfu_device_added_cb: * fu_provider_dfu_device_update:
**/ **/
static void static void
fu_provider_dfu_device_added_cb (DfuContext *ctx, fu_provider_dfu_device_update (FuProviderDfu *provider_dfu,
DfuDevice *device, FuDevice *dev,
FuProviderDfu *provider_dfu) DfuDevice *device)
{ {
FuProviderDfuPrivate *priv = GET_PRIVATE (provider_dfu);
const gchar *platform_id; const gchar *platform_id;
const gchar *display_name;
guint16 release; guint16 release;
g_autofree gchar *guid = NULL; g_autofree gchar *guid = NULL;
g_autofree gchar *id = NULL;
g_autofree gchar *version = NULL; g_autofree gchar *version = NULL;
g_autofree gchar *vid_pid = NULL; g_autofree gchar *vid_pid = NULL;
g_autoptr(AsProfile) profile = as_profile_new ();
g_autoptr(AsProfileTask) ptask = NULL;
g_autoptr(FuDevice) dev = NULL;
g_autoptr(GError) error = NULL;
/* check mode */
platform_id = dfu_device_get_platform_id (device); platform_id = dfu_device_get_platform_id (device);
ptask = as_profile_start (profile, "FuProviderDfu:added{%s} [%04x:%04x]", if (dfu_device_get_runtime_vid (device) == 0xffff) {
platform_id, g_debug ("Ignoring DFU device not in runtime: %s", platform_id);
dfu_device_get_runtime_vid (device), return;
dfu_device_get_runtime_pid (device)); }
/* create new device */
dev = fu_device_new ();
fu_device_set_id (dev, platform_id);
/* check capabilities */ /* check capabilities */
if (dfu_device_can_download (device)) { if (dfu_device_can_download (device)) {
@ -96,17 +86,63 @@ fu_provider_dfu_device_added_cb (DfuContext *ctx,
fu_device_set_metadata (dev, FU_DEVICE_KEY_VERSION, version); fu_device_set_metadata (dev, FU_DEVICE_KEY_VERSION, version);
} }
/* get DFU VID:PID hash */
if (dfu_device_get_runtime_vid (device) == 0xffff) {
g_debug ("Ignoring DFU device not in runtime: %s", platform_id);
return;
}
vid_pid = g_strdup_printf ("USB\\VID_%04X&PID_%04X", vid_pid = g_strdup_printf ("USB\\VID_%04X&PID_%04X",
dfu_device_get_runtime_vid (device), dfu_device_get_runtime_vid (device),
dfu_device_get_runtime_pid (device)); dfu_device_get_runtime_pid (device));
guid = as_utils_guid_from_string (vid_pid); guid = as_utils_guid_from_string (vid_pid);
g_debug ("using %s for %s", guid, vid_pid); g_debug ("using %s for %s", guid, vid_pid);
fu_device_set_guid (dev, guid); fu_device_set_guid (dev, guid);
}
/**
* fu_provider_dfu_device_changed_cb:
**/
static void
fu_provider_dfu_device_changed_cb (DfuContext *ctx,
DfuDevice *device,
FuProviderDfu *provider_dfu)
{
FuProviderDfuPrivate *priv = GET_PRIVATE (provider_dfu);
FuDevice *dev;
const gchar *platform_id;
/* convert DfuDevice to FuDevice */
platform_id = dfu_device_get_platform_id (device);
dev = g_hash_table_lookup (priv->devices, platform_id);
if (dev == NULL) {
g_warning ("cannot find device %s", platform_id);
return;
}
fu_provider_dfu_device_update (provider_dfu, dev, device);
}
/**
* fu_provider_dfu_device_added_cb:
**/
static void
fu_provider_dfu_device_added_cb (DfuContext *ctx,
DfuDevice *device,
FuProviderDfu *provider_dfu)
{
FuProviderDfuPrivate *priv = GET_PRIVATE (provider_dfu);
const gchar *platform_id;
const gchar *display_name;
g_autofree gchar *id = NULL;
g_autoptr(AsProfile) profile = as_profile_new ();
g_autoptr(AsProfileTask) ptask = NULL;
g_autoptr(FuDevice) dev = NULL;
g_autoptr(GError) error = NULL;
platform_id = dfu_device_get_platform_id (device);
ptask = as_profile_start (profile, "FuProviderDfu:added{%s} [%04x:%04x]",
platform_id,
dfu_device_get_runtime_vid (device),
dfu_device_get_runtime_pid (device));
/* create new device */
dev = fu_device_new ();
fu_device_set_id (dev, platform_id);
fu_provider_dfu_device_update (provider_dfu, dev, device);
/* open device to get display name */ /* open device to get display name */
if (!dfu_device_open (device, DFU_DEVICE_OPEN_FLAG_NONE, NULL, &error)) { if (!dfu_device_open (device, DFU_DEVICE_OPEN_FLAG_NONE, NULL, &error)) {
@ -204,8 +240,10 @@ fu_provider_dfu_update (FuProvider *provider,
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
/* get device */ /* get device */
platform_id = fu_device_get_id (dev) + 4; platform_id = fu_device_get_id (dev);
device = dfu_context_get_device_by_platform_id (priv->context, platform_id, &error_local); device = dfu_context_get_device_by_platform_id (priv->context,
platform_id,
&error_local);
if (device == NULL) { if (device == NULL) {
g_set_error (error, g_set_error (error,
FWUPD_ERROR, FWUPD_ERROR,
@ -360,6 +398,9 @@ fu_provider_dfu_init (FuProviderDfu *provider_dfu)
g_signal_connect (priv->context, "device-removed", g_signal_connect (priv->context, "device-removed",
G_CALLBACK (fu_provider_dfu_device_removed_cb), G_CALLBACK (fu_provider_dfu_device_removed_cb),
provider_dfu); provider_dfu);
g_signal_connect (priv->context, "device-changed",
G_CALLBACK (fu_provider_dfu_device_changed_cb),
provider_dfu);
} }
/** /**