+++ /dev/null
-/**
- * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos 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; 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction. Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License. This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
- * -->
- *
- * \brief Simple serial I/O driver
- *
- * \version $Id$
- * \author Francesco Sacchi <batt@develer.com>
- */
-
-/*#*
- *#* $Log$
- *#* Revision 1.2 2006/07/19 12:56:26 bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.1 2005/04/12 01:37:50 bernie
- *#* Import into DevLib.
- *#*
- *#* Revision 1.7 2005/01/23 12:24:27 bernie
- *#* Include macros.h for BV().
- *#*
- *#* Revision 1.6 2004/10/20 13:40:54 batt
- *#* Put {} instead of ; after while loop.
- *#*
- *#* Revision 1.5 2004/10/20 13:39:40 batt
- *#* Reformat.
- *#*
- *#* Revision 1.4 2004/10/20 13:30:02 batt
- *#* Optimization of UCSR0C writing
- *#*
- *#* Revision 1.3 2004/10/14 15:55:32 batt
- *#* Add ser_purge.
- *#*
- *#* Revision 1.2 2004/10/14 14:46:59 batt
- *#* Change baudrate calculation.
- *#*
- *#* Revision 1.1 2004/10/13 16:35:36 batt
- *#* New (simple) serial driver.
- *#*/
-#include "ser_simple.h"
-
-#include <compiler.h>
-#include <config.h>
-#include <macros.h> /* BV() */
-#include <hw.h>
-
-#include <avr/io.h>
-
-/**
- * Send a character over the serial line.
- *
- * \return the character sent.
- */
-int _ser_putchar(int c)
-{
- /* Disable Rx to avoid echo*/
- UCSR0B &= ~BV(RXEN);
- /* Enable tx*/
- UCSR0B |= BV(TXEN);
- /* Prepare transmission */
- UDR0 = c;
- /* Wait until byte sent */
- while (!(UCSR0A & BV(TXC))) {}
- /* Disable tx to avoid short circuit when tx and rx share the same wire. */
- UCSR0B &= ~BV(TXEN);
- /* Enable Rx */
- UCSR0B |= BV(RXEN);
- /* Delete TRANSMIT_COMPLETE_BIT flag */
- UCSR0A |= BV(TXC);
- return c;
-}
-
-
-/**
- * Get a character from the serial line.
- * If ther is no character in the buffer this function wait until
- * one is received (no timeout).
- *
- * \return the character received.
- */
-int _ser_getchar(void)
-{
- /* Wait for data */
- while (!(UCSR0A & BV(RXC))) {}
- return UDR0;
-
-}
-
-
-/**
- * Get a character from the receiver buffer
- * If the buffer is empty, ser_getchar_nowait() returns
- * immediatly EOF.
- */
-int _ser_getchar_nowait(void)
-{
- if (!(UCSR0A & BV(RXC))) return EOF;
- else return UDR0;
-}
-
-void _ser_settimeouts(void)
-{
-}
-
-/**
- * Set the baudrate.
- */
-void _ser_setbaudrate(unsigned long rate)
-{
- /* Compute baud-rate period */
- uint16_t period = (((CLOCK_FREQ / 16UL) + (rate / 2)) / rate) - 1;
-
- UBRR0H = (period) >> 8;
- UBRR0L = (period);
-}
-
-/**
- * Send a string.
- */
-int _ser_print(const char *s)
-{
- while(*s) _ser_putchar(*s++);
- return 0;
-}
-
-
-void _ser_setparity(int parity)
-{
- /* Set the new parity */
- UCSR0C |= (UCSR0C & ~(BV(UPM1) | BV(UPM0))) | (parity << UPM0);
-}
-
-/**
- * Dummy functions.
- */
-void _ser_purge(void)
-{
- while (_ser_getchar_nowait() != EOF) {}
-}
-
-/**
- * Initialize serial.
- */
-struct Serial * _ser_open(void)
-{
- /*
- * Set Rx and Tx pins as input to avoid short
- * circuit when serial is disabled.
- */
- DDRE &= ~(BV(PE0)|BV(PE1));
- PORTE &= ~BV(PE0);
- PORTE |= BV(PE1);
- /* Enable only Rx section */
- UCSR0B = BV(RXEN);
- return NULL;
-}
-
-
-/**
- * Clean up serial port, disabling the associated hardware.
- */
-void _ser_close(void)
-{
- /* Disable Rx & Tx. */
- UCSR0B &= ~(BV(RXEN) | BV(TXEN));
-}
+++ /dev/null
-/**
- * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos 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; 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
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction. Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License. This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- * -->
- *
- * \brief Simple serial I/O driver
- *
- * \version $Id$
- * \author Bernardo Innocenti <bernie@develer.com>
- * \author Francesco Sacchi <batt@develer.com>
- */
-
-/*#*
- *#* $Log$
- *#* Revision 1.2 2006/07/19 12:56:26 bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.1 2005/04/12 01:37:50 bernie
- *#* Import into DevLib.
- *#*
- *#* Revision 1.5 2004/10/20 13:37:49 batt
- *#* Change testing of simple serial instead of ARCH_BOOT in sc driver.
- *#*
- *#* Revision 1.4 2004/10/15 12:22:04 batt
- *#* Readd ';' in setstatus macro.
- *#*
- *#* Revision 1.3 2004/10/15 12:13:57 batt
- *#* Correct \brief header.
- *#*
- *#* Revision 1.2 2004/10/15 11:54:21 batt
- *#* Reformat.
- *#*
- *#* Revision 1.1 2004/10/13 16:35:36 batt
- *#* New (simple) serial driver.
- *#*
- *#*
- */
-#ifndef SER_SIMPLE_H
-#define SER_SIMPLE_H
-
-/* For checking which serial driver is linked */
-#define SER_SIMPLE
-
-#include <config.h>
-#include <compiler.h>
-
-
-#if 0
-#if CPU_AVR
- typedef uint8_t serstatus_t;
-
- /* Software errors */
- #define SERRF_RXFIFOOVERRUN BV(0) /**< Rx FIFO buffer overrun */
- #define SERRF_RXTIMEOUT BV(5) /**< Receive timeout */
- #define SERRF_TXTIMEOUT BV(6) /**< Transmit timeout */
-
- /* Hardware errors */
- #define SERRF_RXSROVERRUN BV(3) /**< Rx shift register overrun */
- #define SERRF_FRAMEERROR BV(4) /**< Stop bit missing */
- #define SERRF_PARITYERROR BV(7) /**< Parity error */
-#else
- #error unknown architecture
-#endif
-/*\}*/
-
-/**
- * \name Serial hw numbers
- *
- * \{
- */
-enum
-{
-#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
- SER_UART0,
- SER_UART1,
- SER_SPI,
-#elif CPU_AVR_ATMEGA103 || CPU_AVR_ATMEGA8
- SER_UART0,
- SER_SPI,
-#else
- #error unknown architecture
-#endif
- SER_CNT /**< Number of serial ports */
-};
-/*\}*/
-#endif
-
-/** \name Parity settings for ser_setparity() */
-/*\{*/
-#define SER_PARITY_NONE 0
-#define SER_PARITY_EVEN 2
-#define SER_PARITY_ODD 3
-/*\}*/
-
-
-/** Serial handle structure */
-struct Serial;
-
-/* Function prototypes */
-extern int _ser_putchar(int c);
-extern int _ser_getchar(void);
-extern int _ser_getchar_nowait(void);
-/*
-extern int ser_write(struct Serial *port, const void *buf, size_t len);
-extern int ser_read(struct Serial *port, void *buf, size_t size);
-
-extern int ser_printf(struct Serial *port, const char *format, ...) FORMAT(__printf__, 2, 3);
-
-extern int ser_gets(struct Serial *port, char *buf, int size);
-extern int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo);
-*/
-extern int _ser_print(const char *s);
-
-extern void _ser_setbaudrate(unsigned long rate);
-extern void _ser_setparity(int parity);
-extern void _ser_settimeouts(void);
-extern void _ser_setstatus(void);
-/*
-extern void ser_resync(struct Serial *port, time_t delay);
-extern void ser_drain(struct Serial *port);
-*/
-extern void _ser_purge(void);
-extern struct Serial *_ser_open(void);
-extern void _ser_close(void);
-
-/**
- * \name Functions implemented as macros
- *
- * \{
- */
-#define ser_putchar(c, port) _ser_putchar(c)
-#define ser_getchar(port) _ser_getchar()
-#define ser_getchar_nowait(port) _ser_getchar_nowait()
-#define ser_print(port, s) _ser_print(s)
-#define ser_setbaudrate(port, y) _ser_setbaudrate(y)
-#define ser_setparity(port, par) _ser_setparity(par)
-#define ser_settimeouts(port, y, z) _ser_settimeouts()
-#define ser_purge(port) _ser_purge()
-#define ser_open(port) _ser_open()
-#define ser_getstatus(h) 0
-#define ser_setstatus(h, x) do {(void)(x);} while(0)
-/* \} */
-
-#endif /* SER_SIMPLE_H */
--- /dev/null
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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; 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction. Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License. This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Simple serial I/O driver
+ *
+ * \version $Id$
+ * \author Francesco Sacchi <batt@develer.com>
+ */
+
+/*#*
+ *#* $Log$
+ *#* Revision 1.2 2006/07/19 12:56:26 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.1 2005/04/12 01:37:50 bernie
+ *#* Import into DevLib.
+ *#*
+ *#* Revision 1.7 2005/01/23 12:24:27 bernie
+ *#* Include macros.h for BV().
+ *#*
+ *#* Revision 1.6 2004/10/20 13:40:54 batt
+ *#* Put {} instead of ; after while loop.
+ *#*
+ *#* Revision 1.5 2004/10/20 13:39:40 batt
+ *#* Reformat.
+ *#*
+ *#* Revision 1.4 2004/10/20 13:30:02 batt
+ *#* Optimization of UCSR0C writing
+ *#*
+ *#* Revision 1.3 2004/10/14 15:55:32 batt
+ *#* Add ser_purge.
+ *#*
+ *#* Revision 1.2 2004/10/14 14:46:59 batt
+ *#* Change baudrate calculation.
+ *#*
+ *#* Revision 1.1 2004/10/13 16:35:36 batt
+ *#* New (simple) serial driver.
+ *#*/
+#include "ser_simple.h"
+
+#include <compiler.h>
+#include <config.h>
+#include <macros.h> /* BV() */
+#include <hw.h>
+
+#include <avr/io.h>
+
+/**
+ * Send a character over the serial line.
+ *
+ * \return the character sent.
+ */
+int _ser_putchar(int c)
+{
+ /* Disable Rx to avoid echo*/
+ UCSR0B &= ~BV(RXEN);
+ /* Enable tx*/
+ UCSR0B |= BV(TXEN);
+ /* Prepare transmission */
+ UDR0 = c;
+ /* Wait until byte sent */
+ while (!(UCSR0A & BV(TXC))) {}
+ /* Disable tx to avoid short circuit when tx and rx share the same wire. */
+ UCSR0B &= ~BV(TXEN);
+ /* Enable Rx */
+ UCSR0B |= BV(RXEN);
+ /* Delete TRANSMIT_COMPLETE_BIT flag */
+ UCSR0A |= BV(TXC);
+ return c;
+}
+
+
+/**
+ * Get a character from the serial line.
+ * If ther is no character in the buffer this function wait until
+ * one is received (no timeout).
+ *
+ * \return the character received.
+ */
+int _ser_getchar(void)
+{
+ /* Wait for data */
+ while (!(UCSR0A & BV(RXC))) {}
+ return UDR0;
+
+}
+
+
+/**
+ * Get a character from the receiver buffer
+ * If the buffer is empty, ser_getchar_nowait() returns
+ * immediatly EOF.
+ */
+int _ser_getchar_nowait(void)
+{
+ if (!(UCSR0A & BV(RXC))) return EOF;
+ else return UDR0;
+}
+
+void _ser_settimeouts(void)
+{
+}
+
+/**
+ * Set the baudrate.
+ */
+void _ser_setbaudrate(unsigned long rate)
+{
+ /* Compute baud-rate period */
+ uint16_t period = (((CLOCK_FREQ / 16UL) + (rate / 2)) / rate) - 1;
+
+ UBRR0H = (period) >> 8;
+ UBRR0L = (period);
+}
+
+/**
+ * Send a string.
+ */
+int _ser_print(const char *s)
+{
+ while(*s) _ser_putchar(*s++);
+ return 0;
+}
+
+
+void _ser_setparity(int parity)
+{
+ /* Set the new parity */
+ UCSR0C |= (UCSR0C & ~(BV(UPM1) | BV(UPM0))) | (parity << UPM0);
+}
+
+/**
+ * Dummy functions.
+ */
+void _ser_purge(void)
+{
+ while (_ser_getchar_nowait() != EOF) {}
+}
+
+/**
+ * Initialize serial.
+ */
+struct Serial * _ser_open(void)
+{
+ /*
+ * Set Rx and Tx pins as input to avoid short
+ * circuit when serial is disabled.
+ */
+ DDRE &= ~(BV(PE0)|BV(PE1));
+ PORTE &= ~BV(PE0);
+ PORTE |= BV(PE1);
+ /* Enable only Rx section */
+ UCSR0B = BV(RXEN);
+ return NULL;
+}
+
+
+/**
+ * Clean up serial port, disabling the associated hardware.
+ */
+void _ser_close(void)
+{
+ /* Disable Rx & Tx. */
+ UCSR0B &= ~(BV(RXEN) | BV(TXEN));
+}
--- /dev/null
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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; 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction. Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License. This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ * -->
+ *
+ * \brief Simple serial I/O driver
+ *
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Francesco Sacchi <batt@develer.com>
+ */
+
+/*#*
+ *#* $Log$
+ *#* Revision 1.2 2006/07/19 12:56:26 bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.1 2005/04/12 01:37:50 bernie
+ *#* Import into DevLib.
+ *#*
+ *#* Revision 1.5 2004/10/20 13:37:49 batt
+ *#* Change testing of simple serial instead of ARCH_BOOT in sc driver.
+ *#*
+ *#* Revision 1.4 2004/10/15 12:22:04 batt
+ *#* Readd ';' in setstatus macro.
+ *#*
+ *#* Revision 1.3 2004/10/15 12:13:57 batt
+ *#* Correct \brief header.
+ *#*
+ *#* Revision 1.2 2004/10/15 11:54:21 batt
+ *#* Reformat.
+ *#*
+ *#* Revision 1.1 2004/10/13 16:35:36 batt
+ *#* New (simple) serial driver.
+ *#*
+ *#*
+ */
+#ifndef SER_SIMPLE_H
+#define SER_SIMPLE_H
+
+/* For checking which serial driver is linked */
+#define SER_SIMPLE
+
+#include <config.h>
+#include <compiler.h>
+
+
+#if 0
+#if CPU_AVR
+ typedef uint8_t serstatus_t;
+
+ /* Software errors */
+ #define SERRF_RXFIFOOVERRUN BV(0) /**< Rx FIFO buffer overrun */
+ #define SERRF_RXTIMEOUT BV(5) /**< Receive timeout */
+ #define SERRF_TXTIMEOUT BV(6) /**< Transmit timeout */
+
+ /* Hardware errors */
+ #define SERRF_RXSROVERRUN BV(3) /**< Rx shift register overrun */
+ #define SERRF_FRAMEERROR BV(4) /**< Stop bit missing */
+ #define SERRF_PARITYERROR BV(7) /**< Parity error */
+#else
+ #error unknown architecture
+#endif
+/*\}*/
+
+/**
+ * \name Serial hw numbers
+ *
+ * \{
+ */
+enum
+{
+#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128
+ SER_UART0,
+ SER_UART1,
+ SER_SPI,
+#elif CPU_AVR_ATMEGA103 || CPU_AVR_ATMEGA8
+ SER_UART0,
+ SER_SPI,
+#else
+ #error unknown architecture
+#endif
+ SER_CNT /**< Number of serial ports */
+};
+/*\}*/
+#endif
+
+/** \name Parity settings for ser_setparity() */
+/*\{*/
+#define SER_PARITY_NONE 0
+#define SER_PARITY_EVEN 2
+#define SER_PARITY_ODD 3
+/*\}*/
+
+
+/** Serial handle structure */
+struct Serial;
+
+/* Function prototypes */
+extern int _ser_putchar(int c);
+extern int _ser_getchar(void);
+extern int _ser_getchar_nowait(void);
+/*
+extern int ser_write(struct Serial *port, const void *buf, size_t len);
+extern int ser_read(struct Serial *port, void *buf, size_t size);
+
+extern int ser_printf(struct Serial *port, const char *format, ...) FORMAT(__printf__, 2, 3);
+
+extern int ser_gets(struct Serial *port, char *buf, int size);
+extern int ser_gets_echo(struct Serial *port, char *buf, int size, bool echo);
+*/
+extern int _ser_print(const char *s);
+
+extern void _ser_setbaudrate(unsigned long rate);
+extern void _ser_setparity(int parity);
+extern void _ser_settimeouts(void);
+extern void _ser_setstatus(void);
+/*
+extern void ser_resync(struct Serial *port, time_t delay);
+extern void ser_drain(struct Serial *port);
+*/
+extern void _ser_purge(void);
+extern struct Serial *_ser_open(void);
+extern void _ser_close(void);
+
+/**
+ * \name Functions implemented as macros
+ *
+ * \{
+ */
+#define ser_putchar(c, port) _ser_putchar(c)
+#define ser_getchar(port) _ser_getchar()
+#define ser_getchar_nowait(port) _ser_getchar_nowait()
+#define ser_print(port, s) _ser_print(s)
+#define ser_setbaudrate(port, y) _ser_setbaudrate(y)
+#define ser_setparity(port, par) _ser_setparity(par)
+#define ser_settimeouts(port, y, z) _ser_settimeouts()
+#define ser_purge(port) _ser_purge()
+#define ser_open(port) _ser_open()
+#define ser_getstatus(h) 0
+#define ser_setstatus(h, x) do {(void)(x);} while(0)
+/* \} */
+
+#endif /* SER_SIMPLE_H */
projects / bertos.git / commitdiff