Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to fix 666 issue #668

Merged
merged 7 commits into from
Feb 16, 2018
Merged

Try to fix 666 issue #668

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0717289
try to fix #666 issue
slyshykO Feb 15, 2018
a976472
has fixed few function's signatures for match g_thread_new expectations.
slyshykO Feb 16, 2018
9c4fdf9
fix check in stlink_gui_populate_filemem_view
slyshykO Feb 16, 2018
1a81728
fix gcc-8 warnings
slyshykO Feb 16, 2018
a4b265a
Merge branch 'master' into try-to-fix-666-issue
slyshykO Feb 16, 2018
910c195
fix g_return* for proper one
slyshykO Feb 16, 2018
4ba91eb
Merge branch 'try-to-fix-666-issue' of https://github.com/slyshykO/st…
slyshykO Feb 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 20 additions & 10 deletions src/tools/gui/stlink-gui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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;
Expand All @@ -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);

Expand Down Expand Up @@ -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
Expand Down