Moved manual device family decision to a sufficiently early stage

ZeroThreeEight
Thomas Schmitt 16 years ago
parent 64233b0ccc
commit 2816d8b569
  1. 20
      cdrskin/cdrskin.c
  2. 2
      cdrskin/cdrskin_timestamp.h

@ -2260,6 +2260,16 @@ final_checks:;
if(flag&1)
goto ex;
#ifndef Cdrskin_libburn_no_burn_preset_device_opeN
burn_preset_device_open(o->drive_exclusive
#ifdef Cdrskin_libburn_preset_device_familY
| (o->drive_scsi_dev_family<<2)
#endif
,
o->drive_blocking,
o->abort_on_busy_drive);
#endif /* ! Cdrskin_libburn_no_burn_preset_device_opeN */
if(strlen(o->raw_device_adr)>0 && !o->no_whitelist) {
int driveno,hret;
char *adr,buf[Cdrskin_adrleN];
@ -6133,16 +6143,6 @@ int Cdrskin_create(struct CdrskiN **o, struct CdrpreskiN **preskin,
*o= NULL;
*exit_value= 0;
#ifndef Cdrskin_libburn_no_burn_preset_device_opeN
burn_preset_device_open((*preskin)->drive_exclusive
#ifdef Cdrskin_libburn_preset_device_familY
| ((*preskin)->drive_scsi_dev_family<<2)
#endif
,
(*preskin)->drive_blocking,
(*preskin)->abort_on_busy_drive);
#endif /* ! Cdrskin_libburn_no_burn_preset_device_opeN */
if(strlen((*preskin)->device_adr)>0) { /* disable scan for all others */
ClN(printf(
"cdrskin: NOTE : greying out all drives besides given dev='%s'\n",

@ -1 +1 @@
#define Cdrskin_timestamP "2007.03.15.195005"
#define Cdrskin_timestamP "2007.03.15.195251"

Loading…
Cancel
Save