Browse Source

Fork as BFGMiner

BFGMiner is dedicated to Barbara, patron Saint of miners and mathematicians.
Luke Dashjr 13 years ago
parent
commit
b9df56511c
18 changed files with 183 additions and 177 deletions
  1. 2 0
      .gitignore
  2. 2 2
      AUTHORS
  3. 1 1
      ChangeLog
  4. 1 1
      LICENSE
  5. 19 19
      Makefile.am
  6. 90 90
      README
  7. 1 1
      adl.c
  8. 1 1
      api-example.php
  9. 2 2
      api.c
  10. 3 3
      configure.ac
  11. 5 5
      driver-cpu.c
  12. 1 1
      driver-opencl.c
  13. 1 1
      driver-ztex.c
  14. 16 22
      linux-usb-bfgminer
  15. 18 8
      miner.c
  16. 5 5
      miner.php
  17. 2 2
      ocl.c
  18. 13 13
      windows-build.txt

+ 2 - 0
.gitignore

@@ -1,3 +1,5 @@
+bfgminer
+bfgminer.exe
 cgminer
 cgminer
 cgminer.exe
 cgminer.exe
 minerd
 minerd

+ 2 - 2
AUTHORS

@@ -1,4 +1,4 @@
 Original CPU mining software: Jeff Garzik <jgarzik@pobox.com>
 Original CPU mining software: Jeff Garzik <jgarzik@pobox.com>
-GPU mining and rewrite: Con Kolivas <kernel@kolivas.org> 15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ
-BitFORCE FPGA mining and refactor: Luke Dashjr <luke-jr+cgminer@utopios.org> 1NbRmS6a4dniwHHoSS9v3tEYUpP1Z5VVdL
+GPU mining and refactor: Con Kolivas <kernel@kolivas.org> 15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ
+FPGA mining and refactor: Luke Dashjr <luke-jr+bfgminer@utopios.org> 1QATWksNFGeUJCWBrN4g6hGM178Lovm7Wh
 API+: Andrew Smith <kanoi2@kano-kun.net> 1Jjk2LmktEQKnv8r2cZ9MvLiZwZ9gxabKm
 API+: Andrew Smith <kanoi2@kano-kun.net> 1Jjk2LmktEQKnv8r2cZ9MvLiZwZ9gxabKm

+ 1 - 1
ChangeLog

@@ -1,4 +1,4 @@
 See git repository ('git log') for full changelog.
 See git repository ('git log') for full changelog.
 
 
 Git repo can be found at:
 Git repo can be found at:
-https://github.com/ckolivas/cgminer
+https://github.com/luke-jr/bfgminer

+ 1 - 1
LICENSE

@@ -1,3 +1,3 @@
-Cgminer is available under the terms of the GNU Public License version 3.
+BFGMiner is available under the terms of the GNU Public License version 3.
 
 
 See COPYING for details.
 See COPYING for details.

+ 19 - 19
Makefile.am

@@ -7,7 +7,7 @@ else
 JANSSON_INCLUDES=
 JANSSON_INCLUDES=
 endif
 endif
 
 
