20031003 release

diff --git a/relnotes/20031003.txt b/relnotes/20031003.txt
new file mode 100644 (file)
index 0000000..f1df7a4
--- /dev/null
+++ b/relnotes/20031003.txt
@@ -0,0 +1,24 @@
+HYTECH INTERNATIONAL BV\r
+NOS/UZI/CYGWIN RELEASE 031003SD\r
+\r
+MANIFEST\r
+\r
+-rwxr-xr-x    1 Administ None        58588 Oct  3 16:40 uzipatch.zip*\r
+\r
+INTRODUCTION\r
+\r
+This is an update to the 030827SD release containing some bugfixes:\r
+- new welcome message\r
+- help text printing fixed\r
+- substitute of "asci.h" inclusion i.s.o. "n8250.h" in various files\r
+- dummy modem control in dialer.c to (for now) keep the compiler happy\r
+\r
+INSTALLATION INSTRUCTIONS\r
+\r
+Follow the instructions mentioned in the 030827SD release doc and\r
+then unpack uzipatch.zip over the 030827SD release; then it should work.\r
+\r
+REMARKS\r
+\r
+This bugfix release does not implement external communication yet\r
+\r

diff --git a/src/nos/clients/lterm.c b/src/nos/clients/lterm.c
index bf8fc74..aab7940 100644 (file)
--- a/src/nos/clients/lterm.c
+++ b/src/nos/clients/lterm.c
@@ -5,7 +5,7 @@
 #include "netuser.h"\r
 #include "socket.h"\r
 #include "session.h"\r
-#include "n8250.h"\r
+#include "asci.h"\r
 #include "asy.h"\r
 #include <libintl.h>\r
 #include "po/messages.h"\r

diff --git a/src/nos/include/nos/asci.h b/src/nos/include/nos/asci.h
index a2e203f..2e39693 100644 (file)
--- 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 */\r
 #define CNTLA_RE       0x40    /* Receive enable */\r
 #define CNTLA_TE       0x20    /* Transmit enable */\r
-#define CNTLA_RTS_CKA1D        0x10    /* =1 RTS off (chan0), =1 TEND0 select (chan1)\r
+#define CNTLA_RTS_CKA1D        0x10    /* =1 RTS off (chan0), =1 TEND0 select (chan1) */\r
 #define        CNTLA_7BITS     0x00    /* 7 bit words */\r
 #define        CNTLA_8BITS     0x04    /* 8 bit words */\r
 #define CNTLA_BIT_MASK 0x04    /* mask of bit size */\r
@@ -184,7 +184,7 @@ extern struct fport Fport[];
 #define CNTLB_MP       0x40    /* =0 Normal mode, =1 Multiprocessor mode */\r
 #define        CNTLB_PEO       0x10    /* =0 Even parity, =1 Odd parity select */\r
 \r
-#if 0\r
+#if 1 /* RPB: temporary till actual defs determined */\r
 #define        CNTLB_DCTS      0x01    /* Delta Clear-to-Send */\r
 #define        CNTLB_DDSR      0x02    /* Delta Data Set Ready */\r
 #define        CNTLB_TERI      0x04    /* Trailing edge ring indicator */\r

