summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschodet2005-06-29 21:54:48 +0000
committerschodet2005-06-29 21:54:48 +0000
commit8837b88c9d9cce383fd1e3467abadef51cbc5b1c (patch)
tree613c34ed30bb77e93392e22402748e3385dfc415
parentc8af15a62a2c5edb9ff1f160cc68f4ed63c61511 (diff)
Ajout de la partie host.
-rw-r--r--n/avr/modules/uart/test_uart.c4
-rw-r--r--n/avr/modules/uart/uart.host.c98
-rw-r--r--p/todo/n/avr/modules/uart.todo4
3 files changed, 103 insertions, 3 deletions
diff --git a/n/avr/modules/uart/test_uart.c b/n/avr/modules/uart/test_uart.c
index 9d5f982..9ef7e7e 100644
--- a/n/avr/modules/uart/test_uart.c
+++ b/n/avr/modules/uart/test_uart.c
@@ -24,7 +24,7 @@
* }}} */
#include "modules/uart/uart.h"
-#include <avr/interrupt.h>
+//#include <avr/interrupt.h>
/* +AutoDec */
/* -AutoDec */
@@ -32,7 +32,7 @@
int
main (void)
{
- sei ();
+ //sei ();
uart0_init ();
uart0_putc ('N');
uart0_putc ('i');
diff --git a/n/avr/modules/uart/uart.host.c b/n/avr/modules/uart/uart.host.c
new file mode 100644
index 0000000..3bbd112
--- /dev/null
+++ b/n/avr/modules/uart/uart.host.c
@@ -0,0 +1,98 @@
+/* uart.host.c */
+/* avr.uart - UART AVR module. {{{
+ *
+ * Copyright (C) 2005 Nicolas Schodet
+ *
+ * Robot APB Team/Efrei 2006.
+ * Web: http://assos.efrei.fr/robot/
+ * Email: robot AT efrei DOT fr
+ *
+ * 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; 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * }}} */
+#define _GNU_SOURCE
+#include "uart.h"
+
+#include "uart_common.h"
+
+#if AC_UART (PORT) != -1
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <unistd.h>
+
+/* Pseudo terminal file descriptor. */
+static int uart_pt_fd;
+
+/** Initialise uart. */
+void
+uart_init (void)
+{
+ /* Open and unlock pt. */
+ uart_pt_fd = getpt ();
+ if (uart_pt_fd == -1)
+ assert_perror (errno);
+ if (grantpt (uart_pt_fd) == -1 || unlockpt (uart_pt_fd) == -1)
+ assert_perror (errno);
+ /* Display its name. */
+ printf ("uart%d: %s\n", UART_N, ptsname (uart_pt_fd));
+}
+
+/** Read a char. */
+uint8_t
+uart_getc (void)
+{
+ uint8_t c;
+ int n;
+ n = read (uart_pt_fd, &c, 1);
+ if (n == -1)
+ assert_perror (errno);
+ /* This is quite unusual... */
+ if (n == 0)
+ return 0;
+ return c;
+}
+
+/** Write a char. */
+void
+uart_putc (uint8_t c)
+{
+ int n;
+ write (uart_pt_fd, &c, 1);
+}
+
+/** Retrieve availlable chars. */
+uint8_t
+uart_poll (void)
+{
+ fd_set fds;
+ struct timeval tv;
+ int r;
+ /* Use select to poll. */
+ FD_ZERO (&fds);
+ FD_SET (uart_pt_fd, &fds);
+ tv.tv_sec = 0;
+ tv.tv_usec = 0;
+ r = select (FD_SETSIZE, &fds, 0, 0, &tv);
+ /* Check result. */
+ if (r == -1)
+ assert_perror (errno);
+ return r;
+}
+
+#endif /* AC_UART (PORT) != -1 */
diff --git a/p/todo/n/avr/modules/uart.todo b/p/todo/n/avr/modules/uart.todo
index 5a5f269..1b163d9 100644
--- a/p/todo/n/avr/modules/uart.todo
+++ b/p/todo/n/avr/modules/uart.todo
@@ -1,3 +1,5 @@
(Ni)
-- parti host
++ parti host
+- écrire le pts dans un fichier
- détection d'erreur à la termios
+- régler le problème aft avec la doc