[Debburn-changes] r348 - nonameyet/trunk/cdrecord

Eduard Bloch blade at costa.debian.org
Wed Sep 27 00:01:32 UTC 2006


Author: blade
Date: 2006-09-27 00:01:31 +0000 (Wed, 27 Sep 2006)
New Revision: 348

Modified:
   nonameyet/trunk/cdrecord/drv_mmc.c
Log:
More xlc related fixes: C++ comments, wrong casts

Modified: nonameyet/trunk/cdrecord/drv_mmc.c
===================================================================
--- nonameyet/trunk/cdrecord/drv_mmc.c	2006-09-26 23:48:07 UTC (rev 347)
+++ nonameyet/trunk/cdrecord/drv_mmc.c	2006-09-27 00:01:31 UTC (rev 348)
@@ -243,13 +243,13 @@
          scsi_unload,
          read_buff_cap,
          cmd_dummy,                              /* recovery_needed      */
-         (int(*)__PR((SCSI *, int)))cmd_dummy,   /* recover              */
+         (int(*)__PR((SCSI *, struct cdr_cmd*,int)))cmd_dummy,   /* recover              */
          speed_select_mdvd,
          select_secsize,
          next_wr_addr_mdvd,
          (int(*)__PR((SCSI *, Ulong)))cmd_ill,   /* reserve_track        */
          scsi_cdr_write,
-         (int(*)__PR((SCSI *scgp, int, track_t *)))cmd_dummy, /* gen_cue */
+         (int(*)__PR((struct track*,void*,int)))cmd_dummy, /* gen_cue */
 	 (int(*)__PR((SCSI *scgp, cdr_t *, track_t *)))cmd_dummy, /* send_cue */
  	 write_leadin_mmc,
          open_track_mdvd,
@@ -2105,7 +2105,7 @@
   perf_desc[26] = 1000 >> 8;
   perf_desc[27] = 1000 & 0xFF;  
   
-  //retcode = scsi_set_streaming(scgp, NULL, 0);
+  /* retcode = scsi_set_streaming(scgp, NULL, 0); */
   retcode = scsi_set_streaming(scgp, &perf_desc, sizeof(perf_desc));
   if (retcode == -1) return retcode;
   retcode = speed_select_mmc(scgp, dp, speedp);
@@ -2866,10 +2866,10 @@
 		printf("Error: disk already formated, ignoring.\n");
 	        return ret;
         }
-	addr[0] = 0;           // "Reserved"
-	addr[1] = 2;           // "IMMED" flag
-	addr[2] = 0;           // "Descriptor Length" (MSB)
-	addr[3] = 8;           // "Descriptor Length" (LSB)
+	addr[0] = 0;           /* "Reserved" */
+	addr[1] = 2;           /* "IMMED" flag */
+	addr[2] = 0;           /* "Descriptor Length" (MSB) */
+	addr[3] = 8;           /* "Descriptor Length" (LSB) */
 	addr[4+0] = 0xff;
 	addr[4+1] = 0xff;
 	addr[4+2] = 0xff;




More information about the Debburn-changes mailing list