Attachment #180381 for bug #257047

Lines 84-90 typedef struct cdrom_drive{ Link Here

(-)cdparanoia-III-10.2.orig/interface/cdda_interface.h (-1 / +1 lines)
84	int is_atapi;	84	int is_atapi;
85	int is_mmc;	85	int is_mmc;
86		86
87	cdda_private_data_t *private;	87	cdda_private_data_t *private_data;
88	void *reserved;	88	void *reserved;
89	unsigned char inqbytes[4];	89	unsigned char inqbytes[4];
90		90




static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
  struct timespec tv1;
  struct timespec tv2;
  int ret1=clock_gettime(d->private_data->clock,&tv1);
  int ret2=ioctl(fd, command,arg);
  int ret3=clock_gettime(d->private_data->clock,&tv2);
  if(ret1<0 || ret3<0){
    d->private_data->last_milliseconds=-1;
  }else{
    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
  }
  return ret2;
}




    if(d->drive_model)free(d->drive_model);
    if(d->cdda_fd!=-1)close(d->cdda_fd);
    if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
    if(d->private_data){
      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
      free(d->private_data);
    }

    free(d);

	}
      }	
    }
    if(ms)*ms=d->private_data->last_milliseconds;
    return(sectors);
  }
  




  d->interface=COOKED_IOCTL;
  d->bigendianp=-1; /* We don't know yet... */
  d->nsectors=-1;
  d->private_data=calloc(1,sizeof(*d->private_data));
  {
    /* goddamnit */
    struct timespec tv;
    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
  }
  idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
  return(d);

  d->bigendianp=-1; /* We don't know yet... */
  d->nsectors=-1;
  d->messagedest = messagedest;
  d->private_data=calloc(1,sizeof(*d->private_data));
  {
    /* goddamnit */
    struct timespec tv;
    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
  }
  if(use_sgio){
    d->interface=SGIO_SCSI;
    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
    g_fd=d->cdda_fd=dup(d->ioctl_fd);
  }else{
    version=verify_SG_version(d,messagedest,messages);

    }

    /* malloc our big buffer for scsi commands */
    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
  }

  {

  if(i_fd!=-1)close(i_fd);
  if(g_fd!=-1)close(g_fd);
  if(d){
    if(d->private_data){
      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
      free(d->private_data);
    }
    free(d);
  }

  d->interface=TEST_INTERFACE;
  d->bigendianp=-1; /* We don't know yet... */
  d->nsectors=-1;
  d->private_data=calloc(1,sizeof(*d->private_data));
  d->drive_model=copystring("File based test interface");
  idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
  




static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
  struct timespec tv1;
  struct timespec tv2;
  int ret1=clock_gettime(d->private_data->clock,&tv1);
  int ret2=ioctl(fd, command,arg);
  int ret3=clock_gettime(d->private_data->clock,&tv2);
  if(ret1<0 || ret3<0){
    d->private_data->last_milliseconds=-1;
  }else{
    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
  }
  return ret2;
}

