Changeset 561 for sbliveos2/trunk/drv16/commdbg.c

Timestamp:

Jul 28, 2011, 11:16:56 AM (14 years ago)

Author:

rudi

Message:

SBLliveOS2: Adapt to newer OpenWatcom versions

File:

• sbliveos2/trunk/drv16/commdbg.c (modified) (2 diffs)

sbliveos2/trunk/drv16/commdbg.c

@@ -53 +53 @@
 
 char hextab[]="0123456789ABCDEF";
+
+#ifdef DEBUG
+//#define       MAGIC_COMM_PORT 0x3f8           // pulled from word ptr 40:0
+#define         MAGIC_COMM_PORT 0x2f8           // pulled from word ptr 40:0
+
+
+#define UART_DATA               0x00            // UART Data port
+#define UART_INT_ENAB           0x01            // UART Interrupt enable
+#define UART_INT_ID             0x02            // interrupt ID
+#define UART_LINE_CTRL          0x03            // line control registers
+#define UART_MODEM_CTRL         0x04            // modem control register
+#define UART_LINE_STAT          0x05            // line status register
+#define UART_MODEM_STAT         0x06            // modem status regiser
+#define UART_DIVISOR_LO         0x00            // divisor latch least sig
+#define UART_DIVISOR_HI         0x01h           // divisor latch most sig
+
+#define DELAY   nop
+#endif
+
+#ifdef DEBUG                            //--------------------------- CharOut -
+void CharOut(char c)
+{
+        _asm    {
+
+        mov     dx, MAGIC_COMM_PORT     // address of PS/2's first COM port
+        add     dx, UART_LINE_STAT
+
+ReadyCheck:
+        in      al, dx                                                          // wait for comm port ready signal
+
+        DELAY
+        DELAY
+        DELAY
+
+        test    al, 020h
+        jz      ReadyCheck
+
+        // Send the character
+
+        add     dx, UART_DATA - UART_LINE_STAT
+        mov     al,c
+        out     dx, al
+
+        DELAY
+        DELAY
+        DELAY
+        }
+}
+#endif
+
+#ifdef DEBUG                            //------------------------- StringOut -
+void StringOut(char far *DbgStr)
+{
+   while (*DbgStr)
+      CharOut(*DbgStr++);
+
+   if (fLineTerminate)
+   {
+      CharOut(CR);                              // append carriage return,
+      CharOut(LF);                              // linefeed
+   }
+}
+#endif
 
                                         //-------------------- DecWordToASCII -
@@ -330 +393 @@
 #endif                            //DEBUG
 
-
-#ifdef DEBUG                            //------------------------- StringOut -
-void StringOut(char far *DbgStr)
-{
-   while (*DbgStr)
-      CharOut(*DbgStr++);
-
-   if (fLineTerminate)
-   {
-      CharOut(CR);                              // append carriage return,
-      CharOut(LF);                              // linefeed
-   }
-}
-#endif
-
-#ifdef DEBUG
-//#define       MAGIC_COMM_PORT 0x3f8           // pulled from word ptr 40:0
-#define         MAGIC_COMM_PORT 0x2f8           // pulled from word ptr 40:0
-
-
-#define UART_DATA               0x00            // UART Data port
-#define UART_INT_ENAB           0x01            // UART Interrupt enable
-#define UART_INT_ID             0x02            // interrupt ID
-#define UART_LINE_CTRL          0x03            // line control registers
-#define UART_MODEM_CTRL         0x04            // modem control register
-#define UART_LINE_STAT          0x05            // line status register
-#define UART_MODEM_STAT         0x06            // modem status regiser
-#define UART_DIVISOR_LO         0x00            // divisor latch least sig
-#define UART_DIVISOR_HI         0x01h           // divisor latch most sig
-
-#define DELAY   nop
-#endif
-
-#ifdef DEBUG                            //--------------------------- CharOut -
-void CharOut(char c)
-{
-        _asm    {
-
-        mov     dx, MAGIC_COMM_PORT     // address of PS/2's first COM port
-        add     dx, UART_LINE_STAT
-
-ReadyCheck:
-        in      al, dx                                                          // wait for comm port ready signal
-
-        DELAY
-        DELAY
-        DELAY
-
-        test    al, 020h
-        jz      ReadyCheck
-
-        // Send the character
-
-        add     dx, UART_DATA - UART_LINE_STAT
-        mov     al,c
-        out     dx, al
-
-        DELAY
-        DELAY
-        DELAY
-        }
-}
-#endif