Merge pull request #19 in BIDU/software from monitoring to master

* commit '3f8ba6c0':
  rename regconfig etc to pcie40_regconfig

Pcie40Applications/Makefile

@@ -107,23 +107,23 @@ PCIE40_MINIPOD_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Driver -I$(TOP)/..
 PCIE40_MINIPOD_INSTALL =$(PREFIX)/bin
 PCIE40_MINIPOD_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs
 
-REGCONFIG :=regconfig
-REGCONFIG_OBJS =regconfig.o
-REGCONFIG_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Libraries
-REGCONFIG_INSTALL =$(PREFIX)/bin
-REGCONFIG_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs
-
-STATLINK :=statlink
-STATLINK_OBJS =statlink.o
-STATLINK_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Libraries 
-STATLINK_INSTALL =$(PREFIX)/bin
-STATLINK_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs
-
-TIMEDIFF :=timediff
-TIMEDIFF_OBJS =timediff.o
-TIMEDIFF_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Libraries 
-TIMEDIFF_INSTALL =$(PREFIX)/bin
-TIMEDIFF_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs -lrt
+PCIE40_REGCONFIG :=pcie40_regconfig
+PCIE40_REGCONFIG_OBJS =main_pcie40_regconfig.o
+PCIE40_REGCONFIG_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Libraries
+PCIE40_REGCONFIG_INSTALL =$(PREFIX)/bin
+PCIE40_REGCONFIG_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs
+
+PCIE40_STATLINK :=pcie40_statlink
+PCIE40_STATLINK_OBJS =main_pcie40_statlink.o
+PCIE40_STATLINK_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Libraries 
+PCIE40_STATLINK_INSTALL =$(PREFIX)/bin
+PCIE40_STATLINK_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs
+
+PCIE40_TIMEDIFF :=pcie40_timediff
+PCIE40_TIMEDIFF_OBJS =main_pcie40_timediff.o
+PCIE40_TIMEDIFF_CXXFLAGS =$(CFLAGS) -I$(TOP) -I$(TOP)/../Pcie40Libraries 
+PCIE40_TIMEDIFF_INSTALL =$(PREFIX)/bin
+PCIE40_TIMEDIFF_LDFLAGS = -L../Pcie40Libraries/lib -lpcie40 -L../Pcie40DriverLibraries/ -lpcie40driver_ecs -lrt
 
 PCIE40_DMATEST :=pcie40_dmatest
 PCIE40_DMATEST_OBJS =main_pcie40_dmatest.o pk_tstlib.o
@@ -151,9 +151,9 @@ $(eval $(call ODIR_template,PCIE40_ULRESET))
 $(eval $(call ODIR_template,PCIE40_READFPGAVERSION))
 $(eval $(call ODIR_template,PCIE40_MINIPOD))
 #$(eval $(call ODIR_template,PCIE40_DMATEST))
-$(eval $(call ODIR_template,REGCONFIG))
-$(eval $(call ODIR_template,STATLINK))
-$(eval $(call ODIR_template,TIMEDIFF))
+$(eval $(call ODIR_template,PCIE40_REGCONFIG))
+$(eval $(call ODIR_template,PCIE40_STATLINK))
+$(eval $(call ODIR_template,PCIE40_TIMEDIFF))
 $(eval $(call COPY_template,SCRIPTS,755))
 $(eval $(call LINK_template,PCIE40_RELOAD))
 $(eval $(call ODIR_template,PCIE40_RELOAD_SUID))

Pcie40Applications/regconfig.cpp → Pcie40Applications/main_pcie40_regconfig.cpp

@@ -182,7 +182,7 @@ void argument(int argc, char **argv){
                        "       --op operation name writen in check hsreg()\n\n"
 	               "       %s --ch 0 --stream /path/firmware.bit\n"
                        "       --stream /path/filename #streaming a file by using stream file method\n\n"
-	      , ARGV0, ARGV0, ARGV0);
+	      , ARGV0, ARGV0, ARGV0, ARGV0);
       return;
     }
   }