Kernel 0.93+

This commit is contained in:
Rémy GIBERT 2019-12-04 14:46:58 +01:00
parent 792da70ee8
commit dd10b02cce
9 changed files with 163 additions and 112 deletions

Binary file not shown.

View File

@ -4,7 +4,7 @@ AUTO 4,1
.LIST OFF
.OP 65C02
.OR $2000
.TF BIN/FORMAT
.TF bin/format
*--------------------------------------
.INB INC/MACROS.I
.INB INC/A2OSX.I
@ -300,7 +300,7 @@ CS.RUN.CheckOpt ldy #1
*--------------------------------------
CS.END
*--------------------------------------
LIBBLKDEV .AZ "LIBBLKDEV"
LIBBLKDEV .AZ "libblkdev"
hLIBBLKDEV .BS 1
*--------------------------------------
MSG.USAGE .AS "Usage : FORMAT <BLOCKDEV> [VOLUME.NAME]\r\n"

View File

@ -4,7 +4,7 @@ AUTO 4,1
.LIST OFF
.OP 65C02
.OR $2000
.TF SBIN/KCONFIG
.TF bin/kconfig
*--------------------------------------
.INB INC/MACROS.I
.INB INC/MLI.I
@ -391,5 +391,5 @@ DS.START
StatBuf .BS S.STAT
DS.END .ED
MAN
SAVE USR/SRC/SBIN/KCONFIG.S
SAVE USR/SRC/BIN/KCONFIG.S
ASM

View File

@ -3,7 +3,7 @@ NEW
.LIST OFF
.OP 65C02
.OR $2000
.TF BIN/PING
.TF bin/ping
*--------------------------------------
.INB INC/MACROS.I
.INB INC/A2OSX.I

View File

@ -3,7 +3,7 @@ NEW
.LIST OFF
.OP 65C02
.OR $2000
.TF SBIN/TELNETD
.TF sbin/telnetd
*--------------------------------------
.INB INC/MACROS.I
.INB INC/A2OSX.I
@ -242,7 +242,7 @@ MSG.SKTERR .AZ "TELNETD:Listen Error."
MSG.INCOMING .AZ "TELNETD:Incoming Connection [SKT=%h] From : %d.%d.%d.%d\r\n"
MSG.EXECERR .AZ "TELNETD:ExecL failed $%h."
*--------------------------------------
NOD.Template .AZ "/DEV/TTY%h"
NOD.Template .AZ "/dev/tty%h"
CMD.Template .AZ "${ROOT}SBIN/GETTY -E %s ${ROOT}SBIN/LOGIN"
*--------------------------------------
SA.LOCAL .DA #AF.INET S.SOCKADDR.AF

View File

@ -162,21 +162,21 @@ S.DCB.TTY.MODE.IAC .EQ 6
S.DCB.TTY.MODE.G0 .EQ 8
S.DCB.TTY.MODE.G1 .EQ 10
S.DCB.TTY.CH .EQ 3
S.DCB.TTY.CV .EQ 4
S.DCB.TTY.SCROLLTOP .EQ 5
S.DCB.TTY.SCROLLBOT .EQ 6
S.DCB.TTY.bCURON .EQ 7
S.DCB.TTY.bTITLE .EQ 8
S.DCB.TTY.CH.SAVE .EQ 4
S.DCB.TTY.CV .EQ 5
S.DCB.TTY.CV.SAVE .EQ 6
S.DCB.TTY.bNORMAL .EQ 9
S.DCB.TTY.bLINEWRAP .EQ 10
S.DCB.TTY.bCRLF .EQ 11
S.DCB.TTY.SCROLLTOP .EQ 7
S.DCB.TTY.SCROLLBOT .EQ 8
S.DCB.TTY.bCURON .EQ 9
S.DCB.TTY.bTITLE .EQ 10
* .EQ 12
S.DCB.TTY.bNORMAL .EQ 11
S.DCB.TTY.bLINEWRAP .EQ 12
S.DCB.TTY.bCRLF .EQ 13
S.DCB.TTY.bG0G1 .EQ 13
S.DCB.TTY.bG0ALT .EQ 14
S.DCB.TTY.bG1ALT .EQ 15
S.DCB.TTY.bG0G1 .EQ 14
S.DCB.TTY.bG0G1ALT .EQ 15
S.DCB.TTY.OUTTAIL .EQ 16
S.DCB.TTY.OUTHEAD .EQ 17

