X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Favr%2Fao_serial_avr.c;h=cfdd7dfe2883431c74610ed6e4b98fcb3cf7a164;hb=c6e57291d91f1f6c4de5c54a5cfd3eef66d9f830;hp=dcee246ce3eb66191e393708aeee88858dc7ef34;hpb=040a6eb119451026e1ec7c3a6a8e76b439c632d5;p=fw%2Faltos

diff --git a/src/avr/ao_serial_avr.c b/src/avr/ao_serial_avr.c
index dcee246c..cfdd7dfe 100644
--- a/src/avr/ao_serial_avr.c
+++ b/src/avr/ao_serial_avr.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,8 +18,8 @@
 
 #include "ao.h"
 
-__xdata struct ao_fifo	ao_serial1_rx_fifo;
-__xdata struct ao_fifo	ao_serial1_tx_fifo;
+struct ao_fifo	ao_serial1_rx_fifo;
+struct ao_fifo	ao_serial1_tx_fifo;
 
 void
 ao_debug_out(char c)
@@ -39,7 +40,7 @@ ISR(USART1_RX_vect)
 #endif
 }
 
-static __xdata uint8_t ao_serial_tx1_started;
+static uint8_t ao_serial_tx1_started;
 
 static void
 ao_serial1_tx_start(void)
@@ -59,52 +60,51 @@ ISR(USART1_UDRE_vect)
 	ao_wakeup(&ao_serial1_tx_fifo);
 }
 
-char
-ao_serial1_getchar(void) __critical
-{
-	char	c;
-	cli();
-	while (ao_fifo_empty(ao_serial1_rx_fifo))
-		ao_sleep(&ao_serial1_rx_fifo);
-	ao_fifo_remove(ao_serial1_rx_fifo, c);
-	sei();
-	return c;
-}
-
 #if USE_SERIAL_1_STDIN
-char
-ao_serial1_pollchar(void) __critical
+int
+_ao_serial1_pollchar(void)
 {
 	char	c;
-	cli();
 	if (ao_fifo_empty(ao_serial1_rx_fifo)) {
 		sei();
 		return AO_READ_AGAIN;
 	}
 	ao_fifo_remove(ao_serial1_rx_fifo,c);
-	sei();
 	return c;
 }
 #endif
 
+char
+ao_serial1_getchar(void) 
+{
+	char	c;
+
+	ao_arch_block_interrupts();
+	while (ao_fifo_empty(ao_serial1_rx_fifo))
+		ao_sleep(&ao_serial1_rx_fifo);
+	ao_fifo_remove(ao_serial1_rx_fifo, c);
+	ao_arch_release_interrupts();
+	return c;
+}
+
 void
-ao_serial1_putchar(char c) __critical
+ao_serial1_putchar(char c)
 {
-	cli();
+	ao_arch_block_interrupts();
 	while (ao_fifo_full(ao_serial1_tx_fifo))
 		ao_sleep(&ao_serial1_tx_fifo);
 	ao_fifo_insert(ao_serial1_tx_fifo, c);
 	ao_serial_tx1_start();
-	sei();
+	ao_arch_release_interrupts();
 }
 
 void
-ao_serial1_drain(void) __critical
+ao_serial1_drain(void) 
 {
-	cli();
+	ao_arch_block_interrupts();
 	while (!ao_fifo_empty(ao_serial1_tx_fifo))
 		ao_sleep(&ao_serial1_tx_fifo);
-	sei();
+	ao_arch_release_interrupts();
 }
 
 static const struct {
@@ -155,7 +155,7 @@ ao_serial_init(void)
 		  (1 << RXCIE1) |	/* Enable receive interrupts */
 		  (1 << UDRIE1));	/* Enable transmit empty interrupts */
 #if USE_SERIAL_1_STDIN
-	ao_add_stdio(ao_serial1_pollchar,
+	ao_add_stdio(_ao_serial1_pollchar,
 		     ao_serial1_putchar,
 		     NULL);
 #endif