static void clear_garbage(cdrom_drive *d){
  fd_set fdset;
  struct timeval tv;
  struct sg_header *sg_hd=d->private_data->sg_hd;
  int flag=0;

  /* clear out any possibly preexisting garbage */

  struct timespec tv2;
  int tret1,tret2;
  int status = 0;
  struct sg_header *sg_hd=d->private_data->sg_hd;
  long writebytes=SG_OFF+cmd_len+in_size;

  /* generic scsi device services */


  memset(sg_hd,0,sizeof(sg_hd)); 
  memset(sense_buffer,0,SG_MAX_SENSE); 
  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
  sg_hd->twelve_byte = cmd_len == 12;
  sg_hd->result = 0;
  sg_hd->reply_len = SG_OFF + out_size;

     tell if the command failed.  Scared yet? */

  if(bytecheck && out_size>in_size){
    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
    /* the size does not remove cmd_len due to the way the kernel
       driver copies buffers */
    writebytes+=(out_size-in_size);

  }

  sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
  tret1=clock_gettime(d->private_data->clock,&tv1);  
  errno=0;
  status = write(d->cdda_fd, sg_hd, writebytes );


    }
  }

  tret2=clock_gettime(d->private_data->clock,&tv2);  
  errno=0;
  status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
  sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );

  if(bytecheck && in_size+cmd_len<out_size){
    long i,flag=0;
    for(i=in_size;i<out_size;i++)
      if(d->private_data->sg_buffer[i]!=bytefill){
	flag=1;
	break;
      }


  errno=0;
  if(tret1<0 || tret2<0){
    d->private_data->last_milliseconds=-1;
  }else{
    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
  }
  return(0);
}


  memset(&hdr,0,sizeof(hdr));
  memset(sense,0,sizeof(sense));
  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);

  hdr.cmdp = cmd;
  hdr.cmd_len = cmd_len;

  hdr.mx_sb_len = SG_MAX_SENSE;
  hdr.timeout = 50000;
  hdr.interface_id = 'S';
  hdr.dxferp =  d->private_data->sg_buffer;
  hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */

  /* scary buffer fill hack */

  if(bytecheck && in_size<out_size){
    long i,flag=0;
    for(i=in_size;i<out_size;i++)
      if(d->private_data->sg_buffer[i]!=bytefill){
	flag=1;
	break;
      }

  }

  /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
  /* d->private_data->last_milliseconds = hdr.duration; */

  errno = 0;
  return 0;


  handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);

  key = d->private_data->sg_buffer[2] & 0xf;
  ASC = d->private_data->sg_buffer[12];
  ASCQ = d->private_data->sg_buffer[13];
  
  if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
  return 1;

  if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);

  {
    unsigned char *b=d->private_data->sg_buffer;
    if(b[0])return(1); /* Handles only up to 256 bytes */
    if(b[6])return(1); /* Handles only up to 256 bytes */


static unsigned int get_orig_sectorsize(cdrom_drive *d){
  if(mode_sense(d,12,0x01))return(-1);

  d->orgdens = d->private_data->sg_buffer[4];
  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
}

/* switch CDROM scsi drives to given sector size  */

    return(-4);
  }

  first=d->private_data->sg_buffer[2];
  last=d->private_data->sg_buffer[3];
  tracks=last-first+1;

  if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {

      return(-5);
    }
    {
      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);

      d->disc_toc[i-first].bFlags=toc->bFlags;
      d->disc_toc[i-first].bTrack=i;

    return(-2);
  }
  {
    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
    
    d->disc_toc[i-first].bFlags=toc->bFlags;
    d->disc_toc[i-first].bTrack=0xAA;

  }

  /* copy to our structure and convert start sector */
  tracks = d->private_data->sg_buffer[1];
  if (tracks > MAXTRK) {
    cderror(d,"003: CDROM reporting illegal number of tracks\n");
    return(-3);

      return(-5);
    }
    
    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
    d->disc_toc[i].bTrack = i + 1;

    d->disc_toc[i].dwStartSector= d->adjust_ssize * 
	(((signed char)(d->private_data->sg_buffer[2])<<24) | 
	 (d->private_data->sg_buffer[3]<<16)|
	 (d->private_data->sg_buffer[4]<<8)|
	 (d->private_data->sg_buffer[5]));
  }

  d->disc_toc[i].bFlags = 0;
  d->disc_toc[i].bTrack = i + 1;
  memcpy (&foo, d->private_data->sg_buffer+2, 4);
  memcpy (&bar, d->private_data->sg_buffer+6, 4);
  d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
						    be32_to_cpu(bar));

  d->disc_toc[i].dwStartSector= d->adjust_ssize * 
    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 
      (d->private_data->sg_buffer[3]<<16)|
      (d->private_data->sg_buffer[4]<<8)|
      (d->private_data->sg_buffer[5]))+
     
     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 
       (d->private_data->sg_buffer[7]<<16)|
       (d->private_data->sg_buffer[8]<<8)|
       (d->private_data->sg_buffer[9]))));


  d->cd_extra = FixupTOC(d,tracks+1);

  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[9] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[9] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[9] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  cmd[8] = sectors;
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}



  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}



  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


  
  if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
    return(ret);
  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
  return(0);
}


