Merge branch 'master' into nhb-fix-ethereventfn

Reintroduce changes to enable XNS when ethernet is available
Necessitated by a merge of the LOADUP-LISP function from the main branch.
2026-05-20 12:42:03 +00:00 · 2026-05-18 18:11:39 -07:00 · 2026-05-18 18:08:50 -07:00 · 2026-05-18 17:53:06 -07:00 · 2026-05-17 16:59:40 -07:00 · 2026-04-02 09:20:02 -07:00
3 changed files with 18 additions and 14 deletions
--- a/.github/workflows/buildLoadup.yml
+++ b/.github/workflows/buildLoadup.yml
@@ -73,7 +73,7 @@ jobs:
    steps:
      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
@@ -115,7 +115,7 @@ jobs:
    steps:
      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
@@ -123,7 +123,7 @@ jobs:

      # Checkout latest commit
      - name: Checkout Medley
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # Setup release tag
      - name: Setup Release Tag
@@ -193,7 +193,7 @@ jobs:

      # Checkout Notecards and tar it in the tarballsdir
      - name: Checkout Notecards
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/notecards
          path: ./notecards
@@ -268,7 +268,7 @@ jobs:

      # Checkout latest commit
      - name: Checkout Medley
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # Environment variables
      - name: Environment variables
@@ -349,7 +349,7 @@ jobs:

      # Checkout latest commit
      - name: Checkout Medley
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # Environment variables
      - name: Environment variables
@@ -418,7 +418,7 @@ jobs:

      # Checkout latest commit
      - name: Checkout Medley
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      # Store the values output from loadup job as environment variables
      - name: Environment Variables
@@ -530,7 +530,7 @@ jobs:

      # Checkout latest commit
      - name: Checkout Medley
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4


      # Upload a dummy file to release
@@ -623,7 +623,7 @@ jobs:

      # Checkout the actions for this repo owner
      - name: Checkout Actions
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          repository: ${{ github.repository_owner }}/.github
          path: ./Actions_${{ github.sha }}
--- a/internal/loadups/LOADUP-LISP
+++ b/internal/loadups/LOADUP-LISP
@@ -1,12 +1,14 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "XCL" :BASE 10)

-(FILECREATED "16-Apr-2026 09:06:26" |{WMEDLEY}<internal>loadups>LOADUP-LISP.;32| 7864   
+(FILECREATED "18-May-2026 17:55:46" 
+|{DSK}<Users>briggs>projects>medley>internal>loadups>LOADUP-LISP.;20| 8046   

-      :EDIT-BY |rmk|
+      :EDIT-BY |nhb|

      :CHANGES-TO (FNS LOADUP-LISP)

-      :PREVIOUS-DATE "15-Apr-2026 23:27:22" |{WMEDLEY}<internal>loadups>LOADUP-LISP.;31|)
+      :PREVIOUS-DATE "16-Apr-2026 09:06:26" 
+|{DSK}<Users>briggs>projects>medley>internal>loadups>LOADUP-LISP.;19|)


 (PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -19,7 +21,8 @@
 (DEFINEQ

 (LOADUP-LISP
-  (LAMBDA (DRIBBLEFILE)                                     (* \; "Edited 16-Apr-2026 09:06 by rmk")
+  (LAMBDA (DRIBBLEFILE)                                     (* \; "Edited 18-May-2026 17:55 by nhb")
+                                                            (* \; "Edited 16-Apr-2026 09:06 by rmk")
                                                            (* \; "Edited  5-Apr-2026 21:35 by rmk")
                                                         (* \; "Edited 26-Mar-2026 18:38 by briggs")
                                                            (* \; "Edited 22-Feb-2026 14:15 by rmk")
@@ -138,6 +141,7 @@

    (LOADUP '(PUP 10MBDRIVER LEAF LLETHER DPUPFTP LOCALFILE DSKDISPLAY COURIER LLNS TRSERVER SPP 
                  NSPRINT AUTHENTICATION BSP CLEARINGHOUSE NSFILING MAIKOETHER))
+    (SETQ \\NSFLG T)
    (RESTART.ETHER)
    (DRIBBLE)
    (SETQ MAKESYSNAME :MEDLEY)))
@@ -151,5 +155,5 @@
 (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (640 7658 (LOADUP-LISP 650 . 7656)))))
