Changeset 1535 for trunk/src/win32k/dev16

Timestamp:

Nov 1, 1999, 12:57:09 AM (26 years ago)

Author:

bird

Message:

Updated option/argument handling.
Corrected a few bugs.

Location:

trunk/src/win32k/dev16

Files:

• d16init.c (modified) (2 diffs)
• probkrnl.c (modified) (7 diffs)

trunk/src/win32k/dev16/d16init.c

@@ -1 @@
-/* $Id: d16init.c,v 1.2 1999-10-27 02:02:53 bird Exp $
+/* $Id: d16init.c,v 1.3 1999-10-31 23:57:00 bird Exp $
  *
  * d16init - init routines for both drivers.
@@ -94 +94 @@
                 else
                 {
+                    /* FIXME quiet test! */
                     register NPSZ npsz = "Win32k.sys succesfully initiated!\n\r";
                     DosPutMessage(1, strlen(npsz)+1, npsz);

trunk/src/win32k/dev16/probkrnl.c

@@ -1 @@
-/* $Id: probkrnl.c,v 1.2 1999-10-27 02:02:53 bird Exp $
+/* $Id: probkrnl.c,v 1.3 1999-10-31 23:57:01 bird Exp $
  *
  * Description:   Autoprobes the os2krnl file and os2krnl[*].sym files.
@@ -6 +6 @@
  *                16-bit inittime code.
  *
- *                All data has to be initiated because this file is to be compiled into assembly,
- *                automaticly modified and run thru an assembler to produce an object-file. This
- *                because there is no other known way to combine 32-bit and 16-bit C/C++ code into
- *                the same device driver which works.
+ *                All data has to be initiated because this is 16-bit C code
+ *                and is to be linked with 32-bit C/C++ code. Uninitiazlied
+ *                data ends up in the BSS segment, and that segment can't
+ *                both be 32-bit and 16-bit. I have not found any other way
+ *                around this problem that initiating all data.
  *
  *                How this works:
@@ -86 +87 @@
 };
 
-unsigned long int   fInitSuccess = 0;
 unsigned long int   ulBuild      = 0;
 unsigned short      usVerMajor   = 0;
@@ -96 +96 @@
  */
 static int      fQuiet = 0;
-
 static char     szUsrOS2Krnl[50] = {0};
 static char     szOS2Krnl[]      = {"c:\\os2krnl"};
@@ -917 +916 @@
 /**
  * "main" function.
+ * Note that the option -Noloader causes nothing to be done.
  * @returns   0 on success, something else on error.
  * @param     pReqPack  Pointer to init request packet
  * @remark
- * @result    init_success
  */
 int ProbeKernel(PRPINITIN pReqPack)
@@ -943 +942 @@
             {
                 i++;
-                if (pReqPack->InitArgs[i] == 'V' || pReqPack->InitArgs[i] == 'v')
-                    fQuiet = 0;
-                else if (pReqPack->InitArgs[i] == 'Q' || pReqPack->InitArgs[i] == 'q')
-                    fQuiet = 1;
-                else if (pReqPack->InitArgs[i] == 'K' || pReqPack->InitArgs[i] == 'k')
-                {   /* kernel file */
-                    i++;
-                    i += kargncpy(szUsrOS2Krnl, &pReqPack->InitArgs[i], sizeof(szUsrOS2Krnl));
-                }
-                else if (pReqPack->InitArgs[i] == 'S' || pReqPack->InitArgs[i] == 's')
-                {   /* symbol file */
-                    i++;
-                    i += kargncpy(szUsrSym, &pReqPack->InitArgs[i], sizeof(szUsrSym));
+                switch (pReqPack->InitArgs[i])
+                {
+                    case 'k':
+                    case 'K': /* Kernel file */
+                        i++;
+                        i += kargncpy(szUsrOS2Krnl, &pReqPack->InitArgs[i], sizeof(szUsrOS2Krnl));
+                        break;
+
+                    case 'n':
+                    case 'N': /* NoLoader */
+                        return 0;
+
+                    case 'q':
+                    case 'Q': /* Quiet */
+                        fQuiet = 1;
+                        break;
+
+                    case 's':
+                    case 'S': /* Symbol file */
+                        i++;
+                        i += kargncpy(szUsrSym, &pReqPack->InitArgs[i], sizeof(szUsrSym));
+                        break;
+
+                    case 'v':
+                    case 'V': /* Verbose */
+                        fQuiet = 0;
+                        break;
                 }
             }
@@ -1029 +1042 @@
     dprintf(("rc=%d; i=%d\n", rc, i));
     ShowResult(rc, i);
-    fInitSuccess = rc = 0;
 
     return rc;