diff --git a/src/nos/main/config.c b/src/nos/main/config.c
index 8095e0d..eb18b6e 100644 (file)
--- a/src/nos/main/config.c
+++ b/src/nos/main/config.c
@@ -773,7 +773,12 @@ struct iftype Iftypes[] = {
 #ifdef PPP\r
        "PPP",          ppp_send,       ppp_output,     NULL,\r
        NULL,           CL_PPP,         0,              ppp_proc,\r
-       NULL,           ppp_dump,       NULL,           NULL,\r
+       NULL,           ppp_dump,\r
+#ifdef DIALER\r
+                                       sd_init,        sd_stat,\r
+#else\r
+                                       NULL,           NULL,\r
+#endif\r
 #endif /* PPP */\r
 \r
 #ifdef SPPP\r

diff --git a/src/nos/main/main.c b/src/nos/main/main.c
index b4fd4ee..3948723 100644 (file)
--- a/src/nos/main/main.c
+++ b/src/nos/main/main.c
@@ -390,7 +390,12 @@ char *argv[];
 #if 1 /* Nick */\r
               "Hytech "\r
 #endif\r
-              "KA9Q NOS kernel\n"\r
+              "KA9Q NOS"\r
+#if 1 /* Nick */\r
+              "/UZI kernel\n"\r
+#else\r
+              " "\r
+#endif\r
               "Version %s\n"\r
 #ifdef ZILOG\r
               "Compiled for Zilog Z8S180 CPU\n"\r

diff --git a/src/nos/net/cmdparse.c b/src/nos/net/cmdparse.c
index 71731dc..f42b3f5 100644 (file)
--- a/src/nos/net/cmdparse.c
+++ b/src/nos/net/cmdparse.c
@@ -280,7 +280,16 @@ void *p;
        if(!found){\r
                _printf(_("valid subcommands:"));\r
                for(cmdp = tab;cmdp->name != NULL;cmdp++)\r
+ {\r
+#if 1 /* Nick */\r
+                       {\r
+                       _printf(_(" "));\r
+                       _printf(cmdp->name);\r
+                       }\r
+#else\r
                        _printf(_(" %s"),cmdp->name);\r
+#endif\r
+ }\r
                _printf(_("\n"));\r
                return -1;\r
        }\r

diff --git a/src/nos/ppp/asy.c b/src/nos/ppp/asy.c
index 7e0031f..5b8d052 100644 (file)
--- a/src/nos/ppp/asy.c
+++ b/src/nos/ppp/asy.c
@@ -7,7 +7,7 @@
 #include "iface.h"\r
 #include "netuser.h"\r
 #include "slhc.h"\r
-#include "n8250.h"\r
+#include "asci.h"\r
 #include "asy.h"\r
 #include "ax25.h"\r
 #include "kiss.h"\r

diff --git a/src/nos/ppp/dialer.c b/src/nos/ppp/dialer.c
index caeaad6..ac37f0b 100644 (file)
--- a/src/nos/ppp/dialer.c
+++ b/src/nos/ppp/dialer.c
@@ -27,7 +27,10 @@
 #include "proc.h"\r
 #include "iface.h"\r
 #include "netuser.h"\r
-#include "n8250.h"\r
+/*RPB*/\r
+/*#include "n8250.h"*/\r
+#include "asci.h"\r
+/*RPB*/\r
 #include "asy.h"\r
 #include "tty.h"\r
 #include "socket.h"\r
@@ -65,6 +68,8 @@ static struct cmds Dial_cmds[] = {
                N_("wait <milliseconds> [ \"string\" [speed] ]"),\r
        NULL,           NULL,           0, 0, N_("Unknown command"),\r
 };\r
+\r
+\r
 /* Set up demand dialing on an asy link. Called from dodialer command\r
  * in iface.c.\r
  */\r
@@ -147,7 +152,10 @@ struct iface *ifp;
                return 1;\r
        }\r
        ap = &Asy[ifp->dev];\r
-       _printf(_("%s: %s,"),ifp->name,(ap->msr & MSR_RLSD) ? "UP":"DOWN");\r
+/*RPB*/\r
+       /*_printf(_("%s: %s,"),ifp->name,(ap->msr & MSR_RLSD) ? "UP":"DOWN");*/\r
+       _printf(_("%s: %s,"),ifp->name,(ap->cntlb & CNTLB_RLSD) ? "UP":"DOWN");\r
+/*RPB*/\r
        _printf(_(" idle timer %lu/%lu sec\n"),read_timer(&dialer->idle)/1000L,\r
          dur_timer(&dialer->idle)/1000L);\r
        if(dialer->actfile != NULL)\r
@@ -173,12 +181,18 @@ struct iface *ifp;
        dialer = (struct asydialer *)ifp->dstate;\r
        asyp = &Asy[ifp->dev];\r
        stop_timer(&dialer->idle);\r
