Changeset 268

Timestamp:

Nov 10, 2007, 3:35:56 AM (18 years ago)

Author:

Brendan Oakley

Message:

Make debug buffer larger, and fix alsahlp line endings, from Allan

Location:

GPL/trunk

Files:

• drv32/read.cpp (modified) (3 diffs)
• lib32/debug.c (modified) (3 diffs)

GPL/trunk/drv32/read.cpp

@@ -11 +11 @@
 int   wrOffset= 0;
 char  *szprintBuf= 0;
+#ifdef DEBUG
+int   max_buf_size= 0x100000;
+#else
+int   max_buf_size= 0x10000;
+#endif
 
 void * __ioremap(unsigned long physaddr, unsigned long size, unsigned long flags);
@@ -33 +38 @@
       if( rdOffset > wrOffset )
       {
-        diffCount= 0x10000 - rdOffset + wrOffset;
+        diffCount= max_buf_size - rdOffset + wrOffset;
       } else
       {
@@ -42 +47 @@
       
       rp->Count= transferCount;
-      if( (rdOffset + transferCount) > 0x10000 )
+      if( (rdOffset + transferCount) > max_buf_size )
       {
-        diffCount= 0x10000 - rdOffset;
+        diffCount= max_buf_size - rdOffset;
         memcpy( lin, szprintBuf + rdOffset, diffCount );
         transferCount= transferCount - diffCount;

GPL/trunk/lib32/debug.c

@@ -39 +39 @@
 extern int wrOffset;
 extern char *szprintBuf;
+extern int max_buf_size;
 
 char hextab[]="0123456789ABCDEF";
@@ -570 +571 @@
    if( szprintBuf == 0 )
    {
-      VMAlloc( 0x10000, VMDHA_FIXED, &szprintBuf );
+      VMAlloc( max_buf_size, VMDHA_FIXED, &szprintBuf );
       if( szprintBuf )
-         memset( szprintBuf, 0, 0x10000 );
+         memset( szprintBuf, 0, max_buf_size );
       wrOffset= 0;
    }
    if( szprintBuf )
    {
-       if( (len + wrOffset) > 0x10000 )
+       if( (len + wrOffset) > max_buf_size )
        {
           int cntr;
-          cntr= 0x10000 - wrOffset;
+          cntr= max_buf_size - wrOffset;
           memcpy( szprintBuf +  wrOffset, DbgStr, cntr );
           DbgStr+= cntr;
@@ -590 +591 @@
           memcpy( szprintBuf + wrOffset, DbgStr, len );
           wrOffset= wrOffset + len;
-          if( wrOffset >= 0x10000 )
+          if( wrOffset >= max_buf_size )
               wrOffset= 0;
        }
        if (fLineTerminate)
        {
-//           if( (wrOffset+1) >= 0x10000 )
+//           if( (wrOffset+1) >= max_buf_size )
 //               wrOffset= 0;
            szprintBuf[wrOffset]= CR;
-           if( ++wrOffset >= 0x10000 )
+           if( ++wrOffset >= max_buf_size )
+               wrOffset= 0;
+           szprintBuf[wrOffset]= LF;
+           if( ++wrOffset >= max_buf_size )
                wrOffset= 0;
        }