CC: wired to libgui

SH: bugfix
BIN/*, DRV/*:bugfix, API change
This commit is contained in:
burniouf 2022-10-09 23:22:46 +02:00
parent 947764b71e
commit 127ebe266a
50 changed files with 731 additions and 696 deletions

Binary file not shown.

View File

@ -291,19 +291,19 @@ CS.QUIT lda hBuf
rts rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.NOATK .AZ "AppleTalk Not Loaded." MSG.NOATK .CZ "AppleTalk Not Loaded."
MSG.ATKERR .AZ "AppleTalk Call %h, ERR:%H\r\n" MSG.ATKERR .CZ "AppleTalk Call %h, ERR:%H\r\n"
MSG.GETINFO .AS "Network/Node:%H/%h\r\n" MSG.GETINFO .CS "Network/Node:%H/%h\r\n"
.AS "Bridge : %h\r\n" .CS "Bridge : %h\r\n"
.AZ "HWID/ROMVER :%H/%h\r\n" .CZ "HWID/ROMVER :%H/%h\r\n"
MSG.MYZONE .AZ "Zone Name :%S\r\n" MSG.MYZONE .CZ "Zone Name :%S\r\n"
SEARCH.STRING >PSTR "=" SEARCH.STRING .PS "="
>PSTR "=" .PS "="
>PSTR "*" .PS "*"
MSG.ZONES .AZ "Zone list :" MSG.ZONES .CZ "Zone list :"
MSG.PSTR .AZ " %S\r\n" MSG.PSTR .CZ " %S\r\n"
MSG.DUMP0 .AZ "Net Nod SkT En# Object:Type@Zone" MSG.DUMP0 .CZ "Net Nod SkT En# Object:Type@Zone"
MSG.DUMP .AZ "\e[?7l%H %h %h %h %S:%S@%S\r\n" MSG.DUMP .CZ "\e[?7l%H %h %h %h %S:%S@%S\r\n"
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0

View File

@ -511,34 +511,34 @@ CS.QUIT lda hReplyBuf
rts rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.USAGE .AZ "Usage : ATLOGON <SERVER> [USER] [PASSWORD]" MSG.USAGE .CZ "Usage : ATLOGON <SERVER> [USER] [PASSWORD]"
MSG.NOATK .AZ "AppleTalk Not Loaded." MSG.NOATK .CZ "AppleTalk Not Loaded."
MSG.ATKERR .AZ "AppleTalk Call %h, ERR:%H\r\n" MSG.ATKERR .CZ "AppleTalk Call %h, ERR:%H\r\n"
MSG.GETINFO .AS "Network/Node:%H/%h\r\n" MSG.GETINFO .CS "Network/Node:%H/%h\r\n"
.AS "Bridge : %h\r\n" .CS "Bridge : %h\r\n"
.AZ "HWID/ROMVER :%H/%h\r\n" .CZ "HWID/ROMVER :%H/%h\r\n"
MSG.NETNODPORT .AZ "Server Address : %H/%h:%h\r\n" MSG.NETNODPORT .CZ "Server Address : %H/%h:%h\r\n"
MSG.NOTFOUND .AZ "Server not found" MSG.NOTFOUND .CZ "Server not found"
MSG.SRVINFO1 .AS "Server Name : %S\r\n" MSG.SRVINFO1 .CS "Server Name : %S\r\n"
.AS "Server Type : %S\r\n" .CS "Server Type : %S\r\n"
.AZ "AFP Dialects :\r\n" .CZ "AFP Dialects :\r\n"
MSG.SRVINFO2 .AZ "Supported UAMs :" MSG.SRVINFO2 .CZ "Supported UAMs :"
MSG.PSTR .AZ " %S\r\n" MSG.PSTR .CZ " %S\r\n"
SEARCH.STRING >PSTR "AFPServer" SEARCH.STRING .PS "AFPServer"
>PSTR "*" .PS "*"
SEARCH.STRING.Len .EQ *-SEARCH.STRING SEARCH.STRING.Len .EQ *-SEARCH.STRING
*-------------------------------------- *--------------------------------------
FPLogin.Guest .DA #18 FPLogin.Guest .DA #18
* .DA #0 * .DA #0
>PSTR "AFPVersion 2.1" .PS "AFPVersion 2.1"
>PSTR "No User Authent" .PS "No User Authent"
FPLogin.Guest.Len .EQ *-FPLogin.Guest FPLogin.Guest.Len .EQ *-FPLogin.Guest
*-------------------------------------- *--------------------------------------
FPLogin.Auth .DA #18 FPLogin.Auth .DA #18
* .DA #0 * .DA #0
>PSTR "AFPVersion 2.1" .PS "AFPVersion 2.1"
>PSTR "Cleartxt Passwrd" .PS "Cleartxt Passwrd"
* >PSTR "username" * .PS "username"
* .AS "password" 8 bytes, word aligned, 0 padded * .AS "password" 8 bytes, word aligned, 0 padded
FPLogin.Auth.Len .EQ *-FPLogin.Auth FPLogin.Auth.Len .EQ *-FPLogin.Auth
*-------------------------------------- *--------------------------------------

View File

@ -61,8 +61,7 @@ L.ASCII .DA ASCII
CS.INIT clc CS.INIT clc
rts rts
*-------------------------------------- *--------------------------------------
CS.RUN CS.RUN inc ArgCount
.1 inc ArgCount
lda ArgCount lda ArgCount
>SYSCALL ArgV >SYSCALL ArgV
bcs .7 bcs .7
@ -75,8 +74,9 @@ CS.RUN
ldy #1 ldy #1
lda (ZPPtr1),y lda (ZPPtr1),y
beq .99
ldx #OptionList.Cnt-1 .1 ldx #OptionVars-OptionList-1
.2 cmp OptionList,x .2 cmp OptionList,x
beq .3 beq .3
@ -84,20 +84,24 @@ CS.RUN
dex dex
bpl .2 bpl .2
.99 >PUSHW L.MSG.USAGE .99 >LDYA L.MSG.USAGE
>PUSHBI 0 >SYSCALL PutS
>SYSCALL PrintF
lda #E.SYN lda #E.SYN
sec sec
.9 rts .9 rts
.3 ldy OptionVars,x .3 lda OptionVars,x
lda #$80 tax
sta 0,y * sec
bra .1 ror 0,x
iny
lda (ZPPtr1),y
bne .1
bra CS.RUN
.4 inc FileCount .4 inc FileCount
bra .1 scan for any other args bra CS.RUN scan for any other args
.7 lda FileCount .7 lda FileCount
beq .99 beq .99
@ -321,50 +325,49 @@ CS.DOEVENT sec
CS.END CS.END
*-------------------------------------- *--------------------------------------
OptionList .AS "ANSans" OptionList .AS "ANSans"
OptionList.Cnt .EQ *-OptionList
OptionVars .DA #bPrintAll,#bLineNum,#bSuppressBlankLine,#bPrintAll,#bLineNum,#bSuppressBlankLine OptionVars .DA #bPrintAll,#bLineNum,#bSuppressBlankLine,#bPrintAll,#bLineNum,#bSuppressBlankLine
*-------------------------------------- *--------------------------------------
MSG.USAGE .AS "Usage : CAT File1 [File2...]\r\n" MSG.USAGE .CS "Usage : CAT File1 [File2...]\r\n"
.AS " -A : Show All non printable characters\r\n" .CS " -A : Show All non printable characters\r\n"
.AS " -N : Number all output lines\r\n" .CS " -N : Number all output lines\r\n"
.AS " -S : Suppress repeated empty output lines" .CS " -S : Suppress repeated empty output lines"
MSG.CRLF .AZ "\r\n" MSG.CRLF .CZ "\r\n"
MSG.INIT .AZ "\e[?7h" Enable Line Wrap MSG.INIT .CZ "\e[?7h" Enable Line Wrap
MSG.LINENUM .AZ "%5D:" MSG.LINENUM .CZ "%5D:"
MSG.CTRLCHAR .AZ "[%S]" MSG.CTRLCHAR .CZ "[%S]"
*-------------------------------------- *--------------------------------------
ASCII >PSTR "NUL" ASCII .PS "NUL"
>PSTR "SOH" .PS "SOH"
>PSTR "STX" .PS "STX"
>PSTR "ETX" .PS "ETX"
>PSTR "EOT" .PS "EOT"
>PSTR "ENQ" .PS "ENQ"
>PSTR "ACK" .PS "ACK"
>PSTR "BEL" .PS "BEL"
>PSTR "BS" .PS "BS"
>PSTR "TAB" .PS "TAB"
>PSTR "LF" .PS "LF"
>PSTR "VT" .PS "VT"
>PSTR "FF" .PS "FF"
>PSTR "CR" .PS "CR"
>PSTR "SO" .PS "SO"
>PSTR "SI" .PS "SI"
>PSTR "DLE" .PS "DLE"
>PSTR "DC1" .PS "DC1"
>PSTR "DC2" .PS "DC2"
>PSTR "DC3" .PS "DC3"
>PSTR "DC4" .PS "DC4"
>PSTR "NAK" .PS "NAK"
>PSTR "SYN" .PS "SYN"
>PSTR "ETB" .PS "ETB"
>PSTR "CAN" .PS "CAN"
>PSTR "EM" .PS "EM"
>PSTR "SUB" .PS "SUB"
>PSTR "ESC" .PS "ESC"
>PSTR "FS" .PS "FS"
>PSTR "GS" .PS "GS"
>PSTR "RS" .PS "RS"
>PSTR "US" .PS "US"
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0

View File

@ -13,7 +13,7 @@ F.Decl stz LocalPtr
jsr SYM.NewScope jsr SYM.NewScope
bcs .99 bcs .99
jsr CORE.GetNCharNB Skip ( jsr CORE.GetNCharNBNL Skip (
bcs .9 bcs .9
cmp #')' func() cmp #')' func()

View File

@ -137,7 +137,11 @@ KW.WHILE jsr KW.BEGIN00
sec sec
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
KW.WHILE.END lda #'C' KW.WHILE.END >LDYA L.PCC.SLEEP
jsr CODE.EmitPCC
bcs .99
lda #'C'
jsr KW.GetLabel jsr KW.GetLabel
bcs .99 bcs .99

View File

@ -28,9 +28,9 @@ STMT.Get jsr CC.GetCharNB
pha pha
lda (ZPLookupSymPtr) lda (ZPLookupSymPtr)
pha pha
jsr SYM.LookupFree jsr SYM.LookupFree
ply ply
pla pla
@ -42,7 +42,7 @@ STMT.Get jsr CC.GetCharNB
lda (ZPLookupSymPtr),y lda (ZPLookupSymPtr),y
bit #SYM.Q.FUNC bit #SYM.Q.FUNC
beq .61 beq .61
bit StmtPreOp bit StmtPreOp
bpl .9 ++func ???????? bpl .9 ++func ????????
@ -178,7 +178,7 @@ CC.STMT.POP bne .98
jsr .7 jsr .7
bcs .99 bcs .99
bvs .1 DONT POP reused context (ELSE....) bvs .1 DONT POP reused context (ELSE....)
lda CStackPtr lda CStackPtr

View File

@ -82,9 +82,8 @@ CS.RUN lda #C.SPACE
.97 lda #E.SYN .97 lda #E.SYN
.98 pha .98 pha
>PUSHW L.MSG.USAGE >LDYA L.MSG.USAGE
>PUSHBI 0 >SYSCALL PutS
>SYSCALL PrintF
pla pla
sec sec
.9 rts .9 rts
@ -240,6 +239,7 @@ CS.RUN.OUT.MN ldy #0
lda (ZPBufPtr),y lda (ZPBufPtr),y
beq CS.RUN.PRINTCR beq CS.RUN.PRINTCR
iny iny
bra .1 bra .1
@ -284,6 +284,7 @@ CS.RUN.AddYToBufPtr
adc ZPBufPtr adc ZPBufPtr
sta ZPBufPtr sta ZPBufPtr
bcc .8 bcc .8
inc ZPBufPtr+1 inc ZPBufPtr+1
.8 rts .8 rts
*-------------------------------------- *--------------------------------------
@ -308,13 +309,13 @@ CS.END
OptionList .AS "HhFfMmNnSs" OptionList .AS "HhFfMmNnSs"
OptionList.Cnt .EQ *-OptionList OptionList.Cnt .EQ *-OptionList
*-------------------------------------- *--------------------------------------
MSG.USAGE .AS "Usage : CUT "line of text"\r\n" MSG.USAGE .CS "Usage : CUT "line of text"\r\n"
.AS " -H : This help screen\r\n" .CS " -H : This help screen\r\n"
.AS "-F nn : Output field nn\r\n" .CS " -F nn : Output field nn\r\n"
.AS "-M nn : Output starting at nn\r\n" .CS " -M nn : Output starting at nn\r\n"
.AS "-N nn : Output Ending at nn\r\n" .CS " -N nn : Output Ending at nn\r\n"
.AS "-S ch : Change default SPACE separator to 'ch'" .CS " -S ch : Change default SPACE separator to 'ch'"
MSG.CRLF .AZ "\r\n" MSG.CRLF .CZ "\r\n"
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0

View File

@ -1,13 +1,13 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF .LIST OFF
.OP 65C02 .OP 65C02
.OR $2000 .OR $2000
.TF bin/gtest .TF root/asmtest/gtest
*-------------------------------------- *--------------------------------------
.INB inc/macros.i .INB inc/macros.i
.INB inc/a2osx.i .INB inc/a2osx.i
.INB inc/kernel.i .INB inc/mli.i
.INB inc/gfx.i .INB inc/gfx.i
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
@ -78,14 +78,14 @@ CS.RUN jsr GFX.Open
lda CB.RECT2+S.CB.COLOR lda CB.RECT2+S.CB.COLOR
cmp #16 cmp #16
beq .3 beq .3
lda CB.RECT2+S.CB.X1 lda CB.RECT2+S.CB.X1
clc clc
adc #28 adc #28
sta CB.RECT2+S.CB.X1 sta CB.RECT2+S.CB.X1
bcc .2 bcc .2
inc CB.RECT2+S.CB.X1+1 inc CB.RECT2+S.CB.X1+1
.2 lda CB.RECT2+S.CB.X2 .2 lda CB.RECT2+S.CB.X2
clc clc
adc #28 adc #28
@ -93,7 +93,7 @@ CS.RUN jsr GFX.Open
bcc .1 bcc .1
inc CB.RECT2+S.CB.X2+1 inc CB.RECT2+S.CB.X2+1
bra .1 bra .1
.3 >LDYA L.CB.PIX .3 >LDYA L.CB.PIX
jsr GFX.Write.YA jsr GFX.Write.YA
@ -110,7 +110,7 @@ CS.RUN jsr GFX.Open
sta CB.TEXTB+S.CB.hFont sta CB.TEXTB+S.CB.hFont
>LDYA L.MESSAGEB >LDYA L.MESSAGEB
>STYA CB.TEXTB+S.CB.TxtPtr >STYA CB.TEXTB+S.CB.TxtPtr
>LDYA L.CB.TEXTB >LDYA L.CB.TEXTB
jsr GFX.Write.YA jsr GFX.Write.YA
bcs .9 bcs .9
@ -130,7 +130,7 @@ CS.RUN jsr GFX.Open
>LDYA L.CB.TEXT >LDYA L.CB.TEXT
jsr GFX.Write.YA jsr GFX.Write.YA
jsr CS.RUN.LOGO.SHOW jsr CS.RUN.LOGO.SHOW
lda #0 lda #0
@ -151,13 +151,13 @@ CS.RUN.LOGO.SHOW
lda #S.CB.CMD.BITBLT lda #S.CB.CMD.BITBLT
sta CB.LOGO+S.CB.CMD sta CB.LOGO+S.CB.CMD
.1 lda #S.CB.OP.SET+S.CB.OP.COLOR+S.CB.OP.SAVE .1 lda #S.CB.OP.SET+S.CB.OP.COLOR+S.CB.OP.SAVE
sta CB.LOGO+S.CB.OP sta CB.LOGO+S.CB.OP
>LDYA L.CB.LOGO >LDYA L.CB.LOGO
jsr GFX.Write.YA jsr GFX.Write.YA
ldy #S.PS.hStdIn ldy #S.PS.hStdIn
lda (pPS),y lda (pPS),y
@ -165,14 +165,14 @@ CS.RUN.LOGO.SHOW
bcs CS.RUN.RTS bcs CS.RUN.RTS
tay tay
beq .80 beq .80
.2 >SLEEP .2 >SLEEP
bit bVBL bit bVBL
bpl .2 bpl .2
stz bVBL stz bVBL
lda #S.CB.OP.RESTORE lda #S.CB.OP.RESTORE
sta CB.LOGO+S.CB.OP sta CB.LOGO+S.CB.OP
@ -181,12 +181,12 @@ CS.RUN.LOGO.SHOW
bit xDir bit xDir
bmi .4 bmi .4
lda CB.LOGO+S.CB.X1 lda CB.LOGO+S.CB.X1
clc clc
adc #4 adc #4
tay tay
lda CB.LOGO+S.CB.X1+1 lda CB.LOGO+S.CB.X1+1
adc #0 adc #0
pha pha
@ -194,7 +194,7 @@ CS.RUN.LOGO.SHOW
sbc /244 sbc /244
pla pla
bcc .5 bcc .5
.3 lda xDir .3 lda xDir
eor #$ff eor #$ff
sta xDir sta xDir
@ -207,14 +207,14 @@ CS.RUN.LOGO.SHOW
lda CB.LOGO+S.CB.X1+1 lda CB.LOGO+S.CB.X1+1
sbc #0 sbc #0
bcc .3 bcc .3
.5 sty CB.LOGO+S.CB.X1 .5 sty CB.LOGO+S.CB.X1
sta CB.LOGO+S.CB.X1+1 sta CB.LOGO+S.CB.X1+1
.6 lda CB.LOGO+S.CB.Y1 .6 lda CB.LOGO+S.CB.Y1
bit yDir bit yDir
bmi .8 bmi .8
inc inc
sta CB.LOGO+S.CB.Y1 sta CB.LOGO+S.CB.Y1
cmp #144 cmp #144
@ -224,12 +224,12 @@ CS.RUN.LOGO.SHOW
eor #$ff eor #$ff
sta yDir sta yDir
jmp .1 jmp .1
.8 sec .8 sec
sbc #1 sbc #1
sta CB.LOGO+S.CB.Y1 sta CB.LOGO+S.CB.Y1
beq .7 beq .7
jmp .1 jmp .1
.80 >SYSCALL GetChar .80 >SYSCALL GetChar
@ -266,7 +266,7 @@ CS.QUIT lda hFont
.4 lda CB.TEXTB+S.CB.SrcPtr .4 lda CB.TEXTB+S.CB.SrcPtr
beq .5 beq .5
>SYSCALL FreeStkObj >SYSCALL FreeStkObj
.5 lda CB.TEXT+S.CB.SrcPtr .5 lda CB.TEXT+S.CB.SrcPtr
beq .6 beq .6
>SYSCALL FreeStkObj >SYSCALL FreeStkObj
@ -274,7 +274,7 @@ CS.QUIT lda hFont
.6 lda CB.PALETTE+S.CB.SrcPtr .6 lda CB.PALETTE+S.CB.SrcPtr
beq .7 beq .7
>SYSCALL FreeStkObj >SYSCALL FreeStkObj
.7 lda hDevGFX .7 lda hDevGFX
beq .8 beq .8
@ -317,8 +317,8 @@ LoadResources >LDYA L.FONTFILE
bcs .9 bcs .9
stx CB.PALETTE+S.CB.SrcPtr stx CB.PALETTE+S.CB.SrcPtr
.9 rts .9 rts
.1 >PUSHYA .1 >PUSHYA
>PUSHBI O.RDONLY >PUSHBI O.RDONLY
@ -341,7 +341,7 @@ GFX.Write.YA pha
pla pla
>PUSHYA >PUSHYA
>SYSCALL IOCTL >SYSCALL IOCTL
rts rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
DEVNAME.GFX .AZ "/dev/gfx" DEVNAME.GFX .AZ "/dev/gfx"
@ -486,7 +486,7 @@ CB.LOGO .DA #S.CB.CMD.GETRECTBUFSIZE
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0
DS.START DS.START
DS.END .ED DS.END .ED
*-------------------------------------- *--------------------------------------
MAN MAN

View File

@ -13,6 +13,7 @@ NEW
.INB inc/eth.i .INB inc/eth.i
.INB inc/lib.net.i .INB inc/lib.net.i
.INB inc/libtcpip.i .INB inc/libtcpip.i
.INB inc/net.tcpip.i
.INB inc/net.dhcp.i .INB inc/net.dhcp.i
*-------------------------------------- *--------------------------------------
TIMEOUT.MAX .EQ 200 20 sec. TIMEOUT.MAX .EQ 200 20 sec.
@ -443,53 +444,53 @@ MSG.USAGE .AS "Usage : IPCONFIG <switches>\r\n"
*-------------------------------------- *--------------------------------------
MSG.NODEV .AZ "TCP/IP not bound to any device." MSG.NODEV .AZ "TCP/IP not bound to any device."
*-------------------------------------- *--------------------------------------
MSG1.DEV .AS "NIC Device Configuration :\r\n" MSG1.DEV .CS "NIC Device Configuration :\r\n"
.AS " Device ID : $%h\r\n" .CS " Device ID : $%h\r\n"
.AS " Device Name : %s\r\n" .CS " Device Name : %s\r\n"
.AS " Device Type : %S\r\n" .CS " Device Type : %S\r\n"
.AZ " HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" .CZ " HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n"
MSG1.DEV.ARP .AZ " ARP Offload : %d\r\n" MSG1.DEV.ARP .CZ " ARP Offload : %d\r\n"
MSG1.DEV.IP .AS " IP Offload : %d\r\n" MSG1.DEV.IP .CS " IP Offload : %d\r\n"
.AZ " Link Status : " .CZ " Link Status : "
MSG1.LINK.OK .AZ "OK" MSG1.LINK.OK .CZ "OK"
MSG1.LINK.KO .AZ "Media Disconnected" MSG1.LINK.KO .CZ "Media Disconnected"
MSG1.LINKSPEED .AZ " Link Speed : 1" MSG1.LINKSPEED .CZ " Link Speed : 1"
MSG1.DPLX.FD .AZ " Mbit/s,Full Duplex" MSG1.DPLX.FD .CZ " Mbit/s,Full Duplex"
MSG1.DPLX.HD .AZ " Mbit/s,Half Duplex" MSG1.DPLX.HD .CZ " Mbit/s,Half Duplex"
*-------------------------------------- *--------------------------------------
MSG2 .AZ "IP Configuration : " MSG2 .CZ "IP Configuration : "
MSG2.C .AZ "Configured" MSG2.C .CZ "Configured"
MSG2.U .AZ "Not Configured" MSG2.U .CZ "Not Configured"
MSG2.DHCPSRVR .AZ " DHCP Server : %d.%d.%d.%d\r\n" MSG2.DHCPSRVR .CZ " DHCP Server : %d.%d.%d.%d\r\n"
MSG2.IPMASK .AZ " IP/Mask : %d.%d.%d.%d/%d.%d.%d.%d\r\n" MSG2.IPMASK .CZ " IP/Mask : %d.%d.%d.%d/%d.%d.%d.%d\r\n"
MSG2.GW .AZ " Gateway : %d.%d.%d.%d\r\n" MSG2.GW .CZ " Gateway : %d.%d.%d.%d\r\n"
MSG2.DNS .AZ " DNS : %d.%d.%d.%d,%d.%d.%d.%d\r\n" MSG2.DNS .CZ " DNS : %d.%d.%d.%d,%d.%d.%d.%d\r\n"
MSG2.HOSTNAME .AZ " Hostname : %s.%s\r\n" MSG2.HOSTNAME .CZ " Hostname : %s.%s\r\n"
*-------------------------------------- *--------------------------------------
MSG.CFG .AZ "IPCONFIG:Reading %s..." MSG.CFG .CZ "IPCONFIG:Reading %s..."
MSG.CFG.KO .AZ "Not Found. [%h]\r\n" MSG.CFG.KO .CZ "Not Found. [%h]\r\n"
MSG.CFG.OK .AZ "OK." MSG.CFG.OK .CZ "OK."
*-------------------------------------- *--------------------------------------
HOSTNAME .AZ "${ROOT}etc/hostname" HOSTNAME .AZ "${ROOT}etc/hostname"
TCPIP.CONF .AZ "${ROOT}etc/tcpip.conf" TCPIP.CONF .AZ "${ROOT}etc/tcpip.conf"
HOSTS .AZ "${ROOT}etc/hosts" HOSTS .AZ "${ROOT}etc/hosts"
*-------------------------------------- *--------------------------------------
CFG.DefaultHost .AZ "a2osx-%H" CFG.DefaultHost .AZ "a2osx-%H"
CFG.Keywords >PSTR "address" CFG.Keywords .PS "address"
>PSTR "netmask" .PS "netmask"
>PSTR "gateway" .PS "gateway"
>PSTR "nameserver" .PS "nameserver"
>PSTR "dnsdomain" .PS "dnsdomain"
.DA #0 .DA #0
*-------------------------------------- *--------------------------------------
CFG.IP.SScanF .AZ "%d.%d.%d.%d" CFG.IP.SScanF .AZ "%d.%d.%d.%d"
CFG.HOST.SScanF .AZ "%d.%d.%d.%d %s %s" CFG.HOST.SScanF .AZ "%d.%d.%d.%d %s %s"
*-------------------------------------- *--------------------------------------
MSG.DHCP.CFG1 .AZ "IPCONFIG:Searching for DHCP servers..." MSG.DHCP.CFG1 .CZ "IPCONFIG:Searching for DHCP servers..."
MSG.DHCP.CFG2 .AZ "IPCONFIG:Reply from DHCP Server at %d.%d.%d.%d, requesting...\r\n" MSG.DHCP.CFG2 .CZ "IPCONFIG:Reply from DHCP Server at %d.%d.%d.%d, requesting...\r\n"
MSG.DHCP.KO .AZ "IPCONFIG:Time Out [%h].\r\n" MSG.DHCP.KO .CZ "IPCONFIG:Time Out [%h].\r\n"
MSG.DHCP.OK .AZ "IPCONFIG:Success:[IP=%d.%d.%d.%d/%d.%d.%d.%d]\r\n" MSG.DHCP.OK .CZ "IPCONFIG:Success:[IP=%d.%d.%d.%d/%d.%d.%d.%d]\r\n"
MSG.DHCP.NA .AZ "IPCONFIG:TCPIP Already configured, exiting." MSG.DHCP.NA .CZ "IPCONFIG:TCPIP Already configured, exiting."
*-------------------------------------- *--------------------------------------
IPCFG .BS S.IPCFG IPCFG .BS S.IPCFG
CFG.IP .BS 4 CFG.IP .BS 4

View File

@ -248,7 +248,7 @@ CS.QUIT clc
CS.END CS.END
MSG0 .CZ "hFD Type Name Addr Status Typ/Sub IDString Version Size (BLK)" MSG0 .CZ "hFD Type Name Addr Status Typ/Sub IDString Version Size (BLK)"
MSG.DEV .CZ "%3d %5s %12s %H " MSG.DEV .CZ "%3d %5s %12s %H "
MSG.DEV.ERR .CZ "Device Error : $%h\r\n" MSG.DEV.ERR .CZ "[%h] Device Error.\r\n"
MSG.DEV.DIB .CZ "%s $%h/$%h %16S %03d.%03d " MSG.DEV.DIB .CZ "%s $%h/$%h %16S %03d.%03d "
MSG.DEV.B .CZ "%10u\r\n" MSG.DEV.B .CZ "%10u\r\n"
MSG.DEV.C .CZ "n/a\r\n" MSG.DEV.C .CZ "n/a\r\n"

View File

@ -8,6 +8,7 @@ NEW
.INB inc/macros.i .INB inc/macros.i
.INB inc/a2osx.i .INB inc/a2osx.i
.INB inc/eth.i .INB inc/eth.i
.INB inc/net.tcpip.i
.INB inc/libtcpip.i .INB inc/libtcpip.i
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
@ -187,7 +188,7 @@ CS.END
LIBTCPIP .AZ "libtcpip" LIBTCPIP .AZ "libtcpip"
hLIBTCPIP .BS 1 hLIBTCPIP .BS 1
MSG0 .AZ "Type Prot Local Remote Options Status" MSG0 .AZ "Type Prot Local Remote Options Status"
MSG1 .AZ "%s %s %3d.%3d.%3d.%3d:%5D %3d.%3d.%3d.%3d:%5D %b %s\r\n" MSG1 .CZ "%s %s %3d.%3d.%3d.%3d:%5D %3d.%3d.%3d.%3d:%5D %b %s\r\n"
MSG1.T.RAW .AZ "RAW " MSG1.T.RAW .AZ "RAW "
MSG1.T.DGRAM .AZ "DGRAM " MSG1.T.DGRAM .AZ "DGRAM "
MSG1.T.SEQPKT .AZ "SEQPKT" MSG1.T.SEQPKT .AZ "SEQPKT"

View File

@ -1,6 +1,5 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF
*-------------------------------------- *--------------------------------------
CL.Init >LDYAI 256 CL.Init >LDYAI 256
>SYSCALL GetMem >SYSCALL GetMem
@ -18,9 +17,9 @@ CL.PrintPrompt >PUSHW L.PS1
bcs .9 bcs .9
phx phx
jsr PrintYANoCR jsr PrintYANoCR
pla pla
>SYSCALL FreeMem >SYSCALL FreeMem
@ -29,7 +28,7 @@ CL.PrintPrompt >PUSHW L.PS1
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
CL.READN0A tax CL.READN0A tax
CL.READN0X CL.READN0X
>PUSHW ZPCLBuf >PUSHW ZPCLBuf
>PUSHW L.FMT.Byte >PUSHW L.FMT.Byte
txa txa
@ -37,7 +36,7 @@ CL.READN0X
>PUSHBI 1 >PUSHBI 1
>SYSCALL SPrintF >SYSCALL SPrintF
bcs .9 bcs .9
lda #$ff lda #$ff
>STA.G CL.bReady >STA.G CL.bReady
* clc * clc
@ -67,10 +66,10 @@ CL.CHARIN tax
.2 >LDA.G CL.MaxCnt .2 >LDA.G CL.MaxCnt
bne .3 bne .3
lda EscChars.Remap,x lda EscChars.Remap,x
bra CL.READN0A bra CL.READN0A
.3 txa .3 txa
asl asl
tax tax
@ -86,7 +85,7 @@ CL.CHARIN tax
.5 >LDA.G CL.MaxCnt .5 >LDA.G CL.MaxCnt
beq CL.READN0X beq CL.READN0X
cpx #C.SPACE cpx #C.SPACE
bcc CL.CHARIN.CTRL bcc CL.CHARIN.CTRL
@ -118,7 +117,7 @@ CL.Insert >LDA.G CL.Len
>STA.G CL.Len >STA.G CL.Len
pha pha
.1 ply .1 ply
dey dey
lda (ZPCLBuf),y Move from Ptr To end of buffer forward... lda (ZPCLBuf),y Move from Ptr To end of buffer forward...
@ -175,10 +174,10 @@ CL.CHARIN.CTRL cpx #C.CR
.1 cpx #26 Ctrl-Z .1 cpx #26 Ctrl-Z
bne .8 bne .8
jmp CL.SUPPR jmp CL.SUPPR
.18 jsr CheckLFAfterCR Check for any extra LF .18 jsr CheckLFAfterCR Check for any extra LF
bcs .9 bcs .9
.19 lda #$ff .19 lda #$ff
>STA.G CL.bReady >STA.G CL.bReady
@ -189,7 +188,7 @@ CL.CLR >STZ.G HIS.Ptr
CL.CLR.1 lda (ZPCLBuf) CL.CLR.1 lda (ZPCLBuf)
beq CL.Reset.1 beq CL.Reset.1
>LDA.G CL.bSilent >LDA.G CL.bSilent
bmi CL.Reset bmi CL.Reset
@ -217,11 +216,11 @@ CL.CLR.1 lda (ZPCLBuf)
*-------------------------------------- *--------------------------------------
CL.Reset lda #0 CL.Reset lda #0
sta (ZPCLBuf) sta (ZPCLBuf)
CL.Reset.1 lda #0 CL.Reset.1 lda #0
ldy #CL.Ptr ldy #CL.Ptr
.1 sta (pData),y .1 sta (pData),y
iny iny
cpy #CL.bEscMode+1 cpy #CL.bEscMode+1
@ -264,7 +263,7 @@ CL.NAK >LDA.G CL.Ptr
bmi .9 bmi .9
lda #C.FS lda #C.FS
>SYSCALL PutChar >SYSCALL PutChar
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
@ -285,7 +284,7 @@ CL.DEL pha
iny iny
phy phy
tya tya
>CMP.G CL.Len >CMP.G CL.Len
bne .1 bne .1
@ -322,7 +321,7 @@ CL.PrintEOL >LDA.G CL.Ptr
pla pla
inc inc
bra .3 bra .3
.4 lda #C.BS .4 lda #C.BS
>SYSCALL PutChar >SYSCALL PutChar

View File

@ -1,13 +1,12 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF
*--------------------------------------
* https://linuxize.com/post/how-to-create-bash-aliases/
*-------------------------------------- *--------------------------------------
CMD.ALIAS lda (ZPArgVBufPtr) CMD.ALIAS lda (ZPArgVBufPtr)
bne CMD.ALIAS.ADD beq .10
>LDA.G hAliases jmp CMD.ALIAS.ADD
.10 >LDA.G hAliases
beq .8 beq .8
ldy #0 ldy #0
@ -15,29 +14,30 @@ CMD.ALIAS lda (ZPArgVBufPtr)
.1 >STYA ZPTmpW Save KeyID .1 >STYA ZPTmpW Save KeyID
clc >PUSHB.G hAliases
jsr CMD.ALIAS.Push >PUSHW ZPTmpW KeyID
>PUSHW ZPCLBuf
>SYSCALL SListGetByID >SYSCALL SListGetByID
bcs .8 bcs .8
>STYA ZPPtr1 NextID >STYA ZPPtr1 NextID
>LDYA ZPCLBuf ldy #hAliases
jsr PrintYANoCR jsr CORE.SListGetData
bcs .9 bcs .9
sec phx
jsr CMD.ALIAS.Push
>SYSCALL SListGetData
bcs .9
>PUSHW L.MSG.ALIAS >PUSHW L.MSG.ALIAS
>PUSHW ZPCLBuf >PUSHW ZPCLBuf
>PUSHBI 2 txa
>SYSCALL GetMemPtr
>PUSHYA
>PUSHBI 4
>SYSCALL PrintF >SYSCALL PrintF
bcs .9
pla
>SYSCALL FreeMem
>LDYA ZPPtr1 >LDYA ZPPtr1
bra .1 bra .1
@ -85,16 +85,6 @@ CMD.ALIAS.ADD >LDYA ZPArgVBufPtr
sec sec
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
CMD.ALIAS.Push >PUSHB.G hAliases
>PUSHW ZPTmpW KeyID
>PUSHW ZPCLBuf
bcc .8
>PUSHWI $ffff All
>PUSHWZ from Start
.8 rts
*--------------------------------------
CMD.. lda (ZPArgVBufPtr) CMD.. lda (ZPArgVBufPtr)
beq CMD...9 beq CMD...9
@ -273,7 +263,7 @@ CMD.SET.1
eor bState eor bState
sta bState sta bState
bra .5 bra .5
.3 dex .3 dex
bpl .2 bpl .2
@ -714,13 +704,8 @@ CMD.CALL jsr CMD.CALL.GETFUNC
>STYA ZPTmpW KeyID >STYA ZPTmpW KeyID
>PUSHB.G hFunctions ldy #hFunctions
>PUSHW ZPTmpW KeyID jsr CORE.SListGetData
>PUSHWZ Allocate..
>PUSHWI $ffff all
>PUSHWZ From Start
>SYSCALL SListGetData X = hMem
bcs CMD.CALL.RTS bcs CMD.CALL.RTS
>LDYA ZPArgVBufPtr FUNC PARAM1 PARAM2... >LDYA ZPArgVBufPtr FUNC PARAM1 PARAM2...
@ -771,7 +756,7 @@ CMD.EXIT lda (ZPArgVBufPtr)
.8 jsr CMD.EXIT.FILE .8 jsr CMD.EXIT.FILE
lda #bState.ExitOnEOF lda #bState.ExitOnEOF
tsb bState tsb bState
clc clc
.9 rts .9 rts
*-------------------------------------- *--------------------------------------

View File

@ -1,6 +1,5 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF
*-------------------------------------- *--------------------------------------
CORE.Init lda #PUSHD.STACK CORE.Init lda #PUSHD.STACK
tay tay
@ -20,8 +19,8 @@ CORE.FUNCRESET >LDA.G hFunctions
.8 rts .8 rts
*-------------------------------------- *--------------------------------------
* stack-6,7 InputBuf * stack-6,7 old InputBuf
* stack-4,5 InputBufPtr * stack-4,5 old InputBufPtr
* stack-3 old ARGC * stack-3 old ARGC
* stack-2 old ARGV * stack-2 old ARGV
* stack-1 new hCode * stack-1 new hCode
@ -131,7 +130,8 @@ CORE.Run jsr IO.Reset
txa txa
>STA.G CORE.hArgVBuf >STA.G CORE.hArgVBuf
>STZ.G CORE.bPipeIn lda #bState.PipeIn
trb bState
CORE.Run.1 >LDYA ZPInputBufPtr Save Actual ptr for looping CORE.Run.1 >LDYA ZPInputBufPtr Save Actual ptr for looping
>STYA ZPInputCmdPtr >STYA ZPInputCmdPtr
@ -178,13 +178,8 @@ CORE.Run.3 >LDA.G hAliases
txa txa
jsr CORE.SkipCharsA jsr CORE.SkipCharsA
>PUSHB.G hAliases ldy #hAliases
>PUSHW ZPTmpW KeyID jsr CORE.SListGetData
>PUSHWZ Allocate..
>PUSHWI $ffff all
>PUSHWZ From Start
>SYSCALL SListGetData X = hMem
bcs .9 bcs .9
jsr CORE.PushBufX jsr CORE.PushBufX
@ -236,7 +231,7 @@ CORE.Run.4 >LDYA L.CMD internal command ?
jmp CORE.Run.Exit jmp CORE.Run.Exit
*-------------------------------------- *--------------------------------------
CORE.Run.5 jsr CORE.GetCharNB CORE.Run.5 jsr CORE.GetCharNB
bcs CORE.Run.NOPIPE Nothing to skip bcs .8 Nothing to skip
jsr CORE.IsEndCmd jsr CORE.IsEndCmd
bcc .3 bcc .3
@ -264,56 +259,57 @@ CORE.Run.5 jsr CORE.GetCharNB
cmp #';' cmp #';'
beq .7 beq .7
cmp #'|' cmp #'|'
bne .5 bne .5
jsr CORE.GetNextCharNB '|' jsr CORE.GetNextCharNB '|'
bra CORE.Run.PIPE
lda #bState.PipeOut
tsb bState
bra CORE.Run.6
.5 cmp #'&' .5 cmp #'&'
bne .9 bne .9
jsr CORE.GetNextChar Skip '&' jsr CORE.GetNextChar Skip '&'
bcs .50 bcs .50
cmp #'&' cmp #'&'
beq .6 && beq .6 &&
.50 lda #S.PS.F.HOLD Run in the background... .50 lda #S.PS.F.HOLD Run in the background...
trb CORE.PSFlags trb CORE.PSFlags
bra CORE.Run.NOPIPE bra .8
.6 jsr CORE.GetNextChar Skip '&&' .6 jsr CORE.GetNextChar Skip '&&'
jsr CORE.ExecCmd jsr CORE.ExecCmd
bcc .60 bcc .60
jsr CORE.SkipLine jsr CORE.SkipLine
clc clc
lda #0 lda #0
jmp CORE.Run.Exit jmp CORE.Run.Exit
.60 jmp CORE.Run.1 .60 jmp CORE.Run.1
.7 jsr CORE.GetNextCharNB Skip EoL char .7 jsr CORE.GetNextCharNB Skip EoL char
.8 bra CORE.Run.NOPIPE .8 lda #bState.PipeOut
trb bState
*-------------------------------------- *--------------------------------------
CORE.Run.NOPIPE clc no pipe CORE.Run.6 lda bState
.HS B0 BCS bit #bState.PipeIn
CORE.Run.PIPE sec beq .1
ror
>STA.G CORE.bPipeOut
>LDA.G CORE.bPipeIn
bpl .1
jsr IO.Pipe.In jsr IO.Pipe.In
bcs CORE.Run.Exit bcs CORE.Run.Exit
.1 >LDA.G CORE.bPipeOut lda bState
bpl .7
.1 bit #bState.PipeOut
beq .7
jsr IO.Pipe.Out jsr IO.Pipe.Out
bcs CORE.Run.Exit bcs CORE.Run.Exit
@ -335,8 +331,9 @@ CORE.Run.PIPE sec
jsr IO.Reset.OutC restore Output, NO close if EXTERNAL jsr IO.Reset.OutC restore Output, NO close if EXTERNAL
>LDA.G CORE.bPipeIn lda bState
bpl .6 and #bState.PipeIn
beq .6
jsr IO.Pop.In restore Input jsr IO.Pop.In restore Input
@ -344,8 +341,8 @@ CORE.Run.PIPE sec
plp plp
bcs CORE.Run.Exit bcs CORE.Run.Exit
lda #$FF lda #bState.PipeIn
>STA.G CORE.bPipeIn tsb bState
jmp CORE.Run.1 Loop with Pipe IN jmp CORE.Run.1 Loop with Pipe IN
@ -389,8 +386,9 @@ CORE.ExecExtCmd >PUSHW ZPArgVBuf
and #S.PS.F.HOLD and #S.PS.F.HOLD
bne .4 bne .4
>LDA.G CORE.bPipeOut lda bState
bmi .4 bit #bState.PipeOut
bne .4
ldy #S.PS.hStdErr ldy #S.PS.hStdErr
lda (pPS),y lda (pPS),y
@ -725,11 +723,11 @@ CORE.PushBufX >LDA.G CODE.STACK
ldx #0 ldx #0
.1 lda ZPInputBuf,x .1 lda ZPInputBuf,x ZPInputBuf
sta (pData),y sta (pData),y
inx inx ZPInputBufPtr
iny iny
cpx #6 cpx #6 ZPInputCmdPtr
bne .1 bne .1
pla pla
@ -766,11 +764,11 @@ CORE.PopBuf phy
ldx #5 ldx #5
dey dey
.1 lda (pData),y .1 lda (pData),y ZPInputBuf
sta ZPInputBuf,x sta ZPInputBuf,x
dey dey ZPInputBufPtr
dex dex
bpl .1 bpl .1 ZPInputCmdPtr
tya tya
>STA.G CODE.STACK >STA.G CODE.STACK
@ -786,6 +784,15 @@ CORE.PopBuf phy
* sec * sec
rts rts
*-------------------------------------- *--------------------------------------
CORE.SListGetData
>PUSHB (pData),y
>PUSHW ZPTmpW KeyID
>PUSHWZ Allocate
>PUSHWI $ffff All
>PUSHWZ from Start
>SYSCALL SListGetData X = hMem
rts
*--------------------------------------
* Stack * Stack
*-------------------------------------- *--------------------------------------
CORE.StkPopCtx jsr CORE.StkPull CORE.StkPopCtx jsr CORE.StkPull

View File

@ -1,6 +1,5 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF
*-------------------------------------- *--------------------------------------
EXP.GET jsr CORE.ArgV.Next EXP.GET jsr CORE.ArgV.Next
bne .1 bne .1

View File

@ -1,6 +1,5 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF
*-------------------------------------- *--------------------------------------
HIS.Init >LDYAI HISBUF.MAX Get a buffer for History HIS.Init >LDYAI HISBUF.MAX Get a buffer for History
@ -17,7 +16,7 @@ HIS.Init >LDYAI HISBUF.MAX Get a buffer for History
*-------------------------------------- *--------------------------------------
HIS.Add >LDA.G HIS.hBuf HIS.Add >LDA.G HIS.hBuf
beq .9 beq .9
>LDA.G HIS.Count >LDA.G HIS.Count
cmp #HISCNT.MAX cmp #HISCNT.MAX
bcs .1 bcs .1
@ -45,10 +44,10 @@ HIS.Add >LDA.G HIS.hBuf
*-------------------------------------- *--------------------------------------
HIS.Select >LDA.G HIS.Count HIS.Select >LDA.G HIS.Count
bne .10 bne .10
clc clc
.99 rts .99 rts
.10 jsr CL.Reset .10 jsr CL.Reset
ldx #0 ldx #0
@ -80,7 +79,7 @@ HIS.Select >LDA.G HIS.Count
lda #0 lda #0
sta (ZPCLBuf) sta (ZPCLBuf)
ldy #HIS.Ptr ldy #HIS.Ptr
sta (ZPCLBuf),y sta (ZPCLBuf),y
@ -100,7 +99,7 @@ HIS.Select >LDA.G HIS.Count
.7 >LDYA L.MSG.HISROMPTCLR .7 >LDYA L.MSG.HISROMPTCLR
jsr PrintYANoCR jsr PrintYANoCR
bcs .9 bcs .9
jsr CL.PrintPrompt jsr CL.PrintPrompt
bcc HIS.GetToCL1 bcc HIS.GetToCL1
.9 .9
@ -119,7 +118,7 @@ HIS.GetPrev >LDA.G HIS.Count
bne .2 bne .2
>LDA.G HIS.Count >LDA.G HIS.Count
.2 bra HIS.GetToCL .2 bra HIS.GetToCL
*-------------------------------------- *--------------------------------------
HIS.GetNext >LDA.G HIS.Count HIS.GetNext >LDA.G HIS.Count
@ -153,7 +152,7 @@ HIS.GetToCL1 >LDA.G HIS.Ptr
>STA.G CL.Ptr >STA.G CL.Ptr
>STA.G CL.Len >STA.G CL.Len
>LDYA ZPCLBuf >LDYA ZPCLBuf
jmp PrintYANoCR jmp PrintYANoCR
@ -168,15 +167,15 @@ HIS.GetX >PUSHB.G HIS.hBuf
rts rts
*-------------------------------------- *--------------------------------------
HIS.NextY lda (pData),y HIS.NextY lda (pData),y
phy phy
>CMP.G HIS.Count >CMP.G HIS.Count
ply ply
bcc .1 bcc .1
lda #0 lda #0
.1 inc .1 inc
rts rts

View File

@ -1,6 +1,5 @@
NEW NEW
AUTO 3,1 AUTO 3,1
.LIST OFF
*-------------------------------------- *--------------------------------------
IO.Reset jsr IO.Reset.In IO.Reset jsr IO.Reset.In
jsr IO.Reset.Out jsr IO.Reset.Out
@ -32,7 +31,7 @@ IO.Set.In pha
sta (pPS),y sta (pPS),y
rts rts
*-------------------------------------- *--------------------------------------
IO.Pop.In clc IO.Pop.In clc
.HS B0 BCS .HS B0 BCS
*-------------------------------------- *--------------------------------------
@ -40,10 +39,10 @@ IO.Reset.In sec
>LDA.G IO.hIn >LDA.G IO.hIn
beq .8 beq .8
bcc .1 bcc .1
ldy #S.PS.hStdIn ldy #S.PS.hStdIn
jsr IO.Close.Y jsr IO.Close.Y
.1 ldy #S.PS.hStdIn .1 ldy #S.PS.hStdIn
sta (pPS),y sta (pPS),y
>STZ.G IO.hIn >STZ.G IO.hIn
@ -56,9 +55,9 @@ IO.Pipe.Out >PUSHEA.G IO.DEVFIFO
>SYSCALL MKFIFO >SYSCALL MKFIFO
bcs .9 bcs .9
jsr IO.Pipe.OpenW Open for OUTPUT jsr IO.Pipe.OpenW Open for OUTPUT
bcs .9 bcs .9
pha pha
ldy #S.PS.hStdOut ldy #S.PS.hStdOut
lda (pPS),y lda (pPS),y
@ -79,19 +78,19 @@ IO.Set.Out pha
sta (pPS),y sta (pPS),y
clc clc
rts rts
*-------------------------------------- *--------------------------------------
IO.Pop.Out clc IO.Pop.Out clc
.HS B0 BCS .HS B0 BCS
*-------------------------------------- *--------------------------------------
IO.Reset.Out sec IO.Reset.Out sec
IO.Reset.OutC >LDA.G IO.hOut IO.Reset.OutC >LDA.G IO.hOut
beq .8 beq .8
bcc .1 bcc .1
ldy #S.PS.hStdOut ldy #S.PS.hStdOut
jsr IO.Close.Y jsr IO.Close.Y
.1 ldy #S.PS.hStdOut .1 ldy #S.PS.hStdOut
sta (pPS),y sta (pPS),y
>STZ.G IO.hOut >STZ.G IO.hOut
@ -106,13 +105,13 @@ IO.Set.Err pha
ldy #S.PS.hStdErr ldy #S.PS.hStdErr
sta (pPS),y sta (pPS),y
rts rts
*-------------------------------------- *--------------------------------------
IO.Reset.Err >LDA.G IO.hErr IO.Reset.Err >LDA.G IO.hErr
beq .8 beq .8
ldy #S.PS.hStdErr ldy #S.PS.hStdErr
jsr IO.Close.Y jsr IO.Close.Y
ldy #S.PS.hStdErr ldy #S.PS.hStdErr
sta (pPS),y sta (pPS),y
>STZ.G IO.hErr >STZ.G IO.hErr
@ -145,11 +144,11 @@ IO.StatYA >PUSHYA
>PUSHW ZPCLBuf >PUSHW ZPCLBuf
>SYSCALL Stat >SYSCALL Stat
bcs .9 bcs .9
ldy #S.STAT.MODE+1 ldy #S.STAT.MODE+1
lda (ZPCLBuf),y lda (ZPCLBuf),y
and #$F0 and #$F0
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
IO.Exec >PUSHW ZPArgVBufPtr IO.Exec >PUSHW ZPArgVBufPtr
@ -223,11 +222,11 @@ IO.PrintBatchErrMsg
bne .5 bne .5
sta (ZPCLBuf),y sta (ZPCLBuf),y
.6 ldy #S.PS.hStdErr .6 ldy #S.PS.hStdErr
lda (pPS),y lda (pPS),y
>PUSHA >PUSHA
>PUSHW L.MSG.BATCHLINE >PUSHW L.MSG.BATCHLINE
>PUSHW ZPCLBuf >PUSHW ZPCLBuf
@ -260,20 +259,20 @@ IO.PrintErrMsg ldy #S.PS.RC
>PUSHA >PUSHA
>PUSHW ZPCLBuf >PUSHW ZPCLBuf
>SYSCALL GetErrMsg >SYSCALL GetErrMsg
.8 ldy #S.PS.hStdErr .8 ldy #S.PS.hStdErr
lda (pPS),y lda (pPS),y
>PUSHA >PUSHA
>PUSHW L.MSG.ERROR >PUSHW L.MSG.ERROR
ldy #S.PS.RC ldy #S.PS.RC
lda (pPS),y lda (pPS),y
>PUSHA >PUSHA
>PUSHW ZPCLBuf >PUSHW ZPCLBuf
>PUSHBI 3 >PUSHBI 3
>SYSCALL FPrintF >SYSCALL FPrintF

View File

@ -87,10 +87,9 @@ bState .BS 1
bState.ExitOnEOF .EQ %10000000 bState.ExitOnEOF .EQ %10000000
bState.Pause .EQ %01000000 bState.Pause .EQ %01000000
bState.PipeIn .EQ %00100000 bState.PipeIn .EQ %00100000
bState.PipeOut .EQ %00010000 bState.PipeOut .EQ %00010000
bState.AmpAmp .EQ %00001000
bState.SET.C .EQ %00000100 bState.SET.C .EQ %00000100
bState.SET.E .EQ %00000010 bState.SET.E .EQ %00000010
bState.SET.X .EQ %00000001 bState.SET.X .EQ %00000001
@ -488,7 +487,7 @@ CS.DOEVENT lda (pEvent)
*-------------------------------------- *--------------------------------------
CS.QUIT jsr CORE.FUNCRESET CS.QUIT jsr CORE.FUNCRESET
>LDA.G hFunctions >LDA.G hAliases
beq .10 beq .10
>SYSCALL SListFree >SYSCALL SListFree
@ -613,7 +612,7 @@ MSG.BATCHERR .CZ "%s^\r\nLine #%D:"
MSG.ERROR .CS "[$%h]:%s." MSG.ERROR .CS "[$%h]:%s."
MSG.ECHOCRLF .CZ "\r\n" MSG.ECHOCRLF .CZ "\r\n"
MSG.PID .CZ "PID=%d\r\n" MSG.PID .CZ "PID=%d\r\n"
MSG.ALIAS .CZ ' = "%s"\r\n' MSG.ALIAS .CZ '%s = "%s"\r\n'
*-------------------------------------- *--------------------------------------
FMT.DATE .AZ "%A, %B %d %Y %H:%M:%S" FMT.DATE .AZ "%A, %B %d %Y %H:%M:%S"
FMT.Long .AZ "%L" FMT.Long .AZ "%L"
@ -741,9 +740,6 @@ CL.bEscMode .BS 1
CL.MaxCnt .BS 1 CL.MaxCnt .BS 1
CL.bSilent .BS 1 CL.bSilent .BS 1
CORE.bPipeIn .BS 1
CORE.bPipeOut .BS 1
HIS.hBuf .BS 1 HIS.hBuf .BS 1
HIS.Count .BS 1 HIS.Count .BS 1
HIS.Ptr .BS 1 HIS.Ptr .BS 1

View File

@ -138,9 +138,8 @@ CS.RUN lda #DEFAULT.TIMEOUT
sec sec
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
.9 >PUSHW L.MSG.USAGE .9 >LDYA L.MSG.USAGE
>PUSHBI 0 >SYSCALL PutS
>SYSCALL PrintF
lda #E.SYN lda #E.SYN
sec sec
@ -400,13 +399,13 @@ CS.QUIT clc
rts rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.USAGE .AS "Usage : SHUTDOWN <NEXT.SYSTEM>\r\n" MSG.USAGE .CS "Usage : SHUTDOWN <NEXT.SYSTEM>\r\n"
.AS " -R : Restart System\r\n" .CS " -R : Restart System\r\n"
.AS " -T <seconds> : default to 60" .CS " -T <seconds> : default to 60"
MSG.CRLF .AZ "\r\n" MSG.CRLF .CZ "\r\n"
MSG.SHUTDOWN .AZ "\r\e[KSHUTDOWN:System will stop in %u seconds..." MSG.SHUTDOWN .CZ "\r\e[KSHUTDOWN:System will stop in %u seconds..."
MSG.PS .AZ "SHUTDOWN:Killing process %3d, %s\r\n" MSG.PS .CZ "SHUTDOWN:Killing process %3d, %s\r\n"
MSG.DEV .AZ "SHUTDOWN:Closing device %3d, %s\r\n" MSG.DEV .CZ "SHUTDOWN:Closing device %3d, %s\r\n"
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0

View File

@ -237,14 +237,14 @@ CS.QUIT clc
rts rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.SP.FOUND .AZ "Slot #%2d:DevId = %b, " MSG.SP.FOUND .CZ "Slot #%2d:DevId = %b, "
MSG.SP.OK .AS "Dev Count = %d\r\n" MSG.SP.OK .CS "Dev Count = %d\r\n"
.AZ " Status Typ/Sub IDString Version Size (BLK)\r\n" .CZ " Status Typ/Sub IDString Version Size (BLK)\r\n"
MSG.DEV .AZ " Dev #%2d:" MSG.DEV .CZ " Dev #%2d:"
MSG.DEV.DIB .AZ "%s $%h/$%h %16S %03d.%03d " MSG.DEV.DIB .CZ "%s $%h/$%h %16S %03d.%03d "
MSG.DEV.B .AZ "%10u\r\n" MSG.DEV.B .CZ "%10u\r\n"
MSG.DEV.C .AZ "n/a\r\n" MSG.DEV.C .CZ "n/a\r\n"
MSG.ERR .AZ "Error : $%h\r\n" MSG.ERR .CZ "Error : $%h\r\n"
*-------------------------------------- *--------------------------------------
MSG.SFLAGS .AS "bwrlneio" MSG.SFLAGS .AS "bwrlneio"
*-------------------------------------- *--------------------------------------
@ -253,7 +253,7 @@ SmartPort.SIG .HS 20000300
*-------------------------------------- *--------------------------------------
BLANK.DIB .DA #0 BLANK.DIB .DA #0
.BS 3 .BS 3
>PSTR "(No IDS String!)" .PS "(No IDS String!)"
.DA #0 .DA #0
.DA #0 .DA #0
.DA 0 .DA 0

View File

@ -83,6 +83,7 @@ CS.RUN.LOOP >SLEEP
lda hDev lda hDev
>SYSCALL FEOF >SYSCALL FEOF
bcs .9 bcs .9
tay tay
bne .1 EOF, no char bne .1 EOF, no char
@ -102,6 +103,7 @@ CS.RUN.LOOP >SLEEP
>SYSCALL FEOF >SYSCALL FEOF
bcs .9 bcs .9
tay tay
bne CS.RUN.LOOP EOF = true, no char from STDIN bne CS.RUN.LOOP EOF = true, no char from STDIN
@ -114,8 +116,8 @@ CS.RUN.LOOP >SLEEP
lda (ZPBufPtr) lda (ZPBufPtr)
eor #$14 Ctrl-T eor #$14 Ctrl-T
clc sec
beq .9 exit with A=0,CC beq .9 exit with A=0,CS
lda hDev lda hDev
jsr CS.Write jsr CS.Write
@ -159,7 +161,7 @@ CS.QUIT lda hDev
rts rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.USAGE .AZ "Usage : TERM device " MSG.USAGE .AZ "Usage : TERM device"
MSG.DEVOK .AZ "Connected (Exit key is Ctrl-T)" MSG.DEVOK .AZ "Connected (Exit key is Ctrl-T)"
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY

View File

@ -86,9 +86,8 @@ CS.RUN >LDYAI 256
sec sec
rts rts
.9 >PUSHW L.MSG.INV .9 >LDYA L.MSG.INV
>PUSHBI 0 >SYSCALL Puts
>SYSCALL PrintF
lda #E.IUSR lda #E.IUSR
sec sec
rts rts
@ -118,9 +117,8 @@ CS.RUN.CheckArg inc ArgIndex
dex dex
bpl .2 bpl .2
.9 >PUSHW L.MSG.USAGE .9 >LDYA L.MSG.USAGE
>PUSHBI 0 >SYSCALL PutS
>SYSCALL PrintF
lda #E.SYN lda #E.SYN
sec sec
rts rts
@ -186,6 +184,7 @@ CS.DOEVENT sec
*-------------------------------------- *--------------------------------------
CS.QUIT lda ZPhStr CS.QUIT lda ZPhStr
beq .8 beq .8
>SYSCALL FreeMem >SYSCALL FreeMem
.8 clc .8 clc
@ -198,10 +197,10 @@ OptionVars .DA #bDelete,#bDelete
*-------------------------------------- *--------------------------------------
* Initialized DATA * Initialized DATA
*-------------------------------------- *--------------------------------------
MSG.USAGE .AS "Usage : USERDEL username\r\n" MSG.USAGE .CS "Usage : USERDEL username\r\n"
.AZ " -r : Force remove files in home directory\r\n" .CZ " -r : Force remove files in home directory\r\n"
MSG.INV .AZ "Invalid username.\r\n" MSG.INV .CZ "Invalid username."
CMD.RM .AZ "${ROOT}BIN/RM -R -Q " CMD.RM .CZ "${ROOT}BIN/RM -R -Q "
*-------------------------------------- *--------------------------------------
* Per Process DATA segment * Per Process DATA segment
*-------------------------------------- *--------------------------------------

View File

@ -167,9 +167,8 @@ CS.RUN.CheckArgs
.97 lda #E.SYN .97 lda #E.SYN
.98 pha .98 pha
>PUSHW L.MSG.USAGE >LDYA L.MSG.USAGE
>PUSHBI 0 >SYSCALL PutS
>SYSCALL PrintF
pla pla
sec sec
rts rts
@ -252,10 +251,10 @@ CS.END
OptionList .AS "Hh" OptionList .AS "Hh"
OptionList.Cnt .EQ *-OptionList OptionList.Cnt .EQ *-OptionList
*-------------------------------------- *--------------------------------------
MSG.USAGE .AS "Usage : XARGS command <file>\r\n" MSG.USAGE .CS "Usage : XARGS command <file>\r\n"
.AS " or : CMD|XARGS command" .CS " or : CMD|XARGS command"
MSG.CRLF .AZ "\r\n" MSG.CRLF .CZ "\r\n"
CMD.SPC .AZ " " CMD.SPC .CZ " "
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0

View File

@ -630,11 +630,11 @@ LBUF.DATA .BS 81
*-------------------------------------- *--------------------------------------
DIB .DA #0 DIB .DA #0
.DA #0,#0,#0 .DA #0,#0,#0
>PSTR "Apple II DHGR" .PS "Apple II DHGR"
.BS 3 .BS 3
.DA #S.DIB.T.GFX .DA #S.DIB.T.GFX
.DA #0 .DA #0
.DA K.VER .DA #94,#00
*-------------------------------------- *--------------------------------------
DCB .DA #S.DCB.T.GFX DCB .DA #S.DCB.T.GFX
.BS 1 DEV.ID .BS 1 DEV.ID

View File

@ -44,7 +44,7 @@ L.MAC4 .DA DCB+S.DCB.NIC.MAC+4
L.MAC5 .DA DCB+S.DCB.NIC.MAC+5 L.MAC5 .DA DCB+S.DCB.NIC.MAC+5
.DA 0 End Of Reloc Table .DA 0 End Of Reloc Table
*-------------------------------------- *--------------------------------------
Dev.Detect >STYA ARGS Dev.Detect >STYA ZPArgPtr
>LDYA L.MSG.DETECT >LDYA L.MSG.DETECT
>SYSCALL PutS >SYSCALL PutS
@ -104,9 +104,7 @@ Dev.Detect >STYA ARGS
* clc * clc
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
Dev.ParseArgs >LDYA ARGS Dev.ParseArgs lda (ZPArgPtr)
>STYA ZPArgPtr
lda (ZPArgPtr)
bne .1 bne .1
lda A2osX.RANDOM16 lda A2osX.RANDOM16
@ -139,11 +137,10 @@ Dev.ParseArgs >LDYA ARGS
.8 rts .8 rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
ARGS .BS 2 MSG.DETECT .CZ "LanCeGS/SMSC91C96 Driver."
MSG.DETECT .AZ "LanCeGS/SMSC91C96 Driver." MSG.DETECT.OK .CZ "LanCeGS/SMSC91C96 Installed As Device : %s\r\n"
MSG.DETECT.OK .AZ "LanCeGS/SMSC91C96 Installed As Device : %s\r\n" MSG.DETECT.KO .CZ "Hardware Not Found."
MSG.DETECT.KO .AZ "Hardware Not Found." SSCANF.MAC .CZ "%h:%h:%h:%h:%h:%h"
SSCANF.MAC .AZ "%h:%h:%h:%h:%h:%h"
*-------------------------------------- *--------------------------------------
FD.DEV .DA #S.FD.T.CDEV FD.DEV .DA #S.FD.T.CDEV
.DA #0 HANDLER .DA #0 HANDLER
@ -541,7 +538,7 @@ DEVSLOTx0 .BS 1
*-------------------------------------- *--------------------------------------
DIB .DA #0 DIB .DA #0
.DA #0,#0,#0 size .DA #0,#0,#0 size
>PSTR "LanCEGS/L91C96" .PS "LanCEGS/L91C96"
.BS 2 .BS 2
.DA #S.DIB.T.NIC .DA #S.DIB.T.NIC
.BS 1 Subtype .BS 1 Subtype

View File

@ -9,8 +9,8 @@ NEW
.INB inc/a2osx.i .INB inc/a2osx.i
.INB inc/io.i .INB inc/io.i
.INB inc/mli.e.i .INB inc/mli.e.i
.INB inc/xy.i
.INB inc/xy.mouse.i .INB inc/xy.mouse.i
.INB inc/libgui.i
*-------------------------------------- *--------------------------------------
ZPSlotPtr .EQ ZPBIN ZPSlotPtr .EQ ZPBIN
*-------------------------------------- *--------------------------------------
@ -101,9 +101,9 @@ Dev.Detect >LDYA L.MSG.DETECT
.99 rts .99 rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.DETECT .AZ "Apple Mouse Driver." MSG.DETECT .CZ "Apple Mouse Driver."
MSG.DETECT.OK .AZ "Mouse Installed As Device : %s\r\n" MSG.DETECT.OK .CZ "Mouse Installed As Device : %s\r\n"
MSG.DETECT.KO .AZ "No Mouse Found." MSG.DETECT.KO .CZ "No Mouse Found."
DEVSIG.Offset .HS 05070B0CFB DEVSIG.Offset .HS 05070B0CFB
DEVSIG.Value .HS 38180120D6 DEVSIG.Value .HS 38180120D6
*-------------------------------------- *--------------------------------------
@ -240,7 +240,7 @@ READ >STYA ZPBufPtr NON STANDARD
and #MOUSESTSx.MOVED and #MOUSESTSx.MOVED
beq .1 beq .1
ldy #S.MOUSE.X1 ldy #S.XY.X1
lda MOUSEXLOx,x lda MOUSEXLOx,x
sta (ZPBufPtr),y sta (ZPBufPtr),y
@ -254,7 +254,7 @@ READ >STYA ZPBufPtr NON STANDARD
lda MOUSEYHIx,x lda MOUSEYHIx,x
sta (ZPBufPtr),y sta (ZPBufPtr),y
lda #S.MOUSE.S.MOVE lda #S.XY.S.MOVE
tsb READ.S+1 tsb READ.S+1
stz bDblClick Reset DblClick flag stz bDblClick Reset DblClick flag
@ -268,7 +268,7 @@ READ >STYA ZPBufPtr NON STANDARD
asl if CS, down & previously up asl if CS, down & previously up
bcc .2 bcc .2
lda #S.MOUSE.S.DOWN lda #S.XY.S.DOWN
tsb READ.S+1 button has been pressed, start drag... tsb READ.S+1 button has been pressed, start drag...
lda MOUSEXLOx,x lda MOUSEXLOx,x
@ -283,16 +283,16 @@ READ >STYA ZPBufPtr NON STANDARD
.2 lda READ.S+1 .2 lda READ.S+1
pha save move state pha save move state
ora #S.MOUSE.S.UP ora #S.XY.S.UP
sta READ.S+1 sta READ.S+1
pla get back move state pla get back move state
bne .4 no move...click! bne .4 no move...click!
lda #S.MOUSE.S.CLK lda #S.XY.S.CLK
bit bDblClick bit bDblClick
bpl .3 bpl .3
lda #S.MOUSE.S.DCLK lda #S.XY.S.DCLK
ldy #1 ldy #1
sty bDblClick sty bDblClick
@ -302,12 +302,12 @@ READ >STYA ZPBufPtr NON STANDARD
tsb READ.S+1 tsb READ.S+1
bra .8 bra .8
.4 lda #S.MOUSE.S.DRAGSTART .4 lda #S.XY.S.DRAGSTART
tsb READ.S+1 tsb READ.S+1
ldy #S.MOUSE.X2+3 ldy #S.XY.X2+3
.5 lda SrcDrag-S.MOUSE.X2,y .5 lda SrcDrag-S.XY.X2,y
sta (ZPBufPtr),y sta (ZPBufPtr),y
dey dey
bpl .5 bpl .5
@ -317,7 +317,7 @@ READ >STYA ZPBufPtr NON STANDARD
READ.S lda #$ff SELF MODIFIED READ.S lda #$ff SELF MODIFIED
beq .9 beq .9
ldy #S.MOUSE.S ldy #S.XY.S
sta (ZPBufPtr),y sta (ZPBufPtr),y
clc clc
rts rts
@ -360,11 +360,11 @@ SrcDrag .BS 4
*-------------------------------------- *--------------------------------------
DIB .DA #0 DIB .DA #0
.DA #0,#0,#0 .DA #0,#0,#0
>PSTR "Apple II Mouse" .PS "Apple II Mouse"
.BS 2 .BS 2
.DA #S.DIB.T.XY .DA #S.DIB.T.XY
.DA #0 .DA #0
.DA K.VER .DA #0,#94
*-------------------------------------- *--------------------------------------
DRV.END DRV.END
*-------------------------------------- *--------------------------------------

View File

@ -47,7 +47,7 @@ L.MAC4 .DA DCB+S.DCB.NIC.MAC+4
L.MAC5 .DA DCB+S.DCB.NIC.MAC+5 L.MAC5 .DA DCB+S.DCB.NIC.MAC+5
.DA 0 End Of Reloc Table .DA 0 End Of Reloc Table
*-------------------------------------- *--------------------------------------
Dev.Detect >STYA ARGS Dev.Detect >STYA ZPArgPtr
>LDYA L.MSG.DETECT >LDYA L.MSG.DETECT
>SYSCALL PutS >SYSCALL PutS
@ -131,9 +131,7 @@ Dev.Detect >STYA ARGS
* clc * clc
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
Dev.ParseArgs >LDYA ARGS Dev.ParseArgs lda (ZPArgPtr)
>STYA ZPArgPtr
lda (ZPArgPtr)
bne .1 bne .1
lda A2osX.RANDOM16 lda A2osX.RANDOM16
@ -168,10 +166,10 @@ Dev.ParseArgs >LDYA ARGS
*-------------------------------------- *--------------------------------------
CS.END CS.END
ARGS .BS 2 ARGS .BS 2
MSG.DETECT .AZ "UtherNet2/W5100 Driver (ARP/IP Offload)." MSG.DETECT .CZ "UtherNet2/W5100 Driver (ARP/IP Offload)."
MSG.DETECT.OK .AZ "UtherNet2/W5100 Installed As Device : %s\r\n" MSG.DETECT.OK .CZ "UtherNet2/W5100 Installed As Device : %s\r\n"
MSG.DETECT.KO .AZ "Hardware Not Found." MSG.DETECT.KO .CZ "Hardware Not Found."
SSCANF.MAC .AZ "%h:%h:%h:%h:%h:%h" SSCANF.MAC .CZ "%h:%h:%h:%h:%h:%h"
*-------------------------------------- *--------------------------------------
FD.DEV .DA #S.FD.T.CDEV FD.DEV .DA #S.FD.T.CDEV
.DA #0 HANDLER .DA #0 HANDLER
@ -889,7 +887,7 @@ DEVSLOTx0 .BS 1
*-------------------------------------- *--------------------------------------
DIB .DA #0 DIB .DA #0
.DA #0,#0,#0 size .DA #0,#0,#0 size
>PSTR "UtherNetII/W5100" .PS "UtherNetII/W5100"
.DA #S.DIB.T.NIC .DA #S.DIB.T.NIC
.BS 1 Subtype .BS 1 Subtype
.DA K.VER Version .DA K.VER Version

View File

@ -158,10 +158,10 @@ Dev.ParseArgs lda (ZPArgPtr)
.8 rts .8 rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
MSG.DETECT .AZ "UtherNet/CS8900A Driver." MSG.DETECT .CZ "UtherNet/CS8900A Driver."
MSG.DETECT.OK .AZ "UtherNet/CS8900A Installed As Device : %s\r\n" MSG.DETECT.OK .CZ "UtherNet/CS8900A Installed As Device : %s\r\n"
MSG.DETECT.KO .AZ "Hardware Not Found." MSG.DETECT.KO .CZ "Hardware Not Found."
SSCANF.MAC .AZ "%h:%h:%h:%h:%h:%h" SSCANF.MAC .CZ "%h:%h:%h:%h:%h:%h"
*-------------------------------------- *--------------------------------------
FD.DEV .DA #S.FD.T.CDEV FD.DEV .DA #S.FD.T.CDEV
.DA #0 HANDLER .DA #0 HANDLER
@ -530,7 +530,7 @@ DEVSLOTx0 .BS 1
*-------------------------------------- *--------------------------------------
DIB .DA #0 DIB .DA #0
.DA #0,#0,#0 size .DA #0,#0,#0 size
>PSTR "Uthernet/CS8900A" .PS "Uthernet/CS8900A"
.DA #S.DIB.T.NIC .DA #S.DIB.T.NIC
.BS 1 Subtype .BS 1 Subtype
.BS 2 Version .BS 2 Version

View File

@ -45,7 +45,7 @@ L.MAC4 .DA DCB+S.DCB.NIC.MAC+4
L.MAC5 .DA DCB+S.DCB.NIC.MAC+5 L.MAC5 .DA DCB+S.DCB.NIC.MAC+5
.DA 0 End Of Reloc Table .DA 0 End Of Reloc Table
*-------------------------------------- *--------------------------------------
Dev.Detect >STYA ARGS Dev.Detect >STYA ZPArgPtr
>LDYA L.MSG.DETECT >LDYA L.MSG.DETECT
>SYSCALL PutS >SYSCALL PutS
@ -129,9 +129,7 @@ Dev.Detect >STYA ARGS
* clc * clc
.9 rts .9 rts
*-------------------------------------- *--------------------------------------
Dev.ParseArgs >LDYA ARGS Dev.ParseArgs lda (ZPArgPtr)
>STYA ZPArgPtr
lda (ZPArgPtr)
bne .1 bne .1
lda A2osX.RANDOM16 lda A2osX.RANDOM16
@ -165,11 +163,10 @@ Dev.ParseArgs >LDYA ARGS
.8 rts .8 rts
*-------------------------------------- *--------------------------------------
CS.END CS.END
ARGS .BS 2 MSG.DETECT .CZ "UtherNet2/W5100 Driver."
MSG.DETECT .AZ "UtherNet2/W5100 Driver." MSG.DETECT.OK .CZ "UtherNet2/W5100 Installed As Device : %s\r\n"
MSG.DETECT.OK .AZ "UtherNet2/W5100 Installed As Device : %s\r\n" MSG.DETECT.KO .CZ "Hardware Not Found."
MSG.DETECT.KO .AZ "Hardware Not Found." SSCANF.MAC .CZ "%h:%h:%h:%h:%h:%h"
SSCANF.MAC .AZ "%h:%h:%h:%h:%h:%h"
*-------------------------------------- *--------------------------------------
FD.DEV .DA #S.FD.T.CDEV FD.DEV .DA #S.FD.T.CDEV
.DA #0 HANDLER .DA #0 HANDLER
@ -516,7 +513,7 @@ DEVSLOTx0 .BS 1
*-------------------------------------- *--------------------------------------
DIB .DA #0 DIB .DA #0
.DA #0,#0,#0 size .DA #0,#0,#0 size
>PSTR "UtherNetII/W5100" .PS "UtherNetII/W5100"
.DA #S.DIB.T.NIC .DA #S.DIB.T.NIC
.BS 1 Subtype .BS 1 Subtype
.DA K.VER Version .DA K.VER Version

View File

@ -11,9 +11,10 @@ LIBGUI.DrawLine .EQ 16
LIBGUI.OBJ.SetProp .EQ 18 LIBGUI.OBJ.SetProp .EQ 18
LIBGUI.OBJ.GetProp .EQ 20 LIBGUI.OBJ.GetProp .EQ 20
LIBGUI.WND.New .EQ 22 LIBGUI.WND.New .EQ 22
LIBJUI.WND.Destroy .EQ 24 LIBGUI.WND.Destroy .EQ 24
LIBGUI.WND.Show .EQ 26 LIBGUI.WND.Show .EQ 26
LIBGUI.WND.Paint .EQ 28 LIBGUI.WND.Paint .EQ 28
LIBGUI.GetMsg .EQ 30
*-------------------------------------- *--------------------------------------
C.BLACK .EQ 0 C.BLACK .EQ 0
C16.D.BLUE .EQ 1 C16.D.BLUE .EQ 1
@ -42,23 +43,34 @@ CUR.T.CROSS .EQ 12
CUR.T.TEXT .EQ 14 CUR.T.TEXT .EQ 14
CUR.T.WAIT .EQ 16 CUR.T.WAIT .EQ 16
*-------------------------------------- *--------------------------------------
S.MOUSE.X1 .EQ 0 S.MSG.T .EQ 0
S.MOUSE.Y1 .EQ 2 S.MSG.T.KEY .EQ 0
S.MOUSE.X2 .EQ 4 S.MSG.T.XY .EQ 2
S.MOUSE.Y2 .EQ 6 S.MSG.T.ID .EQ 4
S.MOUSE.S .EQ 8 S.MSG.T.WND .EQ 6
S.MOUSE.S.UP .EQ %00000001
S.MOUSE.S.DOWN .EQ %00000010
S.MOUSE.S.MOVE .EQ %00000100
S.MOUSE.S.DRAGSTART .EQ %00001000
S.MOUSE.S.DRAGEND .EQ %00010000
S.MOUSE.S.CLK .EQ %00100000
S.MOUSE.S.DCLK .EQ %01000000
S.MOUSE.KEYMOD .EQ 9
S.MOUSE.KEYMOD.OA .EQ %00000001
S.MOUSE.KEYMOD.CA .EQ %00000010
* *
S.MOUSE .EQ 10 S.MSG.KEYMOD .EQ 2
S.MSG.KEYMOD.OA .EQ %00000001
S.MSG.KEYMOD.CA .EQ %00000010
S.MSG.KEY .EQ 3
S.MSG.ID .EQ 4
S.MSG.WND .EQ 5
* S.MSG.T.XY
S.MSG.X1 .EQ 6
S.MSG.Y1 .EQ 8
S.MSG.X2 .EQ 10
S.MSG.Y2 .EQ 12
S.MSG.S .EQ 14
S.MSG.S.UP .EQ %00000001
S.MSG.S.DOWN .EQ %00000010
S.MSG.S.MOVE .EQ %00000100
S.MSG.S.DRAGSTART .EQ %00001000
S.MSG.S.DRAGEND .EQ %00010000
S.MSG.S.CLK .EQ %00100000
S.MSG.S.DCLK .EQ %01000000
*
*
S.MSG .EQ 16
*-------------------------------------- *--------------------------------------
S.POINT.X .EQ 0 S.POINT.X .EQ 0
S.POINT.Y .EQ 2 S.POINT.Y .EQ 2

23
INC/XY.I.txt Normal file
View File

@ -0,0 +1,23 @@
NEW
AUTO 3,1
*--------------------------------------
* XY pointing devices
*--------------------------------------
S.XY.X1 .EQ 0
S.XY.Y1 .EQ 2
S.XY.X2 .EQ 4
S.XY.Y2 .EQ 6
S.XY.S .EQ 8
S.XY.S.UP .EQ %00000001
S.XY.S.DOWN .EQ %00000010
S.XY.S.MOVE .EQ %00000100
S.XY.S.DRAGSTART .EQ %00001000
S.XY.S.DRAGEND .EQ %00010000
S.XY.S.CLK .EQ %00100000
S.XY.S.DCLK .EQ %01000000
*
*
S.XY .EQ 10
*--------------------------------------
MAN
SAVE inc/xy.i

60
INCLUDE/libgui.h.txt Normal file
View File

@ -0,0 +1,60 @@
NEW
AUTO 3,1
#define CUR_T_ARROW 0
#define CUR_T_MOVE 2
#define CUR_T_RESIZEX 4
#define CUR_T_RESIZEY 6
#define CUR_T_RESIZEXY1 8
#define CUR_T_RESIZEXY2 10
#define CUR_T_CROSS 12
#define CUR_T_TEXT 14
#define CUR_T_WAIT 16
#define WND_F_RESIZE 1
#define WND_F_MOVE 2
#define WND_F_CLOSE 4
#define WND_F_MIN 8
#define WND_F_MAX 16
#define WND_F_BORDER 32
#define WND_F_MODAL 64
#define WND_F_SYSMODAL 128
#define WND_S_HASTBAR 1
#define WND_S_HASMBAR 2
#define WND_S_HASSBAR 4
#define WND_S_MAXIMIZED 8
#define WND_S_MINIMIZED 16
#define WND_S_ACTIVE 64
#define WND_P_pTITLE 24
#define WND_P_pMBAR 26
#define WND_P_pSTATUS 28
typedef short int HWND;
struct _MSG_ {
short int type;
short int subt;
short int keymod;
short int key;
int x1;
int y1;
int x2;
int y2;
int s;
};
typedef struct _MSG_ MSG;
HWND guiNewWnd(short int,int,int,int,int);
void guiDestroyWnd(HWND);
void guiShowWnd(HWND);
void* guiSetProp(HWND,short int,void*);
void* guiGetProp(HWND,short int);
void GetMsg(MSG*);
MAN
TEXT include/libgui.h

28
LIB/LIBGUI.O.S.txt Normal file
View File

@ -0,0 +1,28 @@
NEW
AUTO 3,1
.LIST OFF
.OR $0
.TF lib/libgui.o
*--------------------------------------
.INB inc/libgui.i
*--------------------------------------
.PS "guiSetProp"
.DA #LIBGUI.OBJ.SetProp
.PS "guiGetProp"
.DA #LIBGUI.OBJ.GetProp
.PS "guiNewWnd"
.DA #LIBGUI.WND.New
.PS "guiDestroyWnd"
.DA #LIBGUI.WND.Destroy
.PS "guiShowWnd"
.DA #LIBGUI.WND.Show
.PS "GetMsg"
.DA #LIBGUI.GetMsg
.DA #0
*--------------------------------------
MAN
SAVE usr/src/lib/libgui.o.s
ASM

View File

@ -81,8 +81,8 @@ SetCursor.RTS rts
*-------------------------------------- *--------------------------------------
SetCursorPos >PULLW ZPPtr1 SetCursorPos >PULLW ZPPtr1
lda CUR.bVisible lda CUR.bVisible
bpl .1 bpl .1
jsr HideCursor.I jsr HideCursor.I
.1 ldy #S.POINT-1 .1 ldy #S.POINT-1

View File

@ -1,45 +1,82 @@
NEW NEW
AUTO 3,1 AUTO 3,1
*-------------------------------------- *--------------------------------------
EVT.GetMsg >PULLW ZPPtr1 EVT.GetMsg stz MSG+S.MSG.T
lda A2osX.ASCREEN GUI screen active ? lda A2osX.ASCREEN GUI screen active ?
cmp DCB.GFX+S.DCB.GFX.DEVID cmp DCB.GFX+S.DCB.GFX.DEVID
bne .9 no, exit.... beq .10
jmp .9 no, exit....
* sec .10 lda hDevMouse
beq .5
lda hDevMouse
beq .2
>PUSHA >PUSHA
>PUSHBI IOCTL.READ >PUSHBI IOCTL.READ
>PUSHW L.MouseData >PUSHW L.XY
>SYSCALL2 IOCTL >SYSCALL2 IOCTL
bcs .2 bcs .5
ldy #S.MOUSE-1 ldx #S.XY-1
ldy #S.MSG-1
.1 lda MouseData,y .1 lda XY,x
sta (ZPPtr1),y sta MSG,y
dey dey
dex
bpl .1 bpl .1
* clc lda #S.MSG.T.XY
sta MSG+S.MSG.T
.2 lda KBD lda XY+S.XY.S
bmi .3 bit #S.MSG.S.MOVE
beq .2
>PUSHW L.XY
jsr SetCursorPos
lda XY+S.XY.S
.2 bit #S.MSG.S.MOVE+S.MSG.S.CLK
beq .5
jsr MOU.CheckOverMenu
bcc .8
jsr MOU.CheckOverSysBut
bcc .8
jsr MOU.CheckOverWND
bcc .8
*--------------------------------------
.5 lda KBD
bpl .9
rts sta KBDSTROBE
.3 sta KBDSTROBE
and #$7F and #$7F
sta MSG+S.MSG.KEY
lda #S.MSG.T.KEY
sta MSG+S.MSG.T
.8 clc .8 >PULLW ZPPtr1 pS.MSG
ldy #S.MSG-1
.6 lda MSG,y
sta (ZPPtr1),y
dey
bpl .6
clc
rts rts
.9 sec .9 inc pStack discard pS.MSG
inc pStack
sec No User Msg
rts rts
*-------------------------------------- *--------------------------------------
MAN MAN

View File

@ -29,7 +29,7 @@ MBAR.New >LDYAI S.MBAR
clc clc
rts .99 rts
*-------------------------------------- *--------------------------------------
MBAR.Init >STYA ZPMENUPtr MBAR.Init >STYA ZPMENUPtr
>STYA ZPPtr1 >STYA ZPPtr1
@ -119,6 +119,18 @@ MBAR.Init >STYA ZPMENUPtr
.80 clc .80 clc
rts rts
*-------------------------------------- *--------------------------------------
* ZPWNDPtr parent WND
* MSG.X1, MSG.Y1
*--------------------------------------
MBAR.Enter
* >DEBUG
*--------------------------------------
MBAR.Leave
clc
rts
*--------------------------------------
MAN MAN
SAVE usr/src/lib/libgui.s.mbar SAVE usr/src/lib/libgui.s.mbar
LOAD usr/src/lib/libgui.s LOAD usr/src/lib/libgui.s

View File

@ -233,11 +233,16 @@ MENU.Enter jsr MENU.GetDX
.80 >LDYA L.WND.Screen .80 >LDYA L.WND.Screen
jmp DrawCBBufToYA jmp DrawCBBufToYA
.9 lda MouseData+S.MOUSE.S .9 lda MSG+S.MSG.S
bit #S.MOUSE.S.CLK bit #S.MSG.S.CLK
beq .90 beq .90
* >DEBUG lda #S.MSG.T.ID
sta MSG+S.MSG.T
ldy #S.MITEM.ID
lda (ZPPtr1),y
sta MSG+S.MSG.ID
jmp MENU.DestroyAll jmp MENU.DestroyAll

View File

@ -59,7 +59,7 @@ MOU.Quit lda hDevMouse
.8 clc .8 clc
rts rts
*-------------------------------------- *--------------------------------------
MOU.ReadMouse >PULLW ZPPtr1 MOU.ReadMouse >PULLW ZPPtr1 pS.XY
lda A2osX.ASCREEN GUI screen active ? lda A2osX.ASCREEN GUI screen active ?
cmp DCB.GFX+S.DCB.GFX.DEVID cmp DCB.GFX+S.DCB.GFX.DEVID
@ -70,32 +70,18 @@ MOU.ReadMouse >PULLW ZPPtr1
>PUSHA >PUSHA
>PUSHBI IOCTL.READ >PUSHBI IOCTL.READ
>PUSHW L.MouseData >PUSHW L.XY
>SYSCALL2 IOCTL >SYSCALL2 IOCTL
bcs .99 bcs .99
ldy #S.MOUSE-1 ldy #S.XY-1
.1 lda MouseData,y .1 lda XY,y
sta (ZPPtr1),y sta (ZPPtr1),y
dey dey
bpl .1 bpl .1
lda MouseData+S.MOUSE.S * clc
bit #S.MOUSE.S.MOVE+S.MOUSE.S.CLK
beq .8
jsr MOU.CheckOverMenu
bcc .8
jsr MOU.CheckOverSysBut
bcc .8
jsr MOU.CheckOverWND
bcc .8
.8 clc
rts rts
.9 sec .9 sec
@ -144,15 +130,17 @@ MOU.CheckOverSysBut
>LDYA L.RECT.SysBut >LDYA L.RECT.SysBut
jsr MOU.InRectYA jsr MOU.InRectYA
bcs .9 bcs .9
jmp SYSBUT.Enter jmp SYSBUT.Enter
.9 jsr SYSBUT.Leave .9 jsr SYSBUT.Leave
sec sec
MOU.CheckOverSysBut.RTS
rts rts
*-------------------------------------- *--------------------------------------
MOU.CheckOverWND MOU.CheckOverWND
ldx WND.Stack.Top ldx WND.Stack.Top
beq .9 beq MOU.CheckOverSysBut.RTS
.1 stx WND.Stack.Idx .1 stx WND.Stack.Idx
@ -179,18 +167,18 @@ MOU.CheckOverWND
jsr MOU.InRectYA jsr MOU.InRectYA
bcs .7 not over this WND bcs .7 not over this WND
lda MouseData+S.MOUSE.S lda MSG+S.MSG.S
bit #S.MOUSE.S.CLK bit #S.MSG.S.CLK
beq .22 beq .22
jsr WND.Bring2Front jsr WND.Bring2Front
.22 ldy #S.WND.TBarY2 .22 ldy #S.WND.TBarY2
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
cmp MouseData+S.MOUSE.Y1 cmp MSG+S.MSG.Y1
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sbc MouseData+S.MOUSE.Y1+1 sbc MSG+S.MSG.Y1+1
bcc .3 not in TBAR bcc .3 not in TBAR
@ -199,23 +187,23 @@ MOU.CheckOverWND
.3 iny #S.WND.MBarY2 .3 iny #S.WND.MBarY2
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
cmp MouseData+S.MOUSE.Y1 cmp MSG+S.MSG.Y1
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sbc MouseData+S.MOUSE.Y1+1 sbc MSG+S.MSG.Y1+1
bcc .4 not in MBAR bcc .4 not in MBAR
jsr MBAR.Enter
bra .5 bra .5
.4 iny #S.WND.SBarY1 .4 iny #S.WND.SBarY1
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
cmp MouseData+S.MOUSE.Y1 cmp MSG+S.MSG.Y1
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sbc MouseData+S.MOUSE.Y1+1 sbc MSG+S.MSG.Y1+1
bcs .6 not in SBAR bcs .6 not in SBAR
@ -250,13 +238,13 @@ MOU.ChkWNDBorders
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sec sec
sbc #1 sbc #1
eor MouseData+S.MOUSE.X1 eor MSG+S.MSG.X1
bne .1 bne .1
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sbc #0 sbc #0
eor MouseData+S.MOUSE.X1+1 eor MSG+S.MSG.X1+1
bne .1 bne .1
lda #CUR.T.RESIZEX lda #CUR.T.RESIZEX
@ -266,13 +254,13 @@ MOU.ChkWNDBorders
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sec sec
sbc #1 sbc #1
eor MouseData+S.MOUSE.Y1 eor MSG+S.MSG.Y1
bne .3 bne .3
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
sbc #0 sbc #0
eor MouseData+S.MOUSE.Y1+1 eor MSG+S.MSG.Y1+1
bne .3 bne .3
lda IY lda IY
@ -288,13 +276,13 @@ MOU.ChkWNDBorders
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
clc clc
adc #1 adc #1
eor MouseData+S.MOUSE.X2 eor MSG+S.MSG.X2
bne .5 bne .5
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
adc #0 adc #0
eor MouseData+S.MOUSE.X2+1 eor MSG+S.MSG.X2+1
bne .5 bne .5
lda IY lda IY
@ -310,13 +298,13 @@ MOU.ChkWNDBorders
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
clc clc
adc #1 adc #1
eor MouseData+S.MOUSE.Y2 eor MSG+S.MSG.Y2
bne .7 bne .7
iny iny
lda (ZPWNDPtr),y lda (ZPWNDPtr),y
adc #0 adc #0
eor MouseData+S.MOUSE.Y2+1 eor MSG+S.MSG.Y2+1
bne .7 bne .7
lda #CUR.T.RESIZEXY1 lda #CUR.T.RESIZEXY1
@ -332,38 +320,38 @@ MOU.InRectYA >STYA ZPRECTPtr
ldy #S.RECT.X1 ldy #S.RECT.X1
lda MouseData+S.MOUSE.X1 lda MSG+S.MSG.X1
cmp (ZPRECTPtr),y cmp (ZPRECTPtr),y
iny iny
lda MouseData+S.MOUSE.X1+1 lda MSG+S.MSG.X1+1
sbc (ZPRECTPtr),y sbc (ZPRECTPtr),y
bcc .9 bcc .9
iny #S.RECT.Y1 iny #S.RECT.Y1
lda MouseData+S.MOUSE.Y1 lda MSG+S.MSG.Y1
cmp (ZPRECTPtr),y cmp (ZPRECTPtr),y
iny iny
lda MouseData+S.MOUSE.Y1+1 lda MSG+S.MSG.Y1+1
sbc (ZPRECTPtr),y sbc (ZPRECTPtr),y
bcc .9 bcc .9
iny #S.RECT.X2 iny #S.RECT.X2
lda (ZPRECTPtr),y lda (ZPRECTPtr),y
cmp MouseData+S.MOUSE.X1 cmp MSG+S.MSG.X1
iny iny
lda (ZPRECTPtr),y lda (ZPRECTPtr),y
sbc MouseData+S.MOUSE.X1+1 sbc MSG+S.MSG.X1+1
bcc .9 bcc .9
iny #S.RECT.Y2 iny #S.RECT.Y2
lda (ZPRECTPtr),y lda (ZPRECTPtr),y
cmp MouseData+S.MOUSE.Y1 cmp MSG+S.MSG.Y1
iny iny
lda (ZPRECTPtr),y lda (ZPRECTPtr),y
sbc MouseData+S.MOUSE.Y1+1 sbc MSG+S.MSG.Y1+1
bcc .9 bcc .9
clc clc

View File

@ -7,8 +7,10 @@ NEW
*-------------------------------------- *--------------------------------------
.INB inc/macros.i .INB inc/macros.i
.INB inc/a2osx.i .INB inc/a2osx.i
.INB inc/io.i
.INB inc/mli.i .INB inc/mli.i
.INB inc/gfx.i .INB inc/gfx.i
.INB inc/xy.i
.INB inc/libgui.i .INB inc/libgui.i
*-------------------------------------- *--------------------------------------
WND.MAX .EQ 64 WND.MAX .EQ 64
@ -132,6 +134,8 @@ CS.START cld
.DA WND.Destroy .DA WND.Destroy
.DA WND.Show .DA WND.Show
.DA WND.Paint .DA WND.Paint
.DA EVT.GetMsg
*--------------------------------------
L.WND.fPaint .DA WND.fPaint L.WND.fPaint .DA WND.fPaint
*-------------------------------------- *--------------------------------------
L.DEVNAME.GFX .DA DEVNAME.GFX L.DEVNAME.GFX .DA DEVNAME.GFX
@ -141,7 +145,8 @@ L.SYSX7B .DA SYSX7B
L.IOCTL .DA IOCTL L.IOCTL .DA IOCTL
L.DCB.GFX .DA DCB.GFX L.DCB.GFX .DA DCB.GFX
L.MouseClamp .DA MouseClamp L.MouseClamp .DA MouseClamp
L.MouseData .DA MouseData L.XY .DA XY
L.MSG .DA MSG
L.CB.PTR .DA CB.PTR L.CB.PTR .DA CB.PTR
L.CB.Cache .DA CB.Cache L.CB.Cache .DA CB.Cache
L.OBJ.Cache .DA OBJ.Cache L.OBJ.Cache .DA OBJ.Cache
@ -233,12 +238,12 @@ LIB.UNLOAD dec LibCount
*-------------------------------------- *--------------------------------------
CB.InitCacheA sta CB.Cache+S.CB.CMD CB.InitCacheA sta CB.Cache+S.CB.CMD
*-------------------------------------- *--------------------------------------
CB.ClearCache ldx #S.CB-1 CB.ClearCache ldx #S.CB-1
.1 stz CB.Cache,x .1 stz CB.Cache,x
dex dex
bne .1 bne .1
rts rts
*-------------------------------------- *--------------------------------------
CB.GetInCache >STYA .1+1 CB.GetInCache >STYA .1+1
@ -260,7 +265,7 @@ GetCBBuf clc
>LDYAI 512 >LDYAI 512
>SYSCALL2 GetMem >SYSCALL2 GetMem
bcs .9 bcs .9
stx hCBBuf stx hCBBuf
>STYA ZPCBPtr >STYA ZPCBPtr
>STYA ZPCBBufPtr >STYA ZPCBBufPtr
@ -272,7 +277,7 @@ PutCBCache2CBBuf
lsr lsr
tax tax
ldy CB.CmdLen-1,x ldy CB.CmdLen-1,x
ldx #0 ldx #0
.1 lda CB.Cache,x .1 lda CB.Cache,x
@ -362,6 +367,7 @@ OBJ.SetX2Y2 >STYA ZPPtr1
.INB usr/src/lib/libgui.s.clip .INB usr/src/lib/libgui.s.clip
.INB usr/src/lib/libgui.s.cur .INB usr/src/lib/libgui.s.cur
.INB usr/src/lib/libgui.s.draw .INB usr/src/lib/libgui.s.draw
.INB usr/src/lib/libgui.s.evt
.INB usr/src/lib/libgui.s.fon .INB usr/src/lib/libgui.s.fon
.INB usr/src/lib/libgui.s.mbar .INB usr/src/lib/libgui.s.mbar
.INB usr/src/lib/libgui.s.menu .INB usr/src/lib/libgui.s.menu
@ -410,7 +416,8 @@ IOCTL .BS S.IOCTL
DCB.GFX .BS S.DCB.GFX DCB.GFX .BS S.DCB.GFX
*-------------------------------------- *--------------------------------------
MouseClamp .BS 8 MouseClamp .BS 8
MouseData .BS S.MOUSE XY .BS S.XY
MSG .BS S.MSG
*-------------------------------------- *--------------------------------------
CB.PTR .DA #S.CB.CMD.BITBLT CB.PTR .DA #S.CB.CMD.BITBLT
.BS 1 S.CB.OP .BS 1 S.CB.OP
@ -460,10 +467,10 @@ MENU.Sys
.AZ "About..." .AZ "About..."
.11 .AS "Ctrl-" .11 .AS "Ctrl-"
.DA #1,#'-',#2,#'-',#'A',#0 .DA #1,#'-',#2,#'-',#'A',#0
.2 .DA #.3-* next .2 .DA #.3-* next
.DA #S.MITEM.F.SEP .DA #S.MITEM.F.SEP
.3 .DA #.4-* next .3 .DA #.4-* next
.DA #S.MITEM.F.SUBMENU F .DA #S.MITEM.F.SUBMENU F
.DA #0 S .DA #0 S
@ -484,7 +491,7 @@ MENU.Sys
.5 .DA #.6-* next .5 .DA #.6-* next
.DA #S.MITEM.F.SEP .DA #S.MITEM.F.SEP
.6 .DA #.7-* next .6 .DA #.7-* next
.DA #S.MITEM.F.ITEM F .DA #S.MITEM.F.ITEM F
.DA #0 S .DA #0 S
@ -493,8 +500,8 @@ MENU.Sys
.DA #0 .DA #0
.DA #0 .DA #0
.DA #0 KEYSTR .DA #0 KEYSTR
.AZ "Search..." .AZ "Search..."
.7 .DA #.8-* next .7 .DA #.8-* next
.DA #S.MITEM.F.ITEM F .DA #S.MITEM.F.ITEM F
.DA #0 S .DA #0 S
@ -503,7 +510,7 @@ MENU.Sys
.DA #S.MITEM.KEYMOD.CTRL+S.MITEM.KEYMOD.OA .DA #S.MITEM.KEYMOD.CTRL+S.MITEM.KEYMOD.OA
.DA #'R' .DA #'R'
.DA #.77-.7 .DA #.77-.7
.AZ "Run..." .AZ "Run..."
.77 .AZ "Ctrl-R" .77 .AZ "Ctrl-R"
.8 .DA #0 .8 .DA #0
*-------------------------------------- *--------------------------------------
@ -516,7 +523,7 @@ MENU.Sys.Programs
.DA #0 .DA #0
.DA #0 .DA #0
.DA #0 KEYSTR .DA #0 KEYSTR
.AZ "GUITest1" .AZ "Test ASM"
.2 .DA #.3-* next .2 .DA #.3-* next
.DA #S.MITEM.F.ITEM F .DA #S.MITEM.F.ITEM F
@ -526,7 +533,7 @@ MENU.Sys.Programs
.DA #0 .DA #0
.DA #0 .DA #0
.DA #0 KEYSTR .DA #0 KEYSTR
.AZ "GUITest2" .AZ "Test C"
.3 .DA #0 .3 .DA #0
*-------------------------------------- *--------------------------------------
@ -539,7 +546,7 @@ MENU.Sys.Settings
.DA #0 .DA #0
.DA #0 .DA #0
.DA #0 KEYSTR .DA #0 KEYSTR
.AZ "Colors..." .AZ "Colors..."
.2 .DA #.3-* next .2 .DA #.3-* next
.DA #S.MITEM.F.ITEM F .DA #S.MITEM.F.ITEM F
@ -549,7 +556,7 @@ MENU.Sys.Settings
.DA #0 .DA #0
.DA #0 .DA #0
.DA #0 KEYSTR .DA #0 KEYSTR
.AZ "SubItem2..." .AZ "SubItem2..."
.3 .DA #0 .3 .DA #0
*-------------------------------------- *--------------------------------------

View File

@ -35,8 +35,6 @@ bin/etconfig
bin/format bin/format
bin/forth bin/forth
bin/grep bin/grep
bin/gtest
bin/guitest1
bin/hmacmd5 bin/hmacmd5
bin/httpget bin/httpget
bin/ipconfig bin/ipconfig

View File

@ -60,9 +60,6 @@ L.TELNETOPT.LMODE .DA TELNETOPT.LMODE
L.ENV.TERM .DA ENV.TERM L.ENV.TERM .DA ENV.TERM
.DA 0 End Of Reloc Table .DA 0 End Of Reloc Table
*-------------------------------------- *--------------------------------------
CS.INIT clc
rts
*--------------------------------------
CS.RUN ldy #S.PS.ARGC CS.RUN ldy #S.PS.ARGC
lda (pPS),y lda (pPS),y
cmp #2 cmp #2
@ -298,7 +295,8 @@ CS.QUIT lda hFILE
>SYSCALL FClose >SYSCALL FClose
.8 clc .8
CS.INIT clc
rts rts
*-------------------------------------- *--------------------------------------
CkeckOption lda (ZPPtr1) CkeckOption lda (ZPPtr1)
@ -333,10 +331,10 @@ CkeckOption lda (ZPPtr1)
CS.END CS.END
OptionList .AS "Ee" OptionList .AS "Ee"
OptionVars .DA #bExitOnClose,#bExitOnClose OptionVars .DA #bExitOnClose,#bExitOnClose
MSG.GREETINGS .AZ "\r\nA2osX-GeTTY %d.%d on %s\r\n" *--------------------------------------
MSG.USAGE .AS "Usage : GETTY <DEV> <PROGRAM>" MSG.GREETINGS .CZ "\r\nA2osX-GeTTY %d.%d on %s\r\n"
.DA #C.CR,#C.LF MSG.USAGE .CS "Usage : GETTY <DEV> <PROGRAM>\r\n"
.AZ " -E : Exit on disconnect" .CZ " -E : Exit on disconnect"
*-------------------------------------- *--------------------------------------
TELNETOPTS .DA #IAC,#WILL,#TN.O.BINARY TELNETOPTS .DA #IAC,#WILL,#TN.O.BINARY
.DA #IAC,#WILL,#TN.O.ECHO .DA #IAC,#WILL,#TN.O.ECHO

View File

@ -16,7 +16,6 @@ NEW
.DUMMY .DUMMY
.OR ZPBIN .OR ZPBIN
ZS.START ZS.START
hWND .BS 1
ZS.END ZS.END
.ED .ED
*-------------------------------------- *--------------------------------------
@ -41,10 +40,9 @@ CS.START cld
.DA CS.DOEVENT .DA CS.DOEVENT
.DA CS.QUIT .DA CS.QUIT
L.LIBGUI .DA LIBGUI L.LIBGUI .DA LIBGUI
L.MouseData .DA MouseData L.GUITEST1 .DA GUITEST1
L.WND.TITLE .DA WND.TITLE L.GUITEST2 .DA GUITEST2
L.WND.MBAR .DA WND.MBAR L.MSG .DA MSG
L.WND.STATUS .DA WND.STATUS
.DA 0 .DA 0
*-------------------------------------- *--------------------------------------
CS.INIT >LDYA L.LIBGUI CS.INIT >LDYA L.LIBGUI
@ -59,26 +57,30 @@ CS.INIT.RTS rts
*-------------------------------------- *--------------------------------------
CS.RUN >SLEEP CS.RUN >SLEEP
>PUSHW L.MouseData >PUSHW L.MSG
>LIBCALL hLIBGUI,LIBGUI.ReadMouse >LIBCALL hLIBGUI,LIBGUI.GetMsg
bcs CS.RUN bcs CS.RUN
lda MouseData+S.MOUSE.S .1 lda MSG+S.MSG.T
bit #S.MOUSE.S.MOVE cmp #S.MSG.T.ID
beq .1 bne CS.RUN
>PUSHW L.MouseData lda MSG+S.MSG.ID
>LIBCALL hLIBGUI,LIBGUI.SetCursorPos cmp #42
bne .2
lda MouseData+S.MOUSE.S
.1 bit #S.MOUSE.S.DCLK
beq CS.RUN
jsr WND.Test
>PUSHW L.GUITEST1
>PUSHBI 0
>SYSCALL ExecL
bra CS.RUN bra CS.RUN
.2 cmp #44
bne CS.RUN
>PUSHW L.GUITEST2
>PUSHBI 0
>SYSCALL ExecL
bra CS.RUN
clc clc
rts rts
*-------------------------------------- *--------------------------------------
@ -93,132 +95,13 @@ CS.DOEVENT lda (pEvent)
CS.QUIT clc CS.QUIT clc
CS.QUIT.RTS rts CS.QUIT.RTS rts
*-------------------------------------- *--------------------------------------
WND.Test >PUSHBI S.WND.F.RESIZE+S.WND.F.MOVE+S.WND.F.CLOSE+S.WND.F.MAX+S.WND.F.MIN
>PUSHW MouseData+S.MOUSE.X1
>PUSHW MouseData+S.MOUSE.Y1
>PUSHWI 360 witdh
>PUSHWI 96 height
>LIBCALL hLIBGUI,LIBGUI.WND.New
bcs CS.QUIT.RTS
sta hWND
>PUSHA A = hWND
>PUSHBI S.WND.BGCOLOR
>PUSHWI C.WHITE
>LIBCALL hLIBGUI,LIBGUI.OBJ.SetProp
>PUSHB hWND
>PUSHBI S.WND.TITLE
>PUSHW L.WND.TITLE
>LIBCALL hLIBGUI,LIBGUI.OBJ.SetProp
>PUSHB hWND
>PUSHBI S.WND.MBAR
>PUSHW L.WND.MBAR
>LIBCALL hLIBGUI,LIBGUI.OBJ.SetProp
>PUSHB hWND
>PUSHBI S.WND.STATUS
>PUSHW L.WND.STATUS
>LIBCALL hLIBGUI,LIBGUI.OBJ.SetProp
lda hWND
>LIBCALL hLIBGUI,LIBGUI.WND.Show
rts
*--------------------------------------
CS.END CS.END
LIBGUI .AZ "libgui" LIBGUI .AZ "libgui"
hLIBGUI .BS 1 hLIBGUI .BS 1
GUITEST1 .AZ "${ROOT}root/asmtest/guitest1"
GUITEST2 .AZ "${ROOT}root/ctest/testgui"
*-------------------------------------- *--------------------------------------
MouseData .BS S.MOUSE MSG .BS S.MSG
*--------------------------------------
WND.TITLE .AZ "Window Title"
*--------------------------------------
WND.MBAR .DA #.1-* next
.DA #0 status
.DA 0 X1
.DA 0 XT
.DA 0 X2
.DA 0 MENU
.AZ "File"
.1 .DA #.2-* next
.DA #0 status
.DA 0 X1
.DA 0 XT
.DA 0 X2
.DA 0 MENU
.AZ "Edit"
.2 .DA #.3-* next
.DA #0 status
.DA 0 X1
.DA 0 XT
.DA 0 X2
.DA 0 MENU
.AZ "Options"
.3 .DA #.4-* next
.DA #0 status
.DA 0 X1
.DA 0 XT
.DA 0 X2
.DA 0 MENU
.AZ "?"
.4 .DA #0
*--------------------------------------
WND.STATUS .AZ "Window status bar message"
*--------------------------------------
WND.MENU.FILE .DA #02 ID
.DA #S.MITEM.KEYMOD.CTRL
.DA #'N'
.AZ "New"
.DA #04 ID
.DA #S.MITEM.KEYMOD.CTRL
.DA #'O'
.AZ "Open..."
.DA #06 ID
.DA #S.MITEM.KEYMOD.CTRL
.DA #'S'
.AZ "Save"
.DA #08 ID
.DA #S.MITEM.KEYMOD.OA+S.MITEM.KEYMOD.CTRL
.DA #'S'
.AZ "Save As..."
.DA #10 ID
.DA #S.MITEM.KEYMOD.CTRL
.DA #'Q'
.AZ "Quit"
.DA #0
*--------------------------------------
WND.MENU.EDIT .DA #12 ID
.DA #S.MITEM.KEYMOD.OA
.DA #'X'
.AZ "Cut"
.DA #14 ID
.DA #S.MITEM.KEYMOD.OA
.DA #'C'
.AZ "Copy"
.DA #16 ID
.DA #S.MITEM.KEYMOD.OA
.DA #'V'
.AZ "Paste"
.DA #0
*--------------------------------------
WND.MENU.OPTIONS .DA #18 ID
.DA #0
.DA #0
.AZ "Check Me"
.DA #0
*--------------------------------------
WND.MENU.HELP .DA #20 ID
.DA #0
.DA #0
.AZ "About..."
.DA #0
*-------------------------------------- *--------------------------------------
.DUMMY .DUMMY
.OR 0 .OR 0

View File

@ -11,6 +11,7 @@ NEW
.INB inc/mli.e.i .INB inc/mli.e.i
.INB inc/eth.i .INB inc/eth.i
.INB inc/libtcpip.i .INB inc/libtcpip.i
.INB inc/net.tcpip.i
.INB inc/net.http.i .INB inc/net.http.i
*-------------------------------------- *--------------------------------------
TIMEOUT.MAX .EQ 30 30 sec. TIMEOUT.MAX .EQ 30 30 sec.
@ -750,15 +751,15 @@ KEYWORDS.CONF .AS "ServerName "
.AS "DocumentRoot " .AS "DocumentRoot "
.DA #0 .DA #0
*-------------------------------------- *--------------------------------------
MSG.TCPWAIT .AZ "HTTPD:Waiting for TCP/IP initializing..." MSG.TCPWAIT .CZ "HTTPD:Waiting for TCP/IP initializing..."
MSG.TCPIPERR .AZ "HTTPD:TCP/IP Not initialized properly." MSG.TCPIPERR .CZ "HTTPD:TCP/IP Not initialized properly."
MSG.INITCONF .AZ "HTTPD:Reading %s file...\r\n" MSG.INITCONF .CZ "HTTPD:Reading %s file...\r\n"
MSG.INITOK .AZ "HTTPD:Listening on port %D, root dir: %s.\r\n" MSG.INITOK .CZ "HTTPD:Listening on port %D, root dir: %s.\r\n"
MSG.SKTERR .AZ "HTTPD:Skt Bind Error." MSG.SKTERR .CZ "HTTPD:Skt Bind Error."
MSG.INCOMING .AZ "HTTPD:Skt $%h Opened From %d.%d.%d.%d\r\n" MSG.INCOMING .CZ "HTTPD:Skt $%h Opened From %d.%d.%d.%d\r\n"
MSG.REQ .AZ "HTTPD:Req $%h From Skt $%h\r\n" MSG.REQ .CZ "HTTPD:Req $%h From Skt $%h\r\n"
MSG.FILE .AZ "HTTPD:Skt $%h File %s\r\n" MSG.FILE .CZ "HTTPD:Skt $%h File %s\r\n"
MSG.SKTCLOSE .AZ "HTTPD:Skt $%h Close\r\n" MSG.SKTCLOSE .CZ "HTTPD:Skt $%h Close\r\n"
*-------------------------------------- *--------------------------------------
KEYWORDS.REQ .AS "GET " KEYWORDS.REQ .AS "GET "
.AS "Connection: " .AS "Connection: "

View File

@ -5,7 +5,7 @@ NEW
.OR $2000 .OR $2000
.TF sbin/initd .TF sbin/initd
*-------------------------------------- *--------------------------------------
INITDDBG .EQ 1 INITDDBG .EQ 0
*-------------------------------------- *--------------------------------------
.INB inc/macros.i .INB inc/macros.i
.INB inc/a2osx.i .INB inc/a2osx.i
@ -94,7 +94,7 @@ CS.RUN .DO INITDDBG=1
jsr CS.RUN.EXEC.X jsr CS.RUN.EXEC.X
>SLEEP >SLEEP
*--------------------------------------
.1 .DO INITDDBG=1 .1 .DO INITDDBG=1
>LDYA L.MSG.ETCINIT >LDYA L.MSG.ETCINIT
>SYSCALL PutS >SYSCALL PutS
@ -102,35 +102,23 @@ CS.RUN .DO INITDDBG=1
jsr CS.RUN.ETCINIT jsr CS.RUN.ETCINIT
bcs .99 bcs .99
*--------------------------------------
.2 >SYSCALL GetChar .2 >SYSCALL GetChar
bcs .99 bcs .99
cmp #C.CR Ctrl.M ldy #4
bne .3
.3 cmp CTRLCHARS,y
beq .7
dey
bpl .3
ldx #2
jsr CS.RUN.EXEC.X
bra .2 bra .2
.3 cmp #16 Ctrl.P .7 tya
bne .4 asl
tax
ldx #4
jsr CS.RUN.EXEC.X
bra .2
.4 cmp #12 Ctrl.L
bne .5
ldx #6
jsr CS.RUN.EXEC.X
bra .2
.5 cmp #4 Ctrl.D
bne .2
ldx #8
jsr CS.RUN.EXEC.X jsr CS.RUN.EXEC.X
bra .2 bra .2
@ -181,6 +169,7 @@ CS.RUN.ETCINIT >LDYAI 256
>PUSHW BufPtr >PUSHW BufPtr
>PUSHBI S.PS.F.NOHUP+S.PS.F.HOLD >PUSHBI S.PS.F.NOHUP+S.PS.F.HOLD
>SYSCALL ExecL >SYSCALL ExecL
.DO INITDDBG=1 .DO INITDDBG=1
bcs .2 bcs .2
@ -228,10 +217,13 @@ MSG.CTRLR .AZ "INITD:Entering ROOT mode..."
.DO INITDDBG=1 .DO INITDDBG=1
MSG.START .AZ "INITD:Starting..." MSG.START .AZ "INITD:Starting..."
MSG.OK .AZ " [OK]" MSG.OK .AZ " [OK]"
MSG.KO .AZ " [%h]\r\n" MSG.KO .CZ " [%h]\r\n"
MSG.ETCINIT .AS "INITD:Executing " MSG.ETCINIT .AS "INITD:Executing "
.FIN .FIN
ETCINIT .AZ "${ROOT}etc/init" ETCINIT .AZ "${ROOT}etc/init"
*--------------------------------------
CTRLCHARS .DA #19,#13,#16,#12,#4
*--------------------------------------
BINSH .AZ "${ROOT}bin/sh" BINSH .AZ "${ROOT}bin/sh"
BINMEM .AZ "${ROOT}bin/mem" BINMEM .AZ "${ROOT}bin/mem"
BINPS .AZ "${ROOT}bin/ps" BINPS .AZ "${ROOT}bin/ps"

View File

@ -336,10 +336,8 @@ CS.DOEVENT sec
*-------------------------------------- *--------------------------------------
CS.END CS.END
*-------------------------------------- *--------------------------------------
MSG.LOGIN .DA #C.CR,#C.LF MSG.LOGIN .CZ "\r\nlogin:"
.AZ "login:" MSG.PASSWORD .CZ "\r\npassword:"
MSG.PASSWORD .DA #C.CR,#C.LF
.AZ "password:"
*-------------------------------------- *--------------------------------------
MSG.BAD .AZ "Bad user or password" MSG.BAD .AZ "Bad user or password"
MSG.BS .DA #C.BS,#C.SPACE,#C.BS MSG.BS .DA #C.BS,#C.SPACE,#C.BS

View File

@ -231,7 +231,7 @@ MSG.TCPWAIT .AZ "TELNETD:Waiting for TCP/IP initializing..."
MSG.INITOK .AZ "TELNETD:Init Ok, Listening." MSG.INITOK .AZ "TELNETD:Init Ok, Listening."
MSG.TCPIPERR .AZ "TELNETD:TCP/IP Not initialized properly." MSG.TCPIPERR .AZ "TELNETD:TCP/IP Not initialized properly."
MSG.SKTERR .AZ "TELNETD:Listen Error." MSG.SKTERR .AZ "TELNETD:Listen Error."
MSG.INCOMING .AZ "TELNETD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n" MSG.INCOMING .CZ "TELNETD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n"
*-------------------------------------- *--------------------------------------
NOD.Template .AZ "/dev/tty%h" NOD.Template .AZ "/dev/tty%h"
CMD.Template .AZ "${ROOT}sbin/getty -E %s ${ROOT}sbin/login" CMD.Template .AZ "${ROOT}sbin/getty -E %s ${ROOT}sbin/login"

View File

@ -485,6 +485,9 @@ K.SYSCALL2.BANK bpl K.SYSCALL.JMP 0, E000, no BNK change
K.SYSCALL.JMP jmp (K.SYSCALL,x) K.SYSCALL.JMP jmp (K.SYSCALL,x)
*-------------------------------------- *--------------------------------------
K.SYSCALL.JMPX1A
>PULLW FORPNT
bra JMPXA
K.SYSCALL.JMPX2A K.SYSCALL.JMPX2A
sec sec
.HS 90 BCC .HS 90 BCC
@ -493,7 +496,7 @@ K.SYSCALL.JMPX2 clc
>PULLW TXTPTR >PULLW TXTPTR
bcc K.SYSCALL.JMPX bcc K.SYSCALL.JMPX
>PULLA JMPXA >PULLA
K.SYSCALL.JMPX sta SETREADAUX K.SYSCALL.JMPX sta SETREADAUX
sta SETWRITEAUX sta SETWRITEAUX

View File

@ -57,10 +57,11 @@ K.MD5Update .EQ K.SYSCALL.JMPX2A
* `>SYSCALL MD5Finalize` * `>SYSCALL MD5Finalize`
* ## RETURN VALUE * ## RETURN VALUE
*\-------------------------------------- *\--------------------------------------
K.MD5Finalize >PULLW FORPNT K.MD5Finalize .EQ K.SYSCALL.JMPX1A
>PULLA * >PULLW FORPNT
* >PULLA
jmp K.SYSCALL.JMPX * jmp K.SYSCALL.JMPX
*-------------------------------------- *--------------------------------------
MAN MAN
SAVE usr/src/sys/kernel.s.md5 SAVE usr/src/sys/kernel.s.md5

View File

@ -10,7 +10,10 @@ NEW
* `>SYSCALL getpwuid` * `>SYSCALL getpwuid`
* ## RETURN VALUE * ## RETURN VALUE
*\-------------------------------------- *\--------------------------------------
K.GetPWUID K.GetPWUID .EQ K.SYSCALL.JMPX1A
* >PULLW FORPNT
* >PULLA UID
* jmp K.SYSCALL.JMPX
*/-------------------------------------- */--------------------------------------
* # GetGRGID * # GetGRGID
* ## C * ## C
@ -21,9 +24,10 @@ K.GetPWUID
* `>SYSCALL getpwname` * `>SYSCALL getpwname`
* ## RETURN VALUE * ## RETURN VALUE
*\-------------------------------------- *\--------------------------------------
K.GetGRGID >PULLW FORPNT K.GetGRGID .EQ K.SYSCALL.JMPX1A
>PULLA UID/GID * >PULLW FORPNT
jmp K.SYSCALL.JMPX * >PULLA GID
* jmp K.SYSCALL.JMPX
*/-------------------------------------- */--------------------------------------
* # CloseSession * # CloseSession
* ## C * ## C