View File

@ -139,7 +139,7 @@ DRV.TERM.CONTROL
ldy #S.DCB.TTY.bCURON
sta (ZPDCBPtr),y
ldy #S.DCB.TTY.bTITLE
iny ldy #S.DCB.TTY.bTITLE
sta (ZPDCBPtr),y
clc
rts
@ -194,10 +194,13 @@ DRV.TERM.READ jsr DRV.TERM.GetIOCTLBufCntDCB
and #$7F
ldx #KeyRemapped.cnt-1
.2 cmp KeyRemapped,x
beq .3
dex
bpl .2
cmp #C.CR
bne .21
@ -205,9 +208,11 @@ DRV.TERM.READ jsr DRV.TERM.GetIOCTLBufCntDCB
ldy #S.DCB.TTY.bCRLF
lda (ZPDCBPtr),y
bpl .7
lda #C.LF
.21 jsr Char.Out.Put no remap....send char....
bra .7 and flush
.3 lda KeyRemapped.Tbl,x
pha
lda #C.ESC
@ -223,18 +228,23 @@ DRV.TERM.READ jsr DRV.TERM.GetIOCTLBufCntDCB
iny
cmp (ZPDCBPtr),y OUTHEAD
beq .9 no char in output buffer...
.7 stz .8+1
.70 inc ZPCount
bne .71
inc ZPCount+1
beq .8
.71 jsr Char.Out.Get
bcs .8
ldy .8+1
sta (ZPBufPtr),y
iny
sty .8+1
bra .70
.8 lda #$ff SELF MODIFIED
ldy #S.IOCTL.BYTECNT
sta (ZPIOCTL),y
@ -243,6 +253,7 @@ DRV.TERM.READ jsr DRV.TERM.GetIOCTLBufCntDCB
sta (ZPIOCTL),y
clc
rts
.9 lda #E.NODATA
* sec
rts
@ -371,24 +382,20 @@ DRV.TERM.COUT.DEL
sta (ZPDCBPtr),y
bra .3
.1 iny S.DCB.TTY.CV
.1 ldy #S.DCB.TTY.CV
lda (ZPDCBPtr),y
beq DRV.TERM.COUT.BS.8
dec
sta (ZPDCBPtr),y
dey
ldy #S.DCB.TTY.CH
lda #79
sta (ZPDCBPtr),y S.DCB.TTY.CH
.3 lda #C.SPACE
jmp SetCharAtCurPos
*--------------------------------------
DRV.TERM.COUT.FF
lda #0
ldy #S.DCB.TTY.CV
sta (ZPDCBPtr),y
dey
sta (ZPDCBPtr),y
jsr HOME
jmp DRV.TERM.CLRSCR
*--------------------------------------
DRV.TERM.COUT.CR
@ -421,26 +428,32 @@ DRV.TERM.ESC lda (ZPBufPtr) y = #S.DCB.TTY.MODE
beq .3
dex
bpl .2
lda #0
bra DRV.TERM.SETMODE
bra DRV.TERM.SETMODE0
.3 phx
jsr .4
plx
lda EscModes,x
bra DRV.TERM.SETMODE
.4 txa
asl
tax
jmp (.5,x)
.5 .DA Scroll.Dn M
.5 .DA SaveCurPos 7
.DA RestoreCurPos 8
.DA Scroll.Dn M
.DA Scroll.Up D
.DA RESET c
.DA DRV.TERM.SETMODE.RTS [
.DA DRV.TERM.SETMODE.RTS (
.DA DRV.TERM.SETMODE.RTS )
*--------------------------------------
DRV.TERM.SETMODE
DRV.TERM.SETMODE0
lda #0
DRV.TERM.SETMODE
ldy #S.DCB.TTY.MODE
sta (ZPDCBPtr),y
ldy #S.DCB.TTY.INBUFFER
@ -670,23 +683,13 @@ Csi.EraseLine ldx CsiParamCnt
jmp CLRSOL
.2 cmp #2
bne .9
bne Csi.Home.8
jmp CLRLINE
.9 clc
rts
*--------------------------------------
Csi.Home lda CsiParamCnt
bne .1
beq HOME
ldy #S.DCB.TTY.CH
sta (ZPDCBPtr),y
iny S.DCB.TTY.CV
sta (ZPDCBPtr),y
clc
rts
.1 ldx #1
ldx #1
lda CsiParams
beq .2
@ -721,18 +724,35 @@ Csi.Home lda CsiParamCnt
Csi.Home.8 clc
rts
*--------------------------------------
DRV.TERM.G0 ldy #S.DCB.TTY.bG0ALT
HOME lda #0
ldy #S.DCB.TTY.CV
sta (ZPDCBPtr),y
ldy #S.DCB.TTY.CH
sta (ZPDCBPtr),y
clc
rts
*--------------------------------------
DRV.TERM.G0 ldx #$80
.HS 2C BIT ABS
DRV.TERM.G1 ldy #S.DCB.TTY.bG1ALT
DRV.TERM.G1 ldx #$40
ldy #S.DCB.TTY.bG0G1ALT
lda (ZPBufPtr)
cmp #'0'
beq .1
clc
.1 ror
sta (ZPDCBPtr),y
lda #0
jmp DRV.TERM.SETMODE
txa
eor #$ff
and (ZPDCBPtr),y
bra .8
.1 txa
ora (ZPDCBPtr),y
.8 sta (ZPDCBPtr),y
jmp DRV.TERM.SETMODE0
*--------------------------------------
DRV.TERM.IAC ldy #S.DCB.TTY.INBUFFER
lda (ZPDCBPtr),y
@ -816,12 +836,14 @@ COUT.IAC.DO ldx #DOWILL.CNT-1
beq .7
dex
bpl .1
ldx #DOWONT.CNT-1
.2 cmp DOWONT,x
beq .8
dex
bpl .2
bra COUT.IAC.EXIT
.7 ldx #WILL
.HS 2C BIT ABS
@ -926,6 +948,28 @@ CLR sty .1+1 Save Start
CLR.8 clc
rts
*--------------------------------------
SaveCurPos ldy #S.DCB.TTY.CH
lda (ZPDCBPtr),y
iny
sta (ZPDCBPtr),y
iny
lda (ZPDCBPtr),y
iny
sta (ZPDCBPtr),y
rts
*--------------------------------------
RestoreCurPos jsr DRV.TERM.CUROFF
ldy #S.DCB.TTY.CV.SAVE
lda (ZPDCBPtr),y
dey
sta (ZPDCBPtr),y
dey
lda (ZPDCBPtr),y
dey
sta (ZPDCBPtr),y
rts
*--------------------------------------
SCROLL.UP ldy #S.DCB.TTY.SCROLLTOP
lda (ZPDCBPtr),y
@ -1178,9 +1222,9 @@ DRV.TERM.SETUP.L1X.8
CtrlChars .DA #C.ENQ,#C.BS,#C.LF,#C.FF,#C.CR,#C.SO,#C.SI,#C.FS,#C.ESC
CtrlChars.Cnt .EQ *-CtrlChars
*--------------------------------------
EscCodes .AZ "MDc[()"
EscCodes .AZ "78MDc[()"
EscCodes.Cnt .EQ *-EscCodes
EscModes .DA #0,#0,#0,#S.DCB.TTY.MODE.CSI,#S.DCB.TTY.MODE.G0,#S.DCB.TTY.MODE.G1
EscModes .DA #0,#0,#0,#0,#0,#S.DCB.TTY.MODE.CSI,#S.DCB.TTY.MODE.G0,#S.DCB.TTY.MODE.G1
CsiCodes .AS "hlmnrJKH"
CsiCodes.Cnt .EQ *-CsiCodes
*--------------------------------------
@ -1209,7 +1253,9 @@ SB.IS.NAWS.LEN .EQ *-SB.IS.NAWS
*--------------------------------------
RESET.VALUES .DA #0 S.DCB.TTY.MODE
.DA #0 S.DCB.TTY.CH
.DA #0 S.DCB.TTY.CH.SAVE
.DA #0 S.DCB.TTY.CV
.DA #0 S.DCB.TTY.CV.SAVE
.DA #0 S.DCB.TTY.SCROLLTOP
.DA #23 S.DCB.TTY.SCROLLBOT
.DA #0 S.DCB.TTY.bCURON
@ -1219,10 +1265,8 @@ RESET.VALUES .DA #0 S.DCB.TTY.MODE
.DA #$80 S.DCB.TTY.bLINEWRAP
.DA #$80 S.DCB.TTY.bCRLF
.DA #0
.DA #0 S.DCB.TTY.bG0G1
.DA #0 S.DCB.TTY.bG0ALT
.DA #$80 S.DCB.TTY.bG1ALT
.DA #$80 S.DCB.TTY.bG0G1ALT
.DA #S.DCB.TTY.OUTBUFFER S.DCB.TTY.OUTTAIL
.DA #S.DCB.TTY.OUTBUFFER S.DCB.TTY.OUTHEAD
@ -1240,55 +1284,6 @@ REMAP.E0.FF .HS 5B4142434445464748495FA0DF544e4f
* p q r s t u v w x y z { | } ~ DEL
.HS 50DF5253545556575F595a5b5c5d5e5f
*--------------------------------------
BUF.BASEL .DA #0
.DA #80
.DA #160
.DA #240
.DA #320
.DA #400
.DA #480
.DA #560
.DA #640
.DA #720
.DA #800
.DA #880
.DA #960
.DA #1040
.DA #1120
.DA #1200
.DA #1280
.DA #1360
.DA #1440
.DA #1520
.DA #1600
.DA #1680
.DA #1760
.DA #1840
BUF.BASEH .DA /0
.DA /80
.DA /160
.DA /240
.DA /320
.DA /400
.DA /480
.DA /560
.DA /640
.DA /720
.DA /800
.DA /880
.DA /960
.DA /1040
.DA /1120
.DA /1200
.DA /1280
.DA /1360
.DA /1440
.DA /1520
.DA /1600
.DA /1680
.DA /1760
.DA /1840
*--------------------------------------
SCR.BASEL .HS 00.80.00.80.00.80.00.80.28.A8.28.A8.28.A8.28.A8.50.D0.50.D0.50.D0.50.D0
*SCR.BASEH .HS 04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07.04.04.05.05.06.06.07.07
*--------------------------------------

View File

@ -142,7 +142,7 @@ SetCharAtCurPos pha
ldy #S.DCB.TTY.CV
lda (ZPDCBPtr),y
tax
dey
ldy #S.DCB.TTY.CH
lda (ZPDCBPtr),y
tay
pla
@ -161,13 +161,18 @@ SetCharAtYX cmp #$40
ora (ZPDCBPtr),y
sta ZPTmpChar
ldy #S.DCB.TTY.bG0G1 Select Active Font
clc
lda (ZPDCBPtr),y
bpl .2
iny
sec
.2 lda #$80
bcc .21
lsr
.21 and (ZPDCBPtr),y
beq .3 not Graphic mode
.2 iny
lda (ZPDCBPtr),y
bpl .3 not Graphic mode
lda ZPTmpChar
cmp #$E0 Normal lowercase ?
bcc .3
@ -227,6 +232,55 @@ GetCharAtCurPos ldy #S.DCB.TTY.CV
*--------------------------------------
* TEMP
*--------------------------------------
BUF.BASEL .DA #0
.DA #80
.DA #160
.DA #240
.DA #320
.DA #400
.DA #480
.DA #560
.DA #640
.DA #720
.DA #800
.DA #880
.DA #960
.DA #1040
.DA #1120
.DA #1200
.DA #1280
.DA #1360
.DA #1440
.DA #1520
.DA #1600
.DA #1680
.DA #1760
.DA #1840
BUF.BASEH .DA /0
.DA /80
.DA /160
.DA /240
.DA /320
.DA /400
.DA /480
.DA /560
.DA /640
.DA /720
.DA /800
.DA /880
.DA /960
.DA /1040
.DA /1120
.DA /1200
.DA /1280
.DA /1360
.DA /1440
.DA /1520
.DA /1600
.DA /1680
.DA /1760
.DA /1840
*--------------------------------------
MAN
SAVE USR/SRC/SYS/KERNEL.S.TERMLC
LOAD USR/SRC/SYS/KERNEL.S

View File

@ -83,6 +83,9 @@ K.PTime2Time >STYA ARG32
*--------------------------------------
* 1/1/1970 was Thursday...if not leap, add one, if leap add 2
*--------------------------------------
clc
rts
K.ComputeWDAY lda #DAY0-1 Thursday : 4 (-1 for mod 7)
pha
@ -90,8 +93,7 @@ K.ComputeWDAY lda #DAY0-1 Thursday : 4 (-1 for mod 7)
sta ACC32
lda #YEAR0
sta ACC32+1
clc
rts
.1 ldy ACC32
lda ACC32+1