-       if(asyp->rlsd && !(asyp->msr & MSR_RLSD)\r
+/*RPB*/\r
+       /*if(asyp->rlsd && !(asyp->msr & MSR_RLSD)*/\r
+       if(asyp->rlsd && !(asyp->cntlb & CNTLB_RLSD)\r
+/*RPB*/\r
         && dialer->actfile != NULL){\r
                /* Line down, try a redial */\r
                dialer->originates++;\r
                if(redial(ifp,dialer->actfile) != 0 \r
-                || !(asyp->msr & MSR_RLSD)){\r
+/*RPB*/\r
+                /*|| !(asyp->msr & MSR_RLSD)){*/\r
+                || !(asyp->cntlb & CNTLB_RLSD)){\r
+/*RPB*/\r
                        /* Redial failed, drop line and return failure */\r
                        dialer->localdrops++;\r
                        redial(ifp,dialer->dropfile);\r
@@ -210,7 +224,10 @@ void *u;
 \r
        dialer = (struct asydialer *)ifp->dstate;\r
        ap = &Asy[ifp->dev];\r
-       if(ap->msr & MSR_RLSD){\r
+/*RPB*/\r
+       /*if(ap->msr & MSR_RLSD){*/\r
+       if(ap->cntlb & CNTLB_RLSD){\r
+/*RPB*/\r
                dialer->localdrops++;\r
                redial(ifp,dialer->dropfile);   /* Drop only if still up */\r
        }\r
@@ -231,9 +248,18 @@ void *p1,*p2;
        if(dialer == NULL)\r
                return; /* Can't happen */\r
        for(;;){\r
-               while((asyp->msr & MSR_TERI) == 0)\r
-                       kwait(&asyp->msr);\r
-               asyp->msr &= ~MSR_TERI;\r
+/*RPB*/\r
+               /*while((asyp->msr & MSR_TERI) == 0)*/\r
+               while((asyp->cntlb & CNTLB_TERI) == 0)\r
+/*RPB*/\r
+/*RPB*/\r
+                       /*kwait(&asyp->msr);*/\r
+                       kwait(&asyp->cntlb);\r
+/*RPB*/\r
+/*RPB*/\r
+               /*asyp->msr &= ~MSR_TERI;*/\r
+               asyp->cntlb &= ~CNTLB_TERI;\r
+/*RPB*/\r
                dialer->answers++;\r
                redial(ifp,dialer->ansfile);\r
        }\r

diff --git a/src/nos/ppp/ppp.c b/src/nos/ppp/ppp.c
index d04ce99..3edc7ce 100644 (file)
--- a/src/nos/ppp/ppp.c
+++ b/src/nos/ppp/ppp.c
@@ -33,7 +33,7 @@
 #include "internet.h"\r
 #include "ip.h"\r
 #include "slhc.h"\r
-#include "n8250.h"\r
+#include "asci.h"\r
 #include "asy.h"\r
 #include "pktdrvr.h"\r
 #include "socket.h"\r
@@ -857,6 +857,7 @@ struct iface *ifp;
                        320, ppp_recv, ifp->dev, ifp, NULL, 0);\r
 #endif\r
        free(ifn);\r
+\r
        return 0;\r
 }\r
 #endif\r

diff --git a/src/nos/servers/smisc.c b/src/nos/servers/smisc.c
index 2fe09d7..e3c7938 100644 (file)
--- a/src/nos/servers/smisc.c
+++ b/src/nos/servers/smisc.c
@@ -13,7 +13,7 @@
 #include "hardware.h"\r
 #include "mailbox.h"\r
 #include "asy.h"\r
-#include "n8250.h"\r
+#include "asci.h"\r
 #include "devparam.h"\r
 #include "telnet.h"\r
 #include "po/messages.h"\r

diff --git a/src/nos/servers/telnetd.c b/src/nos/servers/telnetd.c
index f3a1fbe..9fa0290 100644 (file)
--- a/src/nos/servers/telnetd.c
+++ b/src/nos/servers/telnetd.c
@@ -13,7 +13,7 @@
 #include "proc.h"\r
 #include "iface.h"\r
 /* Nick why?? #ifndef  UNIX */\r
-#include "n8250.h"\r
+#include "asci.h"\r
 /* Nick #endif */\r
 #include "asy.h"\r
 #include "socket.h"\r

diff --git a/src/nos/servers/tipmail.c b/src/nos/servers/tipmail.c
index 3e5450b..e45b404 100644 (file)
--- a/src/nos/servers/tipmail.c
+++ b/src/nos/servers/tipmail.c
@@ -13,7 +13,7 @@
 #include "proc.h"\r
 #include "iface.h"\r
 /* Nick why?? #ifndef  UNIX */\r
-#include "n8250.h"\r
+#include "asci.h"\r
 /* Nick #endif */\r
 #include "asy.h"\r
 #include "socket.h"\r

diff --git a/src/nos/z80/escc.c b/src/nos/z80/escc.c
index 8f1dcf1..13d9e23 100644 (file)
--- a/src/nos/z80/escc.c
+++ b/src/nos/z80/escc.c
@@ -133,7 +133,7 @@
 #include "pktdrvr.h"\r
 #include "slip.h"\r
 #include "nrs.h"\r
-#include "n8250.h"\r
+#include "asci.h"\r
 #include "escc.h"\r
 #include "esccgen.h"\r
 #include "z8536.h"\r