From 9d70c419c01cabcee89b7bafdade75461d8c9ee1 Mon Sep 17 00:00:00 2001
From: folkert van heusden <mail@vanheusden.com>
Date: Tue, 30 Apr 2024 13:12:51 +0200
Subject: [PATCH] flags update & initialization of client fds fix

---
 dc11.cpp | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/dc11.cpp b/dc11.cpp
index a3818f4..961d861 100644
--- a/dc11.cpp
+++ b/dc11.cpp
@@ -45,7 +45,7 @@ void dc11::operator()()
 
 	for(int i=0; i<dc11_n_lines; i++) {
 		// client session
-		pfds[dc11_n_lines + i].fd     = socket(AF_INET, SOCK_STREAM, 0);
+		pfds[dc11_n_lines + i].fd     = -1;
 		pfds[dc11_n_lines + i].events = POLLIN;
 
 		// listen on port
@@ -117,7 +117,7 @@ void dc11::operator()()
 			char buffer[32] { };
 			int rc = read(pfds[i].fd, buffer, sizeof buffer);
 			if (rc <= 0) {  // closed or error?
-				DOLOG(info, false, "Failed reading on port %d", i - dc11_n_lines + 1);
+				DOLOG(info, false, "Failed reading from port %d", i - dc11_n_lines + 1);
 				close(pfds[i].fd);
 				pfds[i].fd = -1;
 			}
@@ -137,19 +137,6 @@ void dc11::operator()()
 				have_data[line_nr].notify_all();
 			}
 		}
-
-		// emulate DTR, CTS & READY
-		for(int i=0; i<dc11_n_lines; i++) {
-			registers[i * 4 + 0] &= ~1;  // DTR: bit 0
-			registers[i * 4 + 2] &= ~2;  // CTS: bit 1
-			registers[i * 4 + 2] &= ~128;  // READY: bit 7
-
-			if (pfds[i + dc11_n_lines].fd != -1) {
-				registers[i * 4 + 0] |= 1;
-				registers[i * 4 + 2] |= 2;
-				registers[i * 4 + 2] |= 128;
-			}
-		}
 	}
 
 	DOLOG(info, true, "DC11 thread terminating");
@@ -179,6 +166,21 @@ uint16_t dc11::read_word(const uint16_t addr)
 	int      reg     = (addr - DC11_BASE) / 2;
 	int      line_nr = reg / 4;
 
+	// emulate DTR, CTS & READY
+	for(int i=0; i<dc11_n_lines; i++) {
+		registers[i * 4 + 0] &= ~1;  // DTR: bit 0
+		registers[i * 4 + 0] &= ~4;  // CD : bit 2
+		registers[i * 4 + 2] &= ~2;  // CTS: bit 1
+		registers[i * 4 + 2] &= ~128;  // READY: bit 7
+
+		if (pfds[i + dc11_n_lines].fd != -1) {
+			registers[i * 4 + 0] |= 1;
+			registers[i * 4 + 0] |= 4;
+			registers[i * 4 + 2] |= 2;
+			registers[i * 4 + 2] |= 128;
+		}
+	}
+
 	uint16_t vtemp   = registers[reg];
 
 	if ((reg & 3) == 1) {  // read data register
@@ -200,8 +202,8 @@ uint16_t dc11::read_word(const uint16_t addr)
 		}
 	}
 
-	DOLOG(debug, true, "DC11: read register %06o (%d): %06o", addr, reg, vtemp);
-	printf("DC11: read register %06o (%d): %06o\r\n", addr, reg, vtemp);
+	DOLOG(debug, true, "DC11: read register %06o (%d line %d): %06o", addr, reg, line_nr, vtemp);
+	printf("DC11: read register %06o (%d line %d): %06o\r\n", addr, reg, line_nr, vtemp);
 
 	return vtemp;
 }
@@ -227,8 +229,8 @@ void dc11::write_word(const uint16_t addr, uint16_t v)
 	int reg     = (addr - DC11_BASE) / 2;
 	int line_nr = reg / 4;
 
-	DOLOG(debug, true, "DC11: write register %06o (%d) to %06o", addr, reg, v);
-	printf("DC11: write register %06o (%d) to %06o\r\n", addr, reg, v);
+	DOLOG(debug, true, "DC11: write register %06o (%d line_nr %d) to %06o", addr, reg, line_nr, v);
+	printf("DC11: write register %06o (%d line_nr %d) to %06o\r\n", addr, reg, line_nr, v);
 
 	if ((reg & 3) == 3) {  // transmit buffer
 		char c = v;