static int count_2352_bytes(cdrom_drive *d){
  long i;
  for(i=2351;i>=0;i--)
    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
      return(((i+3)>>2)<<2);

  return(0);

static int verify_nonzero(cdrom_drive *d){
  long i,flag=0;
  for(i=0;i<2352;i++)
    if(d->private_data->sg_buffer[i]!=0){
      flag=1;
      break;
    }

  d->is_mmc=0;
  if(mode_sense(d,22,0x2A)==0){
  
    b=d->private_data->sg_buffer;
    b+=b[3]+4;
    
    if((b[0]&0x3F)==0x2A){

    cderror(d,"008: Unable to identify CDROM model\n");
    return(NULL);
  }
  return (d->private_data->sg_buffer);
}

int scsi_init_drive(cdrom_drive *d){

  check_cache(d);

  d->error_retry=1;
  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
  d->report_all=1;
  return(0);
}

Lines 66-74 static long test_read(cdrom_drive *d, vo Link Here

(-)cdparanoia-III-10.2.orig/interface/test_interface.c (-2 / +2 lines)
66	if(!fd)fd=fdopen(d->cdda_fd,"r");	66	if(!fd)fd=fdopen(d->cdda_fd,"r");
67		67
68	if(begin<lastread)	68	if(begin<lastread)
69	d->private->last_milliseconds=20;	69	d->private_data->last_milliseconds=20;
70	else	70	else
71	d->private->last_milliseconds=sectors;	71	d->private_data->last_milliseconds=sectors;
72		72
73	#ifdef CDDA_TEST_UNDERRUN	73	#ifdef CDDA_TEST_UNDERRUN
74	sectors-=1;	74	sectors-=1;





  /* read the header first */
  unsigned char sense[SG_MAX_SENSE];
  const unsigned char orig_cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0};
  unsigned char cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0};
  cmd[1]=d->lun<<5;


  }

  for (i = first; i <= last; i++){
    memcpy(cmd, orig_cmd, 10);
    cmd[1]=d->lun<<5;
    cmd[6]=i;
    

    }
  }

  memcpy(cmd, orig_cmd, 10);
  cmd[1]=d->lun<<5;
  cmd[6]=0xAA;
    

  }

  for (i = 0; i < tracks; i++){
    memset(cmd, 0, 10);
    cmd[0]=0xe5;
    cmd[5]=i+1;
    cmd[8]=255;
    

Return to bug 257047

Lines 39-47 int cdda_close(cdrom_drive *d){ Link Here

(-)cdparanoia-III-10.2.orig/interface/interface.c (-4 / +4 lines)
39	if(d->drive_model)free(d->drive_model);	39	if(d->drive_model)free(d->drive_model);
40	if(d->cdda_fd!=-1)close(d->cdda_fd);	40	if(d->cdda_fd!=-1)close(d->cdda_fd);
41	if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);	41	if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
42	if(d->private){	42	if(d->private_data){
43	if(d->private->sg_hd)free(d->private->sg_hd);	43	if(d->private_data->sg_hd)free(d->private_data->sg_hd);
44	free(d->private);	44	free(d->private_data);
45	}	45	}
46		46
47	free(d);	47	free(d);
Lines 127-133 long cdda_read_timed(cdrom_drive *d, voi Link Here
127	}	127	}
128	}	128	}
129	}	129	}
130	if(ms)*ms=d->private->last_milliseconds;	130	if(ms)*ms=d->private_data->last_milliseconds;
131	return(sectors);	131	return(sectors);
132	}	132	}
133		133

