deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Integrated latest enhancements contributed by Kajtar Zsolt:

Browse source 
- Use cc65 C library _filetype for writing instead of fixed 'p'.
- Support for fake O_TRUNC through SCRATCH.
This commit is contained in:
oliverschmidt 2010-07-22 10:16:58 +00:00
parent 9c0f5d857c
commit e53c34770a
2 changed files with 85 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
platform/c128/lib/pfs.S
View file

@ -31,12 +31,12 @@
; Author: Kajtar Zsolt <soci@c64.rulez.org> ; Author: Kajtar Zsolt <soci@c64.rulez.org>
; ;
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
.define F_IDE64 0 ; support IDE64, 100 byte only .define F_IDE64 0 ; support IDE64, not on C128
.constructor init_pfs .constructor init_pfs
.destructor done_pfs .destructor done_pfs
.importzp ptr1, ptr2, ptr3, sp .importzp ptr1, ptr2, ptr3, sp
.import __curunit, popax, addysp, subysp .import __curunit, __filetype, popax, addysp, subysp
.export pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend .export pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
.if F_IDE64 .if F_IDE64
.export ide64_rwprepare, ide64_rwfinish .export ide64_rwprepare, ide64_rwfinish
@ -73,7 +73,8 @@ flags: .res 10
.data .data
illchr: .byte $3A, $2A, $3F, $3D ;illegal chars illchr: .byte $3A, $2A, $3F, $3D ;illegal chars
pw: .byte $2C, $50, $2C, $57 ;,p,w pw: .byte $2C
filet: .byte $50, $2C, $57 ;,p,w
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
.segment "INIT" .segment "INIT"
@ -100,11 +101,12 @@ _pfs_open:
ldy #F_MAXLEN+8 ldy #F_MAXLEN+8
jsr subysp ;allocate name jsr subysp ;allocate name
ldy #255 ldy #255
sty ptr3
sty ptr1 sty ptr1
@L10: iny @L10: iny
cpy #F_MAXLEN cpy #F_MAXLEN
bcs error3 ;too long... bcs error3 ;too long...
ldx #4 ldx #4 ;4+1 (comma)
@L12: cmp illchr,x @L12: cmp illchr,x
beq error3 ;illegal char? beq error3 ;illegal char?
dex dex
@ -146,6 +148,8 @@ nopath: lda #$3A
bne @L16 bne @L16
lsr ptr2 lsr ptr2
bcs ro ;read only bcs ro ;read only
lda __filetype
sta filet ;set filetype
ldx #252 ldx #252
@L20: lda pw-252,x @L20: lda pw-252,x
sta (sp),y ;write sta (sp),y ;write
@ -173,7 +177,7 @@ next: inc ptr2 ;next file number
inx inx
stx ptr2+1 stx ptr2+1
nextsa: inc ptr2+1 ;next channel nextsa: inc ptr2+1 ;next channel
lda ptr2 ;file number retr: lda ptr2 ;file number
ldx __curunit ldx __curunit
ldy ptr2+1 ;secondary address ldy ptr2+1 ;secondary address
jsr SETLFS jsr SETLFS
@ -201,10 +205,10 @@ nextsa: inc ptr2+1 ;next channel
lda ptr2 lda ptr2
jsr CLOSE ;close jsr CLOSE ;close
pla pla
ldx ptr1
cmp #$37 ;no channel? cmp #$37 ;no channel?
bne error bne nnoc
lda ptr1 cpx #$30
cmp #$30
bne error ;not no channel bne error ;not no channel
lda ptr2+1 lda ptr2+1
cmp #14 cmp #14
@ -227,6 +231,37 @@ error: lda #$FF
tax ;failed tax ;failed
bne ret bne ret
nnoc: inc ptr3
bne error ;no retry
cmp #$36
bne error ;no exists
cpx #$33
bne error
ldx cmdc
jsr CHKOUT
bcs error
lda FNL
sec
sbc #5
tax
lda #$53 ;scratch
jsr CHROUT
ldy #1
@L4: lda (FN),y
iny
jsr CHROUT
dex
bne @L4
lda #$3D
jsr CHROUT
iny
lda (FN),y
jsr CHROUT
lda #$0d
jsr CHROUT
jsr CLRCHN
jmp retr
.proc _pfs_read .proc _pfs_read
jsr pfs_rwcommon ; pop params, check handle jsr pfs_rwcommon ; pop params, check handle
beq error2 ; not open beq error2 ; not open

