Browse Source

Include list of lowlevels built in configure and --help output

Luke Dashjr 12 years ago
parent
commit
03d18ac346
2 changed files with 10 additions and 0 deletions
  1. 9 0
      configure.ac
  2. 1 0
      miner.c

+ 9 - 0
configure.ac

@@ -114,6 +114,7 @@ AC_CHECK_FUNCS([sleep])
 
 
 AC_FUNC_ALLOCA
 AC_FUNC_ALLOCA
 
 
+lowllist=
 driverlist=
 driverlist=
 algolist=SHA256d
 algolist=SHA256d
 optlist=
 optlist=
@@ -1011,26 +1012,32 @@ if test "x$opencl$need_lowl_hid" = xnono; then
 	DLOPEN_FLAGS=""
 	DLOPEN_FLAGS=""
 fi
 fi
 
 
+lowllist="$lowllist hid/need_lowl_hid"
 if test x$need_lowl_hid = xyes; then
 if test x$need_lowl_hid = xyes; then
 	AC_DEFINE([NEED_BFG_LOWL_HID], [1], [Defined to 1 if lowlevel hid drivers are being used])
 	AC_DEFINE([NEED_BFG_LOWL_HID], [1], [Defined to 1 if lowlevel hid drivers are being used])
 	need_lowlevel=yes
 	need_lowlevel=yes
 fi
 fi
 
 
+lowllist="$lowllist pci/need_lowl_pci"
 if test x$need_lowl_pci = xyes; then
 if test x$need_lowl_pci = xyes; then
 	AC_DEFINE([NEED_BFG_LOWL_PCI], [1], [Defined to 1 if lowlevel PCI drivers are being used])
 	AC_DEFINE([NEED_BFG_LOWL_PCI], [1], [Defined to 1 if lowlevel PCI drivers are being used])
 	need_lowlevel=yes
 	need_lowlevel=yes
+	lowllist="$lowllist pci:uio/uio"
 	if test x$uio = xyes; then
 	if test x$uio = xyes; then
 		AC_DEFINE([USE_UIO], [1], [Defined to 1 if lowlevel PCI drivers should support UIO])
 		AC_DEFINE([USE_UIO], [1], [Defined to 1 if lowlevel PCI drivers should support UIO])
 	fi
 	fi
+	lowllist="$lowllist pci:vfio/vfio"
 	if test x$vfio = xyes; then
 	if test x$vfio = xyes; then
 		AC_DEFINE([USE_VFIO], [1], [Defined to 1 if lowlevel PCI drivers should support VFIO])
 		AC_DEFINE([USE_VFIO], [1], [Defined to 1 if lowlevel PCI drivers should support VFIO])
 	fi
 	fi
 fi
 fi
 
 
+lowllist="$lowllist usb/need_lowl_usb"
 if test x$need_lowl_usb = xyes; then
 if test x$need_lowl_usb = xyes; then
 	need_lowlevel=yes
 	need_lowlevel=yes
 fi
 fi
 
 
+lowllist="$lowllist vcom/need_lowl_vcom"
 if test x$need_lowl_vcom = xyes; then
 if test x$need_lowl_vcom = xyes; then
 	need_lowlevel=yes
 	need_lowlevel=yes
 fi
 fi
@@ -1568,6 +1575,7 @@ EOF
 	AC_DEFINE_UNQUOTED(AS_TR_CPP([BFG_$2]),["$_yeslist"],[List of drivers being built])
 	AC_DEFINE_UNQUOTED(AS_TR_CPP([BFG_$2]),["$_yeslist"],[List of drivers being built])
 	$2_print="  Enabled..$1..:${_yeslist}~  Disabled.$1..:${_nolist}${_enableactions}"
 	$2_print="  Enabled..$1..:${_yeslist}~  Disabled.$1..:${_nolist}${_enableactions}"
 ])
 ])
+BFG_PRINT_LIST([Lowlevel..],[lowllist])
 BFG_PRINT_LIST([Drivers...],[driverlist])
 BFG_PRINT_LIST([Drivers...],[driverlist])
 BFG_PRINT_LIST([Algorithms],[algolist])
 BFG_PRINT_LIST([Algorithms],[algolist])
 BFG_PRINT_LIST([Options...],[optlist])
 BFG_PRINT_LIST([Options...],[optlist])
@@ -1618,6 +1626,7 @@ echo "  CFLAGS...............: "`wordfilter "$CPPFLAGS $AUTOSCAN_CPPFLAGS $NCURS
 echo "  LDFLAGS..............: "`wordfilter "$LDFLAGS $AUTOSCAN_LIBS $PTHREAD_FLAGS $libblkmaker_LDFLAGS $PTHREAD_LIBS $LIBS $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $UDEV_LIBS $LIBUSB_LIBS $RT_LIBS $sensors_LIBS $libblkmaker_LIBS"`
 echo "  LDFLAGS..............: "`wordfilter "$LDFLAGS $AUTOSCAN_LIBS $PTHREAD_FLAGS $libblkmaker_LDFLAGS $PTHREAD_LIBS $LIBS $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $UDEV_LIBS $LIBUSB_LIBS $RT_LIBS $sensors_LIBS $libblkmaker_LIBS"`
 echo "  Installation.prefix..: $prefix"
 echo "  Installation.prefix..: $prefix"
 echo
 echo
+echo "${lowllist_print}" | tr '~' '\n'
 echo "${driverlist_print}" | tr '~' '\n'
 echo "${driverlist_print}" | tr '~' '\n'
 echo "${algolist_print}" | tr '~' '\n'
 echo "${algolist_print}" | tr '~' '\n'
 echo "${optlist_print}" | tr '~' '\n'
 echo "${optlist_print}" | tr '~' '\n'

+ 1 - 0
miner.c

@@ -2512,6 +2512,7 @@ extern const char *opt_argv0;
 static char *opt_verusage_and_exit(const char *extra)
 static char *opt_verusage_and_exit(const char *extra)
 {
 {
 	puts(packagename);
 	puts(packagename);
+	printf("  Lowlevel:%s\n", BFG_LOWLLIST);
 	printf("  Drivers:%s\n", BFG_DRIVERLIST);
 	printf("  Drivers:%s\n", BFG_DRIVERLIST);
 	printf("  Algoritms:%s\n", BFG_ALGOLIST);
 	printf("  Algoritms:%s\n", BFG_ALGOLIST);
 	printf("  Options:%s\n", BFG_OPTLIST);
 	printf("  Options:%s\n", BFG_OPTLIST);