Changeset 1467 for trunk/src/win32k/misc/vprintf.c

Timestamp:

Oct 27, 1999, 4:03:01 AM (26 years ago)

Author:

bird

Message:

Corrections to make win32k work.
(And now it does work, at least at my test machine...)

File:

• trunk/src/win32k/misc/vprintf.c (modified) (15 diffs)

trunk/src/win32k/misc/vprintf.c

@@ -1 @@
-/* $Id: vprintf.c,v 1.1 1999-10-14 01:19:22 bird Exp $
+/* $Id: vprintf.c,v 1.2 1999-10-27 02:03:00 bird Exp $
  *
  * vprintf and printf
@@ -31 +31 @@
 #include <stdarg.h>
 
+#include "dev32.h"
+#include "vprintf.h"
 #ifdef RING0
-    #include "dev32.h"
-#else
-    #define SSToDS(a) (a)
+    #include <builtin.h>
+    #include "options.h"
 #endif
-#include "vprintf.h"
-
+
+
+/*******************************************************************************
+*   Global Variables                                                           *
+*******************************************************************************/
+static char chNewLine = '\n';
+static char chReturn  = '\r';
 
 /*******************************************************************************
@@ -44 +50 @@
 static int       _atoi_skip(const char **ppsz);
 static unsigned  _strnlen(const char *psz, unsigned cchMax);
-_Inline void     chout(int ch);
+static void      chout(int ch);
+static char *    strout(char *psz, signed cchMax);
 
 
@@ -162 +169 @@
     #if 0
     else if (!(fFlags & NTSF_LEFT) && cchWidth > 0)
-    {   /* not supported! */
+    {   /* not yet supported! */
         /*
         for (j = i-1; j >= 0; j--)
@@ -207 +214 @@
 int vprintf(const char *pszFormat, va_list args)
 {
+    #ifdef RING0
+        if (options.fQuiet)
+            return 0;
+    #else
+        int cch = 0;
+    #endif
+
     while (*pszFormat != '\0')
     {
         if (*pszFormat == '%')
         {
+            #ifndef RING0
+                if (cch > 0)
+                {
+                    strout((char*)(pszFormat - cch), cch);
+                    cch = 0;
+                }
+            #endif
+
             pszFormat++;  /* skip '%' */
             if (*pszFormat == '%')    /* '%%'-> '%' */
@@ -306 +328 @@
                     case 's':   /* string */
                     {
-                        int   i;
                         int   cchStr;
                         char *pszStr = va_arg(args, char*);
@@ -316 +337 @@
                             while (--cchWidth >= cchStr)
                                  chout(' ');
-                        for (i = cchStr; i > 0; i--)
-                            chout(*pszStr++);
+
+                        pszStr = strout(pszStr, cchStr);
 
                         while (--cchWidth >= cchStr)
@@ -352 +373 @@
         }
         else
-            chout(*pszFormat++);
-    }
+        {
+            #ifdef RING0
+                chout(*pszFormat++);
+            #else
+                cch++;
+                pszFormat++;
+            #endif
+        }
+    }
+
+    #ifndef RING0
+        if (cch > 0)
+        {
+            strout((char*)(pszFormat - cch), cch);
+            cch = 0;
+        }
+    #endif
 
     return 0UL;
@@ -376 +412 @@
     va_list arguments;
 
+    #ifdef RING0
+        if (options.fQuiet)
+            return 0;
+    #endif
+
     va_start(arguments, pszFormat);
     cch = vprintf(pszFormat, arguments);
@@ -390 +431 @@
     va_list arguments;
 
+    #ifdef RING0
+        if (options.fQuiet)
+            return 0;
+    #endif
+
     va_start(arguments, pszFormat);
     cch = vprintf(pszFormat, arguments);
@@ -402 +448 @@
     int     cch;
     va_list arguments;
+
+    #ifdef RING0
+        if (options.fQuiet)
+            return 0;
+    #endif
 
     va_start(arguments, pszFormat);
@@ -419 +470 @@
  * @author    knut st. osmundsen
  */
-_Inline void  chout(int ch)
-{
-    #ifdef RING0
-
-    #else
+static void chout(int ch)
+{
+    #ifndef RING0
         ULONG ulWrote;
     #endif
@@ -431 +480 @@
         if (ch == '\n')
         {
-            static char chReturn = '\r';
             #ifdef RING0
-
+                while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+                _outp(options.usCom, chReturn);             /* Put the char. */
             #else
                 DosWrite(1, (void*)&chReturn, 1, &ulWrote);
@@ -439 +488 @@
         }
         #ifdef RING0
-
+            while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+            _outp(options.usCom, ch);                   /* Put the char. */
         #else
             DosWrite(1, (void*)&ch, 1, &ulWrote);
@@ -446 +496 @@
 }
 
+
+/**
+ * Write a string to the output device.
+ * @returns   pointer end of string.
+ * @param     psz     Pointer to the string to write.
+ * @param     cchMax  Max count of chars to write. (or until '\0')
+ * @status    completely implemented.
+ * @author    knut st. osmundsen
+ */
+static char *strout(char *psz, signed cchMax)
+{
+    while (cchMax > 0 && *psz != '\0')
+    {
+        ULONG cch = 0;
+        ULONG ul;
+
+        while (cchMax - cch > 0 && psz[cch] != '\0' && psz[cch] != '\r' && psz[cch] != '\n')
+            cch++;
+
+        /* write string part */
+        #ifdef RING0
+            for (ul = 0; ul < cch; ul++)
+            {
+                while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+                _outp(options.usCom, psz[ul]);              /* Put the char. */
+            }
+        #else
+            DosWrite(1, (void*)psz, cch, &ul);
+        #endif
+
+        /* cr and lf check + skip */
+        if (psz[cch] == '\n' || psz[cch] == '\r')
+        {
+            if (psz[cch] == '\n')
+            {
+            #ifdef RING0
+                while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+                _outp(options.usCom, chReturn);             /* Put the char. */
+                while (!(_inp(options.usCom + 5) & 0x20));  /* Waits for the port to be ready. */
+                _outp(options.usCom, chNewLine);            /* Put the char. */
+            #else
+                DosWrite(1, (void*)&chReturn, 1, &ul);
+                DosWrite(1, (void*)&chNewLine, 1, &ul);
+            #endif
+
+            }
+
+            while (cchMax - cch > 0 && (psz[cch] == '\r' || psz[cch] == '\n'))
+                cch++;
+        }
+
+        /* next */
+        psz += cch;
+        cchMax -= cch;
+    }
+    return psz;
+}
+