From 53dcca3bfcbe7780a47a761f6dc399ebf0873580 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Mon, 5 Mar 2018 21:27:41 -0800 Subject: [PATCH] constants --- desktop/desktop.s | 14 +++++++------- desktop/sys.s | 18 +++++++++--------- inc/prodos.inc | 6 ++++++ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/desktop/desktop.s b/desktop/desktop.s index 8c93c76..34f4446 100644 --- a/desktop/desktop.s +++ b/desktop/desktop.s @@ -7416,7 +7416,7 @@ L4F68: .byte $00 L4F69: .byte $00 ;; access = destroy/rename/write/read - DEFINE_CREATE_PARAMS create_params, path_buffer, %11000011, FT_DIRECTORY,, ST_LINKED_DIRECTORY + DEFINE_CREATE_PARAMS create_params, path_buffer, ACCESS_DEFAULT, FT_DIRECTORY,, ST_LINKED_DIRECTORY path_buffer: .res 65, 0 ; buffer is used elsewhere too @@ -15487,7 +15487,7 @@ L972E: .res 5, 0 DEFINE_OPEN_PARAMS open_params5, $1FC0, $1100 DEFINE_READ_PARAMS read_params6, $1500, $AC0 DEFINE_WRITE_PARAMS write_params, $1500, $AC0 - DEFINE_CREATE_PARAMS create_params3, $1FC0, %11000011 + DEFINE_CREATE_PARAMS create_params3, $1FC0, ACCESS_DEFAULT DEFINE_CREATE_PARAMS create_params2, $1FC0 .byte $00,$00 @@ -15814,7 +15814,7 @@ L9AAA: lda file_info_params2,y dey cpy #$02 bne L9AAA - lda #%11000011 + lda #ACCESS_DEFAULT sta create_params2::access lda LE05B beq L9B23 @@ -16308,7 +16308,7 @@ L9F62: yax_call JT_MLI_RELAY, GET_FILE_INFO, file_info_params2 lda file_info_params2::access and #$80 bne L9F8D - lda #$C3 + lda #ACCESS_DEFAULT sta file_info_params2::access lda #7 ; param count for SET_FILE_INFO sta file_info_params2 @@ -16366,7 +16366,7 @@ L9FC2: yax_call JT_MLI_RELAY, DESTROY, destroy_params bne LA001 L9FFE: jmp LA39F -LA001: lda #$C3 +LA001: lda #ACCESS_DEFAULT sta file_info_params2::access lda #7 ; param count for SET_FILE_INFO sta file_info_params2 @@ -16531,7 +16531,7 @@ LA18A: lda file_info_params2::storage_type beq LA1C0 bit L918B bpl LA19E - lda #%11000011 + lda #ACCESS_DEFAULT bne LA1A0 LA19E: lda #$21 LA1A0: sta file_info_params2::access @@ -16834,7 +16834,7 @@ LA425: .byte 0 .proc LA426 jsr LA46D - lda #$C3 + lda #ACCESS_DEFAULT sta file_info_params3::access jsr LA479 lda file_info_params2::file_type diff --git a/desktop/sys.s b/desktop/sys.s index ce230a1..363d7de 100644 --- a/desktop/sys.s +++ b/desktop/sys.s @@ -85,7 +85,7 @@ L23DF: .byte $00,$00,$00 DEFINE_READ_PARAMS read_srcfile_params, copy_buffer, max_copy_count DEFINE_WRITE_PARAMS write_dstfile_params, copy_buffer, max_copy_count - DEFINE_CREATE_PARAMS create_params, path0, %11000011, 0, 0 + DEFINE_CREATE_PARAMS create_params, path0, ACCESS_DEFAULT, 0, 0 .byte $07 .addr path0 .byte $00 @@ -292,7 +292,7 @@ str_slash_desktop: .proc file_info_ovl .byte $A ; param_count .addr 0 ; pathname - .byte %11000011 ; access + .byte ACCESS_DEFAULT ; access .byte FT_DIRECTORY ; filetype .word 0 ; aux_type .byte ST_LINKED_DIRECTORY ; storage_type @@ -1007,7 +1007,7 @@ L30E0: .res 5, 0 DEFINE_READ_PARAMS read_params7, $1100, $0B00 DEFINE_WRITE_PARAMS write_params3, $1100, $0B00 - DEFINE_CREATE_PARAMS create_params3, path1, %11000011 + DEFINE_CREATE_PARAMS create_params3, path1, ACCESS_DEFAULT DEFINE_CREATE_PARAMS create_params2, path1, 0 @@ -1240,7 +1240,7 @@ L34EE: sta L353A dey cpy #3 bne :- - lda #%11000011 + lda #ACCESS_DEFAULT sta create_params2::access jsr L35A9 bcc L350B @@ -1252,9 +1252,9 @@ L350D: lda get_file_info_params2::create_date,x dex bpl L350D lda create_params2::storage_type - cmp #$0F + cmp #ST_VOLUME_DIRECTORY bne L3522 - lda #$0D + lda #ST_LINKED_DIRECTORY sta create_params2::storage_type L3522: MLI_CALL CREATE, create_params2 beq :+ @@ -1410,7 +1410,7 @@ L36C1: ldx #7 dex cpx #3 bne :- - lda #$C3 + lda #ACCESS_DEFAULT sta create_params3::access ldx #$03 L36D5: lda get_file_info_params2::create_date,x @@ -1418,9 +1418,9 @@ L36D5: lda get_file_info_params2::create_date,x dex bpl L36D5 lda create_params3::storage_type - cmp #$0F + cmp #ST_VOLUME_DIRECTORY bne L36EA - lda #$0D + lda #ST_LINKED_DIRECTORY sta create_params3::storage_type L36EA: MLI_CALL CREATE, create_params3 clc diff --git a/inc/prodos.inc b/inc/prodos.inc index f74b41b..958858a 100644 --- a/inc/prodos.inc +++ b/inc/prodos.inc @@ -89,6 +89,12 @@ FT_S16 := $B3 ; IIgs Application Program FT_BASIC := $FC FT_SYSTEM := $FF +;;; ============================================================ +;;; Access +;;; ============================================================ + +ACCESS_DEFAULT := %11000011 + ;;; ============================================================ ;;; Storage Types ;;; ============================================================