Changeset 170 for trunk

Timestamp:

Aug 14, 2013, 6:48:01 PM (12 years ago)

Author:

David Azarewicz

Message:

Increased size of debug buffer

Location:

trunk/src/os2ahci

Files:

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

trunk/src/os2ahci/os2ahci.c

@@ -405 +405 @@
 
   /* initialize trace buffer if applicable */
-  if (TRACE_ACTIVE) {
+  if (debug > 0 && com_base == 0) {
     /* debug is on, but COM port is off -> use our trace buffer */
-    trace_init(AHCI_TRACE_BUF_SIZE);
+    trace_init(AHCI_DEBUG_BUF_SIZE);
   } else {
     trace_init(AHCI_INFO_BUF_SIZE);

trunk/src/os2ahci/os2ahci.h

@@ -140 +140 @@
 
 /* TRACE macros (for our internal ring buffer trace) */
-#define AHCI_TRACE_BUF_SIZE  0x8000U /* 32k */
-#define AHCI_INFO_BUF_SIZE  0x1000U /* 4k */
-#define TRACE_ACTIVE  (debug > 0 && com_base == 0)
+#define AHCI_DEBUG_BUF_SIZE  0x10000UL /* 64k must be a power of 2 */
+#define AHCI_INFO_BUF_SIZE  0x1000UL /* 4k must be a power of 2 */
 
 /* adapter number from AD_INFO pointer; mainly for dprintf() purposes */
@@ -568 +567 @@
 
 /* trace.c */
-extern void        trace_init    (u16);
+extern void        trace_init    (u32);
 extern void        trace_exit    (void);
 extern void        trace_write   (u8 _far *s, int len);

trunk/src/os2ahci/trace.c

@@ -52 +52 @@
  *       a GDT selector for the trace ring buffer
  */
-void trace_init(u16 usBufSize)
+void trace_init(u32 ulBufSize)
 {
   SEL sel = 0;
@@ -61 +61 @@
   ahci_trace_buf.writep = 0;
   ahci_trace_buf.readp = 0;
-  ahci_trace_buf.mask = usBufSize - 1;
+  ahci_trace_buf.mask = ulBufSize - 1;
 
   if (ahci_trace_buf.phys_addr == 0) {
     /* allocate buffer */
-    if (DevHelp_AllocPhys((ULONG) usBufSize, MEMTYPE_ABOVE_1M,
+    if (DevHelp_AllocPhys(ulBufSize, MEMTYPE_ABOVE_1M,
                          &(ahci_trace_buf.phys_addr))) {
       /* failed above 1MB, try below */
-      if (DevHelp_AllocPhys((ULONG) usBufSize, MEMTYPE_BELOW_1M,
+      if (DevHelp_AllocPhys(ulBufSize, MEMTYPE_BELOW_1M,
                             &(ahci_trace_buf.phys_addr))) {
         /* failed, too. Give up */
         ahci_trace_buf.phys_addr = 0;
         cprintf("%s warning: failed to allocate %dk trace buffer\n",
-                drv_name, usBufSize / 1024);
+                drv_name, ulBufSize / 1024);
         return;
       }
@@ -81 +81 @@
     if (DevHelp_AllocGDTSelector(&sel, 1) ||
         DevHelp_PhysToGDTSelector(ahci_trace_buf.phys_addr,
-                                  usBufSize, sel)) {
+                                  ulBufSize, sel)) {
       /* failed; free GDT selector and physical memory we allocated before */
       if (sel) {
@@ -94 +94 @@
     /* create ring buffer address */
     ahci_trace_buf.tbuf = (u8 _far *) ((u32) sel << 16);
-
   }
 }