userspace/tools: bugfix 1235, postpone hw init in wr_phytool

Don't reset ports when help is wanted in wr_phytool. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

userspace/tools: bugfix 1235, postpone hw init in wr_phytool
Don't reset ports when help is wanted in wr_phytool. Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
6946ca99 · Adam Wujek · 3eb6e4e2 · 6946ca99
Commit 6946ca99 authored Feb 09, 2016 by Adam Wujek 💬
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

wr_phytool.c userspace/tools/wr_phytool.c +3 -3

No files found.
--- a/userspace/tools/wr_phytool.c
+++ b/userspace/tools/wr_phytool.c
@@ -580,11 +580,8 @@ struct {
 int main(int argc, char **argv)
 {
 	int i;
-	if (fpga_map(argv[0]) < 0)
-		exit(1);

 	wrs_msg_init(1, argv); /* only use argv[0]: no cmdline */
-	shw_init();

 	if(argc<3)
 	{
@@ -597,6 +594,9 @@ int main(int argc, char **argv)
 		return 0;
 	}

+	if (fpga_map(argv[0]) < 0)
+		exit(1);
+	shw_init();

 	for(i=0; commands[i].cmd;i++)
 		if(!strcmp(commands[i].cmd, argv[2]))