Merge commit 'f466022' into bfgminer

driver-modminer.c

@@ -184,19 +184,19 @@ modminer_reopen(struct cgpu_info*modminer)
 
 #define check_magic(L)  do {  \
 	if (1 != fread(buf, 1, 1, f))  \
-		bailout(LOG_ERR, "Error reading ModMiner firmware ('%c')", L);  \
+		bailout(LOG_ERR, "Error reading ModMiner bitstream ('%c')", L);  \
 	if (buf[0] != L)  \
-		bailout(LOG_ERR, "ModMiner firmware has wrong magic ('%c')", L);  \
+		bailout(LOG_ERR, "ModMiner bitstream has wrong magic ('%c')", L);  \
 } while(0)
 
 #define read_str(eng)  do {  \
 	if (1 != fread(buf, 2, 1, f))  \
-		bailout(LOG_ERR, "Error reading ModMiner firmware (" eng " len)");  \
+		bailout(LOG_ERR, "Error reading ModMiner bitstream (" eng " len)");  \
 	len = (ubuf[0] << 8) | ubuf[1];  \
 	if (len >= sizeof(buf))  \
-		bailout(LOG_ERR, "ModMiner firmware " eng " too long");  \
+		bailout(LOG_ERR, "ModMiner bitstream " eng " too long");  \
 	if (1 != fread(buf, len, 1, f))  \
-		bailout(LOG_ERR, "Error reading ModMiner firmware (" eng ")");  \
+		bailout(LOG_ERR, "Error reading ModMiner bitstream (" eng ")");  \
 	buf[len] = '\0';  \
 } while(0)