Changeset 13 for trunk/src/os2ahci/libc.c

Timestamp:

Sep 14, 2010, 10:07:59 AM (15 years ago)

Author:

root

Message:

latest NCQ changes from Christian

Location:

trunk/src/os2ahci

Files:

• . (added)
• libc.c (moved) (moved from trunk/src/libc.c ) (6 diffs)

trunk/src/os2ahci/libc.c

@@ -27 +27 @@
                                        * for printing custom messages via
                                        * DevHelp_Save_Message() */
-
-#define COM_BASE              0x03f8  /* base address of COM port (COM1) */
 
 /* heap management constants */
@@ -54 +52 @@
 
 /* ------------------------ global/static variables ------------------------ */
+
+/* debug COM port base address */
+u16 com_base = 0x03f8;
 
 static char  hex_digits[] = "0123456789abcdef";
@@ -99 +100 @@
 
   for (i = 0; com1_init_sequence[i].reg != -1; i++) {
-    u16 port = COM_BASE + com1_init_sequence[i].reg;
+    u16 port = com_base + com1_init_sequence[i].reg;
     u8  data = com1_init_sequence[i].data;
     _asm {
@@ -248 +249 @@
      * The C equivalent would look like this:
      *
-     *   while (!(inp(COM_BASE + 5) & 0x20));
-     *   outp(COM_BASE, *s);
+     *   while (!(inp(com_base + 5) & 0x20));
+     *   outp(com_base, *s);
      */
 
     _asm {
       /* wait until COM transmitter is idle */
-      mov  dx, COM_BASE + 5;
+      mov  dx, com_base;
+      add  dx, 5;
     transmitter_not_idle:
       in   al, dx;
@@ -261 +263 @@
 
       /* output character to be sent */
-      mov  dx, COM_BASE;
+      mov  dx, com_base;
       mov  bx, s;
       mov  al, [bx];
@@ -655 +657 @@
 int disable(void)
 {
-  int rc = 0;
+  int rc;
 
   _asm {