diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index 09e12611..f8e14837 100644 Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index c43ef95e..3436eea7 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index 05ad858d..e4eee71d 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/.screen-shots/ScreenShot.KCONFIG.png b/.screen-shots/ScreenShot.KCONFIG.png index a11f835a..bb43c1d7 100644 Binary files a/.screen-shots/ScreenShot.KCONFIG.png and b/.screen-shots/ScreenShot.KCONFIG.png differ diff --git a/A2osX.S.txt b/A2osX.S.txt index 8ec27021..6463a523 100644 --- a/A2osX.S.txt +++ b/A2osX.S.txt @@ -369,25 +369,25 @@ LoadKM ldx Boot.Prefix *-------------------------------------- .INB /A2OSX.SRC/X.PRINTF.S *-------------------------------------- -MSG.INIT0 >CSTR "A2osX[Stage0]:Init\n" -MSG.SYSMEM >CSTR "Checking System Memory..." -MSG.SYSMEM.OK >CSTR "128k Detected.\n" -MSG.SYSMEM.KO >CSTR "A2osX Requires At Least 128k Memory.\n" +MSG.INIT0 .AZ "A2osX[Stage0]:Init\n" +MSG.SYSMEM .AZ "Checking System Memory..." +MSG.SYSMEM.OK .AZ "128k Detected.\n" +MSG.SYSMEM.KO .AZ "A2osX Requires At Least 128k Memory.\n" -MSG.CPU >CSTR "Checking CPU..." -MSG.CPU.OK >CSTR "65C02 CPU (or higher) Detected.\n" -MSG.CPU.KO >CSTR "A2osX Requires At Least A 65C02 CPU.\n" +MSG.CPU .AZ "Checking CPU..." +MSG.CPU.OK .AZ "65C02 CPU (or higher) Detected.\n" +MSG.CPU.KO .AZ "A2osX Requires At Least A 65C02 CPU.\n" -MSG.RAMDRV >CSTR "Checking ProDOS RamDrive..." -MSG.RAMDRV.OK >CSTR "Successfully Disabled.\n" -MSG.RAMDRV.KO0 >CSTR "Not Detected.\n" -MSG.RAMDRV.KO1 >CSTR "Uninstall Failed !!!\n" +MSG.RAMDRV .AZ "Checking ProDOS RamDrive..." +MSG.RAMDRV.OK .AZ "Successfully Disabled.\n" +MSG.RAMDRV.KO0 .AZ "Not Detected.\n" +MSG.RAMDRV.KO1 .AZ "Uninstall Failed !!!\n" -MSG.BOOTPREFIX >CSTR "Boot Prefix:" +MSG.BOOTPREFIX .AZ "Boot Prefix:" -MSG.KMENUM >CSTR "Looking For Kernel Modules...\n" -MSG.KMLOAD >CSTR "***Loading KM : %S\n" -MSG.INIT0OK >CSTR "A2osX[Stage0]:Complete.\n" +MSG.KMENUM .AZ "Looking For Kernel Modules...\n" +MSG.KMLOAD .AZ "***Loading KM : %S\n" +MSG.INIT0OK .AZ "A2osX[Stage0]:Complete.\n" *-------------------------------------- MLIGETPREFIX01 .DA #1 .DA Boot.Prefix diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt index a9bb3070..0658cce5 100644 --- a/BIN/ARP.S.txt +++ b/BIN/ARP.S.txt @@ -183,11 +183,11 @@ Wait.TimeOut sec .9 rts *-------------------------------------- CS.END -LIBTCPIP >CSTR "libtcpip.o" -SSCANF.IP >CSTR "%d.%d.%d.%d" -MSG0 >CSTR "STS TTL MAC Address IP Address\r\n" -MSG1 >CSTR "$%h %5D %h:%h:%h:%h:%h:%h %d.%d.%d.%d\r\n" -MSG2 >CSTR "%d.%d.%d.%d is at %h:%h:%h:%h:%h:%h\r\n" +LIBTCPIP .AZ "libtcpip.o" +SSCANF.IP .AZ "%d.%d.%d.%d" +MSG0 .AZ "STS TTL MAC Address IP Address\r\n" +MSG1 .AZ "$%h %5D %h:%h:%h:%h:%h:%h %d.%d.%d.%d\r\n" +MSG2 .AZ "%d.%d.%d.%d is at %h:%h:%h:%h:%h:%h\r\n" *-------------------------------------- DS.START hLIBTCPIP .BS 1 diff --git a/BIN/ATBROWSE.S.txt b/BIN/ATBROWSE.S.txt index 62f7d544..6608abf6 100644 --- a/BIN/ATBROWSE.S.txt +++ b/BIN/ATBROWSE.S.txt @@ -147,11 +147,11 @@ CS.QUIT >LDA.G hBuf rts *-------------------------------------- CS.END -MSG.NOATK >CSTR "AppleTalk Not Loaded.\r\n" -MSG.NETNODE >CSTR "Network/Node:$%H/$%h\r\n" +MSG.NOATK .AZ "AppleTalk Not Loaded.\r\n" +MSG.NETNODE .AZ "Network/Node:$%H/$%h\r\n" SEARCH.STRING >PSTR "*:*@*" -MSG.DUMP0 >CSTR "Net Nod SkT En# Name\r\n" -MSG.DUMP >CSTR "%H $%h $%h $%h %S\r\n" +MSG.DUMP0 .AZ "Net Nod SkT En# Name\r\n" +MSG.DUMP .AZ "%H $%h $%h $%h %S\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/BIN/ATLOGON.S.txt b/BIN/ATLOGON.S.txt index 9ae49278..8435a1c2 100644 --- a/BIN/ATLOGON.S.txt +++ b/BIN/ATLOGON.S.txt @@ -65,8 +65,8 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG.USAGE >CSTR "Usage : ATLOGON [USER] [PASSWORD]\r\n" -MSG.NOATK >CSTR "AppleTalk Not Loaded.\r\n" +MSG.USAGE .AZ "Usage : ATLOGON [USER] [PASSWORD]\r\n" +MSG.NOATK .AZ "AppleTalk Not Loaded.\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/BIN/CAT.S.txt b/BIN/CAT.S.txt index 83f0f3ea..2699fe90 100644 --- a/BIN/CAT.S.txt +++ b/BIN/CAT.S.txt @@ -302,9 +302,9 @@ CS.END OptionList >PSTR "ANSans" OptionVars .DA #bPrintAll,#bLineNum,#bSuppressBlankLine,#bPrintAll,#bLineNum,#bSuppressBlankLine *-------------------------------------- -MSG.USAGE >CSTR "Usage : CAT File1 [File2...]\r\n -A : Show All non printable caracters\r\n -N : Number all output lines\r\n -S : Suppress repeated empty output lines\r\n" -MSG.LINENUM >CSTR "%5D:" -MSG.CTRLCHAR >CSTR "[%S]" +MSG.USAGE .AZ "Usage : CAT File1 [File2...]\r\n -A : Show All non printable caracters\r\n -N : Number all output lines\r\n -S : Suppress repeated empty output lines\r\n" +MSG.LINENUM .AZ "%5D:" +MSG.CTRLCHAR .AZ "[%S]" *-------------------------------------- ASCII >PSTR "NULL" >PSTR "SOH" diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index 8cc4f904..da2f73b7 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -344,10 +344,10 @@ CS.END OptionList >PSTR "CRcr" OptionVars .DA #bContinue,#bRecurse,#bContinue,#bRecurse *-------------------------------------- -MSG.USAGE >CSTR "Usage : CHTYP [File *,? wildcards allowed] [File type : 0xx (Hexadecimal byte),SYS,TXT....]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n" -MSG.OK >CSTR "[OK]\r\n" -MSG.ERR >CSTR "[%h]\r\n" -MSG.FILE >CSTR "CHTYP File:%S..." +MSG.USAGE .AZ "Usage : CHTYP [File *,? wildcards allowed] [File type : 0xx (Hexadecimal byte),SYS,TXT....]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n" +MSG.OK .AZ "[OK]\r\n" +MSG.ERR .AZ "[%h]\r\n" +MSG.FILE .AZ "CHTYP File:%S..." Tmp .BS 1 *-------------------------------------- diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt index 7bf68ce1..f1f86225 100644 --- a/BIN/CP.S.txt +++ b/BIN/CP.S.txt @@ -21,13 +21,13 @@ CS.END OptionList >PSTR "CRYQcryq" OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#bNoConfirm,#bQuiet *-------------------------------------- -MSG.USAGE >CSTR "Usage : CP [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" -MSG.DIR >CSTR "CP Dir :%s to %s..." -MSG.FILE >CSTR "CP File:%s to %s..." -MSG.OVERWRITE >CSTR "Overwrite %s [Yes,No,All]?" -MSG.OK >CSTR "[OK]\r\n" -MSG.ERR >CSTR "[%h]\r\n" -MSG.DONE >CSTR "%D File(s) Copied.\r\n" +MSG.USAGE .AZ "Usage : CP [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" +MSG.DIR .AZ "CP Dir :%s to %s..." +MSG.FILE .AZ "CP File:%s to %s..." +MSG.OVERWRITE .AZ "Overwrite %s [Yes,No,All]?" +MSG.OK .AZ "[OK]\r\n" +MSG.ERR .AZ "[%h]\r\n" +MSG.DONE .AZ "%D File(s) Copied.\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index 75979f49..641e9604 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -142,10 +142,10 @@ CS.QUIT lda hLIBTCPIP rts *-------------------------------------- CS.END -LIBTCPIP >CSTR "libtcpip.o" -SSCANF.IP >CSTR "%d.%d.%d.%d" -MSG0 >CSTR "STS TR.ID Hostname IP Address TTL\r\n" -MSG1 >CSTR "$%h $%H %32s %03d.%03d.%03d.%03d %u\r\n" +LIBTCPIP .AZ "libtcpip.o" +SSCANF.IP .AZ "%d.%d.%d.%d" +MSG0 .AZ "STS TR.ID Hostname IP Address TTL\r\n" +MSG1 .AZ "$%h $%H %32s %03d.%03d.%03d.%03d %u\r\n" hLIBTCPIP .BS 1 IP .BS 4 diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 39deb36d..27dbc100 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -460,23 +460,23 @@ DecTmpCount lda TmpCount .INB /A2OSX.SRC/BIN/EDIT.S.SCRN *-------------------------------------- CS.END -SEQ.DETECT >CSTR "Querying terminal capabilities...\e[999;999H\e[6n" -SEQ.INIT >CSTR "\ec\e[2;%dr" \e[?6h -SEQ.RESET >CSTR "\ec" -SEQ.SCROLLUP >CSTR "\e[%d;%dH\eD" -SEQ.SCROLLDN >CSTR "\e[%d;%dH\eM" -SEQ.INV >CSTR "\e[7m" -SEQ.NORM >CSTR "\e[0m" -SEQ.CEOL >CSTR "\e[K" -MSG.TOPBAR >CSTR "\e[1;1HA2osX Edit:%s\e[0m" -MSG.STATUSBAR >CSTR "Press Ctrl-A For Help Length:%5D,Col:%3d,Line:%5D" -MSG.STATUSBAR.H >CSTR "Press any key to exit this screen:\e[0m" -MSG.STATUSBAR.F >CSTR "Find:%s\e[0m" -MSG.STATUSBAR.R >CSTR "Replace:%s\e[0m" -MSG.STATUSBAR.S >CSTR "Save:%s\e[0m" -MSG.STATUSBAR.E >CSTR "Error:%h\e[0m" -MSG.GOTOXY >CSTR "\e[%d;%dH" -MSG.HELPLINE >CSTR "%S\e[K" +SEQ.DETECT .AZ "Querying terminal capabilities...\e[999;999H\e[6n" +SEQ.INIT .AZ "\ec\e[2;%dr" \e[?6h +SEQ.RESET .AZ "\ec" +SEQ.SCROLLUP .AZ "\e[%d;%dH\eD" +SEQ.SCROLLDN .AZ "\e[%d;%dH\eM" +SEQ.INV .AZ "\e[7m" +SEQ.NORM .AZ "\e[0m" +SEQ.CEOL .AZ "\e[K" +MSG.TOPBAR .AZ "\e[1;1HA2osX Edit:%s\e[0m" +MSG.STATUSBAR .AZ "Press Ctrl-A For Help Length:%5D,Col:%3d,Line:%5D" +MSG.STATUSBAR.H .AZ "Press any key to exit this screen:\e[0m" +MSG.STATUSBAR.F .AZ "Find:%s\e[0m" +MSG.STATUSBAR.R .AZ "Replace:%s\e[0m" +MSG.STATUSBAR.S .AZ "Save:%s\e[0m" +MSG.STATUSBAR.E .AZ "Error:%h\e[0m" +MSG.GOTOXY .AZ "\e[%d;%dH" +MSG.HELPLINE .AZ "%S\e[K" MSG.HELP >PSTR "All commands: (* = Not yet implemented)" >PSTR "------------" >PSTR " Ctrl-A : This help screen" diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt index 6b59e46e..6740d9b5 100644 --- a/BIN/FORMAT.S.txt +++ b/BIN/FORMAT.S.txt @@ -297,13 +297,13 @@ CS.END OptionList >PSTR "Ll" OptionVars .DA #bLL,#bLL *-------------------------------------- -MSG.USAGE >CSTR "Usage : FORMAT [VOLUME.NAME]\r\n -L : Low-Level Format\r\n" -MSG.OK >CSTR "[OK]\r\n" -MSG.ERR >CSTR "[%h]\r\n" -MSG.INIT >CSTR "Formatting %s (%D Blks),Volname:%s..." +MSG.USAGE .AZ "Usage : FORMAT [VOLUME.NAME]\r\n -L : Low-Level Format\r\n" +MSG.OK .AZ "[OK]\r\n" +MSG.ERR .AZ "[%h]\r\n" +MSG.INIT .AZ "Formatting %s (%D Blks),Volname:%s..." *-------------------------------------- -LIBBLKDEV >CSTR "libblkdev.o" -BLANK >CSTR "BLANK" +LIBBLKDEV .AZ "libblkdev.o" +BLANK .AZ "BLANK" hLIBBLKDEV .BS 1 *-------------------------------------- .DUMMY diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index 0dcc30dc..887fc341 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -258,30 +258,30 @@ CS.QUIT lda hLIBTCPIP NetDevJmp jmp * *-------------------------------------- CS.END -LIBTCPIP >CSTR "libtcpip.o" +LIBTCPIP .AZ "libtcpip.o" *-------------------------------------- -MSG0 >CSTR "TCP/IP Status : " -MSG0.L >CSTR "Loaded\r\n" -MSG0.NL >CSTR "Not Loaded\r\n" +MSG0 .AZ "TCP/IP Status : " +MSG0.L .AZ "Loaded\r\n" +MSG0.NL .AZ "Not Loaded\r\n" *-------------------------------------- -MSG1.DEV >CSTR "\r\nDevice Configuration :\r\n DevID : $%h\r\n Device Type : %S\r\n Device Name : %s\r\n HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" -MSG1.DEV.ARP >CSTR " ARP Offload : %d\r\n" -MSG1.DEV.IP >CSTR " IP Offload : %d\r\n" -MSG1.LINK >CSTR " Link Status : %s\r\n" -MSG1.LINK.OK >CSTR "OK" -MSG1.LINK.KO >CSTR "Media Disconnected" -MSG1.LINKSPEED >CSTR " Link Speed : 1" -MSG1.DPLX.FD >CSTR " Mbit/s,Full Duplex\r\n" -MSG1.DPLX.HD >CSTR " Mbit/s,Half Duplex\r\n" +MSG1.DEV .AZ "\r\nDevice Configuration :\r\n DevID : $%h\r\n Device Type : %S\r\n Device Name : %s\r\n HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" +MSG1.DEV.ARP .AZ " ARP Offload : %d\r\n" +MSG1.DEV.IP .AZ " IP Offload : %d\r\n" +MSG1.LINK .AZ " Link Status : %s\r\n" +MSG1.LINK.OK .AZ "OK" +MSG1.LINK.KO .AZ "Media Disconnected" +MSG1.LINKSPEED .AZ " Link Speed : 1" +MSG1.DPLX.FD .AZ " Mbit/s,Full Duplex\r\n" +MSG1.DPLX.HD .AZ " Mbit/s,Half Duplex\r\n" *-------------------------------------- -MSG2 >CSTR "\r\nIP Configuration : " -MSG2.C >CSTR "Configured\r\n" -MSG2.U >CSTR "Not Configured\r\n" -MSG2.DHCPSRVR >CSTR " DHCP Server : %d.%d.%d.%d\r\n" -MSG2.IP >CSTR " IP/Mask : %d.%d.%d.%d/%d.%d.%d.%d\r\n" -MSG2.GW >CSTR " Gateway : %d.%d.%d.%d\r\n" -MSG2.DNS >CSTR " DNS : %d.%d.%d.%d,%d.%d.%d.%d\r\n" -MSG2.HOSTNAME >CSTR " Hostname : %S.%S\r\n" +MSG2 .AZ "\r\nIP Configuration : " +MSG2.C .AZ "Configured\r\n" +MSG2.U .AZ "Not Configured\r\n" +MSG2.DHCPSRVR .AZ " DHCP Server : %d.%d.%d.%d\r\n" +MSG2.IP .AZ " IP/Mask : %d.%d.%d.%d/%d.%d.%d.%d\r\n" +MSG2.GW .AZ " Gateway : %d.%d.%d.%d\r\n" +MSG2.DNS .AZ " DNS : %d.%d.%d.%d,%d.%d.%d.%d\r\n" +MSG2.HOSTNAME .AZ " Hostname : %S.%S\r\n" hLIBTCPIP .BS 1 DevID .BS 1 DevName .BS 5 diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index 49d09dd3..d873a45e 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -500,12 +500,12 @@ CS.END OptionList >PSTR "ALRalr" OptionVars .DA #bAllmostAll,#bLong,#bRecurse,#bAllmostAll,#bLong,#bRecurse *-------------------------------------- -MSG.DEVEXT >CSTR "%15s S%d,D%d Blocks Used:%5D Total:%5D\r\n" -MSG.DIR >CSTR "\e[32m%s/\e[0m" -MSG.ENTER >CSTR "Directory:%s\r\n" -MSG.DIREXT >CSTR "\e[32m%16s\e[0m %s %s %s\r\n" -MSG.FILE >CSTR "%19s" -MSG.FILEEXT >CSTR "%15s %S $%H %s %10u %s %s\r\n" +MSG.DEVEXT .AZ "%15s S%d,D%d Blocks Used:%5D Total:%5D\r\n" +MSG.DIR .AZ "\e[32m%s/\e[0m" +MSG.ENTER .AZ "Directory:%s\r\n" +MSG.DIREXT .AZ "\e[32m%16s\e[0m %s %s %s\r\n" +MSG.FILE .AZ "%19s" +MSG.FILEEXT .AZ "%15s %S $%H %s %10u %s %s\r\n" *-------------------------------------- PRODOS.FT.HEX .HS 0406FAFCFDE2CBCCFF PRODOS.FT.TXT >PSTR "TXT" @@ -518,8 +518,8 @@ PRODOS.FT.TXT >PSTR "TXT" >PSTR "FON" >PSTR "SYS" PRODOS.FT.DFLT >PSTR "$ " -MSG.NODATE >CSTR " " -FMT.DateTime >CSTR "%d-%b-%y %H:%M" +MSG.NODATE .AZ " " +FMT.DateTime .AZ "%d-%b-%y %H:%M" HEXDIGIT .AS '0123456789ABCDEF' TYPES .AS "-dbclssp" ACCESS .AS "rwxrwxrwx" diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt index 44ea533c..d30e23dd 100644 --- a/BIN/LSDEV.S.txt +++ b/BIN/LSDEV.S.txt @@ -181,10 +181,10 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG0 >CSTR "ID Status Flags Name Addr. Typ/Sub IDString Version Size (BLK)\r\n" -MSG1 >CSTR "%03d %s %b %4s $%H " -MSG2.B >CSTR "$%h/$%h %16S %03d.%03d %10u" -MSG2.C >CSTR "$%h/$%h %16S %03d.%03d n/a" +MSG0 .AZ "ID Status Flags Name Addr. Typ/Sub IDString Version Size (BLK)\r\n" +MSG1 .AZ "%03d %s %b %4s $%H " +MSG2.B .AZ "$%h/$%h %16S %03d.%03d %10u" +MSG2.C .AZ "$%h/$%h %16S %03d.%03d n/a" MSG.SFLAGS .AS "BWRLNEIO" *-------------------------------------- .DUMMY diff --git a/BIN/MEM.S.txt b/BIN/MEM.S.txt index 97f41e0a..1cd352d1 100644 --- a/BIN/MEM.S.txt +++ b/BIN/MEM.S.txt @@ -115,11 +115,11 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG.Main >CSTR "--- Main Memory ---------------\r\n" -MSG.Aux >CSTR "--- Aux Memory ----------------\r\n" -MSG.Kernel >CSTR "--- Kernel (Drivers) Memory ---\r\n" -MSG.Stat >CSTR " Low : $%H\r\n Free Ptr : $%H\r\n High : $%H\r\n Available Memory : %05D Bytes\r\n" -MSG.End >CSTR "-------------------------------\r\n" +MSG.Main .AZ "--- Main Memory ---------------\r\n" +MSG.Aux .AZ "--- Aux Memory ----------------\r\n" +MSG.Kernel .AZ "--- Kernel (Drivers) Memory ---\r\n" +MSG.Stat .AZ " Low : $%H\r\n Free Ptr : $%H\r\n High : $%H\r\n Available Memory : %05D Bytes\r\n" +MSG.End .AZ "-------------------------------\r\n" MemStat .BS S.MSTAT *-------------------------------------- .DUMMY diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt index 563e394b..466532fa 100644 --- a/BIN/MEMDUMP.S.txt +++ b/BIN/MEMDUMP.S.txt @@ -287,17 +287,17 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG0 >CSTR " # Flags PID REF PTR LEN BINPATH/DATA\r\n" -MSG1.INV >CSTR "\e[7m" -MSG1 >CSTR "%03d %s %03d %03d $%H %05D " -MSG1.BIN >CSTR "{%s}\e[0m\r\n" -MSG1.STR >CSTR "[%03d:%s]\e[0m\r\n" -MSG1.HEX >CSTR "?HEX:%h%h.%h%h.%h%h.%h%h.%h%h.%h%h.%h%h.%h%h\e[0m\r\n" -MSG2 >CSTR "\r\nAllocated hMem:%d, Total:%d\r\n" -MSG3 >CSTR "High Memory: $%H\r\n" -MSG4 >CSTR "Free ULimit: $%H\r\n" -MSG5 >CSTR "Low Memory: $%H\r\n" -MSG.FREE >CSTR "\r\nFree Memory: %D Bytes.\r\n" +MSG0 .AZ " # Flags PID REF PTR LEN BINPATH/DATA\r\n" +MSG1.INV .AZ "\e[7m" +MSG1 .AZ "%03d %s %03d %03d $%H %05D " +MSG1.BIN .AZ "{%s}\e[0m\r\n" +MSG1.STR .AZ "[%03d:%s]\e[0m\r\n" +MSG1.HEX .AZ "?HEX:%h%h.%h%h.%h%h.%h%h.%h%h.%h%h.%h%h.%h%h\e[0m\r\n" +MSG2 .AZ "\r\nAllocated hMem:%d, Total:%d\r\n" +MSG3 .AZ "High Memory: $%H\r\n" +MSG4 .AZ "Free ULimit: $%H\r\n" +MSG5 .AZ "Low Memory: $%H\r\n" +MSG.FREE .AZ "\r\nFree Memory: %D Bytes.\r\n" MSG.FLAGS .AS "UZCNA--" *-------------------------------------- .DUMMY diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt index 2ebf4f23..3983f341 100644 --- a/BIN/MV.S.txt +++ b/BIN/MV.S.txt @@ -21,13 +21,13 @@ CS.END OptionList >PSTR "CRYQcryq" OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#bNoConfirm,#bQuiet *-------------------------------------- -MSG.USAGE >CSTR "Usage : MV [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" -MSG.DIR >CSTR "MV Dir :%S to %S..." -MSG.FILE >CSTR "MV File:%S to %S..." -MSG.OVERWRITE >CSTR "Overwrite %S [Yes,No,All]?" -MSG.OK >CSTR "[OK]\r\n" -MSG.ERR >CSTR "[%h]\r\n" -MSG.DONE >CSTR "%D File(s) Moved.\r\n" +MSG.USAGE .AZ "Usage : MV [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" +MSG.DIR .AZ "MV Dir :%S to %S..." +MSG.FILE .AZ "MV File:%S to %S..." +MSG.OVERWRITE .AZ "Overwrite %S [Yes,No,All]?" +MSG.OK .AZ "[OK]\r\n" +MSG.ERR .AZ "[%h]\r\n" +MSG.DONE .AZ "%D File(s) Moved.\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index 1de14a10..d822fad4 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -128,24 +128,24 @@ CS.QUIT lda hLIBTCPIP rts *-------------------------------------- CS.END -LIBTCPIP >CSTR "libtcpip.o" -MSG0 >CSTR "Proto Local Remote Options Status\r\n" -MSG1 >CSTR "%s %03d.%03d.%03d.%03d:%05D %03d.%03d.%03d.%03d:%05D %b %s\r\n" -MSG1.UDP >CSTR "UDP" -MSG1.TCP >CSTR "TCP" -MSG1.RAW >CSTR "RAW" -MSG1.INV >CSTR "???" -MSG1.S.0 >CSTR "*" -MSG1.S.1 >CSTR "LISTENING" -MSG1.S.2 >CSTR "SYN-SENT" -MSG1.S.3 >CSTR "SYN-RECEIVED" -MSG1.S.4 >CSTR "ESTABLISHED" -MSG1.S.5 >CSTR "CLOSE-WAIT" -MSG1.S.6 >CSTR "LAST-ACK" -MSG1.S.7 >CSTR "FIN-WAIT-1" -MSG1.S.8 >CSTR "FIN-WAIT-2" -MSG1.S.9 >CSTR "CLOSING" -MSG1.S.10 >CSTR "TIME-WAIT" +LIBTCPIP .AZ "libtcpip.o" +MSG0 .AZ "Proto Local Remote Options Status\r\n" +MSG1 .AZ "%s %03d.%03d.%03d.%03d:%05D %03d.%03d.%03d.%03d:%05D %b %s\r\n" +MSG1.UDP .AZ "UDP" +MSG1.TCP .AZ "TCP" +MSG1.RAW .AZ "RAW" +MSG1.INV .AZ "???" +MSG1.S.0 .AZ "*" +MSG1.S.1 .AZ "LISTENING" +MSG1.S.2 .AZ "SYN-SENT" +MSG1.S.3 .AZ "SYN-RECEIVED" +MSG1.S.4 .AZ "ESTABLISHED" +MSG1.S.5 .AZ "CLOSE-WAIT" +MSG1.S.6 .AZ "LAST-ACK" +MSG1.S.7 .AZ "FIN-WAIT-1" +MSG1.S.8 .AZ "FIN-WAIT-2" +MSG1.S.9 .AZ "CLOSING" +MSG1.S.10 .AZ "TIME-WAIT" hLIBTCPIP .BS 1 SocketCount .BS 1 MAN diff --git a/BIN/NFSMOUNT.S.txt b/BIN/NFSMOUNT.S.txt index cfb3fa2c..8eaf405b 100644 --- a/BIN/NFSMOUNT.S.txt +++ b/BIN/NFSMOUNT.S.txt @@ -86,7 +86,7 @@ CS.QUIT lda hLIBTCPIP rts *-------------------------------------- CS.END -MSG.USAGE >CSTR "Usage : NFSMOUNT [HOST | IP]/export /mountvol\n" +MSG.USAGE .AZ "Usage : NFSMOUNT [HOST | IP]/export /mountvol\n" LIBTCPIP >PSTR "libtcpip.o" hLIBTCPIP .BS 1 Socket .DA #S.SOCKET.SOCK.DGRAM diff --git a/BIN/NSCUTIL.S.txt b/BIN/NSCUTIL.S.txt index c2c49f1a..8f48779a 100644 --- a/BIN/NSCUTIL.S.txt +++ b/BIN/NSCUTIL.S.txt @@ -361,13 +361,13 @@ IsDigit cmp #'0' rts *-------------------------------------- CS.END -MSG.READ.KO >CSTR "DS1216E Not Detected.\r\n" -MSG.READ.OK1 >CSTR "DS1216E Detected:/OSC=%d,/RST=%d,mode=" -MSG.READ.OK2.12 >CSTR "am/pm" -MSG.READ.OK2.24 >CSTR "24h" -MSG.READ.OK3 >CSTR "\r\nDate:" -MSG.READ.OK4 >CSTR "\r\nTime:" -MSG.USAGE >CSTR "\r\n\r\nTo Reset the chip and set clock, type:\r\nNSCUTIL DD/MM/YY hh:mm:ss\r\n" +MSG.READ.KO .AZ "DS1216E Not Detected.\r\n" +MSG.READ.OK1 .AZ "DS1216E Detected:/OSC=%d,/RST=%d,mode=" +MSG.READ.OK2.12 .AZ "am/pm" +MSG.READ.OK2.24 .AZ "24h" +MSG.READ.OK3 .AZ "\r\nDate:" +MSG.READ.OK4 .AZ "\r\nTime:" +MSG.USAGE .AZ "\r\n\r\nTo Reset the chip and set clock, type:\r\nNSCUTIL DD/MM/YY hh:mm:ss\r\n" TmpByte .BS 1 DS1216E.PATTERN .HS 5CA33AC55CA33AC5 Reverted 7->0 DS1216E.DETECT .BS 8 diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index b5f613e2..e3449e20 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -321,14 +321,14 @@ Wait.TimeOut sec .9 rts *-------------------------------------- CS.END -LIBTCPIP >CSTR "libtcpip.o" -MSG.IPKO >CSTR "TCP/IP Not Loaded/Configured.\r\n" -MSG.USAGE >CSTR "Usage : PING \r\n" -MSG.UNKNOWN >CSTR "%s: Unknown host\r\n" -MSG.HOSTOK >CSTR "PING %d.%d.%d.%d (%s)\r\n" -MSG.SKTKO >CSTR "Failed to Open Socket.\r\n" -MSG.UNREACH >CSTR "%d.%d.%d.%d: TimeOut/Host unreachable\r\n" -MSG.REPLY >CSTR "32 bytes from %d.%d.%d.%d, icmp_seq=%D, ttl=%d, time=%D ms\r\n" +LIBTCPIP .AZ "libtcpip.o" +MSG.IPKO .AZ "TCP/IP Not Loaded/Configured.\r\n" +MSG.USAGE .AZ "Usage : PING \r\n" +MSG.UNKNOWN .AZ "%s: Unknown host\r\n" +MSG.HOSTOK .AZ "PING %d.%d.%d.%d (%s)\r\n" +MSG.SKTKO .AZ "Failed to Open Socket.\r\n" +MSG.UNREACH .AZ "%d.%d.%d.%d: TimeOut/Host unreachable\r\n" +MSG.REPLY .AZ "32 bytes from %d.%d.%d.%d, icmp_seq=%D, ttl=%d, time=%D ms\r\n" hLIBTCPIP .BS 1 TimeOut.ms .BS 2 Socket .DA #S.SOCKET.SOCK.RAW diff --git a/BIN/PS.S.txt b/BIN/PS.S.txt index a7e079fb..cdfe08b3 100644 --- a/BIN/PS.S.txt +++ b/BIN/PS.S.txt @@ -104,8 +104,8 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG0 >CSTR "ID Flags PID Command Line\r\n" -MSG1 >CSTR "%03d %s %03d %s\r\n" +MSG0 .AZ "ID Flags PID Command Line\r\n" +MSG1 .AZ "%03d %s %03d %s\r\n" MSG.FLAGS .AS "-IHSED--" *-------------------------------------- .DUMMY diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 8c58ec4a..3a95117d 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -21,12 +21,12 @@ CS.END OptionList >PSTR "CRYQcryq" OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#bNoConfirm,#bQuiet *-------------------------------------- -MSG.USAGE >CSTR "Usage : RM [File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n" -MSG.DIR >CSTR "RM Dir :%S..." -MSG.FILE >CSTR "RM File:%S..." -MSG.OK >CSTR "[OK]\r\n" -MSG.ERR >CSTR "[%h]\r\n" -MSG.DONE >CSTR "%D File(s) Removed.\r\n" +MSG.USAGE .AZ "Usage : RM [File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n" +MSG.DIR .AZ "RM Dir :%S..." +MSG.FILE .AZ "RM File:%S..." +MSG.OK .AZ "[OK]\r\n" +MSG.ERR .AZ "[%h]\r\n" +MSG.DONE .AZ "%D File(s) Removed.\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index 9d26bc32..275444cf 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -243,11 +243,11 @@ DumpRPCFrame lda #S.UDP+24 *-------------------------------------- CS.END LIBTCPIP >PSTR "libtcpip.o" -MSG.USAGE >CSTR "Usage : RPCDUMP \r\n" -MSG.UNKNOWN >CSTR "%S: Unknown host\r\n" -MSG.TIMEOUT >CSTR "No response from %S\r\n" -MSG.DUMP0 >CSTR "Program Ver Proto:Port\r\n" -MSG.DUMP1 >CSTR "%10L %2d %2d:%D\r\n" +MSG.USAGE .AZ "Usage : RPCDUMP \r\n" +MSG.UNKNOWN .AZ "%S: Unknown host\r\n" +MSG.TIMEOUT .AZ "No response from %S\r\n" +MSG.DUMP0 .AZ "Program Ver Proto:Port\r\n" +MSG.DUMP1 .AZ "%10L %2d %2d:%D\r\n" Socket .DA #S.SOCKET.SOCK.DGRAM .BS 3 Socket.Src.Addr .BS 4 diff --git a/BMP2PIX.S.txt b/BMP2PIX.S.txt index e6b82c49..2e35d52b 100644 --- a/BMP2PIX.S.txt +++ b/BMP2PIX.S.txt @@ -327,11 +327,11 @@ CS.END *-------------------------------------- OptionList >PSTR "Vv" OptionVars .DA #bVerbose,#bVerbose -MSG.USAGE >CSTR "Usage : BMP2PIX BMP-File \r\n -V : Verbose Mode\r\n" -MSG.FILE.OK >CSTR "BMP Loaded, %D Bytes Read\r\n" -MSG.HEADER.OK >CSTR "BMP Size : %D x %D pixels\r\n" -MSG.HEADER.KO >CSTR "Invalid Input File Format\r\n" -MSG.DONE >CSTR "All Done!!!\r\n" +MSG.USAGE .AZ "Usage : BMP2PIX BMP-File \r\n -V : Verbose Mode\r\n" +MSG.FILE.OK .AZ "BMP Loaded, %D Bytes Read\r\n" +MSG.HEADER.OK .AZ "BMP Size : %D x %D pixels\r\n" +MSG.HEADER.KO .AZ "Invalid Input File Format\r\n" +MSG.DONE .AZ "All Done!!!\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/DRV/CONSOLE.DRV.S.txt b/DRV/CONSOLE.DRV.S.txt index a3a44234..5df57048 100644 --- a/DRV/CONSOLE.DRV.S.txt +++ b/DRV/CONSOLE.DRV.S.txt @@ -40,7 +40,7 @@ Dev.Detect >LDYA L.MSG.DETECT clc rts CS.END -MSG.DETECT >CSTR "Apple IIe/IIc 80 Col Driver.\r\n" +MSG.DETECT .AZ "Apple IIe/IIc 80 Col Driver.\r\n" *-------------------------------------- * Device Header (16 Bytes) *-------------------------------------- @@ -48,7 +48,7 @@ DEV.HEADER cld jmp (DRV.CS.START,x) .DA #S.DEV.S.WRITE+S.DEV.S.READ .BS 6 - >CSTR "CON" NAME + .AZ "CON" NAME .HS 00 NAME must Be 5 bytes long *-------------------------------------- * Driver Code @@ -881,7 +881,7 @@ DEVSTAT .DA #S.DSTAT.S.WRITE+S.DSTAT.S.READ .DA #0 .DA #0 .DA #91 -ENQ.String >CSTR "XTERM" +ENQ.String .AZ "XTERM" SB.IS.TTYPE .DA #IAC,#SB,#TELOPT.TTYPE,#SB.IS .AS 'XTERM' .DA #IAC,#SE diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index f676cc9f..3b72f8e8 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -106,10 +106,10 @@ Dev.Detect >LDYA L.MSG.DETECT rts *-------------------------------------- CS.END -MSG.DETECT >CSTR "Apple IIe/IIc DHGR Driver.\r\n" -MSG.DETECT.IIC >CSTR "Apple //c detected, Assuming 'Le Chat Mauve' Mode.\r\n" -MSG.DETECT.EVE >CSTR "'Le Chat Mauve EVE' Board Detected.\r\n" -MSG.DETECT.80C >CSTR "No Specific H/W Found, Assuming 80c Mode.\r\n" +MSG.DETECT .AZ "Apple IIe/IIc DHGR Driver.\r\n" +MSG.DETECT.IIC .AZ "Apple //c detected, Assuming 'Le Chat Mauve' Mode.\r\n" +MSG.DETECT.EVE .AZ "'Le Chat Mauve EVE' Board Detected.\r\n" +MSG.DETECT.80C .AZ "No Specific H/W Found, Assuming 80c Mode.\r\n" *-------------------------------------- * Device Header (16 Bytes) *-------------------------------------- @@ -117,7 +117,7 @@ DEV.HEADER cld jmp (DRV.CS.START,x) .DA #0 .BS 6 -DEV.HEADER.NAME >CSTR "GFX" +DEV.HEADER.NAME .AZ "GFX" .BS 1 *-------------------------------------- * Driver Code diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt index 7244bfff..332e17e5 100644 --- a/DRV/LANCEGS.DRV.S.txt +++ b/DRV/LANCEGS.DRV.S.txt @@ -94,9 +94,9 @@ Dev.Detect >STYA Args .INB /A2OSX.SRC/DRV/X.NET.DRV.S *-------------------------------------- CS.END -MSG.DETECT >CSTR "LanCeGS/SMSC91C96 Driver.\r\n" -MSG.DETECT.OK >CSTR "LanCeGS/SMSC91C96 Installed As Device : %S\r\n" -MSG.DETECT.KO >CSTR "Hardware Not Found.\r\n" +MSG.DETECT .AZ "LanCeGS/SMSC91C96 Driver.\r\n" +MSG.DETECT.OK .AZ "LanCeGS/SMSC91C96 Installed As Device : %S\r\n" +MSG.DETECT.KO .AZ "Hardware Not Found.\r\n" Args .BS 2 *-------------------------------------- * Device Header (16 Bytes) @@ -105,7 +105,7 @@ DEV.HEADER cld jmp (DRV.CS.START,x) .DA #0 .BS 6 -DEV.HEADER.NAME >CSTR "ETH7" +DEV.HEADER.NAME .AZ "ETH7" *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index 6a98a497..b5e19f7c 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -83,9 +83,9 @@ Dev.Detect >LDYA L.MSG.DETECT *-------------------------------------- CS.END -MSG.DETECT >CSTR "Apple Mouse Driver.\r\n" -MSG.DETECT.OK >CSTR "Mouse Installed As Device : %s\r\n" -MSG.DETECT.KO >CSTR "No Mouse Found.\r\n" +MSG.DETECT .AZ "Apple Mouse Driver.\r\n" +MSG.DETECT.OK .AZ "Mouse Installed As Device : %s\r\n" +MSG.DETECT.KO .AZ "No Mouse Found.\r\n" DEVSIG.Offset .HS 05070B0CFB DEVSIG.Value .HS 38180120D6 *-------------------------------------- @@ -95,7 +95,7 @@ DEV.HEADER cld jmp (DRV.CS.START,x) .DA #0 .BS 6 -DEV.HEADER.NAME >CSTR "MOUX" +DEV.HEADER.NAME .AZ "MOUX" *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/DRV/PIC.DRV.S.txt b/DRV/PIC.DRV.S.txt index 9ea8d2a1..9a55d78f 100644 --- a/DRV/PIC.DRV.S.txt +++ b/DRV/PIC.DRV.S.txt @@ -94,9 +94,9 @@ CS.END DEVSIG.Offset .HS 0507 DEVSIG.Value .HS 4848 DEVSIG.Length .EQ DEVSIG.Value-DEVSIG.Offset -MSG.DETECT >CSTR "Apple PIC (Parallel Interface Card).\r\n" -MSG.DETECT.OK >CSTR "PIC Installed As Device : %S\r\n" -MSG.DETECT.KO >CSTR "No PIC Found.\r\n" +MSG.DETECT .AZ "Apple PIC (Parallel Interface Card).\r\n" +MSG.DETECT.OK .AZ "PIC Installed As Device : %S\r\n" +MSG.DETECT.KO .AZ "No PIC Found.\r\n" ARGS .BS 2 *-------------------------------------- * Device Header (16 Bytes) diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt index 0399e5a3..9bb3da4d 100644 --- a/DRV/UTHER2.AI.DRV.S.txt +++ b/DRV/UTHER2.AI.DRV.S.txt @@ -130,9 +130,9 @@ Dev.Detect >STYA Args .INB /A2OSX.SRC/DRV/X.NET.DRV.S *-------------------------------------- CS.END -MSG.DETECT >CSTR "UtherNet2/W5100 Driver.\r\n" -MSG.DETECT.OK >CSTR "UtherNet2/W5100 Installed As Device : %S\r\n" -MSG.DETECT.KO >CSTR "Hardware Not Found.\r\n" +MSG.DETECT .AZ "UtherNet2/W5100 Driver.\r\n" +MSG.DETECT.OK .AZ "UtherNet2/W5100 Installed As Device : %S\r\n" +MSG.DETECT.KO .AZ "Hardware Not Found.\r\n" Args .BS 2 *-------------------------------------- * Device Header (16 Bytes) diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index c192bc86..1d35e5ec 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -125,9 +125,9 @@ Dev.Detect >STYA ARGS .INB /A2OSX.SRC/DRV/X.NET.DRV.S *-------------------------------------- CS.END -MSG.DETECT >CSTR "UtherNet/CS8900A Driver.\r\n" -MSG.DETECT.OK >CSTR "UtherNet/CS8900A Installed As Device : %s\r\n" -MSG.DETECT.KO >CSTR "Hardware Not Found.\r\n" +MSG.DETECT .AZ "UtherNet/CS8900A Driver.\r\n" +MSG.DETECT.OK .AZ "UtherNet/CS8900A Installed As Device : %s\r\n" +MSG.DETECT.KO .AZ "Hardware Not Found.\r\n" ARGS .BS 2 *-------------------------------------- * Device Header (16 Bytes) @@ -136,7 +136,7 @@ DEV.HEADER cld jmp (DRV.CS.START,x) .DA #0 .BS 6 -DEV.HEADER.NAME >CSTR "ETH7" NAME +DEV.HEADER.NAME .AZ "ETH7" NAME *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt index e2a7cda4..2f980c42 100644 --- a/DRV/UTHERNET2.DRV.S.txt +++ b/DRV/UTHERNET2.DRV.S.txt @@ -129,9 +129,9 @@ Dev.Detect >STYA Args .INB /A2OSX.SRC/DRV/X.NET.DRV.S *-------------------------------------- CS.END -MSG.DETECT >CSTR "UtherNet2/W5100 Driver.\r\n" -MSG.DETECT.OK >CSTR "UtherNet2/W5100 Installed As Device : %S\r\n" -MSG.DETECT.KO >CSTR "Hardware Not Found.\r\n" +MSG.DETECT .AZ "UtherNet2/W5100 Driver.\r\n" +MSG.DETECT.OK .AZ "UtherNet2/W5100 Installed As Device : %S\r\n" +MSG.DETECT.KO .AZ "Hardware Not Found.\r\n" Args .BS 2 *-------------------------------------- * Device Header (16 Bytes) diff --git a/FNT2FON.S.txt b/FNT2FON.S.txt index 9c669d0a..c5cd9aff 100644 --- a/FNT2FON.S.txt +++ b/FNT2FON.S.txt @@ -812,13 +812,13 @@ CS.END *-------------------------------------- OptionList >PSTR "NnVv" OptionVars .DA #bNoShrink,#bNoShrink,#bVerbose,#bVerbose -MSG.USAGE >CSTR "Usage : FNT2FON FNT-File \r\n -V : Verbose Mode\r\n -N : No shrink\r\n" -MSG.FILE.OK >CSTR "FNT File Loaded, %D Bytes Read\r\n" -MSG.HEADER.OK >CSTR "FNT File Version : %d, Size : %d x %d pixels, Ascent : %d\r\n" -MSG.HEADER.KO >CSTR "Invalid Input File Format\r\n" -MSG.RANGE >CSTR "First/Last Char : %d/%d, Default : %d, Break : %d\r\n" -MSG.DUMP >CSTR "Caracter ID : %d (0x0%2h), Width(P) : %d, Width(B) : %d\r\n" -MSG.DONE >CSTR "All Done!!!\r\n" +MSG.USAGE .AZ "Usage : FNT2FON FNT-File \r\n -V : Verbose Mode\r\n -N : No shrink\r\n" +MSG.FILE.OK .AZ "FNT File Loaded, %D Bytes Read\r\n" +MSG.HEADER.OK .AZ "FNT File Version : %d, Size : %d x %d pixels, Ascent : %d\r\n" +MSG.HEADER.KO .AZ "Invalid Input File Format\r\n" +MSG.RANGE .AZ "First/Last Char : %d/%d, Default : %d, Break : %d\r\n" +MSG.DUMP .AZ "Caracter ID : %d (0x0%2h), Width(P) : %d, Width(B) : %d\r\n" +MSG.DONE .AZ "All Done!!!\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index a3f16445..aa6a0998 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -379,10 +379,15 @@ S.PS.hStdIn .EQ 10 S.PS.hStdOut .EQ 11 S.PS.hStdErr .EQ 12 S.PS.RC .EQ 13 -S.PS.PC .EQ 14 +S.PS.ARGC .EQ 14 +S.PS.hARGS .EQ 15 -S.PS.ARGC .EQ 16 -S.PS.hARGS .EQ 17 +S.PS.A .EQ 16 +S.PS.X .EQ 17 +S.PS.Y .EQ 18 +S.PS.P .EQ 19 +S.PS.PC .EQ 20 WORD +S.PS.S .EQ 22 S.PS.ZP .EQ 24 diff --git a/INC/MACROS.I.txt b/INC/MACROS.I.txt index 08410037..d466d9cd 100644 --- a/INC/MACROS.I.txt +++ b/INC/MACROS.I.txt @@ -329,11 +329,6 @@ AUTO 4,1 .EM *-------------------------------------- * General Strings Macros -*-------------------------------------- - .MA CSTR - .AS "]1" - .HS 00 - .EM *-------------------------------------- .MA PSTR .DA #:1-*-1 diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index c5b26ed0..788c0137 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -266,8 +266,8 @@ CS.END *-------------------------------------- .INB /A2OSX.SRC/LIB/LIBGUI.G.CUR *-------------------------------------- -DEVNAME.GFX >CSTR "GFX" -DEVNAME.MOUSE >CSTR "MOU1" +DEVNAME.GFX .AZ "GFX" +DEVNAME.MOUSE .AZ "MOU1" *-------------------------------------- hDevMouse .BS 1 *-------------------------------------- diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt index 951ed028..c2911e74 100644 --- a/SBIN/DHCPCLNT.S.txt +++ b/SBIN/DHCPCLNT.S.txt @@ -438,13 +438,13 @@ Wait.TimeOut ldy #TimeOut rts *-------------------------------------- CS.END -LIBTCPIP >CSTR "libtcpip.o" -MSG.CFG1 >CSTR "DHCPCLNT:Searching for DHCP servers...\r\n" -MSG.CFG2 >CSTR "DHCPCLNT:Reply from DHCP Server at %d.%d.%d.%d, requesting...\r\n" -MSG.CFG.KO >CSTR "DHCPCLNT:Time Out [%h].\r\n" -MSG.CFG.OK >CSTR "DHCPCLNT:Success:[IP=%d.%d.%d.%d/%d.%d.%d.%d]\r\n" -MSG.CFG.ND >CSTR "DHCPCLNT:No Device, exiting.\r\n" -MSG.CFG.NA >CSTR "DHCPCLNT:TCPIP Already configured, exiting.\r\n" +LIBTCPIP .AZ "libtcpip.o" +MSG.CFG1 .AZ "DHCPCLNT:Searching for DHCP servers...\r\n" +MSG.CFG2 .AZ "DHCPCLNT:Reply from DHCP Server at %d.%d.%d.%d, requesting...\r\n" +MSG.CFG.KO .AZ "DHCPCLNT:Time Out [%h].\r\n" +MSG.CFG.OK .AZ "DHCPCLNT:Success:[IP=%d.%d.%d.%d/%d.%d.%d.%d]\r\n" +MSG.CFG.ND .AZ "DHCPCLNT:No Device, exiting.\r\n" +MSG.CFG.NA .AZ "DHCPCLNT:TCPIP Already configured, exiting.\r\n" hLIBTCPIP .BS 1 IPCFG .BS S.IPCFG *-------------------------------------- diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt index 1117824f..4860b01e 100644 --- a/SBIN/GETTY.S.txt +++ b/SBIN/GETTY.S.txt @@ -270,7 +270,7 @@ PRINTA2 pha pla rts CS.END -MSG.USAGE >CSTR "Usage : GETTY \r\n" +MSG.USAGE .AZ "Usage : GETTY \r\n" MSG.TELNETOPT .DA #IAC,#WILL,#TELOPT.BINARY .DA #IAC,#DO,#TELOPT.LINEMODE .DA #IAC,#SB,#TELOPT.LINEMODE,#SB.SEND,#0,#IAC,#SE @@ -282,10 +282,10 @@ MSG.TELNETOPT .DA #IAC,#WILL,#TELOPT.BINARY .DA #IAC,#DO,#TELOPT.TTYPE .DA #IAC,#SB,#TELOPT.TTYPE,#SB.SEND,#IAC,#SE MSG.TELNETOPT.LEN .EQ *-MSG.TELNETOPT -MSG.GREETINGS >CSTR "\r\nA2osX-GeTTY 0.9.1\r\n" -ENV.TERM >CSTR "TERM" -HEX >CSTR "[%h]" -HEX2 >CSTR "{%h}" +MSG.GREETINGS .AZ "\r\nA2osX-GeTTY 0.9.1\r\n" +ENV.TERM .AZ "TERM" +HEX .AZ "[%h]" +HEX2 .AZ "{%h}" * \e[12h *-------------------------------------- .DUMMY diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 35112c7d..9c293c8f 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -176,14 +176,14 @@ Destop.Paint >LIBCALL hLIBGUI,LIBGUI.HideCursor rts *-------------------------------------- CS.END -LIBGUI >CSTR "libgui.o" -MSG.INIT >CSTR "GUI:Init...\r\n" +LIBGUI .AZ "libgui.o" +MSG.INIT .AZ "GUI:Init...\r\n" hLIBGUI .BS 1 hSYSFONT .BS 1 *-------------------------------------- -Filename >CSTR "/A2OSX.BUILD/ROOT/MARILYN" +Filename .AZ "/A2OSX.BUILD/ROOT/MARILYN" *-------------------------------------- -SYSFONT >CSTR "/A2OSX.BUILD/SBIN/GUI/SYSTEM" +SYSFONT .AZ "/A2OSX.BUILD/SBIN/GUI/SYSTEM" *-------------------------------------- MouseData .BS S.MOUSE *-------------------------------------- @@ -246,7 +246,7 @@ BM.Apple .DA #S.BM.F.BBP4 .HS 9999 violet (11) .HS 1FF1 Dark blue (4) *-------------------------------------- -TXT.Sample >CSTR "@@@@@@@@@ This Is A Sample Text with System Font Height=7px, Variable Width {}[] #0123456789$ @@@@@@@@@" +TXT.Sample .AZ "@@@@@@@@@ This Is A Sample Text with System Font Height=7px, Variable Width {}[] #0123456789$ @@@@@@@@@" *-------------------------------------- CB.Marylin .DA #S.CB.CMD.BITBLT .DA #S.CB.OP.SET diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt index 86e9309d..820c2fd7 100644 --- a/SBIN/HTTPD.S.txt +++ b/SBIN/HTTPD.S.txt @@ -242,12 +242,12 @@ Wait.TimeOut sec CS.END *-------------------------------------- LIBTCPIP >PSTR "libtcpip.o" -MSG.TCPWAIT >CSTR "HTTPD:Waiting for TCP/IP initializing...\r\n" -MSG.INITOK >CSTR "HTTPD:Init Ok, Listening.\r\n" -MSG.TCPIPERR >CSTR "HTTPD:TCP/IP Not initialized properly\r\n" -MSG.SKTERR >CSTR "HTTPD:Listen Error\r\n" -MSG.ABORT >CSTR "HTTPD:User Aborted\r\n" -MSG.INCOMING >CSTR "HTTPD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n" +MSG.TCPWAIT .AZ "HTTPD:Waiting for TCP/IP initializing...\r\n" +MSG.INITOK .AZ "HTTPD:Init Ok, Listening.\r\n" +MSG.TCPIPERR .AZ "HTTPD:TCP/IP Not initialized properly\r\n" +MSG.SKTERR .AZ "HTTPD:Listen Error\r\n" +MSG.ABORT .AZ "HTTPD:User Aborted\r\n" +MSG.INCOMING .AZ "HTTPD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n" hLIBTCPIP .BS 1 hClntSocket .BS 1 *-------------------------------------- diff --git a/SBIN/INSDRV.S.txt b/SBIN/INSDRV.S.txt index 59f5e84d..ead8d773 100644 --- a/SBIN/INSDRV.S.txt +++ b/SBIN/INSDRV.S.txt @@ -73,8 +73,8 @@ CS.QUIT clc rts *-------------------------------------- CS.END -MSG.HELP >CSTR "Usage: insdrv file.drv \r\n" -MSG.LOAD >CSTR "INSDRV:Loading %s...\r\n" +MSG.HELP .AZ "Usage: insdrv file.drv \r\n" +MSG.LOAD .AZ "INSDRV:Loading %s...\r\n" *-------------------------------------- MAN SAVE /A2OSX.SRC/SBIN/INSDRV.S diff --git a/SBIN/KCONFIG.S.txt b/SBIN/KCONFIG.S.txt index 8ab33c38..ba102782 100644 --- a/SBIN/KCONFIG.S.txt +++ b/SBIN/KCONFIG.S.txt @@ -346,33 +346,33 @@ SLOTS .DA #0 .DA #A2osX.S.DISABLE SLOTS.MAX .EQ *-SLOTS *-------------------------------------- -FILENAME >CSTR "${A2OSX}A2osX.KCONFIG" -MSG.TOPBAR >CSTR "\ec\e[7m\e[1;1HA2osX Kernel Config Utility : " -MSG.TOPBAR.OK >CSTR "KCONFIG File Successfully Loaded. \e[0m" -MSG.TOPBAR.KO >CSTR "Invalid/missing KCONFIG File. \e[0m" -MSG.STATUSBAR >CSTR "\e[7m\e[24;1HCtrl-Q:Quit,Ctrl-S:Save,Ctrl-T:Time,Ctrl-P:Preemptive,Ctrl-C:CHRoot,1-7:En/Dis \e[0m" -MSG.KCONF >CSTR "\e[2;1H------ Actual Kernel Configuration ------\r\n" -MSG.FCONF >CSTR "\e[13;1H------ KCONFIG File Configuration -------\r\n" -MSG.HZ >CSTR " Machine Timing : %d0 Hz\r\n" -MSG.PMODE >CSTR " Preemptive Mode : %s\r\n" -MSG.CHROOT >CSTR " CHRoot to /RAMx : %s\r\n" -MSG.ENABLED >CSTR "Enabled " -MSG.DISABLED >CSTR "Disabled" -MSG.SLOT >CSTR " Slot #%d : %s\r\n" -MSG.SLOT.NODEV >CSTR " " -MSG.SLOT.Z80 >CSTR "Z80 CPU Board" -MSG.SLOT.VSD >CSTR "SSC Shared Driver for VSDRIVE" -MSG.SLOT.ATK >CSTR "AppleTalk Board" -MSG.SLOT.DII >CSTR "Disk II Controller" -MSG.SLOT.BLK >CSTR "Generic Block/SCSI Controller" -MSG.SLOT.PRT >CSTR "SmartPort Controller" -MSG.SLOT.COM >CSTR "Communication Card" -MSG.SLOT.XY >CSTR "XY Pointing Device" -MSG.SLOT.NET >CSTR "Network Interface Card" -MSG.SLOT.DIS >CSTR "" -MSG.PROMPT >CSTR "\e[24;80H" -MSG.QUIT >CSTR "\ec" -MSG.QUIT.ERR >CSTR "\ecError [$%h] While Writing KCONFIG File.\r\n\r\n" +FILENAME .AZ "${A2OSX}A2osX.KCONFIG" +MSG.TOPBAR .AZ "\ec\e[7m\e[1;1HA2osX Kernel Config Utility : " +MSG.TOPBAR.OK .AZ "KCONFIG File Successfully Loaded. \e[0m" +MSG.TOPBAR.KO .AZ "Invalid/missing KCONFIG File. \e[0m" +MSG.STATUSBAR .AZ "\e[7m\e[24;1HCtrl-Q:Quit,Ctrl-S:Save,Ctrl-T:Time,Ctrl-P:Preemptive,Ctrl-C:CHRoot,1-7:En/Dis \e[0m" +MSG.KCONF .AZ "\e[2;1H------ Actual Kernel Configuration ------\r\n" +MSG.FCONF .AZ "\e[13;1H------ KCONFIG File Configuration -------\r\n" +MSG.HZ .AZ " Machine Timing : %d0 Hz\r\n" +MSG.PMODE .AZ " Preemptive Mode : %s\r\n" +MSG.CHROOT .AZ " CHRoot to /RAMx : %s\r\n" +MSG.ENABLED .AZ "Enabled " +MSG.DISABLED .AZ "Disabled" +MSG.SLOT .AZ " Slot #%d : %s\r\n" +MSG.SLOT.NODEV .AZ " " +MSG.SLOT.Z80 .AZ "Z80 CPU Board" +MSG.SLOT.VSD .AZ "SSC Shared Driver for VSDRIVE" +MSG.SLOT.ATK .AZ "AppleTalk Board" +MSG.SLOT.DII .AZ "Disk II Controller" +MSG.SLOT.BLK .AZ "Generic Block/SCSI Controller" +MSG.SLOT.PRT .AZ "SmartPort Controller" +MSG.SLOT.COM .AZ "Communication Card" +MSG.SLOT.XY .AZ "XY Pointing Device" +MSG.SLOT.NET .AZ "Network Interface Card" +MSG.SLOT.DIS .AZ "" +MSG.PROMPT .AZ "\e[24;80H" +MSG.QUIT .AZ "\ec" +MSG.QUIT.ERR .AZ "\ecError [$%h] While Writing KCONFIG File.\r\n\r\n" *-------------------------------------- .DUMMY .OR 0 diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt index 653eeb03..4e16c30f 100644 --- a/SBIN/LOGIN.S.txt +++ b/SBIN/LOGIN.S.txt @@ -189,9 +189,9 @@ INPUT.LINEIN ldy #INPUT.Status rts *-------------------------------------- CS.END -MSG.LOGIN >CSTR "\r\nlogin:" -MSG.PASSWORD >CSTR "\r\npassword:" -SHELL >CSTR "${A2OSX}SBIN/SHELL" +MSG.LOGIN .AZ "\r\nlogin:" +MSG.PASSWORD .AZ "\r\npassword:" +SHELL .AZ "${A2OSX}SBIN/SHELL" *-------------------------------------- .DUMMY .OR 0 diff --git a/SBIN/NFSD.S.txt b/SBIN/NFSD.S.txt index 57eea77c..b2bc9603 100644 --- a/SBIN/NFSD.S.txt +++ b/SBIN/NFSD.S.txt @@ -199,12 +199,12 @@ Wait.TimeOut sec CS.END *-------------------------------------- LIBTCPIP >PSTR "libtcpip.o" -MSG.TCPWAIT >CSTR "NFSD:Waiting for TCP/IP initializing...\n" -MSG.INITOK >CSTR "NFSD:Init Ok, Listening.\n" -MSG.TCPIPERR >CSTR "NFSD:TCP/IP Not initialized properly\n" -MSG.SKTERR >CSTR "NFSD:Listen Error\n" -MSG.ABORT >CSTR "NFSD:User Aborted\n" -MSG.INCOMING >CSTR "NFSD:Incoming Connection From : %d.%d.%d.%d\n" +MSG.TCPWAIT .AZ "NFSD:Waiting for TCP/IP initializing...\n" +MSG.INITOK .AZ "NFSD:Init Ok, Listening.\n" +MSG.TCPIPERR .AZ "NFSD:TCP/IP Not initialized properly\n" +MSG.SKTERR .AZ "NFSD:Listen Error\n" +MSG.ABORT .AZ "NFSD:User Aborted\n" +MSG.INCOMING .AZ "NFSD:Incoming Connection From : %d.%d.%d.%d\n" hLIBTCPIP .BS 1 *-------------------------------------- Socket .DA #S.SOCKET.SOCK.DGRAM diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index fb2c5a8c..cbdd6e02 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -332,32 +332,32 @@ SetPWD ldy #S.PS.hPREFIX *-------------------------------------- CS.END *-------------------------------------- -ENV.PATH >CSTR "PATH" -ENV.PWD >CSTR "PWD" -ENV.PS1 >CSTR "PS1" -ENV.HOME >CSTR "HOME" +ENV.PATH .AZ "PATH" +ENV.PWD .AZ "PWD" +ENV.PS1 .AZ "PS1" +ENV.HOME .AZ "HOME" *-------------------------------------- -INTCMDS >CSTR "CD" - >CSTR "DATE" - >CSTR "ECHO" - >CSTR "EXIT" - >CSTR "PAUSE" - >CSTR "PWD" - >CSTR "READ" - >CSTR "SET" - >CSTR "SLEEP" - >CSTR "STARTPROC" - >CSTR "TIME" +INTCMDS .AZ "CD" + .AZ "DATE" + .AZ "ECHO" + .AZ "EXIT" + .AZ "PAUSE" + .AZ "PWD" + .AZ "READ" + .AZ "SET" + .AZ "SLEEP" + .AZ "STARTPROC" + .AZ "TIME" .HS 00 *-------------------------------------- -MSG.GREETINGS >CSTR "\r\nA2osX-Shell 0.9.1\r\n\r\n" -MSG.PROMPT >CSTR "$ " -MSG.ECHO >CSTR ">%s\r\n" -MSG.ERROR >CSTR "[$%h]:%S.\r\n" -MSG.PRINTENV >CSTR "%s=%s\r\n" -MSG.CSHERR >CSTR "^\r\nLine #%D:" -FMT.DATE >CSTR "%A (%w), %B %d %Y" -FMT.TIME >CSTR "%H:%M:%S (%I:%M:%S%p)" +MSG.GREETINGS .AZ "\r\nA2osX-Shell 0.9.1\r\n\r\n" +MSG.PROMPT .AZ "$ " +MSG.ECHO .AZ ">%s\r\n" +MSG.ERROR .AZ "[$%h]:%S.\r\n" +MSG.PRINTENV .AZ "%s=%s\r\n" +MSG.CSHERR .AZ "^\r\nLine #%D:" +FMT.DATE .AZ "%A (%w), %B %d %Y" +FMT.TIME .AZ "%H:%M:%S (%I:%M:%S%p)" *-------------------------------------- .INB /A2OSX.SRC/SBIN/SHELL.C.CSH .INB /A2OSX.SRC/X.ERRORS.S diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt index a9ca1a7f..0d235e83 100644 --- a/SBIN/TCPIPD.S.txt +++ b/SBIN/TCPIPD.S.txt @@ -181,17 +181,17 @@ NetDevJmp jmp * *-------------------------------------- CS.END *-------------------------------------- -LIBTCPIP >CSTR "libtcpip.o" -DEVNAME >CSTR "ETH1" -MSG.DEV.KO >CSTR "TCPIPD:No Device Found, exiting.\r\n" -MSG.DEV.OK >CSTR "TCPIPD:Bound To Device : %s\r\n" -MSG.CFG >CSTR "TCPIPD:Reading %s..." -MSG.CFG.KO >CSTR "Failed!!! [%h]\r\n" -MSG.CFG.OK >CSTR "OK.\r\n" +LIBTCPIP .AZ "libtcpip.o" +DEVNAME .AZ "ETH1" +MSG.DEV.KO .AZ "TCPIPD:No Device Found, exiting.\r\n" +MSG.DEV.OK .AZ "TCPIPD:Bound To Device : %s\r\n" +MSG.CFG .AZ "TCPIPD:Reading %s..." +MSG.CFG.KO .AZ "Failed!!! [%h]\r\n" +MSG.CFG.OK .AZ "OK.\r\n" *-------------------------------------- -HOSTNAME >CSTR "${A2OSX}ETC/HOSTNAME" -TCPIP.CONF >CSTR "${A2OSX}ETC/TCPIP.CONF" -HOSTS >CSTR "${A2OSX}ETC/HOSTS" +HOSTNAME .AZ "${A2OSX}ETC/HOSTNAME" +TCPIP.CONF .AZ "${A2OSX}ETC/TCPIP.CONF" +HOSTS .AZ "${A2OSX}ETC/HOSTS" DefaultHostName >PSTR "a2osx-XXXX" CFG.Keywords >PSTR "DOMAIN" >PSTR "IP" diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt index f6f681d1..abafe713 100644 --- a/SBIN/TELNETD.S.txt +++ b/SBIN/TELNETD.S.txt @@ -268,13 +268,13 @@ Wait.TimeOut sec CS.END *-------------------------------------- LIBTCPIP >PSTR "libtcpip.o" -MSG.TCPWAIT >CSTR "TELNETD:Waiting for TCP/IP initializing...\r\n" -MSG.INITOK >CSTR "TELNETD:Init Ok, Listening.\r\n" -MSG.TCPIPERR >CSTR "TELNETD:TCP/IP Not initialized properly\r\n" -MSG.SKTERR >CSTR "TELNETD:Listen Error\r\n" -MSG.ABORT >CSTR "TELNETD:User Aborted\r\n" -MSG.INCOMING >CSTR "TELNETD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n" -MSG.BYTE >CSTR "[%h]" +MSG.TCPWAIT .AZ "TELNETD:Waiting for TCP/IP initializing...\r\n" +MSG.INITOK .AZ "TELNETD:Init Ok, Listening.\r\n" +MSG.TCPIPERR .AZ "TELNETD:TCP/IP Not initialized properly\r\n" +MSG.SKTERR .AZ "TELNETD:Listen Error\r\n" +MSG.ABORT .AZ "TELNETD:User Aborted\r\n" +MSG.INCOMING .AZ "TELNETD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n" +MSG.BYTE .AZ "[%h]" hLIBTCPIP .BS 1 *-------------------------------------- Socket .DA #S.SOCKET.SOCK.STREAM diff --git a/SYS/KERNEL.S.CORE.txt b/SYS/KERNEL.S.CORE.txt index 3fd45852..9ed33980 100644 --- a/SYS/KERNEL.S.CORE.txt +++ b/SYS/KERNEL.S.CORE.txt @@ -38,7 +38,8 @@ CORE.Run lda CORE.PSCount and #$FF^S.PS.F.SLEEP unmark as SLEEP sta (pPS) - jsr CORE.PSResume Restore PC....and JMP to + jsr CORE.Resume Restore PC....and JMP to + bcc .7 bcs .5 @@ -438,34 +439,92 @@ CORE.PSLeave ldy #S.PS.ZP+ZPBIN.SIZE-1 rts *-------------------------------------- -CORE.Sleep pla get PC LO - sec - sbc pCode - ldy #S.PS.PC +CORE.Sleep php + phy + ldy #S.PS.A + sta (pPs),y + + txa + iny #S.PS.X + sta (pPs),y + + pla + iny #S.PS.Y + sta (pPs),y + + pla + iny #S.PS.P + sta (pPs),y + + pla get PC LO + iny #S.PS.PC sta (pPs),y pla get PC HI - sbc pCode+1 - iny + iny #S.PS.PC+1 sta (pPs),y - lda (pPs) + iny #S.PS.S + tsx + + inx + inx + inx + txa + sta (pPs),y + + beq .8 + +.1 pla + >PUSHA + inx + bne .1 + +.8 lda (pPs) ora #S.PS.F.SLEEP sta (pPs) - clc + + + clc exit to kernel with CC rts *-------------------------------------- -CORE.PSResume ldy #S.PS.PC +CORE.Resume ldy #S.PS.S lda (pPs),y - sec Advance PC by one as it was saved by a JSR - adc pCode setup by PS.Select - sta .8+1 - iny + beq .2 + + tax + +.1 >PULLA + pha + inx + bne .1 + +.2 dey #S.PS.PC+1 lda (pPs),y - adc pCode+1 - sta .8+2 - -.8 jmp $FFFF + pha + + dey #S.PS.PC + lda (pPs),y + pha + + dey #S.PS.P + lda (pPs),y + pha + + dey #S.PS.Y + lda (pPs),y + pha + + dey #S.PS.X + lda (pPs),y + tax + + dey #S.PS.A + lda (pPs),y + + ply + plp + rts *-------------------------------------- TSKMGR.EVENTCNT .BS 1 *-------------------------------------- diff --git a/SYS/KERNEL.S.IRQ.txt b/SYS/KERNEL.S.IRQ.txt index 4d81db6a..87d682f4 100644 --- a/SYS/KERNEL.S.IRQ.txt +++ b/SYS/KERNEL.S.IRQ.txt @@ -13,7 +13,9 @@ AUTO 4,1 *-------------------------------------- MSLOT .EQ $7f8 *-------------------------------------- -K.IrqHAuxLC sta K.IrqHAuxLC.6+1 +K.IrqHAuxLC cld + + sta K.IrqHAuxLC.6+1 pla pha and #$10 BRK? @@ -63,6 +65,28 @@ K.IrqHAuxLC.3 pla sta $ff pla sta $fe + bvc K.IrqHAuxLC.4 no task switching + + php + php make room for 2 additional bytes + php keep track of C + + tsx + + sec + + lda $104,x get RTI PC LO + sbc #1 back one byte, to make it a "RTS" return adddress + sta $104,x + bcs .1 + dec $105,x adjust RTI PC HI + +.1 lda #CORE.Sleep make a RTI like "jsr CORE.Sleep" + sta $102,x + lda /CORE.Sleep with RTS=PC IRQ-1 + sta $103,x + + plp K.IrqHAuxLC.4 ldy #$ff Self Modified K.IrqHAuxLC.5 ldx #$ff Self Modified @@ -107,14 +131,14 @@ K.IrqH.Switch inc IRQ.Tick bit A2osX.F A2osX.F.PMODE .EQ %01000000 bvc .8 - lda IRQ.InKernel + lda IRQ.InKernel keep V flag set bmi .8 - lda SYS.BASL0+37 - eor #$A0+'S + lda #$A0+'S + eor SYS.BASL0+37 sta SYS.BASL0+37 -.8 clc +.8 clc exit with V flag set rts *-------------------------------------- K.IrqH.DEV >LDYAI Dev.Table @@ -144,7 +168,8 @@ K.IrqH.DEV >LDYAI Dev.Table sec -.8 rts +.8 clv clear V (no task switching) + rts *-------------------------------------- K.IRQ.OldFFFE .BS 2 *-------------------------------------- diff --git a/SYS/KM.APPLETALK.S.txt b/SYS/KM.APPLETALK.S.txt index 3552d7a9..4491b480 100644 --- a/SYS/KM.APPLETALK.S.txt +++ b/SYS/KM.APPLETALK.S.txt @@ -128,16 +128,16 @@ GO.OLDMLI jmp $ffff *-------------------------------------- .INB /A2OSX.SRC/X.PRINTF.S *-------------------------------------- -MSG.INIT >CSTR "AppleTalk Driver For A2osX\n" -MSG.FAILED >CSTR "AppleTalk Workstation Card Failed Power Up Diagnostics : EC=%h.\n" -MSG.NOHW >CSTR "AppleTalk Workstation Card Not Found.\n" -MSG.HWOK >CSTR "AppleTalk Workstation Card Type #%d Found In Slot #%d.\n" -MSG.ATINIT >CSTR "Calling ATInit...\n" -MSG.IRQ >CSTR "Setting Up IRQ Vector...\n" -MSG.PREFIX1 >CSTR "Getting ProDOS Prefix...\n" -MSG.PREFIX2 >CSTR "Setting AppleTalk Prefix...\n" -MSG.OK >CSTR "AppleTalk Driver Successfully Installed.\n" -MSG.KO >CSTR "AppleTalk Driver Install Failed : EC=%h.\n" +MSG.INIT .AZ "AppleTalk Driver For A2osX\n" +MSG.FAILED .AZ "AppleTalk Workstation Card Failed Power Up Diagnostics : EC=%h.\n" +MSG.NOHW .AZ "AppleTalk Workstation Card Not Found.\n" +MSG.HWOK .AZ "AppleTalk Workstation Card Type #%d Found In Slot #%d.\n" +MSG.ATINIT .AZ "Calling ATInit...\n" +MSG.IRQ .AZ "Setting Up IRQ Vector...\n" +MSG.PREFIX1 .AZ "Getting ProDOS Prefix...\n" +MSG.PREFIX2 .AZ "Setting AppleTalk Prefix...\n" +MSG.OK .AZ "AppleTalk Driver Successfully Installed.\n" +MSG.KO .AZ "AppleTalk Driver Install Failed : EC=%h.\n" *-------------------------------------- SIG.ATLK .AS "ATLK" WC.Flag .BS 1 diff --git a/SYS/KM.NSC.S.txt b/SYS/KM.NSC.S.txt index ef53ef11..958e8eea 100644 --- a/SYS/KM.NSC.S.txt +++ b/SYS/KM.NSC.S.txt @@ -195,10 +195,10 @@ NSC.Print sta TmpPtr1 bne .1 .9 jmp CROUT *-------------------------------------- -NSC.MSG0 >CSTR "NSC ('No-Slot-Clock'/DS1216E) Driver For A2osX" -NSC.MSG1 >CSTR "A Clock Driver Is Already Installed." -NSC.MSG2 >CSTR "DS1216E Chip Not Detected." -NSC.MSG3 >CSTR "DS1216E Driver Successfully Installed." +NSC.MSG0 .AZ "NSC ('No-Slot-Clock'/DS1216E) Driver For A2osX" +NSC.MSG1 .AZ "A Clock Driver Is Already Installed." +NSC.MSG2 .AZ "DS1216E Chip Not Detected." +NSC.MSG3 .AZ "DS1216E Driver Successfully Installed." *-------------------------------------- * Driver For DS1216E *-------------------------------------- diff --git a/SYS/KM.RAMWORKS.S.txt b/SYS/KM.RAMWORKS.S.txt index 33e348f4..7a6e0658 100644 --- a/SYS/KM.RAMWORKS.S.txt +++ b/SYS/KM.RAMWORKS.S.txt @@ -381,14 +381,14 @@ RW.BLOCK2.END .EQ * *-------------------------------------- .INB /A2OSX.SRC/X.PRINTF.S *-------------------------------------- -RW.MSG >CSTR "RAMWorks (I,II,III,z-Ram) Driver For A2osX\n" -RW.MSG.OK >CSTR "/RAM3 Device Already Installed.\n" -RW.MSG.OK1 >CSTR "%D KB (%d Pages) Available for RamDrive.\n" -RW.MSG.KO1 >CSTR "Not Detected.\n" -RW.MSG.OK2 >CSTR "RamWorks Driver Installed.\n" -RW.MSG.KO2 >CSTR "RamWorks Driver Install Error.\n" -RW.MSG.OK3 >CSTR "RamWorks Drive Formatted as /RAM3.\n" -RW.MSG.KO3 >CSTR "RamWorks Drive Format Error.\n" +RW.MSG .AZ "RAMWorks (I,II,III,z-Ram) Driver For A2osX\n" +RW.MSG.OK .AZ "/RAM3 Device Already Installed.\n" +RW.MSG.OK1 .AZ "%D KB (%d Pages) Available for RamDrive.\n" +RW.MSG.KO1 .AZ "Not Detected.\n" +RW.MSG.OK2 .AZ "RamWorks Driver Installed.\n" +RW.MSG.KO2 .AZ "RamWorks Driver Install Error.\n" +RW.MSG.OK3 .AZ "RamWorks Drive Formatted as /RAM3.\n" +RW.MSG.KO3 .AZ "RamWorks Drive Format Error.\n" *-------------------------------------- * Driver for Ramworks in main LC * $FF00 -> $FF9A (Inclusive) diff --git a/SYS/KM.VSDRIVE.S.txt b/SYS/KM.VSDRIVE.S.txt index 02b82584..2d4253fa 100644 --- a/SYS/KM.VSDRIVE.S.txt +++ b/SYS/KM.VSDRIVE.S.txt @@ -314,15 +314,15 @@ VSDRIVE.Install ldx #PATCH.SIZE *-------------------------------------- DEVSIG.Offset .HS 05070B0C DEVSIG.Value .HS 38180131 -VSDRIVE.MSG0 >CSTR "VSDRIVE (ADTPro Vitual Serial HD) Driver For A2osX\n" -VSDRIVE.DRVKO >CSTR "VSDRIVE (Or other custom Driver) Already Installed.\n" -VSDRIVE.SSCKO >CSTR "SSC Not Detected.\n" -VSDRIVE.SSCOK >CSTR "SSC Found At Slot %d.\nContacting ADTPro Server..." -VSDRIVE.SRVKO >CSTR "No Response From ADTPro Server (EC=%d).\n" -VSDRIVE.SRVOK >CSTR "ADTPro Server Is Online.\n" -VSDRIVE.NOSLOT >CSTR "No ProDOS device slot available.\n" -VSDRIVE.DEVOK >CSTR "VSDRIVE Installed 2 devices at S%d,D1 & S%d,D2.\n" -VSDRIVE.OK >CSTR "VSDRIVE Driver Successfully Installed.\n" +VSDRIVE.MSG0 .AZ "VSDRIVE (ADTPro Vitual Serial HD) Driver For A2osX\n" +VSDRIVE.DRVKO .AZ "VSDRIVE (Or other custom Driver) Already Installed.\n" +VSDRIVE.SSCKO .AZ "SSC Not Detected.\n" +VSDRIVE.SSCOK .AZ "SSC Found At Slot %d.\nContacting ADTPro Server..." +VSDRIVE.SRVKO .AZ "No Response From ADTPro Server (EC=%d).\n" +VSDRIVE.SRVOK .AZ "ADTPro Server Is Online.\n" +VSDRIVE.NOSLOT .AZ "No ProDOS device slot available.\n" +VSDRIVE.DEVOK .AZ "VSDRIVE Installed 2 devices at S%d,D1 & S%d,D2.\n" +VSDRIVE.OK .AZ "VSDRIVE Driver Successfully Installed.\n" *-------------------------------------- * ProDOS $BE41->$BE4B Patch for switching to BANK2 (10 bytes) *--------------------------------------