Changeset 152 for sbliveos2/trunk/drv16/init.cpp

Timestamp:

Jul 17, 2000, 8:37:33 PM (25 years ago)

Author:

sandervl

Message:

misc updates

File:

• sbliveos2/trunk/drv16/init.cpp (modified) (5 diffs)

sbliveos2/trunk/drv16/init.cpp

@@ -55 +55 @@
 #include <include.h>                   // Pragmas and more.
 #include <sbversion.h>
+#include "commdbg.h"
+#include <dbgos2.h>
 
 #ifndef PCI_VENDOR_ID_CREATIVE
@@ -72 +74 @@
 static char NEWLINE[]     = "\r\n";
 static char szSBLiveNotFound[] = "SB Live! hardware not detected!";
-static char szAltF1[]     = "Reboot, press Alt-F1 during OS/2 startup and select Enable Hardware Detection";
+static char szSBLiveConfig1[]  = "SB Live! configuration: IRQ ";
+static char szSBLiveConfig2[]  = ", IO Port 0x";
+
 
 //
@@ -78 +82 @@
 // Name is copied from header at runtime.
 //
-char  szPddName [9]  = {0};
+char  szPddName[9]  = {0};
+char  digit[16]     = {0};
 
 ResourceManager* pRM = 0;               // Resource manager object.
@@ -122 +127 @@
 
         DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
-        DosWrite(1, (VOID FAR*)szSBLive, strlen(szSBLive), &result);
+        DosWrite(1, (VOID FAR*)szSBLive, sizeof(szSBLive)-1, &result);
         DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
 
@@ -137 +142 @@
       return;
    }
-   else if (pRM->getState() != rmDriverCreated) {
-      return;
-   }
 
    //SvL: Check if SB Live hardware has been detected by the resource manager
-   //     If not, tell user to reboot, press alt-f1 and enable hardware detection
-   if(!pRM->bIsDevDetected(PCI_ID, SEARCH_ID_DEVICEID, TRUE)) {
+   if(pRM->getState() != rmDriverCreated || !pRM->bIsDevDetected(PCI_ID, SEARCH_ID_DEVICEID, TRUE)) 
+   {
+hardware_notfound:
         USHORT result;
 
-        DosWrite(1, (VOID FAR*)szSBLiveNotFound, strlen(szSBLiveNotFound), &result);
-        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
-        DosWrite(1, (VOID FAR*)szAltF1, sizeof(szAltF1), &result);
+        DosWrite(1, (VOID FAR*)szSBLiveNotFound, sizeof(szSBLiveNotFound)-1, &result);
+        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
         DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
         return;
    }
+   LDev_Resources *pResources = pRM->pGetDevResources(PCI_ID, SEARCH_ID_DEVICEID, TRUE);
+   if ((!pResources) || pResources->isEmpty()) {
+        goto hardware_notfound;
+   }
+
+   if (fVerbose) {
+        USHORT result;
+
+        DecWordToASCII(digit, (USHORT)pResources->uIRQLevel[0], 0);
+        DosWrite(1, (VOID FAR*)szSBLiveConfig1, sizeof(szSBLiveConfig1)-1, &result);
+        DosWrite(1, (VOID FAR*)digit, strlen(digit), &result);
+
+        DosWrite(1, (VOID FAR*)szSBLiveConfig2, sizeof(szSBLiveConfig2)-1, &result);
+        HexWordToASCII(digit, pResources->uIOBase[0], 0);
+        DosWrite(1, (VOID FAR*)digit, strlen(digit), &result);
+
+        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
+        DosWrite(1, (VOID FAR*)NEWLINE, sizeof(NEWLINE)-1, &result);
+   }
+   delete pResources;
 
    // Build the MPU401 object only if we got a good 2115 init.