[Debburn-changes] r386 - in nonameyet/trunk: . cdrecord debian

[Eduard Bloch]

Author: blade
Date: 2006-11-07 11:52:45 +0100 (Tue, 07 Nov 2006)
New Revision: 386

Modified:
   nonameyet/trunk/Changelog
   nonameyet/trunk/cdrecord/cdrecord.c
   nonameyet/trunk/debian/changelog
Log:
Workaround for breakage after DMA tests

Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog	2006-11-07 10:38:02 UTC (rev 385)
+++ nonameyet/trunk/Changelog	2006-11-07 10:52:45 UTC (rev 386)
@@ -19,6 +19,7 @@
     havoc after harmless header moving (conflict with incompatible GNU version)
   * restored scsi-remote.c compilation, moved to libscg sources, used instead
     of rdummy.c
+  * added optional omiting of DMA speed tests
 
   [ Eugen Dedu ]
   * corrections and constructive help on cdda2ogg

Modified: nonameyet/trunk/cdrecord/cdrecord.c
===================================================================
--- nonameyet/trunk/cdrecord/cdrecord.c	2006-11-07 10:38:02 UTC (rev 385)
+++ nonameyet/trunk/cdrecord/cdrecord.c	2006-11-07 10:52:45 UTC (rev 386)
@@ -4261,6 +4261,14 @@
 	int	bs;
 	int	tsize;
 
+  if(getenv("CDR_NODMATEST"))
+     return -1;
+
+  if (debug || lverbose)
+     fprintf( stderr, 
+           "Beginning DMA speed test. Set CDR_NODMATEST environment variable if device\n"
+           "communication breaks or freezes immediately after that.\n" );
+
 	fillbytes((caddr_t)buf, 4, '\0');
 	tsize = 0;
 	scgp->silent++;

Modified: nonameyet/trunk/debian/changelog
===================================================================
--- nonameyet/trunk/debian/changelog	2006-11-07 10:38:02 UTC (rev 385)
+++ nonameyet/trunk/debian/changelog	2006-11-07 10:52:45 UTC (rev 386)
@@ -14,6 +14,7 @@
     them, old "convinience" symlinks, preinstalls user-modified files to the
     new target locations /etc/{wodim,rscsi}.conf 
     (closes: #388403, #390084, #388119, #387854)
+  * option (env. variable) to skip DMA tests (closes: #293953)
 
  -- Eduard Bloch <blade at debian.org>  Mon, 06 Nov 2006 10:47:33 +0100