Skip to content

Commit

Permalink
Import Mini vMac 37 Alpha Version 200926
Browse files Browse the repository at this point in the history
  • Loading branch information
zydeco committed Sep 30, 2020
1 parent b202ed4 commit f076203
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 30 deletions.
35 changes: 29 additions & 6 deletions extras/mydriver/disk/mydriver.a
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; mydriver.a
;
; Copyright (C) 2004 Paul C. Pratt
; Copyright (C) 2020 Paul C. Pratt, Jesus A. Alvarez
;
; You can redistribute this file and/or modify it under the terms
; of version 2 of the GNU General Public License as published by
Expand Down Expand Up @@ -179,12 +179,19 @@ RomBase EQU $00400000
Lea.L (DrvQHdr),A1
Jmp (RomBase + 2848)

VBLTaskFreq EQU $0E19
; about once a minute, often enough that
; a problem with VBLTaskProc noticable.

VBLTaskProc
MOVE.W VBLTaskFreq, $000A(A0)
; fall through to return

NullTaskProc
RTS

DOpen
MOVEM.L D3-D7/A3,-(A7)
MOVEM.L D3-D7/A3-A4,-(A7)
MOVEM.L A0-A1, -(SP) ; push ParmBlkPtr, DCtlPtr for C

SUBQ #6, A7 ; room for result code, L
Expand All @@ -209,12 +216,12 @@ DOpen
BNE @2
MOVE.L D7,D0
DC.W $A71E ; _NewPtr ,Sys,Clear
MOVEA.L A0,A3
MOVE.L A3,D0
MOVEA.L A0,A4
MOVE.L A4,D0
BEQ @6

SUBA #16, A7 ; room for various results
MOVE.L A3, -(A7)
MOVE.L A4, -(A7)
MOVE.L D7, -(A7)
SUBQ #2, A7 ; room for result code
MOVE.W #kCmndSonyOpenB, -(A7)
Expand All @@ -238,6 +245,22 @@ DOpen
TST.W D0
BNE.S @2


; Patch from Jesus A. Alvarez:
; The program Winter Games by Epyx manipulates
; the VBL queue directly, and will break if the
; queue was empty. Add a VBL task to prevent this
; (like the real disk driver does).

; MOVE.L #14, D0
; DC.W $A71E ; _NewPtr ,Sys,Clear
LEA 48(A4), A0
LEA VBLTaskProc,A1
MOVE.W #1,$0004(A0) ; task type
MOVE.L A1,$0006(A0) ; task procedure
MOVE.W VBLTaskFreq,$000A(A0)
DC.W $A033 ; _VInstall

MOVE.L A3,D0
BEQ.S @3

Expand Down Expand Up @@ -287,7 +310,7 @@ DOpen
; result code should be in D0 when reach here

MOVEM.L (A7)+, A0-A1 ; restore ParmBlkPtr, DCtlPtr
MOVEM.L (A7)+, D3-D7/A3
MOVEM.L (A7)+, D3-D7/A3-A4

