From fb0eb7cfda6d57191245853f0bb24569d49d0b1e Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Tue, 16 Jan 2018 21:16:31 -0700
Subject: [PATCH] DeskTop: MLI relay calls

---
 desktop/desktop.s | 132 +++++++++++++++++++++-------------------------
 inc/prodos.inc    |   2 +-
 2 files changed, 60 insertions(+), 74 deletions(-)

diff --git a/desktop/desktop.s b/desktop/desktop.s
index f9a8bb3..1191f68 100644
--- a/desktop/desktop.s
+++ b/desktop/desktop.s
@@ -5652,7 +5652,7 @@ L0D14           := $0D14
 
         ;; Jump table
 L4000:  jmp     L4042
-L4003:  jmp     A2D_RELAY
+JT_A2D_RELAY:  jmp     A2D_RELAY
 L4006:  jmp     L8259
 L4009:  jmp     L830F
         jmp     L5E78
@@ -5662,7 +5662,7 @@ L4015:  jmp     L40F2
 L4018:  jmp     DESKTOP_RELAY
         jmp     L8E81
 L401E:  jmp     L6D2B
-L4021:  jmp     MLI_RELAY
+JT_MLI_RELAY:  jmp     MLI_RELAY
         jmp     DESKTOP_COPY_TO_BUF
         jmp     DESKTOP_COPY_FROM_BUF
         jmp     L490E
@@ -7335,7 +7335,7 @@ L4F76:  .res    64
 
         lda     desktop_winid
         sta     L4F67
-        yax_call LA500, $4F67, $03
+        yax_call LA500, L4F67, $03
 L4FC6:  lda     desktop_winid
         beq     L4FD4
         jsr     L86FB
@@ -7343,7 +7343,7 @@ L4FC6:  lda     desktop_winid
         stx     L4F69
 L4FD4:  lda     #$80
         sta     L4F67
-        yax_call LA500, $4F67, $03
+        yax_call LA500, L4F67, $03
         beq     L4FE7
         jmp     L504B
 
@@ -7376,7 +7376,7 @@ L5000:  lda     DATELO,x
 
 L5027:  lda     #$40
         sta     L4F67
-        yax_call LA500, $4F67, $03
+        yax_call LA500, L4F67, $03
         lda     #$76
         ldx     #$4F
         jsr     L6F90
@@ -14769,14 +14769,8 @@ L91CE:  .byte   0
 L91D1:  stx     $E00A
         rts
 
-L91D5:  ldy     #$03
-        lda     #$39
-        ldx     #$D2
-        jsr     L4003
-        ldy     #$04
-        lda     #$39
-        ldx     #$D2
-        jsr     L4003
+L91D5:  yax_call JT_A2D_RELAY, $D239, $03
+        yax_call JT_A2D_RELAY, $D239, $04
         rts
 
 L91E8:  jsr     L4015
@@ -14895,7 +14889,8 @@ L92BD:  jmp     (L0006)
 
 L92C0:  .byte   $03
 L92C1:  .byte   $00,$C5,$92,$04,$00,$00
-L92C7:  .byte   $00,$00,$0A,$20,$02
+L92C7:  .byte   $00,$00
+L92C9:  .byte   $0A,$20,$02
 L92CC:  .byte   $00
 L92CD:  .byte   $00
 L92CE:  .byte   $00
@@ -14960,7 +14955,7 @@ L9343:  lda     (L0006),y
         dec     $0220
         lda     #$2F
         sta     $0221
-L9356:  yax_call L4021, $92C9, $C4
+L9356:  yax_call JT_MLI_RELAY, L92C9, GET_FILE_INFO
         beq     L9366
         jsr     LA49B
         beq     L9356
@@ -15001,9 +14996,9 @@ L93AD:  cmp     $E1A0,y
 
 L93B8:  lda     DEVLST,y
         sta     L92DE
