diff --git a/cdrskin/cdrskin_timestamp.h b/cdrskin/cdrskin_timestamp.h index 4001b24..2e3ad75 100644 --- a/cdrskin/cdrskin_timestamp.h +++ b/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2007.09.06.100100" +#define Cdrskin_timestamP "2007.09.06.120844" diff --git a/libburn/drive.c b/libburn/drive.c index f2d47dc..f2e7fd8 100644 --- a/libburn/drive.c +++ b/libburn/drive.c @@ -1150,9 +1150,9 @@ int burn_drive_adr_debug_msg(char *fmt, char *arg) return ret; } -/* ts A60923 */ +/* ts A60923 */ /* ts A70906 : promoted to API */ /** Inquire the persistent address of the given drive. */ -int burn_drive_raw_get_adr(struct burn_drive *d, char adr[]) +int burn_drive_d_get_adr(struct burn_drive *d, char adr[]) { if (strlen(d->devname) >= BURN_DRIVE_ADR_LEN) { libdax_msgs_submit(libdax_messenger, d->global_index, @@ -1171,11 +1171,13 @@ int burn_drive_get_adr(struct burn_drive_info *drive_info, char adr[]) { int ret; - ret = burn_drive_raw_get_adr(drive_info->drive, adr); + ret = burn_drive_d_get_adr(drive_info->drive, adr); return ret; } + + /* ts A60922 ticket 33 */ /** Evaluate wether the given address would be enumerated by libburn */ int burn_drive_is_enumerable_adr(char *adr) @@ -1276,7 +1278,7 @@ int burn_drive_obtain_scsi_adr(char *path, for (i = 0; i < drivetop + 1; i++) { if (drive_array[i].global_index < 0) continue; - ret = burn_drive_raw_get_adr(&(drive_array[i]),adr); + ret = burn_drive_d_get_adr(&(drive_array[i]),adr); if (ret < 0) return -1; if (ret == 0) diff --git a/libburn/libburn.h b/libburn/libburn.h index 71de0e6..ed1a855 100644 --- a/libburn/libburn.h +++ b/libburn/libburn.h @@ -718,6 +718,15 @@ void burn_drive_info_free(struct burn_drive_info drive_infos[]); #define BURN_DRIVE_ADR_LEN 1024 /** Inquire the persistent address of the given drive. + @param drive The drive to inquire. + @param adr An application provided array of at least BURN_DRIVE_ADR_LEN + characters size. The persistent address gets copied to it. + @return >0 success , <=0 error (due to libburn internal problem) +*/ +int burn_drive_d_get_adr(struct burn_drive *drive, char adr[]); + +/** Inquire the persistent address of a drive via a given drive_info object. + (Note: This is a legacy call.) @param drive_info The drive to inquire. Usually some &(drive_infos[driveno]) @param adr An application provided array of at least BURN_DRIVE_ADR_LEN characters size. The persistent address gets copied to it. @@ -725,6 +734,7 @@ void burn_drive_info_free(struct burn_drive_info drive_infos[]); */ int burn_drive_get_adr(struct burn_drive_info *drive_info, char adr[]); + /* ts A60922 ticket 33 */ /** Evaluate wether the given address would be a possible persistent drive address of libburn.