RTS ; open is always immediate, must return via RTS
@6
Expand Down
52 changes: 28 additions & 24 deletions src/ROMEMDEV.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,59 +44,63 @@ LOCALVAR const ui3b sony_driver[] = {
68k machine code, compiled from mydriver.a
*/
0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0xEE, 0x00, 0x18, 0x00, 0x24, 0x00, 0x4A,
0x00, 0xF4, 0x00, 0x18, 0x00, 0x24, 0x00, 0x4A,
0x00, 0x8A, 0x05, 0x2E, 0x53, 0x6F, 0x6E, 0x79,
0x48, 0xE7, 0x00, 0xC0, 0x55, 0x4F, 0x3F, 0x3C,
0x00, 0x01, 0x60, 0x30, 0x48, 0xE7, 0x00, 0xC0,
0x55, 0x4F, 0x3F, 0x3C, 0x00, 0x02, 0x41, 0xFA,
0x01, 0x84, 0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F,
0x01, 0xA4, 0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F,
0x5C, 0x4F, 0x30, 0x1F, 0x4C, 0xDF, 0x03, 0x00,
0x0C, 0x68, 0x00, 0x01, 0x00, 0x1A, 0x66, 0x1E,
0x4E, 0x75, 0x48, 0xE7, 0x00, 0xC0, 0x55, 0x4F,
0x3F, 0x3C, 0x00, 0x03, 0x41, 0xFA, 0x01, 0x5E,
0x3F, 0x3C, 0x00, 0x03, 0x41, 0xFA, 0x01, 0x7E,
0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F, 0x5C, 0x4F,
0x30, 0x1F, 0x4C, 0xDF, 0x03, 0x00, 0x32, 0x28,
0x00, 0x06, 0x08, 0x01, 0x00, 0x09, 0x67, 0x0C,
0x4A, 0x40, 0x6F, 0x02, 0x42, 0x40, 0x31, 0x40,
0x00, 0x10, 0x4E, 0x75, 0x4A, 0x40, 0x6F, 0x04,
0x42, 0x40, 0x4E, 0x75, 0x2F, 0x38, 0x08, 0xFC,
0x4E, 0x75, 0x48, 0xE7, 0x00, 0xC0, 0x55, 0x4F,
0x3F, 0x3C, 0x00, 0x04, 0x41, 0xFA, 0x01, 0x1E,
0x3F, 0x3C, 0x00, 0x04, 0x41, 0xFA, 0x01, 0x3E,
0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F, 0x5C, 0x4F,
0x30, 0x1F, 0x4C, 0xDF, 0x03, 0x00, 0x4E, 0x75,
0x48, 0xE7, 0xE0, 0xC0, 0x20, 0x2F, 0x00, 0x14,
0x59, 0x4F, 0x2F, 0x00, 0x55, 0x4F, 0x3F, 0x3C,
0x00, 0x08, 0x41, 0xFA, 0x00, 0xF8, 0x2F, 0x18,
0x00, 0x08, 0x41, 0xFA, 0x01, 0x18, 0x2F, 0x18,
0x20, 0x50, 0x20, 0x8F, 0x5C, 0x4F, 0x32, 0x1F,
0x58, 0x4F, 0x20, 0x1F, 0x4A, 0x41, 0x66, 0x06,
0x30, 0x7C, 0x00, 0x07, 0xA0, 0x2F, 0x4C, 0xDF,
0x03, 0x07, 0x58, 0x4F, 0x4E, 0x73, 0x21, 0x40,
0x00, 0x06, 0x43, 0xF8, 0x03, 0x08, 0x4E, 0xF9,
0x00, 0x40, 0x0B, 0x20, 0x4E, 0x75, 0x48, 0xE7,
0x1F, 0x10, 0x48, 0xE7, 0x00, 0xC0, 0x5D, 0x4F,
0x3F, 0x3C, 0x00, 0x05, 0x41, 0xFA, 0x00, 0xB6,
0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F, 0x5C, 0x4F,
0x30, 0x1F, 0x2E, 0x1F, 0x0C, 0x40, 0xFF, 0xCF,
0x66, 0x06, 0x42, 0x40, 0x60, 0x00, 0x00, 0x8E,
0x4A, 0x40, 0x66, 0x00, 0x00, 0x88, 0x20, 0x07,
0xA7, 0x1E, 0x26, 0x48, 0x20, 0x0B, 0x67, 0x00,
0x00, 0x86, 0x9E, 0xFC, 0x00, 0x10, 0x2F, 0x0B,
0x2F, 0x07, 0x55, 0x4F, 0x3F, 0x3C, 0x00, 0x06,
0x41, 0xFA, 0x00, 0x7A, 0x2F, 0x18, 0x20, 0x50,
0x20, 0x8F, 0x5C, 0x4F, 0x30, 0x1F, 0x50, 0x4F,
0x2E, 0x1F, 0x76, 0x00, 0x36, 0x1F, 0x38, 0x1F,
0x3C, 0x1F, 0x3A, 0x1F, 0x26, 0x5F, 0x4A, 0x40,
0x66, 0x4A, 0x20, 0x0B, 0x67, 0x0E, 0x41, 0xFA,
0xFF, 0x8C, 0x27, 0x48, 0x00, 0x06, 0x20, 0x4B,
0xA0, 0x58, 0x60, 0x1A, 0x41, 0xFA, 0xFF, 0x70,
0x00, 0x40, 0x0B, 0x20, 0x31, 0x78, 0x0E, 0x19,
0x00, 0x0A, 0x4E, 0x75, 0x48, 0xE7, 0x1F, 0x18,
0x48, 0xE7, 0x00, 0xC0, 0x5D, 0x4F, 0x3F, 0x3C,
0x00, 0x05, 0x41, 0xFA, 0x00, 0xD0, 0x2F, 0x18,
0x20, 0x50, 0x20, 0x8F, 0x5C, 0x4F, 0x30, 0x1F,
0x2E, 0x1F, 0x0C, 0x40, 0xFF, 0xCF, 0x66, 0x06,
0x42, 0x40, 0x60, 0x00, 0x00, 0xA8, 0x4A, 0x40,
0x66, 0x00, 0x00, 0xA2, 0x20, 0x07, 0xA7, 0x1E,
0x28, 0x48, 0x20, 0x0C, 0x67, 0x00, 0x00, 0xA0,
0x9E, 0xFC, 0x00, 0x10, 0x2F, 0x0C, 0x2F, 0x07,
0x55, 0x4F, 0x3F, 0x3C, 0x00, 0x06, 0x41, 0xFA,
0x00, 0x94, 0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F,
0x5C, 0x4F, 0x30, 0x1F, 0x50, 0x4F, 0x2E, 0x1F,
0x76, 0x00, 0x36, 0x1F, 0x38, 0x1F, 0x3C, 0x1F,
0x3A, 0x1F, 0x26, 0x5F, 0x4A, 0x40, 0x66, 0x64,
0x41, 0xEC, 0x00, 0x30, 0x43, 0xFA, 0xFF, 0x86,
0x31, 0x7C, 0x00, 0x01, 0x00, 0x04, 0x21, 0x49,
0x00, 0x06, 0x31, 0x78, 0x0E, 0x19, 0x00, 0x0A,
0xA0, 0x33, 0x20, 0x0B, 0x67, 0x0E, 0x41, 0xFA,
0xFF, 0x72, 0x27, 0x48, 0x00, 0x06, 0x20, 0x4B,
0xA0, 0x58, 0x60, 0x1A, 0x41, 0xFA, 0xFF, 0x50,
0x30, 0x3C, 0xA0, 0x4E, 0xA0, 0x47, 0x60, 0x0E,
0x20, 0x47, 0x30, 0x06, 0x48, 0x40, 0x30, 0x05,
0xA0, 0x4E, 0xDE, 0x83, 0x52, 0x46, 0x51, 0xCC,
0xFF, 0xF0, 0x48, 0x7A, 0xFF, 0x1C, 0x55, 0x4F,
0xFF, 0xF0, 0x48, 0x7A, 0xFE, 0xFC, 0x55, 0x4F,
0x3F, 0x3C, 0x00, 0x07, 0x41, 0xFA, 0x00, 0x1E,
0x2F, 0x18, 0x20, 0x50, 0x20, 0x8F, 0x5C, 0x4F,
0x30, 0x1F, 0x58, 0x4F, 0x4C, 0xDF, 0x03, 0x00,
0x4C, 0xDF, 0x08, 0xF8, 0x4E, 0x75, 0x30, 0x3C,
0x4C, 0xDF, 0x18, 0xF8, 0x4E, 0x75, 0x30, 0x3C,
0xFF, 0xFF, 0x60, 0xF0
};
#endif
Expand Down
1 change: 1 addition & 0 deletions src/SONYEMDV.c
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,7 @@ struct MyDriverDat_R {
ui4b NumDrives; /* 24 */
ui4b DiskExtn; /* 26 */
TMTask NullTask; /* 28 */
VBLTask NullVBLTask; /* 48 */
/* total size must be <= FirstDriveVarsOffset */
};

Expand Down

0 comments on commit f076203

Please sign in to comment.