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