github.com/PDP-10.klh10
1
0
Fork 0
mirror of https://github.com/PDP-10/klh10.git synced 2026-03-09 20:18:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #54 from PDP-10/ch11-fix2

Browse Source 
CH11: fix long-standing data corruption bug
This commit is contained in:
Rhialto The M
2021-02-23 21:27:53 +01:00
committed by GitHub
parent d6de1d64d3 0a9e34c36f
commit f432d23c41
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dvch11.c
View File

@@ -622,7 +622,7 @@ ch11_cmd_status(struct ch11 *ch, FILE *of)
fprintf(of,"Input possible: %d, Output possible: %d\n", ch->ch_inactf, ch->ch_outactf);
fprintf(of, "DP status: %d\n", ch->ch_dpstate);
fprintf(of, "DP Rtest: %d, Stest: %d\n",
(int)dp_xrtest(dp_dpxfr(&ch->ch_dp)), (int)dp_xstest(dp_dpxfr(&ch->ch_dp)));
(int)dp_xrtest(dp_dpxfr(&ch->ch_dp)), (int)dp_xstest(dp_dpxto(&ch->ch_dp)));
fprintf(of, "DP rcmd: %d, rcnt: %d\n",
(int)dp_xrcmd(dp_dpxfr(&ch->ch_dp)), (int)dp_xrcnt(dp_dpxfr(&ch->ch_dp)));
fprintf(of,"Input buffer: ");
@@ -838,6 +838,8 @@ ch11_read(struct device *d, register uint18 addr)
fprintf(DVDBF(ch), "[CH11 reading last word, clearing RDN]\r\n");
ch->ch_rcnt = -1; /* read last word */
REG(ch) &= ~CH_RDN; /* Done receiving? */
ch->ch_inactf = TRUE; /* OK to read another */
dp_xrdone(dp_dpxfr(&ch->ch_dp)); /* Done, can now ACK */
}
break;
}
@@ -961,7 +963,7 @@ ch11_write(struct device *d, uint18 addr, register dvureg_t val)
/* AIM628: when both xDN and xEN are set, the computer is interrupted */
if ((val & CH_TEN) && (val & CH_REN)) {
/* try to be clever */
if (dp_xstest(dp_dpxfr(&ch->ch_dp))) {
if (dp_xstest(dp_dpxto(&ch->ch_dp))) {
ch_ogo(ch); /* sender's turn, process output first */
ch_igo(ch);
} else {
@@ -1548,8 +1550,6 @@ chaos_inxfer(register struct ch11 *ch)
}
REG(ch) |= CH_RDN; /* Note it's done! */
}
ch->ch_inactf = TRUE; /* OK to read another */
dp_xrdone(dpx); /* Done, can now ACK */
}
#endif /* KLH10_DEV_CH11 */

17
src/dvch11.txt
View File

@@ -7,10 +7,11 @@
The ch11 device in KLH10 for ITS, which was originally just a dummy
inteface to keep ITS running, is now a functional Unibus Chaosnet
device, which supports Chaosnet-on-Ethernet and Chaosnet-over-UDP.
It does not support SPY (promiscuous) mode, LUP (loopback), or
broadcast, but ITS doesn't seem to use/need these.
It does not support SPY (promiscuous) mode, or LUP (loopback), but ITS
doesn't seem to use/need these. It only supports broadcast on
Ethernet, not on UDP.
Latest update: 2018-04-15
Latest update: 2021-02-23
Like other KLH10 network devices, ch11 works together with a Device
Process which communicates with the device and reads/writes network
@@ -59,7 +60,7 @@ For "chudp":
used, the first IPv4 address returned is used. (Rather than
listing all your friends' ITS hosts directly, I suggest joining the
Global Chaosnet and just list its central router. See
https://aosnet.ch.)
https://chaosnet.net.)
If chudpport or chip parameters are given, the ifmeth defaults to chudp.
@@ -88,11 +89,11 @@ to
IFN CHAOSP,DEFOPT NM%CHA==<IPADDR 255,255,0,0> ; Set default netmask for it
but the real fix would be to the IPMASK macro.
Ideas for future work:
- Implement Chaos-over-DTLS to get some security, on this modern Internet.
----------------
More info:
- see https://chaosnet.net
See https://chaosnet.net for much much more information, and
https://github.com/bictorv/chaosnet-bridge for a bridging/routing
program for Chaosnet.
Cheers,