summaryrefslogtreecommitdiff
path: root/src/avr/ao_spi_slave.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2012-10-18 15:18:52 -0700
committerKeith Packard <keithp@keithp.com>2012-10-18 15:18:52 -0700
commit5a55501660ebab3b858a48483c5df1cfb4e858e4 (patch)
tree9b5d8305d9c65b10f82f6839bb1b5c169681ef00 /src/avr/ao_spi_slave.c
parent0361235c9ef56738ba0e97be88a85afef0ce8268 (diff)
parent440365bd17d804c2f574c35164612cf1682397d7 (diff)
Merge branch 'master' into mm-ms5611
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/avr/ao_spi_slave.c')
-rw-r--r--src/avr/ao_spi_slave.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/avr/ao_spi_slave.c b/src/avr/ao_spi_slave.c
index b742d29a..a400b8a0 100644
--- a/src/avr/ao_spi_slave.c
+++ b/src/avr/ao_spi_slave.c
@@ -44,9 +44,8 @@ ao_spi_slave_send(uint8_t *buf, uint8_t len)
static uint8_t ao_spi_slave_running;
-ISR(PCINT0_vect)
+ISR(PCINT0_vect, ISR_BLOCK)
{
- cli();
#if SPI_SLAVE_PIN_0_3
if ((PINB & (1 << PORTB0)) == 0)
#endif
@@ -61,7 +60,6 @@ ISR(PCINT0_vect)
} else {
ao_spi_slave_running = 0;
}
- sei();
}
void