-EXTRA_DIST	= example.conf m4/gnulib-cache.m4 linux-usb-cgminer \
+EXTRA_DIST	= example.conf m4/gnulib-cache.m4 linux-usb-bfgminer \
 		  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/*
 		  bitstreams/*
@@ -16,68 +16,68 @@ SUBDIRS		= lib compat ccan
 
 
 INCLUDES	= $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USB_FLAGS)
 INCLUDES	= $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USB_FLAGS)
 
 
-bin_PROGRAMS	= cgminer
+bin_PROGRAMS	= bfgminer
 
 
 bin_SCRIPTS	= *.cl
 bin_SCRIPTS	= *.cl
 
 
-cgminer_LDFLAGS	= $(PTHREAD_FLAGS)
-cgminer_LDADD	= $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ \
+bfgminer_LDFLAGS	= $(PTHREAD_FLAGS)
+bfgminer_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@ \
 		  @UDEV_LIBS@ @USB_LIBS@ \
 		  @UDEV_LIBS@ @USB_LIBS@ \
 		  @MATH_LIBS@ lib/libgnu.a ccan/libccan.a
 		  @MATH_LIBS@ lib/libgnu.a ccan/libccan.a
-cgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@
+bfgminer_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@
 
 
 # common sources
 # common sources
-cgminer_SOURCES := cgminer.c
+bfgminer_SOURCES := miner.c
 
 
-cgminer_SOURCES	+= elist.h miner.h compat.h bench_block.h	\
+bfgminer_SOURCES	+= elist.h miner.h compat.h bench_block.h	\
 		   util.c uthash.h logging.h			\
 		   util.c uthash.h logging.h			\
 		   sha2.c sha2.h api.c
 		   sha2.c sha2.h api.c
 
 
-cgminer_SOURCES	+= logging.c
+bfgminer_SOURCES	+= logging.c
 
 
 # GPU sources, TODO: make them selectable
 # GPU sources, TODO: make them selectable
 # the GPU portion extracted from original main.c
 # the GPU portion extracted from original main.c
-cgminer_SOURCES += driver-opencl.h driver-opencl.c
+bfgminer_SOURCES += driver-opencl.h driver-opencl.c
 
 
 # the original GPU related sources, unchanged
 # the original GPU related sources, unchanged
-cgminer_SOURCES += ocl.c ocl.h findnonce.c findnonce.h
-cgminer_SOURCES += adl.c adl.h adl_functions.h
-cgminer_SOURCES += *.cl
+bfgminer_SOURCES += ocl.c ocl.h findnonce.c findnonce.h
+bfgminer_SOURCES += adl.c adl.h adl_functions.h
+bfgminer_SOURCES += *.cl
 
 
 if HAS_CPUMINE
 if HAS_CPUMINE
 # original CPU related sources, unchanged
 # original CPU related sources, unchanged
-cgminer_SOURCES	+= \
+bfgminer_SOURCES	+= \
 		  sha256_generic.c sha256_4way.c sha256_via.c	\
 		  sha256_generic.c sha256_4way.c sha256_via.c	\
 		  sha256_cryptopp.c sha256_sse2_amd64.c		\
 		  sha256_cryptopp.c sha256_sse2_amd64.c		\
 		  sha256_sse4_amd64.c sha256_sse2_i386.c	\
 		  sha256_sse4_amd64.c sha256_sse2_i386.c	\
 		  sha256_altivec_4way.c
 		  sha256_altivec_4way.c
 
 
 # the CPU portion extracted from original main.c
 # the CPU portion extracted from original main.c
-cgminer_SOURCES += driver-cpu.h driver-cpu.c
+bfgminer_SOURCES += driver-cpu.h driver-cpu.c
 
 
 if HAS_YASM
 if HAS_YASM
 AM_CFLAGS	= -DHAS_YASM
 AM_CFLAGS	= -DHAS_YASM
 if HAVE_x86_64
 if HAVE_x86_64
 SUBDIRS		+= x86_64
 SUBDIRS		+= x86_64
-cgminer_LDADD	+= x86_64/libx8664.a
+bfgminer_LDADD	+= x86_64/libx8664.a
 else # HAVE_x86_64
 else # HAVE_x86_64
 SUBDIRS		+= x86_32
 SUBDIRS		+= x86_32
-cgminer_LDADD	+= x86_32/libx8632.a
+bfgminer_LDADD	+= x86_32/libx8632.a
 endif # HAVE_x86_64
 endif # HAVE_x86_64
 endif # HAS_YASM
 endif # HAS_YASM
 endif # HAS_CPUMINE
 endif # HAS_CPUMINE
 
 
 if HAS_BITFORCE
 if HAS_BITFORCE
-cgminer_SOURCES += driver-bitforce.c
+bfgminer_SOURCES += driver-bitforce.c
 endif
 endif
 
 
 if HAS_ICARUS
 if HAS_ICARUS
-cgminer_SOURCES += driver-icarus.c
+bfgminer_SOURCES += driver-icarus.c
 endif
 endif
 
 
 if HAS_ZTEX
 if HAS_ZTEX
-cgminer_SOURCES += driver-ztex.c libztex.c libztex.h
+bfgminer_SOURCES += driver-ztex.c libztex.c libztex.h
 bitstreamsdir = $(bindir)/bitstreams
 bitstreamsdir = $(bindir)/bitstreams
 dist_bitstreams_DATA = bitstreams/*
 dist_bitstreams_DATA = bitstreams/*
 endif
 endif

+ 90 - 90
README

@@ -7,26 +7,26 @@ This code is provided entirely free of charge by the programmer in his spare
 time so donations would be greatly appreciated. Please consider donating to the
 time so donations would be greatly appreciated. Please consider donating to the
 address below.
 address below.
 
 
-Con Kolivas <kernel@kolivas.org>
-15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ
+Luke-Jr <luke-jr+bfgminer@utopios.org>
+1QATWksNFGeUJCWBrN4g6hGM178Lovm7Wh
 
 
 DOWNLOADS:
 DOWNLOADS:
 
 
-http://ck.kolivas.org/apps/cgminer
+http://luke.dashjr.org/programs/bitcoin/files/bfgminer
 
 
 GIT TREE:
 GIT TREE:
 
 
-https://github.com/ckolivas/cgminer
+https://github.com/luke-jr/bfgminer
 
 
-Support thread:
+Bug reports:
 
 
-http://bitcointalk.org/index.php?topic=28402.0
+https://github.com/luke-jr/bfgminer/issues
 
 
 IRC Channel:
 IRC Channel:
 
 
-irc://irc.freenode.net/cgminer
+irc://irc.freenode.net/eligius
 
 
-License: GPLv2.  See COPYING for details.
+License: GPLv3.  See COPYING for details.
 
 
 READ EXECUTIVE SUMMARY BELOW FOR FIRST TIME USERS!
 READ EXECUTIVE SUMMARY BELOW FOR FIRST TIME USERS!
 
 
@@ -47,7 +47,7 @@ Dependencies:
 	libudev headers
 	libudev headers
 	(This is only required for FPGA auto-detection)
 	(This is only required for FPGA auto-detection)
 
 
-CGMiner specific configuration options:
+BFGMiner specific configuration options:
 	--enable-cpumining      Build with cpu mining support(default disabled)
 	--enable-cpumining      Build with cpu mining support(default disabled)
 	--disable-opencl        Override detection and disable building with opencl
 	--disable-opencl        Override detection and disable building with opencl
 	--disable-adl           Override detection and disable building with adl
 	--disable-adl           Override detection and disable building with adl
@@ -63,7 +63,7 @@ Basic *nix build instructions:
 	To build with GPU monitoring & clocking support:
 	To build with GPU monitoring & clocking support:
 	Extract the AMD ADL SDK, latest version - there is also no official
 	Extract the AMD ADL SDK, latest version - there is also no official
 	place for these files. Copy all the *.h files in the "include"
 	place for these files. Copy all the *.h files in the "include"
-	directory into cgminer's ADL_SDK directory.
+	directory into BFGMiner's ADL_SDK directory.
 
 
 The easiest way to install the ATI AMD SPP sdk on linux is to actually put it
 The easiest way to install the ATI AMD SPP sdk on linux is to actually put it
 into a system location. Then building will be simpler. Download the correct
 into a system location. Then building will be simpler. Download the correct
@@ -118,14 +118,14 @@ Native WIN32 build instructions (outdated, see windows-build.txt)
 
 
 ---
 ---
 
 
-Usage instructions:  Run "cgminer --help" to see options:
+Usage instructions:  Run "bfgminer --help" to see options:
 
 
 Usage: . [-atDdGCgIKklmpPQqrRsTouvwOchnV] 
 Usage: . [-atDdGCgIKklmpPQqrRsTouvwOchnV] 
 Options for both config file and command line:
 Options for both config file and command line:
 --api-allow         Allow API access (if enabled) only to the given list of [W:]IP[/Prefix] address[/subnets]
 --api-allow         Allow API access (if enabled) only to the given list of [W:]IP[/Prefix] address[/subnets]
                     This overrides --api-network and you must specify 127.0.0.1 if it is required
                     This overrides --api-network and you must specify 127.0.0.1 if it is required
                     W: in front of the IP address gives that address privileged access to all api commands
                     W: in front of the IP address gives that address privileged access to all api commands
---api-description   Description placed in the API status header (default: cgminer version)
+--api-description   Description placed in the API status header (default: BFGMiner version)
 --api-listen        Listen for API requests (default: disabled)
 --api-listen        Listen for API requests (default: disabled)
                     By default any command that does not just display data returns access denied
                     By default any command that does not just display data returns access denied
                     See --api-allow to overcome this
                     See --api-allow to overcome this
@@ -133,7 +133,7 @@ Options for both config file and command line:
 --api-port          Port number of miner API (default: 4028)
 --api-port          Port number of miner API (default: 4028)
 --auto-fan          Automatically adjust all GPU fan speeds to maintain a target temperature
 --auto-fan          Automatically adjust all GPU fan speeds to maintain a target temperature
 --auto-gpu          Automatically adjust all GPU engine clock speeds to maintain a target temperature
 --auto-gpu          Automatically adjust all GPU engine clock speeds to maintain a target temperature
---benchmark         Run cgminer in benchmark mode - produces no shares
+--benchmark         Run BFGMiner in benchmark mode - produces no shares
 --debug|-D          Enable debug output
 --debug|-D          Enable debug output
 --expiry|-E <arg>   Upper bound on how many seconds after getting work we consider a share from it stale (default: 120)
 --expiry|-E <arg>   Upper bound on how many seconds after getting work we consider a share from it stale (default: 120)
 --failover-only     Don't leak work to backup pools when primary pool is lagging
 --failover-only     Don't leak work to backup pools when primary pool is lagging
@@ -206,9 +206,9 @@ FPGA mining boards(BitForce, Icarus) only options:
 
 
 --scan-serial|-S <arg> Serial port to probe for FPGA mining device
 --scan-serial|-S <arg> Serial port to probe for FPGA mining device
 
 
-     By default, cgminer will scan for autodetected FPGAs unless at least one
-     -S is specified for that driver. If you specify -S and still want cgminer
-     to scan, you must also use "-S auto". If you want to prevent cgminer from
+     By default, BFGMiner will scan for autodetected FPGAs unless at least one
+     -S is specified for that driver. If you specify -S and still want BFGMiner
+     to scan, you must also use "-S auto". If you want to prevent BFGMiner from
      scanning without specifying a device, you can use "-S noauto". Note that
      scanning without specifying a device, you can use "-S noauto". Note that
      presently, autodetection only works on Linux, and might only detect one
      presently, autodetection only works on Linux, and might only detect one
      device depending on the version of udev being used.
      device depending on the version of udev being used.
@@ -237,7 +237,7 @@ CPU only options (deprecated, not included in binaries!):
 
 
 EXECUTIVE SUMMARY ON USAGE:
 EXECUTIVE SUMMARY ON USAGE:
 
 
-After saving configuration from the menu, you do not need to give cgminer any
+After saving configuration from the menu, you do not need to give BFGMiner any
 arguments and it will load your configuration.
 arguments and it will load your configuration.
 
 
 Any configuration file may also contain a single
 Any configuration file may also contain a single
@@ -248,27 +248,27 @@ Writing the configuration will save all settings from all files in the output.
 
 
 Single pool, regular desktop:
 Single pool, regular desktop:
 
 
-cgminer -o http://pool:port -u username -p password
+bfgminer -o http://pool:port -u username -p password
 
 
 Single pool, dedicated miner:
 Single pool, dedicated miner:
 
 
-cgminer -o http://pool:port -u username -p password -I 9
+bfgminer -o http://pool:port -u username -p password -I 9
 
 
 Single pool, first card regular desktop, 3 other dedicated cards:
 Single pool, first card regular desktop, 3 other dedicated cards:
 
 
-cgminer -o http://pool:port -u username -p password -I d,9,9,9
+bfgminer -o http://pool:port -u username -p password -I d,9,9,9
 
 
 Multiple pool, dedicated miner:
 Multiple pool, dedicated miner:
 
 
-cgminer -o http://pool1:port -u pool1username -p pool1password -o http://pool2:port -u pool2usernmae -p pool2password -I 9
+bfgminer -o http://pool1:port -u pool1username -p pool1password -o http://pool2:port -u pool2usernmae -p pool2password -I 9
 
 
 Add overclocking settings, GPU and fan control for all cards:
 Add overclocking settings, GPU and fan control for all cards:
 
 
-cgminer -o http://pool:port -u username -p password -I 9 --auto-fan --auto-gpu --gpu-engine 750-950 --gpu-memclock 300
+bfgminer -o http://pool:port -u username -p password -I 9 --auto-fan --auto-gpu --gpu-engine 750-950 --gpu-memclock 300
 
 
 Add overclocking settings, GPU and fan control with different engine settings for 4 cards:
 Add overclocking settings, GPU and fan control with different engine settings for 4 cards:
 
 
-cgminer -o http://pool:port -u username -p password -I 9 --auto-fan --auto-gpu --gpu-engine 750-950,945,700-930,960 --gpu-memclock 300
+bfgminer -o http://pool:port -u username -p password -I 9 --auto-fan --auto-gpu --gpu-engine 750-950,945,700-930,960 --gpu-memclock 300
 
 
 READ WARNINGS AND DOCUMENTATION BELOW ABOUT OVERCLOCKING
 READ WARNINGS AND DOCUMENTATION BELOW ABOUT OVERCLOCKING
 
 
@@ -360,7 +360,7 @@ The number of rejected shares
 The number of hardware erorrs
 The number of hardware erorrs
 The utility defines as the number of shares / minute
 The utility defines as the number of shares / minute
 
 
-The cgminer status line shows:
+The BFGMiner status line shows:
  TQ: 1  ST: 1  SS: 0  DW: 0  NB: 1  LW: 8  GF: 1  RF: 1
  TQ: 1  ST: 1  SS: 0  DW: 0  NB: 1  LW: 8  GF: 1  RF: 1
 
 
 TQ is Total Queued work items.
 TQ is Total Queued work items.
@@ -406,29 +406,29 @@ pool falls idle, the rest will take up the slack keeping the miner busy.
 ---
 ---
 LOGGING
 LOGGING
 
 
-cgminer will log to stderr if it detects stderr is being redirected to a file.
+BFGMiner will log to stderr if it detects stderr is being redirected to a file.
 To enable logging simply add 2>logfile.txt to your command line and logfile.txt
 To enable logging simply add 2>logfile.txt to your command line and logfile.txt
 will contain the logged output at the log level you specify (normal, verbose,
 will contain the logged output at the log level you specify (normal, verbose,
 debug etc.)
 debug etc.)
 
 
 In other words if you would normally use:
 In other words if you would normally use:
-./cgminer -o xxx -u yyy -p zzz
+./bfgminer -o xxx -u yyy -p zzz
 if you use
 if you use
-./cgminer -o xxx -u yyy -p zzz 2>logfile.txt
+./bfgminer -o xxx -u yyy -p zzz 2>logfile.txt
 it will log to a file called logfile.txt and otherwise work the same.
 it will log to a file called logfile.txt and otherwise work the same.
 
 
 There is also the -m option on linux which will spawn a command of your choice
 There is also the -m option on linux which will spawn a command of your choice
 and pipe the output directly to that command.
 and pipe the output directly to that command.
 
 
 
 
-If you start cgminer with the --sharelog option, you can get detailed
+If you start BFGMiner with the --sharelog option, you can get detailed
 information for each share found. The argument to the option may be "-" for
 information for each share found. The argument to the option may be "-" for
 standard output (not advisable with the ncurses UI), any valid positive number
 standard output (not advisable with the ncurses UI), any valid positive number
 for that file descriptor, or a filename.
 for that file descriptor, or a filename.
 
 
 To log share data to a file named "share.log", you can use either:
 To log share data to a file named "share.log", you can use either:
-./cgminer --sharelog 50 -o xxx -u yyy -p zzz 50>share.log
-./cgminer --sharelog share.log -o xxx -u yyy -p zzz
+./bfgminer --sharelog 50 -o xxx -u yyy -p zzz 50>share.log
+./bfgminer --sharelog share.log -o xxx -u yyy -p zzz
 
 
 For every share found, data will be logged in a CSV (Comma Separated Value)
 For every share found, data will be logged in a CSV (Comma Separated Value)
 format:
 format:
@@ -451,14 +451,14 @@ MAY CAUSE TO YOUR HARDWARE. OVERCLOCKING CAN INVALIDATE WARRANTIES, DAMAGE
 HARDWARE AND EVEN CAUSE FIRES. THE AUTHOR ASSUMES NO RESPONSIBILITY FOR ANY
 HARDWARE AND EVEN CAUSE FIRES. THE AUTHOR ASSUMES NO RESPONSIBILITY FOR ANY
 DAMAGE YOU MAY CAUSE OR UNPLANNED CHILDREN THAT MAY OCCUR AS A RESULT.
 DAMAGE YOU MAY CAUSE OR UNPLANNED CHILDREN THAT MAY OCCUR AS A RESULT.
 
 
-The GPU monitoring, clocking and fanspeed control incorporated into cgminer
+The GPU monitoring, clocking and fanspeed control incorporated into BFGMiner
 comes through use of the ATI Display Library. As such, it only supports ATI
 comes through use of the ATI Display Library. As such, it only supports ATI
-GPUs. Even if ADL support is successfully built into cgminer, unless the card
+GPUs. Even if ADL support is successfully built into BFGMiner, unless the card
 and driver supports it, no GPU monitoring/settings will be available.
 and driver supports it, no GPU monitoring/settings will be available.
 
 
-Cgminer supports initial setting of GPU engine clock speed, memory clock
+BFGMiner supports initial setting of GPU engine clock speed, memory clock
 speed, voltage, fanspeed, and the undocumented powertune feature of 69x0+ GPUs.
 speed, voltage, fanspeed, and the undocumented powertune feature of 69x0+ GPUs.
-The setting passed to cgminer is used by all GPUs unless separate values are
+The setting passed to BFGMiner is used by all GPUs unless separate values are
 specified. All settings can all be changed within the menu on the fly on a
 specified. All settings can all be changed within the menu on the fly on a
 per-GPU basis.
 per-GPU basis.
 
 
@@ -473,7 +473,7 @@ will try to set the engine clock of card 0 to 950, 1 to 945, 2 to 930, 3 to
 960 and all memory clocks to 300.
 960 and all memory clocks to 300.
 
 
 AUTO MODES:
 AUTO MODES:
-There are two "auto" modes in cgminer, --auto-fan and --auto-gpu. These can
+There are two "auto" modes in BFGMiner, --auto-fan and --auto-gpu. These can
 be used independently of each other and are complementary. Both auto modes
 be used independently of each other and are complementary. Both auto modes
 are designed to safely change settings while trying to maintain a target
 are designed to safely change settings while trying to maintain a target
 temperature. By default this is set to 75 degrees C but can be changed with:
 temperature. By default this is set to 75 degrees C but can be changed with:
@@ -522,11 +522,11 @@ the target temperature by the hysteresis amount, which is set to 3 by default
 and can be changed with:
 and can be changed with:
 --temp-hysteresis
 --temp-hysteresis
 If the temperature drops below the target temperature, and engine clock speed
 If the temperature drops below the target temperature, and engine clock speed
-is not at the highest level set at startup, cgminer will raise the clock speed.
+is not at the highest level set at startup, BFGMiner will raise the clock speed.
 If at any time you manually set an even higher clock speed successfully in
 If at any time you manually set an even higher clock speed successfully in
-cgminer, it will record this value and use it as its new upper limit (and the
+BFGMiner, it will record this value and use it as its new upper limit (and the
 same for low clock speeds and lower limits). If the temperature goes over the
 same for low clock speeds and lower limits). If the temperature goes over the
-cutoff limit (95 degrees by default), cgminer will completely disable the GPU
+cutoff limit (95 degrees by default), BFGMiner will completely disable the GPU
 from mining and it will not be re-enabled unless manually done so. The cutoff
 from mining and it will not be re-enabled unless manually done so. The cutoff
 temperature can be changed with:
 temperature can be changed with:
 
 
@@ -548,39 +548,39 @@ may report the value was changed successfully, and the new card power profile
 information contains the values you set it to, that the card itself may
 information contains the values you set it to, that the card itself may
 refuse to use those settings. As the performance profile changes dynamically,
 refuse to use those settings. As the performance profile changes dynamically,
 querying the "current" value on the card can be wrong as well. So when changing
 querying the "current" value on the card can be wrong as well. So when changing
-values in cgminer, after a pause of 1 second, it will report to you the current
+values in BFGMiner, after a pause of 1 second, it will report to you the current
 values where you should check that your change has taken. An example is that
 values where you should check that your change has taken. An example is that
 6970 reference cards will accept low memory values but refuse to actually run
 6970 reference cards will accept low memory values but refuse to actually run
 those lower memory values unless they're within 125 of the engine clock speed.
 those lower memory values unless they're within 125 of the engine clock speed.
 In that scenario, they usually set their real speed back to their default.
 In that scenario, they usually set their real speed back to their default.
 
 
-Cgminer reports the so-called "safe" range of whatever it is you are modifying
+BFGMiner reports the so-called "safe" range of whatever it is you are modifying
 when you ask to modify it on the fly. However, you can change settings to values
 when you ask to modify it on the fly. However, you can change settings to values
 outside this range. Despite this, the card can easily refuse to accept your
 outside this range. Despite this, the card can easily refuse to accept your
 changes, or worse, to accept your changes and then silently ignore them. So
 changes, or worse, to accept your changes and then silently ignore them. So
 there is absolutely to know how far to/from where/to it can set things safely or
 there is absolutely to know how far to/from where/to it can set things safely or
 otherwise, and there is nothing stopping you from at least trying to set them
 otherwise, and there is nothing stopping you from at least trying to set them
 outside this range. Being very conscious of these possible failures is why
 outside this range. Being very conscious of these possible failures is why
-cgminer will report back the current values for you to examine how exactly the
+BFGMiner will report back the current values for you to examine how exactly the
 card has responded. Even within the reported range of accepted values by the
 card has responded. Even within the reported range of accepted values by the
 card, it is very easy to crash just about any card, so it cannot use those
 card, it is very easy to crash just about any card, so it cannot use those
 values to determine what range to set. You have to provide something meaningful
 values to determine what range to set. You have to provide something meaningful
-manually for cgminer to work with through experimentation.
+manually for BFGMiner to work with through experimentation.
 
 
 STARTUP / SHUTDOWN:
 STARTUP / SHUTDOWN:
-When cgminer starts up, it tries to read off the current profile information
-for clock and fan speeds and stores these values. When quitting cgminer, it
+When BFGMiner starts up, it tries to read off the current profile information
+for clock and fan speeds and stores these values. When quitting BFGMiner, it
 will then try to restore the original values. Changing settings outside of
 will then try to restore the original values. Changing settings outside of
-cgminer while it's running may be reset to the startup cgminer values when
-cgminer shuts down because of this.
+BFGMiner while it's running may be reset to the startup BFGMiner values when
+BFGMiner shuts down because of this.
 
 
 ---
 ---
 
 
 RPC API
 RPC API
 
 
-If you start cgminer with the "--api-listen" option, it will listen on a
+If you start BFGMiner with the "--api-listen" option, it will listen on a
 simple TCP/IP socket for single string API requests from the same machine
 simple TCP/IP socket for single string API requests from the same machine
-running cgminer and reply with a string and then close the socket each time
+running BFGMiner and reply with a string and then close the socket each time
 If you add the "--api-network" option, it will accept API requests from any
 If you add the "--api-network" option, it will accept API requests from any
 network attached computer.
 network attached computer.
 
 
@@ -595,7 +595,7 @@ IP addresses are automatically padded with extra '.0's as needed
 Without a /prefix is the same as specifying /32
 Without a /prefix is the same as specifying /32
 0/0 means all IP addresses.
 0/0 means all IP addresses.
 The 'W:' on the front gives that address/subnet privileged access to commands
 The 'W:' on the front gives that address/subnet privileged access to commands
-that modify cgminer.
+that modify BFGMiner.
 Without it those commands return an access denied status.
 Without it those commands return an access denied status.
 Privileged access is checked in the order the IP addresses were supplied to
 Privileged access is checked in the order the IP addresses were supplied to
 "--api-allow"
 "--api-allow"
@@ -653,7 +653,7 @@ The STATUS section is:
    Message matching the Code value N
    Message matching the Code value N
 
 
   Description=string
   Description=string
-   This defaults to the cgminer version but is the value of --api-description
+   This defaults to the BFGMiner version but is the value of --api-description
    if it was specified at runtime.
    if it was specified at runtime.
 
 
 For API version 1.7:
 For API version 1.7:
@@ -662,7 +662,7 @@ The list of requests - a (*) means it requires privileged access - and replies a
 
 
  Request       Reply Section  Details
  Request       Reply Section  Details
  -------       -------------  -------
  -------       -------------  -------
- version       VERSION        CGMiner=cgminer version
+ version       VERSION        BFGMiner=bfgminer version
                               API=API version
                               API=API version
 
 
  config        CONFIG         Some miner configuration information:
  config        CONFIG         Some miner configuration information:
@@ -774,11 +774,11 @@ The list of requests - a (*) means it requires privileged access - and replies a
 
 
  save|filename (*)
  save|filename (*)
                none           There is no reply section just the STATUS section
                none           There is no reply section just the STATUS section
-                              stating success or failure saving the cgminer config
+                              stating success or failure saving the BFGMiner config
                               to filename
                               to filename
 
 
  quit (*)      none           There is no status section but just a single "BYE|"
  quit (*)      none           There is no status section but just a single "BYE|"
-                              reply before cgminer quits
+                              reply before BFGMiner quits
 
 
  notify        NOTIFY         The last status and history count of each devices problem
  notify        NOTIFY         The last status and history count of each devices problem
                               e.g. NOTIFY=0,Name=GPU,ID=0,Last Well=1332432290,...|
                               e.g. NOTIFY=0,Name=GPU,ID=0,Last Well=1332432290,...|
@@ -787,7 +787,7 @@ The list of requests - a (*) means it requires privileged access - and replies a
                none           There is no reply section just the STATUS section
                none           There is no reply section just the STATUS section
                               stating an error if you do not have privileged access
                               stating an error if you do not have privileged access
                               to the API and success if you do have privilege
                               to the API and success if you do have privilege
-                              The command doesn't change anything in cgminer
+                              The command doesn't change anything in BFGMiner
 
 
  pgaenable|N (*)
  pgaenable|N (*)
                none           There is no reply section just the STATUS section
                none           There is no reply section just the STATUS section
@@ -801,15 +801,15 @@ The list of requests - a (*) means it requires privileged access - and replies a
                               This is only available if PGA mining is enabled
                               This is only available if PGA mining is enabled
 
 
 When you enable, disable or restart a GPU or PGA, you will also get Thread messages
 When you enable, disable or restart a GPU or PGA, you will also get Thread messages
-in the cgminer status window
+in the BFGMiner status window
 
 
 When you switch to a different pool to the current one, you will get a
 When you switch to a different pool to the current one, you will get a
-'Switching to URL' message in the cgminer status windows
+'Switching to URL' message in the BFGMiner status windows
 
 
 Obviously, the JSON format is simply just the names as given before the '='
 Obviously, the JSON format is simply just the names as given before the '='
 with the values after the '='
 with the values after the '='
 
 
-If you enable cgminer debug (-D or --debug) you will also get messages showing
+If you enable BFGMiner debug (-D or --debug) you will also get messages showing
 details of the requests received and the replies
 details of the requests received and the replies
 
 
 There are included 4 program examples for accessing the API:
 There are included 4 program examples for accessing the API:
@@ -819,7 +819,7 @@ api-example.php - a php script to access the API
  by default it sends a 'summary' request to the miner at 127.0.0.1:4028
  by default it sends a 'summary' request to the miner at 127.0.0.1:4028
  If you specify a command it will send that request instead
  If you specify a command it will send that request instead
  You must modify the line "$socket = getsock('127.0.0.1', 4028);" at the
  You must modify the line "$socket = getsock('127.0.0.1', 4028);" at the
- beginning of "function request($cmd)" to change where it looks for cgminer
+ beginning of "function request($cmd)" to change where it looks for BFGMiner
 
 
 API.java/API.class
 API.java/API.class
  a java program to access the API (with source code)
  a java program to access the API (with source code)
@@ -844,10 +844,10 @@ GPU DEVICE ISSUES and use of --gpu-map
 GPUs mine with OpenCL software via the GPU device driver. This means you need
 GPUs mine with OpenCL software via the GPU device driver. This means you need
 to have both an OpenCL SDK installed, and the GPU device driver RUNNING (i.e.
 to have both an OpenCL SDK installed, and the GPU device driver RUNNING (i.e.
 Xorg up and running configured for all devices that will mine on linux etc.)
 Xorg up and running configured for all devices that will mine on linux etc.)
-Meanwhile, the hardware monitoring that cgminer offers for AMD devices relies
+Meanwhile, the hardware monitoring that BFGMiner offers for AMD devices relies
 on the ATI Display Library (ADL) software to work. OpenCL DOES NOT TALK TO THE
 on the ATI Display Library (ADL) software to work. OpenCL DOES NOT TALK TO THE
 ADL. There is no 100% reliable way to know that OpenCL devices are identical
 ADL. There is no 100% reliable way to know that OpenCL devices are identical
-to the ADL devices, as neither give off the same information. cgminer does its
+to the ADL devices, as neither give off the same information. BFGMiner does its
 best to correlate these devices based on the order that OpenCL and ADL numbers
 best to correlate these devices based on the order that OpenCL and ADL numbers
 them. It is possible that this will fail for the following reasons:
 them. It is possible that this will fail for the following reasons:
 
 
@@ -858,11 +858,11 @@ devices if you have two monitors connected to the one GPU.
 3. There are more ADL devices than OpenCL. ADL devices include any ATI GPUs,
 3. There are more ADL devices than OpenCL. ADL devices include any ATI GPUs,
 including ones that can't mine, like some older R4xxx cards.
 including ones that can't mine, like some older R4xxx cards.
 
 
-To cope with this, the ADVANCED option for --gpu-map is provided with cgminer.
+To cope with this, the ADVANCED option for --gpu-map is provided with BFGMiner.
 DO NOT USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING. The default will work the
 DO NOT USE THIS UNLESS YOU KNOW WHAT YOU ARE DOING. The default will work the
 vast majority of the time unless you know you have a problem already.
 vast majority of the time unless you know you have a problem already.
 
 
-To get useful information, start cgminer with just the -n option. You will get
+To get useful information, start BFGMiner with just the -n option. You will get
 output that looks like this:
 output that looks like this:
 
 
 [2012-04-25 13:17:34] CL Platform 0 vendor: Advanced Micro Devices, Inc.
 [2012-04-25 13:17:34] CL Platform 0 vendor: Advanced Micro Devices, Inc.
@@ -878,7 +878,7 @@ output that looks like this:
 [2012-04-25 13:17:34] 3 GPU devices max detected
 [2012-04-25 13:17:34] 3 GPU devices max detected
 
 
 Note the number of devices here match, and the order is the same. If devices 1
 Note the number of devices here match, and the order is the same. If devices 1
-and 2 were different between Tahiti and Cayman, you could run cgminer with:
+and 2 were different between Tahiti and Cayman, you could run BFGMiner with:
 --gpu-map 2:1,1:2
 --gpu-map 2:1,1:2
 And it would swap the monitoring it received from ADL device 1 and put it to
 And it would swap the monitoring it received from ADL device 1 and put it to
 opencl device 2 and vice versa.
 opencl device 2 and vice versa.
@@ -916,13 +916,13 @@ To work around this you would use:
 
 
 FAQ
 FAQ
 
 
-Q: cgminer segfaults when I change my shell window size.
+Q: BFGMiner segfaults when I change my shell window size.
 A: Older versions of libncurses have a bug to do with refreshing a window
 A: Older versions of libncurses have a bug to do with refreshing a window
 after a size change. Upgrading to a new version of curses will fix it.
 after a size change. Upgrading to a new version of curses will fix it.
 
 
 Q: Can I mine on servers from different networks (eg smartcoin and bitcoin) at
 Q: Can I mine on servers from different networks (eg smartcoin and bitcoin) at
 the same time?
 the same time?
-A: No, cgminer keeps a database of the block it's working on to ensure it does
+A: No, BFGMiner keeps a database of the block it's working on to ensure it does
 not work on stale blocks, and having different blocks from two networks would
 not work on stale blocks, and having different blocks from two networks would
 make it invalidate the work from each other.
 make it invalidate the work from each other.
 
 
@@ -940,11 +940,11 @@ does not support it.
 
 
 Q: The CPU usage is high.
 Q: The CPU usage is high.
 A: The ATI drivers after 11.6 have a bug that makes them consume 100% of one
 A: The ATI drivers after 11.6 have a bug that makes them consume 100% of one
-CPU core unnecessarily so downgrade to 11.6. Binding cgminer to one CPU core on
+CPU core unnecessarily so downgrade to 11.6. Binding BFGMiner to one CPU core on
 windows can minimise it to 100% (instead of more than one core). Driver version
 windows can minimise it to 100% (instead of more than one core). Driver version
 11.11 on linux and 11.12 on windows appear to have fixed this issue. Note that
 11.11 on linux and 11.12 on windows appear to have fixed this issue. Note that
 later drivers may have an apparent return of high CPU usage. Try
 later drivers may have an apparent return of high CPU usage. Try
-'export GPU_USE_SYNC_OBJECTS=1' on Linux before starting cgminer.
+'export GPU_USE_SYNC_OBJECTS=1' on Linux before starting BFGMiner.
 
 
 Q: Can you implement feature X?
 Q: Can you implement feature X?
 A: I can, but time is limited, and people who donate are more likely to get
 A: I can, but time is limited, and people who donate are more likely to get
@@ -952,12 +952,12 @@ their feature requests implemented.
 
 
 Q: My GPU hangs and I have to reboot it to get it going again?
 Q: My GPU hangs and I have to reboot it to get it going again?
 A: The more aggressively the mining software uses your GPU, the less overclock
 A: The more aggressively the mining software uses your GPU, the less overclock
-you will be able to run. You are more likely to hit your limits with cgminer
+you will be able to run. You are more likely to hit your limits with BFGMiner
 and you will find you may need to overclock your GPU less aggressively. The
 and you will find you may need to overclock your GPU less aggressively. The
 software cannot be responsible and make your GPU hang directly. If you simply
 software cannot be responsible and make your GPU hang directly. If you simply
 cannot get it to ever stop hanging, try decreasing the intensity, and if even
 cannot get it to ever stop hanging, try decreasing the intensity, and if even
 that fails, try changing to the poclbm kernel with -k poclbm, though you will
 that fails, try changing to the poclbm kernel with -k poclbm, though you will
-sacrifice performance. cgminer is designed to try and safely restart GPUs as
+sacrifice performance. BFGMiner is designed to try and safely restart GPUs as
 much as possible, but NOT if that restart might actually crash the rest of the
 much as possible, but NOT if that restart might actually crash the rest of the
 GPUs mining, or even the machine. It tries to restart them with a separate
 GPUs mining, or even the machine. It tries to restart them with a separate
 thread and if that separate thread dies, it gives up trying to restart any more
 thread and if that separate thread dies, it gives up trying to restart any more
@@ -965,16 +965,16 @@ GPUs.
 
 
 Q: Work keeps going to my backup pool even though my primary pool hasn't
 Q: Work keeps going to my backup pool even though my primary pool hasn't
 failed?
 failed?
-A: Cgminer checks for conditions where the primary pool is lagging and will
+A: BFGMiner checks for conditions where the primary pool is lagging and will
 pass some work to the backup servers under those conditions. The reason for
 pass some work to the backup servers under those conditions. The reason for
 doing this is to try its absolute best to keep the GPUs working on something
 doing this is to try its absolute best to keep the GPUs working on something
 useful and not risk idle periods. You can disable this behaviour with the
 useful and not risk idle periods. You can disable this behaviour with the
 option --failover-only.
 option --failover-only.
 
 
 Q: Is this a virus?
 Q: Is this a virus?
-A: Cgminer is being packaged with other trojan scripts and some antivirus
-software is falsely accusing cgminer.exe as being the actual virus, rather
-than whatever it is being packaged with. If you installed cgminer yourself,
+A: BFGMiner is being packaged with other trojan scripts and some antivirus
+software is falsely accusing bfgminer.exe as being the actual virus, rather
+than whatever it is being packaged with. If you installed BFGMiner yourself,
 then you do not have a virus on your computer. Complain to your antivirus
 then you do not have a virus on your computer. Complain to your antivirus
 software company.
 software company.
 
 
@@ -1005,43 +1005,43 @@ Q: What happened to CPU mining?
 A: Being increasingly irrelevant for most users, and a maintenance issue, it is
 A: Being increasingly irrelevant for most users, and a maintenance issue, it is
 no longer under active development and will not be supported unless someone
 no longer under active development and will not be supported unless someone
 steps up to help maintain it. No binary builds supporting CPU mining will be
 steps up to help maintain it. No binary builds supporting CPU mining will be
-released but CPU mining can be built into cgminer when it is compiled.
+released but CPU mining can be built into BFGMiner when it is compiled.
 
 
-Q: I upgraded cgminer version and mu hashrate suddenly dropped!
-A: No, you upgraded your SDK version unwittingly between upgrades of cgminer
+Q: I upgraded BFGMiner version and mu hashrate suddenly dropped!
+A: No, you upgraded your SDK version unwittingly between upgrades of BFGMiner
 and that caused  your hashrate to drop. See the next question.
 and that caused  your hashrate to drop. See the next question.
 
 
-Q: I upgraded my ATI driver/SDK/cgminer and my hashrate suddenly dropped!
-A: The hashrate performance in cgminer is tied to the version of the ATI SDK
-that is installed only for the very first time cgminer is run. This generates
+Q: I upgraded my ATI driver/SDK/BFGMiner and my hashrate suddenly dropped!
+A: The hashrate performance in BFGMiner is tied to the version of the ATI SDK
+that is installed only for the very first time BFGMiner is run. This generates
 binaries that are used by the GPU every time after that. Any upgrades to the
 binaries that are used by the GPU every time after that. Any upgrades to the
 SDK after that time will have no effect on the binaries. However, if you
 SDK after that time will have no effect on the binaries. However, if you
-install a fresh version of cgminer, and have since upgraded your SDK, new
+install a fresh version of BFGMiner, and have since upgraded your SDK, new
 binaries will be built. It is known that the 2.6 ATI SDK has a huge hashrate
 binaries will be built. It is known that the 2.6 ATI SDK has a huge hashrate
 penalty on generating new binaries. It is recommended to not use this SDK at
 penalty on generating new binaries. It is recommended to not use this SDK at
 this time unless you are using an ATI 7xxx card that needs it.
 this time unless you are using an ATI 7xxx card that needs it.
 
 
-Q: Which ATI SDK is the best for cgminer?
+Q: Which ATI SDK is the best for BFGMiner?
 A: At the moment, versions 2.4 and 2.5 work the best. If you are forced to use
 A: At the moment, versions 2.4 and 2.5 work the best. If you are forced to use
 the 2.6 SDK, the phatk kernel will perform poorly, while the diablo or my
 the 2.6 SDK, the phatk kernel will perform poorly, while the diablo or my
 custom modified poclbm kernel are optimised for it.
 custom modified poclbm kernel are optimised for it.
 
 
 Q: I have multiple SDKs installed, can I choose which one it uses?
 Q: I have multiple SDKs installed, can I choose which one it uses?
-A: Run cgminer with the -n option and it will list all the platforms currently
-installed. Then you can tell cgminer which platform to use with --gpu-platform.
+A: Run bfgminer with the -n option and it will list all the platforms currently
+installed. Then you can tell BFGMiner which platform to use with --gpu-platform.
 
 
 Q: GUI version?
 Q: GUI version?
 A: No. The RPC interface makes it possible for someone else to write one
 A: No. The RPC interface makes it possible for someone else to write one
 though.
 though.
 
 
 Q: I'm having an issue. What debugging information should I provide?
 Q: I'm having an issue. What debugging information should I provide?
-A: Start cgminer with your regular commands and add -D -T --verbose and provide
+A: Start BFGMiner with your regular commands and add -D -T --verbose and provide
 the full startup output and a summary of your hardware, operating system, ATI
 the full startup output and a summary of your hardware, operating system, ATI
 driver version and ATI stream version.
 driver version and ATI stream version.
 
 
-Q: cgminer reports no devices or only one device on startup on Linux although
+Q: BFGMiner reports no devices or only one device on startup on Linux although
 I have multiple devices and drivers+SDK installed properly?
 I have multiple devices and drivers+SDK installed properly?
-A: Try 'export DISPLAY=:0" before running cgminer.
+A: Try 'export DISPLAY=:0" before running BFGMiner.
 
 
 Q: My network gets slower and slower and then dies for a minute?
 Q: My network gets slower and slower and then dies for a minute?
 A; Try the --net-delay option.
 A; Try the --net-delay option.
@@ -1051,7 +1051,7 @@ A: p2pool has very rapid expiration of work and new blocks, it is suggested you
 decrease intensity by 1 from your optimal value, and decrease GPU threads to 1
 decrease intensity by 1 from your optimal value, and decrease GPU threads to 1
 with -g 1.
 with -g 1.
 
 
-Q: Are kernels from other mining software useable in cgminer?
+Q: Are kernels from other mining software useable in BFGMiner?
 A: No, the APIs are slightly different between the different software and they
 A: No, the APIs are slightly different between the different software and they
 will not work.
 will not work.
 
 
@@ -1061,7 +1061,7 @@ working in the logs?
 A: http://us.php.net/manual/en/sockets.installation.php
 A: http://us.php.net/manual/en/sockets.installation.php
 
 
 Q: What is a PGA?
 Q: What is a PGA?
-A: At the moment, cgminer supports 2 FPGA's: Icarus and BitForce.
+A: At the moment, BFGMiner supports 2 FPGA's: Icarus and BitForce.
 They are Field-Programmable Gate Arrays that have been programmed to do Bitcoin
 They are Field-Programmable Gate Arrays that have been programmed to do Bitcoin
 mining. Since the acronym needs to be only 3 characters, the "Field-" part has
 mining. Since the acronym needs to be only 3 characters, the "Field-" part has
 been skipped.
 been skipped.
@@ -1072,5 +1072,5 @@ This code is provided entirely free of charge by the programmer in his spare
 time so donations would be greatly appreciated. Please consider donating to the
 time so donations would be greatly appreciated. Please consider donating to the
 address below.
 address below.
 
 
-Con Kolivas <kernel@kolivas.org>
-15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ
+Luke-Jr <luke-jr+bfgminer@utopios.org>
+1QATWksNFGeUJCWBrN4g6hGM178Lovm7Wh

+ 1 - 1
adl.c

@@ -693,7 +693,7 @@ int gpu_fanpercent(int gpu)
 	if (unlikely(ga->has_fanspeed && ret == -1)) {
 	if (unlikely(ga->has_fanspeed && ret == -1)) {
 		applog(LOG_WARNING, "GPU %d stopped reporting fanspeed due to driver corruption", gpu);
 		applog(LOG_WARNING, "GPU %d stopped reporting fanspeed due to driver corruption", gpu);
 		if (opt_restart) {
 		if (opt_restart) {
-			applog(LOG_WARNING, "Restart enabled, will restart cgminer");
+			applog(LOG_WARNING, "Restart enabled, will restart BFGMiner");
 			applog(LOG_WARNING, "You can disable this with the --no-restart option");
 			applog(LOG_WARNING, "You can disable this with the --no-restart option");
 			app_restart();
 			app_restart();
 		}
 		}

+ 1 - 1
api-example.php

@@ -1,6 +1,6 @@
 <?php
 <?php
 #
 #
-# Sample Socket I/O to CGMiner API
+# Sample Socket I/O to BFGMiner API
 #
 #
 function getsock($addr, $port)
 function getsock($addr, $port)
 {
 {

+ 2 - 2
api.c

@@ -427,7 +427,7 @@ struct CODES {
  { SEVERITY_SUCC,  MSG_NUMGPU,	PARAM_NONE,	"GPU count" },
  { SEVERITY_SUCC,  MSG_NUMGPU,	PARAM_NONE,	"GPU count" },
  { SEVERITY_SUCC,  MSG_NUMPGA,	PARAM_NONE,	"PGA count" },
  { SEVERITY_SUCC,  MSG_NUMPGA,	PARAM_NONE,	"PGA count" },
  { SEVERITY_SUCC,  MSG_NUMCPU,	PARAM_NONE,	"CPU count" },
  { SEVERITY_SUCC,  MSG_NUMCPU,	PARAM_NONE,	"CPU count" },
- { SEVERITY_SUCC,  MSG_VERSION,	PARAM_NONE,	"CGMiner versions" },
+ { SEVERITY_SUCC,  MSG_VERSION,	PARAM_NONE,	"BFGMiner versions" },
  { SEVERITY_ERR,   MSG_INVJSON,	PARAM_NONE,	"Invalid JSON" },
  { SEVERITY_ERR,   MSG_INVJSON,	PARAM_NONE,	"Invalid JSON" },
  { SEVERITY_ERR,   MSG_MISCMD,	PARAM_CMD,	"Missing JSON '%s'" },
  { SEVERITY_ERR,   MSG_MISCMD,	PARAM_CMD,	"Missing JSON '%s'" },
  { SEVERITY_ERR,   MSG_MISPID,	PARAM_NONE,	"Missing pool id parameter" },
  { SEVERITY_ERR,   MSG_MISPID,	PARAM_NONE,	"Missing pool id parameter" },
@@ -438,7 +438,7 @@ struct CODES {
  { SEVERITY_ERR,   MSG_NOGPUADL,PARAM_GPU,	"GPU %d does not have ADL" },
  { SEVERITY_ERR,   MSG_NOGPUADL,PARAM_GPU,	"GPU %d does not have ADL" },
  { SEVERITY_ERR,   MSG_INVINT,	PARAM_STR,	"Invalid intensity (%s) - must be '" _DYNAMIC  "' or range " _MIN_INTENSITY_STR " - " _MAX_INTENSITY_STR },
  { SEVERITY_ERR,   MSG_INVINT,	PARAM_STR,	"Invalid intensity (%s) - must be '" _DYNAMIC  "' or range " _MIN_INTENSITY_STR " - " _MAX_INTENSITY_STR },
  { SEVERITY_INFO,  MSG_GPUINT,	PARAM_BOTH,	"GPU %d set new intensity to %s" },
  { SEVERITY_INFO,  MSG_GPUINT,	PARAM_BOTH,	"GPU %d set new intensity to %s" },
- { SEVERITY_SUCC,  MSG_MINECON, PARAM_NONE,	"CGMiner config" },
+ { SEVERITY_SUCC,  MSG_MINECON, PARAM_NONE,	"BFGMiner config" },
  { SEVERITY_ERR,   MSG_GPUMERR,	PARAM_BOTH,	"Setting GPU %d memoryclock to (%s) reported failure" },
  { SEVERITY_ERR,   MSG_GPUMERR,	PARAM_BOTH,	"Setting GPU %d memoryclock to (%s) reported failure" },
  { SEVERITY_SUCC,  MSG_GPUMEM,	PARAM_BOTH,	"Setting GPU %d memoryclock to (%s) reported succeess" },
  { SEVERITY_SUCC,  MSG_GPUMEM,	PARAM_BOTH,	"Setting GPU %d memoryclock to (%s) reported succeess" },
  { SEVERITY_ERR,   MSG_GPUEERR,	PARAM_BOTH,	"Setting GPU %d clock to (%s) reported failure" },
  { SEVERITY_ERR,   MSG_GPUEERR,	PARAM_BOTH,	"Setting GPU %d clock to (%s) reported failure" },

+ 3 - 3
configure.ac

@@ -11,12 +11,12 @@ m4_define([lt_age], v_min)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 
 
-AC_INIT([cgminer], [v_ver], [kernel@kolivas.org])
+AC_INIT([bfgminer], [v_ver], [luke-jr+bfgminer@utopios.org])
 
 
 AC_PREREQ(2.59)
 AC_PREREQ(2.59)
 AC_CANONICAL_SYSTEM
 AC_CANONICAL_SYSTEM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([cgminer.c])
+AC_CONFIG_SRCDIR([miner.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([config.h])
 
 
 AM_INIT_AUTOMAKE([foreign])
 AM_INIT_AUTOMAKE([foreign])
@@ -364,7 +364,7 @@ if test "x$prefix" = xNONE; then
 	prefix=/usr/local
 	prefix=/usr/local
 fi
 fi
 
 
-AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to cgminer install])
+AC_DEFINE_UNQUOTED([CGMINER_PREFIX], ["$prefix/bin"], [Path to bfgminer install])
 
 
 AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk120223"], [Filename for phatk kernel])
 AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk120223"], [Filename for phatk kernel])
 AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm120327"], [Filename for poclbm kernel])
 AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm120327"], [Filename for poclbm kernel])

+ 5 - 5
driver-cpu.c

@@ -413,11 +413,11 @@ static double bench_algo_stage2(
 		}
 		}
 
 
 		// Create a unique name
 		// Create a unique name
-		char unique_name[32];
+		char unique_name[33];
 		snprintf(
 		snprintf(
 			unique_name,
 			unique_name,
 			sizeof(unique_name)-1,
 			sizeof(unique_name)-1,
-			"cgminer-%p",
+			"bfgminer-%p",
 			(void*)module
 			(void*)module
 		);
 		);
 
 
@@ -446,7 +446,7 @@ static double bench_algo_stage2(
 			applog(LOG_ERR, "could not map shared memory");
 			applog(LOG_ERR, "could not map shared memory");
 			exit(1);
 			exit(1);
 		}
 		}
-		SetEnvironmentVariable("CGMINER_SHARED_MEM", unique_name);
+		SetEnvironmentVariable("BFGMINER_SHARED_MEM", unique_name);
 		CopyMemory(shared_mem, &rate, sizeof(rate));
 		CopyMemory(shared_mem, &rate, sizeof(rate));
 
 
 		// Get path to current exe
 		// Get path to current exe
@@ -461,9 +461,9 @@ static double bench_algo_stage2(
 		// Construct new command line based on that
 		// Construct new command line based on that
 		char *p = strlen(cmd_line) + cmd_line;
 		char *p = strlen(cmd_line) + cmd_line;
 		sprintf(p, " --bench-algo %d", algo);
 		sprintf(p, " --bench-algo %d", algo);
-		SetEnvironmentVariable("CGMINER_BENCH_ALGO", "1");
+		SetEnvironmentVariable("BFGMINER_BENCH_ALGO", "1");
 
 
-		// Launch a debug copy of cgminer
+		// Launch a debug copy of BFGMiner
 		STARTUPINFO startup_info;
 		STARTUPINFO startup_info;
 		PROCESS_INFORMATION process_info;
 		PROCESS_INFORMATION process_info;
 		ZeroMemory(&startup_info, sizeof(startup_info));
 		ZeroMemory(&startup_info, sizeof(startup_info));

+ 1 - 1
driver-opencl.c

@@ -1249,7 +1249,7 @@ static bool opencl_thread_prepare(struct thr_info *thr)
 			char *buf;
 			char *buf;
 
 
 			applog(LOG_ERR, "Restarting the GPU from the menu will not fix this.");
 			applog(LOG_ERR, "Restarting the GPU from the menu will not fix this.");
-			applog(LOG_ERR, "Try restarting cgminer.");
+			applog(LOG_ERR, "Try restarting BFGMiner.");
 			failmessage = true;
 			failmessage = true;
 #ifdef HAVE_CURSES
 #ifdef HAVE_CURSES
 			if (use_curses) {
 			if (use_curses) {

+ 1 - 1
driver-ztex.c

@@ -1,5 +1,5 @@
 /**
 /**
- *   ztex.c - cgminer worker for Ztex 1.15x fpga board
+ *   ztex.c - BFGMiner worker for Ztex 1.15x fpga board
  *
  *
  *   Copyright (c) 2012 nelisky.btc@gmail.com
  *   Copyright (c) 2012 nelisky.btc@gmail.com
  *
  *

+ 16 - 22
linux-usb-cgminer → linux-usb-bfgminer

@@ -1,15 +1,9 @@
-How to setup a cgminer using xubuntu 11.04 live on a USB
+How to setup a BFGMiner using Xubuntu 11.04 live on a USB
 
 
 The master version of this document is here:
 The master version of this document is here:
- https://github.com/kanoi/linux-usb-cgminer
+ https://github.com/luke-jr/bfgminer/blob/master/linux-usb-bfgminer
 
 
-The actual file is:
- https://github.com/kanoi/linux-usb-cgminer/blob/master/linux-usb-cgminer
-
-The copy in cgminer (check to make sure it isn't older) is:
- https://github.com/ckolivas/cgminer/blob/master/linux-usb-cgminer
-
-The original old verion on bitcointalk is:
+The original old version on bitcointalk is:
  https://bitcointalk.org/index.php?topic=28402.msg426741#msg426741
  https://bitcointalk.org/index.php?topic=28402.msg426741#msg426741
 
 
 ========
 ========
@@ -63,7 +57,7 @@ Click: "Make Install Disk"
 After about 10-15 minutes you have a base xubuntu 11.04 boot USB
 After about 10-15 minutes you have a base xubuntu 11.04 boot USB
 (you can shut down this computer now)
 (you can shut down this computer now)
 
 
-5) Boot your cgminer PC with this USB stick, select "English"
+5) Boot your BFGMiner PC with this USB stick, select "English"
    then select "Try Xubuntu without installing" and wait for the desktop to
    then select "Try Xubuntu without installing" and wait for the desktop to
    appear (this happens by default if you wait for the timeouts)
    appear (this happens by default if you wait for the timeouts)
 
 
@@ -115,19 +109,19 @@ shutting down the PC to ensure all data is written to the USB
 
 
  You now have an OpenCL enabled xubuntu
  You now have an OpenCL enabled xubuntu
 
 
-13) cgminer:
+13) BFGMiner:
  sudo apt-get install curl
  sudo apt-get install curl
 
 
- get the binary linux cgminer
- (see the bitcoin forum cgminer thread for where to get it)
+ get the binary Linux BFGMiner
+ (see the bitcoin forum bfgminer thread for where to get it)
  https://bitcointalk.org/index.php?topic=28402.0
  https://bitcointalk.org/index.php?topic=28402.0
 
 
- ./cgminer -n
+ ./bfgminer -n
    this shows you the GPU's it found on your PC
    this shows you the GPU's it found on your PC
    See further below if you get an error regarding libtinfo.so.5
    See further below if you get an error regarding libtinfo.so.5
 
 
 14) An OC option:
 14) An OC option:
- This is no longer needed since cgminer 2.* includes OC, however:
+ This is no longer needed since BFGMiner 2.* includes OC, however:
 
 
  sudo apt-get install libwxbase2.8-0 libwxgtk2.8-0
  sudo apt-get install libwxbase2.8-0 libwxgtk2.8-0
 
 
@@ -157,7 +151,7 @@ Initial setup complete.
 
 
 ========
 ========
 
 
-If you want to SSH into the machine and run cgminer:
+If you want to SSH into the machine and run BFGMiner:
  From a terminal on the miner display each time after you boot:
  From a terminal on the miner display each time after you boot:
   xhost +
   xhost +
 
 
@@ -166,7 +160,7 @@ If you want to SSH into the machine and run cgminer:
 
 
 Then after you ssh into the machine:
 Then after you ssh into the machine:
  export DISPLAY=:0
  export DISPLAY=:0
-before running cgminer
+before running BFGMiner
 
 
 Also note, that you should force the screen to blank when mining if
 Also note, that you should force the screen to blank when mining if
 the ATI card is displaying the screen (using the screen saver
 the ATI card is displaying the screen (using the screen saver
@@ -177,7 +171,7 @@ as mentioned above at 15)
 
 
 
 
 This is of course just the basics ... but it should get you a computer
 This is of course just the basics ... but it should get you a computer
-up and running and able to run cgminer
+up and running and able to run BFGMiner
 
 
 ========
 ========
 
 
@@ -210,10 +204,10 @@ In this example, it's currently 45% full with almost 1.1GB of free space
 
 
 ========
 ========
 
 
-The latest version (2.0.8) of cgminer is built with 11.10 (not 11.04)
+The latest version (2.0.8) of BFGMiner is built with 11.10 (not 11.04)
 If you get the following error when running the prebuilt version in 11.04:
 If you get the following error when running the prebuilt version in 11.04:
 
 
-   ./cgminer: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
+   ./bfgminer: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
 
 
 The fix is to simply link the old curses library to the new name e.g.:
 The fix is to simply link the old curses library to the new name e.g.:
 
 
@@ -284,8 +278,8 @@ Then:
    username you chose here instead of "ubuntu"
    username you chose here instead of "ubuntu"
 
 
    Important: set it to "log in automatically" if you ever want to be able
    Important: set it to "log in automatically" if you ever want to be able
-   to start cgminer without being in front of the computer since 'X' must
-   be running to use cgminer properly
+   to start BFGMiner without being in front of the computer since 'X' must
+   be running to use BFGMiner properly
    That does of course mean that the computer isn't secure from anyone who
    That does of course mean that the computer isn't secure from anyone who
    has access to it - but then again no computer that can automatically
    has access to it - but then again no computer that can automatically
    reboot is secure from anyone who has access to the actual computer itself
    reboot is secure from anyone who has access to the actual computer itself

+ 18 - 8
cgminer.c → miner.c

@@ -209,7 +209,7 @@ static struct block *blocks = NULL;
 
 
 char *opt_socks_proxy = NULL;
 char *opt_socks_proxy = NULL;
 
 
-static const char def_conf[] = "cgminer.conf";
+static const char def_conf[] = "bfgminer.conf";
 static bool config_loaded = false;
 static bool config_loaded = false;
 static int include_count = 0;
 static int include_count = 0;
 #define JSON_INCLUDE_CONF "include"
 #define JSON_INCLUDE_CONF "include"
@@ -720,7 +720,7 @@ static struct opt_table opt_config_table[] = {
 		     "Allow API access only to the given list of IP[/Prefix] addresses[/subnets]"),
 		     "Allow API access only to the given list of IP[/Prefix] addresses[/subnets]"),
 	OPT_WITH_ARG("--api-description",
 	OPT_WITH_ARG("--api-description",
 		     set_api_description, NULL, NULL,
 		     set_api_description, NULL, NULL,
-		     "Description placed in the API status header, default: cgminer version"),
+		     "Description placed in the API status header, default: BFGMiner version"),
 	OPT_WITHOUT_ARG("--api-listen",
 	OPT_WITHOUT_ARG("--api-listen",
 			opt_set_bool, &opt_api_listen,
 			opt_set_bool, &opt_api_listen,
 			"Enable API, default: disabled"),
 			"Enable API, default: disabled"),
@@ -740,7 +740,7 @@ static struct opt_table opt_config_table[] = {
 #endif
 #endif
 	OPT_WITHOUT_ARG("--benchmark",
 	OPT_WITHOUT_ARG("--benchmark",
 			opt_set_bool, &opt_benchmark,
 			opt_set_bool, &opt_benchmark,
-			"Run cgminer in benchmark mode - produces no shares"),
+			"Run BFGMiner in benchmark mode - produces no shares"),
 #ifdef WANT_CPUMINE
 #ifdef WANT_CPUMINE
 	OPT_WITH_ARG("--bench-algo|-b",
 	OPT_WITH_ARG("--bench-algo|-b",
 		     set_int_0_to_9999, opt_show_intval, &opt_bench_algo,
 		     set_int_0_to_9999, opt_show_intval, &opt_bench_algo,
@@ -1086,7 +1086,15 @@ static void load_default_config(void)
 	}
 	}
 	else
 	else
 		strcpy(cnfbuf, "");
 		strcpy(cnfbuf, "");
-	strcat(cnfbuf, ".cgminer/");
+	char *dirp = cnfbuf + strlen(cnfbuf);
+	strcpy(dirp, ".bfgminer/");
+	strcat(dirp, def_conf);
+	if (access(cnfbuf, R_OK))
+	{
+		// No BFGMiner config, try Cgminer's...
+		strcpy(dirp, ".cgminer/");
+		strcat(dirp, def_conf);
+	}
 #else
 #else
 	strcpy(cnfbuf, "");
 	strcpy(cnfbuf, "");
 #endif
 #endif
@@ -2984,7 +2992,7 @@ retry:
 		}
 		}
 		else
 		else
 			strcpy(filename, "");
 			strcpy(filename, "");
-		strcat(filename, ".cgminer/");
+		strcat(filename, ".bfgminer/");
 		mkdir(filename, 0777);
 		mkdir(filename, 0777);
 #else
 #else
 		strcpy(filename, "");
 		strcpy(filename, "");
@@ -4628,6 +4636,8 @@ int main(int argc, char *argv[])
 	int skip_to_bench = 0;
 	int skip_to_bench = 0;
 	#if defined(WIN32)
 	#if defined(WIN32)
 		char buf[32];
 		char buf[32];
+		if (GetEnvironmentVariable("BFGMINER_BENCH_ALGO", buf, 16))
+			skip_to_bench = 1;
 		if (GetEnvironmentVariable("CGMINER_BENCH_ALGO", buf, 16))
 		if (GetEnvironmentVariable("CGMINER_BENCH_ALGO", buf, 16))
 			skip_to_bench = 1;
 			skip_to_bench = 1;
 	#endif // defined(WIN32)
 	#endif // defined(WIN32)
@@ -4701,7 +4711,7 @@ int main(int argc, char *argv[])
 				break;
 				break;
 			case -1:
 			case -1:
 				applog(LOG_WARNING, "Error in configuration file, partially loaded.");
 				applog(LOG_WARNING, "Error in configuration file, partially loaded.");
-				applog(LOG_WARNING, "Start cgminer with -T to see what failed to load.");
+				applog(LOG_WARNING, "Start BFGMiner with -T to see what failed to load.");
 				break;
 				break;
 			default:
 			default:
 				break;
 				break;
@@ -4724,7 +4734,7 @@ int main(int argc, char *argv[])
 			// Write result to shared memory for parent
 			// Write result to shared memory for parent
 			#if defined(WIN32)
 			#if defined(WIN32)
 				char unique_name[64];
 				char unique_name[64];
-				if (GetEnvironmentVariable("CGMINER_SHARED_MEM", unique_name, 32)) {
+				if (GetEnvironmentVariable("BFGMINER_SHARED_MEM", unique_name, 32) || GetEnvironmentVariable("CGMINER_SHARED_MEM", unique_name, 32)) {
 					HANDLE map_handle = CreateFileMapping(
 					HANDLE map_handle = CreateFileMapping(
 						INVALID_HANDLE_VALUE,   // use paging file
 						INVALID_HANDLE_VALUE,   // use paging file
 						NULL,                   // default security attributes
 						NULL,                   // default security attributes
@@ -4951,7 +4961,7 @@ int main(int argc, char *argv[])
 #ifdef HAVE_CURSES
 #ifdef HAVE_CURSES
 			if (use_curses) {
 			if (use_curses) {
 				halfdelay(150);
 				halfdelay(150);
-				applog(LOG_ERR, "Press any key to exit, or cgminer will try again in 15s.");
+				applog(LOG_ERR, "Press any key to exit, or BFGMiner will try again in 15s.");
 				if (getch() != ERR)
 				if (getch() != ERR)
 					quit(0, "No servers could be used! Exiting.");
 					quit(0, "No servers could be used! Exiting.");
 				nocbreak();
 				nocbreak();

+ 5 - 5
miner.php

@@ -8,16 +8,16 @@ $miner = null;
 $port = null;
 $port = null;
 #
 #
 # Set $readonly to true to force miner.php to be readonly
 # Set $readonly to true to force miner.php to be readonly
-# Set $readonly to false then it will check cgminer 'privileged'
+# Set $readonly to false then it will check BFGMiner 'privileged'
 $readonly = false;
 $readonly = false;
 #
 #
 # Set $notify to false to NOT attempt to display the notify command
 # Set $notify to false to NOT attempt to display the notify command
 # Set $notify to true to attempt to display the notify command
 # Set $notify to true to attempt to display the notify command
-# If your older version of cgminer returns an 'Invalid command'
+# If your older version of BFGMiner returns an 'Invalid command'
 #  coz it doesn't have notify - it just shows the error status table
 #  coz it doesn't have notify - it just shows the error status table
 $notify = true;
 $notify = true;
 #
 #
-# Set $rigs to an array of your cgminer rigs that are running
+# Set $rigs to an array of your BFGMiner rigs that are running
 #  format: 'IP:Port' or 'Host:Port'
 #  format: 'IP:Port' or 'Host:Port'
 # If you only have one rig, it will just show the detail of that rig
 # If you only have one rig, it will just show the detail of that rig
 # If you have more than one rig it will show a summary of all the rigs
 # If you have more than one rig it will show a summary of all the rigs
@@ -686,7 +686,7 @@ function doOne($rig, $preprocess)
  echo "<td width=100%>&nbsp;</td><td>";
  echo "<td width=100%>&nbsp;</td><td>";
  if ($readonly === false)
  if ($readonly === false)
  {
  {
-	$msg = 'Quit CGMiner';
+	$msg = 'Quit BFGMiner';
 	if (count($rigs) > 1)
 	if (count($rigs) > 1)
 		$msg .= " Rig $rig";
 		$msg .= " Rig $rig";
 	echo "<input type=button value='Quit' onclick='prc(\"quit&rig=$rig\",\"$msg\")'>";
 	echo "<input type=button value='Quit' onclick='prc(\"quit&rig=$rig\",\"$msg\")'>";
@@ -703,7 +703,7 @@ function doOne($rig, $preprocess)
  if ($notify)
  if ($notify)
 	$cmds['notify'] = 'device status';
 	$cmds['notify'] = 'device status';
 
 
- $cmds['config'] = 'cgminer config';
+ $cmds['config'] = 'BFGMiner config';
 
 
  process($cmds, $rig);
  process($cmds, $rig);
 
 

+ 2 - 2
ocl.c

@@ -47,7 +47,7 @@ char *file_contents(const char *filename, int *length)
 	/* Try in the optional kernel path or installed prefix first */
 	/* Try in the optional kernel path or installed prefix first */
 	f = fopen(fullpath, "rb");
 	f = fopen(fullpath, "rb");
 	if (!f) {
 	if (!f) {
-		/* Then try from the path cgminer was called */
+		/* Then try from the path BFGMiner was called */
 		strcpy(fullpath, cgminer_path);
 		strcpy(fullpath, cgminer_path);
 		strcat(fullpath, filename);
 		strcat(fullpath, filename);
 		f = fopen(fullpath, "rb");
 		f = fopen(fullpath, "rb");
@@ -380,7 +380,7 @@ _clState *initCl(unsigned int gpu, char *name, size_t nameSize)
 			applog(LOG_WARNING, "WARNING: You have selected the phatk kernel.");
 			applog(LOG_WARNING, "WARNING: You have selected the phatk kernel.");
 			applog(LOG_WARNING, "You are running SDK 2.6 which performs poorly with this kernel.");
 			applog(LOG_WARNING, "You are running SDK 2.6 which performs poorly with this kernel.");
 			applog(LOG_WARNING, "Downgrade your SDK and delete any .bin files before starting again.");
 			applog(LOG_WARNING, "Downgrade your SDK and delete any .bin files before starting again.");
-			applog(LOG_WARNING, "Or allow cgminer to automatically choose a more suitable kernel.");
+			applog(LOG_WARNING, "Or allow BFGMiner to automatically choose a more suitable kernel.");
 		}
 		}
 	}
 	}
 
 

