Commit 3a3dfb0fe3adcda363a5a07590efa2a6a1238e09

Con Kolivas 2014-07-28T12:33:08

Merge branch 'master' of github.com:ckolivas/cgminer

diff --git a/README b/README
index 8bce6b2..cc72853 100644
--- a/README
+++ b/README
@@ -243,7 +243,7 @@ Options for both config file and command line:
 --quiet|-q          Disable logging output, display status and errors
 --quota|-U <arg>    quota;URL combination for server with load-balance strategy quotas
 --real-quiet        Disable all output
---rock-freq <arg>   Set RockMiner frequency in MHz, range 125-500 (default: 270)
+--rock-freq <arg>   Set RockMiner frequency in MHz, range 200-400 (default: 270)
 --rotate <arg>      Change multipool strategy from failover to regularly rotate at N minutes (default: 0)
 --round-robin       Change multipool strategy from failover to round robin on failure
 --scan-time|-s <arg> Upper bound on time spent scanning current work, in seconds (default: -1)
diff --git a/api-example.c b/api-example.c
index 26d5a0e..639ffc5 100644
--- a/api-example.c
+++ b/api-example.c
@@ -8,7 +8,7 @@
  */
 
 /* Compile:
- *   gcc api-example.c -Icompat/jansson-2.5 -Icompat/libusb-1.0/libusb -o cgminer-api
+ *   gcc api-example.c -Icompat/jansson-2.6/src -Icompat/libusb-1.0/libusb -o cgminer-api
  */
 
 #include "config.h"
diff --git a/hexdump.c b/hexdump.c
index eb24deb..80b8c2d 100644
--- a/hexdump.c
+++ b/hexdump.c
@@ -30,7 +30,7 @@ static char nibble[] = {
 static void hexdump(const uint8_t *p, unsigned int len)
 {
 	unsigned int i, addr;
-	unsigned int wordlen = sizeof(void*);
+	unsigned int wordlen = sizeof(unsigned int);
 	unsigned char v, line[BYTES_PER_LINE * 5];
 
 	for (addr = 0; addr < len; addr += BYTES_PER_LINE) {