49
platform/c64/lib/pfs.S
View file

@ -36,7 +36,7 @@
.constructor init_pfs .constructor init_pfs
.destructor done_pfs .destructor done_pfs
.importzp ptr1, ptr2, ptr3, sp .importzp ptr1, ptr2, ptr3, sp
.import __curunit, popax, addysp, subysp .import __curunit, __filetype, popax, addysp, subysp
.export pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend .export pfs_rwcommon, pfs_rwsetflags, pfs_rwcommonend
.if F_IDE64 .if F_IDE64
.export ide64_rwprepare, ide64_rwfinish .export ide64_rwprepare, ide64_rwfinish
@ -73,7 +73,8 @@ flags: .res 10
.data .data
illchr: .byte $3A, $2A, $3F, $3D ;illegal chars illchr: .byte $3A, $2A, $3F, $3D ;illegal chars
pw: .byte $2C, $50, $2C, $57 ;,p,w pw: .byte $2C
filet: .byte $50, $2C, $57 ;,p,w
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
.segment "INIT" .segment "INIT"
@ -100,11 +101,12 @@ _pfs_open:
ldy #F_MAXLEN+8 ldy #F_MAXLEN+8
jsr subysp ;allocate name jsr subysp ;allocate name
ldy #255 ldy #255
sty ptr3
sty ptr1 sty ptr1
@L10: iny @L10: iny
cpy #F_MAXLEN cpy #F_MAXLEN
bcs error3 ;too long... bcs error3 ;too long...
ldx #4 ldx #4 ;4+1 (comma)
@L12: cmp illchr,x @L12: cmp illchr,x
beq error3 ;illegal char? beq error3 ;illegal char?
dex dex
@ -146,6 +148,8 @@ nopath: lda #$3A
bne @L16 bne @L16
lsr ptr2 lsr ptr2
bcs ro ;read only bcs ro ;read only
lda __filetype
sta filet ;set filetype
ldx #252 ldx #252
@L20: lda pw-252,x @L20: lda pw-252,x
sta (sp),y ;write sta (sp),y ;write
@ -173,7 +177,7 @@ next: inc ptr2 ;next file number
inx inx
stx ptr2+1 stx ptr2+1
nextsa: inc ptr2+1 ;next channel nextsa: inc ptr2+1 ;next channel
lda ptr2 ;file number retr: lda ptr2 ;file number
ldx __curunit ldx __curunit
ldy ptr2+1 ;secondary address ldy ptr2+1 ;secondary address
jsr SETLFS jsr SETLFS
@ -201,10 +205,10 @@ nextsa: inc ptr2+1 ;next channel
lda ptr2 lda ptr2
jsr CLOSE ;close jsr CLOSE ;close
pla pla
ldx ptr1
cmp #$37 ;no channel? cmp #$37 ;no channel?
bne error bne nnoc
lda ptr1 cpx #$30
cmp #$30
bne error ;not no channel bne error ;not no channel
lda ptr2+1 lda ptr2+1
cmp #14 cmp #14
@ -227,6 +231,37 @@ error: lda #$FF
tax ;failed tax ;failed
bne ret bne ret
nnoc: inc ptr3
bne error ;no retry
cmp #$36
bne error ;no exists
cpx #$33
bne error
ldx cmdc
jsr CHKOUT
bcs error
lda FNL
sec
sbc #5
tax
lda #$53 ;scratch
jsr CHROUT
ldy #1
@L4: lda (FN),y
iny
jsr CHROUT
dex
bne @L4
lda #$3D
jsr CHROUT
iny
lda (FN),y
jsr CHROUT
lda #$0d
jsr CHROUT
jsr CLRCHN
jmp retr
.proc _pfs_read .proc _pfs_read
jsr pfs_rwcommon ; pop params, check handle jsr pfs_rwcommon ; pop params, check handle
beq error2 ; not open beq error2 ; not open