+ 13 - 13
windows-build.txt

@@ -81,9 +81,9 @@ Ctrl-D or typing "logout" and pressing the enter key should get you out of the
 window.
 window.
 
 
 **************************************************************************************
 **************************************************************************************
-* Copy CGMiner source to your MSYS working directory                                 *
+* Copy BFGMiner source to your MSYS working directory                                *
 **************************************************************************************
 **************************************************************************************
-Copy CGMiner source code directory into: 
+Copy BFGMiner source code directory into: 
 \MinGW\msys\1.0\home\(folder with your user name)
 \MinGW\msys\1.0\home\(folder with your user name)
 
 
 **************************************************************************************
 **************************************************************************************
@@ -109,7 +109,7 @@ Go to this url ==> http://developer.amd.com/sdks/ADLSDK/Pages/default.aspx
 Download and unzip the file you downloaded.
 Download and unzip the file you downloaded.
 Pull adl_defines.h, adl_sdk.h, and adl_structures.h out of the include folder 
 Pull adl_defines.h, adl_sdk.h, and adl_structures.h out of the include folder 
 Put those files into the ADL_SDK folder in your source tree as shown below.
 Put those files into the ADL_SDK folder in your source tree as shown below.
-\MinGW\msys\1.0\home\(folder with your user name)\cgminer-x.x.x\ADL_SDK
+\MinGW\msys\1.0\home\(folder with your user name)\bfgminer-x.x.x\ADL_SDK
 
 
 **************************************************************************************
 **************************************************************************************
 * Install GTK-WIN, required for Pkg-config in the next step                          *
 * Install GTK-WIN, required for Pkg-config in the next step                          *