Lines 264-274 cdrom_drive *cdda_identify_cooked(const Link Here

(-)cdparanoia-III-10.2.orig/interface/scan_devices.c (-11 / +11 lines)
264	d->interface=COOKED_IOCTL;	264	d->interface=COOKED_IOCTL;
265	d->bigendianp=-1; /* We don't know yet... */	265	d->bigendianp=-1; /* We don't know yet... */
266	d->nsectors=-1;	266	d->nsectors=-1;
267	d->private=calloc(1,sizeof(*d->private));	267	d->private_data=calloc(1,sizeof(*d->private_data));
268	{	268	{
269	/* goddamnit */	269	/* goddamnit */
270	struct timespec tv;	270	struct timespec tv;
271	d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);	271	d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
272	}	272	}
273	idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);	273	idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
274	return(d);	274	return(d);
Lines 674-688 cdrom_drive *cdda_identify_scsi(const ch Link Here
674	d->bigendianp=-1; /* We don't know yet... */	674	d->bigendianp=-1; /* We don't know yet... */
675	d->nsectors=-1;	675	d->nsectors=-1;
676	d->messagedest = messagedest;	676	d->messagedest = messagedest;
677	d->private=calloc(1,sizeof(*d->private));	677	d->private_data=calloc(1,sizeof(*d->private_data));
678	{	678	{
679	/* goddamnit */	679	/* goddamnit */
680	struct timespec tv;	680	struct timespec tv;
681	d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);	681	d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
682	}	682	}
683	if(use_sgio){	683	if(use_sgio){
684	d->interface=SGIO_SCSI;	684	d->interface=SGIO_SCSI;
685	d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));	685	d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
686	g_fd=d->cdda_fd=dup(d->ioctl_fd);	686	g_fd=d->cdda_fd=dup(d->ioctl_fd);
687	}else{	687	}else{
688	version=verify_SG_version(d,messagedest,messages);	688	version=verify_SG_version(d,messagedest,messages);
Lines 696-703 cdrom_drive *cdda_identify_scsi(const ch Link Here
696	}	696	}
697		697
698	/* malloc our big buffer for scsi commands */	698	/* malloc our big buffer for scsi commands */
699	d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);	699	d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
700	d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;	700	d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
701	}	701	}
702		702
703	{	703	{
Lines 772-780 cdda_identify_scsi_fail: Link Here
772	if(i_fd!=-1)close(i_fd);	772	if(i_fd!=-1)close(i_fd);
773	if(g_fd!=-1)close(g_fd);	773	if(g_fd!=-1)close(g_fd);
774	if(d){	774	if(d){
775	if(d->private){	775	if(d->private_data){
776	if(d->private->sg_hd)free(d->private->sg_hd);	776	if(d->private_data->sg_hd)free(d->private_data->sg_hd);
777	free(d->private);	777	free(d->private_data);
778	}	778	}
779	free(d);	779	free(d);
780	}	780	}
Lines 821-827 cdrom_drive *cdda_identify_test(const ch Link Here
821	d->interface=TEST_INTERFACE;	821	d->interface=TEST_INTERFACE;
822	d->bigendianp=-1; /* We don't know yet... */	822	d->bigendianp=-1; /* We don't know yet... */
823	d->nsectors=-1;	823	d->nsectors=-1;
824	d->private=calloc(1,sizeof(*d->private));	824	d->private_data=calloc(1,sizeof(*d->private_data));
825	d->drive_model=copystring("File based test interface");	825	d->drive_model=copystring("File based test interface");
826	idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);	826	idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
827		827

Lines 656-661 static int scsi_read_toc (cdrom_drive *d Link Here

(-)cdparanoia-III-10.2.orig/interface/scsi_interface.c (-3 / +5 lines)
656		656
657	/* read the header first */	657	/* read the header first */
658	unsigned char sense[SG_MAX_SENSE];	658	unsigned char sense[SG_MAX_SENSE];
		659	const unsigned char orig_cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0};
659	unsigned char cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0};	660	unsigned char cmd[10] = { 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0};
660	cmd[1]=d->lun<<5;	661	cmd[1]=d->lun<<5;
661		662
Lines 674-680 static int scsi_read_toc (cdrom_drive *d Link Here
674	}	675	}
675		676
676	for (i = first; i <= last; i++){	677	for (i = first; i <= last; i++){
677	memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10);	678	memcpy(cmd, orig_cmd, 10);
678	cmd[1]=d->lun<<5;	679	cmd[1]=d->lun<<5;
679	cmd[6]=i;	680	cmd[6]=i;
680		681
Lines 695-701 static int scsi_read_toc (cdrom_drive *d Link Here
695	}	696	}
696	}	697	}
697		698
698	memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10);	699	memcpy(cmd, orig_cmd, 10);
699	cmd[1]=d->lun<<5;	700	cmd[1]=d->lun<<5;
700	cmd[6]=0xAA;	701	cmd[6]=0xAA;
701		702
Lines 745-751 static int scsi_read_toc2 (cdrom_drive * Link Here
745	}	746	}
746		747
747	for (i = 0; i < tracks; i++){	748	for (i = 0; i < tracks; i++){
748	memcpy(cmd, (char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10);	749	memset(cmd, 0, 10);
		750	cmd[0]=0xe5;
749	cmd[5]=i+1;	751	cmd[5]=i+1;
750	cmd[8]=255;	752	cmd[8]=255;
751		753

Lines 13-25 Link Here

(-)cdparanoia-III-10.2.orig/interface/cooked_interface.c (-4 / +4 lines)
13	static int timed_ioctl(cdrom_drive d, int fd, int command, void arg){	13	static int timed_ioctl(cdrom_drive d, int fd, int command, void arg){
14	struct timespec tv1;	14	struct timespec tv1;
15	struct timespec tv2;	15	struct timespec tv2;
16	int ret1=clock_gettime(d->private->clock,&tv1);	16	int ret1=clock_gettime(d->private_data->clock,&tv1);
17	int ret2=ioctl(fd, command,arg);	17	int ret2=ioctl(fd, command,arg);
18	int ret3=clock_gettime(d->private->clock,&tv2);	18	int ret3=clock_gettime(d->private_data->clock,&tv2);
19	if(ret1<0 \|\| ret3<0){	19	if(ret1<0 \|\| ret3<0){
20	d->private->last_milliseconds=-1;	20	d->private_data->last_milliseconds=-1;
21	}else{	21	}else{
22	d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;	22	d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
23	}	23	}
24	return ret2;	24	return ret2;
25	}	25	}