Revert "Fix reading temperature problem", should be done in host side

This reverts commit d4b1f2a.

Author: xiangfu

firmware/main.c

@@ -39,8 +39,7 @@ static int g_local_work = 0;
 static int g_hw_work = 0;
 
 uint32_t g_clock_conf_count = 0;
-uint16_t temperature0[10] = {0};
-uint16_t temperature1[10] = {0};
+
 
 static uint32_t g_nonce2_offset = 0;
 static uint32_t g_nonce2_range = 0xffffffff;
@@ -86,7 +85,7 @@ static void encode_pkg(uint8_t *p, int type, uint8_t *buf, unsigned int len)
 		memcpy(data, buf, len);
 		break;
 	case AVA2_P_STATUS:
-		tmp = read_temp0(temperature0) << 16 | read_temp1(temperature1);
+		tmp = read_temp0() << 16 | read_temp1();
 		memcpy(data + 0, &tmp, 4);
 
 		tmp = read_fan0() << 16 | read_fan1();
@@ -230,7 +229,7 @@ static int decode_pkg(uint8_t *p, struct mm_work *mw)
 	case AVA2_P_REQUIRE:
 		break;
 	case AVA2_P_SET:
-		if (read_temp0(temperature0) >= IDLE_TEMP || read_temp1(temperature1) >= IDLE_TEMP)
+		if (read_temp0() >= IDLE_TEMP || read_temp1() >= IDLE_TEMP)
 			break;
 
 		memcpy(&tmp, data, 4);
@@ -328,6 +327,7 @@ static int get_pkg(struct mm_work *mw)
 
 			start = 0;
 			count = 2;
+
 			if (decode_pkg(g_pkg, mw)) {
 #ifdef CFG_ENABLE_ACK
 				send_pkg(AVA2_P_NAK, NULL, 0);
@@ -385,7 +385,7 @@ int main(int argv, char **argc)
 
 	uart_init();
 	debug32("%d:MM-%s\n", g_module_id, MM_VERSION);
-	debug32("T:%d, %d\n", read_temp0(temperature0), read_temp1(temperature1));
+	debug32("T:%d, %d\n", read_temp0(), read_temp1());
 
 	timer_set(0, IDLE_TIME);
 	g_new_stratum = 0;
@@ -403,7 +403,7 @@ int main(int argv, char **argc)
 
 		wdg_feed((CPU_FREQUENCY / 1000) * 2);
 		if ((!timer_read(0) && g_new_stratum) ||
-		    (read_temp0(temperature0) >= IDLE_TEMP && read_temp1(temperature1) >= IDLE_TEMP)) {
+		    (read_temp0() >= IDLE_TEMP && read_temp1() >= IDLE_TEMP)) {
 			g_new_stratum = 0;
 			g_local_work = 0;
 			g_hw_work = 0;

firmware/miner.c

@@ -248,7 +248,7 @@ void miner_gen_nonce2_work(struct mm_work *mw, uint32_t nonce2, struct work *wor
 	tmp32 = bswap_32(nonce2);
 	work->nonce2 = nonce2;
 
-	if (mw->coinbase_len > AVA2_P_COINBASE_SIZE) {
+	if(mw->coinbase_len > AVA2_P_COINBASE_SIZE) {
 		nonce2_offset_posthash = (mw->nonce2_offset % SHA256_BLOCK_SIZE) + 32;
 		coinbase_len_posthash = mw->coinbase_len - mw->nonce2_offset + (mw->nonce2_offset % SHA256_BLOCK_SIZE);
 		memcpy(mw->coinbase + nonce2_offset_posthash, (uint8_t *)(&tmp32), mw->nonce2_size);

firmware/twipwm.c

@@ -12,6 +12,7 @@
 #include "defines.h"
 #include "io.h"
 
+
 static struct lm32_twipwm *tp = (struct lm32_twipwm *)TWIPWM_BASE;
 
 static void twi_start(void)
@@ -119,46 +120,12 @@ void adjust_fan(uint32_t pwm)
 	write_pwm(value);
 }
 
-uint16_t read_temp0(uint16_t *temperature)
+uint16_t read_temp0()
 {
-	int i;
-	uint32_t sum = 0;
-	uint16_t min = temperature[0];
-	uint16_t max = temperature[0];
-	uint16_t temp[10] = {0};
-
-	memcpy(temp, temperature + 1, 9 * sizeof(uint16_t));
-	temp[9] = (twi_read_2byte(LM32_TWI_REG_TEMP0) >> 4) / 16;
-	memcpy(temperature, temp, 10 * sizeof(uint16_t));
-	for(i = 0; i < 10; i++)
-	{
-		if(max < temperature[i])
-			max = temperature[i];
-		if(min > temp[i])
-			min = temperature[i];
-		sum = sum + temperature[i];
-	}
-	return (uint16_t)((sum - max - min) / 8);
+	return (twi_read_2byte(LM32_TWI_REG_TEMP0) >> 4) / 16;
 }
 
-uint16_t read_temp1(uint16_t *temperature)
+uint16_t read_temp1()
 {
-	int i;
-	uint32_t sum = 0;
-	uint16_t min = temperature[0];
-	uint16_t max = temperature[0];
-	uint16_t temp[10] = {0};
-
-	memcpy(temp, temperature + 1, 9 * sizeof(uint16_t));
-	temp[9] = (twi_read_2byte(LM32_TWI_REG_TEMP1) >> 4) / 16;
-	memcpy(temperature, temp, 10 * sizeof(uint16_t));
-	for(i = 0; i < 10; i++)
-	{
-		if(max < temperature[i])
-			max = temperature[i];
-		if(min > temp[i])
-			min = temperature[i];
-		sum = sum + temperature[i];
-	}
-	return (uint16_t)((sum - max - min) / 8);
+	return (twi_read_2byte(LM32_TWI_REG_TEMP1) >> 4) / 16;
 }

firmware/twipwm.h

@@ -20,8 +20,8 @@ void wdg_feed(uint32_t value);
 uint32_t read_fan0();
 uint32_t read_fan1();
 
-uint16_t read_temp0(uint16_t *temperature);
-uint16_t read_temp1(uint16_t *temperature);
+uint16_t read_temp0();
+uint16_t read_temp1();
 
 void adjust_fan(uint32_t pwm);
 void reset();