@@ -147,12 +147,12 @@ Edit the file \MinGW\lib\pkgconfig\libcurl.pc and change "-lcurl" to
 Ref. http://old.nabble.com/gcc-working-with-libcurl-td20506927.html
 Ref. http://old.nabble.com/gcc-working-with-libcurl-td20506927.html
 
 
 **************************************************************************************
 **************************************************************************************
-* Build cgminer.exe                                                                  *
+* Build bfgminer.exe                                                                 *
 **************************************************************************************
 **************************************************************************************
 Run the MinGW MSYS shell 
 Run the MinGW MSYS shell 
 (Start Icon/keyboard key ==> All Programs ==> MinGW ==> MinGW Shell).	
 (Start Icon/keyboard key ==> All Programs ==> MinGW ==> MinGW Shell).	
-Change the working directory to your CGMiner project folder.
-Example: cd cgminer-2.1.2 [Enter Key] if you are unsure then type "ls -la"
+Change the working directory to your BFGMiner project folder.
+Example: cd bfgminer-2.1.2 [Enter Key] if you are unsure then type "ls -la"
 Another way is to type "cd cg" and then press the tab key; It will auto fill.		
 Another way is to type "cd cg" and then press the tab key; It will auto fill.		
 Type the lines below one at a time. Look for problems after each one before going on
 Type the lines below one at a time. Look for problems after each one before going on
 to the next.
 to the next.
