Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-01-21 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/disasm'

Browse Source
This commit is contained in:
Joshua Bell 2018-12-27 18:41:32 -08:00
commit 245cf779f1
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
desktop/desktop_main.s
View File

@ -161,7 +161,7 @@ loop_counter:
L40E0: tsx
stx saved_stack
sta menu_click_params::item_num
jsr cmd_check_single_drive
jsr cmd_check_single_drive_by_menu
copy #0, menu_click_params::item_num
rts
@ -2116,8 +2116,8 @@ L5077: iny
jsr jt_eject
L5084: ldx L5098
lda $1800,x
sta unit_number_to_refresh
jsr cmd_check_single_drive_C0
sta drive_to_refresh ; icon number
jsr cmd_check_single_drive_by_icon_number
dec L5098
bpl L5084
jmp redraw_windows_and_desktop
@ -2451,8 +2451,10 @@ done: jsr DESKTOP_COPY_FROM_BUF
;;; ============================================================
;; Set after format, erase, failed open, etc.
unit_number_to_refresh:
;;; Set after format, erase, failed open, etc.
;;; Used by 'cmd_check_single_drive_by_XXX'; may be unit number
;;; or device index depending on call site.
drive_to_refresh:
.byte 0
;;; ============================================================
@ -2465,9 +2467,9 @@ unit_number_to_refresh:
lda #$04
jsr dynamic_routine_800
bne :+
stx unit_number_to_refresh
stx drive_to_refresh ; unit number
jsr redraw_windows_and_desktop
jsr cmd_check_single_drive_80
jsr cmd_check_single_drive_by_unit_number
: jmp redraw_windows_and_desktop
fail: rts
@ -2484,9 +2486,9 @@ fail: rts
jsr dynamic_routine_800
bne done
stx unit_number_to_refresh
stx drive_to_refresh ; unit number
jsr redraw_windows_and_desktop
jsr cmd_check_single_drive_80
jsr cmd_check_single_drive_by_unit_number
done: jmp redraw_windows_and_desktop
.endproc
@ -2589,9 +2591,9 @@ L5403: jsr close_window
finish_with_vols:
ldx selected_vol_icon_count
: lda selected_vol_icon_list,x
sta unit_number_to_refresh
jsr cmd_check_single_drive_C0
: lda selected_vol_icon_list,x ; BUG: off by one?
sta drive_to_refresh ; icon number
jsr cmd_check_single_drive_by_icon_number
ldx selected_vol_icon_count
dec selected_vol_icon_count
dex
@ -3295,19 +3297,22 @@ pending_alert:
;;; ============================================================
;;; Check > [drive] command - obsolete, but core still used
;;; following Format (etc)
;;;
.proc cmd_check_single_drive
;; Check Drive command
by_menu:
lda #$00
beq start
;; After format/erase
flag_80:
by_unit_number:
lda #$80
bne start
;; After open/eject/rename
flag_C0:
by_icon_number:
lda #$C0
start: sta check_drive_flags
@ -3320,8 +3325,8 @@ start: sta check_drive_flags
;;; --------------------------------------------------
;;; After an Open/Eject/Rename action
;; Map unit number to icon number
lda unit_number_to_refresh
;; Map icon number to index in DEVLST
lda drive_to_refresh
ldy #15
: cmp device_to_icon_map,y
beq :+
@ -3336,9 +3341,9 @@ start: sta check_drive_flags
;;; After a Format/Erase action
after_format_erase:
;; Map unit number to device index (???)
;; Map unit number to index in DEVLST
ldy DEVCNT
lda unit_number_to_refresh
lda drive_to_refresh
: cmp DEVLST,y
beq :+
dey
@ -3459,8 +3464,9 @@ check_drive_flags:
.endproc
cmd_check_single_drive_80 := cmd_check_single_drive::flag_80
cmd_check_single_drive_C0 := cmd_check_single_drive::flag_C0
cmd_check_single_drive_by_menu := cmd_check_single_drive::by_menu
cmd_check_single_drive_by_unit_number := cmd_check_single_drive::by_unit_number
cmd_check_single_drive_by_icon_number := cmd_check_single_drive::by_icon_number
;;; ============================================================
@ -5956,8 +5962,8 @@ L72A8: .word 0
lda selected_window_index
bne :+
lda icon_params2
sta unit_number_to_refresh
jsr cmd_check_single_drive_C0
sta drive_to_refresh ; icon number
jsr cmd_check_single_drive_by_icon_number
: ldx saved_stack
txs
done: rts