mirror/gc_n64_usb-v3
1
0
Fork 0
mirror of https://github.com/raphnet/gc_n64_usb-v3 synced 2024-12-22 15:28:52 -05:00
Code Issues Releases Wiki Activity

Fix dfu-programmer detection under windows

Browse Source
This commit is contained in:
Raphael Assenat 2015-11-16 23:32:42 -05:00
parent 912c174b67
commit e1ef39d940
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tool/gcn64ctl_gui.c
View File

@ -285,6 +285,11 @@ G_MODULE_EXPORT void update_usbadapter_firmware(GtkWidget *w, gpointer data)
FILE *dfu_fp; FILE *dfu_fp;
char *filename = NULL, *basename = NULL; char *filename = NULL, *basename = NULL;
char adap_sig[64]; char adap_sig[64];
#ifndef WINDOWS
const char *notfound = "dfu-programmer not found. Cannot perform update.";
#else
const char *notfound = "dfu-programmer.exe not found. Cannot perform update.";
#endif
if (gcn64lib_getSignature(app->current_adapter_handle, adap_sig, sizeof(adap_sig))) { if (gcn64lib_getSignature(app->current_adapter_handle, adap_sig, sizeof(adap_sig))) {
errorPopup(app, "Could not read adapter signature - This file may not be meant for it (Bricking hazard!)"); errorPopup(app, "Could not read adapter signature - This file may not be meant for it (Bricking hazard!)");
@ -293,14 +298,23 @@ G_MODULE_EXPORT void update_usbadapter_firmware(GtkWidget *w, gpointer data)
/* Test for dfu-programmer presence in path*/ /* Test for dfu-programmer presence in path*/
dfu_fp = popen("dfu-programmer --version", "r"); dfu_fp = popen("dfu-programmer --version", "r");
//dfu_fp = popen("dfu2-programmer --version", "r");
if (!dfu_fp) { if (!dfu_fp) {
perror("popen"); perror("popen");
errorPopup(app, notfound);
return; return;
} }
res = pclose(dfu_fp); res = pclose(dfu_fp);
#ifdef WINDOWS WIFEXITED
// Under Mingw, 0 is returned when dfu-programmmer was found
// and executed. Otherwise 1.
if (res != 0) {
#else
// Under Unix, the usual is available.
if (!WIFEXITED(res) || (WEXITSTATUS(res)!=1)) { if (!WIFEXITED(res) || (WEXITSTATUS(res)!=1)) {
#endif
if (res) { if (res) {
errorPopup(app, "dfu-programmmer not found. Cannot perform update."); errorPopup(app, notfound);
return; return;
} }
} }