@@ -165,13 +165,13 @@ to the next.
 **************************************************************************************
 **************************************************************************************
 * Copy files to a build directory/folder                                             *
 * Copy files to a build directory/folder                                             *
 **************************************************************************************
 **************************************************************************************
-Make a directory and copy the following files into it. This will be your CGMiner
+Make a directory and copy the following files into it. This will be your BFGMiner
 Folder that you use for mining. Remember the .cl filenames could change on later
 Folder that you use for mining. Remember the .cl filenames could change on later
 releases. If you installed a different version of libcurl then some of those dll's
 releases. If you installed a different version of libcurl then some of those dll's
 may be different as well.
 may be different as well.
-  cgminer.exe     from \MinGW\msys\1.0\home\(username)\cgminer-x.x.x 
-  *.cl            from \MinGW\msys\1.0\home\(username)\cgminer-x.x.x
-  README          from \MinGW\msys\1.0\home\(username)\cgminer-x.x.x
+  bfgminer.exe    from \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x
+  *.cl            from \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x
+  README          from \MinGW\msys\1.0\home\(username)\bfgminer-x.x.x
   libcurl.dll     from \MinGW\bin
   libcurl.dll     from \MinGW\bin
   libeay32.dll    from \MinGW\bin
   libeay32.dll    from \MinGW\bin
   libidn-11.dll   from \MinGW\bin
   libidn-11.dll   from \MinGW\bin
