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

trivial: Remove the version from the DFU firmware format enum

Browse Source 
This isn't accurate, as it's used for all versions of DFU.
This commit is contained in:
Richard Hughes 2016-08-26 18:13:30 +01:00
parent b8d2de2110
commit 7920826098
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdfu/dfu-device.c
View File

@ -1780,7 +1780,7 @@ dfu_device_upload (DfuDevice *device,
g_debug ("switching to DefuSe automatically"); g_debug ("switching to DefuSe automatically");
dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFUSE); dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFUSE);
} else { } else {
dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFU_1_0); dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFU);
} }
/* do host reset */ /* do host reset */

10
libdfu/dfu-firmware.c
View File

@ -432,7 +432,7 @@ dfu_firmware_parse_data (DfuFirmware *firmware, GBytes *bytes,
return dfu_firmware_from_ihex (firmware, bytes, flags, error); return dfu_firmware_from_ihex (firmware, bytes, flags, error);
if (priv->format == DFU_FIRMWARE_FORMAT_ELF) if (priv->format == DFU_FIRMWARE_FORMAT_ELF)
return dfu_firmware_from_elf (firmware, bytes, flags, error); return dfu_firmware_from_elf (firmware, bytes, flags, error);
if (priv->format == DFU_FIRMWARE_FORMAT_DFU_1_0 || if (priv->format == DFU_FIRMWARE_FORMAT_DFU ||
priv->format == DFU_FIRMWARE_FORMAT_DFUSE) priv->format == DFU_FIRMWARE_FORMAT_DFUSE)
return dfu_firmware_from_dfu (firmware, bytes, flags, error); return dfu_firmware_from_dfu (firmware, bytes, flags, error);
return dfu_firmware_from_raw (firmware, bytes, flags, error); return dfu_firmware_from_raw (firmware, bytes, flags, error);
@ -593,7 +593,7 @@ dfu_firmware_write_data (DfuFirmware *firmware, GError **error)
return dfu_firmware_to_raw (firmware, error); return dfu_firmware_to_raw (firmware, error);
/* DFU or DfuSe*/ /* DFU or DfuSe*/
if (priv->format == DFU_FIRMWARE_FORMAT_DFU_1_0 || if (priv->format == DFU_FIRMWARE_FORMAT_DFU ||
priv->format == DFU_FIRMWARE_FORMAT_DFUSE) priv->format == DFU_FIRMWARE_FORMAT_DFUSE)
return dfu_firmware_to_dfu (firmware, error); return dfu_firmware_to_dfu (firmware, error);
@ -714,7 +714,7 @@ dfu_firmware_to_string (DfuFirmware *firmware)
/** /**
* dfu_firmware_format_to_string: * dfu_firmware_format_to_string:
* @format: a #DfuFirmwareFormat, e.g. %DFU_FIRMWARE_FORMAT_DFU_1_0 * @format: a #DfuFirmwareFormat, e.g. %DFU_FIRMWARE_FORMAT_DFU
* *
* Returns a string representaiton of the format. * Returns a string representaiton of the format.
* *
@ -727,7 +727,7 @@ dfu_firmware_format_to_string (DfuFirmwareFormat format)
{ {
if (format == DFU_FIRMWARE_FORMAT_RAW) if (format == DFU_FIRMWARE_FORMAT_RAW)
return "raw"; return "raw";
if (format == DFU_FIRMWARE_FORMAT_DFU_1_0) if (format == DFU_FIRMWARE_FORMAT_DFU)
return "dfu"; return "dfu";
if (format == DFU_FIRMWARE_FORMAT_DFUSE) if (format == DFU_FIRMWARE_FORMAT_DFUSE)
return "dfuse"; return "dfuse";
@ -754,7 +754,7 @@ dfu_firmware_format_from_string (const gchar *format)
if (g_strcmp0 (format, "raw") == 0) if (g_strcmp0 (format, "raw") == 0)
return DFU_FIRMWARE_FORMAT_RAW; return DFU_FIRMWARE_FORMAT_RAW;
if (g_strcmp0 (format, "dfu") == 0) if (g_strcmp0 (format, "dfu") == 0)
return DFU_FIRMWARE_FORMAT_DFU_1_0; return DFU_FIRMWARE_FORMAT_DFU;
if (g_strcmp0 (format, "dfuse") == 0) if (g_strcmp0 (format, "dfuse") == 0)
return DFU_FIRMWARE_FORMAT_DFUSE; return DFU_FIRMWARE_FORMAT_DFUSE;
if (g_strcmp0 (format, "ihex") == 0) if (g_strcmp0 (format, "ihex") == 0)

6
libdfu/dfu-firmware.h
View File

@ -71,8 +71,8 @@ typedef enum {
* DfuFirmwareFormat: * DfuFirmwareFormat:
* @DFU_FIRMWARE_FORMAT_UNKNOWN: Format unknown * @DFU_FIRMWARE_FORMAT_UNKNOWN: Format unknown
* @DFU_FIRMWARE_FORMAT_RAW: Raw format * @DFU_FIRMWARE_FORMAT_RAW: Raw format
* @DFU_FIRMWARE_FORMAT_DFU_1_0: DFU 1.0 * @DFU_FIRMWARE_FORMAT_DFU: DFU footer
* @DFU_FIRMWARE_FORMAT_DFUSE: DfuSe extension * @DFU_FIRMWARE_FORMAT_DFUSE: DfuSe header
* @DFU_FIRMWARE_FORMAT_INTEL_HEX: Intel HEX * @DFU_FIRMWARE_FORMAT_INTEL_HEX: Intel HEX
* @DFU_FIRMWARE_FORMAT_ELF: ELF * @DFU_FIRMWARE_FORMAT_ELF: ELF
* *
@ -81,7 +81,7 @@ typedef enum {
typedef enum { typedef enum {
DFU_FIRMWARE_FORMAT_UNKNOWN, DFU_FIRMWARE_FORMAT_UNKNOWN,
DFU_FIRMWARE_FORMAT_RAW, DFU_FIRMWARE_FORMAT_RAW,
DFU_FIRMWARE_FORMAT_DFU_1_0, DFU_FIRMWARE_FORMAT_DFU,
DFU_FIRMWARE_FORMAT_DFUSE, DFU_FIRMWARE_FORMAT_DFUSE,
DFU_FIRMWARE_FORMAT_INTEL_HEX, DFU_FIRMWARE_FORMAT_INTEL_HEX,
DFU_FIRMWARE_FORMAT_ELF, DFU_FIRMWARE_FORMAT_ELF,

8
libdfu/dfu-format-dfu.c
View File

@ -70,7 +70,7 @@ dfu_firmware_detect_dfu (GBytes *bytes)
switch (GUINT16_FROM_LE (ftr->ver)) { switch (GUINT16_FROM_LE (ftr->ver)) {
case DFU_VERSION_DFU_1_0: case DFU_VERSION_DFU_1_0:
case DFU_VERSION_DFU_1_1: case DFU_VERSION_DFU_1_1:
return DFU_FIRMWARE_FORMAT_DFU_1_0; return DFU_FIRMWARE_FORMAT_DFU;
case DFU_VERSION_DFUSE: case DFU_VERSION_DFUSE:
return DFU_FIRMWARE_FORMAT_DFUSE; return DFU_FIRMWARE_FORMAT_DFUSE;
default: default:
@ -181,7 +181,7 @@ dfu_firmware_from_dfu (DfuFirmware *firmware,
/* check version */ /* check version */
if ((flags & DFU_FIRMWARE_PARSE_FLAG_NO_VERSION_TEST) == 0) { if ((flags & DFU_FIRMWARE_PARSE_FLAG_NO_VERSION_TEST) == 0) {
if (dfu_firmware_get_format (firmware) != DFU_FIRMWARE_FORMAT_DFU_1_0 && if (dfu_firmware_get_format (firmware) != DFU_FIRMWARE_FORMAT_DFU &&
dfu_firmware_get_format (firmware) != DFU_FIRMWARE_FORMAT_DFUSE) { dfu_firmware_get_format (firmware) != DFU_FIRMWARE_FORMAT_DFUSE) {
g_set_error (error, g_set_error (error,
DFU_ERROR, DFU_ERROR,
@ -252,7 +252,7 @@ dfu_firmware_from_dfu (DfuFirmware *firmware,
static DfuVersion static DfuVersion
dfu_convert_version (DfuFirmwareFormat format) dfu_convert_version (DfuFirmwareFormat format)
{ {
if (format == DFU_FIRMWARE_FORMAT_DFU_1_0) if (format == DFU_FIRMWARE_FORMAT_DFU)
return DFU_VERSION_DFU_1_0; return DFU_VERSION_DFU_1_0;
if (format == DFU_FIRMWARE_FORMAT_DFUSE) if (format == DFU_FIRMWARE_FORMAT_DFUSE)
return DFU_VERSION_DFUSE; return DFU_VERSION_DFUSE;
@ -313,7 +313,7 @@ GBytes *
dfu_firmware_to_dfu (DfuFirmware *firmware, GError **error) dfu_firmware_to_dfu (DfuFirmware *firmware, GError **error)
{ {
/* plain DFU */ /* plain DFU */
if (dfu_firmware_get_format (firmware) == DFU_FIRMWARE_FORMAT_DFU_1_0) { if (dfu_firmware_get_format (firmware) == DFU_FIRMWARE_FORMAT_DFU) {
GBytes *contents; GBytes *contents;
DfuElement *element; DfuElement *element;
DfuImage *image; DfuImage *image;

6
libdfu/dfu-self-test.c
View File

@ -187,7 +187,7 @@ dfu_firmware_dfu_func (void)
/* write DFU format */ /* write DFU format */
firmware = dfu_firmware_new (); firmware = dfu_firmware_new ();
dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFU_1_0); dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFU);
dfu_firmware_set_vid (firmware, 0x1234); dfu_firmware_set_vid (firmware, 0x1234);
dfu_firmware_set_pid (firmware, 0x5678); dfu_firmware_set_pid (firmware, 0x5678);
dfu_firmware_set_release (firmware, 0xfedc); dfu_firmware_set_release (firmware, 0xfedc);
@ -209,7 +209,7 @@ dfu_firmware_dfu_func (void)
g_assert_cmpint (dfu_firmware_get_vid (firmware), ==, 0x1234); g_assert_cmpint (dfu_firmware_get_vid (firmware), ==, 0x1234);
g_assert_cmpint (dfu_firmware_get_pid (firmware), ==, 0x5678); g_assert_cmpint (dfu_firmware_get_pid (firmware), ==, 0x5678);
g_assert_cmpint (dfu_firmware_get_release (firmware), ==, 0xfedc); g_assert_cmpint (dfu_firmware_get_release (firmware), ==, 0xfedc);
g_assert_cmpint (dfu_firmware_get_format (firmware), ==, DFU_FIRMWARE_FORMAT_DFU_1_0); g_assert_cmpint (dfu_firmware_get_format (firmware), ==, DFU_FIRMWARE_FORMAT_DFU);
g_assert_cmpint (dfu_firmware_get_size (firmware), ==, 256); g_assert_cmpint (dfu_firmware_get_size (firmware), ==, 256);
/* load a real firmware */ /* load a real firmware */
@ -225,7 +225,7 @@ dfu_firmware_dfu_func (void)
g_assert_cmpint (dfu_firmware_get_vid (firmware), ==, 0x1c11); g_assert_cmpint (dfu_firmware_get_vid (firmware), ==, 0x1c11);
g_assert_cmpint (dfu_firmware_get_pid (firmware), ==, 0xb007); g_assert_cmpint (dfu_firmware_get_pid (firmware), ==, 0xb007);
g_assert_cmpint (dfu_firmware_get_release (firmware), ==, 0xffff); g_assert_cmpint (dfu_firmware_get_release (firmware), ==, 0xffff);
g_assert_cmpint (dfu_firmware_get_format (firmware), ==, DFU_FIRMWARE_FORMAT_DFU_1_0); g_assert_cmpint (dfu_firmware_get_format (firmware), ==, DFU_FIRMWARE_FORMAT_DFU);
g_assert_cmpint (dfu_firmware_get_size (firmware), ==, 0x8eB4); g_assert_cmpint (dfu_firmware_get_size (firmware), ==, 0x8eB4);
g_assert_cmpint (dfu_firmware_get_cipher_kind (firmware), ==, DFU_CIPHER_KIND_NONE); g_assert_cmpint (dfu_firmware_get_cipher_kind (firmware), ==, DFU_CIPHER_KIND_NONE);

2
libdfu/dfu-tool.c
View File

@ -1095,7 +1095,7 @@ dfu_tool_read_alt (DfuToolPrivate *priv, gchar **values, GError **error)
/* create new firmware object */ /* create new firmware object */
firmware = dfu_firmware_new (); firmware = dfu_firmware_new ();
dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFU_1_0); dfu_firmware_set_format (firmware, DFU_FIRMWARE_FORMAT_DFU);
dfu_firmware_set_vid (firmware, dfu_device_get_runtime_vid (device)); dfu_firmware_set_vid (firmware, dfu_device_get_runtime_vid (device));
dfu_firmware_set_pid (firmware, dfu_device_get_runtime_pid (device)); dfu_firmware_set_pid (firmware, dfu_device_get_runtime_pid (device));
dfu_firmware_add_image (firmware, image); dfu_firmware_add_image (firmware, image);