Changeset 15

Timestamp:

May 10, 2018, 5:56:06 PM (7 years ago)

Author:

erdmann

Message:

add Valerys changes, update makefile to properly generate version and date info

Location:

trunk

Files:

• VFDisk.asm (modified) (8 diffs)
• VFDisk.def (deleted)
• makefile (modified) (1 diff)

trunk/VFDisk.asm ¶

@@ -19 +19 @@
 
 StdOut         =       1
-
-CMVERSION_MAJOR = 1
-CMVERSION_MINOR = 1
 
 DRF_STATIC      = 0
@@ -133 +130 @@
 DD_TableLen    =       ($ - DD_Functions) / 2
 
-MsgBoot        DB      0DH, 0AH, 'VFDISK 4.0 (c) 2003 D.Engert (2010 L. Erdmann), Drive '
+MsgBoot        DB      0DH, 0AH, 'VFDISK ',_VERMAJOR+'0','.',_VERMINOR+'0',' (c) 2003 D.Engert (2010 L. Erdmann), Drive '
 MsgDriveLetter DB      'A:', 0DH, 0AH
 MsgBootLen     =       $ - MsgBoot
@@ -244 +241 @@
 ddVendor       DB 'Daniela Engert (Lars Erdmann)',00H
 
-dStruct        DRIVERSTRUCT <ddName,ddDesc,ddVendor,CMVERSION_MAJOR,CMVERSION_MINOR,<2017,05,02>,DRF_STATIC,DRT_OS2,DRS_BLOCK,0>
+dStruct        DRIVERSTRUCT <ddName,ddDesc,ddVendor,_VERMAJOR,_VERMINOR,<_YEAR,_MONTH,_DAY>,DRF_STATIC,DRT_OS2,DRS_BLOCK,0>
 hDriver        DD 0
 
@@ -271 +268 @@
 
 Strategy       PROC    FAR
+               PUSH    BP
+               MOV     BP,SP
+               AND     SP,NOT 3
+               PUSH    ESI
+               PUSH    EDI
                MOV     DI, OFFSET DD_Table
                MOV     AL, BYTE PTR ES:[BX+2]
@@ -283 +285 @@
                OR      AX, 100h
                MOV     ES:[BX+3], AX
+               POP     EDI
+               POP     ESI
+               MOV     SP,BP
+               POP     BP
                RET
 Strategy       ENDP
@@ -437 +443 @@
                MOV     BX, [BufferLow]
                MOV     AX, [BufferHigh]
+               MOV     CX, [BPB.BpSector]
                MOV     DX, DevHlp_PhysToVirt + 100h
                CALL    [_Device_Help]
@@ -497 +504 @@
                MOV     BX, [BufferLow]
                MOV     AX, [BufferHigh]
+               MOV     CX, [BPB.BpSector]
                MOV     DX, DevHlp_PhysToVirt
                CALL    [_Device_Help]
@@ -647 +655 @@
                MOVZX   EAX, AX
                ADD     EDI, EAX
+
+               MOVZX   ECX, [BPB.numFATs]
+InitFATs:
                MOV     AL, [BPB.MediaDesc]
                MOV     ES:[EDI], AL
                MOV     WORD PTR ES:[EDI+1], 0FFFFH
+
+               DEC     ECX
+               JCXZ    InitFATs_exit
+
+               MOVZX   EAX, [BPB.SpFat]
+               MUL     [BPB.BpSector]
+               ADD     EDI, EAX
+
+               JMP     InitFATs
+InitFATs_exit:
 
                POP     DI

trunk/makefile ¶

@@ -1 @@
-VFDisk.sys: VFDisk.obj VFDisk.def
-  LINK /NOL /E /PACKC /PACKD /A:1 /MAP:FULL VFDisk.obj,VFDisk.sys,VFDisk.map,DOSCALLS.lib+OS2286p.lib+rmcalls.lib,VFDisk.def
+!ifndef DDK
+!error DDK must be defined in environment
+!endif
+
+!ifndef VERMAJOR
+!error Missing major version info for build ! Specify VERMAJOR as env var !
+!endif
+!ifndef VERMINOR
+!error Missing minor version info for build ! Specify VERMINOR as env var !
+!endif
+!ifndef DAY
+!error Missing day info for build ! Specify DAY as env var !
+!endif
+!ifndef MONTH
+!error Missing month info for build ! Specify MONTH as env var !
+!endif
+!ifndef YEAR
+!error Missing year info for build ! Specify YEAR as env var !
+!endif
+!ifndef VENDOR
+!error Missing vendor info for build ! Specify VENDOR as env var !
+!endif
+
+INC    = $(DDK)\base\inc
+H      = $(DDK)\base\h
+LIBS    = $(DDK)\base\lib
+TOOLSPATH = $(DDK)\base\tools
+TKTOOLS  = \ddktools\toolkits\masm60\binp
+
+!if [SET LIB=] || [SET INCLUDE=] || [set PATH=$(TKTOOLS);$(TOOLSPATH);$(PATH)]
+!endif
+
+!include      "$(H)\version.mak"
+_VERMAJOR = $(VERMAJOR)
+_VERMINOR = $(VERMINOR)
+_DAY      = $(DAY)
+_MONTH    = $(MONTH)
+_YEAR     = $(YEAR)
+_VENDOR  = $(VENDOR)
+_VERSION = $(_VERMAJOR).$(_VERMINOR)
+
+all: VFDisk.sys VFDISK.sym
+
+VFDisk.sys: VFDisk.obj makefile
+  Rem Create DEF file <<VFDisk.def
+LIBRARY VFDisk INITGLOBAL
+DESCRIPTION '$(FILEVER)Virtual Floppy Disk Device Driver'
+PROTMODE
+
+SEGMENTS
+ _DATA          CLASS 'DATA' PRELOAD
+ CONST          CLASS 'CONST' PRELOAD
+ _BSS           CLASS 'BSS'  PRELOAD
+ _TEXT          CLASS 'CODE' PRELOAD
+ RMCode         CLASS 'CODE' PRELOAD
+<<keep  
+  LINK /NOL /E /PACKC /PACKD /A:1 /MAP:FULL VFDisk.obj,VFDisk.sys,VFDisk.map,$(LIBS)\+DOSCALLS.lib+OS2286p.lib+rmcalls.lib,VFDisk.def
   NELITE $@ $@ /P:255 /A:1 /S /E+ /O-
 
+VFDISK.map: VFDISK.sys
+
+VFDISK.sym: VFDISK.map
+  MAPSYM $?
+
 VFDisk.obj: VFDisk.asm
-  ML /Fl /Zp1 /Zf /c $?
+  ML /Fl /Zp1 /Zf /I$(INC) /D_VERMAJOR=$(_VERMAJOR) /D_VERMINOR=$(_VERMINOR) /D_DAY=$(_DAY) /D_MONTH=$(_MONTH) /D_YEAR=$(_YEAR) /c $?