X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fstm%2Fao_i2c_stm.c;h=158f5b218ebfe0edd877b4049322fb11b51f18fd;hp=779e227503110971abcb3c8aa14744ef1594b1ed;hb=4af4e36cda96d053458eeb040e35886890917385;hpb=a46c9398a5f02ff4b52b7a4309a51498560cadb5

diff --git a/src/stm/ao_i2c_stm.c b/src/stm/ao_i2c_stm.c
index 779e2275..158f5b21 100644
--- a/src/stm/ao_i2c_stm.c
+++ b/src/stm/ao_i2c_stm.c
@@ -36,7 +36,7 @@ static uint16_t	ao_i2c_addr[STM_NUM_I2C];
 uint8_t 	ao_i2c_mutex[STM_NUM_I2C];
 
 # define I2C_HIGH_SLOW	5000	/* ns, 100kHz clock */
-#ifdef MEGAMETRUM
+#ifdef TELEMEGA
 # define I2C_HIGH_FAST	2000	/* ns, 167kHz clock */
 #else
 # define I2C_HIGH_FAST	1000	/* ns, 333kHz clock */
@@ -185,7 +185,6 @@ uint8_t
 ao_i2c_start(uint8_t index, uint16_t addr)
 {
 	struct stm_i2c	*stm_i2c = ao_i2c_stm_info[index].stm_i2c;
-	uint32_t	sr1, sr2;
 	int		t;
 
 	ao_i2c_state[index] = I2C_IDLE;
@@ -196,15 +195,13 @@ ao_i2c_start(uint8_t index, uint16_t addr)
 		if (!(stm_i2c->cr1 & (1 << STM_I2C_CR1_START)))
 			break;
 	}
-	ao_alarm(AO_MS_TO_TICKS(250));
 	ao_arch_block_interrupts();
 	stm_i2c->cr2 = AO_STM_I2C_CR2 | (1 << STM_I2C_CR2_ITEVTEN) | (1 << STM_I2C_CR2_ITERREN);
 	ao_i2c_ev_isr(index);
 	while (ao_i2c_state[index] == I2C_IDLE)
-		if (ao_sleep(&ao_i2c_state[index]))
+		if (ao_sleep_for(&ao_i2c_state[index], AO_MS_TO_TICKS(250)))
 			break;
 	ao_arch_release_interrupts();
-	ao_clear_alarm();
 	return ao_i2c_state[index] == I2C_RUNNING;
 }
 
@@ -239,10 +236,7 @@ uint8_t
 ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
 {
 	struct stm_i2c	*stm_i2c = ao_i2c_stm_info[index].stm_i2c;
-	uint8_t		*b = block;
-	uint32_t	sr1;
 	uint8_t		tx_dma_index = ao_i2c_stm_info[index].tx_dma_index;
-	int		t;
 
 	/* Clear any pending ADDR bit */
 	(void) stm_i2c->sr2;
@@ -262,16 +256,14 @@ ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
 			    (STM_DMA_CCR_DIR_MEM_TO_PER << STM_DMA_CCR_DIR));
 			   
 	ao_dma_start(tx_dma_index);
-	ao_alarm(1 + len);
 	ao_arch_block_interrupts();
 	while (!ao_dma_done[tx_dma_index])
-		if (ao_sleep(&ao_dma_done[tx_dma_index]))
+		if (ao_sleep_for(&ao_dma_done[tx_dma_index], 1 + len))
 			break;
-	ao_clear_alarm();
 	ao_dma_done_transfer(tx_dma_index);
 	stm_i2c->cr2 = AO_STM_I2C_CR2 | (1 << STM_I2C_CR2_ITEVTEN) | (1 << STM_I2C_CR2_ITERREN);
 	while ((stm_i2c->sr1 & (1 << STM_I2C_SR1_BTF)) == 0)
-		if (ao_sleep(&ao_i2c_state[index]))
+		if (ao_sleep_for(&ao_i2c_state[index], 1 + len))
 			break;
 	stm_i2c->cr2 = AO_STM_I2C_CR2;
 	ao_arch_release_interrupts();
@@ -304,8 +296,6 @@ uint8_t
 ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 {
 	struct stm_i2c	*stm_i2c = ao_i2c_stm_info[index].stm_i2c;
-	uint8_t		*b = block;
-	int		t;
 	uint8_t		ret = TRUE;
 
 	if (len == 0)
@@ -327,14 +317,12 @@ ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 		if (stop)
 			stm_i2c->cr1 = AO_STM_I2C_CR1 | (1 << STM_I2C_CR1_STOP);
 
-		ao_alarm(1);
 		ao_arch_block_interrupts();
 		while (ao_i2c_recv_len[index])
-			if (ao_sleep(&ao_i2c_recv_len[index]))
+			if (ao_sleep_for(&ao_i2c_recv_len[index], 1))
 				break;
 		ao_arch_release_interrupts();
 		ret = ao_i2c_recv_len[index] == 0;
-		ao_clear_alarm();
 	} else {
 		uint8_t		rx_dma_index = ao_i2c_stm_info[index].rx_dma_index;
 		ao_dma_set_transfer(rx_dma_index,
@@ -357,13 +345,11 @@ ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 		ao_i2c_wait_addr(index);
 
 		ao_dma_start(rx_dma_index);
-		ao_alarm(len);
 		ao_arch_block_interrupts();
 		while (!ao_dma_done[rx_dma_index])
-			if (ao_sleep(&ao_dma_done[rx_dma_index]))
+			if (ao_sleep_for(&ao_dma_done[rx_dma_index], len))
 				break;
 		ao_arch_release_interrupts();
-		ao_clear_alarm();
 		ret = ao_dma_done[rx_dma_index];
 		ao_dma_done_transfer(rx_dma_index);
 		stm_i2c->cr1 = AO_STM_I2C_CR1 | (1 << STM_I2C_CR1_STOP);