Changeset 504 for GPL/branches/uniaud32-2.1.x/drv32/init.c

Timestamp:

Jul 11, 2010, 7:42:10 AM (15 years ago)

Author:

David Azarewicz

Message:

Bring branch up-to-date with trunk

File:

• GPL/branches/uniaud32-2.1.x/drv32/init.c (modified) (8 diffs)

GPL/branches/uniaud32-2.1.x/drv32/init.c

@@ -36 +36 @@
 #include <ossidc32.h>
 #include <dbgos2.h>
-#include <printfos2.h>
 #include <irqos2.h>
 //#include <bsedos16.h>
@@ -43 +42 @@
 #endif
 #include "parse.h"
+#include "malloc.h"
 
 const char ERR_ERROR[]   = "ERROR: ";
@@ -68 +68 @@
 extern "C" int sprintf (char *buffer, const char *format, ...);
 
-extern "C" int wrOffset;
-extern "C" char *szprintBuf;
 extern "C" APIRET APIENTRY DOS16OPEN(PSZ pszFileName, PHFILE phf, PULONG pulAction, ULONG cbFile, ULONG ulAttribute, ULONG fsOpenFlags, ULONG fsOpenMode, PEAOP2 peaop2 );
 extern "C" APIRET APIENTRY DOS16CLOSE(HFILE hFile);
 extern "C" APIRET APIENTRY DOS16WRITE(HFILE hFile, PVOID pBuffer, ULONG cbWrite, PULONG pcbActual);
 extern "C" void SaveBuffer(void);
+
+#define VMDHA_FIXED             0x0002
+
+extern "C" APIRET VMAlloc(ULONG size, ULONG flags, char NEAR* *pAddr);
 
 //Print messages with DosWrite when init is done or has failed (see startup.asm)
@@ -91 +93 @@
 }
 
-void _cdecl printfos2(char *string)
-{
-   DevSaveMessage(string, strlen(string));
-}
-
 //SvL: Lock our 32 bits data & code segments
-int LockSegments(void) 
+int LockSegments(void)
 {
 #ifdef KEE
@@ -194 +191 @@
 #endif
 // Initialize device driver
-WORD32 DiscardableInit(RPInit __far* rp)  
+WORD32 DiscardableInit(RPInit __far* rp)
 {
     char        debugmsg[64];
@@ -209 +206 @@
     }
 
+        DebugLevel = 1;
     rp->Out.FinalCS = 0;
     rp->Out.FinalDS = 0;
+
+        if ( szprintBuf == 0 ) {
+                VMAlloc( DBG_MAX_BUF_SIZE, VMDHA_FIXED, &szprintBuf );
+                if (szprintBuf) {
+                        memset( szprintBuf, 0, DBG_MAX_BUF_SIZE );
+                        wrOffset= 0;
+                }
+        }
+        if (!HeapInit(HEAP_SIZE)) {
+                dprintf(("HeapInit failed!"));
+        }
 
     args = MAKE_FARPTR32(rp->In.Args);
@@ -268 +277 @@
 #if 0
         for(int i=1;i<OSS32_MAX_AUDIOCARDS;i++) {
-            if(OSS32_QueryNames(i, szDeviceName, sizeof(szDeviceName), szMixerName, sizeof(szMixerName)) == OSSERR_SUCCESS) 
+            if(OSS32_QueryNames(i, szDeviceName, sizeof(szDeviceName), szMixerName, sizeof(szMixerName)) == OSSERR_SUCCESS)
             {
                 WriteString(szDeviceName, strlen(szDeviceName));
@@ -281 +290 @@
         WriteString(szEOL, sizeof(szEOL)-1);
     }
-#ifdef DEBUG
-    dprintf(("DiscardableInit. cp1"));
-#endif
     // Complete the installation
     rp->Out.FinalCS = _OffsetFinalCS16;
     rp->Out.FinalDS = _OffsetFinalDS16;
-#ifdef DEBUG
-    dprintf(("DiscardableInit. cp2"));
-#endif
-
-//    SaveBuffer();
+
+        //SaveBuffer();
 
     // Confirm a successful installation