Changeset 504 for GPL/branches/uniaud32-2.1.x/drv32/read.cpp

Timestamp:

Jul 11, 2010, 7:42:10 AM (15 years ago)

Author:

David Azarewicz

Message:

Bring branch up-to-date with trunk

File:

• GPL/branches/uniaud32-2.1.x/drv32/read.cpp (modified) (5 diffs)

GPL/branches/uniaud32-2.1.x/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);
@@ -25 +20 @@
 {
   RPRWV __far* rp = (RPRWV __far*)_rp;
-  
+
   char *lin;
   int   transferCount= rp->Count;
-  
+
   if( szprintBuf )
   {
@@ -35 +30 @@
     {
       int diffCount;
-      
+
       if( rdOffset > wrOffset )
       {
-        diffCount= max_buf_size - rdOffset + wrOffset;
+        diffCount= DBG_MAX_BUF_SIZE - rdOffset + wrOffset;
       } else
       {
@@ -45 +40 @@
       if( transferCount > diffCount )
         transferCount= diffCount;
-      
+
       rp->Count= transferCount;
-      if( (rdOffset + transferCount) > max_buf_size )
+      if( (rdOffset + transferCount) > DBG_MAX_BUF_SIZE )
       {
-        diffCount= max_buf_size - rdOffset;
+        diffCount= DBG_MAX_BUF_SIZE - rdOffset;
         memcpy( lin, szprintBuf + rdOffset, diffCount );
         transferCount= transferCount - diffCount;
@@ -55 +50 @@
       } else
         diffCount= 0;
-        
-      if( transferCount ) 
+
+      if( transferCount )
       {
         memcpy( lin + diffCount, szprintBuf + rdOffset, transferCount );