summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--n/avr/rs232/Makefile.avr2
-rw-r--r--n/avr/rs232/avrconfig.h8
-rw-r--r--n/avr/rs232/rs232.c20
3 files changed, 6 insertions, 24 deletions
diff --git a/n/avr/rs232/Makefile.avr b/n/avr/rs232/Makefile.avr
index b3ceb39..d1411f4 100644
--- a/n/avr/rs232/Makefile.avr
+++ b/n/avr/rs232/Makefile.avr
@@ -3,7 +3,7 @@
CC = avr-gcc
CFLAGS = -g -Wall $(OPTIMIZE) -mmcu=$(MCU_TARGET)
-CPPFLAGS = $(DEFS)
+CPPFLAGS = $(DEFS) -Imodules
LDFLAGS =
OBJCOPY = avr-objcopy
diff --git a/n/avr/rs232/avrconfig.h b/n/avr/rs232/avrconfig.h
index 8b2c68a..00a0d2b 100644
--- a/n/avr/rs232/avrconfig.h
+++ b/n/avr/rs232/avrconfig.h
@@ -35,9 +35,7 @@
#define AC_RS232_BAUDRATE 115200
/** Send mode :
* - POLLING : no interrupts;
- * - RING : interrupts, ring buffer;
- * - PACKETS : interrupts, by packets delimited by SOP and EOP
- * (unimplemented). */
+ * - RING : interrupts, ring buffer. */
#define AC_RS232_SEND_MODE POLLING
/** Recv mode, same as send mode. */
#define AC_RS232_RECV_MODE POLLING
@@ -47,10 +45,6 @@
#define AC_RS232_PARITY EVEN
/** Stop bits : 1, 2. */
#define AC_RS232_STOP_BITS 1
-/** SOP (Start of packet) caracter. */
-#define AC_RS232_SOP(c) ((c) == '!')
-/** EOP (End of packet) caracter. */
-#define AC_RS232_EOP(c) ((c) == '\r')
/** Send buffer size, should be power of 2 for RING mode. */
#define AC_RS232_SEND_BUFFER_SIZE 32
/** Recv buffer size, should be power of 2 for RING mode. */
diff --git a/n/avr/rs232/rs232.c b/n/avr/rs232/rs232.c
index 68895bd..469ff17 100644
--- a/n/avr/rs232/rs232.c
+++ b/n/avr/rs232/rs232.c
@@ -78,7 +78,6 @@
/* Mode. */
#define POLLING 0
#define RING 1
-#define PACKETS 2
#define SEND_MODE AC_RS232_SEND_MODE
#define RECV_MODE AC_RS232_RECV_MODE
#if RECV_MODE == POLLING
@@ -86,9 +85,6 @@
#else
# define RECV_IE _BV (RXCIE)
#endif
-#if SEND_MODE == PACKETS || RECV_MODE == PACKETS
-# error "rs232: packet mode not implemented."
-#endif
/* Parity. */
#define ODD (_BV (UPM1) | _BV (UPM0))
@@ -109,19 +105,15 @@
#define CHAR_SIZE (_BV (UCSZ1) | _BV (UCSZ0))
/* Buffers. */
-#if SEND_MODE == RING || SEND_MODE == PACKETS
-# define SEND_BUFFER_SIZE AC_RS232_SEND_BUFFER_SIZE
-#endif
#if SEND_MODE == RING
+# define SEND_BUFFER_SIZE AC_RS232_SEND_BUFFER_SIZE
# define SEND_BUFFER_MASK (SEND_BUFFER_SIZE - 1)
# if SEND_BUFFER_SIZE & SEND_BUFFER_MASK
# error "rs232: send buffer size must be a power of 2."
# endif
#endif
-#if RECV_MODE == RING || RECV_MODE == PACKETS
-# define RECV_BUFFER_SIZE AC_RS232_RECV_BUFFER_SIZE
-#endif
#if RECV_MODE == RING
+# define RECV_BUFFER_SIZE AC_RS232_RECV_BUFFER_SIZE
# define RECV_BUFFER_MASK (RECV_BUFFER_SIZE - 1)
# if RECV_BUFFER_SIZE & RECV_BUFFER_MASK
# error "rs232: recv buffer size must be a power of 2."
@@ -129,18 +121,14 @@
#endif
/* Send buffer. */
-#if SEND_MODE != POLLING
-uint8_t rs232_send_buffer[SEND_BUFFER_SIZE];
-#endif
#if SEND_MODE == RING
+uint8_t rs232_send_buffer[SEND_BUFFER_SIZE];
volatile uint8_t rs232_send_head, rs232_send_tail;
#endif
/* Recv buffer. */
-#if RECV_MODE != POLLING
-uint8_t rs232_recv_buffer[RECV_BUFFER_SIZE];
-#endif
#if RECV_MODE == RING
+uint8_t rs232_recv_buffer[RECV_BUFFER_SIZE];
volatile uint8_t rs232_recv_head, rs232_recv_tail;
#endif