along with simavr. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <sys/select.h>
+#include "sim_network.h"
#include <stdlib.h>
#include <pthread.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
-#include <pty.h>
#include <signal.h>
+#ifdef __APPLE__
+#include <util.h>
+#else
+#include <pty.h>
+#endif
#include "uart_pty.h"
#include "avr_uart.h"
DEFINE_FIFO(uint8_t,uart_pty_fifo);
+//#define TRACE(_w) _w
+#ifndef TRACE
+#define TRACE(_w)
+#endif
+
+#define LOCK_MUTEX { TRACE(printf("%s lock: %p\n", __FUNCTION__ , (void*)pthread_self())); pthread_mutex_lock(&p->lock); }
+#define UNLOCK_MUTEX { pthread_mutex_unlock(&p->lock); TRACE(printf("%s unlock: %p\n", __FUNCTION__ , (void*)pthread_self())); }
+
/*
* called when a byte is send via the uart on the AVR
*/
-static void uart_pty_in_hook(struct avr_irq_t * irq, uint32_t value, void * param)
+static void
+uart_pty_in_hook(
+ struct avr_irq_t * irq,
+ uint32_t value,
+ void * param)
{
uart_pty_t * p = (uart_pty_t*)param;
- //printf("uart_pty_in_hook %02x\n", value);
- uart_pty_fifo_write(&p->in, value);
+ LOCK_MUTEX;
+ TRACE(printf("uart_pty_in_hook %02x\n", value);)
+ uart_pty_fifo_write(&p->pty.in, value);
+
+ if (p->tap.s) {
+ if (p->tap.crlf && value == '\n')
+ uart_pty_fifo_write(&p->tap.in, '\r');
+ uart_pty_fifo_write(&p->tap.in, value);
+ }
+ UNLOCK_MUTEX;
}
// try to empty our fifo, the uart_pty_xoff_hook() will be called when
// other side is full
-static void uart_pty_flush_incoming(uart_pty_t * p)
+static void
+uart_pty_flush_incoming(
+ uart_pty_t * p)
{
- while (p->xon && !uart_pty_fifo_isempty(&p->out)) {
- uint8_t byte = uart_pty_fifo_read(&p->out);
- // printf("uart_pty_flush_incoming send %02x\n", byte);
+ LOCK_MUTEX;
+ while (p->xon && !uart_pty_fifo_isempty(&p->pty.out)) {
+ uint8_t byte = uart_pty_fifo_read(&p->pty.out);
+ TRACE(printf("uart_pty_flush_incoming send %02x\n", byte);)
avr_raise_irq(p->irq + IRQ_UART_PTY_BYTE_OUT, byte);
+
+ if (p->tap.s) {
+ if (p->tap.crlf && byte == '\n')
+ uart_pty_fifo_write(&p->tap.in, '\r');
+ uart_pty_fifo_write(&p->tap.in, byte);
+ }
+ }
+ if (p->tap.s) {
+ while (p->xon && !uart_pty_fifo_isempty(&p->tap.out)) {
+ uint8_t byte = uart_pty_fifo_read(&p->tap.out);
+ if (p->tap.crlf && byte == '\r') {
+ uart_pty_fifo_write(&p->tap.in, '\n');
+ }
+ if (byte == '\n')
+ continue;
+ uart_pty_fifo_write(&p->tap.in, byte);
+ avr_raise_irq(p->irq + IRQ_UART_PTY_BYTE_OUT, byte);
+ }
}
+ UNLOCK_MUTEX;
}
/*
* Called when the uart has room in it's input buffer. This is called repeateadly
* if necessary, while the xoff is called only when the uart fifo is FULL
*/
-static void uart_pty_xon_hook(struct avr_irq_t * irq, uint32_t value, void * param)
+static void
+uart_pty_xon_hook(
+ struct avr_irq_t * irq,
+ uint32_t value,
+ void * param)
{
uart_pty_t * p = (uart_pty_t*)param;
- if (!p->xon)
- printf("uart_pty_xon_hook\n");
+ TRACE(if (!p->xon) printf("uart_pty_xon_hook\n");)
p->xon = 1;
uart_pty_flush_incoming(p);
}
/*
* Called when the uart ran out of room in it's input buffer
*/
-static void uart_pty_xoff_hook(struct avr_irq_t * irq, uint32_t value, void * param)
+static void
+uart_pty_xoff_hook(
+ struct avr_irq_t * irq,
+ uint32_t value,
+ void * param)
{
uart_pty_t * p = (uart_pty_t*)param;
- if (p->xon)
- printf("uart_pty_xoff_hook\n");
+ TRACE(if (p->xon) printf("uart_pty_xoff_hook\n");)
p->xon = 0;
}
-static void * uart_pty_thread(void * param)
+static void *
+uart_pty_thread(
+ void * param)
{
uart_pty_t * p = (uart_pty_t*)param;
while (1) {
fd_set read_set, write_set;
- int max = p->s + 1;
+ int max = 0;
FD_ZERO(&read_set);
FD_ZERO(&write_set);
- // read more only if buffer was flushed
- if (p->buffer_len == p->buffer_done)
- FD_SET(p->s, &read_set);
- if (!uart_pty_fifo_isempty(&p->in))
- FD_SET(p->s, &write_set);
+ for (int ti = 0; ti < 2; ti++) if (p->port[ti].s) {
+ // read more only if buffer was flushed
+ if (p->port[ti].buffer_len == p->port[ti].buffer_done) {
+ FD_SET(p->port[ti].s, &read_set);
+ max = p->port[ti].s > max ? p->port[ti].s : max;
+ }
+ if (!uart_pty_fifo_isempty(&p->port[ti].in)) {
+ FD_SET(p->port[ti].s, &write_set);
+ max = p->port[ti].s > max ? p->port[ti].s : max;
+ }
+ }
struct timeval timo = { 0, 500 }; // short, but not too short interval
- int ret = select(max, &read_set, &write_set, NULL, &timo);
+ int ret = select(max+1, &read_set, &write_set, NULL, &timo);
if (!ret)
continue;
if (ret < 0)
break;
- if (FD_ISSET(p->s, &read_set)) {
- ssize_t r = read(p->s, p->buffer, sizeof(p->buffer)-1);
- p->buffer_len = r;
- p->buffer_done = 0;
- // hdump("pty recv", p->buffer, r);
- }
- if (p->buffer_done < p->buffer_len) {
- // write them in fifo
- while (p->buffer_done < p->buffer_len && !uart_pty_fifo_isfull(&p->out))
- uart_pty_fifo_write(&p->out, p->buffer[p->buffer_done++]);
- }
- if (FD_ISSET(p->s, &write_set)) {
- uint8_t buffer[512];
- // write them in fifo
- uint8_t * dst = buffer;
- while (!uart_pty_fifo_isempty(&p->in) && dst < (buffer+sizeof(buffer)))
- *dst++ = uart_pty_fifo_read(&p->in);
- size_t len = dst - buffer;
- size_t r = write(p->s, buffer, len);
- // hdump("pty send", buffer, r);
+ for (int ti = 0; ti < 2; ti++) if (p->port[ti].s) {
+ if (FD_ISSET(p->port[ti].s, &read_set)) {
+ LOCK_MUTEX;
+ ssize_t r = read(p->port[ti].s, p->port[ti].buffer, sizeof(p->port[ti].buffer)-1);
+ p->port[ti].buffer_len = r;
+ p->port[ti].buffer_done = 0;
+ TRACE(hdump("pty recv", p->port[ti].buffer, r);)
+ UNLOCK_MUTEX;
+ }
+ if (p->port[ti].buffer_done < p->port[ti].buffer_len) {
+ LOCK_MUTEX;
+ // write them in fifo
+ while (p->port[ti].buffer_done < p->port[ti].buffer_len &&
+ !uart_pty_fifo_isfull(&p->port[ti].out))
+ uart_pty_fifo_write(&p->port[ti].out,
+ p->port[ti].buffer[p->port[ti].buffer_done++]);
+ UNLOCK_MUTEX;
+ }
+ if (FD_ISSET(p->port[ti].s, &write_set)) {
+ LOCK_MUTEX;
+ uint8_t buffer[512];
+ // write them in fifo
+ uint8_t * dst = buffer;
+ while (!uart_pty_fifo_isempty(&p->port[ti].in) &&
+ dst < (buffer + sizeof(buffer)))
+ *dst++ = uart_pty_fifo_read(&p->port[ti].in);
+ size_t len = dst - buffer;
+ TRACE(size_t r =) write(p->port[ti].s, buffer, len);
+ TRACE(hdump("pty send", buffer, r);)
+ UNLOCK_MUTEX;
+ }
}
- // uart_pty_flush_incoming(p);
+ uart_pty_flush_incoming(p);
}
return NULL;
}
[IRQ_UART_PTY_BYTE_OUT] = "8>uart_pty.out",
};
-void uart_pty_init(struct avr_t * avr, uart_pty_t * p)
+void
+uart_pty_init(
+ struct avr_t * avr,
+ uart_pty_t * p)
{
+ memset(p, 0, sizeof(*p));
+
p->avr = avr;
p->irq = avr_alloc_irq(&avr->irq_pool, 0, IRQ_UART_PTY_COUNT, irq_names);
avr_irq_register_notify(p->irq + IRQ_UART_PTY_BYTE_IN, uart_pty_in_hook, p);
- int m, s;
+ int hastap = (getenv("SIMAVR_UART_TAP") && atoi(getenv("SIMAVR_UART_TAP"))) ||
+ (getenv("SIMAVR_UART_XTERM") && atoi(getenv("SIMAVR_UART_XTERM"))) ;
- if (openpty(&m, &s, p->slavename, NULL, NULL) < 0) {
- fprintf(stderr, "%s: Can't create pty: %s", __FUNCTION__, strerror(errno));
- return ;
- }
- p->s = m;
+ for (int ti = 0; ti < 1 + hastap; ti++) {
+ int m, s;
- printf("uart_pty_init bridge on port *** %s ***\n", p->slavename);
+ if (openpty(&m, &s, p->port[ti].slavename, NULL, NULL) < 0) {
+ fprintf(stderr, "%s: Can't create pty: %s", __FUNCTION__, strerror(errno));
+ return ;
+ }
+ struct termios tio;
+ tcgetattr(m, &tio);
+ cfmakeraw(&tio);
+ tcsetattr(m, TCSANOW, &tio);
+ p->port[ti].s = m;
+ p->port[ti].tap = ti != 0;
+ p->port[ti].crlf = ti != 0;
+ printf("uart_pty_init %s on port *** %s ***\n",
+ ti == 0 ? "bridge" : "tap", p->port[ti].slavename);
+ }
+ pthread_mutex_init(&p->lock, NULL);
pthread_create(&p->thread, NULL, uart_pty_thread, p);
}
-void uart_pty_stop(uart_pty_t * p)
+void
+uart_pty_stop(
+ uart_pty_t * p)
{
puts(__func__);
pthread_kill(p->thread, SIGINT);
- close(p->s);
+ for (int ti = 0; ti < 2; ti++)
+ if (p->port[ti].s)
+ close(p->port[ti].s);
void * ret;
pthread_join(p->thread, &ret);
}
-void uart_pty_connect(uart_pty_t * p, char uart)
+void
+uart_pty_connect(
+ uart_pty_t * p,
+ char uart)
{
// disable the stdio dump, as we are sending binary there
uint32_t f = 0;
if (xoff)
avr_irq_register_notify(xoff, uart_pty_xoff_hook, p);
- char link[128];
- sprintf(link, "/tmp/simavr-uart%c", uart);
- unlink(link);
- if (symlink(p->slavename, link) != 0) {
- fprintf(stderr, "WARN %s: Can't create %s: %s", __func__, link, strerror(errno));
- } else {
- printf("%s: %s now points to %s\n", __func__, link, p->slavename);
+ for (int ti = 0; ti < 1; ti++) if (p->port[ti].s) {
+ char link[128];
+ sprintf(link, "/tmp/simavr-uart%s%c", ti == 1 ? "tap" : "", uart);
+ unlink(link);
+ if (symlink(p->port[ti].slavename, link) != 0) {
+ fprintf(stderr, "WARN %s: Can't create %s: %s", __func__, link, strerror(errno));
+ } else {
+ printf("%s: %s now points to %s\n", __func__, link, p->port[ti].slavename);
+ }
}
- if (getenv("SIMAVR_UART_XTERM")) {
+ if (getenv("SIMAVR_UART_XTERM") && atoi(getenv("SIMAVR_UART_XTERM"))) {
char cmd[256];
- sprintf(cmd, "nohup xterm -e picocom -b 115200 %s >/dev/null 2>&1 &", p->slavename);
+ sprintf(cmd, "xterm -e picocom -b 115200 %s >/dev/null 2>&1 &",
+ p->tap.slavename);
system(cmd);
- }
+ } else
+ printf("note: export SIMAVR_UART_XTERM=1 and install picocom to get a terminal\n");
}
projects / simavr / blobdiff