X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm%2Fao_i2c_stm.c;h=1c90cdb85c19193f223acaf40b970c9cfc74a267;hb=e70f3dca01b15b75b0b8795eb71bd12817af4800;hp=b6dd7056e426e6db55b6b89413f059cbeba952e1;hpb=4f258fe565dc3e58b83761bfa1a2276946012163;p=fw%2Faltos

diff --git a/src/stm/ao_i2c_stm.c b/src/stm/ao_i2c_stm.c
index b6dd7056..1c90cdb8 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;
@@ -197,13 +196,13 @@ ao_i2c_start(uint8_t index, uint16_t addr)
 			break;
 	}
 	ao_alarm(AO_MS_TO_TICKS(250));
-	cli();
+	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]))
 			break;
-	sei();
+	ao_arch_release_interrupts();
 	ao_clear_alarm();
 	return ao_i2c_state[index] == I2C_RUNNING;
 }
@@ -239,10 +238,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;
@@ -263,7 +259,7 @@ ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
 			   
 	ao_dma_start(tx_dma_index);
 	ao_alarm(1 + len);
-	cli();
+	ao_arch_block_interrupts();
 	while (!ao_dma_done[tx_dma_index])
 		if (ao_sleep(&ao_dma_done[tx_dma_index]))
 			break;
@@ -274,7 +270,7 @@ ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
 		if (ao_sleep(&ao_i2c_state[index]))
 			break;
 	stm_i2c->cr2 = AO_STM_I2C_CR2;
-	sei();
+	ao_arch_release_interrupts();
 	if (stop) {
 		stm_i2c->cr1 = AO_STM_I2C_CR1 | (1 << STM_I2C_CR1_STOP);
 		ao_i2c_wait_stop(index);
@@ -304,8 +300,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)
@@ -328,11 +322,11 @@ ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 			stm_i2c->cr1 = AO_STM_I2C_CR1 | (1 << STM_I2C_CR1_STOP);
 
 		ao_alarm(1);
-		cli();
+		ao_arch_block_interrupts();
 		while (ao_i2c_recv_len[index])
 			if (ao_sleep(&ao_i2c_recv_len[index]))
 				break;
-		sei();
+		ao_arch_release_interrupts();
 		ret = ao_i2c_recv_len[index] == 0;
 		ao_clear_alarm();
 	} else {
@@ -358,11 +352,11 @@ ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 
 		ao_dma_start(rx_dma_index);
 		ao_alarm(len);
-		cli();
+		ao_arch_block_interrupts();
 		while (!ao_dma_done[rx_dma_index])
 			if (ao_sleep(&ao_dma_done[rx_dma_index]))
 				break;
-		sei();
+		ao_arch_release_interrupts();
 		ao_clear_alarm();
 		ret = ao_dma_done[rx_dma_index];
 		ao_dma_done_transfer(rx_dma_index);