From 301dd08b89e857726291e7b9911001200585530d Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Tue, 1 Dec 2015 03:13:42 +1100 Subject: [PATCH] 20031003 release --- relnotes/20031003.txt | 24 ++++++++++++++++++++++ src/nos/clients/lterm.c | 2 +- src/nos/include/nos/asci.h | 4 ++-- src/nos/main/config.c | 7 ++++++- src/nos/main/main.c | 7 ++++++- src/nos/net/cmdparse.c | 9 ++++++++ src/nos/ppp/asy.c | 2 +- src/nos/ppp/dialer.c | 42 ++++++++++++++++++++++++++++++-------- src/nos/ppp/ppp.c | 3 ++- src/nos/servers/smisc.c | 2 +- src/nos/servers/telnetd.c | 2 +- src/nos/servers/tipmail.c | 2 +- src/nos/z80/escc.c | 2 +- 13 files changed, 89 insertions(+), 19 deletions(-) create mode 100644 relnotes/20031003.txt diff --git a/relnotes/20031003.txt b/relnotes/20031003.txt new file mode 100644 index 00000000..f1df7a4d --- /dev/null +++ b/relnotes/20031003.txt @@ -0,0 +1,24 @@ +HYTECH INTERNATIONAL BV +NOS/UZI/CYGWIN RELEASE 031003SD + +MANIFEST + +-rwxr-xr-x 1 Administ None 58588 Oct 3 16:40 uzipatch.zip* + +INTRODUCTION + +This is an update to the 030827SD release containing some bugfixes: +- new welcome message +- help text printing fixed +- substitute of "asci.h" inclusion i.s.o. "n8250.h" in various files +- dummy modem control in dialer.c to (for now) keep the compiler happy + +INSTALLATION INSTRUCTIONS + +Follow the instructions mentioned in the 030827SD release doc and +then unpack uzipatch.zip over the 030827SD release; then it should work. + +REMARKS + +This bugfix release does not implement external communication yet + diff --git a/src/nos/clients/lterm.c b/src/nos/clients/lterm.c index bf8fc746..aab7940c 100644 --- a/src/nos/clients/lterm.c +++ b/src/nos/clients/lterm.c @@ -5,7 +5,7 @@ #include "netuser.h" #include "socket.h" #include "session.h" -#include "n8250.h" +#include "asci.h" #include "asy.h" #include #include "po/messages.h" diff --git a/src/nos/include/nos/asci.h b/src/nos/include/nos/asci.h index a2e203ff..2e396934 100644 --- a/src/nos/include/nos/asci.h +++ b/src/nos/include/nos/asci.h @@ -121,7 +121,7 @@ extern struct fport Fport[]; /* 8250 Line Control Register */ #define CNTLA_RE 0x40 /* Receive enable */ #define CNTLA_TE 0x20 /* Transmit enable */ -#define CNTLA_RTS_CKA1D 0x10 /* =1 RTS off (chan0), =1 TEND0 select (chan1) +#define CNTLA_RTS_CKA1D 0x10 /* =1 RTS off (chan0), =1 TEND0 select (chan1) */ #define CNTLA_7BITS 0x00 /* 7 bit words */ #define CNTLA_8BITS 0x04 /* 8 bit words */ #define CNTLA_BIT_MASK 0x04 /* mask of bit size */ @@ -184,7 +184,7 @@ extern struct fport Fport[]; #define CNTLB_MP 0x40 /* =0 Normal mode, =1 Multiprocessor mode */ #define CNTLB_PEO 0x10 /* =0 Even parity, =1 Odd parity select */ -#if 0 +#if 1 /* RPB: temporary till actual defs determined */ #define CNTLB_DCTS 0x01 /* Delta Clear-to-Send */ #define CNTLB_DDSR 0x02 /* Delta Data Set Ready */ #define CNTLB_TERI 0x04 /* Trailing edge ring indicator */ diff --git a/src/nos/main/config.c b/src/nos/main/config.c index 8095e0d2..eb18b6e7 100644 --- a/src/nos/main/config.c +++ b/src/nos/main/config.c @@ -773,7 +773,12 @@ struct iftype Iftypes[] = { #ifdef PPP "PPP", ppp_send, ppp_output, NULL, NULL, CL_PPP, 0, ppp_proc, - NULL, ppp_dump, NULL, NULL, + NULL, ppp_dump, +#ifdef DIALER + sd_init, sd_stat, +#else + NULL, NULL, +#endif #endif /* PPP */ #ifdef SPPP diff --git a/src/nos/main/main.c b/src/nos/main/main.c index b4fd4eed..39487231 100644 --- a/src/nos/main/main.c +++ b/src/nos/main/main.c @@ -390,7 +390,12 @@ char *argv[]; #if 1 /* Nick */ "Hytech " #endif - "KA9Q NOS kernel\n" + "KA9Q NOS" +#if 1 /* Nick */ + "/UZI kernel\n" +#else + " " +#endif "Version %s\n" #ifdef ZILOG "Compiled for Zilog Z8S180 CPU\n" diff --git a/src/nos/net/cmdparse.c b/src/nos/net/cmdparse.c index 71731dc6..f42b3f57 100644 --- a/src/nos/net/cmdparse.c +++ b/src/nos/net/cmdparse.c @@ -280,7 +280,16 @@ void *p; if(!found){ _printf(_("valid subcommands:")); for(cmdp = tab;cmdp->name != NULL;cmdp++) + { +#if 1 /* Nick */ + { + _printf(_(" ")); + _printf(cmdp->name); + } +#else _printf(_(" %s"),cmdp->name); +#endif + } _printf(_("\n")); return -1; } diff --git a/src/nos/ppp/asy.c b/src/nos/ppp/asy.c index 7e0031f2..5b8d052b 100644 --- a/src/nos/ppp/asy.c +++ b/src/nos/ppp/asy.c @@ -7,7 +7,7 @@ #include "iface.h" #include "netuser.h" #include "slhc.h" -#include "n8250.h" +#include "asci.h" #include "asy.h" #include "ax25.h" #include "kiss.h" diff --git a/src/nos/ppp/dialer.c b/src/nos/ppp/dialer.c index caeaad65..ac37f0b5 100644 --- a/src/nos/ppp/dialer.c +++ b/src/nos/ppp/dialer.c @@ -27,7 +27,10 @@ #include "proc.h" #include "iface.h" #include "netuser.h" -#include "n8250.h" +/*RPB*/ +/*#include "n8250.h"*/ +#include "asci.h" +/*RPB*/ #include "asy.h" #include "tty.h" #include "socket.h" @@ -65,6 +68,8 @@ static struct cmds Dial_cmds[] = { N_("wait [ \"string\" [speed] ]"), NULL, NULL, 0, 0, N_("Unknown command"), }; + + /* Set up demand dialing on an asy link. Called from dodialer command * in iface.c. */ @@ -147,7 +152,10 @@ struct iface *ifp; return 1; } ap = &Asy[ifp->dev]; - _printf(_("%s: %s,"),ifp->name,(ap->msr & MSR_RLSD) ? "UP":"DOWN"); +/*RPB*/ + /*_printf(_("%s: %s,"),ifp->name,(ap->msr & MSR_RLSD) ? "UP":"DOWN");*/ + _printf(_("%s: %s,"),ifp->name,(ap->cntlb & CNTLB_RLSD) ? "UP":"DOWN"); +/*RPB*/ _printf(_(" idle timer %lu/%lu sec\n"),read_timer(&dialer->idle)/1000L, dur_timer(&dialer->idle)/1000L); if(dialer->actfile != NULL) @@ -173,12 +181,18 @@ struct iface *ifp; dialer = (struct asydialer *)ifp->dstate; asyp = &Asy[ifp->dev]; stop_timer(&dialer->idle); - if(asyp->rlsd && !(asyp->msr & MSR_RLSD) +/*RPB*/ + /*if(asyp->rlsd && !(asyp->msr & MSR_RLSD)*/ + if(asyp->rlsd && !(asyp->cntlb & CNTLB_RLSD) +/*RPB*/ && dialer->actfile != NULL){ /* Line down, try a redial */ dialer->originates++; if(redial(ifp,dialer->actfile) != 0 - || !(asyp->msr & MSR_RLSD)){ +/*RPB*/ + /*|| !(asyp->msr & MSR_RLSD)){*/ + || !(asyp->cntlb & CNTLB_RLSD)){ +/*RPB*/ /* Redial failed, drop line and return failure */ dialer->localdrops++; redial(ifp,dialer->dropfile); @@ -210,7 +224,10 @@ void *u; dialer = (struct asydialer *)ifp->dstate; ap = &Asy[ifp->dev]; - if(ap->msr & MSR_RLSD){ +/*RPB*/ + /*if(ap->msr & MSR_RLSD){*/ + if(ap->cntlb & CNTLB_RLSD){ +/*RPB*/ dialer->localdrops++; redial(ifp,dialer->dropfile); /* Drop only if still up */ } @@ -231,9 +248,18 @@ void *p1,*p2; if(dialer == NULL) return; /* Can't happen */ for(;;){ - while((asyp->msr & MSR_TERI) == 0) - kwait(&asyp->msr); - asyp->msr &= ~MSR_TERI; +/*RPB*/ + /*while((asyp->msr & MSR_TERI) == 0)*/ + while((asyp->cntlb & CNTLB_TERI) == 0) +/*RPB*/ +/*RPB*/ + /*kwait(&asyp->msr);*/ + kwait(&asyp->cntlb); +/*RPB*/ +/*RPB*/ + /*asyp->msr &= ~MSR_TERI;*/ + asyp->cntlb &= ~CNTLB_TERI; +/*RPB*/ dialer->answers++; redial(ifp,dialer->ansfile); } diff --git a/src/nos/ppp/ppp.c b/src/nos/ppp/ppp.c index d04ce992..3edc7cef 100644 --- a/src/nos/ppp/ppp.c +++ b/src/nos/ppp/ppp.c @@ -33,7 +33,7 @@ #include "internet.h" #include "ip.h" #include "slhc.h" -#include "n8250.h" +#include "asci.h" #include "asy.h" #include "pktdrvr.h" #include "socket.h" @@ -857,6 +857,7 @@ struct iface *ifp; 320, ppp_recv, ifp->dev, ifp, NULL, 0); #endif free(ifn); + return 0; } #endif diff --git a/src/nos/servers/smisc.c b/src/nos/servers/smisc.c index 2fe09d71..e3c79382 100644 --- a/src/nos/servers/smisc.c +++ b/src/nos/servers/smisc.c @@ -13,7 +13,7 @@ #include "hardware.h" #include "mailbox.h" #include "asy.h" -#include "n8250.h" +#include "asci.h" #include "devparam.h" #include "telnet.h" #include "po/messages.h" diff --git a/src/nos/servers/telnetd.c b/src/nos/servers/telnetd.c index f3a1fbee..9fa02906 100644 --- a/src/nos/servers/telnetd.c +++ b/src/nos/servers/telnetd.c @@ -13,7 +13,7 @@ #include "proc.h" #include "iface.h" /* Nick why?? #ifndef UNIX */ -#include "n8250.h" +#include "asci.h" /* Nick #endif */ #include "asy.h" #include "socket.h" diff --git a/src/nos/servers/tipmail.c b/src/nos/servers/tipmail.c index 3e5450b7..e45b404a 100644 --- a/src/nos/servers/tipmail.c +++ b/src/nos/servers/tipmail.c @@ -13,7 +13,7 @@ #include "proc.h" #include "iface.h" /* Nick why?? #ifndef UNIX */ -#include "n8250.h" +#include "asci.h" /* Nick #endif */ #include "asy.h" #include "socket.h" diff --git a/src/nos/z80/escc.c b/src/nos/z80/escc.c index 8f1dcf11..13d9e239 100644 --- a/src/nos/z80/escc.c +++ b/src/nos/z80/escc.c @@ -133,7 +133,7 @@ #include "pktdrvr.h" #include "slip.h" #include "nrs.h" -#include "n8250.h" +#include "asci.h" #include "escc.h" #include "esccgen.h" #include "z8536.h" -- 2.34.1