package/audio/cdparanoia/gcc.patch.musl

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/cdparanoia/gcc.patch.musl
   3 # Copyright (C) 2022 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 Index: interface/test_interface.c
  15 ===================================================================
  16 --- a/interface/test_interface.c        (Revision 15337)
  17 +++ b/interface/test_interface.c        (Revision 15340)
  18 @@ -66,9 +66,9 @@
  19    if(!fd)fd=fdopen(d->cdda_fd,"r");
  20
  21    if(begin<lastread)
  22 -    d->private->last_milliseconds=20;
  23 +    d->private_data->last_milliseconds=20;
  24    else
  25 -    d->private->last_milliseconds=sectors;
  26 +    d->private_data->last_milliseconds=sectors;
  27
  28  #ifdef CDDA_TEST_UNDERRUN
  29    sectors-=1;
  30 Index: interface/cdda_interface.h
  31 ===================================================================
  32 --- a/interface/cdda_interface.h        (Revision 15337)
  33 +++ b/interface/cdda_interface.h        (Revision 15340)
  34 @@ -84,7 +84,7 @@
  35    int is_atapi;
  36    int is_mmc;
  37
  38 -  cdda_private_data_t *private;
  39 +  cdda_private_data_t *private_data;
  40    void         *reserved;
  41    unsigned char inqbytes[4];
  42
  43 Index: interface/interface.c
  44 ===================================================================
  45 --- a/interface/interface.c     (Revision 15337)
  46 +++ b/interface/interface.c     (Revision 15340)
  47 @@ -39,9 +39,9 @@
  48      if(d->drive_model)free(d->drive_model);
  49      if(d->cdda_fd!=-1)close(d->cdda_fd);
  50      if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
  51 -    if(d->private){
  52 -      if(d->private->sg_hd)free(d->private->sg_hd);
  53 -      free(d->private);
  54 +    if(d->private_data){
  55 +      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
  56 +      free(d->private_data);
  57      }
  58
  59      free(d);
  60 @@ -127,7 +127,7 @@
  61         }
  62        }
  63      }
  64 -    if(ms)*ms=d->private->last_milliseconds;
  65 +    if(ms)*ms=d->private_data->last_milliseconds;
  66      return(sectors);
  67    }
  68
  69 Index: interface/scsi_interface.c
  70 ===================================================================
  71 --- a/interface/scsi_interface.c        (Revision 15337)
  72 +++ b/interface/scsi_interface.c        (Revision 15340)
  73 @@ -15,13 +15,13 @@
  74  static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
  75    struct timespec tv1;
  76    struct timespec tv2;
  77 -  int ret1=clock_gettime(d->private->clock,&tv1);
  78 +  int ret1=clock_gettime(d->private_data->clock,&tv1);
  79    int ret2=ioctl(fd, command,arg);
  80 -  int ret3=clock_gettime(d->private->clock,&tv2);
  81 +  int ret3=clock_gettime(d->private_data->clock,&tv2);
  82    if(ret1<0 || ret3<0){
  83 -    d->private->last_milliseconds=-1;
  84 +    d->private_data->last_milliseconds=-1;
  85    }else{
  86 -    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
  87 +    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
  88    }
  89    return ret2;
  90  }
  91 @@ -96,7 +96,7 @@
  92  static void clear_garbage(cdrom_drive *d){
  93    fd_set fdset;
  94    struct timeval tv;
  95 -  struct sg_header *sg_hd=d->private->sg_hd;
  96 +  struct sg_header *sg_hd=d->private_data->sg_hd;
  97    int flag=0;
  98
  99    /* clear out any possibly preexisting garbage */
 100 @@ -185,7 +185,7 @@
 101    struct timespec tv2;
 102    int tret1,tret2;
 103    int status = 0;
 104 -  struct sg_header *sg_hd=d->private->sg_hd;
 105 +  struct sg_header *sg_hd=d->private_data->sg_hd;
 106    long writebytes=SG_OFF+cmd_len+in_size;
 107
 108    /* generic scsi device services */
 109 @@ -195,7 +195,7 @@
 110
 111    memset(sg_hd,0,sizeof(sg_hd));
 112    memset(sense_buffer,0,SG_MAX_SENSE);
 113 -  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
 114 +  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
 115    sg_hd->twelve_byte = cmd_len == 12;
 116    sg_hd->result = 0;
 117    sg_hd->reply_len = SG_OFF + out_size;
 118 @@ -209,7 +209,7 @@
 119       tell if the command failed.  Scared yet? */
 120
 121    if(bytecheck && out_size>in_size){
 122 -    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
 123 +    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size);
 124      /* the size does not remove cmd_len due to the way the kernel
 125         driver copies buffers */
 126      writebytes+=(out_size-in_size);
 127 @@ -243,7 +243,7 @@
 128    }
 129
 130    sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
 131 -  tret1=clock_gettime(d->private->clock,&tv1);
 132 +  tret1=clock_gettime(d->private_data->clock,&tv1);
 133    errno=0;
 134    status = write(d->cdda_fd, sg_hd, writebytes );
 135
 136 @@ -289,7 +289,7 @@
 137      }
 138    }
 139
 140 -  tret2=clock_gettime(d->private->clock,&tv2);
 141 +  tret2=clock_gettime(d->private_data->clock,&tv2);
 142    errno=0;
 143    status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
 144    sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL );
 145 @@ -313,7 +313,7 @@
 146    if(bytecheck && in_size+cmd_len<out_size){
 147      long i,flag=0;
 148      for(i=in_size;i<out_size;i++)
 149 -      if(d->private->sg_buffer[i]!=bytefill){
 150 +      if(d->private_data->sg_buffer[i]!=bytefill){
 151         flag=1;
 152         break;
 153        }
 154 @@ -326,9 +326,9 @@
 155
 156    errno=0;
 157    if(tret1<0 || tret2<0){
 158 -    d->private->last_milliseconds=-1;
 159 +    d->private_data->last_milliseconds=-1;
 160    }else{
 161 -    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
 162 +    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
 163    }
 164    return(0);
 165  }
 166 @@ -347,7 +347,7 @@
 167
 168    memset(&hdr,0,sizeof(hdr));
 169    memset(sense,0,sizeof(sense));
 170 -  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
 171 +  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
 172
 173    hdr.cmdp = cmd;
 174    hdr.cmd_len = cmd_len;
 175 @@ -355,7 +355,7 @@
 176    hdr.mx_sb_len = SG_MAX_SENSE;
 177    hdr.timeout = 50000;
 178    hdr.interface_id = 'S';
 179 -  hdr.dxferp =  d->private->sg_buffer;
 180 +  hdr.dxferp =  d->private_data->sg_buffer;
 181    hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
 182
 183    /* scary buffer fill hack */
 184 @@ -400,7 +400,7 @@
 185    if(bytecheck && in_size<out_size){
 186      long i,flag=0;
 187      for(i=in_size;i<out_size;i++)
 188 -      if(d->private->sg_buffer[i]!=bytefill){
 189 +      if(d->private_data->sg_buffer[i]!=bytefill){
 190         flag=1;
 191         break;
 192        }
 193 @@ -412,7 +412,7 @@
 194    }
 195
 196    /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
 197 -  /* d->private->last_milliseconds = hdr.duration; */
 198 +  /* d->private_data->last_milliseconds = hdr.duration; */
 199
 200    errno = 0;
 201    return 0;
 202 @@ -445,9 +445,9 @@
 203
 204    handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
 205
 206 -  key = d->private->sg_buffer[2] & 0xf;
 207 -  ASC = d->private->sg_buffer[12];
 208 -  ASCQ = d->private->sg_buffer[13];
 209 +  key = d->private_data->sg_buffer[2] & 0xf;
 210 +  ASC = d->private_data->sg_buffer[12];
 211 +  ASCQ = d->private_data->sg_buffer[13];
 212
 213    if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
 214    return 1;
 215 @@ -492,7 +492,7 @@
 216    if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1);
 217
 218    {
 219 -    unsigned char *b=d->private->sg_buffer;
 220 +    unsigned char *b=d->private_data->sg_buffer;
 221      if(b[0])return(1); /* Handles only up to 256 bytes */
 222      if(b[6])return(1); /* Handles only up to 256 bytes */
 223
 224 @@ -604,8 +604,8 @@
 225  static unsigned int get_orig_sectorsize(cdrom_drive *d){
 226    if(mode_sense(d,12,0x01))return(-1);
 227
 228 -  d->orgdens = d->private->sg_buffer[4];
 229 -  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
 230 +  d->orgdens = d->private_data->sg_buffer[4];
 231 +  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
 232  }
 233
 234  /* switch CDROM scsi drives to given sector size  */
 235 @@ -664,8 +664,8 @@
 236      return(-4);
 237    }
 238
 239 -  first=d->private->sg_buffer[2];
 240 -  last=d->private->sg_buffer[3];
 241 +  first=d->private_data->sg_buffer[2];
 242 +  last=d->private_data->sg_buffer[3];
 243    tracks=last-first+1;
 244
 245    if (last > MAXTRK || first > MAXTRK || last<0 || first<0) {
 246 @@ -683,7 +683,7 @@
 247        return(-5);
 248      }
 249      {
 250 -      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
 251 +      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
 252
 253        d->disc_toc[i-first].bFlags=toc->bFlags;
 254        d->disc_toc[i-first].bTrack=i;
 255 @@ -704,7 +704,7 @@
 256      return(-2);
 257    }
 258    {
 259 -    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
 260 +    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
 261
 262      d->disc_toc[i-first].bFlags=toc->bFlags;
 263      d->disc_toc[i-first].bTrack=0xAA;
 264 @@ -738,7 +738,7 @@
 265    }
 266
 267    /* copy to our structure and convert start sector */
 268 -  tracks = d->private->sg_buffer[1];
 269 +  tracks = d->private_data->sg_buffer[1];
 270    if (tracks > MAXTRK) {
 271      cderror(d,"003: CDROM reporting illegal number of tracks\n");
 272      return(-3);
 273 @@ -754,33 +754,33 @@
 274        return(-5);
 275      }
 276
 277 -    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
 278 +    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
 279      d->disc_toc[i].bTrack = i + 1;
 280
 281      d->disc_toc[i].dwStartSector= d->adjust_ssize *
 282 -       (((signed char)(d->private->sg_buffer[2])<<24) |
 283 -        (d->private->sg_buffer[3]<<16)|
 284 -        (d->private->sg_buffer[4]<<8)|
 285 -        (d->private->sg_buffer[5]));
 286 +       (((signed char)(d->private_data->sg_buffer[2])<<24) |
 287 +        (d->private_data->sg_buffer[3]<<16)|
 288 +        (d->private_data->sg_buffer[4]<<8)|
 289 +        (d->private_data->sg_buffer[5]));
 290    }
 291
 292    d->disc_toc[i].bFlags = 0;
 293    d->disc_toc[i].bTrack = i + 1;
 294 -  memcpy (&foo, d->private->sg_buffer+2, 4);
 295 -  memcpy (&bar, d->private->sg_buffer+6, 4);
 296 +  memcpy (&foo, d->private_data->sg_buffer+2, 4);
 297 +  memcpy (&bar, d->private_data->sg_buffer+6, 4);
 298    d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
 299                                                     be32_to_cpu(bar));
 300
 301    d->disc_toc[i].dwStartSector= d->adjust_ssize *
 302 -    ((((signed char)(d->private->sg_buffer[2])<<24) |
 303 -      (d->private->sg_buffer[3]<<16)|
 304 -      (d->private->sg_buffer[4]<<8)|
 305 -      (d->private->sg_buffer[5]))+
 306 +    ((((signed char)(d->private_data->sg_buffer[2])<<24) |
 307 +      (d->private_data->sg_buffer[3]<<16)|
 308 +      (d->private_data->sg_buffer[4]<<8)|
 309 +      (d->private_data->sg_buffer[5]))+
 310
 311 -     ((((signed char)(d->private->sg_buffer[6])<<24) |
 312 -       (d->private->sg_buffer[7]<<16)|
 313 -       (d->private->sg_buffer[8]<<8)|
 314 -       (d->private->sg_buffer[9]))));
 315 +     ((((signed char)(d->private_data->sg_buffer[6])<<24) |
 316 +       (d->private_data->sg_buffer[7]<<16)|
 317 +       (d->private_data->sg_buffer[8]<<8)|
 318 +       (d->private_data->sg_buffer[9]))));
 319
 320
 321    d->cd_extra = FixupTOC(d,tracks+1);
 322 @@ -817,7 +817,7 @@
 323    cmd[8] = sectors;
 324    if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 325      return(ret);
 326 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 327 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 328    return(0);
 329  }
 330
 331 @@ -836,7 +836,7 @@
 332    cmd[9] = sectors;
 333    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 334      return(ret);
 335 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 336 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 337    return(0);
 338  }
 339
 340 @@ -854,7 +854,7 @@
 341    cmd[8] = sectors;
 342    if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 343      return(ret);
 344 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 345 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 346    return(0);
 347  }
 348
 349 @@ -872,7 +872,7 @@
 350    cmd[9] = sectors;
 351    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 352      return(ret);
 353 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 354 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 355    return(0);
 356  }
 357
 358 @@ -890,7 +890,7 @@
 359    cmd[8] = sectors;
 360    if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 361      return(ret);
 362 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 363 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 364    return(0);
 365  }
 366
 367 @@ -908,7 +908,7 @@
 368    cmd[9] = sectors;
 369    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 370      return(ret);
 371 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 372 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 373    return(0);
 374  }
 375
 376 @@ -922,7 +922,7 @@
 377    cmd[8] = sectors;
 378    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 379      return(ret);
 380 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 381 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 382    return(0);
 383  }
 384
 385 @@ -936,7 +936,7 @@
 386    cmd[8] = sectors;
 387    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 388      return(ret);
 389 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 390 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 391    return(0);
 392  }
 393
 394 @@ -950,7 +950,7 @@
 395    cmd[8] = sectors;
 396    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 397      return(ret);
 398 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 399 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 400    return(0);
 401  }
 402
 403 @@ -964,7 +964,7 @@
 404    cmd[8] = sectors;
 405    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 406      return(ret);
 407 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 408 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 409    return(0);
 410  }
 411
 412 @@ -978,7 +978,7 @@
 413    cmd[8] = sectors;
 414    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 415      return(ret);
 416 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 417 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 418    return(0);
 419  }
 420
 421 @@ -992,7 +992,7 @@
 422    cmd[8] = sectors;
 423    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 424      return(ret);
 425 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 426 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 427    return(0);
 428  }
 429
 430 @@ -1026,7 +1026,7 @@
 431
 432    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 433      return(ret);
 434 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 435 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 436    return(0);
 437  }
 438
 439 @@ -1039,7 +1039,7 @@
 440
 441    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 442      return(ret);
 443 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 444 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 445    return(0);
 446  }
 447
 448 @@ -1052,7 +1052,7 @@
 449
 450    if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
 451      return(ret);
 452 -  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 453 +  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
 454    return(0);
 455  }
 456
 457 @@ -1275,7 +1275,7 @@
 458  static int count_2352_bytes(cdrom_drive *d){
 459    long i;
 460    for(i=2351;i>=0;i--)
 461 -    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
 462 +    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
 463        return(((i+3)>>2)<<2);
 464
 465    return(0);
 466 @@ -1284,7 +1284,7 @@
 467  static int verify_nonzero(cdrom_drive *d){
 468    long i,flag=0;
 469    for(i=0;i<2352;i++)
 470 -    if(d->private->sg_buffer[i]!=0){
 471 +    if(d->private_data->sg_buffer[i]!=0){
 472        flag=1;
 473        break;
 474      }
 475 @@ -1621,7 +1621,7 @@
 476    d->is_mmc=0;
 477    if(mode_sense(d,22,0x2A)==0){
 478
 479 -    b=d->private->sg_buffer;
 480 +    b=d->private_data->sg_buffer;
 481      b+=b[3]+4;
 482
 483      if((b[0]&0x3F)==0x2A){
 484 @@ -1669,7 +1669,7 @@
 485      cderror(d,"008: Unable to identify CDROM model\n");
 486      return(NULL);
 487    }
 488 -  return (d->private->sg_buffer);
 489 +  return (d->private_data->sg_buffer);
 490  }
 491
 492  int scsi_init_drive(cdrom_drive *d){
 493 @@ -1725,8 +1725,8 @@
 494    check_cache(d);
 495
 496    d->error_retry=1;
 497 -  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
 498 -  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
 499 +  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
 500 +  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
 501    d->report_all=1;
 502    return(0);
 503  }
 504 Index: interface/cooked_interface.c
 505 ===================================================================
 506 --- a/interface/cooked_interface.c      (Revision 15337)
 507 +++ b/interface/cooked_interface.c      (Revision 15340)
 508 @@ -13,13 +13,13 @@
 509  static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
 510    struct timespec tv1;
 511    struct timespec tv2;
 512 -  int ret1=clock_gettime(d->private->clock,&tv1);
 513 +  int ret1=clock_gettime(d->private_data->clock,&tv1);
 514    int ret2=ioctl(fd, command,arg);
 515 -  int ret3=clock_gettime(d->private->clock,&tv2);
 516 +  int ret3=clock_gettime(d->private_data->clock,&tv2);
 517    if(ret1<0 || ret3<0){
 518 -    d->private->last_milliseconds=-1;
 519 +    d->private_data->last_milliseconds=-1;
 520    }else{
 521 -    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
 522 +    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
 523    }
 524    return ret2;
 525  }
 526 Index: interface/scan_devices.c
 527 ===================================================================
 528 --- a/interface/scan_devices.c  (Revision 15337)
 529 +++ b/interface/scan_devices.c  (Revision 15340)
 530 @@ -264,11 +264,11 @@
 531    d->interface=COOKED_IOCTL;
 532    d->bigendianp=-1; /* We don't know yet... */
 533    d->nsectors=-1;
 534 -  d->private=calloc(1,sizeof(*d->private));
 535 +  d->private_data=calloc(1,sizeof(*d->private_data));
 536    {
 537      /* goddamnit */
 538      struct timespec tv;
 539 -    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
 540 +    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
 541    }
 542    idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
 543    return(d);
 544 @@ -674,15 +674,15 @@
 545    d->bigendianp=-1; /* We don't know yet... */
 546    d->nsectors=-1;
 547    d->messagedest = messagedest;
 548 -  d->private=calloc(1,sizeof(*d->private));
 549 +  d->private_data=calloc(1,sizeof(*d->private_data));
 550    {
 551      /* goddamnit */
 552      struct timespec tv;
 553 -    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
 554 +    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
 555    }
 556    if(use_sgio){
 557      d->interface=SGIO_SCSI;
 558 -    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
 559 +    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
 560      g_fd=d->cdda_fd=dup(d->ioctl_fd);
 561    }else{
 562      version=verify_SG_version(d,messagedest,messages);
 563 @@ -696,8 +696,8 @@
 564      }
 565
 566      /* malloc our big buffer for scsi commands */
 567 -    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
 568 -    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
 569 +    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
 570 +    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
 571    }
 572
 573    {
 574 @@ -772,9 +772,9 @@
 575    if(i_fd!=-1)close(i_fd);
 576    if(g_fd!=-1)close(g_fd);
 577    if(d){
 578 -    if(d->private){
 579 -      if(d->private->sg_hd)free(d->private->sg_hd);
 580 -      free(d->private);
 581 +    if(d->private_data){
 582 +      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
 583 +      free(d->private_data);
 584      }
 585      free(d);
 586    }
 587 @@ -821,7 +821,7 @@
 588    d->interface=TEST_INTERFACE;
 589    d->bigendianp=-1; /* We don't know yet... */
 590    d->nsectors=-1;
 591 -  d->private=calloc(1,sizeof(*d->private));
 592 +  d->private_data=calloc(1,sizeof(*d->private_data));
 593    d->drive_model=copystring("File based test interface");
 594    idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
 595