-        yax_call L4021, $92DD, $80
+        yax_call JT_MLI_RELAY, $92DD, READ_BLOCK
         bne     L93DB
-        yax_call L4021, $92DD, $81
+        yax_call JT_MLI_RELAY, $92DD, WRITE_BLOCK
         cmp     #$2B
         bne     L93DB
         lda     #$80
@@ -15306,7 +15301,7 @@ L9674:  inx
         cpy     L9709
         bne     L9674
         stx     $1FC0
-        yax_call L4021, $9569, $C2
+        yax_call JT_MLI_RELAY, $9569, RENAME
         beq     L969E
         jsr     L4030
         bne     L9696
@@ -15445,7 +15440,7 @@ L97F3:  ldx     $E10C
 L9801:  lda     #$00
         sta     $E05F
         sta     $E10D
-L9809:  yax_call L4021, $970A, $C8
+L9809:  yax_call JT_MLI_RELAY, $970A, OPEN
         beq     L981E
         ldx     #$80
         jsr     L4033
@@ -15455,7 +15450,7 @@ L9809:  yax_call L4021, $970A, $C8
 L981E:  lda     L970F
         sta     $E060
         sta     L9711
-L9827:  yax_call L4021, $9710, $CA
+L9827:  yax_call JT_MLI_RELAY, $9710, READ
         beq     L983C
         ldx     #$80
         jsr     L4033
@@ -15466,7 +15461,7 @@ L983C:  jmp     L985B
 
 L983F:  lda     $E060
         sta     L971D
-L9845:  yax_call L4021, $971C, $CC
+L9845:  yax_call JT_MLI_RELAY, $971C, CLOSE
         beq     L985A
         ldx     #$80
         jsr     L4033
@@ -15478,7 +15473,7 @@ L985A:  rts
 L985B:  inc     $E05F
         lda     $E060
         sta     L971F
-L9864:  yax_call L4021, $971E, $CA
+L9864:  yax_call JT_MLI_RELAY, $971E, READ
         beq     L987D
         cmp     #$4C
         beq     L989F
@@ -15495,7 +15490,7 @@ L987D:  inc     $E10D
         sta     $E10D
         lda     $E060
         sta     L9727
-        yax_call L4021, $9726, $CA
+        yax_call JT_MLI_RELAY, $9726, READ
 L989C:  lda     #$00
         rts
 
@@ -15698,7 +15693,7 @@ L9A60:  iny
         cpy     $E04B
         bne     L9A60
         stx     $1FC0
-L9A70:  yax_call L4021, $9774, $C4
+L9A70:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     L9A81
         jsr     LA49B
         jmp     L9A70
@@ -15745,7 +15740,7 @@ L9AC8:  lda     L9774,y
         bne     L9AE0
         lda     #$0D
         sta     L976D
-L9AE0:  yax_call L4021, $9766, $C0
+L9AE0:  yax_call JT_MLI_RELAY, $9766, CREATE
         beq     L9B23
         cmp     #$47
         bne     L9B1D
@@ -15796,7 +15791,7 @@ L9B3E:  lda     L97BD
         cmp     #$0F
         bne     L9B88
         jsr     LA2FD
-L9B48:  yax_call L4021, $9774, $C4
+L9B48:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     L9B59
         jsr     LA49B
         jmp     L9B48
@@ -15824,7 +15819,7 @@ L9B7A:  jsr     LA360
 L9B88:  jsr     LA33B
         jsr     LA2FD
         jsr     LA40A
-L9B91:  yax_call L4021, $9774, $C4
+L9B91:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     L9BA2
         jsr     LA49B
         jmp     L9B91
@@ -15845,7 +15840,7 @@ L9BBE:  rts
 L9BBF:  yax_call LA500, $9937, $01
         rts
 
-L9BC9:  yax_call L4021, $9787, $C4
+L9BC9:  yax_call JT_MLI_RELAY, $9787, GET_FILE_INFO
         beq     L9BDA
         jsr     LA497
         jmp     L9BC9
