mirror
/
stlink
kopia lustrzana https://github.com/stlink-org/stlink
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Try to fix 666 issue (#668) 

* try to fix #666 issue
* has fixed few function's signatures for match g_thread_new expectations.
* fix check in stlink_gui_populate_filemem_view
* fix gcc-8 warnings
* fix g_return* for proper one
pull/670/head
Slyshyk Oleksiy 2018-02-16 14:01:08 +02:00 zatwierdzone przez Jerry Jacobs
rodzic 247b7eb9ba
commit d9a114a641
1 zmienionych plików z 20 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

30
src/tools/gui/stlink-gui.c
Wyświetl plik

@ -223,17 +223,18 @@ stlink_gui_update_devmem_view (STlinkGUI *gui)
}
static void
static gpointer
stlink_gui_populate_devmem_view (gpointer data)
{
guint off;
stm32_addr_t addr;
g_return_if_fail (STLINK_IS_GUI (data));
g_return_val_if_fail (STLINK_IS_GUI (data), NULL);
STlinkGUI *gui = (STlinkGUI *)data;
g_return_if_fail (gui != NULL);
g_return_if_fail (gui->sl != NULL);
g_return_val_if_fail ((gui != NULL), NULL);
g_return_val_if_fail ((gui->sl != NULL), NULL);
addr = gui->sl->flash_base;
@ -261,12 +262,14 @@ stlink_gui_populate_devmem_view (gpointer data)
stlink_gui_set_info_error_message (gui, "Failed to read memory");
g_free (gui->flash_mem.memory);
gui->flash_mem.memory = NULL;
return;
return NULL;
}
memcpy (gui->flash_mem.memory + off, gui->sl->q_buf, n_read);
gui->progress.fraction = (gdouble) (off + n_read) / gui->sl->flash_size;
}
g_idle_add ((GSourceFunc) stlink_gui_update_devmem_view, gui);
return NULL;
}
static gboolean
@ -286,7 +289,7 @@ stlink_gui_update_filemem_view (STlinkGUI *gui)
}
static gpointer
stlink_gui_populate_filemem_view (STlinkGUI *gui)
stlink_gui_populate_filemem_view (gpointer data)
{
guchar buffer[MEM_READ_SIZE];
GFile *file;
@ -295,6 +298,9 @@ stlink_gui_populate_filemem_view (STlinkGUI *gui)
gint off;
GError *err = NULL;
g_return_val_if_fail (STLINK_IS_GUI (data), NULL);
STlinkGUI *gui = (STlinkGUI *)data;
g_return_val_if_fail (gui != NULL, NULL);
g_return_val_if_fail (gui->filename != NULL, NULL);
@ -643,17 +649,21 @@ stlink_gui_write_flash_update (STlinkGUI *gui)
return FALSE;
}
static void
stlink_gui_write_flash (STlinkGUI *gui)
static gpointer
stlink_gui_write_flash (gpointer data)
{
g_return_if_fail (gui->sl != NULL);
g_return_if_fail (gui->filename != NULL);
g_return_val_if_fail (STLINK_IS_GUI (data), NULL);
STlinkGUI *gui = (STlinkGUI *)data;
g_return_val_if_fail ((gui->sl != NULL), NULL);
g_return_val_if_fail ((gui->filename != NULL), NULL);
if (stlink_fwrite_flash(gui->sl, gui->filename, gui->sl->flash_base) < 0) {
stlink_gui_set_info_error_message (gui, "Failed to write to flash");
}
g_idle_add ((GSourceFunc) stlink_gui_write_flash_update, gui);
return NULL;
}
static void