changed handling of TTYs; you now connect to a tty device, misc/mkpty is used to create a pty to be used by the emulator

src/apr.c

@@ -751,7 +751,6 @@ wake_pi(void *dev)
 			apr->pi_active = 0;
 		if(bus->c12 & F28)
 			apr->pi_active = 1;
-printf("%o %o\n", apr->pir, apr->pio);
 	}
 }
 

src/main.c

@@ -537,7 +537,7 @@ getms(void)
 void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-td]\n", argv0);
+	fprintf(stderr, "usage: %s [-t] [-d debugfile] [-c ttyfile]\n", argv0);
 	exit(1);
 }
 
@@ -559,9 +559,10 @@ main(int argc, char *argv[])
 	int delay;
 	int i;
 	int w, h;
-	const char *outfile;
+	const char *outfile, *ttyfile;
 
 	outfile = "/dev/null";
+	ttyfile = "/tmp/6tty";
 	ARGBEGIN{
 	case 't':
 		dotrace = 1;
@@ -569,6 +570,9 @@ main(int argc, char *argv[])
 	case 'd':
 		outfile = EARGF(usage());
 		break;
+	case 'c':
+		ttyfile = EARGF(usage());
+		break;
 	default:
 		usage();
 	}ARGEND;
@@ -679,6 +683,8 @@ main(int argc, char *argv[])
 	inittty(&tty, &apr.iobus);
 	initptr(&ptr, &apr.iobus);
 	initptp(&ptp, &apr.iobus);
+	if(ttyfile)
+		attachdevtty(&tty, ttyfile);
 	showmem(&apr.membus);
 
 	for(;;){

src/pdp6.h

@@ -448,6 +448,7 @@ struct Tty
 	int fd;
 };
 void inittty(Tty *tty, IOBus *bus);
+void attachdevtty(Tty *tty, const char *path);
 
 
 

src/tty.c

@@ -1,10 +1,8 @@
 #include "pdp6.h"
-#include <string.h>
+#include <fcntl.h>
 #include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h> 
-#include <pthread.h>    
+#include <termios.h>
+#include <pthread.h>
 #include <poll.h>
 
 static void
@@ -13,52 +11,24 @@ recalc_tty_req(Tty *tty)
 	setreq(tty->bus, TTY, tty->tto_flag || tty->tti_flag ? tty->pia : 0);
 }
 
+/* TODO: implement some kind of sleep if no tty is attached */
 static void*
 ttythread(void *dev)
 {
-	int sockfd, newsockfd, portno, clilen;
-	char buf;
-	struct sockaddr_in serv_addr, cli_addr;
 	int n;
+	char c;
 	Tty *tty;
 
 	tty = dev;
-	sockfd = socket(AF_INET, SOCK_STREAM, 0);
-	if(sockfd < 0){
-		perror("error: socket");
-		exit(1);
-	}
-	memset(&serv_addr, 0, sizeof(serv_addr));
-	portno = 6666;
-	serv_addr.sin_family = AF_INET;
-	serv_addr.sin_addr.s_addr = INADDR_ANY;
-	serv_addr.sin_port = htons(portno);
-	if(bind(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0){
-		perror("error: bind");
-		exit(1);
-	}
-	listen(sockfd,5);
-	clilen = sizeof(cli_addr);
-
-	while(newsockfd = accept(sockfd, (struct sockaddr*)&cli_addr, &clilen)){
-		printf("TTY attached\n");
-		tty->fd = newsockfd;
-		while(n = read(tty->fd, &buf, 1), n > 0){
+	for(;;){
+		while(tty->fd >= 0 && (n = read(tty->fd, &c, 1)) > 0){
 			tty->tti_busy = 1;
-			//fprintf(stderr, "(got.%c)", buf);
-			tty->tti = buf|0200;
+			tty->tti = c|0200;
 			tty->tti_busy = 0;
 			tty->tti_flag = 1;
 			recalc_tty_req(tty);
 		}
-		tty->fd = -1;
-		close(newsockfd);
 	}
-	if(newsockfd < 0){
-		perror("error: accept");
-		exit(1);
-	}
-	return nil;
 }
 
 static void
@@ -122,6 +92,34 @@ wake_tty(void *dev)
 	recalc_tty_req(tty);
 }
 
+void
+attachdevtty(Tty *tty, const char *path)
+{
+	int fd;
+	struct termios tio;
+
+	fd = tty->fd;
+	if(fd >= 0){
+		tty->fd = -1;
+		close(fd);
+	}
+	fd = open(path, O_RDWR);
+	if(fd < 0)
+		goto fail;
+	if(tcgetattr(fd, &tio) < 0)
+		goto fail;
+	cfmakeraw(&tio);
+//	cfsetspeed(&tio, B300);
+	if(tcsetattr(fd, TCSAFLUSH, &tio) < 0)
+		goto fail;
+	tty->fd = fd;
+	return;
+
+fail:
+	if(fd >= 0) close(fd);
+	fprintf(stderr, "couldn't open tty %s\n", path);
+}
+
 void
 inittty(Tty *tty, IOBus *bus)
 {