[Debburn-changes] r732 - in cdrkit/trunk: . libusal wodim

[Eduard Bloch]

Author: blade
Date: 2007-04-08 22:09:51 +0000 (Sun, 08 Apr 2007)
New Revision: 732

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/libusal/scsi-wnt.c
   cdrkit/trunk/libusal/scsitransp.c
   cdrkit/trunk/wodim/scsi_scan.c
Log:
A minor fix from Suse changes and some minor cleanups

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2007-04-06 20:11:40 UTC (rev 731)
+++ cdrkit/trunk/Changelog	2007-04-08 22:09:51 UTC (rev 732)
@@ -2,6 +2,8 @@
 
   * Let --devices use sr on kernel 2.6 and sg on kernel 2.4
   * forced MAGIC_ERROR definition for older version, thanks to T. Schmidt
+  * always return a value in usal_sense_table(...), from a patch from
+    SUSE (cdrkit-dvd-fix.patch)
 
  -- Eduard Bloch <blade at debian.org>  Fri, 06 Apr 2007 16:22:49 +0200
 

Modified: cdrkit/trunk/libusal/scsi-wnt.c
===================================================================
--- cdrkit/trunk/libusal/scsi-wnt.c	2007-04-06 20:11:40 UTC (rev 731)
+++ cdrkit/trunk/libusal/scsi-wnt.c	2007-04-08 22:09:51 UTC (rev 732)
@@ -279,7 +279,7 @@
 					sptihamax++;
 				}
 
-				/* shortcut for device names */
+				/* shortcut for device names, remember the hit */
 				if(uDriveType==DRIVE_CDROM && usalp->device && ('A'+i)==toupper(usalp->device[0]))
 					explicite_number=i;
 			}

Modified: cdrkit/trunk/libusal/scsitransp.c
===================================================================
--- cdrkit/trunk/libusal/scsitransp.c	2007-04-06 20:11:40 UTC (rev 731)
+++ cdrkit/trunk/libusal/scsitransp.c	2007-04-08 22:09:51 UTC (rev 732)
@@ -1153,7 +1153,7 @@
 	if(!usal_cmd_err(usalp))
 		return (0);
 
-	if (cp->sense.code >= 0x70)
+	/* if (cp->sense.code >= 0x70) */
 	return (char *) &(cp->sense);
 }
 

Modified: cdrkit/trunk/wodim/scsi_scan.c
===================================================================
--- cdrkit/trunk/wodim/scsi_scan.c	2007-04-06 20:11:40 UTC (rev 731)
+++ cdrkit/trunk/wodim/scsi_scan.c	2007-04-08 22:09:51 UTC (rev 732)
@@ -295,74 +295,3 @@
 	return (amt);
 }
 
-#ifdef DEAD_CODE
-static int
-select_unit(SCSI *usalp, FILE *f)
-{
-	int	initiator;
-	int	clun	= usal_lun(usalp);
-	int	low	= -1;
-	int	high	= -1;
-	int	lun;
-
-	usalp->silent++;
-
-	fprintf(f, "scsibus%d target %d:\n", usal_scsibus(usalp), usal_target(usalp));
-
-	initiator = usal_initiator_id(usalp);
-	for (lun = 0; lun < 8; lun++) {
-
-#ifdef	FMT
-		if (print_disknames(usal_scsibus(usalp), usal_target(usalp), lun) < 8)
-			fprintf(f, "\t");
-		else
-			fprintf(f, " ");
-#else
-		fprintf(f, "\t");
-#endif
-		if (fprintf(f, "%d,%d,%d", usal_scsibus(usalp), usal_target(usalp), lun) < 8)
-			fprintf(f, "\t");
-		else
-			fprintf(f, " ");
-		fprintf(f, "%3d) ", lun);
-		if (usal_target(usalp) == initiator) {
-			fprintf(f, "HOST ADAPTOR\n");
-			continue;
-		}
-		usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), lun);
-		if (!unit_ready(usalp) && usalp->scmd->error == SCG_FATAL) {
-			fprintf(f, "*\n");
-			continue;
-		}
-		if (unit_ready(usalp)) {
-			/* non extended sense illegal lun */
-			if (usalp->scmd->sense.code == 0x25) {
-				fprintf(f, "BAD UNIT\n");
-				continue;
-			}
-		}
-		if (low < 0)
-			low = lun;
-		high = lun;
-
-		getdev(usalp, FALSE);
-		print_product(f, usalp->inq);
-	}
-	usalp->silent--;
-
-	if (low < 0) {
-		errmsgno(EX_BAD, "No lun found.\n");
-		return (0);
-	}
-	lun = -1;
-#ifdef	FMT
-	getint("Select lun", &lun, low, high);
-	usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), lun);
-	format_one(usalp);
-	return (1);
-#endif
-
-	usal_settarget(usalp, usal_scsibus(usalp), usal_target(usalp), clun);
-	return (1);
-}
-#endif