@@ -15881,7 +15876,7 @@ L9C13:  lda     #$03
         sec
 L9C19:  rts
 
-L9C1A:  yax_call L4021, $9774, $C4
+L9C1A:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     L9C2B
         jsr     LA49B
         jmp     L9C1A
@@ -15889,7 +15884,7 @@ L9C1A:  yax_call L4021, $9774, $C4
 L9C2B:  lda     #$00
         sta     L9CD8
         sta     L9CD9
-L9C33:  yax_call L4021, $9787, $C4
+L9C33:  yax_call JT_MLI_RELAY, $9787, GET_FILE_INFO
         beq     L9C48
         cmp     #$46
         beq     L9C54
@@ -15912,7 +15907,7 @@ L9C5C:  iny
         tya
         sta     $1FC0
         sta     L9CD7
-L9C70:  yax_call L4021, $9787, $C4
+L9C70:  yax_call JT_MLI_RELAY, $9787, GET_FILE_INFO
         beq     L9C95
         pha
         lda     L9CD6
@@ -15984,7 +15979,7 @@ L9D0C:  jsr     L9DA9
 L9D17:  jsr     L9D81
         bne     L9D17
         jsr     L9D9C
-        yax_call L4021, $97A4, $CE
+        yax_call JT_MLI_RELAY, $97A4, SET_MARK
 L9D28:  bit     L9E18
         bmi     L9D51
         jsr     L9DE8
@@ -15993,7 +15988,7 @@ L9D28:  bit     L9E18
         jsr     L9E03
         jsr     L9D62
         jsr     L9D74
-        yax_call L4021, $979F, $CE
+        yax_call JT_MLI_RELAY, $979F, SET_MARK
         beq     L9D0C
         lda     #$FF
         sta     L9E18
@@ -16006,7 +16001,7 @@ L9D51:  jsr     L9E03
 L9D5C:  jsr     LA46D
         jmp     LA479
 
-L9D62:  yax_call L4021, $973E, $C8
+L9D62:  yax_call JT_MLI_RELAY, $973E, OPEN
         beq     L9D73
         jsr     LA49B
         jmp     L9D62
@@ -16019,7 +16014,7 @@ L9D74:  lda     L9743
         sta     L97A0
         rts
 
-L9D81:  yax_call L4021, $9744, $C8
+L9D81:  yax_call JT_MLI_RELAY, $9744, OPEN
         beq     L9D9B
         cmp     #$45
         beq     L9D96
@@ -16040,7 +16035,7 @@ L9DA9:  lda     #$C0
         sta     L974E
         lda     #$0A
         sta     L974F
-L9DB3:  yax_call L4021, $974A, $CA
+L9DB3:  yax_call JT_MLI_RELAY, $974A, READ
         beq     L9DC8
         cmp     #$4C
         beq     L9DD9
@@ -16055,21 +16050,21 @@ L9DC8:  lda     L9750
         bne     L9DDE
 L9DD9:  lda     #$FF
         sta     L9E18
-L9DDE:  yax_call L4021, $979F, $CF
+L9DDE:  yax_call JT_MLI_RELAY, $979F, GET_MARK
         rts
 
-L9DE8:  yax_call L4021, $9752, $CB
+L9DE8:  yax_call JT_MLI_RELAY, $9752, WRITE
         beq     L9DF9
         jsr     LA497
         jmp     L9DE8
 
-L9DF9:  yax_call L4021, $97A4, $CF
+L9DF9:  yax_call JT_MLI_RELAY, $97A4, GET_MARK
         rts
 
-L9E03:  yax_call L4021, $9739, $CC
+L9E03:  yax_call JT_MLI_RELAY, $9739, CLOSE
         rts
 
-L9E0D:  yax_call L4021, $9737, $CC
+L9E0D:  yax_call JT_MLI_RELAY, $9737, CLOSE
         rts
 
 L9E17:  .byte   0