+  (FILEMAP (NIL (692 7840 (LOADUP-LISP 702 . 7838)))))
 STOP
--- a/internal/loadups/LOADUP-LISP.LCOM
+++ b/internal/loadups/LOADUP-LISP.LCOM
Author	SHA1	Message	Date
Nick Briggs	3038d22ff0	Merge branch 'master' into nhb-fix-ethereventfn	2026-05-18 18:11:39 -07:00
Nick Briggs	30ecf3fced	Reintroduce changes to enable XNS when ethernet is available Necessitated by a merge of the LOADUP-LISP function from the main branch.	2026-05-18 18:08:50 -07:00
Nick Briggs	ef5b97f25f	Merge branch 'master' into nhb-fix-ethereventfn Picking up changes to LOADUP-LISP before reintroducing the ethernet related changes.	2026-05-18 17:53:06 -07:00
Nick Briggs	7841074444	Globally enables XNS networking Later, the result of (\ETHER-AVAILABLE) controls whether any networking is turned on.	2026-05-17 16:59:40 -07:00
Nick Briggs	fb8e46fccf	Prevents \LOOKUPPORT waiting for an ethernet timeout if PUP has already been detected as unavailable	2026-04-02 09:20:02 -07:00
Nick Briggs	321623463c	Removes OCTALSTRING from PUP - now in APRINT	2026-03-26 18:42:51 -07:00
Nick Briggs	c160b0af15	Merge branch 'master' into nhb-fix-ethereventfn Resolves conflict for internal/loadups/LOADUP-LISP internal/loadups/LOADUP-LISP.LCOM from adding call to (RESTART.ETHER) at end of loadup.	2026-03-26 18:39:51 -07:00
Nick Briggs	d79f1ae819	Merge branch 'master' into nhb-fix-ethereventfn	2026-02-03 12:01:02 -08:00
Nick Briggs	b0f92834e2	Merge branch 'master' into nhb-fix-ethereventfn	2026-01-25 17:36:26 -08:00
Nick Briggs	b45dea97c7	RESTART.ETHER at end of loadup-lisp to ensure network structures are set up.	2026-01-25 15:45:29 -08:00
Nick Briggs	1bf3f50d98	Avoids making copy of \10MBLOCALNDB as \MAIKO.10MB.NDB for \MAIKO.ETHER-INTERRUPT	2026-01-23 18:51:15 -08:00
Nick Briggs	09b6b1e854	Updates \SETETHERFLAGS to avoid setting \10MBFLG when no ethernet	2026-01-23 18:31:19 -08:00
Nick Briggs	6e00dcf458	When no ethernet \FIND.LOCALPUPHOSTNUMBER should immediately return NIL If there is NO ethernet it is better to avoid a delay waiting for a PUP lookup response that will never come, and there is no value in asking for the user to enter a PUP host number that will not be used.	2026-01-01 18:05:52 -08:00
Nick Briggs	16fa8c6a24	Updates \ETHEREVENTFN to remove early exit when the ethernet is unvailable. In the case that the ethernet is unavailable the \ETHEREVENTFN should still call \SETETHERFLAGS, \SETLOCALNSNUMBERS, and \FLUSHNDBS, or a newly started image will retain information from the system on which it was built (such as ethernet MAC address in the NS address). This will also ensure that the NS address is not set to 0, instead initializing with a fake address based on the system serial number (calls \SERIALNUMBER).	2026-01-01 17:41:09 -08:00