Changeset 116

Timestamp:

Jul 7, 2011, 1:22:32 PM (14 years ago)

Author:

Markus Thielen

Message:

• do not initialize com port if base address is 0 (thanks, Steven)
• trace buffer: wake up waiting processes after data has been written (thanks, Steven)

Location:

trunk/src/os2ahci

Files:

• libc.c (modified) (1 diff)
• os2ahci.c (modified) (2 diffs)
• trace.c (modified) (2 diffs)
• version.h (modified) (1 diff)

trunk/src/os2ahci/libc.c

@@ -135 +135 @@
 {
   int i;
+
+  if (com_base == 0) {
+    /* no com port in use */
+    return;
+  }
 
   spin_lock(com_lock);

trunk/src/os2ahci/os2ahci.c

@@ -215 +215 @@
       case 'd':
         /* increase debug level */
-        if (debug++ == 0) {
-          init_com();
-        }
+        debug++;
         break;
 
@@ -317 +315 @@
   }
 
+  if (debug) {
+    /* initialize com port for debug output */
+    init_com();
+  }
+
   /* initialize trace buffer if applicable */
   if (TRACE_ACTIVE) {

trunk/src/os2ahci/trace.c

@@ -144 +144 @@
     cb = cbw < len ? cbw : len;
     if (cb && ahci_trace_buf.empty) {
-      /* if trace buffer was empty, we wake up any evtl. waiting
-       * processes now */
       ahci_trace_buf.empty = 0;
-      DevHelp_ProcRun(ahci_trace_buf.phys_addr, &awake_cnt);
     }
     memcpy(ahci_trace_buf.tbuf + ahci_trace_buf.writep, s, cb);
@@ -161 +158 @@
   }
        
-       
+  /* wake up processes waiting for data from trace buffer */
+  DevHelp_ProcRun(ahci_trace_buf.phys_addr, &awake_cnt);
+
 }
 

trunk/src/os2ahci/version.h

@@ -14 +14 @@
 
 
-#define VERSION            117       /* driver version (2 implied decimals) */
+#define VERSION            118       /* driver version (2 implied decimals) */