@@ -16080,7 +16075,7 @@ L9E1B:  lda     L9774,x
         dex
         cpx     #$03
         bne     L9E1B
-L9E26:  yax_call L4021, $975A, $C0
+L9E26:  yax_call JT_MLI_RELAY, $975A, CREATE
         beq     L9E6F
         cmp     #$47
         bne     L9E69
@@ -16168,7 +16163,7 @@ L9EC1:  lda     L9E73,y
 L9EDB:  lda     #$03
         sta     L9E79
         jsr     LA379
-L9EE3:  yax_call L4021, $9774, $C4
+L9EE3:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     L9EF4
         jsr     LA49B
         jmp     L9EE3
@@ -16198,7 +16193,7 @@ L9F1E:  bit     $E05C
         bmi     L9F26
         jsr     LA3EF
 L9F26:  jsr     LA2F1
-L9F29:  yax_call L4021, $973B, $C1
+L9F29:  yax_call JT_MLI_RELAY, $973B, DESTROY
         beq     L9F8D
         cmp     #$4E
         bne     L9F8E
@@ -16222,7 +16217,7 @@ L9F29:  yax_call L4021, $973B, $C1
         bne     L9F62
 L9F5F:  jmp     LA39F
 
-L9F62:  yax_call L4021, $9774, $C4
+L9F62:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         lda     L9777
         and     #$80
         bne     L9F8D
@@ -16230,7 +16225,7 @@ L9F62:  yax_call L4021, $9774, $C4
         sta     L9777
         lda     #$07
         sta     L9774
-        yax_call L4021, $9774, $C3
+        yax_call JT_MLI_RELAY, $9774, SET_FILE_INFO
         lda     #$0A
         sta     L9774
         jmp     L9F29
@@ -16249,7 +16244,7 @@ L9F9C:  jsr     LA2FD
         bmi     L9FA7
         jsr     LA3EF
 L9FA7:  jsr     LA2F1
-L9FAA:  yax_call L4021, $9774, $C4
+L9FAA:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     L9FBB
         jsr     LA49B
         jmp     L9FAA
@@ -16257,7 +16252,7 @@ L9FAA:  yax_call L4021, $9774, $C4
 L9FBB:  lda     L977B
         cmp     #$0D
         beq     LA022
-L9FC2:  yax_call L4021, $973B, $C1
+L9FC2:  yax_call JT_MLI_RELAY, $973B, DESTROY
         beq     LA022
         cmp     #$4E
         bne     LA01C
@@ -16285,7 +16280,7 @@ LA001:  lda     #$C3
         sta     L9777
         lda     #$07
         sta     L9774
-        yax_call L4021, $9774, $C3
+        yax_call JT_MLI_RELAY, $9774, SET_FILE_INFO
         lda     #$0A
         sta     L9774
         jmp     L9FC2
@@ -16300,7 +16295,7 @@ LA022:  jmp     LA322
         sta     L9923
         rts
 
-LA02E:  yax_call L4021, $973B, $C1
+LA02E:  yax_call JT_MLI_RELAY, $973B, DESTROY
         beq     LA043
         cmp     #$4E
         beq     LA043
@@ -16416,7 +16411,7 @@ LA123:  iny
         cpy     $0220
         bne     LA123
         stx     $1FC0
-LA133:  yax_call L4021, $9774, $C4
+LA133:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     LA144
         jsr     LA49B
         jmp     LA133
@@ -16446,7 +16441,7 @@ LA16A:  jsr     LA173
         jsr     LA2FD
 LA173:  jsr     LA1C3
         jsr     LA2F1
-LA179:  yax_call L4021, $9774, $C4
+LA179:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     LA18A
         jsr     LA49B
         jmp     LA179
@@ -16464,7 +16459,7 @@ LA19E:  lda     #$21
 LA1A0:  sta     L9777
 LA1A3:  lda     #$07
         sta     L9774
