 +#endif /* TRIMPOT_MPC4X_H */
 diff --git a/API-README b/API-README
 index a10017c..076785c 100644
->>>>>>> Stashed changes
 --- a/API-README
 +++ b/API-README
 @@ -136,7 +136,7 @@ If you request a command that can't be used due to requiring parameters,
  a command that isn't a report, or an invalid command, you'll get an 'E' STATUS
  for that one but it will still attempt to process all other commands supplied
  
-<<<<<<< Updated upstream
--Blank/missing commands are ignored e.g. +devs++
-+Blank/missing commands are ignore e.g. +devs++
-=======
 -Blank/missing commands are ignore e.g. +devs++
 +Blank/missing commands are ignored e.g. +devs++
->>>>>>> Stashed changes
  will just show 'devs' using the new layout
  
  For API version 1.10 and later:
 diff --git a/ASIC-README b/ASIC-README
-<<<<<<< Updated upstream
-index e68837c..6e82783 100644
---- a/ASIC-README
-+++ b/ASIC-README
-@@ -7,7 +7,6 @@ Currently supported devices include:
- - BF1 (bitfury) USB (red and blue)
- - KnCminer Mercury, Saturn and Jupiter
- - BlackArrow Bitfury
--- BlackArrow Minion
- - Bi*fury USB
- - Onestring miner USB
- - Hexfury USB
-@@ -56,14 +55,6 @@ The current BlackArrow Bitfury devices are similar to the Bitfury GPIO mining
- boards, with both V1 and V2 controllers, and come up as BaB.
- 
- 
--BlackArrow Minion devices
--
--BlackArrow Minion devices need the --enable-minion option when compiling
--cgminer.
--
--BlackArrow Minion devices are SPI/GPIO mining devices and come up as MBA
--
--
- BITFURY devices
- 
- Bitfury devices need the --enable-bitfury option when compiling cgminer.
-@@ -234,7 +225,6 @@ ASIC SPECIFIC COMMANDS
- --hfa-temp-overheat <arg> Set the hashfast overheat throttling temperature (default: 95)
- --hfa-temp-target <arg> Set the hashfast target temperature (0 to disable) (default: 88)
- --klondike-options <arg> Set klondike options clock:temptarget
----minion-freq <arg> Set minion chip frequencies in MHz, single value or comma list, range 100-1400 (default: 1000)
-=======
 index 6e82783..e68837c 100644
 --- a/ASIC-README
 +++ b/ASIC-README

 				applog(LOG_ERR, "%d: enumeration: %d <-> %d",
-				       bid, a1->num_chips, n);
+				       cid, a1->num_chips, n);
>>>>>>> Stashed changes
 				if (n != 0)
 					a1->num_chips = n;
 			}
 			applog(LOG_WARNING, "%d: detected %d chips",
<<<<<<< Updated upstream
-			       cid, a1->num_chips);
+			       bid, a1->num_chips);
 			return a1->num_chips;
 		}
 		bool s = spi_transfer(a1->spi_ctx, NULL, a1->spi_rx, 2);
@@ -463,7 +550,7 @@ static int chain_detect(struct A1_chain *a1)
 		if (!s)
 			return 0;
 	}
-	applog(LOG_WARNING, "%d: no A1 chip-chain detected", cid);
+	applog(LOG_WARNING, "%d: no A1 chip-chain detected", bid);
 	return 0;
 }
 
@@ -486,13 +573,13 @@ static void disable_chip(struct A1_chain *a1, uint8_t chip_id)
 {
 	flush_spi(a1);
 	struct A1_chip *chip = &a1->chips[chip_id - 1];
-	int cid = a1->chain_id;
+	int bid = a1->board_id;
 	if (is_chip_disabled(a1, chip_id)) {
 		applog(LOG_WARNING, "%d: chip %d already disabled",
-		       cid, chip_id);
+		       bid, chip_id);
 		return;
 	}
-	applog(LOG_WARNING, "%d: temporary disabling chip %d", cid, chip_id);
+	applog(LOG_WARNING, "%d: temporary disabling chip %d", bid, chip_id);
 	chip->cooldown_begin = get_current_ms();
 }
 
@@ -500,7 +587,7 @@ static void disable_chip(struct A1_chain *a1, uint8_t chip_id)
 void check_disabled_chips(struct A1_chain *a1)
 {
 	int i;
-	int cid = a1->chain_id;
+	int bid = a1->board_id;
 	for (i = 0; i < a1->num_active_chips; i++) {
 		int chip_id = i + 1;
 		struct A1_chip *chip = &a1->chips[i];
@@ -514,11 +601,11 @@ void check_disabled_chips(struct A1_chain *a1)
 		if (!cmd_READ_REG(a1, chip_id)) {
 			chip->fail_count++;
 			applog(LOG_WARNING, "%d: chip %d not yet working - %d",
-			       cid, chip_id, chip->fail_count);
+			       bid, chip_id, chip->fail_count);
 			if (chip->fail_count > DISABLE_CHIP_FAIL_THRESHOLD) {
 				applog(LOG_WARNING,
 				       "%d: completely disabling chip %d at %d",
-				       cid, chip_id, chip->fail_count);
+				       bid, chip_id, chip->fail_count);
 				chip->disabled = true;
 				a1->num_cores -= chip->num_cores;
 				continue;
@@ -528,7 +615,7 @@ void check_disabled_chips(struct A1_chain *a1)
 			continue;
 		}
 		applog(LOG_WARNING, "%d: chip %d is working again",
-		       cid, chip_id);
+		       bid, chip_id);
 		chip->cooldown_begin = 0;
 		chip->fail_count = 0;
 	}
@@ -585,9 +672,7 @@ static uint8_t *create_job(uint8_t chip_id, uint8_t job_id, struct work *work)
 	p1[0] = bswap_32(p2[0]);
 	p1[1] = bswap_32(p2[1]);
 	p1[2] = bswap_32(p2[2]);
-#ifdef USE_REAL_DIFF
 	p1[4] = get_diff(work->sdiff);
-#endif
 	return job;
 }
 
@@ -595,17 +680,17 @@ static uint8_t *create_job(uint8_t chip_id, uint8_t job_id, struct work *work)
 static bool set_work(struct A1_chain *a1, uint8_t chip_id, struct work *work,
 		     uint8_t queue_states)
 {
-	int cid = a1->chain_id;
+	int bid = a1->board_id;
=======
-			       bid, a1->num_chips);
+			       cid, a1->num_chips);
 			return a1->num_chips;

 			applog(LOG_DEBUG, "%d: flushing chip %d, work %d: 0x%p",
-			       bid, i, j + 1, work);
+			       cid, i, j + 1, work);
 			work_completed(cgpu, work);
 			chip->work[j] = NULL;
 		}
 		chip->last_queued_id = 0;
 	}
 	/* flush queued work */
-	applog(LOG_DEBUG, "%d: flushing queued work...", bid);
+	applog(LOG_DEBUG, "%d: flushing queued work...", cid);
 	while (a1->active_wq.num_elems > 0) {
