libburnia/libburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now unconditional: Cdrskin_libburn_has_convert_scsi_adR

Browse Source
This commit is contained in:
Thomas Schmitt 2011-10-06 11:00:18 +00:00
parent cbcae473ad
commit ff1e0eb54e
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cdrskin/cdrskin.c
View File

@ -183,7 +183,7 @@ or
#define Cdrskin_allow_libburn_taO 1 #define Cdrskin_allow_libburn_taO 1
#define Cdrskin_libburn_has_is_enumerablE 1 #define Cdrskin_libburn_has_is_enumerablE 1
#define Cdrskin_libburn_has_convert_fs_adR 1 #define Cdrskin_libburn_has_convert_fs_adR 1
#define Cdrskin_libburn_has_convert_scsi_adR 1 /* Cdrskin_libburn_has_convert_scsi_adR */
/* Cdrskin_libburn_has_burn_msgS */ /* Cdrskin_libburn_has_burn_msgS */
/* Cdrskin_libburn_has_burn_aborT */ /* Cdrskin_libburn_has_burn_aborT */
/* Cdrskin_libburn_has_cleanup_handleR */ /* Cdrskin_libburn_has_cleanup_handleR */
@ -2023,11 +2023,7 @@ int Cdrpreskin_new(struct CdrpreskiN **preskin, int flag)
o->allow_emulated_drives= 0; o->allow_emulated_drives= 0;
o->no_whitelist= 0; o->no_whitelist= 0;
o->no_convert_fs_adr= 0; o->no_convert_fs_adr= 0;
#ifdef Cdrskin_libburn_has_convert_scsi_adR
o->old_pseudo_scsi_adr= 0; o->old_pseudo_scsi_adr= 0;
#else
o->old_pseudo_scsi_adr= 1;
#endif
o->scan_demands_drive= 0; o->scan_demands_drive= 0;
o->abort_on_busy_drive= 0; o->abort_on_busy_drive= 0;
o->drive_exclusive= 1; o->drive_exclusive= 1;
@ -2427,7 +2423,6 @@ ata_bus:;
} }
sprintf(device_adr,"/dev/hd%c",'a'+(2*busno)+(*driveno)); sprintf(device_adr,"/dev/hd%c",'a'+(2*busno)+(*driveno));
#ifdef Cdrskin_libburn_has_convert_scsi_adR
} else { } else {
int ret; int ret;
@ -2443,8 +2438,6 @@ ata_bus:;
} else if(ret<0) } else if(ret<0)
return(-1); return(-1);
return(1); return(1);
#endif /* Cdrskin_libburn_has_convert_scsi_adR */
} }
} }
} }
@ -4274,7 +4267,6 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
{ret= 2; goto adr_translation;} {ret= 2; goto adr_translation;}
} }
#ifdef Cdrskin_libburn_has_convert_scsi_adR
if(!skin->preskin->old_pseudo_scsi_adr) { if(!skin->preskin->old_pseudo_scsi_adr) {
int host_no= -1,channel_no= -1,target_no= -1,lun_no= -1, bus_no= -1; int host_no= -1,channel_no= -1,target_no= -1,lun_no= -1, bus_no= -1;
@ -4295,7 +4287,6 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
goto adr_translation; goto adr_translation;
} }
} }
#endif
k_start= 0; k_start= 0;
if(strncmp(loc,"/dev/sg",7)==0 || strncmp(loc,"/dev/sr",7)==0) if(strncmp(loc,"/dev/sg",7)==0 || strncmp(loc,"/dev/sr",7)==0)

2
cdrskin/cdrskin_timestamp.h
View File

@ -1 +1 @@
#define Cdrskin_timestamP "2011.10.06.105627" #define Cdrskin_timestamP "2011.10.06.105922"