@@ -189,10 +189,10 @@ Extract the git*.exe files from the bin folder and put them into \MinGW\bin.
 Extract the share\git-core folder and place it into \MinGW\share.
 Extract the share\git-core folder and place it into \MinGW\share.
 To test if it is working, open a MinGW shell and type the following:
 To test if it is working, open a MinGW shell and type the following:
   git config -–global core.autocrlf false (note: one time run only)
   git config -–global core.autocrlf false (note: one time run only)
-  git clone git://github.com/ckolivas/cgminer.git
+  git clone git://github.com/luke-jr/bfgminer.git
   
   
 If you simply just want to update the source after you have already cloned, type:
 If you simply just want to update the source after you have already cloned, type:
-  git pull git://github.com/ckolivas/cgminer.git
+  git pull git://github.com/luke-jr/bfgminer.git
 
 
 Now you can get the latest source directly from github.
 Now you can get the latest source directly from github.
 
 
@@ -205,7 +205,7 @@ Copy the ADL .h files into that folder/directory.
 Open your favorite text editor and type the following into it.
 Open your favorite text editor and type the following into it.
  cp -av ../ADL_SDK/*.h ADL_SDK
  cp -av ../ADL_SDK/*.h ADL_SDK
 Save the file as "adl.sh" and then place the file into "\MinGW\msys\1.0\bin".
 Save the file as "adl.sh" and then place the file into "\MinGW\msys\1.0\bin".
-From now on when your current working directory is the cgminer source directory
+From now on when your current working directory is the bfgminer source directory
 You can simply type "adl.sh" and it will place the ADL header files into place
 You can simply type "adl.sh" and it will place the ADL header files into place
 For you. Make sure you never remove the ADL_SDK folder from your home folder.
 For you. Make sure you never remove the ADL_SDK folder from your home folder.