GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-02-02 18:14:20 +00:00
Code Issues Releases Wiki Activity

HARD RESET to: Remove Bitcoin detection code.

Browse Source 
I'm pretty sure no one was working on this but me.

The code was unusable (gave 100% hardware errors) due to me not
testing it sufficiently. I hope this will not happen again.

ADL doesn't work for some reason, too.
This commit is contained in:
Noel Maersk 2013-11-17 03:38:30 +02:00
parent 8ea32a0b7a
commit d0070c0424
4 changed files with 8 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
Makefile.am
View File

@ -3,30 +3,22 @@ ACLOCAL_AMFLAGS = -I m4
JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src JANSSON_INCLUDES= -I$(top_builddir)/compat/jansson-2.5/src -I$(top_srcdir)/compat/jansson-2.5/src
if WANT_USBUTILS
USBUTILS_INCLUDES = -I$(top_builddir)/compat/libusb-1.0/libusb -I$(top_srcdir)/compat/libusb-1.0/libusb
else
USBUTILS_INCLUDES =
endif
EXTRA_DIST = example.conf m4/gnulib-cache.m4 linux-usb-cgminer \ EXTRA_DIST = example.conf m4/gnulib-cache.m4 linux-usb-cgminer \
ADL_SDK/readme.txt api-example.php miner.php \ ADL_SDK/readme.txt api-example.php miner.php \
API.class API.java api-example.c windows-build.txt \ API.class API.java api-example.c windows-build.txt \
bitstreams/* API-README FPGA-README SCRYPT-README \ bitstreams/* API-README SCRYPT-README \
bitforce-firmware-flash.c hexdump.c ASIC-README \ hexdump.c GPU-README
01-cgminer.rules GPU-README
SUBDIRS = lib compat ccan SUBDIRS = lib compat ccan
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES) INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
bin_PROGRAMS = cgminer bin_PROGRAMS = cgminer
cgminer_LDFLAGS = $(PTHREAD_FLAGS) cgminer_LDFLAGS = $(PTHREAD_FLAGS)
cgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \ cgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
@OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ \ @OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ \
@LIBUSB_LIBS@ @MM_LIBS@ @RT_LIBS@ \ @MM_LIBS@ @RT_LIBS@ @MATH_LIBS@ lib/libgnu.a ccan/libccan.a
@MATH_LIBS@ lib/libgnu.a ccan/libccan.a
if HAVE_WINDOWS if HAVE_WINDOWS
cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@
@ -52,56 +44,6 @@ cgminer_SOURCES += driver-opencl.h driver-opencl.c
cgminer_SOURCES += ocl.c ocl.h findnonce.c findnonce.h cgminer_SOURCES += ocl.c ocl.h findnonce.c findnonce.h
cgminer_SOURCES += adl.c adl.h adl_functions.h cgminer_SOURCES += adl.c adl.h adl_functions.h
cgminer_SOURCES += *.cl cgminer_SOURCES += *.cl
if HAS_SCRYPT
cgminer_SOURCES += scrypt.c scrypt.h cgminer_SOURCES += scrypt.c scrypt.h
endif
endif endif
if NEED_FPGAUTILS
cgminer_SOURCES += fpgautils.c fpgautils.h
endif
if WANT_USBUTILS
cgminer_SOURCES += usbutils.c usbutils.h
endif
# Device drivers
if HAS_AVALON
cgminer_SOURCES += driver-avalon.c driver-avalon.h
endif
if HAS_KNC
cgminer_SOURCES += driver-knc-spi-fpga.c
endif
if HAS_BFLSC
cgminer_SOURCES += driver-bflsc.c driver-bflsc.h
endif
if HAS_BITFORCE
cgminer_SOURCES += driver-bitforce.c
endif
if HAS_HASHFAST
cgminer_SOURCES += driver-hashfast.c driver-hashfast.h hf_protocol.h
endif
if HAS_BITFURY
cgminer_SOURCES += driver-bitfury.c driver-bitfury.h
endif
if HAS_ICARUS
cgminer_SOURCES += driver-icarus.c
endif
if HAS_KLONDIKE
cgminer_SOURCES += driver-klondike.c
endif
if HAS_MODMINER
cgminer_SOURCES += driver-modminer.c
bitstreamsdir = $(bindir)/bitstreams
dist_bitstreams_DATA = $(top_srcdir)/bitstreams/*
endif

5
compat/Makefile.am
View File

@ -1,8 +1,3 @@
SUBDIRS = jansson-2.5 SUBDIRS = jansson-2.5
if WANT_USBUTILS
if WANT_STATIC_LIBUSB
SUBDIRS += libusb-1.0
endif
endif

217
configure.ac
View File

@ -191,7 +191,7 @@ AC_ARG_ENABLE([adl],
[adl=$enableval] [adl=$enableval]
) )
scrypt="no" scrypt="yes"
if test "$found_opencl" = 1; then if test "$found_opencl" = 1; then
if test "x$adl" != xno; then if test "x$adl" != xno; then
@ -221,105 +221,6 @@ fi
AM_CONDITIONAL([HAS_SCRYPT], [test x$scrypt = xyes]) AM_CONDITIONAL([HAS_SCRYPT], [test x$scrypt = xyes])
avalon="no"
AC_ARG_ENABLE([avalon],
[AC_HELP_STRING([--enable-avalon],[Compile support for Avalon (default disabled)])],
[avalon=$enableval]
)
if test "x$avalon" = xyes; then
AC_DEFINE([USE_AVALON], [1], [Defined to 1 if Avalon support is wanted])
fi
AM_CONDITIONAL([HAS_AVALON], [test x$avalon = xyes])
knc="no"
AC_ARG_ENABLE([knc],
[AC_HELP_STRING([--enable-knc],[Compile support for KnC miners (default disabled)])],
[knc=$enableval]
)
if test "x$knc" = xyes; then
AC_DEFINE([USE_KNC], [1], [Defined to 1 if KnC miner support is wanted])
fi
AM_CONDITIONAL([HAS_KNC], [test x$knc = xyes])
bflsc="no"
AC_ARG_ENABLE([bflsc],
[AC_HELP_STRING([--enable-bflsc],[Compile support for BFL ASICs (default disabled)])],
[bflsc=$enableval]
)
if test "x$bflsc" = xyes; then
AC_DEFINE([USE_BFLSC], [1], [Defined to 1 if BFL ASIC support is wanted])
fi
AM_CONDITIONAL([HAS_BFLSC], [test x$bflsc = xyes])
bitforce="no"
AC_ARG_ENABLE([bitforce],
[AC_HELP_STRING([--enable-bitforce],[Compile support for BitForce FPGAs (default disabled)])],
[bitforce=$enableval]
)
if test "x$bitforce" = xyes; then
AC_DEFINE([USE_BITFORCE], [1], [Defined to 1 if BitForce support is wanted])
fi
AM_CONDITIONAL([HAS_BITFORCE], [test x$bitforce = xyes])
bitfury="no"
AC_ARG_ENABLE([bitfury],
[AC_HELP_STRING([--enable-bitfury],[Compile support for BitFury ASICs (default disabled)])],
[bitfury=$enableval]
)
if test "x$bitfury" = xyes; then
AC_DEFINE([USE_BITFURY], [1], [Defined to 1 if BitFury support is wanted])
fi
AM_CONDITIONAL([HAS_BITFURY], [test x$bitfury = xyes])
hashfast="no"
AC_ARG_ENABLE([hashfast],
[AC_HELP_STRING([--enable-hashfast],[Compile support for Hashfast (default disabled)])],
[hashfast=$enableval]
)
if test "x$hashfast" = xyes; then
AC_DEFINE([USE_HASHFAST], [1], [Defined to 1 if Hashfast support is wanted])
fi
AM_CONDITIONAL([HAS_HASHFAST], [test x$hashfast = xyes])
icarus="no"
AC_ARG_ENABLE([icarus],
[AC_HELP_STRING([--enable-icarus],[Compile support for Icarus (default disabled)])],
[icarus=$enableval]
)
if test "x$icarus" = xyes; then
AC_DEFINE([USE_ICARUS], [1], [Defined to 1 if Icarus support is wanted])
fi
AM_CONDITIONAL([HAS_ICARUS], [test x$icarus = xyes])
klondike="no"
AC_ARG_ENABLE([klondike],
[AC_HELP_STRING([--enable-klondike],[Compile support for Klondike (default disabled)])],
[klondike=$enableval]
)
if test "x$klondike" = xyes; then
AC_DEFINE([USE_KLONDIKE], [1], [Defined to 1 if Klondike support is wanted])
fi
AM_CONDITIONAL([HAS_KLONDIKE], [test x$klondike = xyes])
modminer="no"
AC_ARG_ENABLE([modminer],
[AC_HELP_STRING([--enable-modminer],[Compile support for ModMiner FPGAs(default disabled)])],
[modminer=$enableval]
)
if test "x$modminer" = xyes; then
AC_DEFINE([USE_MODMINER], [1], [Defined to 1 if ModMiner support is wanted])
fi
AM_CONDITIONAL([HAS_MODMINER], [test x$modminer = xyes])
curses="auto" curses="auto"
AC_ARG_WITH([curses], AC_ARG_WITH([curses],
@ -344,54 +245,10 @@ else
]) ])
fi fi
if test x$avalon$bitforce$bitfury$modminer$bflsc$icarus$hashfast$klondike != xnononononononono; then
want_usbutils=true
else
want_usbutils=false
fi
AM_CONDITIONAL([NEED_FPGAUTILS], [test x$modminer != xno])
AM_CONDITIONAL([WANT_USBUTILS], [test x$want_usbutils != xfalse])
AM_CONDITIONAL([HAVE_CURSES], [test x$curses = xyes]) AM_CONDITIONAL([HAVE_CURSES], [test x$curses = xyes])
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue]) AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue]) AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
if test "x$want_usbutils" != xfalse; then
dlibusb="no"
AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])
AC_ARG_WITH([system-libusb],
[AC_HELP_STRING([--with-system-libusb],[Compile against dynamic system libusb (default use included static libusb)])],
[dlibusb=$withval]
)
if test "x$dlibusb" != xno; then
case $target in
*-*-freebsd*)
LIBUSB_LIBS="-lusb"
LIBUSB_CFLAGS=""
AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])
;;
*)
PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])], [AC_MSG_ERROR([Could not find usb library - please install libusb-1.0])])
;;
esac
else
AC_CONFIG_SUBDIRS([compat/libusb-1.0])
LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
if test "x$have_linux" = "xtrue"; then
LIBUSB_LIBS+=" -ludev"
fi
if test "x$have_darwin" = "xtrue"; then
LIBUSB_LIBS+=" -lobjc"
LDFLAGS+=" -framework CoreFoundation -framework IOKit"
fi
fi
else
LIBUSB_LIBS=""
fi
AM_CONDITIONAL([WANT_STATIC_LIBUSB], [test x$dlibusb = xno])
AC_CONFIG_SUBDIRS([compat/jansson-2.5]) AC_CONFIG_SUBDIRS([compat/jansson-2.5])
JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a" JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"
@ -407,9 +264,6 @@ if test "x$have_cgminer_sdk" = "xtrue"; then
PKG_CONFIG_PATH="$CGMINER_SDK/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}" PKG_CONFIG_PATH="$CGMINER_SDK/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
fi fi
AC_SUBST(LIBUSB_LIBS)
AC_SUBST(LIBUSB_CFLAGS)
AC_ARG_ENABLE([libcurl], AC_ARG_ENABLE([libcurl],
[AC_HELP_STRING([--disable-libcurl],[Disable building with libcurl for getwork and GBT support])], [AC_HELP_STRING([--disable-libcurl],[Disable building with libcurl for getwork and GBT support])],
[libcurl=$enableval] [libcurl=$enableval]
@ -476,10 +330,6 @@ fi
AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to cgminer install]) AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to cgminer install])
AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel])
AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm130302"], [Filename for poclbm kernel])
AC_DEFINE_UNQUOTED([DIAKGCN_KERNNAME], ["diakgcn121016"], [Filename for diakgcn kernel])
AC_DEFINE_UNQUOTED([DIABLO_KERNNAME], ["diablo130302"], [Filename for diablo kernel])
AC_DEFINE_UNQUOTED([SCRYPT_KERNNAME], ["scrypt130511"], [Filename for scrypt kernel]) AC_DEFINE_UNQUOTED([SCRYPT_KERNNAME], ["scrypt130511"], [Filename for scrypt kernel])
@ -537,16 +387,12 @@ if test "x$opencl" != xno; then
else else
echo " OpenCL...............: NOT FOUND. GPU mining support DISABLED" echo " OpenCL...............: NOT FOUND. GPU mining support DISABLED"
if test "x$avalon$bitforce$bitfury$icarus$modminer$bflsc$hashfast$klondike$knc" = xnonononononononono; then AC_MSG_ERROR([No mining configured in])
AC_MSG_ERROR([No mining configured in])
fi
echo " scrypt...............: Disabled (needs OpenCL)" echo " scrypt...............: Disabled (needs OpenCL)"
fi fi
else else
echo " OpenCL...............: Detection overrided. GPU mining support DISABLED" echo " OpenCL...............: Detection overrided. GPU mining support DISABLED"
if test "x$avalon$bitforce$bitfury$icarus$modminer$bflsc$hashfast$klondike$knc" = xnonononononononono; then AC_MSG_ERROR([No mining configured in])
AC_MSG_ERROR([No mining configured in])
fi
echo " scrypt...............: Disabled (needs OpenCL)" echo " scrypt...............: Disabled (needs OpenCL)"
fi fi
@ -560,67 +406,12 @@ else
echo " ADL..................: Detection overrided. GPU monitoring support DISABLED" echo " ADL..................: Detection overrided. GPU monitoring support DISABLED"
fi fi
echo
if test "x$avalon" = xyes; then
echo " Avalon.ASICs.........: Enabled"
else
echo " Avalon.ASICs.........: Disabled"
fi
if test "x$bflsc" = xyes; then
echo " BFL.ASICs............: Enabled"
else
echo " BFL.ASICs............: Disabled"
fi
if test "x$knc" = xyes; then
echo " KnC.ASICs............: Enabled"
else
echo " KnC.ASICs............: Disabled"
fi
if test "x$bitforce" = xyes; then
echo " BitForce.FPGAs.......: Enabled"
else
echo " BitForce.FPGAs.......: Disabled"
fi
if test "x$bitfury" = xyes; then
echo " BitFury.ASICs........: Enabled"
else
echo " BitFury.ASICs........: Disabled"
fi
if test "x$hashfast" = xyes; then
echo " Hashfast.ASICs.......: Enabled"
else
echo " Hashfast.ASICs.......: Disabled"
fi
if test "x$icarus" = xyes; then
echo " Icarus.ASICs/FPGAs...: Enabled"
else
echo " Icarus.ASICs/FPGAs...: Disabled"
fi
if test "x$klondike" = xyes; then
echo " Klondike.ASICs.......: Enabled"
else
echo " Klondike.ASICs.......: Disabled"
fi
if test "x$modminer" = xyes; then
echo " ModMiner.FPGAs.......: Enabled"
else
echo " ModMiner.FPGAs.......: Disabled"
fi
echo echo
echo "Compilation............: make (or gmake)" echo "Compilation............: make (or gmake)"
echo " CPPFLAGS.............: $CPPFLAGS" echo " CPPFLAGS.............: $CPPFLAGS"
echo " CFLAGS...............: $CFLAGS" echo " CFLAGS...............: $CFLAGS"
echo " LDFLAGS..............: $LDFLAGS $PTHREAD_FLAGS" echo " LDFLAGS..............: $LDFLAGS $PTHREAD_FLAGS"
echo " LDADD................: $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $PTHREAD_LIBS $OPENCL_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $LIBUSB_LIBS $RT_LIBS" echo " LDADD................: $DLOPEN_FLAGS $LIBCURL_LIBS $JANSSON_LIBS $PTHREAD_LIBS $OPENCL_LIBS $NCURSES_LIBS $PDCURSES_LIBS $WS2_LIBS $MATH_LIBS $RT_LIBS"
echo echo
echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')" echo "Installation...........: make install (as root if needed, with 'su' or 'sudo')"
echo " prefix...............: $prefix" echo " prefix...............: $prefix"

15
ocl.c
View File

@ -437,18 +437,6 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
preferred_vwidth = 2; preferred_vwidth = 2;
switch (clState->chosen_kernel) { switch (clState->chosen_kernel) {
case KL_POCLBM:
strcpy(filename, POCLBM_KERNNAME".cl");
strcpy(binaryfilename, POCLBM_KERNNAME);
break;
case KL_PHATK:
strcpy(filename, PHATK_KERNNAME".cl");
strcpy(binaryfilename, PHATK_KERNNAME);
break;
case KL_DIAKGCN:
strcpy(filename, DIAKGCN_KERNNAME".cl");
strcpy(binaryfilename, DIAKGCN_KERNNAME);
break;
case KL_SCRYPT: case KL_SCRYPT:
strcpy(filename, SCRYPT_KERNNAME".cl"); strcpy(filename, SCRYPT_KERNNAME".cl");
strcpy(binaryfilename, SCRYPT_KERNNAME); strcpy(binaryfilename, SCRYPT_KERNNAME);
@ -456,9 +444,6 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
cgpu->vwidth = 1; cgpu->vwidth = 1;
break; break;
case KL_NONE: /* Shouldn't happen */ case KL_NONE: /* Shouldn't happen */
case KL_DIABLO:
strcpy(filename, DIABLO_KERNNAME".cl");
strcpy(binaryfilename, DIABLO_KERNNAME);
break; break;
} }