-        yax_call L4021, $9774, $C3
+        yax_call JT_MLI_RELAY, $9774, SET_FILE_INFO
         pha
         lda     #$0A
         sta     L9774
@@ -16545,7 +16540,7 @@ LA26A:  sta     BITMAP,y
         rts
 
 LA271:  jsr     LA379
-LA274:  yax_call L4021, $9774, $C4
+LA274:  yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         beq     LA285
         jsr     LA49B
         jmp     LA274
@@ -16574,7 +16569,7 @@ LA2AB:  jmp     LA2AE
 LA2AE:  bit     L9189
         bvc     LA2D4
         jsr     LA2FD
-        yax_call L4021, $9774, $C4
+        yax_call JT_MLI_RELAY, $9774, GET_FILE_INFO
         bne     LA2D4
         lda     LA2EF
         clc
@@ -16697,27 +16692,18 @@ LA39F:  jsr     L917F
         jmp     LA3A7
 
         .byte   1, 0
-LA3A7:  yax_call L4021, $A3A5, $CC
+LA3A7:  yax_call JT_MLI_RELAY, $A3A5, CLOSE
         lda     selected_window_index
         beq     LA3CA
         sta     query_state_params2::id
-        ldy     #$3C
-        lda     #$12
-        ldx     #$D2
-        jsr     L4003
-        ldy     #$04
-        lda     #$15
-        ldx     #$D2
-        jsr     L4003
+        yax_call JT_A2D_RELAY, $D212, $3C
+        yax_call JT_A2D_RELAY, $D215, $04
 LA3CA:  ldx     L9188
         txs
         lda     #$FF
         rts
 
-LA3D1:  ldy     #$2A
-        lda     #$08
-        ldx     #$D2
-        jsr     L4003
+LA3D1:  yax_call JT_A2D_RELAY, $D208, $2A
         lda     input_params_state
         cmp     #A2D_INPUT_KEY
         bne     LA3EC
@@ -16757,7 +16743,7 @@ LA426:  jsr     LA46D
         lda     L9778
         cmp     #$0F
         beq     LA46C
-        yax_call L4021, $9744, $C8
+        yax_call JT_MLI_RELAY, $9744, OPEN
         beq     LA449
         jsr     LA497
         jmp     LA426
@@ -16765,12 +16751,12 @@ LA426:  jsr     LA46D
 LA449:  lda     L9749
         sta     L979B
         sta     L973A
-LA452:  yax_call L4021, $979A, $D0
+LA452:  yax_call JT_MLI_RELAY, $979A, SET_EOF
         beq     LA463
         jsr     LA497
         jmp     LA452
 
-LA463:  yax_call L4021, $9739, $CC
+LA463:  yax_call JT_MLI_RELAY, $9739, CLOSE
 LA46C:  rts
 
 LA46D:  ldx     #$0A
@@ -16782,7 +16768,7 @@ LA46F:  lda     L9777,x
 
 LA479:  lda     #$07
         sta     L9787
-        yax_call L4021, $9787, $C3
+        yax_call JT_MLI_RELAY, $9787, SET_FILE_INFO
         pha
         lda     #$0A
         sta     L9787
@@ -16818,7 +16804,7 @@ LA4BA:  jsr     L4030
 LA4C2:  jmp     LA39F
 
 LA4C5:  .byte   0
-LA4C6:  yax_call L4021, $97A9, $C5
+LA4C6:  yax_call JT_MLI_RELAY, $97A9, ON_LINE
         rts
 
         .res    48, 0
diff --git a/inc/prodos.inc b/inc/prodos.inc
index 061e8cb..4b23759 100644
--- a/inc/prodos.inc
+++ b/inc/prodos.inc
@@ -53,7 +53,7 @@ QUIT            := $65
 
 ;;; Direct Disk Access Commands
 READ_BLOCK      := $80
-WRITE_BLOCK     := $71
+WRITE_BLOCK     := $81
 
 ;;; ------------------------------------------------------------
 ;;; Device Types