Apple-2-SW
/
A2osX
mirror of https://github.com/A2osX/A2osX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bugfixes to save etc/network file 

Small tidyup
This commit is contained in:
John LeFebvre 2024-01-25 23:32:16 +00:00
parent 491792212b
commit f0adfc775d
1 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
BIN/NETCONFIG.S.txt
View File

@ -154,7 +154,7 @@ CS.RUN >LDYAI 80
rts
.1 >STYA ZPTmpPtr1
stx hBuf1 !!! don't forget to free() it in CS.QUIT
stx hBuf1
jsr CS.HOSTR Read HOSTNAME file
jsr CS.IPR Read TCPIP.CONF file
@ -166,9 +166,10 @@ CS.RUN >LDYAI 80
.2 sta hCTX
jsr CS.SCRN.Init
bcs CS.RUN.RTS
bcc .3
rts
jsr CS.HOST.INIT
.3 jsr CS.HOST.INIT
bcs CS.RUN.RTS
jsr CS.IFACE.Init
@ -190,15 +191,14 @@ CS.RUN >LDYAI 80
bcs CS.RUN.RTS
jsr CS.SCRN.Draw Will Call SCRN.Draw
lda hItem1
>LIBCALL hLIBTUI,LIBTUI.Show
* >LDA.G AUTOIP.Var
* bne CS.RUN.LOOP2
* jsr CS.AUTOIP.Hide
* bra CS.RUN.LOOP2
>LDA.G AUTOIP.Var
bne .4
*.show1 jsr CS.AUTOIP.Show Shown by default
jsr CS.AUTOIP.Hide
.4 lda hItem1
>LIBCALL hLIBTUI,LIBTUI.Activate
*--------------------------------------
CS.RUN.LOOP2 lda hSCRN
>LIBCALL hLIBTUI,LIBTUI.Exec
@ -269,8 +269,11 @@ CS.HOSTR.Loop2 lda (ZPTmpPtr1),y
*--------------------------------------
CS.IPR >LDYA L.TCPIP.CONF etc/tcpip.conf
JSR CS.File.OpenRD
bcc CS.IPR.Loop
bcc .1
rts
.1 lda #1
>STA.G AUTOIP.Var Preselect manual IP
CS.IPR.Loop jsr CS.File.Read
bcs .8
@ -281,8 +284,8 @@ CS.IPR.Loop jsr CS.File.Read
beq .3
cmp #'#'
bne .2
lda #1
>STA.G AUTOIP.Var Preselect Manual IP radio
lda #0
>STA.G AUTOIP.Var Any hash found preselects autoip/dhcp
inc ZPTmpPtr1
bcc .21
@ -485,11 +488,7 @@ CS.IFACE.Init >PUSHB hSCRN hParent
>PUSHB hSCRN hParent
>PUSHBI SCR.X1
>PUSHBI SCR.Y1+3
>PUSHWZ
* >PUSHBI 0 HK
* >PUSHBI 0 EV
>PUSHW L.IFACE.List
>PUSHEA.G IFACE.Var
>PUSHBI 0
@ -507,11 +506,8 @@ CS.AUTOIP.Init >PUSHB hSCRN hParent
>PUSHB hSCRN hParent
>PUSHBI SCR.X2
>PUSHBI SCR.Y1+3
>PUSHWZ
>PUSHBI 0 HK
>PUSHBI EV.AUTOIP EV
>PUSHW L.AUTOIP.List
>PUSHEA.G AUTOIP.Var
>PUSHBI 0
@ -529,24 +525,17 @@ CS.PROTO.Init >PUSHB hSCRN hParent
>PUSHB hSCRN hParent
>PUSHBI SCR.X2
>PUSHBI SCR.Y1+7
>PUSHWZ
* >PUSHBI 0 HK
* >PUSHBI 0 EV
>PUSHW L.LIBTCPIP.Label
>PUSHEA.G LIBTCPIP.Var
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewCBox
.1 bcs .9
>PUSHB hSCRN hParent
>PUSHBI SCR.X2
>PUSHBI SCR.Y1+8
>PUSHWZ
* >PUSHBI 0 HK
* >PUSHBI 0 EV
>PUSHW L.LIBETALK.Label
>PUSHEA.G LIBETALK.Var
>PUSHBI 0
@ -561,28 +550,22 @@ CS.SERV.Init >PUSHB hSCRN hParent
>LIBCALL hLIBTUI,LIBTUI.NewLabel
bcc .1
rts
.1 >PUSHB hSCRN hParent
>PUSHBI SCR.X3
>PUSHBI SCR.Y1+3
>PUSHWZ
* >PUSHBI 0 HK
* >PUSHBI 0 EV
>PUSHW L.TELNET.Label
>PUSHEA.G TELNET.Var
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewCBox
bcc .2
rts
.2 >PUSHB hSCRN hParent
>PUSHBI SCR.X3
>PUSHBI SCR.Y1+4
>PUSHWZ
* >PUSHBI 0 HK
* >PUSHBI 0 EV
>PUSHW L.HTTPD.Label
>PUSHEA.G HTTPD.Var
>PUSHBI 0
@ -594,11 +577,7 @@ CS.SERV.Init >PUSHB hSCRN hParent
.3 >PUSHB hSCRN hParent
>PUSHBI SCR.X3
>PUSHBI SCR.Y1+5
>PUSHWZ
* >PUSHBI 0 HK
* >PUSHBI 0 EV
>PUSHW L.BBSD.Label
>PUSHEA.G BBSD.Var
>PUSHBI 0
@ -796,7 +775,8 @@ CS.AUTOIP.Show lda hIPLabel
>LIBCALL hLIBTUI,LIBTUI.Show
lda hIPdomV
>LIBCALL hLIBTUI,LIBTUI.Show
rts*--------------------------------------
rts
*--------------------------------------
CS.DLG.SAVE >PUSHB hCTX hParent
>PUSHBI 70 W
>PUSHBI 11 H
@ -824,6 +804,7 @@ CS.DLG.SAVE >PUSHB hCTX hParent
>LIBCALL hLIBTUI,LIBTUI.NewCBox
bcc CS.DLG.SAVE2
.9 rts
CS.DLG.SAVE2 sta hDLGitem
>PUSHB hDLGS hParent
>PUSHBI 48 X1
@ -833,7 +814,6 @@ CS.DLG.SAVE2 sta hDLGitem
>PUSHW L.BUT.OK
>PUSHBI 0
>LIBCALL hLIBTUI,LIBTUI.NewBut
bcs .8
>PUSHB hDLGS hParent
@ -864,7 +844,7 @@ CS.DLG.Loop lda hDLGS
jsr CS.HOSTW write hostname
jsr CS.NETW write startup system script
>LDA.G DLGS.Var
* cmp #0
cmp #1
beq .1
jsr CS.SHW write startup shell script
bra .2
@ -995,11 +975,10 @@ CS.IPW.dom >LDYA L.DOM.Label
*--------------------------------------
CS.SHW >LDYA L.Netstart Write network startup shell script
jsr CS.File.OpenWR
bcc .0
bcc .1
rts
.0 >LDYA L.NS.Hdr
.1 >LDYA L.NS.Hdr
jsr CS.File.FPutSYA
>LDA.G IFACE.var range = 0..5
@ -1049,11 +1028,11 @@ CS.SHW.close jmp CS.File.Close
*--------------------------------------
CS.NETW >LDYA L.NETWORK Write network startup system script
jsr CS.File.OpenWR
bcc .0
bcc .1
rts
.0 >LDA.G LIBTCPIP.Var
.1 >LDA.G LIBTCPIP.Var
bpl CS.NETW.etalk
>LDYA L.NETWORKIP
@ -1107,9 +1086,9 @@ hLIBTUI .BS 1
NETSTART .AZ "${HOME}netstart"
HOSTNAME .AZ "${ROOT}etc/hostname"
TCPIP.CONF .AZ "${ROOT}etc/tcpip.conf"
NETWORK .AZ "$[ROOT]etc/network"
NETWORKIP .CZ "ipconfig/r"
NETWORKET .CZ "etconfig/r"
NETWORK .AZ "${ROOT}etc/network"
NETWORKIP .CZ "ipconfig\r"
NETWORKET .CZ "etconfig\r"
*--------------------------------------
IP.Keywords .PS "address"
.PS "netmask"
@ -1146,7 +1125,7 @@ TELNET.Label .AZ "telnetd"
HTTPD.Label .AZ "httpd"
BBSD.Label .AZ "bbsd"
*--------------------------------------
MANUAL.Label .AZ "MANUAL IP SETTINGS (Ignored for Auto/DHCP)"
MANUAL.Label .AZ "MANUAL IP SETTINGS"
IPADDR.Label .AZ "address "
MASK.Label .AZ "netmask "
GATEWAY.Label .AZ "gateway "