Compare commits
No commits in common. "master" and "release-1.4.8" have entirely different histories.
master
...
release-1.
44
ChangeLog
44
ChangeLog
@ -1,47 +1,3 @@
|
||||
git clone git@dev.lovelyhq.com:libburnia/libburn.git
|
||||
(to become libburn-1.5.8 or higher)
|
||||
===============================================================================
|
||||
- no novelties yet -
|
||||
|
||||
|
||||
libburn-1.5.6.tar.gz Wed Jun 07 2023
|
||||
===============================================================================
|
||||
* Bug fix: Overburning with cdrskin option -force ended by a libburn error
|
||||
* New API call burn_write_opts_set_bdr_obs_exempt()
|
||||
* New cdrskin option --bdr_obs_exempt
|
||||
* Officially enabled overburning with burn_write_opts_set_force(,1)
|
||||
|
||||
libburn-1.5.4.tar.gz Sat Jan 30 2021
|
||||
===============================================================================
|
||||
* Bug fix: Early SCSI commands from sg-linux.c were not logged
|
||||
* New API call burn_drive_set_speed_exact()
|
||||
* New API call burn_nominal_slowdown()
|
||||
|
||||
libburn-1.5.2.pl01.tar.gz Mon Nov 25 2019
|
||||
===============================================================================
|
||||
* Bug fix: cdrskin multi-track burning was slow and stalled after track 1.
|
||||
Regression introduced in version 1.5.0 by commit 84fad99, 2018.02.05
|
||||
O_DIRECT is now disabled for track sources.
|
||||
|
||||
libburn-1.5.2.tar.gz Sat Oct 26 2019
|
||||
===============================================================================
|
||||
* Bug fix: No lock was obtained for setting up a fifo object
|
||||
* Bug fix: Stream recording was applied regardless whether the drive offers it.
|
||||
This caused Xfburn failures with some MATSHITA laptop drives.
|
||||
* Bug fix: TDK Corporation was not recognized as manufacturer of DVD-R "TTH02"
|
||||
* Made libburn ready for building out-of-source. Thanks Ross Burton.
|
||||
* New API calls burn_drive_get_feature_codes(), burn_drive_get_feature()
|
||||
* New cdrskin option --list_features
|
||||
|
||||
libburn-1.5.0.tar.gz Sat Sep 15 2018
|
||||
===============================================================================
|
||||
* Bug fix: cdrskin threw errno 22 on data file input if libburn is
|
||||
configured with --enable-track-src-odirect
|
||||
* Bug fix: SIGSEGV could happen if a track ended by reaching its fixed size
|
||||
while the track source still was willing to deliver bytes.
|
||||
Thanks to user swordragon.
|
||||
* Bug fix: Device file comparison parameters were recorded wrong with Linux sg
|
||||
|
||||
libburn-1.4.8.tar.gz Tue Sep 12 2017
|
||||
===============================================================================
|
||||
* Bug fix: Option -dummy did not affect writing by direct_write_amount=
|
||||
|
||||
@ -114,9 +114,9 @@ test_poll_CPPFLAGS = -Ilibburn
|
||||
test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
|
||||
test_poll_SOURCES = test/poll.c
|
||||
|
||||
## cdrskin construction site - ts A60816 - C30607
|
||||
## cdrskin construction site - ts A60816 - B70912
|
||||
cdrskin_cdrskin_CPPFLAGS = -Ilibburn
|
||||
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_5_7
|
||||
cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_4_8
|
||||
|
||||
# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
|
||||
# ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
|
||||
@ -201,7 +201,6 @@ EXTRA_DIST = \
|
||||
doc/cookbook.txt \
|
||||
doc/mediainfo.txt \
|
||||
doc/cdtext.txt \
|
||||
doc/waveformat.txt \
|
||||
README \
|
||||
AUTHORS \
|
||||
CONTRIBUTORS \
|
||||
|
||||
77
README
77
README
@ -6,12 +6,12 @@ This all is under GPL.
|
||||
------------------------------------------------------------------------------
|
||||
libburnia-project.org
|
||||
By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (C) 2006-2023 Mario Danic, Thomas Schmitt
|
||||
Copyright (C) 2006-2017 Mario Danic, Thomas Schmitt
|
||||
Still containing parts of Libburn. By Derek Foreman <derek@signalmarketing.com>
|
||||
and Ben Jansens <xor@orodu.net>
|
||||
Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
|
||||
|
||||
http://files.libburnia-project.org/releases/libburn-1.5.6.tar.gz
|
||||
http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
@ -19,10 +19,10 @@ Copyright (C) 2002-2006 Derek Foreman and Ben Jansens
|
||||
|
||||
From tarball
|
||||
|
||||
Obtain libburn-1.5.6.tar.gz, take it to a directory of your choice and do:
|
||||
Obtain libburn-1.4.8.tar.gz, take it to a directory of your choice and do:
|
||||
|
||||
tar xzf libburn-1.5.6.tar.gz
|
||||
cd libburn-1.5.6
|
||||
tar xzf libburn-1.4.8.tar.gz
|
||||
cd libburn-1.4.8
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
|
||||
@ -41,21 +41,21 @@ You may have to keep your hald away from the drive. See for example
|
||||
http://www.freebsd.org/gnome/docs/halfaq.html
|
||||
|
||||
|
||||
From git
|
||||
From SVN
|
||||
|
||||
Our build system is based on autotools. For preparing the build of a git
|
||||
Our build system is based on autotools. For preparing the build of a SVN
|
||||
snapshot you will need autotools of at least version 1.7.
|
||||
Do in a directory of your choice:
|
||||
|
||||
git clone https://dev.lovelyhq.com/libburnia/libburn.git libburn-git
|
||||
cd libburn-git
|
||||
svn co http://svn.libburnia-project.org/libburn/trunk libburn-svn
|
||||
cd libburn-svn
|
||||
./bootstrap
|
||||
./configure --prefix=/usr
|
||||
make
|
||||
make install
|
||||
|
||||
Warning: The master branch might contain experimental features which might
|
||||
not persist until next release.
|
||||
Warning: The trunk might contain experimental features which might not
|
||||
persist until next release.
|
||||
|
||||
|
||||
Special ./configure options
|
||||
@ -113,11 +113,12 @@ closing it immediately, waiting, and only then opening it for real:
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
The other parts of the the libburnia project are hosted as neighbors of
|
||||
libburn:
|
||||
An important part of the project, libisofs, is hosted in a bzr repository at
|
||||
launchpad.net :
|
||||
bzr branch lp:libisofs
|
||||
|
||||
git clone https://dev.lovelyhq.com/libburnia/libisofs.git
|
||||
git clone https://dev.lovelyhq.com/libburnia/libisoburn.git
|
||||
Another part the project, libisoburn, is hosted in the libburnia SVN, too:
|
||||
svn co http://svn.libburnia-project.org/libisoburn/trunk libisoburn
|
||||
|
||||
See README files there.
|
||||
|
||||
@ -772,54 +773,10 @@ Project history as far as known to me:
|
||||
- Tue Sep 12 2017 release 1.4.8:
|
||||
libburn now refuses to write to SRM+POW formatted BD-R, because it would
|
||||
spoil them. libisofs got several bugs fixed and offers new API calls to
|
||||
support new xorriso features. libisoburn and xorriso offer more detail
|
||||
supoort new xorriso features. libisoburn and xorriso offer more detail
|
||||
control with particular boot sector types. New bugs and a regression from
|
||||
version 1.4.4 were fixed.
|
||||
|
||||
- Sat Sep 15 2018 release 1.5.0
|
||||
libisofs now can record all xattr namespaces, user defined padding was moved
|
||||
after appended partitions. libisoburn and xorriso make use of the new xattr
|
||||
capability of libisofs.
|
||||
All three libraries got some rarely triggered bugs fixed.
|
||||
|
||||
- Sat Oct 26 2019 release 1.5.2
|
||||
The libraries are now ready for building out-of-source. libisofs got minor
|
||||
API extensions. libburn got a bug fixed which spoiled burn runs on
|
||||
some MATSHITA laptop drives. It is now able to list all features which
|
||||
the drive announces. xorriso can now set GPT type GUIDs with appended
|
||||
partitions and the ISO partition.
|
||||
All three libraries got some rarely triggered bugs fixed.
|
||||
|
||||
- Mon Nov 25 2019 patch release 1.5.2.pl01
|
||||
cdrskin did not properly burn multiple tracks. Track 1 was slow and burning
|
||||
stalled before track 2. Regression introduced by 1.5.0.
|
||||
|
||||
- Sat Jan 30 2021 , 07 Feb 2021 release 1.5.4
|
||||
libburn offers new opportunities to influence drive speed.
|
||||
libisofs got a bug fixed which under medium rare circumstances spoiled
|
||||
zisofs production. libisofs switched to usage of libjte-2.0.0. Further it
|
||||
can now write and read zisofs2 format, which enables compression of files
|
||||
>= 4 GiB. When reading Joliet file trees, the names get stripped of their
|
||||
version numbers by default. After loading metadata, libisofs can now tell
|
||||
which directory tree was loaded and whether Rock Ridge is used.
|
||||
libisoburn and xorriso make use of these new features.
|
||||
xorriso can put out the data stream of -check_media to standard output. It
|
||||
can restore files with many zero bytes as sparse files and it is able to
|
||||
extract recognized boot images into data files on hard disk.
|
||||
A new script xorriso-dd-target helps to put an ISO image onto an USB stick
|
||||
without endangering valuable hard disk content.
|
||||
Several rarely triggered bugs were fixed.
|
||||
|
||||
- Wed Jun 07 2023 release 1.5.6
|
||||
libburn can overburn CD media, i.e. write more data than the drive announced
|
||||
as medium capacity.
|
||||
libisofs can assess many of the features which were in effect when a
|
||||
given ISO 9660 filesystem was created. A safety limit was introduced not
|
||||
to exceed the limit of Linux which is imposed on the number of SUSP CE
|
||||
entries which is good for about 60 KiB of AAIP data. Some rarely occuring
|
||||
bugs were fixed in libisofs.
|
||||
libisoburn and xorriso expose the new library features to the user and
|
||||
got some minor improvements. Many minor bugs were fixed.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
||||
75
acinclude.m4
75
acinclude.m4
@ -16,7 +16,6 @@ AC_DEFUN([TARGET_SHIZZLE],
|
||||
|
||||
AC_MSG_CHECKING([target operating system])
|
||||
|
||||
libburn_check_libcam=
|
||||
LIBBURNIA_LDCONFIG_CMD="echo 'No ldconfig run performed. If needed, configure manually for:'"
|
||||
|
||||
case $target in
|
||||
@ -33,7 +32,6 @@ AC_DEFUN([TARGET_SHIZZLE],
|
||||
*-kfreebsd*-gnu*)
|
||||
ARCH=freebsd
|
||||
LIBBURN_ARCH_LIBS=-lcam
|
||||
libburn_check_libcam=yes
|
||||
;;
|
||||
*-solaris*)
|
||||
ARCH=solaris
|
||||
@ -45,12 +43,8 @@ AC_DEFUN([TARGET_SHIZZLE],
|
||||
# AC_ERROR([You are attempting to compile for an unsupported platform])
|
||||
;;
|
||||
esac
|
||||
AC_MSG_RESULT([$ARCH])
|
||||
|
||||
if test x"$libburn_check_libcam" = xyes
|
||||
then
|
||||
LIBBURNIA_CHECK_LIBCAM
|
||||
fi
|
||||
AC_MSG_RESULT([$ARCH])
|
||||
])
|
||||
|
||||
|
||||
@ -59,12 +53,12 @@ dnl It tests whether -Wl,--version-script=... works with the compiler
|
||||
AC_DEFUN([LIBBURN_ASSERT_VERS_LIBS],
|
||||
[
|
||||
libburnia_save_LDFLAGS="$LDFLAGS"
|
||||
LDFLAGS="$LDFLAGS -Wl,--version-script=$srcdir/libburn/libburn.ver"
|
||||
LDFLAGS="$LDFLAGS -Wl,--version-script=libburn/libburn.ver"
|
||||
AC_TRY_LINK([#include <stdio.h>], [printf("Hello\n");],
|
||||
[vers_libs_test="yes"], [vers_libs_test="no"])
|
||||
if test x$vers_libs_test = xyes
|
||||
then
|
||||
LIBLDFLAGS="-Wl,--version-script=$srcdir/libburn/libburn.ver"
|
||||
LIBLDFLAGS="-Wl,--version-script=libburn/libburn.ver"
|
||||
fi
|
||||
LDFLAGS="$libburnia_save_LDFLAGS"
|
||||
AC_SUBST(LIBLDFLAGS)
|
||||
@ -126,7 +120,6 @@ dnl It tests whether the OS dependent libraries are available.
|
||||
dnl With libisoburn they are needed only for the case that indirect linking
|
||||
dnl does not work. So it is worth a try to omit them.
|
||||
dnl $1 = "mandatory" or "optional" define the action if test linking fails.
|
||||
dnl "silent" is like "optional" but without message.
|
||||
AC_DEFUN([LIBBURNIA_CHECK_ARCH_LIBS],
|
||||
[
|
||||
libburnia_save_LIBS="$LIBS"
|
||||
@ -147,21 +140,13 @@ AC_DEFUN([LIBBURNIA_CHECK_ARCH_LIBS],
|
||||
echo >&2
|
||||
(exit 1); exit 1;
|
||||
else
|
||||
if test x"$1" = xoptional
|
||||
then
|
||||
echo "disabled linking with $LIBBURN_ARCH_LIBS (because not found)"
|
||||
fi
|
||||
LIBBURN_ARCH_LIBS=""
|
||||
fi
|
||||
else
|
||||
if test x"$1" = xsilent
|
||||
then
|
||||
dummy=dummy
|
||||
else
|
||||
echo "enabled linking with $LIBBURN_ARCH_LIBS"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
@ -170,9 +155,6 @@ dnl
|
||||
AC_DEFUN([LIBBURNIA_CHECK_LINUX_SCSI],
|
||||
[
|
||||
dnl Check whether it is a Linux without scsi/scsi.h
|
||||
libburn_scsi_disabled=
|
||||
if test x"$ARCH" = xlinux
|
||||
then
|
||||
AH_TEMPLATE([Libburn_use_sg_dummY],
|
||||
[Define to compile without OS specific SCSI features])
|
||||
AC_MSG_CHECKING([for missing scsi/scsi.h on Linux])
|
||||
@ -184,58 +166,7 @@ AC_DEFUN([LIBBURNIA_CHECK_LINUX_SCSI],
|
||||
[;],
|
||||
[AC_MSG_RESULT([no])],
|
||||
[AC_DEFINE([Libburn_use_sg_dummY], [yes])
|
||||
libburn_scsi_disabled=yes
|
||||
AC_MSG_RESULT([yes])]
|
||||
)
|
||||
fi
|
||||
if test x"$libburn_scsi_disabled" = xyes
|
||||
then
|
||||
echo "disabled operation of optical drives via SCSI"
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
dnl LIBBURNIA_CHECK_LIBCAM is by Thomas Schmitt, libburnia project
|
||||
dnl
|
||||
AC_DEFUN([LIBBURNIA_CHECK_LIBCAM],
|
||||
[
|
||||
dnl Check whether libcam is requested for FreeBSD kernel but missing
|
||||
libburn_scsi_disabled=
|
||||
if test x"$LIBBURN_ARCH_LIBS" = x"-lcam"
|
||||
then
|
||||
AH_TEMPLATE([Libburn_use_sg_dummY],
|
||||
[Define to compile without OS specific SCSI features])
|
||||
AC_MSG_CHECKING([for missing libcam for SCSI on FreeBSD kernel])
|
||||
dnl If libcam is not available, LIBBURN_ARCH_LIBS will be made empty
|
||||
LIBBURNIA_CHECK_ARCH_LIBS(silent)
|
||||
if test x"$LIBBURN_ARCH_LIBS" = x
|
||||
then
|
||||
AC_DEFINE([Libburn_use_sg_dummY], [yes])
|
||||
libburn_scsi_disabled=yes
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
fi
|
||||
if test x"$LIBBURN_ARCH_LIBS" = x"-lcam"
|
||||
then
|
||||
AC_MSG_CHECKING([for missing libcam headers])
|
||||
AC_TRY_COMPILE([
|
||||
#include <stdio.h>
|
||||
#include <camlib.h>
|
||||
#include <cam/scsi/scsi_message.h>
|
||||
#include <cam/scsi/scsi_pass.h>
|
||||
],
|
||||
[;],
|
||||
[AC_MSG_RESULT([no])],
|
||||
[AC_DEFINE([Libburn_use_sg_dummY], [yes])
|
||||
libburn_scsi_disabled=yes
|
||||
AC_MSG_RESULT([yes])]
|
||||
)
|
||||
fi
|
||||
if test x"$libburn_scsi_disabled" = xyes
|
||||
then
|
||||
echo "disabled operation of optical drives via SCSI"
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
@ -4,9 +4,9 @@
|
||||
cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
|
||||
Integrated sub project of libburnia-project.org but also published via:
|
||||
http://scdbackup.sourceforge.net/cdrskin_eng.html
|
||||
http://scdbackup.sourceforge.net/cdrskin-1.5.7.tar.gz
|
||||
http://scdbackup.sourceforge.net/cdrskin-1.4.8.tar.gz
|
||||
|
||||
Copyright (C) 2006-2023 Thomas Schmitt, provided under GPL version 2 or later.
|
||||
Copyright (C) 2006-2017 Thomas Schmitt, provided under GPL version 2 or later.
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ most of the libburn features from the command line.
|
||||
|
||||
Currently it is fully supported on GNU/Linux with kernels >= 2.4, on FreeBSD,
|
||||
on OpenSolaris, and on NetBSD.
|
||||
IDE drives under Linux 2.4 need kernel module ide-scsi.
|
||||
IDE drives under Linux 2.4. need kernel module ide-scsi.
|
||||
ATA and SATA drives under FreeBSD need kernel module atapicam.
|
||||
On other X/Open compliant systems there will only be emulated drives, but no
|
||||
direct MMC operation on real CD/DVD/BD drives.
|
||||
@ -26,10 +26,10 @@ By using this software you agree to the disclaimer at the end of this text
|
||||
|
||||
Compilation, First Glimpse, Installation
|
||||
|
||||
Obtain cdrskin-1.5.7.tar.gz, take it to a directory of your choice and do:
|
||||
Obtain cdrskin-1.4.8.tar.gz, take it to a directory of your choice and do:
|
||||
|
||||
tar xzf cdrskin-1.5.7.tar.gz
|
||||
cd cdrskin-1.5.7
|
||||
tar xzf cdrskin-1.4.8.tar.gz
|
||||
cd cdrskin-1.4.8
|
||||
|
||||
Within that directory execute:
|
||||
|
||||
@ -563,7 +563,7 @@ are the cause. Any mistake of the burn program is supposed to be caught
|
||||
by the drive's firmware and to lead to mere misburns.
|
||||
The worst mishaps which hit the author imposed the need to reboot the
|
||||
system because of drives gnawing endlessly on ill media. Permanent hardware
|
||||
damage did not occur in 13 years of development. But one never knows ...
|
||||
damage did not occur in 3.5 years of development. But one never knows ...
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
@ -591,7 +591,7 @@ contributions in a due way.
|
||||
Based on and sub project of:
|
||||
libburnia-project.org
|
||||
By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (C) 2006-2023 Mario Danic, Thomas Schmitt
|
||||
Copyright (C) 2006-2017 Mario Danic, Thomas Schmitt
|
||||
|
||||
libburnia-project.org is inspired by and in other components still containing
|
||||
parts of
|
||||
|
||||
@ -38,7 +38,7 @@ original="./libburn_svn_release.tgz"
|
||||
# My changes are in $changes , mainly in $changes/cdrskin
|
||||
changes="./libburn-release"
|
||||
|
||||
skin_release="1.5.6"
|
||||
skin_release="1.4.8"
|
||||
patch_level=""
|
||||
# patch_level=".pl00"
|
||||
skin_rev="$skin_release""$patch_level"
|
||||
@ -229,7 +229,6 @@ tar czf "$cdrskin_tarball" "$target"
|
||||
"$compile_cmd" $compile_static_opts -O2 -do_strip
|
||||
cp "$compile_result" "../$bintarget_static"
|
||||
fi
|
||||
( cd cdrskin ; cc -g -Wall -o unite_html_b_line unite_html_b_line.c )
|
||||
"$man_to_html_cmd"
|
||||
mv "$man_page_html" ..
|
||||
)
|
||||
@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
|
||||
# My changes are in $changes , mainly in $changes/cdrskin
|
||||
changes="./libburn-develop"
|
||||
|
||||
skin_release="1.5.7"
|
||||
skin_release="1.4.9"
|
||||
patch_level=""
|
||||
skin_rev="$skin_release""$patch_level"
|
||||
|
||||
@ -229,8 +229,6 @@ tar czf "$cdrskin_tarball" "$target"
|
||||
fi
|
||||
# "$compile_cmd" -libburn_svn -O2 -do_diet -do_strip
|
||||
# cp "$compile_result" "../$bintarget_dynamic"_diet
|
||||
|
||||
( cd cdrskin ; cc -g -Wall -o unite_html_b_line unite_html_b_line.c )
|
||||
"$man_to_html_cmd"
|
||||
mv "$man_page_html" ..
|
||||
)
|
||||
@ -26,22 +26,8 @@
|
||||
#include <sys/select.h>
|
||||
|
||||
#ifndef Cdrfifo_standalonE
|
||||
/* for burn_os_alloc_buffer() */
|
||||
/* <<< until release of 0.7.4 : for Libburn_has_open_trac_srC */
|
||||
#include "../libburn/libburn.h"
|
||||
|
||||
/* ts B91124:
|
||||
DISABLED, because this spoils multi-track burning by slowing down first
|
||||
track and stalling before the second track begins. Obviously a problem
|
||||
with chained input and waiting for full O_DRIECT suitable read chunks.
|
||||
DO NOT ENABLE before the wait code in this source file is fixed.
|
||||
That long, ./configure option --enable-track-src-odirect must not
|
||||
get into effect in libburn. NO -DLibburn_read_o_direcT either.
|
||||
|
||||
For extra safety, O_DIRECT has been banned in libburn/sg-linux.c too.
|
||||
|
||||
# def ine Libburn_has_open_trac_srC 1
|
||||
*/
|
||||
|
||||
#endif
|
||||
|
||||
#include "cdrfifo.h"
|
||||
@ -121,9 +107,6 @@ struct CdrfifO {
|
||||
/* index of currently active (i.e. reading) follow-up */
|
||||
int follow_up_fd_idx;
|
||||
|
||||
/* short read encountered, take subsequent errno 22 with O_DIRECT as EOF */
|
||||
int o_direct_was_short;
|
||||
|
||||
|
||||
/* (simultaneous) peer chaining */
|
||||
struct CdrfifO *next;
|
||||
@ -194,7 +177,6 @@ int Cdrfifo_new(struct CdrfifO **ff, int source_fd, int dest_fd,
|
||||
}
|
||||
o->follow_up_fd_counter= 0;
|
||||
o->follow_up_fd_idx= -1;
|
||||
o->o_direct_was_short= 0;
|
||||
o->next= o->prev= NULL;
|
||||
o->chain_idx= 0;
|
||||
|
||||
@ -714,17 +696,8 @@ after_write:;
|
||||
else if(can_read < Cdrfifo_o_direct_chunK)
|
||||
can_read= -1;
|
||||
ret= 0;
|
||||
if(can_read>0) {
|
||||
if(can_read>0)
|
||||
ret= read(o->source_fd,o->buffer+o->write_idx,can_read);
|
||||
if(ret > 0) {
|
||||
if(ret < can_read) {
|
||||
/* Probably EOF. Prepare for errno = 22 in the next read. */
|
||||
o->o_direct_was_short= 1;
|
||||
} else {
|
||||
o->o_direct_was_short= 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(can_read < 0) {
|
||||
/* waiting for a full Cdrfifo_o_direct_chunK to fit */
|
||||
if(can_write <= 0 && o->dest_fd >= 0) {
|
||||
@ -758,8 +731,6 @@ after_write:;
|
||||
#endif /* ! Libburn_has_open_trac_srC */
|
||||
|
||||
if(ret==-1) {
|
||||
if(o->o_direct_was_short && errno == 22)
|
||||
goto have_eof;
|
||||
|
||||
/* >>> handle input error */;
|
||||
fprintf(stderr,"\ncdrfifo %d: on read: errno=%d , \"%s\"\n",
|
||||
@ -768,7 +739,6 @@ after_write:;
|
||||
|
||||
o->source_fd= -1;
|
||||
} else if(ret==0) { /* eof */
|
||||
have_eof:;
|
||||
/* activate eventual follow-up source fd */
|
||||
if(Cdrfifo_debuG || (flag&1))
|
||||
fprintf(stderr,"\ncdrfifo %d: on read(%d,buffer,%d): eof\n",
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
.\" First parameter, NAME, should be all caps
|
||||
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
||||
.\" other parameters are allowed: see man(7), man(1)
|
||||
.TH CDRSKIN 1 "Version 1.5.7, Jun 07, 2023"
|
||||
.TH CDRSKIN 1 "Version 1.4.7, Sep 12, 2017"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
@ -573,14 +573,9 @@ Eject the disc after work is done.
|
||||
.TP
|
||||
.BI \-force
|
||||
Assume that the user knows better in situations when cdrskin or libburn are
|
||||
refusing because of concerns about drive or media state.
|
||||
.br
|
||||
.B Caution:
|
||||
Use option -force only when in urgent need.
|
||||
.br
|
||||
This option enables the attempt to blank
|
||||
insecure about drive or media state. This includes the attempt to blank
|
||||
media which are classified as unknown or unsuitable, and the attempt to use
|
||||
write modes of which libburn believes they are not supported by the drive.
|
||||
write modes which libburn believes they are not supported by the drive.
|
||||
.br
|
||||
Another application is to enforce blanking or re-formatting of media
|
||||
which appear to be in the desired blank or format state already.
|
||||
@ -589,22 +584,10 @@ This option enables a burn run with option -dummy even if libburn believes
|
||||
that drive and media will not simulate the write mode but will write for real.
|
||||
.br
|
||||
It enables a burn run where cdrskin expects to exceed the available media
|
||||
capacity. This is known as "overburn" and might succeed on CD media with
|
||||
write type SAO.
|
||||
.B Too much overburning
|
||||
might be
|
||||
.B harmful to the medium
|
||||
and might
|
||||
.B make the drive unusable
|
||||
(hopefully only until it gets powered off and on). The man page of cdrecord
|
||||
mentions 88 seconds = 6600 blocks as halfways safe amount over the official
|
||||
medium capacity. The assessment of track sizes by libburn will be wrong if
|
||||
the written size reaches or exceeds 90 minutes = 405000 sectors. The overall
|
||||
medium size assessment by the Linux kernel is supposed to yield roughly the
|
||||
written size, but you should test this yourself with every overburnt medium.
|
||||
capacity.
|
||||
.br
|
||||
First consider to use a medium with more capacity rather than trying to
|
||||
overburn a CD.
|
||||
.B Caution:
|
||||
Use this only when in urgent need.
|
||||
.TP
|
||||
.BI \-format
|
||||
Same as blank=format_overwrite_full -force but restricted to DVD+RW.
|
||||
@ -1104,11 +1087,11 @@ This directory has to already exist, but none of the track files may exist.
|
||||
This option will rather fail than overwrite an existing file.
|
||||
.br
|
||||
By default all tracks of the CD are extracted to files with names
|
||||
NN.wav, where NN is the track number from 01 to at most 99.
|
||||
trackNN.wav, where NN is the track number from 01 to at most 99.
|
||||
.TP
|
||||
.BI extract_basename= name
|
||||
Set a filename prefix which shall be used by extract_audio_to= instead of the
|
||||
empty default name prefix.
|
||||
Set a filename which shall be used by extract_audio_to= instead of the default
|
||||
name "track".
|
||||
.TP
|
||||
.BI --extract_dap
|
||||
Enable Digital Audio Play flaw obscuring mechanisms
|
||||
@ -1468,7 +1451,7 @@ full.
|
||||
.br
|
||||
If a write attempt is delayed, the program will wait for a number of
|
||||
microseconds which is given by parameter "min_usec" before inquiring the buffer
|
||||
again. If more retries occur, this waiting time between inquiries increases
|
||||
again. iIf more retries occur, this waiting time between inquiries increases
|
||||
up to the value of parameter "max_usec".
|
||||
.br
|
||||
If the delay lasts longer than the number of seconds given by parameter
|
||||
@ -1598,46 +1581,6 @@ Try to ignore any signals rather than to abort the program. This is not a
|
||||
very good idea. You might end up waiting a very long time for cdrskin
|
||||
to finish.
|
||||
.TP
|
||||
.BI \--list_features
|
||||
List the SCSI/MMC features which were obtained from the drive when it was
|
||||
last acquired or re-assessed. Although this is better readable than the
|
||||
raw reply to SCSI command GET CONFIGURATION, the MMC specification text
|
||||
is still needed for interpreting it.
|
||||
.br
|
||||
The list consists of line groups of the form
|
||||
.br
|
||||
Code +/- : Name : Version,P/N
|
||||
.br
|
||||
Raw feature data bytes as hex numbers
|
||||
.br
|
||||
Parsed info as Name=Value pairs
|
||||
.br
|
||||
The headline is the only one which has no blank at its start.
|
||||
Code is given as 16 bit hex number.
|
||||
.br
|
||||
"+" marks a currently offered feature. "-" marks those which may be offered
|
||||
under different circumstances.
|
||||
.br
|
||||
Name is the feature name as listed in MMC specs.
|
||||
.br
|
||||
"P" marks persistent features. "N" marks non-persistent features.
|
||||
.br
|
||||
The Raw data can occupy more than one line. No "=" occurs in such lines.
|
||||
If no raw data are present, one line with some blanks is listed instead.
|
||||
.br
|
||||
The Parsed info shows some extracted field values with names which resemble
|
||||
the names used in the MMC description of the particular feature. Parsed info
|
||||
lines contain at least one Name=Value pair. More than one line is possible.
|
||||
If no parsed info is produced, one line with some blanks is listed instead.
|
||||
.br
|
||||
Example:
|
||||
.br
|
||||
0107 - : Real Time Streaming : 4,N
|
||||
.br
|
||||
1f 00 00 00
|
||||
.br
|
||||
RBCB=1 , SCS=1 , MP2A=1 , WSPD=1 , SW=1
|
||||
.TP
|
||||
.BI \--no_abort_handler
|
||||
On signals exit even if the drive is in busy state. This is not a very good
|
||||
idea. You might end up with a stuck drive that refuses to hand out the media.
|
||||
@ -1657,27 +1600,16 @@ addresses which are not listed with cdrskin --devices but nevertheless point
|
||||
to a usable drive. (Like /dev/sg0 using the same SCSI address as /dev/sr0.)
|
||||
.TP
|
||||
.BI \--obs_pad
|
||||
Pad the data of the last write operation of a DVD-R[W] DAO session, or BD-R
|
||||
session, or stdio: pseudo-drive session up to the full size of an output chunk.
|
||||
Pad the data of last write operation of a DVD-R[W] DAO session or
|
||||
stdio: pseudo-drive up to the full size of an output chunk.
|
||||
This padding has to be applied automatically to the other DVD and BD media
|
||||
types, where it causes e.g. ISO images to have trailing unclaimed blocks.
|
||||
Whether it is applied automatically to BD-R depends on option
|
||||
--bdr_obs_exempt.
|
||||
.br
|
||||
Use this option if there is the suspicion that DVD-R[W] DAO or BD-R sessions
|
||||
abort with your kernel and/or DVD drive, if their size is not a multiple of
|
||||
16 blocks.
|
||||
Use this option if there is the suspicion that DAO sessions abort with
|
||||
your kernel and/or DVD drive, if their size is not a multiple of 16 blocks.
|
||||
.br
|
||||
This option may also get enabled at compile time of libburn.
|
||||
.TP
|
||||
.BI \--bdr_obs_exempt
|
||||
Exempt BD-R media from automatic unconditional transaction end padding,
|
||||
provided that this padding is not requested by --obs_pad and that
|
||||
no stream_recording is requested.
|
||||
.br
|
||||
This is a new feature introduced with version 1.5.6. It might become default
|
||||
in later versions.
|
||||
.TP
|
||||
.BI \--old_pseudo_scsi_adr
|
||||
Linux specific:
|
||||
Use and report literal Bus,Target,Lun addresses rather than real SCSI and
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
/*
|
||||
cdrskin.c , Copyright 2006-2023 Thomas Schmitt <scdbackup@gmx.net>
|
||||
cdrskin.c , Copyright 2006-2017 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
A cdrecord compatible command line interface for libburn.
|
||||
@ -87,7 +87,7 @@ or
|
||||
|
||||
/** The official program version */
|
||||
#ifndef Cdrskin_prog_versioN
|
||||
#define Cdrskin_prog_versioN "1.5.7"
|
||||
#define Cdrskin_prog_versioN "1.4.8"
|
||||
#endif
|
||||
|
||||
/** The official libburn interface revision to use.
|
||||
@ -97,10 +97,10 @@ or
|
||||
#define Cdrskin_libburn_majoR 1
|
||||
#endif
|
||||
#ifndef Cdrskin_libburn_minoR
|
||||
#define Cdrskin_libburn_minoR 5
|
||||
#define Cdrskin_libburn_minoR 4
|
||||
#endif
|
||||
#ifndef Cdrskin_libburn_micrO
|
||||
#define Cdrskin_libburn_micrO 6
|
||||
#define Cdrskin_libburn_micrO 8
|
||||
#endif
|
||||
|
||||
|
||||
@ -120,34 +120,34 @@ or
|
||||
#undef Cdrskin_libburn_versioN
|
||||
#endif
|
||||
|
||||
#ifdef Cdrskin_libburn_1_5_6
|
||||
#define Cdrskin_libburn_versioN "1.5.6"
|
||||
#ifdef Cdrskin_libburn_1_4_8
|
||||
#define Cdrskin_libburn_versioN "1.4.8"
|
||||
#endif
|
||||
|
||||
#ifdef Cdrskin_libburn_1_5_7
|
||||
#define Cdrskin_libburn_versioN "1.5.7"
|
||||
#ifdef Cdrskin_libburn_1_4_9
|
||||
#define Cdrskin_libburn_versioN "1.4.9"
|
||||
#endif
|
||||
|
||||
#ifndef Cdrskin_libburn_versioN
|
||||
#define Cdrskin_libburn_1_5_6
|
||||
#define Cdrskin_libburn_versioN "1.5.6"
|
||||
#define Cdrskin_libburn_1_4_8
|
||||
#define Cdrskin_libburn_versioN "1.4.8"
|
||||
#endif
|
||||
|
||||
#ifdef Cdrskin_libburn_1_5_6
|
||||
#ifdef Cdrskin_libburn_1_4_8
|
||||
#undef Cdrskin_libburn_majoR
|
||||
#undef Cdrskin_libburn_minoR
|
||||
#undef Cdrskin_libburn_micrO
|
||||
#define Cdrskin_libburn_majoR 1
|
||||
#define Cdrskin_libburn_minoR 5
|
||||
#define Cdrskin_libburn_micrO 6
|
||||
#define Cdrskin_libburn_minoR 4
|
||||
#define Cdrskin_libburn_micrO 8
|
||||
#endif
|
||||
#ifdef Cdrskin_libburn_1_5_7
|
||||
#ifdef Cdrskin_libburn_1_4_9
|
||||
#undef Cdrskin_libburn_majoR
|
||||
#undef Cdrskin_libburn_minoR
|
||||
#undef Cdrskin_libburn_micrO
|
||||
#define Cdrskin_libburn_majoR 1
|
||||
#define Cdrskin_libburn_minoR 5
|
||||
#define Cdrskin_libburn_micrO 7
|
||||
#define Cdrskin_libburn_minoR 4
|
||||
#define Cdrskin_libburn_micrO 9
|
||||
#endif
|
||||
|
||||
|
||||
@ -1318,7 +1318,6 @@ int Cdrtrack_seek_isosize(struct CdrtracK *track, int fd, int flag)
|
||||
bit1=open as source for direct write:
|
||||
no audio extract, no minimum track size
|
||||
bit2=permission to use burn_os_open_track_src() (evtl O_DIRECT)
|
||||
bit3=This is a CD. Enforce minimum track size if not bit1.
|
||||
@return <=0 error, 1 success
|
||||
*/
|
||||
int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
|
||||
@ -1431,7 +1430,7 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
|
||||
|
||||
track->source_fd= *fd;
|
||||
if(track->fixed_size < Cdrtrack_minimum_sizE * track->sector_size
|
||||
&& (track->fixed_size>0 || size_from_file) && (flag & 8) && !(flag&2)) {
|
||||
&& (track->fixed_size>0 || size_from_file) && !(flag&2)) {
|
||||
if(track->track_type == BURN_AUDIO) {
|
||||
/* >>> cdrecord: We differ in automatic padding with audio:
|
||||
Audio tracks must be at least 705600 bytes and a multiple of 2352.
|
||||
@ -1462,8 +1461,6 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
|
||||
bit1= Do not create and attach a new fifo
|
||||
but attach new follow-up fd pair to previous_fifo
|
||||
bit2= Do not enforce fixed_size if not container extraction
|
||||
bit3= This is a CD. Enforce minimum track size.
|
||||
(Forward to Cdrtrack_open_source_path)
|
||||
@return <=0 error, 1 success
|
||||
*/
|
||||
int Cdrtrack_attach_fifo(struct CdrtracK *track, int *outlet_fd,
|
||||
@ -1476,7 +1473,7 @@ int Cdrtrack_attach_fifo(struct CdrtracK *track, int *outlet_fd,
|
||||
if(track->fifo_size<=0)
|
||||
return(2);
|
||||
ret= Cdrtrack_open_source_path(track,&source_fd,
|
||||
(flag & (1 | 8)) | (4 * (track->fifo_size >= 256 * 1024)));
|
||||
(flag&1) | (4 * (track->fifo_size >= 256 * 1024)));
|
||||
if(ret<=0)
|
||||
return(ret);
|
||||
if(pipe(pipe_fds)==-1)
|
||||
@ -1704,7 +1701,6 @@ int Cdrtrack_add_to_session(struct CdrtracK *track, int trackno,
|
||||
bit0= debugging verbosity
|
||||
bit1= apply padding hack (<<< should be unused for now)
|
||||
bit2= permission to use O_DIRECT (if enabled at compile time)
|
||||
bit3= This is a CD. (Forward to Cdrtrack_open_source_path)
|
||||
*/
|
||||
{
|
||||
struct burn_track *tr;
|
||||
@ -1727,7 +1723,7 @@ int Cdrtrack_add_to_session(struct CdrtracK *track, int trackno,
|
||||
|
||||
/* Note: track->track_type may get set in here */
|
||||
if(track->source_fd==-1) {
|
||||
ret= Cdrtrack_open_source_path(track, &source_fd, flag & (8 | 4 | 1));
|
||||
ret= Cdrtrack_open_source_path(track, &source_fd, flag & (4 | 1));
|
||||
if(ret<=0)
|
||||
goto ex;
|
||||
}
|
||||
@ -2904,7 +2900,6 @@ set_dev:;
|
||||
printf(" --list_formats list format descriptors for loaded media.\n");
|
||||
printf(" --list_ignored_options list all ignored cdrecord options.\n");
|
||||
printf(" --list_speeds list speed descriptors for loaded media.\n");
|
||||
printf(" --list_features list SCSI features reported by the drive\n");
|
||||
printf(" --long_toc print overview of media content\n");
|
||||
printf(" modesty_on_drive=<options> no writing into full drive buffer\n");
|
||||
printf(" --no_abort_handler exit even if the drive is in busy state\n");
|
||||
@ -2914,8 +2909,6 @@ set_dev:;
|
||||
printf(
|
||||
" --no_rc as first argument: do not read startup files\n");
|
||||
printf(" --obs_pad pad DVD DAO to full 16 or 32 blocks\n");
|
||||
printf(
|
||||
" --bdr_obs_exempt possibly exempt BD-R from padding to full 64k\n");
|
||||
printf(" --old_pseudo_scsi_adr use and report literal Bus,Target,Lun\n");
|
||||
printf(" rather than real SCSI and pseudo ATA.\n");
|
||||
printf(
|
||||
@ -3154,8 +3147,7 @@ see_cdrskin_eng_html:;
|
||||
} else if(strncmp(argpt ,"textfile_to_v07t=", 17) == 0) {
|
||||
o->do_not_scan= 1;
|
||||
|
||||
} else if(strcmp(argv[i],"-V")==0 || strcmp(argpt, "-Verbose") == 0 ||
|
||||
strcmp(argv[i],"-VV")==0 || strcmp(argpt, "-VVV") == 0) {
|
||||
} else if(strcmp(argv[i],"-V")==0 || strcmp(argpt, "-Verbose") == 0) {
|
||||
burn_set_scsi_logging(2 | 4); /* log SCSI to stderr */
|
||||
|
||||
} else if(strcmp(argv[i],"-v")==0 || strcmp(argpt, "-verbose") == 0) {
|
||||
@ -3176,7 +3168,7 @@ set_severities:;
|
||||
int major, minor, micro;
|
||||
|
||||
printf(
|
||||
"Cdrecord 2.01a27 Emulation. Copyright (C) 2006-2023, see libburnia-project.org\n");
|
||||
"Cdrecord 2.01a27 Emulation. Copyright (C) 2006-2016, see libburnia-project.org\n");
|
||||
if(o->fallback_program[0]) {
|
||||
char *hargv[2];
|
||||
|
||||
@ -3343,8 +3335,7 @@ ex:;
|
||||
*/
|
||||
|
||||
|
||||
/* 4 TiB - 32 KiB : The libburn API works with int rather than uint32_t */
|
||||
#define Cdrskin_tracksize_maX 4398046478336.0
|
||||
#define Cdrskin_tracksize_maX 1024.0*1024.0*1024.0*1024.0
|
||||
|
||||
|
||||
/* Some constants obtained by hearsay and experiments */
|
||||
@ -3395,9 +3386,6 @@ struct CdrskiN {
|
||||
int stream_recording_is_set; /* see burn_write_opts_set_stream_recording() */
|
||||
int dvd_obs; /* DVD write chunk size: 0, 32k or 64k */
|
||||
int obs_pad; /* Whether to force obs end padding */
|
||||
int bdr_obs_exempt; /* Whether to possibly exempt BD-R from automatic
|
||||
obs_pad
|
||||
*/
|
||||
int stdio_sync; /* stdio fsync interval: -1, 0, >=32 */
|
||||
int single_track;
|
||||
int prodvd_cli_compatible;
|
||||
@ -3417,7 +3405,6 @@ struct CdrskiN {
|
||||
int do_atip;
|
||||
int do_list_speeds;
|
||||
int do_list_formats;
|
||||
int do_list_features;
|
||||
int do_cdtext_to_textfile;
|
||||
char cdtext_to_textfile_path[Cdrskin_strleN];
|
||||
int do_cdtext_to_vt07;
|
||||
@ -3672,7 +3659,6 @@ int Cdrskin_new(struct CdrskiN **skin, struct CdrpreskiN *preskin, int flag)
|
||||
o->stream_recording_is_set= 0;
|
||||
o->dvd_obs= 0;
|
||||
o->obs_pad= 0;
|
||||
o->bdr_obs_exempt= 0;
|
||||
o->stdio_sync= 0;
|
||||
o->single_track= 0;
|
||||
o->prodvd_cli_compatible= 0;
|
||||
@ -3686,7 +3672,6 @@ int Cdrskin_new(struct CdrskiN **skin, struct CdrpreskiN *preskin, int flag)
|
||||
o->do_atip= 0;
|
||||
o->do_list_speeds= 0;
|
||||
o->do_list_formats= 0;
|
||||
o->do_list_features= 0;
|
||||
o->do_cdtext_to_textfile= 0;
|
||||
o->cdtext_to_textfile_path[0]= 0;
|
||||
o->do_cdtext_to_vt07= 0;
|
||||
@ -3921,6 +3906,9 @@ int Cdrskin_attach_fifo(struct CdrskiN *skin, int flag)
|
||||
{
|
||||
struct CdrfifO *ff= NULL;
|
||||
int ret,i,hflag;
|
||||
|
||||
#ifdef Cdrskin_use_libburn_fifO
|
||||
|
||||
int profile_number;
|
||||
char profile_name[80];
|
||||
|
||||
@ -3928,12 +3916,9 @@ int Cdrskin_attach_fifo(struct CdrskiN *skin, int flag)
|
||||
if(ret <= 0)
|
||||
return(ret);
|
||||
|
||||
/* Refuse here and thus use libburn fifo only with single track, non-CD */
|
||||
ret= burn_disc_get_profile(skin->drives[skin->driveno].drive,
|
||||
&profile_number, profile_name);
|
||||
|
||||
#ifdef Cdrskin_use_libburn_fifO
|
||||
|
||||
/* Refuse here and thus use libburn fifo only with single track, non-CD */
|
||||
if(profile_number != 0x09 && profile_number != 0x0a &&
|
||||
skin->track_counter == 1)
|
||||
return(1);
|
||||
@ -3942,8 +3927,7 @@ int Cdrskin_attach_fifo(struct CdrskiN *skin, int flag)
|
||||
|
||||
skin->fifo= NULL;
|
||||
for(i=0;i<skin->track_counter;i++) {
|
||||
hflag= (skin->verbosity>=Cdrskin_verbose_debuG) |
|
||||
((profile_number == 0x09 || profile_number == 0x0a) << 3);
|
||||
hflag= (skin->verbosity>=Cdrskin_verbose_debuG);
|
||||
if(i==skin->track_counter-1)
|
||||
hflag|= 4;
|
||||
if(skin->verbosity>=Cdrskin_verbose_cmD) {
|
||||
@ -4461,13 +4445,6 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
|
||||
loc= adr;
|
||||
ret= burn_drive_get_drive_role(skin->drives[driveno].drive);
|
||||
if(ret!=1) {
|
||||
if(strlen(adr) > Cdrskin_adrleN - 7) {
|
||||
fprintf(stderr,
|
||||
"cdrskin : FAILURE : File path too long for \"stdio:\" prefix: %s\n",
|
||||
adr);
|
||||
sprintf(btldev, "stdio:"); /* Address of the null drive */
|
||||
return(-1);
|
||||
}
|
||||
sprintf(btldev,"stdio:%s",adr);
|
||||
{ret= 2; goto adr_translation;}
|
||||
}
|
||||
@ -5974,128 +5951,6 @@ ex:;
|
||||
}
|
||||
|
||||
|
||||
/* @param flag: bit0= do not print prefix on first line
|
||||
bit1= plan for multiples of 4 hex words
|
||||
*/
|
||||
static int Feature_printf(char *prefix, char *text, int flag)
|
||||
{
|
||||
char *tpt, *npt;
|
||||
int lp, lp0, line_size;
|
||||
|
||||
lp0= !(flag & 1);
|
||||
tpt= text;
|
||||
lp= strlen(prefix);
|
||||
/* Plan 2 char shorter for possible comma inclusion */
|
||||
line_size= 77;
|
||||
if(flag & 2) {
|
||||
line_size= (80 - lp) / 3;
|
||||
line_size-= line_size % 4;
|
||||
line_size= line_size * 3 - 1 + lp;
|
||||
}
|
||||
|
||||
while(lp * lp0 + strlen(tpt) >= 80) {
|
||||
/* Line size for 20 */
|
||||
for(npt= tpt + line_size - lp * lp0; npt > tpt; npt--)
|
||||
if(*npt == ' ')
|
||||
break;
|
||||
if(npt <= tpt) {
|
||||
printf("%s%s\n", lp0 ? prefix : "", tpt);
|
||||
return(2);
|
||||
}
|
||||
/* Keep comma in printed line */
|
||||
if(*(npt + 1) == ',' && *(npt + 1) == ' ')
|
||||
npt+= 2;
|
||||
/* Print and advance */
|
||||
*npt= 0;
|
||||
printf("%s%s\n", lp0 ? prefix : "", tpt);
|
||||
tpt= npt + 1;
|
||||
lp0= 1;
|
||||
}
|
||||
printf("%s%s\n", lp0 ? prefix : "", tpt);
|
||||
return(1);
|
||||
}
|
||||
|
||||
|
||||
/** Perform --list_features
|
||||
@param flag Bitfield for control purposes:
|
||||
@return <=0 error, 1 success
|
||||
*/
|
||||
int Cdrskin_list_features(struct CdrskiN *skin, int flag)
|
||||
{
|
||||
struct burn_drive *d;
|
||||
int ret, count, i, j;
|
||||
unsigned int *feature_codes= NULL;
|
||||
unsigned char flags, additional_length, *feature_data = NULL;
|
||||
char *feature_text = NULL, *cpt, *dpt;
|
||||
|
||||
ret= Cdrskin_grab_drive(skin,0);
|
||||
if(ret <= 0)
|
||||
return(ret);
|
||||
d= skin->drives[skin->driveno].drive;
|
||||
|
||||
fprintf(stderr, "SCSI Features reported by the drive:\n");
|
||||
fprintf(stderr,
|
||||
" + = Current, - = Not Current, P = Persistent, N = Not Persistent\n");
|
||||
fprintf(stderr, "Code C : Name : Version,Persistent\n");
|
||||
fprintf(stderr, " Additional data if present (hex bytes)\n");
|
||||
fprintf(stderr, " Parsed info if available (fieldname=content)\n");
|
||||
fprintf(stderr, "\n");
|
||||
|
||||
burn_drive_get_feature_codes(d, &count, &feature_codes);
|
||||
if(count <= 0) {
|
||||
fprintf(stderr, "cdrskin: NOTE: The drive feature list is empty\n");
|
||||
ret= 1; goto ex;
|
||||
}
|
||||
for(i= 0; i < count; i++) {
|
||||
ret= burn_drive_get_feature(d, feature_codes[i], &flags, &additional_length,
|
||||
&feature_data, &feature_text);
|
||||
if(ret <= 0) {
|
||||
fprintf(stderr, "cdrskin: SORRY: Cannot obtain data of feature %4.4x\n",
|
||||
feature_codes[i]);
|
||||
continue;
|
||||
}
|
||||
cpt= feature_text;
|
||||
for(j= 0; j < 3 && cpt != NULL; j++)
|
||||
cpt= strchr(cpt + 1, ':');
|
||||
if(cpt != NULL) {
|
||||
*cpt= 0;
|
||||
cpt++;
|
||||
}
|
||||
Feature_printf(" ", feature_text, 1);
|
||||
if(cpt != NULL) {
|
||||
dpt= cpt;
|
||||
if(*dpt == ' ')
|
||||
dpt++;
|
||||
for(j= 0; j < 1 && cpt != NULL; j++)
|
||||
cpt= strchr(cpt + 1, ':');
|
||||
if(cpt != NULL) {
|
||||
*cpt= 0;
|
||||
cpt++;
|
||||
}
|
||||
Feature_printf(" ", dpt, 2);
|
||||
}
|
||||
if(cpt != NULL) {
|
||||
if(*cpt == ' ')
|
||||
cpt++;
|
||||
Feature_printf(" ", cpt, 0);
|
||||
} else {
|
||||
printf("\n");
|
||||
}
|
||||
if(feature_data != NULL)
|
||||
free(feature_data);
|
||||
feature_data= NULL;
|
||||
if(feature_text != NULL)
|
||||
free(feature_text);
|
||||
feature_text= NULL;
|
||||
}
|
||||
ret= 1;
|
||||
ex:;
|
||||
if(feature_codes != NULL)
|
||||
free(feature_codes);
|
||||
return(ret);
|
||||
}
|
||||
|
||||
|
||||
int Cdrskin_read_textfile(struct CdrskiN *skin, char *path, int flag)
|
||||
{
|
||||
int ret, num_packs = 0;
|
||||
@ -7469,14 +7324,14 @@ int Cdrskin_burn(struct CdrskiN *skin, int flag)
|
||||
int source_fd, is_from_stdin;
|
||||
int text_flag= 4; /* Check CRCs and silently repair CRCs if all are 0 */
|
||||
unsigned char *text_packs= NULL;
|
||||
int num_packs= 0, start_block, block_no, profile_number;
|
||||
int num_packs= 0, start_block, block_no;
|
||||
|
||||
#ifndef Cdrskin_no_cdrfifO
|
||||
double put_counter, get_counter, empty_counter, full_counter;
|
||||
int total_min_fill, fifo_percent;
|
||||
#endif
|
||||
off_t free_space;
|
||||
char msg[80], profile_name[80];
|
||||
char msg[80];
|
||||
|
||||
if(skin->tell_media_space)
|
||||
doing= "estimating";
|
||||
@ -7496,7 +7351,6 @@ int Cdrskin_burn(struct CdrskiN *skin, int flag)
|
||||
s= burn_disc_get_status(drive);
|
||||
if(skin->verbosity>=Cdrskin_verbose_progresS)
|
||||
Cdrskin_report_disc_status(skin,s,1);
|
||||
burn_disc_get_profile(drive, &profile_number, profile_name);
|
||||
|
||||
disc= burn_disc_create();
|
||||
session= burn_session_create();
|
||||
@ -7553,8 +7407,6 @@ burn_failed:;
|
||||
/* if(skin->fifo_size >= 256 * 1024) */
|
||||
|
||||
hflag|= 4;
|
||||
if(profile_number == 0x09 || profile_number == 0x0a)
|
||||
hflag|= 8;
|
||||
|
||||
ret= Cdrtrack_add_to_session(skin->tracklist[i],i,session,hflag);
|
||||
if(ret<=0) {
|
||||
@ -7712,7 +7564,6 @@ burn_failed:;
|
||||
#endif
|
||||
burn_write_opts_set_dvd_obs(o, skin->dvd_obs);
|
||||
burn_write_opts_set_obs_pad(o, skin->obs_pad);
|
||||
burn_write_opts_set_bdr_obs_exempt(o, skin->bdr_obs_exempt);
|
||||
burn_write_opts_set_stdio_fsync(o, skin->stdio_sync);
|
||||
|
||||
if(skin->dummy_mode) {
|
||||
@ -8984,10 +8835,6 @@ set_isrc:;
|
||||
skin->do_list_speeds= 1;
|
||||
skin->preskin->demands_cdrskin_caps= 1;
|
||||
|
||||
} else if(strcmp(argv[i],"--list_features")==0) {
|
||||
skin->do_list_features= 1;
|
||||
skin->preskin->demands_cdrskin_caps= 1;
|
||||
|
||||
} else if(strncmp(argv[i],"fallback_program=",17)==0) {
|
||||
/* is handled in Cdrpreskin_setup() */;
|
||||
|
||||
@ -9185,9 +9032,6 @@ msifile_equals:;
|
||||
} else if(strcmp(argv[i],"--obs_pad")==0) {
|
||||
skin->obs_pad= 1;
|
||||
|
||||
} else if(strcmp(argv[i],"--bdr_obs_exempt")==0) {
|
||||
skin->bdr_obs_exempt= 1;
|
||||
|
||||
} else if(strcmp(argv[i],"--old_pseudo_scsi_adr")==0) {
|
||||
/* is handled in Cdrpreskin_setup() */;
|
||||
|
||||
@ -9415,8 +9259,7 @@ track_too_large:;
|
||||
return(0);
|
||||
}
|
||||
|
||||
} else if(strcmp(argv[i],"-V") == 0 || strcmp(argpt, "-Verbose") == 0 ||
|
||||
strcmp(argv[i],"-VV") == 0 || strcmp(argpt, "-VVV") == 0) {
|
||||
} else if(strcmp(argv[i],"-V")==0 || strcmp(argpt, "-Verbose")==0) {
|
||||
/* is handled in Cdrpreskin_setup() */;
|
||||
} else if(strcmp(argv[i],"-v")==0 || strcmp(argpt,"-verbose")==0) {
|
||||
/* is handled in Cdrpreskin_setup() */;
|
||||
@ -9860,15 +9703,6 @@ int Cdrskin_run(struct CdrskiN *skin, int *exit_value, int flag)
|
||||
if(ret<=0)
|
||||
{*exit_value= 16; goto ex;}
|
||||
}
|
||||
if(skin->do_list_features) {
|
||||
if(skin->n_drives<=0)
|
||||
{*exit_value= 20; goto no_drive;}
|
||||
if(Cdrskin__is_aborting(0))
|
||||
goto ex;
|
||||
ret= Cdrskin_list_features(skin, 0);
|
||||
if(ret<=0)
|
||||
{*exit_value= 20; goto ex;}
|
||||
}
|
||||
if(skin->do_blank) {
|
||||
if(skin->n_drives<=0)
|
||||
{*exit_value= 8; goto no_drive;}
|
||||
|
||||
@ -67,7 +67,7 @@ with drives connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
|
||||
GPL software included:<BR>
|
||||
</H2>
|
||||
<DL>
|
||||
<DT>libburn-1.5.6</DT>
|
||||
<DT>libburn-1.4.8</DT>
|
||||
<DD>(founded by Derek Foreman and Ben Jansens,
|
||||
developed and maintained since August 2006 by
|
||||
Thomas Schmitt from team of libburnia-project.org)
|
||||
@ -202,15 +202,15 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
|
||||
<P>
|
||||
<DL>
|
||||
<DT>Download as source code (see README):</DT>
|
||||
<DD><A HREF="cdrskin-1.5.6.tar.gz">cdrskin-1.5.6.tar.gz</A>
|
||||
(1075 KB).
|
||||
<DD><A HREF="cdrskin-1.4.8.tar.gz">cdrskin-1.4.8.tar.gz</A>
|
||||
(1060 KB).
|
||||
</DD>
|
||||
<DD><A HREF="cdrskin-1.5.6.tar.gz.sig">cdrskin-1.5.6.tar.gz.sig</A></DD>
|
||||
<DD><A HREF="cdrskin-1.4.8.tar.gz.sig">cdrskin-1.4.8.tar.gz.sig</A></DD>
|
||||
<DD>
|
||||
(detached GPG signature for verification by
|
||||
<KBD>gpg --verify cdrskin-1.5.6.tar.gz.sig cdrskin-1.5.6.tar.gz</KBD>
|
||||
<KBD>gpg --verify cdrskin-1.4.8.tar.gz.sig cdrskin-1.4.8.tar.gz</KBD>
|
||||
<BR>
|
||||
after <KBD>gpg --keyserver keyserver.ubuntu.com --recv-keys ABC0A854</KBD>).
|
||||
after <KBD>gpg --keyserver keys.gnupg.net --recv-keys ABC0A854</KBD>).
|
||||
</DD>
|
||||
<DD>
|
||||
The cdrskin tarballs are source code identical with libburn releases
|
||||
@ -259,35 +259,40 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
|
||||
<HR>
|
||||
|
||||
<P>
|
||||
Enhancements towards previous stable version cdrskin-1.5.4:
|
||||
Enhancements towards previous stable version cdrskin-1.4.6:
|
||||
<UL>
|
||||
<LI>New cdrskin option --bdr_obs_exempt</LI>
|
||||
<LI>Officially enabled overburning on CD media</LI>
|
||||
<LI>Refusing to write to BD-R if formatted to Pseudo Overwrite</LI>
|
||||
<!--
|
||||
<LI>none</LI>
|
||||
-->
|
||||
</UL>
|
||||
|
||||
Bug fixes towards cdrskin-1.5.4:
|
||||
Bug fixes towards cdrskin-1.4.6:
|
||||
<UL>
|
||||
<LI>Overburning with cdrskin option -force ended by a libburn error</LI>
|
||||
</UL>
|
||||
<LI>Option -dummy did not affect writing by direct_write_amount=</LI>
|
||||
<!--
|
||||
<LI>none</LI>
|
||||
Bug fixes towards cdrskin-1.4.2 (without .pl01):
|
||||
<UL>
|
||||
</UL>
|
||||
-->
|
||||
</UL>
|
||||
|
||||
<HR>
|
||||
|
||||
<P>
|
||||
<DL>
|
||||
<DT><H3>Development snapshot, version 1.5.7 :</H3></DT>
|
||||
<DD>Enhancements towards current stable version 1.5.6:
|
||||
<DT><H3>Development snapshot, version 1.4.9 :</H3></DT>
|
||||
<DD>Enhancements towards current stable version 1.4.8:
|
||||
<UL>
|
||||
<LI>none yet</LI>
|
||||
<!--
|
||||
<LI>none yet</LI>
|
||||
-->
|
||||
</UL>
|
||||
Bug fixes towards cdrskin-1.5.6:
|
||||
</DD>
|
||||
|
||||
<DD>Bug fixes towards cdrskin-1.4.8:
|
||||
<UL>
|
||||
<LI>none yet</LI>
|
||||
<!--
|
||||
@ -297,15 +302,14 @@ Bug fixes towards cdrskin-1.5.6:
|
||||
</DD>
|
||||
|
||||
<DD> </DD>
|
||||
<DD><A HREF="README_cdrskin_devel">README 1.5.7</A>
|
||||
<DD><A HREF="cdrskin__help_devel">cdrskin-1.5.7 --help</A></DD>
|
||||
<DD><A HREF="cdrskin_help_devel">cdrskin-1.5.7 -help</A></DD>
|
||||
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.5.7)</A></DD>
|
||||
<DD><A HREF="README_cdrskin_devel">README 1.4.9</A>
|
||||
<DD><A HREF="cdrskin__help_devel">cdrskin-1.4.9 --help</A></DD>
|
||||
<DD><A HREF="cdrskin_help_devel">cdrskin-1.4.9 -help</A></DD>
|
||||
<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.4.9)</A></DD>
|
||||
<DD> </DD>
|
||||
<DT>Maintainers of cdrskin unstable packages please use git of
|
||||
<DT>Maintainers of cdrskin unstable packages please use SVN of
|
||||
<A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
|
||||
<DD>Download: <KBD>
|
||||
<B>git clone https://dev.lovelyhq.com/libburnia/libburn.git</B>
|
||||
<DD>Download: <KBD><B>svn co http://svn.libburnia-project.org/libburn/trunk libburn</B>
|
||||
</KBD></DD>
|
||||
<DD>Build: <KBD><B>cd libburn ; ./bootstrap ; ./configure --prefix /usr ; make ; cdrskin/compile_cdrskin.sh</B>
|
||||
</KBD></DD>
|
||||
@ -321,8 +325,8 @@ admins with full system sovereignty.</DT>
|
||||
<A HREF="README_cdrskin_devel">upcoming README</A> ):
|
||||
</DD>
|
||||
<DD>
|
||||
<A HREF="cdrskin-1.5.7.tar.gz">cdrskin-1.5.7.tar.gz</A>
|
||||
(1075 KB).
|
||||
<A HREF="cdrskin-1.4.9.tar.gz">cdrskin-1.4.9.tar.gz</A>
|
||||
(1060 KB).
|
||||
</DD>
|
||||
|
||||
<!-- This is not offered any more since spring 2008
|
||||
@ -497,7 +501,7 @@ opportunity is the goal of a cdrecord compatibility wrapper.
|
||||
<BR>
|
||||
<BR>
|
||||
It is very important to me that this project is not perceived as hostile
|
||||
towards Joerg Schilling and his work.
|
||||
towards Joerg Schilling and his ongoing work.
|
||||
I owe him much. For cdrecord, for mkisofs, for star. Chapeau.
|
||||
<BR>
|
||||
</P>
|
||||
|
||||
@ -1 +1 @@
|
||||
#define Cdrskin_timestamP "2024.09.20.162105"
|
||||
#define Cdrskin_timestamP "2017.09.12.110001"
|
||||
|
||||
@ -13683,7 +13683,7 @@ Made number transition to 1.4.8
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_4_9
|
||||
Updated cdrskin tarball generator
|
||||
|
||||
12 Sep 2017 [260fc29]
|
||||
12 Sep 2017 []
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
@ -13693,316 +13693,6 @@ Updated change log
|
||||
* New API call burn_drive_get_bd_r_pow()
|
||||
* Refusing to write to BD-R if formatted to Pseudo Overwrite
|
||||
|
||||
13 Sep 2017
|
||||
git tag "release-1.4.8"
|
||||
|
||||
2017.09.13.075728 [f1fc16b]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
Made number transition to 1.4.9
|
||||
|
||||
13 Sep 2017 [ef0d713]
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.4.9 - 2017.09.13.075728
|
||||
|
||||
2017.09.16.095011 [2886b82]
|
||||
libburn/mmc.c
|
||||
Reacted on compiler warning about theoretical overflow of an sprintf
|
||||
|
||||
2017.09.16.105142 [99e828c]
|
||||
libburn/write.c
|
||||
Reacted on compiler warning about theoretical overflow of an sprintf
|
||||
|
||||
2017.09.16.105713 [b5b5cc1]
|
||||
libburn/write.c
|
||||
Reacted on compiler warning about theoretical overflow of an sprintf
|
||||
|
||||
2017.12.31.111507 [ef2fa1d]
|
||||
libburn/libdax_audioxtr.c
|
||||
+ doc/waveformat.txt
|
||||
Adapting to surplus chunks and subchunks in .wav files
|
||||
|
||||
2017.12.31.114757 [95f5b1c]
|
||||
libburn/libdax_audioxtr.h
|
||||
Added missing header file for previous commit
|
||||
|
||||
2018.02.05.103304 [84fad99]
|
||||
cdrskin/cdrfifo.c
|
||||
Bug fix: cdrskin threw errno 22 on data file input if libburn is configured --enable-track-src-odirect
|
||||
|
||||
2018.02.05.103650 [c84889b]
|
||||
libburn/sg-linux.c
|
||||
Reporting in SCSI log when commands get repeated
|
||||
|
||||
05 Feb 2018 [e35995b]
|
||||
ChangeLog
|
||||
cdrskin/cdrskin_eng.html
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.4.9 - 2018.02.05.124100
|
||||
* Bug fix: cdrskin threw errno 22 on data file input if libburn is
|
||||
configured with --enable-track-src-odirect
|
||||
|
||||
|
||||
2018.08.08.152622 [ff039e8]
|
||||
libburn/libdax_msgs.h
|
||||
libburn/file.c
|
||||
Bug fix: SIGSEGV could happen if a track ended by reaching its fixed size
|
||||
while the track source still was willing to deliver bytes
|
||||
|
||||
2018.08.26.141619 [2fe4b3c]
|
||||
cdrskin/cdrskin.c
|
||||
Restricted enforcement of minimum track size to CD media profiles
|
||||
|
||||
2018.09.02.200129 [3fdf118]
|
||||
libburn/sg-linux.c
|
||||
Bug fix: Device file comparison parameters were recorded wrong with Linux sg
|
||||
|
||||
2018.09.06.100353 [d32bb30]
|
||||
cdrskin/cdrfifo.c
|
||||
With --enable-track-src-odirect, do not report error 22 due to unaligned EOF
|
||||
|
||||
2018.09.15.083001 [c75ad31]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
README
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/compile_cdrskin.sh
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
cdrskin/cdrskin_eng.html
|
||||
Made number transition to 1.5.0
|
||||
|
||||
15 Sep 2018 [255afdd]
|
||||
- cdrskin/add_ts_changes_to_libburn_1_4_8
|
||||
- cdrskin/add_ts_changes_to_libburn_1_4_9
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_0
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_1
|
||||
Updated cdrskin tarball generator
|
||||
|
||||
15 Sep 2018 [9ee80ee]
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
15 Sep 2018 [ef3609e]
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/changelog.txt
|
||||
Fixed a typo that was made during version leap
|
||||
|
||||
15 Sep 2018 [c2bcf78]
|
||||
cdrskin/add_ts_changes_to_libburn_1_5_0
|
||||
cdrskin/add_ts_changes_to_libburn_1_5_1
|
||||
cdrskin/changelog.txt
|
||||
Added to cdrskin standalone scripts a compile run for unite_html_b_line.c
|
||||
|
||||
----------------------------------- release - cdrskin-1.5.0 - 2018.09.15.083001
|
||||
* Bug fix: cdrskin threw errno 22 on data file input if libburn is
|
||||
configured with --enable-track-src-odirect
|
||||
* Bug fix: SIGSEGV could happen if a track ended by reaching its fixed size
|
||||
while the track source still was willing to deliver bytes.
|
||||
Thanks to user swordragon.
|
||||
* Bug fix: Device file comparison parameters were recorded wrong with Linux sg
|
||||
|
||||
|
||||
2018.09.16.134959 [04f9a30]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
Made number transition to 1.5.1
|
||||
|
||||
16 Sep 2018 [f525071]
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.5.1 - 2018.09.16.134959
|
||||
|
||||
2018.10.10.160024 [af65852]
|
||||
libburn/mmc.c
|
||||
Silenced gcc warnings about switch-cases and printf target buffers
|
||||
|
||||
2018.10.10.160301 [042fe17]
|
||||
libburn/async.c
|
||||
Bug fix: No lock was obtained for setting up a fifo object
|
||||
|
||||
2018.10.11.074048 [7282eaa]
|
||||
libburn/write.c
|
||||
Silenced gcc warnings about printf target buffer
|
||||
|
||||
2018.12.12.125445 [d72fb13]
|
||||
libburn/spc.c
|
||||
Emitting cleartext for errors with ASC 6F (CSS problems)
|
||||
|
||||
05 Apr 2019 [1c06669]
|
||||
acinclude.m4
|
||||
Made libburn ready for building out-of-source. Thanks Ross Burton.
|
||||
|
||||
07 Apr 2019 [9ac8efa]
|
||||
configure.ac
|
||||
Disabled autotools macro AM_MAINTAINER_MODE on advise of Ross Burton.
|
||||
|
||||
2019.04.13.173355 [39f2712]
|
||||
libburn/libdax_msgs.h
|
||||
libburn/drive.c
|
||||
libburn/write.c
|
||||
libburn/mmc.c
|
||||
Bug fix: Stream recording was applied regardless whether the drive offers it
|
||||
|
||||
2019.04.13.173610 [4d5486a]
|
||||
libburn/drive.c
|
||||
Applying stream recording only to DVD-RAM, BD-R, BD-RE media
|
||||
|
||||
2019.04.17.085941 [610e213]
|
||||
libburn/spc.h
|
||||
libburn/spc.c
|
||||
libburn/sg-linux.c
|
||||
Putting out more info in case of failed Linux SG_IO ioctl
|
||||
|
||||
2019.04.17.092323 [c5bc9f6]
|
||||
libburn/libburn.h
|
||||
libburn/libburn.ver
|
||||
libburn/mmc.c
|
||||
libburn/drive.c
|
||||
New API calls burn_drive_get_feature_codes(), burn_drive_get_feature()
|
||||
|
||||
2019.04.17.095742 [0e73afd]
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
New cdrskin option --list_features
|
||||
|
||||
2019.07.05.133618 [6905bb4]
|
||||
libburn/transport.h
|
||||
libburn/libdax_msgs.h
|
||||
libburn/spc.h
|
||||
libburn/spc.c
|
||||
libburn/mmc.c
|
||||
libburn/write.c
|
||||
libburn/sg-linux.c
|
||||
libburn/sg-freebsd.c
|
||||
libburn/sg-freebsd-port.c
|
||||
libburn/sg-netbsd.c
|
||||
libburn/sg-solaris.c
|
||||
libburn/sg-libcdio.c
|
||||
Showing more info in case of drive errors and transport problems
|
||||
|
||||
2019.09.20.103726 [354d45e]
|
||||
libburn/util.c
|
||||
Bug fix: TDK Corporation was not recognized as manufacturer of DVD-R "TTH02".
|
||||
Thanks Steve.
|
||||
|
||||
2019.10.26.143001 [2298dfd]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
README
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/compile_cdrskin.sh
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
cdrskin/cdrskin_eng.html
|
||||
Made number transition to 1.5.2
|
||||
|
||||
26 Oct 2019 [ce2ddab]
|
||||
- cdrskin/add_ts_changes_to_libburn_1_5_0
|
||||
- cdrskin/add_ts_changes_to_libburn_1_5_1
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_2
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_3
|
||||
Updated cdrskin tarball generator
|
||||
|
||||
26 Oct 2019 [a6fdbc7]
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
26 Oct 2019 [3a94030]
|
||||
libburn/mmc.h
|
||||
cdrskin/changelog.txt
|
||||
Committed forgotten header file
|
||||
|
||||
----------------------------------- release - cdrskin-1.5.2 - 2019.10.26.143001
|
||||
* Bug fix: No lock was obtained for setting up a fifo object
|
||||
* Bug fix: Stream recording was applied regardless whether the drive offers it
|
||||
* Bug fix: TDK Corporation was not recognized as manufacturer of DVD-R "TTH02"
|
||||
* Made libburn ready for building out-of-source. Thanks Ross Burton.
|
||||
* New API calls burn_drive_get_feature_codes(), burn_drive_get_feature()
|
||||
* New cdrskin option --list_features
|
||||
|
||||
|
||||
2019.10.27.142135 [0a37e8c]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
Made number transition to 1.5.3
|
||||
|
||||
27 Oct 2019 [95ad059]
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.5.3 - 2019.10.27.142135
|
||||
|
||||
|
||||
27 Oct 2019 [1c235e8]
|
||||
cdrskin/cdrskin.1
|
||||
Corrected alphabetical sort rank of --list_features in man cdrskin
|
||||
|
||||
2019.10.28.155736 [ba9b69b]
|
||||
libburn/libdax_audioxtr.c
|
||||
libburn/async.c
|
||||
libburn/libdax_msgs.h
|
||||
libburn/file.c
|
||||
libburn/options.c
|
||||
libburn/spc.c
|
||||
libburn/structure.h
|
||||
libburn/sector.c
|
||||
libburn/libdax_audioxtr.h
|
||||
libburn/transport.h
|
||||
libburn/sg-dummy.c
|
||||
libburn/sg-linux.c
|
||||
libburn/sg-netbsd.c
|
||||
libburn/cdtext.c
|
||||
libburn/drive.c
|
||||
libburn/init.c
|
||||
libburn/write.c
|
||||
libburn/read.c
|
||||
libburn/libburn.h
|
||||
libburn/options.h
|
||||
libburn/mmc.c
|
||||
libburn/ddlpa.c
|
||||
libburn/sg-solaris.c
|
||||
libburn/ecma130ab.c
|
||||
libburn/sg-libcdio.c
|
||||
libburn/sg-freebsd-port.c
|
||||
libburn/init.h
|
||||
Fixed spelling errors found by fossies.org with codespell
|
||||
|
||||
2019.11.25.091234 [91f7d4d] [release-1.5.2.pl01 30c9f6d]
|
||||
configure.ac
|
||||
libburn/sg-linux.c
|
||||
cdrskin/cdrfifo.c
|
||||
Bug fix: cdrskin multi-track burning was slow and stalled after track 1.
|
||||
Regression introduced in version 1.5.0 by commit 84fad99, 2018.02.05
|
||||
|
||||
[]
|
||||
ChangeLog
|
||||
@ -14010,273 +13700,23 @@ cdrskin/cdrskin_eng.html
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
25 Nov 2019 [branch-1.5.2.pl01 4c0ebf1]
|
||||
README
|
||||
cdrskin/README
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
cdrskin/cdrskin_eng.html
|
||||
Mentioned bug fix and pl01
|
||||
------------------------------------ cycle - cdrskin-1.5.0 -
|
||||
|
||||
25 Nov 2019 [d4593f4]
|
||||
README
|
||||
Updated README about 1.5.2.pl01
|
||||
|
||||
---------------------- bug fix release - cdrskin-1.5.2.pl01 - 2019.11.25.094931
|
||||
------------------------------------ cycle - cdrskin-1.5.3 - 2019.11.25.194241
|
||||
* Bug fix: cdrskin multi-track burning was slow and stalled after track 1.
|
||||
Regression introduced in version 1.5.0 by commit 84fad99, 2018.02.05
|
||||
O_DIRECT is now disabled for track sources.
|
||||
|
||||
|
||||
26 Nov 2019 [b57c05c]
|
||||
configure.ac
|
||||
Incremented .so numbering to libburn.so.4.106.0
|
||||
|
||||
2020.04.15.185125 [7991750]
|
||||
libburn/sg-linux.c
|
||||
Bug fix: Early SCSI commands from sg-linux.c were not logged
|
||||
|
||||
11 Jul 2020 [e09acf3]
|
||||
cdrskin/cdrskin.1
|
||||
Corrected a typo in man cdrskin found by lintian
|
||||
|
||||
2020.08.22.132046 [8d934ee]
|
||||
libburn/transport.h
|
||||
libburn/drive.c
|
||||
libburn/write.c
|
||||
libburn/sg-linux.c
|
||||
Testing use of experimental ioctl CDROM_REVALIDATE after media state changes
|
||||
|
||||
2020.08.22.132046 [8d934ee]
|
||||
libburn/transport.h
|
||||
libburn/drive.c
|
||||
libburn/write.c
|
||||
libburn/sg-linux.c
|
||||
Testing use of experimental ioctl CDROM_REVALIDATE after media state changes
|
||||
|
||||
2020.08.24.132739 [0e1f5dc]
|
||||
libburn/libburn.h
|
||||
libburn/libburn.ver
|
||||
libburn/transport.h
|
||||
libburn/drive.c
|
||||
libburn/mmc.c
|
||||
New API call burn_drive_set_speed_exact()
|
||||
|
||||
2020.08.26.140343 [8b9a8cf]
|
||||
libburn/libburn.h
|
||||
libburn/libburn.ver
|
||||
libburn/write.c
|
||||
New API call burn_nominal_slowdown()
|
||||
|
||||
2020.09.20.084444 [ab6b103]
|
||||
libburn/sg-linux.c
|
||||
Changed experimental ioctl from CDROM_REVALIDATE to CDROM_SIMUL_CHANGE
|
||||
|
||||
2020.09.20.204320 [9bc9900]
|
||||
libburn/sg-linux.c
|
||||
For now using CDROM_SIMUL_CHANGE only if -DLibburn_use_linux_ioctl_simul_changE
|
||||
|
||||
2020.09.30.185335 [3468a2a]
|
||||
libburn/spc.c
|
||||
Tolerating all sense replies of form 6,28,*
|
||||
|
||||
2021.01.30.103001 [2a58d5a]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
README
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/compile_cdrskin.sh
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
cdrskin/cdrskin_eng.html
|
||||
Made number transition to 1.5.4
|
||||
|
||||
30 Jan 2021 [d95d5a2]
|
||||
- cdrskin/add_ts_changes_to_libburn_1_5_2
|
||||
- cdrskin/add_ts_changes_to_libburn_1_5_3
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_4
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_5
|
||||
Updated cdrskin tarball generator
|
||||
|
||||
30 Jan 2021 [d146886]
|
||||
configure.ac
|
||||
Corrected SONAME parameters to produce libburn.so.4.107.0
|
||||
|
||||
30 Jan 2021 [d3bd97c]
|
||||
ChangeLog
|
||||
cdrskin/cdrskin_eng.html
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
----------------------------------- release - cdrskin-1.5.4 - 2021.01.30.103001
|
||||
* Bug fix: Early SCSI commands from sg-linux.c were not logged
|
||||
* New API call burn_drive_set_speed_exact()
|
||||
* New API call burn_nominal_slowdown()
|
||||
|
||||
2021.01.30.153517 [f1d5c67]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
Made number transition to 1.5.5
|
||||
|
||||
2021.02.28.121708 [2a977cf]
|
||||
libburn/libdax_msgs.h
|
||||
libburn/structure.c
|
||||
libburn/write.c
|
||||
libburn/sector.c
|
||||
Improved error message if a track is larger than 4 TiB - 32 KiB
|
||||
|
||||
2021.02.28.121943 [31e8f5c]
|
||||
libburn/transport.h
|
||||
libburn/drive.h
|
||||
libburn/drive.c
|
||||
Unified size of large or unlimited pseudo drives to 4 TiB - 32 KiB
|
||||
|
||||
2021.03.12.082731 [892df64]
|
||||
acinclude.m4
|
||||
Made optional the use of libcam and thus SCSI passthrough on GNU/FreeBSD systems
|
||||
|
||||
02 Sep 2021 [8d270b1]
|
||||
configure.ac
|
||||
Removed unneeded configure.ac macro AC_C_BIGENDIAN
|
||||
|
||||
02 Sep 2021 [c76145f]
|
||||
cdrskin/cdrskin.1
|
||||
Corrected man page about the default of extract_basename=
|
||||
|
||||
02 Sep 2021 [0a1bbb1]
|
||||
Makefile.am
|
||||
Added doc/waveformat.txt to libburn tarball
|
||||
|
||||
2021.09.02.181259 [27e1568]
|
||||
libburn/mmc.c
|
||||
Let mmc_read_cd() for CD-DA set command.dxfer_len
|
||||
|
||||
2021.09.12.084139 [31591b8]
|
||||
libburn/libburn.h
|
||||
libburn/options.h
|
||||
libburn/options.c
|
||||
libburn/write.c
|
||||
libburn/libburn.ver
|
||||
New API call burn_write_opts_set_bdr_obs_exempt()
|
||||
|
||||
2021.09.12.084556 [da44c70]
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
New cdrskin option --bdr_obs_exempt
|
||||
|
||||
2021.11.24.114417 [7765fbd]
|
||||
libburn/libburn.h
|
||||
libburn/mmc.c
|
||||
Enabled overburning with burn_write_opts_set_force(,1)
|
||||
|
||||
24 Nov 2021 [d4d6321]
|
||||
cdrskin/cdrskin.1
|
||||
Improved man page of cdrskin about -force after enabling overburning in libburn
|
||||
|
||||
25 Nov 2021 [879cb99]
|
||||
ChangeLog
|
||||
cdrskin/cdrskin_eng.html
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.5.5 - 2021.11.25.094022
|
||||
* New API call burn_write_opts_set_bdr_obs_exempt()
|
||||
* New cdrskin option --bdr_obs_exempt
|
||||
* Enabled overburning with burn_write_opts_set_force(,1)
|
||||
* Bug fix: Overburning with cdrskin option -force ended by a libburn error
|
||||
|
||||
|
||||
2022.04.05.135930 [629a4fa]
|
||||
cdrskin/cdrskin.c
|
||||
Let cdrskin take options -VV and -VVV as -V
|
||||
|
||||
2022.04.05.140409 [1954514]
|
||||
cdrskin/cdrskin.c
|
||||
Updated copyright dates of cdrskin
|
||||
|
||||
2022.12.10.093508 [a904ae9]
|
||||
cdrskin/cdrskin.c
|
||||
Enlarged maximum allowed tsize= value to 4 TiB - 2 KiB (just in case)
|
||||
|
||||
2023.06.07.143001 [1172ef7]
|
||||
Makefile.am
|
||||
configure.ac
|
||||
README
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/compile_cdrskin.sh
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
cdrskin/cdrskin_eng.html
|
||||
Made number transition to 1.5.6
|
||||
|
||||
07 Jun 2023 [9acb8ad]
|
||||
- cdrskin/add_ts_changes_to_libburn_1_5_4
|
||||
- cdrskin/add_ts_changes_to_libburn_1_5_5
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_6
|
||||
+ cdrskin/add_ts_changes_to_libburn_1_5_7
|
||||
Updated cdrskin tarball generator
|
||||
|
||||
07 Jun 2023 [f795db5]
|
||||
cdrskin/cdrskin_eng.html
|
||||
Last minute correction in cdrskin web page
|
||||
|
||||
07 Jun 2023 [4628231]
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
----------------------------------- release - cdrskin-1.5.6 - 2023.06.07.143001
|
||||
* New API call burn_write_opts_set_bdr_obs_exempt()
|
||||
* New cdrskin option --bdr_obs_exempt
|
||||
* Enabled overburning with burn_write_opts_set_force(,1)
|
||||
* Bug fix: Overburning with cdrskin option -force ended by a libburn error
|
||||
|
||||
|
||||
2023.06.07.183206 []
|
||||
Makefile.am
|
||||
configure.ac
|
||||
libburn/libburn.h
|
||||
cdrskin/cdrskin.c
|
||||
cdrskin/cdrskin.1
|
||||
cdrskin/README
|
||||
cdrskin/cdrskin_timestamp.h
|
||||
Made number transition to 1.5.7
|
||||
|
||||
07 Jun 2023 []
|
||||
ChangeLog
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
|
||||
[]
|
||||
libburn/cleanup.c
|
||||
>>> SIGCONT in non_signal_list : local but not in git
|
||||
|
||||
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.5.7 -
|
||||
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.5.7 -
|
||||
|
||||
(((
|
||||
[]
|
||||
[] []
|
||||
libburn/spc.h
|
||||
libburn/spc.c
|
||||
libburn/sg-linux.c
|
||||
Making commands retryable after particular Linux kernel transport errors
|
||||
(currently as libburn/*.[ch].after_1_4_8)
|
||||
)))
|
||||
|
||||
|
||||
[]
|
||||
ChangeLog
|
||||
cdrskin/cdrskin_eng.html
|
||||
cdrskin/changelog.txt
|
||||
Updated change log
|
||||
|
||||
------------------------------------ cycle - cdrskin-1.5.0 -
|
||||
|
||||
|
||||
**********************************************************************
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
#!/bin/sh
|
||||
|
||||
# compile_cdrskin.sh
|
||||
# Copyright 2005 - 2023 Thomas Schmitt, scdbackup@gmx.net, GPL v2 or later
|
||||
# Copyright 2005 - 2017 Thomas Schmitt, scdbackup@gmx.net, GPL v2 or later
|
||||
# to be executed within ./libburn-* or./cdrskin-*
|
||||
|
||||
debug_opts="-O2"
|
||||
def_opts=
|
||||
largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
|
||||
fifo_opts=""
|
||||
libvers="-DCdrskin_libburn_1_5_6"
|
||||
libvers="-DCdrskin_libburn_1_4_8"
|
||||
|
||||
# To be used if Makefile.am uses libburn_libburn_la_CFLAGS
|
||||
# burn="libburn/libburn_libburn_la-"
|
||||
@ -41,15 +41,15 @@ do
|
||||
elif test "$i" = "-compile_dewav"
|
||||
then
|
||||
compile_dewav=1
|
||||
elif test "$i" = "-libburn_1_5_6"
|
||||
elif test "$i" = "-libburn_1_4_8"
|
||||
then
|
||||
libvers="-DCdrskin_libburn_1_5_6"
|
||||
libvers="-DCdrskin_libburn_1_4_8"
|
||||
libdax_audioxtr_o="$burn"libdax_audioxtr.o
|
||||
libdax_msgs_o="$burn"libdax_msgs.o
|
||||
cleanup_src_or_obj="$burn"cleanup.o
|
||||
elif test "$i" = "-libburn_svn"
|
||||
then
|
||||
libvers="-DCdrskin_libburn_1_5_7"
|
||||
libvers="-DCdrskin_libburn_1_4_9"
|
||||
libdax_audioxtr_o="$burn"libdax_audioxtr.o
|
||||
libdax_msgs_o="$burn"libdax_msgs.o
|
||||
cleanup_src_or_obj="$burn"cleanup.o
|
||||
@ -99,8 +99,8 @@ do
|
||||
echo "Options:"
|
||||
echo " -compile_cdrfifo compile program cdrskin/cdrfifo."
|
||||
echo " -compile_dewav compile program test/dewav without libburn."
|
||||
echo " -libburn_1_5_6 set macro to match libburn-1.5.6"
|
||||
echo " -libburn_svn set macro to match current libburn git."
|
||||
echo " -libburn_1_4_8 set macro to match libburn-1.4.8"
|
||||
echo " -libburn_svn set macro to match current libburn-SVN."
|
||||
echo " -dvd_obs_64k 64 KB default size for DVD/BD writing."
|
||||
echo " -use_libcdio link with -lcdio because libburn uses it."
|
||||
echo " -do_not_compile_cdrskin omit compilation of cdrskin/cdrskin."
|
||||
|
||||
35
configure.ac
35
configure.ac
@ -1,4 +1,4 @@
|
||||
AC_INIT([libburn], [1.5.7], [http://libburnia-project.org])
|
||||
AC_INIT([libburn], [1.4.8], [http://libburnia-project.org])
|
||||
AC_PREREQ([2.50])
|
||||
dnl AC_CONFIG_HEADER([config.h])
|
||||
|
||||
@ -110,10 +110,6 @@ dnl 1.4.2 = libburn.so.4.95.0
|
||||
dnl 1.4.4 = libburn.so.4.97.0
|
||||
dnl 1.4.6 = libburn.so.4.99.0
|
||||
dnl 1.4.8 = libburn.so.4.101.0
|
||||
dnl 1.5.0 = libburn.so.4.103.0
|
||||
dnl 1.5.2 = libburn.so.4.105.0
|
||||
dnl 1.5.4 = libburn.so.4.107.0
|
||||
dnl 1.5.6 = libburn.so.4.109.0
|
||||
dnl
|
||||
dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
|
||||
dnl SONAME of the emerging library is LT_CURRENT - LT_AGE.
|
||||
@ -138,8 +134,8 @@ dnl If BURN_*_VERSION changes, be sure to change AC_INIT above to match.
|
||||
dnl
|
||||
dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
|
||||
BURN_MAJOR_VERSION=1
|
||||
BURN_MINOR_VERSION=5
|
||||
BURN_MICRO_VERSION=7
|
||||
BURN_MINOR_VERSION=4
|
||||
BURN_MICRO_VERSION=8
|
||||
BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
|
||||
|
||||
AC_SUBST(BURN_MAJOR_VERSION)
|
||||
@ -150,14 +146,14 @@ AC_SUBST(BURN_VERSION)
|
||||
dnl Libtool versioning
|
||||
LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
|
||||
dnl
|
||||
dnl ### This is the release version libburn-1.5.6
|
||||
dnl This is the development version after above release version
|
||||
dnl ### LT_CURRENT++, LT_AGE++ has not yet happened.
|
||||
dnl LT_CURRENT++, LT_AGE++ has happened meanwhile.
|
||||
dnl This is the release version libburn-1.4.8
|
||||
dnl ### This is the development version after above release version
|
||||
dnl LT_CURRENT++, LT_AGE++ has not yet happened.
|
||||
dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
|
||||
dnl
|
||||
dnl SONAME = 114 - 110 = 4 . Linux library name = libburn.so.4.110.0
|
||||
LT_CURRENT=114
|
||||
LT_AGE=110
|
||||
dnl SONAME = 105 - 101 = 4 . Linux library name = libburn.so.4.101.0
|
||||
LT_CURRENT=105
|
||||
LT_AGE=101
|
||||
LT_REVISION=0
|
||||
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
|
||||
|
||||
@ -176,12 +172,12 @@ AC_SUBST(BURN_BINARY_AGE)
|
||||
AC_PREFIX_DEFAULT([/usr/local])
|
||||
test "$prefix" = "NONE" && prefix=$ac_default_prefix
|
||||
|
||||
dnl ts B90405 : Disabled on advise of Ross Burton
|
||||
dnl AM_MAINTAINER_MODE
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
AM_PROG_CC_C_O
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
dnl Large file support
|
||||
AC_SYS_LARGEFILE
|
||||
@ -219,12 +215,11 @@ CFLAGS="$STATVFS_DEF $CFLAGS"
|
||||
|
||||
dnl ts A91122
|
||||
AC_ARG_ENABLE(track-src-odirect,
|
||||
[ --enable-track-src-odirect Banned for now: (Enable use of O_DIRECT with track input, default=no)],
|
||||
[ --enable-track-src-odirect Enable use of O_DIRECT with track input, default=no],
|
||||
, enable_track_src_odirect=no)
|
||||
if test x$enable_track_src_odirect = xyes; then
|
||||
# LIBBURN_O_DIRECT_DEF="-DLibburn_read_o_direcT"
|
||||
# echo "enabled use of O_DIRECT with track input"
|
||||
echo "REFUSED to enable use of O_DIRECT with track input because of cdrskin multi-track bug"
|
||||
LIBBURN_O_DIRECT_DEF="-DLibburn_read_o_direcT"
|
||||
echo "enabled use of O_DIRECT with track input"
|
||||
else
|
||||
LIBBURN_O_DIRECT_DEF=
|
||||
echo "disabled use of O_DIRECT with track input"
|
||||
|
||||
@ -1401,7 +1401,7 @@ in http://libburnia-project.org/ticket/13 .
|
||||
BD-R Cookbook
|
||||
-------------------------------------------------------------------------------
|
||||
Inspired by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
|
||||
backed by experiments with drive LG GGW H20L.
|
||||
backed by experiments iwith drive LG GGW H20L.
|
||||
|
||||
For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
|
||||
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
|
||||
Sound extraction for CD-DA burning from .WAV audio file format
|
||||
|
||||
Using information and text snippets
|
||||
from https://ccrma.stanford.edu/courses/422/projects/WaveFormat/
|
||||
in may 2013. The link is now dead. An apparent copy of the page
|
||||
is 2017 at: http://soundfile.sapp.org/doc/WaveFormat/
|
||||
from https://en.wikipedia.org/wiki/WAV
|
||||
|
||||
For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
|
||||
December 2017
|
||||
|
||||
|
||||
The WAVE file format is an application of the Microsoft RIFF container format
|
||||
for multimedia files. A RIFF file consists of Chunks which contain Subchunks.
|
||||
The Chunks form a linked list within the file, the Subchunks form a linked
|
||||
list inside their Chunk.
|
||||
All numbers are stored in little-endian byte order.
|
||||
|
||||
A .WAV file consists at least of one Chunk with id "RIFF", which contains
|
||||
one Subchunk with id "fmt " and one with id "data":
|
||||
|
||||
Offset Size Name Description
|
||||
|
||||
0 4 ChunkID Contains the letters "RIFF"
|
||||
4 4 ChunkSize The size of the rest of the chunk following
|
||||
this field. I.e. the two fields ChunkID and
|
||||
ChunkSize are not included in this count.
|
||||
8 4 Format Contains the letters "WAVE"
|
||||
|
||||
|
||||
The "fmt " subchunk describes the sound data's format:
|
||||
|
||||
Offset Size Name Description
|
||||
|
||||
0 4 Subchunk1ID Contains the letters "fmt "
|
||||
|
||||
4 4 Subchunk1Size The size of the rest of the Subchunk following
|
||||
this field. I.e. Subchunk1ID and Subchunk1Size
|
||||
are not included in this count.
|
||||
8 2 AudioFormat PCM = 1 (i.e. Linear quantization)
|
||||
Values other than 1 indicate some
|
||||
form of compression.
|
||||
10 2 NumChannels Mono = 1, Stereo = 2, etc.
|
||||
12 4 SampleRate 8000, 44100, etc.
|
||||
16 4 ByteRate == SampleRate * NumChannels * BitsPerSample/8
|
||||
20 2 BlockAlign == NumChannels * BitsPerSample/8
|
||||
The number of bytes for one sample including
|
||||
all channels.
|
||||
22 2 BitsPerSample 8 bits = 8, 16 bits = 16, etc.
|
||||
More data may follow in this Subchunk if AudioFormat is not PCM.
|
||||
|
||||
|
||||
The "data" subchunk contains the size of the data and the actual sound:
|
||||
|
||||
Offset Size Name Description
|
||||
|
||||
0 4 Subchunk2ID Contains the letters "data"
|
||||
|
||||
4 4 Subchunk2Size == NumSamples * NumChannels * BitsPerSample/8
|
||||
The number of audio data bytes.
|
||||
8 * Data The audio data bytes.
|
||||
|
||||
|
||||
CD-DA prescribes these "fmt " parameters:
|
||||
AudioFormat == 1
|
||||
SampleRate == 44100
|
||||
BitsPerSample == 16
|
||||
NumChannels == 2 (stereo)
|
||||
(little-endian byte order)
|
||||
|
||||
If matching parameters are given in the .WAV file, one can directly use the
|
||||
data bytes of Subchunk "data" as payload for burning a CD-DA track.
|
||||
|
||||
|
||||
Above simple form can be expanded by other Chunks or Subchunks of Chunk "RIFF".
|
||||
A .wav file appeared which beared a Subchunk "LIST" inside Chunk "RIFF".
|
||||
Wikipedia mentions Chunks "INFO", "CSET", "JUNK", "PAD ".
|
||||
|
||||
Therefore one should expect such Chunks before Chunk "RIFF" and Subchunks
|
||||
other than "fmt " and "data" inside the "RIFF" Chunk.
|
||||
Multiple Chunks "RIFF" and Subchunks "fmt " or "data" per file have not been
|
||||
seen yet. They would make extraction more cumbersome.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2017 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -122,8 +122,6 @@ struct w_list
|
||||
|
||||
static struct w_list *workers = NULL;
|
||||
|
||||
static void *fifo_worker_func(struct w_list *w);
|
||||
|
||||
|
||||
int burn_async_manage_lock(int mode)
|
||||
{
|
||||
@ -211,7 +209,7 @@ static void add_worker(int w_type, struct burn_drive *d,
|
||||
#endif /* Libburn_create_detached_threadS */
|
||||
|
||||
/* Worker specific locks are to be released early by the worker */
|
||||
if (f == (WorkerFunc) fifo_worker_func)
|
||||
if (f == (WorkerFunc) burn_fifo_source_shoveller)
|
||||
burn_async_manage_lock(BURN_ASYNC_LOCK_OBTAIN);
|
||||
|
||||
if (pthread_create(&a->thread, attr_pt, f, a)) {
|
||||
@ -279,7 +277,7 @@ static void *scan_worker_func(struct w_list *w)
|
||||
}
|
||||
|
||||
static void reset_progress(struct burn_drive *d, int sessions, int tracks,
|
||||
int indices, off_t sectors, int flag)
|
||||
int indices, int sectors, int flag)
|
||||
{
|
||||
/* reset the progress indicator */
|
||||
d->progress.session = 0;
|
||||
@ -412,14 +410,14 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
|
||||
return;
|
||||
}
|
||||
|
||||
reset_progress(drive, 1, 1, 1, (off_t) 0x10000, 0);
|
||||
reset_progress(drive, 1, 1, 1, 0x10000, 0);
|
||||
|
||||
/* A70103 : will be set to 0 by burn_disc_erase_sync() */
|
||||
drive->cancel = 1;
|
||||
|
||||
/* ts A70103 moved up from burn_disc_erase_sync() */
|
||||
/* ts A60825 : allow on parole to blank appendable CDs */
|
||||
/* ts A70131 : allow blanking of overwritable DVD-RW (profile 0x13) */
|
||||
/* ts A70131 : allow blanking of overwriteable DVD-RW (profile 0x13) */
|
||||
/* ts A70216 : allow blanking of CD-RW or DVD-RW in any regular state
|
||||
and of any kind of full media */
|
||||
/* ts A70909 : the willingness to burn any BURN_DISC_FULL media is
|
||||
@ -494,7 +492,7 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
|
||||
int ok = 0, ret;
|
||||
char msg[40];
|
||||
|
||||
reset_progress(drive, 1, 1, 1, (off_t) 0x10000, 0);
|
||||
reset_progress(drive, 1, 1, 1, 0x10000, 0);
|
||||
|
||||
if ((SCAN_GOING()) || find_worker(drive) != NULL) {
|
||||
libdax_msgs_submit(libdax_messenger, drive->global_index,
|
||||
@ -652,7 +650,7 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
|
||||
}
|
||||
|
||||
reset_progress(d, disc->sessions, disc->session[0]->tracks,
|
||||
disc->session[0]->track[0]->indices, (off_t) 0, 0);
|
||||
disc->session[0]->track[0]->indices, 0, 0);
|
||||
|
||||
/* For the next lines any return indicates failure */
|
||||
d->cancel = 1;
|
||||
|
||||
@ -77,7 +77,7 @@ int burn_create_new_pack(int pack_type, int track_no, int double_byte,
|
||||
|
||||
|
||||
/* Plain implementation of polynomial division on a Galois field, where
|
||||
addition and subtraction both are binary exor. Euclidean algorithm.
|
||||
addition and subtraction both are binary exor. Euclidian algorithm.
|
||||
Divisor is x^16 + x^12 + x^5 + 1 = 0x11021.
|
||||
*/
|
||||
static int crc_11021(unsigned char *data, int count, int flag)
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
-DDDLPA_C_STANDALONE -o ddlpa ddlpa.c
|
||||
|
||||
The system macros enable 64-bit off_t and open(2) flag O_LARGEFILE, which
|
||||
are not absolutely necessary but explicitly take into respect that
|
||||
are not absolutely necessary but explicitely take into respect that
|
||||
our devices can offer more than 2 GB of addressable data.
|
||||
|
||||
Run test program:
|
||||
|
||||
315
libburn/drive.c
315
libburn/drive.c
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2017 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -191,7 +191,7 @@ int burn_drive_is_released(struct burn_drive *d)
|
||||
/* ts A60906 */
|
||||
/** Inquires drive status in respect to degree of app usage.
|
||||
@param return -2 = drive is forgotten
|
||||
-1 = drive is closed (i.e. released explicitly)
|
||||
-1 = drive is closed (i.e. released explicitely)
|
||||
0 = drive is open, not grabbed (after scan, before 1st grab)
|
||||
1 = drive is grabbed but BURN_DRIVE_IDLE
|
||||
2 = drive is grabbed, synchronous read/write interrupted
|
||||
@ -287,7 +287,7 @@ int burn_drive_inquire_media(struct burn_drive *d)
|
||||
|
||||
/* ts A61020 : d->status was set to BURN_DISC_BLANK as pure guess */
|
||||
|
||||
/* ts A71128 : run read_disc_info() for any recognizable profile */
|
||||
/* ts A71128 : run read_disc_info() for any recognizeable profile */
|
||||
if (d->current_profile > 0 || d->current_is_guessed_profile ||
|
||||
(d->mdata->p2a_valid > 0 &&
|
||||
(d->mdata->cdr_write || d->mdata->cdrw_write ||
|
||||
@ -375,8 +375,8 @@ static int burn_drive__is_rdwr(char *fname, int *stat_ret,
|
||||
else if (is_rdwr)
|
||||
ret = burn_os_stdio_capacity(fname, 0, &read_size);
|
||||
if (ret <= 0 ||
|
||||
read_size >= BURN_DRIVE_MAX_BYTES)
|
||||
read_size = BURN_DRIVE_MAX_BYTES;
|
||||
read_size / (off_t) 2048 >= (off_t) 0x7ffffff0)
|
||||
read_size = (off_t) 0x7ffffff0 * (off_t) 2048;
|
||||
}
|
||||
|
||||
if (is_rdwr && fd >= 0) {
|
||||
@ -451,10 +451,10 @@ int burn_drive_grab_stdio(struct burn_drive *d, int flag)
|
||||
if (stat_ret != -1 && S_ISREG(stbuf.st_mode) &&
|
||||
stbuf.st_size > 0) {
|
||||
d->status = BURN_DISC_APPENDABLE;
|
||||
if (stbuf.st_size >= BURN_DRIVE_MAX_BYTES) {
|
||||
if (stbuf.st_size / (off_t) 2048
|
||||
>= 0x7ffffff0) {
|
||||
d->status = BURN_DISC_FULL;
|
||||
d->role_5_nwa = (off_t) BURN_DRIVE_MAX_BYTES /
|
||||
(off_t) 2048;
|
||||
d->role_5_nwa = 0x7ffffff0;
|
||||
} else
|
||||
d->role_5_nwa = stbuf.st_size / 2048 +
|
||||
!!(stbuf.st_size % 2048);
|
||||
@ -556,9 +556,6 @@ struct burn_drive *burn_drive_register(struct burn_drive *d)
|
||||
d->thread_pid = 0;
|
||||
d->thread_pid_valid = 0;
|
||||
memset(&(d->thread_tid), 0, sizeof(d->thread_tid));
|
||||
d->medium_state_changed = 0;
|
||||
d->set_streaming_exact_bit = 0;
|
||||
d->set_streaming_err = 0;
|
||||
d->toc_entries = 0;
|
||||
d->toc_entry = NULL;
|
||||
d->disc = NULL;
|
||||
@ -686,10 +683,9 @@ int burn_drive_mark_unready(struct burn_drive *d, int flag)
|
||||
}
|
||||
|
||||
|
||||
/* ts A70918-C40918 : outsourced from burn_drive_release() and enhanced */
|
||||
/* ts A70918 : outsourced from burn_drive_release() and enhanced */
|
||||
/** @param flag bit0-2 = mode : 0=unlock , 1=unlock+eject , 2=leave locked
|
||||
bit3= do not calm drive and do not call d->release()
|
||||
bit4= do not calm drive (@since 1.5.8)
|
||||
bit3= do not call d->release()
|
||||
*/
|
||||
int burn_drive_release_fl(struct burn_drive *d, int flag)
|
||||
{
|
||||
@ -720,11 +716,11 @@ int burn_drive_release_fl(struct burn_drive *d, int flag)
|
||||
d->unlock(d);
|
||||
if ((flag & 7) == 1)
|
||||
d->eject(d);
|
||||
if (!(flag & (8 | 16)))
|
||||
if (!(flag & 8)) {
|
||||
burn_drive_snooze(d, 0);
|
||||
if (!(flag & 8))
|
||||
d->release(d);
|
||||
}
|
||||
}
|
||||
|
||||
d->needs_sync_cache = 0; /* just to be sure */
|
||||
|
||||
@ -766,14 +762,6 @@ void burn_drive_release(struct burn_drive *d, int le)
|
||||
}
|
||||
|
||||
|
||||
/* API */
|
||||
/* ts C40918 */
|
||||
int burn_drive_release_v2(struct burn_drive *d, int flag)
|
||||
{
|
||||
return burn_drive_release_fl(d, flag & 0x17);
|
||||
}
|
||||
|
||||
|
||||
/* ts B11002 */
|
||||
/* API */
|
||||
int burn_drive_re_assess(struct burn_drive *d, int flag)
|
||||
@ -895,7 +883,6 @@ void burn_disc_erase_sync(struct burn_drive *d, int fast)
|
||||
d->progress.sector = 0;
|
||||
#endif /* Libburn_reset_progress_asynC */
|
||||
|
||||
d->medium_state_changed = 1;
|
||||
d->erase(d, fast);
|
||||
d->busy = BURN_DRIVE_ERASING;
|
||||
|
||||
@ -985,7 +972,6 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
|
||||
stages = 1 + ((flag & 1) && size > 1024 * 1024);
|
||||
d->cancel = 0;
|
||||
d->busy = BURN_DRIVE_FORMATTING;
|
||||
d->medium_state_changed = 1;
|
||||
|
||||
ret = d->format_unit(d, size, flag & 0xfff6); /* forward bits */
|
||||
if (ret <= 0)
|
||||
@ -1145,13 +1131,12 @@ int burn_disc_erasable(struct burn_drive *d)
|
||||
{
|
||||
return d->erasable;
|
||||
}
|
||||
|
||||
|
||||
void burn_drive_get_status_sig_handling(void)
|
||||
enum burn_drive_status burn_drive_get_status(struct burn_drive *d,
|
||||
struct burn_progress *p)
|
||||
{
|
||||
/* --- Part of asynchronous signal handling --- */
|
||||
/* The frequently used call burn_drive_get_status*() may be used
|
||||
to react on messages from the libburn built-in signal handler.
|
||||
/* This frequently used call may be used to react on messages from
|
||||
the libburn built-in signal handler.
|
||||
*/
|
||||
|
||||
/* ts B00225 :
|
||||
@ -1175,112 +1160,24 @@ void burn_drive_get_status_sig_handling(void)
|
||||
}
|
||||
|
||||
/* --- End of asynchronous signal handling --- */
|
||||
}
|
||||
|
||||
|
||||
enum burn_drive_status burn_drive_get_status(struct burn_drive *d,
|
||||
struct burn_progress *p)
|
||||
{
|
||||
burn_drive_get_status_sig_handling();
|
||||
|
||||
if (p != NULL) {
|
||||
memcpy(p, &(d->progress), sizeof(struct burn_progress));
|
||||
/* TODO: add mutex */
|
||||
|
||||
p->sessions = d->progress.sessions;
|
||||
p->session = d->progress.session;
|
||||
p->tracks = d->progress.tracks;
|
||||
p->track = d->progress.track;
|
||||
p->indices = d->progress.indices;
|
||||
p->index = d->progress.index;
|
||||
if(d->progress.start_sector < 0x80000000)
|
||||
p->start_sector = d->progress.start_sector;
|
||||
else
|
||||
p->start_sector = 0x7fffffff;
|
||||
if(d->progress.sectors < 0x80000000)
|
||||
p->sectors = d->progress.sectors;
|
||||
else
|
||||
p->sectors = 0x7fffffff;
|
||||
if(d->progress.sector < 0x80000000)
|
||||
p->sector = d->progress.sector;
|
||||
else
|
||||
p->sector = 0x7fffffff;
|
||||
if(d->progress.buffer_capacity < 0x100000000)
|
||||
p->buffer_capacity = d->progress.buffer_capacity;
|
||||
else
|
||||
p->buffer_capacity = 0xffffffff;
|
||||
if(d->progress.buffer_available < 0x100000000)
|
||||
p->buffer_available = d->progress.buffer_available;
|
||||
else
|
||||
p->buffer_available = 0xffffffff;
|
||||
p->buffered_bytes = d->progress.buffered_bytes;
|
||||
if(d->progress.buffer_min_fill < 0x100000000)
|
||||
p->buffer_min_fill = d->progress.buffer_min_fill;
|
||||
else
|
||||
p->buffer_min_fill = 0xffffffff;
|
||||
}
|
||||
return d->busy;
|
||||
}
|
||||
|
||||
|
||||
enum burn_drive_status burn_drive_get_status_v2(struct burn_drive *d,
|
||||
struct burn_progress_v2 *p)
|
||||
{
|
||||
burn_drive_get_status_sig_handling();
|
||||
if (p != NULL) {
|
||||
/* TODO: add mutex */
|
||||
|
||||
memcpy(p, &(d->progress), sizeof(struct burn_progress_v2));
|
||||
}
|
||||
return d->busy;
|
||||
}
|
||||
|
||||
|
||||
int burn_drive_set_stream_recording(struct burn_drive *d, int recmode,
|
||||
int start, int flag)
|
||||
{
|
||||
#ifndef Libburn_force_stream_recordinG
|
||||
struct burn_feature_descr *descr;
|
||||
#endif
|
||||
|
||||
if (recmode == 1) {
|
||||
|
||||
#ifdef Libburn_force_stream_recordinG
|
||||
|
||||
if (recmode == 1)
|
||||
d->do_stream_recording = 1;
|
||||
|
||||
#else /* Libburn_force_stream_recordinG */
|
||||
|
||||
else if (recmode == -1)
|
||||
d->do_stream_recording = 0;
|
||||
if (burn_drive_has_feature(d, 0x107, &descr, 0)) {
|
||||
if ((descr->data[0] & 1) && (descr->flags & 1))
|
||||
d->do_stream_recording = 1;
|
||||
}
|
||||
if (!d->do_stream_recording) {
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201ac,
|
||||
LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"Drive currently does not offer Stream Recording",
|
||||
0, 0);
|
||||
} else if (d->current_profile != 0x12 &&
|
||||
d->current_profile != 0x41 &&
|
||||
d->current_profile != 0x43) {
|
||||
d->do_stream_recording = 0;
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201ad,
|
||||
LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"Stream Recording suppressed due to medium type",
|
||||
0, 0);
|
||||
}
|
||||
|
||||
#endif /* ! Libburn_force_stream_recordinG */
|
||||
|
||||
} else if (recmode == -1) {
|
||||
d->do_stream_recording = 0;
|
||||
}
|
||||
if (d->do_stream_recording)
|
||||
d->stream_recording_start = start;
|
||||
else
|
||||
d->stream_recording_start = 0;
|
||||
return(1);
|
||||
}
|
||||
|
||||
@ -1392,7 +1289,7 @@ static int drive_getcaps(struct burn_drive *d, struct burn_drive_info *out)
|
||||
|
||||
/* ts A91112 */
|
||||
/* Set default block types. The call d->probe_write_modes() is quite
|
||||
obtrusive. It may be performed explicitly by new API call
|
||||
obtrusive. It may be performed explicitely by new API call
|
||||
burn_drive_probe_cd_write_modes().
|
||||
*/
|
||||
if (out->write_dvdram || out->write_dvdr ||
|
||||
@ -1491,7 +1388,7 @@ int burn_drive_scan_sync(struct burn_drive_info *drives[],
|
||||
|
||||
*n_drives = 0;
|
||||
|
||||
/* ts A70907 : whether to scan from scratch or to extend */
|
||||
/* ts A70907 : wether to scan from scratch or to extend */
|
||||
for (i = 0; i < (int) sizeof(scanned); i++)
|
||||
scanned[i] = 0;
|
||||
if (flag & 1) {
|
||||
@ -1632,7 +1529,7 @@ void burn_drive_info_free(struct burn_drive_info drive_infos[])
|
||||
/* ts A70903 : THIS IS WRONG ! (disabled now)
|
||||
It endangers multi drive usage.
|
||||
This call is not entitled to delete all drives, only the
|
||||
ones of the array which it receives a parameter.
|
||||
ones of the array which it receives a parmeter.
|
||||
|
||||
Problem: It was unclear how many items are listed in drive_infos
|
||||
Solution: Added a end marker element to any burn_drive_info array
|
||||
@ -1661,22 +1558,6 @@ void burn_drive_set_speed(struct burn_drive *d, int r, int w)
|
||||
d->set_speed(d, r, w);
|
||||
}
|
||||
|
||||
int burn_drive_set_speed_exact(struct burn_drive *d, int r, int w)
|
||||
{
|
||||
int sose;
|
||||
|
||||
d->nominal_write_speed = w;
|
||||
if(d->drive_role != 1)
|
||||
return 0;
|
||||
sose = d->silent_on_scsi_error;
|
||||
d->silent_on_scsi_error = 3;
|
||||
d->set_streaming_err = 0;
|
||||
d->set_streaming_exact_bit = 1;
|
||||
d->set_speed(d, r, w);
|
||||
d->silent_on_scsi_error = sose;
|
||||
d->set_streaming_exact_bit = 0;
|
||||
return !d->set_streaming_err;
|
||||
}
|
||||
|
||||
/* ts A70711 API function */
|
||||
int burn_drive_set_buffer_waiting(struct burn_drive *d, int enable,
|
||||
@ -1842,7 +1723,8 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
|
||||
{
|
||||
int ret = -1, role = 0, fd;
|
||||
int is_rdwr = 0, stat_ret = -1;
|
||||
off_t size = BURN_DRIVE_MAX_BYTES;
|
||||
/* divided by 512 it needs to fit into a signed long integer */
|
||||
off_t size = ((off_t) (512 * 1024 * 1024 - 1) * (off_t) 2048);
|
||||
off_t read_size = -1;
|
||||
struct burn_drive *d= NULL, *regd_d;
|
||||
struct stat stbuf;
|
||||
@ -1918,11 +1800,10 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
|
||||
(burn_drive_role_4_allowed & 8)) {
|
||||
d->status = BURN_DISC_APPENDABLE;
|
||||
d->block_types[BURN_WRITE_SAO] = 0;
|
||||
if (stbuf.st_size > BURN_DRIVE_MAX_BYTES) {
|
||||
if (stbuf.st_size / (off_t) 2048
|
||||
>= 0x7ffffff0) {
|
||||
d->status = BURN_DISC_FULL;
|
||||
d->role_5_nwa =
|
||||
(off_t) BURN_DRIVE_MAX_BYTES /
|
||||
(off_t) 2048; ;
|
||||
d->role_5_nwa = 0x7ffffff0;
|
||||
} else
|
||||
d->role_5_nwa = stbuf.st_size / 2048 +
|
||||
!!(stbuf.st_size % 2048);
|
||||
@ -1996,7 +1877,7 @@ int burn_drive_scan_and_grab(struct burn_drive_info *drive_infos[], char* adr,
|
||||
unsigned int n_drives;
|
||||
int ret, i;
|
||||
|
||||
/* check whether drive address is already registered */
|
||||
/* check wether drive address is already registered */
|
||||
for (i = 0; i <= drivetop; i++)
|
||||
if (drive_array[i].global_index >= 0)
|
||||
if (strcmp(drive_array[i].devname, adr) == 0)
|
||||
@ -2101,7 +1982,7 @@ int burn_drive_get_adr(struct burn_drive_info *drive_info, char adr[])
|
||||
|
||||
|
||||
/* ts A60922 ticket 33 */
|
||||
/** Evaluate whether the given address would be enumerated by libburn */
|
||||
/** Evaluate wether the given address would be enumerated by libburn */
|
||||
int burn_drive_is_enumerable_adr(char *adr)
|
||||
{
|
||||
return sg_is_enumerable_adr(adr);
|
||||
@ -2335,12 +2216,12 @@ int burn_drive_find_scsi_equiv(char *path, char adr[])
|
||||
burn_drive_adr_debug_msg(msg, NULL);
|
||||
return 0;
|
||||
}
|
||||
sprintf(msg, "burn_drive_find_scsi_equiv( %s ) : %d,%d,%d,%d,%d",
|
||||
sprintf(msg, "burn_drive_find_scsi_equiv( %s ) : (%d),%d,%d,%d,%d",
|
||||
path, bus_no, host_no, channel_no, target_no, lun_no);
|
||||
burn_drive_adr_debug_msg(msg, NULL);
|
||||
|
||||
ret= burn_drive_convert_scsi_adr(bus_no, host_no, channel_no,
|
||||
target_no, lun_no, adr);
|
||||
ret= burn_drive_convert_scsi_adr(-1, host_no, channel_no, target_no,
|
||||
lun_no, adr);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -2702,10 +2583,10 @@ int burn_disc_read_atip(struct burn_drive *d)
|
||||
}
|
||||
|
||||
/* ts A61110 : new API function */
|
||||
int burn_disc_track_lba_nwa_v2(struct burn_drive *d, struct burn_write_opts *o,
|
||||
int trackno, off_t *lba, off_t *nwa)
|
||||
int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
|
||||
int trackno, int *lba, int *nwa)
|
||||
{
|
||||
int ret, int_lba, int_nwa;
|
||||
int ret;
|
||||
|
||||
if (burn_drive_is_released(d)) {
|
||||
libdax_msgs_submit(libdax_messenger,
|
||||
@ -2733,38 +2614,11 @@ int burn_disc_track_lba_nwa_v2(struct burn_drive *d, struct burn_write_opts *o,
|
||||
return 0;
|
||||
if (o != NULL)
|
||||
d->send_write_parameters(d, NULL, -1, o);
|
||||
ret = d->get_nwa(d, trackno, &int_lba, &int_nwa);
|
||||
if (ret <= 0)
|
||||
return ret;
|
||||
*lba = int_lba;
|
||||
*nwa = int_nwa;
|
||||
ret = d->get_nwa(d, trackno, lba, nwa);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/* ts A61110 / C40302 : API */
|
||||
int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
|
||||
int trackno, int *lba, int *nwa)
|
||||
{
|
||||
int ret;
|
||||
off_t off_lba, off_nwa;
|
||||
|
||||
ret = burn_disc_track_lba_nwa_v2(d, o, trackno, &off_lba, &off_nwa);
|
||||
if (ret <= 0)
|
||||
return ret;
|
||||
if (off_lba > 0x7fffffff)
|
||||
*lba = 0x7fffffff;
|
||||
else
|
||||
*lba = off_lba;
|
||||
if (off_nwa > 0x7fffffff) {
|
||||
*nwa = 0x7fffffff;
|
||||
return 0;
|
||||
} else {
|
||||
*nwa = off_nwa;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ts A70131 : new API function */
|
||||
int burn_disc_get_msc1(struct burn_drive *d, int *start)
|
||||
{
|
||||
@ -2814,7 +2668,7 @@ off_t burn_disc_available_space(struct burn_drive *d,
|
||||
if (ret != 1)
|
||||
bytes = d->media_capacity_remaining;
|
||||
if (bytes <= 0)
|
||||
bytes = BURN_DRIVE_MAX_BYTES;
|
||||
bytes = (off_t) (512 * 1024 * 1024 - 1) * (off_t) 2048;
|
||||
if (bytes != d->media_capacity_remaining)
|
||||
burn_drive_set_media_capacity_remaining(d, bytes);
|
||||
} else {
|
||||
@ -3157,7 +3011,7 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
|
||||
d->current_profile == 0x1a ||
|
||||
d->current_profile == 0x43
|
||||
) {
|
||||
/* DVD-RAM, overwritable DVD-RW, DVD+RW, BD-RE */
|
||||
/* DVD-RAM, overwriteable DVD-RW, DVD+RW, BD-RE */
|
||||
o->start_adr = 1;
|
||||
ret = burn_disc_get_formats(d, &status, &size, &dummy,
|
||||
&num_formats);
|
||||
@ -3416,7 +3270,7 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2)
|
||||
/* one dir existing, one not */
|
||||
|
||||
/* Both directories exist. The basenames are equal.
|
||||
So the addresses are equal if the directories are
|
||||
So the adresses are equal if the directories are
|
||||
equal.*/
|
||||
}
|
||||
if (stbuf1.st_ino == stbuf2.st_ino &&
|
||||
@ -3497,38 +3351,21 @@ int burn_drive_find_by_thread_pid(struct burn_drive **d, pid_t pid,
|
||||
*/
|
||||
int burn_drive_set_media_capacity_remaining(struct burn_drive *d, off_t value)
|
||||
{
|
||||
if (value > BURN_DRIVE_MAX_BYTES)
|
||||
value = BURN_DRIVE_MAX_BYTES;
|
||||
if (value / (off_t) 2048 > (off_t) 0x7ffffff0)
|
||||
value = ((off_t) 0x7ffffff0) * (off_t) 2048;
|
||||
d->media_capacity_remaining = value;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ts C40303 : API */
|
||||
int burn_get_read_capacity_v2(struct burn_drive *d, off_t *capacity, int flag)
|
||||
{
|
||||
*capacity = d->media_read_capacity +
|
||||
(d->media_read_capacity != 0x7fffffffffffffff);
|
||||
return (d->media_read_capacity != 0x7fffffffffffffff);
|
||||
}
|
||||
|
||||
/* ts A81215 : API */
|
||||
int burn_get_read_capacity(struct burn_drive *d, int *capacity, int flag)
|
||||
{
|
||||
int ret;
|
||||
off_t cap;
|
||||
*capacity = d->media_read_capacity +
|
||||
(d->media_read_capacity != 0x7fffffff);
|
||||
return (d->media_read_capacity != 0x7fffffff);
|
||||
}
|
||||
|
||||
ret= burn_get_read_capacity_v2(d, &cap, flag);
|
||||
if (cap < -0x7fffffff) {
|
||||
*capacity = -0x7fffffff;
|
||||
ret = 0;
|
||||
} else if (cap > 0x7fffffff) {
|
||||
*capacity = 0x7fffffff;
|
||||
ret = 0;
|
||||
} else {
|
||||
*capacity = cap;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* ts A90903 : API */
|
||||
int burn_disc_get_media_id(struct burn_drive *d,
|
||||
@ -3557,7 +3394,7 @@ int burn_disc_get_media_id(struct burn_drive *d,
|
||||
bit3= disc_app_code valid
|
||||
bit4= Disc is unrestricted (URU bit)
|
||||
bit5= Disc is nominally erasable (Erasable bit)
|
||||
This will be set with overwritable media which
|
||||
This will be set with overwriteable media which
|
||||
libburn normally considers to be unerasable blank.
|
||||
*/
|
||||
int burn_disc_get_cd_info(struct burn_drive *d, char disc_type[80],
|
||||
@ -3802,63 +3639,3 @@ int burn_drive_get_immed(struct burn_drive *drive)
|
||||
}
|
||||
|
||||
|
||||
/* ts B90412 , API */
|
||||
int burn_drive_get_feature(struct burn_drive *d, unsigned int feature_code,
|
||||
unsigned char *flags,
|
||||
unsigned char *additional_length,
|
||||
unsigned char **feature_data,
|
||||
char **feature_text)
|
||||
{
|
||||
int ret, i;
|
||||
struct burn_feature_descr *descr;
|
||||
|
||||
*flags = 0;
|
||||
*additional_length = 0;
|
||||
*feature_data = NULL;
|
||||
if (feature_text != NULL)
|
||||
*feature_text = NULL;
|
||||
if (!burn_drive_has_feature(d, feature_code, &descr, 0))
|
||||
return 0;
|
||||
*flags = descr->flags;
|
||||
*additional_length = descr->data_lenght;
|
||||
if (*additional_length > 0)
|
||||
BURN_ALLOC_MEM(*feature_data, unsigned char,
|
||||
*additional_length);
|
||||
for (i = 0; i < *additional_length; i++)
|
||||
(*feature_data)[i] = descr->data[i];
|
||||
|
||||
if (feature_text != NULL) {
|
||||
ret = burn_make_feature_text(d, feature_code, *flags,
|
||||
*additional_length, *feature_data,
|
||||
feature_text, 0);
|
||||
} else {
|
||||
ret = 1;
|
||||
}
|
||||
ex:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/* ts B90412 , API */
|
||||
void burn_drive_get_feature_codes(struct burn_drive *d,
|
||||
int *count, unsigned int **feature_codes)
|
||||
{
|
||||
struct burn_feature_descr *o;
|
||||
int to_alloc;
|
||||
|
||||
*count = 0;
|
||||
*feature_codes = NULL;
|
||||
for (o = d->features; o != NULL; o = o->next)
|
||||
(*count)++;
|
||||
if (*count == 0)
|
||||
return;
|
||||
to_alloc = *count;
|
||||
*count = 0;
|
||||
BURN_ALLOC_MEM_VOID(*feature_codes, unsigned int, to_alloc);
|
||||
for (o = d->features; o != NULL; o = o->next) {
|
||||
(*feature_codes)[*count] = o->feature_code;
|
||||
(*count)++;
|
||||
}
|
||||
ex:;
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -170,12 +170,4 @@ int burn_drive_has_feature(struct burn_drive *d, int feature_code,
|
||||
|
||||
int burn_drive_grab_stdio(struct burn_drive *d, int flag);
|
||||
|
||||
/* ts C10213 */
|
||||
/* The size of limitless or oversized devices as pseudo drives */
|
||||
/* Do not lightheartedly change this value because of its meaning to
|
||||
burn_drive.media_read_capacity in libburn/transport.h
|
||||
64 TiB = 2 exp 46 = 2 exp 35 blocks
|
||||
*/
|
||||
#define BURN_DRIVE_MAX_BYTES ((off_t) (0x800000000) * (off_t) 2048)
|
||||
|
||||
#endif /* __DRIVE */
|
||||
|
||||
@ -75,11 +75,11 @@
|
||||
>>> See correctness reservation below.
|
||||
|
||||
Algebra on Galois fields is the same as on Rational Numbers.
|
||||
But arithmetics on its polynomials differ from usual integer arithmetics
|
||||
on binary numbers.
|
||||
But arithmetics is defined by operations on polynomials rather than the
|
||||
usual integer arithmetics on binary numbers.
|
||||
Addition and subtraction are identical with the binary exor operator.
|
||||
Multiplication and division would demand polynomial division, e.g. by the
|
||||
euclidean algorithm. The computing path over logarithms and powers follows
|
||||
euclidian algorithm. The computing path over logarithms and powers follows
|
||||
algebra and reduces the arithmetic task to table lookups, additions
|
||||
modulo 255, and exor operations. Note that the logarithms are natural
|
||||
numbers, not polynomials. They get added or subtracted by the usual addition
|
||||
|
||||
@ -43,7 +43,7 @@ an unreadable disc */
|
||||
|
||||
|
||||
/* This is a generic OS oriented function wrapper which compensates
|
||||
shortcomings of read() in respect to a guaranteed amount of return data.
|
||||
shortcommings of read() in respect to a guaranteed amount of return data.
|
||||
See man 2 read , paragraph "RETURN VALUE".
|
||||
*/
|
||||
static int read_full_buffer(int fd, unsigned char *buffer, int size)
|
||||
@ -331,31 +331,8 @@ static int fifo_set_size(struct burn_source *source, off_t size)
|
||||
static void fifo_free(struct burn_source *source)
|
||||
{
|
||||
struct burn_source_fifo *fs = source->data;
|
||||
int wait_count;
|
||||
static int wait_max = 30, wait_usleep = 100000;
|
||||
|
||||
burn_fifo_abort(fs, 0);
|
||||
for (wait_count = 0; wait_count <= wait_max; wait_count++) {
|
||||
if (fs->thread_is_valid <= 0)
|
||||
break;
|
||||
if (wait_count < wait_max)
|
||||
usleep(wait_usleep);
|
||||
}
|
||||
if (wait_count > wait_max) {
|
||||
/* The shoveler thread might still be active. If so, it would
|
||||
use invalid or inappropriate memory if the fifo would be
|
||||
disposed now. A memory and resource leak is the better
|
||||
option here.
|
||||
*/
|
||||
libdax_msgs_submit(libdax_messenger, -1,
|
||||
0x000201ab,
|
||||
LIBDAX_MSGS_SEV_WARNING,
|
||||
LIBDAX_MSGS_PRIO_HIGH,
|
||||
"Leaving burn_source_fifo object undisposed because it is possibly stuck but alive",
|
||||
0, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
if (fs->inp != NULL)
|
||||
burn_source_free(fs->inp);
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ struct burn_source_offst {
|
||||
int size_adjustable;
|
||||
|
||||
/* for set_size/get_size */
|
||||
off_t nominal_size;
|
||||
int nominal_size;
|
||||
|
||||
/* To help offst_free() */
|
||||
struct burn_source *next;
|
||||
|
||||
@ -52,7 +52,7 @@ double lib_start_time;
|
||||
*/
|
||||
int burn_sg_open_o_excl = 1;
|
||||
|
||||
/* ts A70403 : GNU/Linux: whether to use fcntl(,F_SETLK,)
|
||||
/* ts A70403 : GNU/Linux: wether to use fcntl(,F_SETLK,)
|
||||
after open() of device files */
|
||||
int burn_sg_fcntl_f_setlk = 1;
|
||||
|
||||
@ -71,7 +71,7 @@ int burn_sg_use_family = 0;
|
||||
has been thoroughly tested. */
|
||||
int burn_sg_open_o_nonblock = 1;
|
||||
|
||||
/* whether to take a busy drive as an error */
|
||||
/* wether to take a busy drive as an error */
|
||||
/* Caution: this is implemented by a rough hack and eventually leads
|
||||
to unconditional abort of the process */
|
||||
int burn_sg_open_abort_busy = 0;
|
||||
@ -98,7 +98,7 @@ int burn_builtin_signal_action = 0; /* burn_set_signal_handling() */
|
||||
volatile int burn_builtin_triggered_action = 0; /* burn_is_aborting() */
|
||||
|
||||
|
||||
/* ts A70223 : whether implemented untested profiles are supported */
|
||||
/* ts A70223 : wether implemented untested profiles are supported */
|
||||
int burn_support_untested_profiles = 0;
|
||||
|
||||
/* ts A91111 :
|
||||
@ -112,7 +112,7 @@ int burn_sg_log_scsi = 0;
|
||||
|
||||
/* ts B10312 :
|
||||
Whether to map random-access readonly files to drive role 4.
|
||||
Else it is role 2 overwritable drive
|
||||
Else it is role 2 overwriteable drive
|
||||
*/
|
||||
int burn_drive_role_4_allowed = 0;
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ extern int burn_running;
|
||||
|
||||
extern double lib_start_time;
|
||||
|
||||
/** Indicator for burn_drive_get_status() whether a signal hit parts of the
|
||||
/** Indicator for burn_drive_get_status() wether a signal hit parts of the
|
||||
thread team.
|
||||
0= all works well ,
|
||||
1 to 5 = waiting for eventual signal on control thread
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2017 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
|
||||
This is the official API definition of libburn.
|
||||
@ -9,8 +9,6 @@
|
||||
*/
|
||||
/* Important: If you add a public API function then add its name to file
|
||||
libburn/libburn.ver
|
||||
in the node LIBBURN4_Major.Minor.Micro with the numbers of
|
||||
the next release version, citing the previous node.
|
||||
*/
|
||||
|
||||
|
||||
@ -31,9 +29,6 @@ processing tracks of more than 2 GB size.
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
|
||||
/* For struct timeval */
|
||||
#include <sys/time.h>
|
||||
|
||||
#ifndef DOXYGEN
|
||||
|
||||
#if defined(__cplusplus)
|
||||
@ -149,7 +144,7 @@ enum burn_write_types
|
||||
With sequential DVD-R[W]: Incremental Streaming
|
||||
With DVD+R and BD-R: Track of open size
|
||||
With DVD-RAM, DVD+RW, BD-RE: Random Writeable (used sequentially)
|
||||
With overwritable DVD-RW: Rigid Restricted Overwrite
|
||||
With overwriteable DVD-RW: Rigid Restricted Overwrite
|
||||
*/
|
||||
BURN_WRITE_TAO,
|
||||
|
||||
@ -240,7 +235,7 @@ enum burn_disc_status
|
||||
CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, BD-R
|
||||
Blanked multi-session media (i.e. treated by burn_disc_erase())
|
||||
CD-RW, DVD-RW
|
||||
Overwritable media with or without valid data
|
||||
Overwriteable media with or without valid data
|
||||
DVD-RAM, DVD+RW, formatted DVD-RW, BD-RE
|
||||
*/
|
||||
BURN_DISC_BLANK,
|
||||
@ -378,9 +373,6 @@ struct burn_toc_entry
|
||||
@since 0.5.2 : DVD extensions are made valid for CD too
|
||||
bit1= LRA extension is valid @since 0.7.2
|
||||
bit2= Track status bits extension is valid @since 1.2.8
|
||||
bit3= Long block address is valid:
|
||||
long_start_lba, long_track_blocks, long_last_rec_adr
|
||||
@since 1.5.8
|
||||
*/
|
||||
unsigned char extensions_valid;
|
||||
|
||||
@ -391,10 +383,8 @@ struct burn_toc_entry
|
||||
unsigned char session_msb;
|
||||
unsigned char point_msb;
|
||||
/* pmin, psec, and pframe may be too small if DVD extension is valid */
|
||||
/* -1 means that only long_start_lba is valid */
|
||||
int start_lba;
|
||||
/* min, sec, and frame may be too small if DVD extension is valid */
|
||||
/* -1 means that only long_track_blocks is valid */
|
||||
int track_blocks;
|
||||
|
||||
/* ts A90909 : LRA extension. extensions_valid:bit1 */
|
||||
@ -403,7 +393,6 @@ struct burn_toc_entry
|
||||
DVD-R DL when LJRS = 00b, DVD-RW, HD DVD-R, and BD-R.
|
||||
This would mean profiles: 0x11, 0x15, 0x13, 0x14, 0x51, 0x41, 0x42
|
||||
*/
|
||||
/* -1 means that only long_last_rec_adr is valid */
|
||||
int last_recorded_address;
|
||||
|
||||
/* ts B30112 : Track status bits extension. extensions_valid:bit2 */
|
||||
@ -423,12 +412,6 @@ struct burn_toc_entry
|
||||
*/
|
||||
int track_status_bits;
|
||||
|
||||
/* ts C40221 : Long block address extension. extensions_valid:bit3 */
|
||||
/* @since 1.5.8 */
|
||||
off_t long_start_lba;
|
||||
off_t long_track_blocks;
|
||||
off_t long_last_rec_adr;
|
||||
|
||||
};
|
||||
|
||||
|
||||
@ -680,7 +663,6 @@ struct burn_drive_info
|
||||
|
||||
|
||||
/** Operation progress report. All values are 0 based indices.
|
||||
Handed out by burn_drive_get_status().
|
||||
* */
|
||||
struct burn_progress {
|
||||
/** The total number of sessions */
|
||||
@ -693,7 +675,7 @@ struct burn_progress {
|
||||
int track;
|
||||
/** The total number of indices */
|
||||
int indices;
|
||||
/** Current index. */
|
||||
/** Curent index. */
|
||||
int index;
|
||||
/** The starting logical block address */
|
||||
int start_sector;
|
||||
@ -723,52 +705,6 @@ struct burn_progress {
|
||||
};
|
||||
|
||||
|
||||
/** Operation progress report with long block numbers.
|
||||
All values are 0 based indices.
|
||||
Handed out by burn_drive_get_status_v2().
|
||||
@since 1.5.8
|
||||
**/
|
||||
struct burn_progress_v2 {
|
||||
/** Revision of the struct format.
|
||||
0= Elements up to .buffer_min_fill */
|
||||
int revision;
|
||||
|
||||
/** The total number of sessions */
|
||||
int sessions;
|
||||
/** Current session.*/
|
||||
int session;
|
||||
/** The total number of tracks */
|
||||
int tracks;
|
||||
/** Current track. */
|
||||
int track;
|
||||
/** The total number of indices */
|
||||
int indices;
|
||||
/** Current index. */
|
||||
int index;
|
||||
/** The starting logical block address */
|
||||
off_t start_sector;
|
||||
/** On write: The number of sectors.
|
||||
On blank: 0x10000 as upper limit for relative progress steps */
|
||||
off_t sectors;
|
||||
/** On write: The current sector being processed.
|
||||
On blank: Relative progress steps 0 to 0x10000 */
|
||||
off_t sector;
|
||||
|
||||
/** The capacity of the drive buffer */
|
||||
off_t buffer_capacity;
|
||||
/** The free space in the drive buffer (might be slightly outdated) */
|
||||
off_t buffer_available;
|
||||
|
||||
/** The number of bytes sent to the drive buffer */
|
||||
off_t buffered_bytes;
|
||||
/** The minimum number of bytes stored in buffer during write.
|
||||
(Caution: Before surely one buffer size of bytes was processed,
|
||||
this value is 0x7fffffffffffffff.)
|
||||
*/
|
||||
off_t buffer_min_fill;
|
||||
};
|
||||
|
||||
|
||||
/* ts A61226 */
|
||||
/* @since 0.3.0 */
|
||||
/** Description of a speed capability as reported by the drive in conjunction
|
||||
@ -1269,23 +1205,6 @@ int burn_drive_re_assess(struct burn_drive *d, int flag);
|
||||
void burn_drive_release(struct burn_drive *drive, int eject);
|
||||
|
||||
|
||||
/* ts C40918 */
|
||||
/** Release a drive like with burn_drive_release() or burn_drive_leave_locked()
|
||||
but with the additional option not to calm down the drive.
|
||||
@param drive The drive to release.
|
||||
@param flag Bitfield for control purposes:
|
||||
bit0-2= mode
|
||||
0= unlock
|
||||
1= unlock+eject
|
||||
2= leave locked
|
||||
bit3= reserved, submit 0
|
||||
bit4= do not calm drive
|
||||
@return 1 means success, <=0 means failure
|
||||
@since 1.5.8
|
||||
*/
|
||||
int burn_drive_release_v2(struct burn_drive *d, int flag);
|
||||
|
||||
|
||||
/* ts A70918 */
|
||||
/** Like burn_drive_release() but keeping the drive tray closed and its
|
||||
eject button disabled. This physically locked drive state will last until
|
||||
@ -1409,7 +1328,7 @@ int burn_drive_get_bd_r_pow(struct burn_drive *drive);
|
||||
/* ts A61020 */
|
||||
/** Returns start and end lba of the media which is currently inserted
|
||||
in the given drive. The drive has to be grabbed to have hope for reply.
|
||||
Shortcoming (not a feature): unless burn_disc_read_atip() was called
|
||||
Shortcomming (not a feature): unless burn_disc_read_atip() was called
|
||||
only blank media will return valid info.
|
||||
@param drive The drive to query.
|
||||
@param start_lba Returns the start lba value
|
||||
@ -1467,7 +1386,7 @@ char *burn_guess_cd_manufacturer(int m_li, int s_li, int f_li,
|
||||
This seems to be broken with my drives. The bit is
|
||||
0 and the validity bit for disc_app_code is 0 too.
|
||||
bit5= Disc is nominally erasable (Erasable bit)
|
||||
This will be set with overwritable media which
|
||||
This will be set with overwriteable media which
|
||||
libburn normally considers to be unerasable blank.
|
||||
@return 1 success, <= 0 an error occurred
|
||||
@since 0.7.2
|
||||
@ -1559,13 +1478,6 @@ int burn_disc_get_phys_format_info(struct burn_drive *d, int *disk_category,
|
||||
int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
|
||||
int trackno, int *lba, int *nwa);
|
||||
|
||||
/* ts C40302 */
|
||||
/** Like burn_disc_track_lba_nwa(), but with off_t results.
|
||||
@since 1.5.8
|
||||
*/
|
||||
int burn_disc_track_lba_nwa_v2(struct burn_drive *d, struct burn_write_opts *o,
|
||||
int trackno, off_t *lba, off_t *nwa);
|
||||
|
||||
/* ts B10525 */
|
||||
/** Tells whether a previous attempt to determine the Next Writeable Address
|
||||
of the upcoming track reveiled that the READ TRACK INFORMATION Damage Bit
|
||||
@ -1738,15 +1650,6 @@ int burn_disc_erasable(struct burn_drive *d);
|
||||
enum burn_drive_status burn_drive_get_status(struct burn_drive *drive,
|
||||
struct burn_progress *p);
|
||||
|
||||
/** Returns the progress with long block numbers and the status of the drive.
|
||||
@param drive The drive to query busy state for.
|
||||
@param p Returns the progress of the operation, NULL if you don't care
|
||||
@return the current status of the drive. See also burn_drive_status.
|
||||
@since 1.5.8
|
||||
*/
|
||||
enum burn_drive_status burn_drive_get_status_v2(struct burn_drive *drive,
|
||||
struct burn_progress_v2 *p);
|
||||
|
||||
/** Creates a write_opts struct for burning to the specified drive.
|
||||
The returned object must later be freed with burn_write_opts_free().
|
||||
@param drive The drive to write with
|
||||
@ -1916,7 +1819,7 @@ void burn_disc_read(struct burn_drive *drive, const struct burn_read_opts *o);
|
||||
with drive and media. This function is called by burn_disc_write() but
|
||||
an application might be interested in this check in advance.
|
||||
@param o The options for the writing operation.
|
||||
@param disc The description of the disc to be created
|
||||
@param disc The descrition of the disc to be created
|
||||
@param reasons Eventually returns a list of rejection reason statements
|
||||
@param silent 1= do not issue error messages , 0= report problems
|
||||
@return 1 ok, -1= no recordable media detected, 0= other failure
|
||||
@ -3080,11 +2983,6 @@ int burn_track_set_size(struct burn_track *t, off_t size);
|
||||
*/
|
||||
int burn_track_get_sectors(struct burn_track *);
|
||||
|
||||
/* ts C40302 */
|
||||
/** Like burn_track_get_sectors(), but with return type off_t.
|
||||
@since 1.5.8
|
||||
*/
|
||||
off_t burn_track_get_sectors_v2(struct burn_track *);
|
||||
|
||||
/* ts A61101 */
|
||||
/** Tells how many source bytes have been read and how many data bytes have
|
||||
@ -3098,7 +2996,7 @@ int burn_track_get_counters(struct burn_track *t,
|
||||
off_t *read_bytes, off_t *written_bytes);
|
||||
|
||||
|
||||
/** Sets drive read and write speed.
|
||||
/** Sets drive read and write speed
|
||||
Note: "k" is 1000, not 1024.
|
||||
1xCD = 176.4 k/s, 1xDVD = 1385 k/s, 1xBD = 4496 k/s.
|
||||
Fractional speeds should be rounded up. Like 4xCD = 706.
|
||||
@ -3109,63 +3007,6 @@ int burn_track_get_counters(struct burn_track *t,
|
||||
void burn_drive_set_speed(struct burn_drive *d, int read, int write);
|
||||
|
||||
|
||||
/* ts C00822 */
|
||||
/** Sets drive read and write speed using the "Exact" bit of SCSI command
|
||||
SET STREAMING. This command will be used even if a CD medium is present.
|
||||
MMC specifies that with the Exact bit the desired speed settings shall
|
||||
either be obeyed by the drive exactly, or that the drive shall indicate
|
||||
failure and not accept the settings.
|
||||
But many drives reply no error and nevertheless adjust their read speed
|
||||
only coarsly or ignore the setting after a few MB of fast read attempts.
|
||||
|
||||
The call parameters have the same meaning as with burn_drive_set_speed().
|
||||
@param d The drive to set speed for. It must be a role 1 drive.
|
||||
@param read Read speed in k/s (0 is max, -1 is min).
|
||||
@param write Write speed in k/s (0 is max, -1 is min).
|
||||
@return 1=success , 0=failure
|
||||
@since 1.5.4
|
||||
*/
|
||||
int burn_drive_set_speed_exact(struct burn_drive *d, int read, int write);
|
||||
|
||||
|
||||
/* ts C00822 */
|
||||
/** Waits until the time has elapsed since the given previous time to transmit
|
||||
the given byte count with the given speed in KB/second (KB = 1000 bytes).
|
||||
This call may be used between random access read operations like
|
||||
burn_read_data() in order to force a slower speed than the drive is
|
||||
willing to use if it gets read requests as fast as it delivers data.
|
||||
|
||||
The parameter us_corr carries microseconds of time deviations from one
|
||||
call to the next one. Such deviations may happen because of small
|
||||
inexactnesses of the sleeper function and because of temporary delays
|
||||
in the data supply so that sleeping for a negative time span would have
|
||||
been necessary. The next call will reduce or enlarge its own sleeping
|
||||
period by this value.
|
||||
|
||||
@param kb_per_second the desired speed in 1000 bytes per second.
|
||||
Supplied by the caller.
|
||||
@max_corr the maximum backlog in microseconds which shall
|
||||
be compensated by the next call. Supplied by the
|
||||
caller. Not more than 1 billion = 1000 seconds.
|
||||
@param prev_time time keeper updated by burn_nominal_slowdown().
|
||||
The caller provides the memory and elsewise should
|
||||
carry it unchanged from call to call.
|
||||
@param us_corr updated by burn_nominal_slowdown(). See above.
|
||||
The caller provides the memory and elsewise should
|
||||
carry it unchanged from call to call.
|
||||
@param b_since_prev byte count since the previous call. This number
|
||||
has to be counted and supplied by the caller.
|
||||
@param flag Bitfield for control purposes:
|
||||
bit0= initialize *prev_time and *us_corr,
|
||||
ignore other parameters, do not wait
|
||||
@return 2=no wait because no usable kb_per_second , 1=success , 0=failure
|
||||
@since 1.5.4
|
||||
*/
|
||||
int burn_nominal_slowdown(int kb_per_second, int max_corr,
|
||||
struct timeval *prev_time,
|
||||
int *us_corr, off_t b_since_prev, int flag);
|
||||
|
||||
|
||||
/* ts A70711 */
|
||||
/** Controls the behavior with writing when the drive buffer is suspected to
|
||||
be full. To check and wait for enough free buffer space before writing
|
||||
@ -3436,13 +3277,9 @@ void burn_write_opts_set_fillup(struct burn_write_opts *opts,
|
||||
|
||||
|
||||
/* ts A70303 */
|
||||
/** Lets libburn ignore the failure of some conformance checks:
|
||||
/** Eventually makes libburn ignore the failure of some conformance checks:
|
||||
- the check whether CD write+block type is supported by the drive
|
||||
- the check whether the media profile supports simulated burning
|
||||
- @since 1.5.6
|
||||
The check whether a write operation exceeds the size of the medium
|
||||
as announced by the drive. This is known as "overburn" and may work
|
||||
for a few thousand additional blocks on CD media with write type SAO.
|
||||
@param opts The write opts to change
|
||||
@param use_force 1=ignore above checks, 0=refuse work on failed check
|
||||
@since 0.3.4
|
||||
@ -3492,27 +3329,12 @@ void burn_write_opts_set_dvd_obs(struct burn_write_opts *opts, int obs);
|
||||
void burn_write_opts_set_obs_pad(struct burn_write_opts *opts, int pad);
|
||||
|
||||
|
||||
/* ts C10909 */
|
||||
/** Exempts BD-R media from the elsewise unavoidable automatic padding of the
|
||||
last write chunk to its full size.
|
||||
Even if this exempt is granted it gets into effect only if stream recording
|
||||
is disabled and burn_write_opts_set_obs_pad() is set to 0.
|
||||
@param opts The write opts to change
|
||||
@param value 1= possibly exempt BD-R from end chunk padding.
|
||||
0= always act on BD-R as if
|
||||
burn_write_opts_set_obs_pad(opts, 1) is in effect.
|
||||
@since 1.5.6
|
||||
*/
|
||||
void burn_write_opts_set_bdr_obs_exempt(struct burn_write_opts *opts,
|
||||
int value);
|
||||
|
||||
|
||||
/* ts A91115 */
|
||||
/** Sets the rhythm by which stdio pseudo drives force their output data to
|
||||
be consumed by the receiving storage device. This forcing keeps the memory
|
||||
from being clogged with lots of pending data for slow devices.
|
||||
@param opts The write opts to change
|
||||
@param rhythm Number of 2KB output blocks after which fsync(2) is
|
||||
@param rythm Number of 2KB output blocks after which fsync(2) is
|
||||
performed.
|
||||
-1 means no fsync()
|
||||
0 means default
|
||||
@ -3521,7 +3343,7 @@ void burn_write_opts_set_bdr_obs_exempt(struct burn_write_opts *opts,
|
||||
Default is currently 8192 = 16 MB.
|
||||
@since 0.7.4
|
||||
*/
|
||||
void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rhythm);
|
||||
void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rythm);
|
||||
|
||||
|
||||
/** Sets whether to read in raw mode or not
|
||||
@ -3607,55 +3429,6 @@ int burn_drive_get_all_profiles(struct burn_drive *d, int *num_profiles,
|
||||
int burn_obtain_profile_name(int profile_code, char name[80]);
|
||||
|
||||
|
||||
/* ts B90414 */
|
||||
/** Obtains the list of SCSI Feature Codes from feature descriptors which
|
||||
were obtained from the drive when it was most recently acquired or
|
||||
re-assessed.
|
||||
@param d Drive to query
|
||||
@param count Returns the number of allocated elements in feature_codes
|
||||
@param feature_codes Returns the allocated array of feature codes.
|
||||
If returned *feature_codes is not NULL, dispose it
|
||||
by free() when it is no longer needed.
|
||||
@since 1.5.2
|
||||
*/
|
||||
void burn_drive_get_feature_codes(struct burn_drive *d,
|
||||
int *count, unsigned int **feature_codes);
|
||||
|
||||
/* ts B90414 */
|
||||
/** Obtains the fields and data of a particular feature which were obtained
|
||||
from the drive when it was last acquired or re-assessed. See MMC specs
|
||||
for full detail.
|
||||
@param d Drive to query
|
||||
@param feature_code A number as learned by burn_drive_get_feature_codes()
|
||||
@param flags Returns byte 2 of the feature descriptor:
|
||||
bit0= Current
|
||||
bit1= Persistent
|
||||
bit2-5= Version
|
||||
@param additional_length Returns byte 3 of descriptor.
|
||||
This is the size of feature_data.
|
||||
@param feature_data Returns further bytes of descriptor.
|
||||
If returned *feature_data is not NULL, dispose it
|
||||
by free() when it is no longer needed.
|
||||
@param feature_text Returns text representation of the feature descriptor:
|
||||
Code +/- : Name : Version,P/N : Hex bytes : Parsed info
|
||||
Current features are marked by "+", others by "-".
|
||||
Persistent features are marked by "P", others by "N".
|
||||
feature_text may be submitted as NULL. In this case
|
||||
no text is generated and returned.
|
||||
If returned *feature_text is not NULL, dispose it
|
||||
by free() when it is no longer needed.
|
||||
@return 0 feature descriptor is not present
|
||||
-1 out of memory
|
||||
>0 success
|
||||
@since 1.5.2
|
||||
*/
|
||||
int burn_drive_get_feature(struct burn_drive *d, unsigned int feature_code,
|
||||
unsigned char *flags,
|
||||
unsigned char *additional_length,
|
||||
unsigned char **feature_data,
|
||||
char **feature_text);
|
||||
|
||||
|
||||
/** Gets the maximum write speed for a drive and eventually loaded media.
|
||||
The return value might change by the media type of already loaded media,
|
||||
again by call burn_drive_grab() and again by call burn_disc_read_atip().
|
||||
@ -3806,12 +3579,12 @@ struct burn_multi_caps {
|
||||
/** Profile number which was current when the reply was generated */
|
||||
int current_profile;
|
||||
|
||||
/** Whether the current profile indicates CD media. 1=yes, 0=no */
|
||||
/** Wether the current profile indicates CD media. 1=yes, 0=no */
|
||||
int current_is_cd_profile;
|
||||
|
||||
/* ts A70528 */
|
||||
/* @since 0.3.8 */
|
||||
/** Whether the current profile is able to perform simulated write */
|
||||
/** Wether the current profile is able to perform simulated write */
|
||||
int might_simulate;
|
||||
};
|
||||
|
||||
@ -3878,19 +3651,8 @@ struct burn_session **burn_disc_get_sessions(struct burn_disc *d,
|
||||
int burn_disc_get_incomplete_sessions(struct burn_disc *d);
|
||||
|
||||
|
||||
/** Tells how many sectors a disc will have, or already has.
|
||||
This is the sum of all burn_session_get_sectors() results of the disc.
|
||||
The result is NOT RELIABLE with tracks of undefined length
|
||||
*/
|
||||
int burn_disc_get_sectors(struct burn_disc *d);
|
||||
|
||||
/* ts C40302 */
|
||||
/** Like burn_disc_get_sectors(), but with return type off_t.
|
||||
@since 1.5.8
|
||||
*/
|
||||
off_t burn_disc_get_sectors_v2(struct burn_disc *d);
|
||||
|
||||
|
||||
/** Gets an array of all the tracks for a session
|
||||
THIS IS NO LONGER VALID AFTER YOU ADD OR REMOVE A TRACK
|
||||
@param s session to get track array for
|
||||
@ -3900,19 +3662,8 @@ off_t burn_disc_get_sectors_v2(struct burn_disc *d);
|
||||
struct burn_track **burn_session_get_tracks(struct burn_session *s,
|
||||
int *num);
|
||||
|
||||
/** Tells how many sectors a session will have, or already has on disc.
|
||||
This is the sum of all burn_track_get_sectors() results of the session.
|
||||
The result is NOT RELIABLE with tracks of undefined length
|
||||
*/
|
||||
int burn_session_get_sectors(struct burn_session *s);
|
||||
|
||||
/* ts C40302 */
|
||||
/** Like burn_session_get_sectors(), but with return type off_t.
|
||||
@since 1.5.8
|
||||
*/
|
||||
off_t burn_session_get_sectors_v2(struct burn_session *s);
|
||||
|
||||
|
||||
/** Gets the mode of a track
|
||||
@param track the track to query
|
||||
@return the track's mode
|
||||
@ -3954,8 +3705,8 @@ void burn_version(int *major, int *minor, int *micro);
|
||||
|
||||
*/
|
||||
#define burn_header_version_major 1
|
||||
#define burn_header_version_minor 5
|
||||
#define burn_header_version_micro 7
|
||||
#define burn_header_version_minor 4
|
||||
#define burn_header_version_micro 8
|
||||
/** Note:
|
||||
Above version numbers are also recorded in configure.ac because libtool
|
||||
wants them as parameters at build time.
|
||||
@ -3965,7 +3716,7 @@ void burn_version(int *major, int *minor, int *micro);
|
||||
/** Usage discussion:
|
||||
|
||||
Some developers of the libburnia project have differing
|
||||
opinions how to ensure the compatibility of libraries
|
||||
opinions how to ensure the compatibility of libaries
|
||||
and applications.
|
||||
|
||||
It is about whether to use at compile time and at runtime
|
||||
@ -4215,7 +3966,7 @@ int burn_is_aborting(int flag);
|
||||
/** Write data in random access mode.
|
||||
The drive must be grabbed successfully before calling this function which
|
||||
circumvents usual libburn session processing and rather writes data without
|
||||
preparations or finalizing. This will work only with overwritable media
|
||||
preparations or finalizing. This will work only with overwriteable media
|
||||
which are also suitable for burn_write_opts_set_start_byte(). The same
|
||||
address alignment restrictions as with this function apply. I.e. for DVD
|
||||
it is best to align to 32 KiB blocks (= 16 LBA units). The amount of data
|
||||
@ -4251,13 +4002,10 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
|
||||
|
||||
/* ts A81215 */
|
||||
/** Inquire the maximum amount of readable data.
|
||||
On DVD and BD it is supposed that all LBAs in the range from 0 to
|
||||
capacity - 1 can be read via burn_read_data() although some of them may
|
||||
never have been recorded. With multi-session CD there have to be
|
||||
expected unreadable TAO Run-out blocks.
|
||||
If tracks are recognizable then it is better to only read LBAs which
|
||||
are part of some track and on CD to be cautious about the last two blocks
|
||||
of each track which might be TAO Run-out blocks.
|
||||
It is supposed that all LBAs in the range from 0 to capacity - 1
|
||||
can be read via burn_read_data() although some of them may never have been
|
||||
recorded. If tracks are recognizable then it is better to only read
|
||||
LBAs which are part of some track.
|
||||
If the drive is actually a large file or block device, then the capacity
|
||||
is curbed to a maximum of 0x7ffffff0 blocks = 4 TB - 32 KB.
|
||||
@param d The drive from which to read
|
||||
@ -4268,12 +4016,6 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
|
||||
*/
|
||||
int burn_get_read_capacity(struct burn_drive *d, int *capacity, int flag);
|
||||
|
||||
/* ts C40303 */
|
||||
/** Like burn_get_read_capacity(), but with uncurbed off_t result.
|
||||
@since 1.5.8
|
||||
*/
|
||||
int burn_get_read_capacity_v2(struct burn_drive *d, off_t *capacity, int flag);
|
||||
|
||||
|
||||
/* ts A70812 */
|
||||
/** Read data in random access mode.
|
||||
@ -4504,7 +4246,7 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2, int drive_role2);
|
||||
struct libdax_audioxtr;
|
||||
|
||||
|
||||
/** Open an audio file, check whether suitable, create extractor object.
|
||||
/** Open an audio file, check wether suitable, create extractor object.
|
||||
@param xtr Opaque handle to extractor. Gets attached extractor object.
|
||||
@param path Address of the audio file to extract. "-" is stdin (but might
|
||||
be not suitable for all futurely supported formats).
|
||||
@ -4602,7 +4344,7 @@ BURN_END_DECLS
|
||||
/* The following experiments may be interesting in future:
|
||||
*/
|
||||
|
||||
/* Perform OPC explicitly.
|
||||
/* Perform OPC explicitely.
|
||||
# define Libburn_pioneer_dvr_216d_with_opC 1
|
||||
*/
|
||||
|
||||
|
||||
@ -54,8 +54,6 @@ burn_drive_get_bd_r_pow;
|
||||
burn_drive_get_best_speed;
|
||||
burn_drive_get_disc;
|
||||
burn_drive_get_drive_role;
|
||||
burn_drive_get_feature;
|
||||
burn_drive_get_feature_codes;
|
||||
burn_drive_get_immed;
|
||||
burn_drive_get_media_sno;
|
||||
burn_drive_get_min_write_speed;
|
||||
@ -80,7 +78,6 @@ burn_drive_scan_and_grab;
|
||||
burn_drive_set_buffer_waiting;
|
||||
burn_drive_set_immed;
|
||||
burn_drive_set_speed;
|
||||
burn_drive_set_speed_exact;
|
||||
burn_drive_set_stream_recording;
|
||||
burn_drive_snooze;
|
||||
burn_drive_was_feat21_failure;
|
||||
@ -108,7 +105,6 @@ burn_msf_to_sectors;
|
||||
burn_msgs_obtain;
|
||||
burn_msgs_set_severities;
|
||||
burn_msgs_submit;
|
||||
burn_nominal_slowdown;
|
||||
burn_obtain_profile_name;
|
||||
burn_offst_source_new;
|
||||
burn_os_alloc_buffer;
|
||||
@ -186,7 +182,6 @@ burn_write_opts_auto_write_type;
|
||||
burn_write_opts_free;
|
||||
burn_write_opts_get_drive;
|
||||
burn_write_opts_new;
|
||||
burn_write_opts_set_bdr_obs_exempt;
|
||||
burn_write_opts_set_dvd_obs;
|
||||
burn_write_opts_set_fail21h_sev;
|
||||
burn_write_opts_set_fillup;
|
||||
@ -213,14 +208,3 @@ libdax_audioxtr_new;
|
||||
libdax_audioxtr_read;
|
||||
local: *;
|
||||
};
|
||||
|
||||
LIBBURN4_1.5.8 {
|
||||
burn_disc_get_sectors_v2;
|
||||
burn_disc_track_lba_nwa_v2;
|
||||
burn_drive_get_status_v2;
|
||||
burn_drive_release_v2;
|
||||
burn_get_read_capacity_v2;
|
||||
burn_session_get_sectors_v2;
|
||||
burn_track_get_sectors_v2;
|
||||
} LIBBURN4;
|
||||
|
||||
|
||||
@ -55,7 +55,6 @@ int libdax_audioxtr_new(struct libdax_audioxtr **xtr, char *path, int flag)
|
||||
o->bits_per_sample= 0;
|
||||
o->msb_first= 0;
|
||||
|
||||
o->wav_data_location= 44;
|
||||
o->wav_subchunk2_size= 0;
|
||||
|
||||
o->au_data_location= 0;
|
||||
@ -122,124 +121,48 @@ static int libdax_audioxtr_open(struct libdax_audioxtr *o, int flag)
|
||||
return(1);
|
||||
}
|
||||
|
||||
/* @param flag: bit0= sequential file, skip by reading data
|
||||
*/
|
||||
static int libdax_audioxtr_skip(struct libdax_audioxtr *o,
|
||||
off_t *old_pos,
|
||||
off_t pos, int flag)
|
||||
{
|
||||
int ret;
|
||||
size_t to_read;
|
||||
static char buf[256]; /* Thread safe because the content does not matter */
|
||||
|
||||
if((flag & 1) || o->fd == 0) { /* stdin */
|
||||
while(pos - *old_pos > 0) {
|
||||
to_read= pos - *old_pos;
|
||||
if(to_read > sizeof(buf))
|
||||
to_read= sizeof(buf);
|
||||
ret= read(o->fd, buf, to_read);
|
||||
if(ret < (int) to_read)
|
||||
return(0);
|
||||
*old_pos+= to_read;
|
||||
}
|
||||
} else {
|
||||
ret= lseek(o->fd, pos, SEEK_SET);
|
||||
if(ret == -1)
|
||||
return(0);
|
||||
*old_pos= pos;
|
||||
}
|
||||
return(1);
|
||||
}
|
||||
|
||||
static int libdax_audioxtr_identify_wav(struct libdax_audioxtr *o, int flag)
|
||||
{
|
||||
int ret, fmt_seen= 0, data_seen= 0;
|
||||
off_t pos= 0, old_pos= 0, riff_end= 0;
|
||||
char buf[16];
|
||||
unsigned char *ubuf;
|
||||
int ret;
|
||||
char buf[45];
|
||||
|
||||
/* check whether this is a MS WAVE file .wav */
|
||||
/* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/
|
||||
https://en.wikipedia.org/wiki/WAV
|
||||
see summary in: doc/waveformat.txt
|
||||
*/
|
||||
ubuf= (unsigned char *) buf;
|
||||
/* check wether this is a MS WAVE file .wav */
|
||||
/* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/ */
|
||||
|
||||
/* Look for ChunkID "RIFF" , tolerate other known chunks */
|
||||
while(1) {
|
||||
ret= libdax_audioxtr_skip(o, &old_pos, pos, 0);
|
||||
if(ret <= 0)
|
||||
return(0);
|
||||
ret= read(o->fd, buf, 8);
|
||||
if(ret < 8)
|
||||
return(0);
|
||||
old_pos+= 8;
|
||||
pos= old_pos + libdax_audioxtr_to_int(o, ubuf + 4, 4, 0);
|
||||
if(pos > 0xffffffff || pos - old_pos < 4) /* Too large or no Format word */
|
||||
return(0);
|
||||
if(strncmp(buf, "RIFF", 4) == 0)
|
||||
break;
|
||||
/* Wikipedia mentions these known ChunkId values */
|
||||
if(strncmp(buf, "INFO", 4) == 0 ||
|
||||
strncmp(buf, "CSET", 4) == 0 ||
|
||||
strncmp(buf, "JUNK", 4) == 0 ||
|
||||
strncmp(buf, "PAD ", 4) == 0)
|
||||
continue;
|
||||
if(o->fd!=0) {
|
||||
ret= lseek(o->fd,0,SEEK_SET);
|
||||
if(ret==-1)
|
||||
return(0);
|
||||
}
|
||||
ret= read(o->fd, buf, 44);
|
||||
if(ret<44)
|
||||
return(0);
|
||||
buf[44]= 0; /* as stopper for any string operations */
|
||||
|
||||
/* Read RIFF Format header */
|
||||
ret= read(o->fd, buf, 4);
|
||||
if(ret < 4)
|
||||
if(strncmp(buf,"RIFF",4)!=0) /* ChunkID */
|
||||
return(0);
|
||||
old_pos+= 4;
|
||||
if(strncmp(buf, "WAVE", 4) != 0) /* Format */
|
||||
if(strncmp(buf+8,"WAVE",4)!=0) /* Format */
|
||||
return(0);
|
||||
if(strncmp(buf+12,"fmt ",4)!=0) /* Subchunk1ID */
|
||||
return(0);
|
||||
if(buf[16]!=16 || buf[17]!=0 || buf[18]!=0 || buf[19]!=0) /* Subchunk1Size */
|
||||
return(0);
|
||||
if(buf[20]!=1 || buf[21]!=0) /* AudioFormat must be 1 (Linear quantization) */
|
||||
return(0);
|
||||
riff_end= pos;
|
||||
|
||||
/* Look for SubchunkID "fmt " and "data" */
|
||||
pos= old_pos;
|
||||
while(old_pos < riff_end) {
|
||||
ret= libdax_audioxtr_skip(o, &old_pos, pos, 0);
|
||||
if(ret <= 0)
|
||||
return(0);
|
||||
ret= read(o->fd, buf, 8);
|
||||
if(ret < 8)
|
||||
return(0);
|
||||
old_pos= pos + 8;
|
||||
pos= old_pos + libdax_audioxtr_to_int(o, ubuf + 4, 4, 0); /* SubchunkSize */
|
||||
|
||||
if(strncmp(buf,"fmt ", 4) == 0) {
|
||||
if(pos - old_pos < 16)
|
||||
return(0);
|
||||
ret= read(o->fd, buf, 16);
|
||||
if(ret < 16)
|
||||
return(0);
|
||||
old_pos+= 16;
|
||||
if(buf[0]!=1 || buf[1]!=0) /* AudioFormat (1 = Linear quantization) */
|
||||
return(0);
|
||||
strcpy(o->fmt,".wav");
|
||||
o->msb_first= 0;
|
||||
o->num_channels= libdax_audioxtr_to_int(o, ubuf + 2 , 2, 0);
|
||||
o->sample_rate= libdax_audioxtr_to_int(o, ubuf + 4, 4, 0);
|
||||
o->bits_per_sample= libdax_audioxtr_to_int(o, ubuf + 14, 2, 0);
|
||||
o->num_channels= libdax_audioxtr_to_int(o,(unsigned char *) buf+22,2,0);
|
||||
o->sample_rate= libdax_audioxtr_to_int(o,(unsigned char *) buf+24,4,0);
|
||||
o->bits_per_sample= libdax_audioxtr_to_int(o,(unsigned char *)buf+34,2,0);
|
||||
sprintf(o->fmt_info,
|
||||
".wav , num_channels=%d , sample_rate=%d , bits_per_sample=%d",
|
||||
o->num_channels,o->sample_rate,o->bits_per_sample);
|
||||
fmt_seen= 1;
|
||||
|
||||
} else if(strncmp(buf,"data", 4) == 0) {
|
||||
o->wav_data_location= old_pos;
|
||||
o->wav_subchunk2_size= pos - old_pos;
|
||||
o->wav_subchunk2_size= libdax_audioxtr_to_int(o,(unsigned char *)buf+40,4,0);
|
||||
o->data_size= o->wav_subchunk2_size;
|
||||
data_seen= 1;
|
||||
}
|
||||
if(fmt_seen && data_seen) {
|
||||
strcpy(o->fmt,".wav");
|
||||
return(1);
|
||||
}
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
static int libdax_audioxtr_identify_au(struct libdax_audioxtr *o, int flag)
|
||||
@ -247,7 +170,7 @@ static int libdax_audioxtr_identify_au(struct libdax_audioxtr *o, int flag)
|
||||
int ret,encoding;
|
||||
char buf[24];
|
||||
|
||||
/* Check whether this is a Sun Audio, .au file */
|
||||
/* Check wether this is a Sun Audio, .au file */
|
||||
/* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/ */
|
||||
|
||||
if(o->fd!=0) {
|
||||
@ -333,7 +256,7 @@ static int libdax_audioxtr_init_reading(struct libdax_audioxtr *o, int flag)
|
||||
|
||||
o->extract_count= 0;
|
||||
if(strcmp(o->fmt,".wav")==0)
|
||||
ret= lseek(o->fd, o->wav_data_location, SEEK_SET);
|
||||
ret= lseek(o->fd,44,SEEK_SET);
|
||||
else if(strcmp(o->fmt,".au")==0)
|
||||
ret= lseek(o->fd,o->au_data_location,SEEK_SET);
|
||||
else
|
||||
|
||||
@ -38,7 +38,7 @@ struct libdax_audioxtr;
|
||||
/* Calls from applications (to be forwarded by libdax/libburn) */
|
||||
|
||||
|
||||
/** Open an audio file, check whether suitable, create extractor object.
|
||||
/** Open an audio file, check wether suitable, create extractor object.
|
||||
@param xtr Opaque handle to extractor. Gets attached extractor object.
|
||||
@param path Address of the audio file to extract. "-" is stdin (but might
|
||||
be not suitable for all futurely supported formats).
|
||||
@ -176,10 +176,7 @@ struct libdax_audioxtr {
|
||||
/* Format dependent parameters */
|
||||
|
||||
/* MS WAVE Format */
|
||||
/* see description in: doc/waveformat.txt */
|
||||
|
||||
/* Offset to "data" subchunk */
|
||||
unsigned int wav_data_location;
|
||||
/* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/ */
|
||||
|
||||
/* == NumSamples * NumChannels * BitsPerSample/8
|
||||
This is the number of bytes in the data. */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
|
||||
/* libdax_msgs
|
||||
Message handling facility of libburn and libisofs.
|
||||
Copyright (C) 2006-2021 Thomas Schmitt <scdbackup@gmx.net>,
|
||||
Copyright (C) 2006-2016 Thomas Schmitt <scdbackup@gmx.net>,
|
||||
provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -425,7 +425,7 @@ Range "elmom" : 0x00010000 to 0x0001ffff
|
||||
------------------------------------------------------------------------------
|
||||
Range "scdbackup" : 0x00020000 to 0x0002ffff
|
||||
|
||||
Accessing and defending drives:
|
||||
Acessing and defending drives:
|
||||
|
||||
0x00020001 (SORRY,LOW) = Cannot open busy device
|
||||
0x00020002 (SORRY,HIGH) = Encountered error when closing drive
|
||||
@ -555,7 +555,7 @@ Range "scdbackup" : 0x00020000 to 0x0002ffff
|
||||
0x0002016e (DEBUG,HIGH) = MODE SENSE page 2A too short
|
||||
0x0002016f (DEBUG,HIGH) = Unable to grab scanned drive
|
||||
0x00020170 (NOTE,HIGH) = Closing open session before writing new one
|
||||
0x00020171 (NOTE,HIGH) = Closing BD-R with accidentally open session
|
||||
0x00020171 (NOTE,HIGH) = Closing BD-R with accidentaly open session
|
||||
0x00020172 (SORRY,HIGH) = Read start address larger than number of readable blocks
|
||||
0x00020173 (FAILURE,HIGH) = Drive tells NWA smaller than last written address
|
||||
0x00020174 (SORRY,HIGH) = Fifo alignment does not allow desired read size
|
||||
@ -580,7 +580,7 @@ Range "scdbackup" : 0x00020000 to 0x0002ffff
|
||||
0x00020187 (NOTE,HIGH) = Track not marked as damaged. No action taken.
|
||||
0x00020188 (FAILURE,HIGH) = Cannot close damaged track on given media type
|
||||
0x00020189 (FATAL,HIGH) = Drive is already grabbed by libburn
|
||||
0x0002018a (SORRY,HIGH) = Timeout exceeded. Retry canceled.
|
||||
0x0002018a (SORRY,HIGH) = Timeout exceeded. Retry cancled.
|
||||
0x0002018b (FAILURE,HIGH) = Too many CD-TEXT packs
|
||||
0x0002018c (FAILURE,HIGH) = CD-TEXT pack type out of range
|
||||
0x0002018d (FAILURE,HIGH) = CD-TEXT block number out of range
|
||||
@ -613,10 +613,6 @@ Range "scdbackup" : 0x00020000 to 0x0002ffff
|
||||
0x000201a8 (FAILURE,HIGH) = SCSI command yielded driver problem
|
||||
0x000201a9 (FAILURE,HIGH) = Implausible length from GET CONFIGURATION
|
||||
0x000201aa (FAILURE,HIGH) = No CD-TEXT packs in file
|
||||
0x000201ab (WARN,HIGH) = Leaving burn_source_fifo object undisposed
|
||||
0x000201ac (NOTE,HIGH) = Drive currently does not offer Stream Recording
|
||||
0x000201ad (NOTE,HIGH) = WRITE commands have been repeated
|
||||
0x000201ae (FAILURE,HIGH) = Track size exceeds 4 TiB - 32 KiB
|
||||
|
||||
|
||||
libdax_audioxtr:
|
||||
@ -647,11 +643,11 @@ Range "vreixo" : 0x00030000 to 0x0003ffff
|
||||
0x0003ffbc (FAILURE,HIGH) = Image already bootable
|
||||
0x0003ffbb (FAILURE,HIGH) = Trying to use an invalid file as boot image
|
||||
0x0003ff80 (FAILURE,HIGH) = Error on file operation
|
||||
0x0003ff7f (FAILURE,HIGH) = Trying to open an already opened file
|
||||
0x0003ff7f (FAILURE,HIGH) = Trying to open an already openned file
|
||||
0x0003ff7e (FAILURE,HIGH) = Access to file is not allowed
|
||||
0x0003ff7d (FAILURE,HIGH) = Incorrect path to file
|
||||
0x0003ff7c (FAILURE,HIGH) = The file does not exist in the filesystem
|
||||
0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not opened
|
||||
0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not openned
|
||||
0x0003ff7a (FAILURE,HIGH) = Directory used where no dir is expected
|
||||
0x0003ff79 (FAILURE,HIGH) = File read error
|
||||
0x0003ff78 (FAILURE,HIGH) = Not dir used where a dir is expected
|
||||
@ -702,7 +698,7 @@ X 0x00030203 (HINT,MEDIUM) = Unsupported El-Torito feature
|
||||
X 0x00030204 (SORRY,HIGH) = Invalid file to be an El-Torito image
|
||||
X 0x00030205 (WARNING,MEDIUM)= Cannot properly patch isolinux image
|
||||
X 0x00030206 (WARNING,MEDIUM)= Copying El-Torito from a previous image without
|
||||
X enough info about it
|
||||
X enought info about it
|
||||
X 0x00030301 (NOTE,MEDIUM) = Unsupported file type for Joliet tree
|
||||
|
||||
|
||||
|
||||
720
libburn/mmc.c
720
libburn/mmc.c
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -27,7 +27,7 @@ void mmc_close_disc(struct burn_write_opts *o);
|
||||
|
||||
void mmc_close(struct burn_drive *, int session, int track);
|
||||
void mmc_get_event(struct burn_drive *);
|
||||
int mmc_write(struct burn_drive *, off_t start, struct buffer *buf);
|
||||
int mmc_write(struct burn_drive *, int start, struct buffer *buf);
|
||||
void mmc_write_12(struct burn_drive *d, int start, struct buffer *buf);
|
||||
void mmc_sync_cache(struct burn_drive *);
|
||||
void mmc_load(struct burn_drive *);
|
||||
@ -78,8 +78,6 @@ int mmc_compose_mode_page_5(struct burn_drive *d,
|
||||
|
||||
/* ts A70201 */
|
||||
int mmc_four_char_to_int(unsigned char *data);
|
||||
/* ts C40226 */
|
||||
unsigned int mmc_four_char_to_uint(unsigned char *data);
|
||||
|
||||
/* ts A70201 :
|
||||
Common track info fetcher for mmc_get_nwa() and mmc_fake_toc()
|
||||
@ -132,12 +130,6 @@ int mmc_get_leadin_text(struct burn_drive *d,
|
||||
/* ts B40107 */
|
||||
int mmc_get_performance(struct burn_drive *d, int descr_type, int flag);
|
||||
|
||||
/* ts B90414 */
|
||||
int burn_make_feature_text(struct burn_drive *d, unsigned int feature_code,
|
||||
unsigned char flags,
|
||||
unsigned char additional_length,
|
||||
unsigned char *feature_data,
|
||||
char **text, int flag);
|
||||
|
||||
#ifdef Libburn_develop_quality_scaN
|
||||
/* B21108 ts */
|
||||
|
||||
@ -55,7 +55,6 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
|
||||
opts->obs_pad = 0;
|
||||
#endif
|
||||
|
||||
opts->bdr_obs_exempt = 0;
|
||||
opts->start_byte = -1;
|
||||
opts->fill_up_media = 0;
|
||||
opts->force_is_set = 0;
|
||||
@ -536,25 +535,17 @@ void burn_write_opts_set_obs_pad(struct burn_write_opts *opts, int pad)
|
||||
}
|
||||
|
||||
|
||||
/* ts C10909: API */
|
||||
void burn_write_opts_set_bdr_obs_exempt(struct burn_write_opts *opts,
|
||||
int value)
|
||||
{
|
||||
opts->bdr_obs_exempt = !!value;
|
||||
}
|
||||
|
||||
|
||||
/* ts A91115: API */
|
||||
void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rhythm)
|
||||
void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rythm)
|
||||
{
|
||||
if (rhythm == -1)
|
||||
if (rythm == -1)
|
||||
opts->stdio_fsync_size = -1; /* never */
|
||||
else if (rhythm == 0)
|
||||
else if (rythm == 0)
|
||||
opts->stdio_fsync_size = Libburn_stdio_fsync_limiT;
|
||||
else if (rhythm == 1)
|
||||
else if (rythm == 1)
|
||||
opts->stdio_fsync_size = 0; /* only at end of writing */
|
||||
else if (rhythm >= 32)
|
||||
opts->stdio_fsync_size = rhythm;
|
||||
else if (rythm >= 32)
|
||||
opts->stdio_fsync_size = rythm;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -46,17 +46,14 @@ struct burn_write_opts
|
||||
2 indicates burn_write_opts_set_obs_pad(,1)
|
||||
*/
|
||||
|
||||
/* 1= do not apply obs_pad=1 to BD-R if not stream recording. */
|
||||
int bdr_obs_exempt;
|
||||
|
||||
/* ts A61222 : Start address for media which offer a choice */
|
||||
off_t start_byte;
|
||||
|
||||
/* ts A70213 : Whether to fill up the available space on media */
|
||||
/* ts A70213 : Wether to fill up the available space on media */
|
||||
int fill_up_media;
|
||||
|
||||
/* ts A70303 : Whether to override conformance checks:
|
||||
- the check whether CD write+block type is supported by the drive
|
||||
/* ts A70303 : Wether to override conformance checks:
|
||||
- the check wether CD write+block type is supported by the drive
|
||||
*/
|
||||
int force_is_set;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -286,7 +286,7 @@ void burn_packet_process(struct burn_drive *d, unsigned char *data,
|
||||
*//* write(o->datafd, data, 2352); */
|
||||
}
|
||||
|
||||
/* so yeah, when you uncomment these, make them write zeros instead of crap
|
||||
/* so yeah, when you uncomment these, make them write zeros insted of crap
|
||||
static void write_empty_sector(int fd)
|
||||
{
|
||||
static char sec[2352], initialized = 0;
|
||||
@ -492,13 +492,13 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
|
||||
msg, 0, 0);
|
||||
{ret = 0; goto ex;}
|
||||
}
|
||||
if (d->media_read_capacity != 0x7fffffffffffffff &&
|
||||
byte_address >= (d->media_read_capacity + 1) * (off_t) 2048) {
|
||||
if (d->media_read_capacity != 0x7fffffff && byte_address >=
|
||||
((off_t) d->media_read_capacity + (off_t) 1) * (off_t) 2048) {
|
||||
if (!(flag & 2)) {
|
||||
sprintf(msg,
|
||||
"Read start address %.fs larger than number of readable blocks %.f",
|
||||
(double) (byte_address / 2048 + !!(byte_address % 2048)),
|
||||
(double) (d->media_read_capacity + 1));
|
||||
"Read start address %ds larger than number of readable blocks %d",
|
||||
(int) (byte_address / 2048 + !!(byte_address % 2048)),
|
||||
d->media_read_capacity + 1);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x00020172, (flag & 32) ?
|
||||
LIBDAX_MSGS_SEV_DEBUG : LIBDAX_MSGS_SEV_SORRY,
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2021 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -193,9 +193,7 @@ static void get_bytes(struct burn_track *track, int count, unsigned char *data)
|
||||
off_t missing, inp_block_size, track_blocks;
|
||||
|
||||
inp_block_size = burn_sector_length(track->mode);
|
||||
track_blocks = burn_track_get_sectors_2_v2(track, 1);
|
||||
if (track_blocks < 0)
|
||||
track_blocks = 0;
|
||||
track_blocks = burn_track_get_sectors_2(track, 1);
|
||||
missing = track_blocks * inp_block_size - track->sourcecount;
|
||||
sprintf(msg,
|
||||
"Premature end of input encountered. Missing: %.f bytes",
|
||||
@ -925,7 +923,7 @@ void process_q(struct burn_drive *d, unsigned char *q)
|
||||
break;
|
||||
default:
|
||||
|
||||
/* ts A61009 : if reactivated then without Assert */
|
||||
/* ts A61009 : if reactivated then witout Assert */
|
||||
a ssert(0);
|
||||
}
|
||||
}
|
||||
|
||||
@ -144,7 +144,7 @@ int scsi_enumerate_drives(void)
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether libburn has the given drive in use or exclusively reserved.
|
||||
/** Tells wether libburn has the given drive in use or exclusively reserved.
|
||||
If it is "open" then libburn will eventually call sg_release() on it when
|
||||
it is time to give up usage and reservation.
|
||||
*/
|
||||
@ -180,7 +180,7 @@ int sg_release(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates whether
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates wether
|
||||
the command succeeded or shall be retried or finally failed.
|
||||
Returned SCSI errors shall not lead to a return value indicating failure.
|
||||
The callers get notified by c->error. An SCSI failure which leads not to
|
||||
@ -213,7 +213,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether a text is a persistent address as listed by the enumeration
|
||||
/** Tells wether a text is a persistent address as listed by the enumeration
|
||||
functions.
|
||||
*/
|
||||
int sg_is_enumerable_adr(char *adr)
|
||||
|
||||
@ -47,8 +47,8 @@ sg_initialize() performs global initialization of the SCSI transport
|
||||
facilities. Checks for compatibility of supporting
|
||||
software components.
|
||||
|
||||
sg_shutdown() performs global finalizations and releases globally
|
||||
acquired resources.
|
||||
sg_shutdown() performs global finalizations and releases golbally
|
||||
aquired resources.
|
||||
|
||||
sg_give_next_adr() iterates over the set of potentially useful drive
|
||||
address strings.
|
||||
@ -57,10 +57,10 @@ scsi_enumerate_drives() brings all available, not-whitelist-banned, and
|
||||
accessible drives into libburn's list of drives.
|
||||
|
||||
sg_dispose_drive() finalizes adapter specifics of struct burn_drive
|
||||
on destruction. Releases resources which were acquired
|
||||
on destruction. Releases resources which were aquired
|
||||
underneath scsi_enumerate_drives().
|
||||
|
||||
sg_drive_is_open() tells whether libburn has the given drive in use.
|
||||
sg_drive_is_open() tells wether libburn has the given drive in use.
|
||||
|
||||
sg_grab() opens the drive for SCSI commands and ensures
|
||||
undisturbed access.
|
||||
@ -68,7 +68,7 @@ sg_grab() opens the drive for SCSI commands and ensures
|
||||
sg_release() closes a drive opened by sg_grab()
|
||||
|
||||
sg_issue_command() sends a SCSI command to the drive, receives reply,
|
||||
and evaluates whether the command succeeded or shall
|
||||
and evaluates wether the command succeeded or shall
|
||||
be retried or finally failed.
|
||||
|
||||
sg_obtain_scsi_adr() tries to obtain SCSI address parameters.
|
||||
@ -307,7 +307,7 @@ int sg_initialize(char msg[1024], int flag)
|
||||
|
||||
|
||||
/** Performs global finalization of the SCSI transport adapter and eventually
|
||||
needed operating system facilities. Releases globally acquired resources.
|
||||
needed operating system facilities. Releases globally aquired resources.
|
||||
@param flag unused yet, submit 0
|
||||
@return 1 = success, <=0 = failure
|
||||
*/
|
||||
@ -444,7 +444,7 @@ int scsi_enumerate_drives(void)
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether libburn has the given drive in use or exclusively reserved.
|
||||
/** Tells wether libburn has the given drive in use or exclusively reserved.
|
||||
If it is "open" then libburn will eventually call sg_release() on it when
|
||||
it is time to give up usage and reservation.
|
||||
*/
|
||||
@ -485,7 +485,7 @@ int sg_grab(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/** PORTING: Is mainly about the call to sg_close_drive() and whether it
|
||||
/** PORTING: Is mainly about the call to sg_close_drive() and wether it
|
||||
implements the demanded functionality.
|
||||
*/
|
||||
/** Gives up the drive for SCSI commands and releases eventual access locks.
|
||||
@ -500,7 +500,7 @@ int sg_release(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates whether
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates wether
|
||||
the command succeeded or shall be retried or finally failed.
|
||||
Returned SCSI errors shall not lead to a return value indicating failure.
|
||||
The callers get notified by c->error. An SCSI failure which leads not to
|
||||
@ -567,9 +567,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
ccb->csio.dxfer_len = 0;
|
||||
}
|
||||
|
||||
/* ts B90523 : Record effective transfer length request for debugging*/
|
||||
c->dxfer_len = ccb->csio.dxfer_len;
|
||||
|
||||
do {
|
||||
memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
|
||||
err = cam_send_ccb(d->cam, ccb);
|
||||
@ -588,7 +585,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
}
|
||||
/* XXX */
|
||||
memcpy(c->sense, &ccb->csio.sense_data, ccb->csio.sense_len);
|
||||
c->sense_len = ccb->csio.sense_len;
|
||||
if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
|
||||
if (!c->retry) {
|
||||
c->error = 1;
|
||||
@ -607,8 +603,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
} else {
|
||||
done = 1;
|
||||
}
|
||||
if (!done)
|
||||
spc_register_retry(c);
|
||||
} while (!done);
|
||||
cam_freeccb(ccb);
|
||||
return 1;
|
||||
@ -647,7 +641,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether a text is a persistent address as listed by the enumeration
|
||||
/** Tells wether a text is a persistent address as listed by the enumeration
|
||||
functions.
|
||||
*/
|
||||
int sg_is_enumerable_adr(char* adr)
|
||||
|
||||
@ -873,9 +873,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
ccb->csio.dxfer_len = 0;
|
||||
}
|
||||
|
||||
/* ts B90523 : Record effective transfer length request for debugging*/
|
||||
c->dxfer_len = ccb->csio.dxfer_len;
|
||||
|
||||
start_time = time(NULL);
|
||||
for (i = 0; !done; i++) {
|
||||
|
||||
@ -988,8 +985,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
timeout_ms, i, !!ignore_error);
|
||||
if (d->cancel)
|
||||
done = 1;
|
||||
if (!done)
|
||||
spc_register_retry(c);
|
||||
} while (!done);
|
||||
ret = 1;
|
||||
ex:;
|
||||
|
||||
@ -44,7 +44,7 @@ sg_initialize() performs global initialization of the SCSI transport
|
||||
facilities. Checks for compatibility of supporting
|
||||
software components.
|
||||
|
||||
sg_shutdown() performs global finalizations and releases globally
|
||||
sg_shutdown() performs global finalizations and releases golbally
|
||||
acquired resources.
|
||||
|
||||
sg_give_next_adr() iterates over the set of potentially useful drive
|
||||
@ -57,7 +57,7 @@ sg_dispose_drive() finalizes adapter specifics of struct burn_drive
|
||||
on destruction. Releases resources which were acquired
|
||||
underneath scsi_enumerate_drives().
|
||||
|
||||
sg_drive_is_open() tells whether libburn has the given drive in use.
|
||||
sg_drive_is_open() tells wether libburn has the given drive in use.
|
||||
|
||||
sg_grab() opens the drive for SCSI commands and ensures
|
||||
undisturbed access.
|
||||
@ -65,7 +65,7 @@ sg_grab() opens the drive for SCSI commands and ensures
|
||||
sg_release() closes a drive opened by sg_grab()
|
||||
|
||||
sg_issue_command() sends a SCSI command to the drive, receives reply,
|
||||
and evaluates whether the command succeeded or shall
|
||||
and evaluates wether the command succeeded or shall
|
||||
be retried or finally failed.
|
||||
|
||||
sg_obtain_scsi_adr() tries to obtain SCSI address parameters.
|
||||
@ -609,7 +609,7 @@ int sg_release(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates whether
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates wether
|
||||
the command succeeded or shall be retried or finally failed.
|
||||
Returned SCSI errors shall not lead to a return value indicating failure.
|
||||
The callers get notified by c->error. An SCSI failure which leads not to
|
||||
@ -665,9 +665,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
e_direction = SCSI_MMC_DATA_NONE;
|
||||
}
|
||||
|
||||
/* ts B90523 : Record effective transfer length request for debugging*/
|
||||
c->dxfer_len = dxfer_len;
|
||||
|
||||
/* retry-loop */
|
||||
start_time = time(NULL);
|
||||
if (c->timeout > 0)
|
||||
@ -731,8 +728,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
start_time, timeout_ms, i, 0);
|
||||
if (d->cancel)
|
||||
done = 1;
|
||||
if (!done)
|
||||
spc_register_retry(c);
|
||||
|
||||
} /* end of retry-loop */
|
||||
|
||||
@ -768,7 +763,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether a text is a persistent address as listed by the enumeration
|
||||
/** Tells wether a text is a persistent address as listed by the enumeration
|
||||
functions.
|
||||
*/
|
||||
int sg_is_enumerable_adr(char* adr)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2020 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -50,7 +50,7 @@ sg_initialize() performs global initialization of the SCSI transport
|
||||
facilities. Checks for compatibility of supporting
|
||||
software components.
|
||||
|
||||
sg_shutdown() performs global finalizations and releases globally
|
||||
sg_shutdown() performs global finalizations and releases golbally
|
||||
acquired resources.
|
||||
|
||||
sg_give_next_adr() iterates over the set of potentially useful drive
|
||||
@ -63,7 +63,7 @@ sg_dispose_drive() finalizes adapter specifics of struct burn_drive
|
||||
on destruction. Releases resources which were acquired
|
||||
underneath scsi_enumerate_drives().
|
||||
|
||||
sg_drive_is_open() tells whether libburn has the given drive in use.
|
||||
sg_drive_is_open() tells wether libburn has the given drive in use.
|
||||
|
||||
sg_grab() opens the drive for SCSI commands and ensures
|
||||
undisturbed access.
|
||||
@ -71,7 +71,7 @@ sg_grab() opens the drive for SCSI commands and ensures
|
||||
sg_release() closes a drive opened by sg_grab()
|
||||
|
||||
sg_issue_command() sends a SCSI command to the drive, receives reply,
|
||||
and evaluates whether the command succeeded or shall
|
||||
and evaluates wether the command succeeded or shall
|
||||
be retried or finally failed.
|
||||
|
||||
sg_obtain_scsi_adr() tries to obtain SCSI address parameters.
|
||||
@ -111,15 +111,6 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
|
||||
|
||||
/** PORTING : ------- OS dependent headers and definitions ------ */
|
||||
|
||||
#ifdef Libburn_read_o_direcT
|
||||
/* ts B91124:
|
||||
DISABLED, because this spoils multi-track burning of cdrskin by a hard to
|
||||
fix bug in cdrskin/cdrfifo.c
|
||||
DO NOT ENABLE before the wait code in that source file is fixed.
|
||||
*/
|
||||
#undef Libburn_read_o_direcT
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef Libburn_read_o_direcT
|
||||
# ifndef _GNU_SOURCE
|
||||
@ -225,7 +216,7 @@ static char linux_ata_device_family[80] = {"/dev/hd%c"};
|
||||
|
||||
/* Set this to 1 in order to get on stderr messages from ata_enumerate()
|
||||
*/
|
||||
static int linux_ata_enumerate_verbose = 0;
|
||||
static int linux_ata_enumerate_verbous = 0;
|
||||
|
||||
|
||||
/** PORTING : ------ libburn portable headers and definitions ----- */
|
||||
@ -296,7 +287,7 @@ int mmc_function_spy(struct burn_drive *d, char * text);
|
||||
/* ------------------------------------------------------------------------ */
|
||||
|
||||
/* ts A70413 */
|
||||
/* This finds out whether the software is running on kernel >= 2.6
|
||||
/* This finds out wether the software is running on kernel >= 2.6
|
||||
*/
|
||||
static void sg_evaluate_kernel(void)
|
||||
{
|
||||
@ -314,7 +305,7 @@ static void sg_evaluate_kernel(void)
|
||||
|
||||
|
||||
/* ts A70314 */
|
||||
/* This installs the device file family if one was chosen explicitly
|
||||
/* This installs the device file family if one was chosen explicitely
|
||||
by burn_preset_device_open()
|
||||
*/
|
||||
static void sg_select_device_family(void)
|
||||
@ -383,16 +374,11 @@ static int sg_exchange_scd_for_sr(char *fname, int flag)
|
||||
/* This is an early stage version of scsi_log_cmd.
|
||||
>>> It will become obsolete when the /tmp file handler is moved into
|
||||
>>> scsi_log_command().
|
||||
@param flag bit0= data direction is FROM_DRIVE
|
||||
*/
|
||||
static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
|
||||
{
|
||||
FILE *fp = fp_in;
|
||||
int ret = 0;
|
||||
int data_dir = NO_TRANSFER;
|
||||
|
||||
if (flag & 1)
|
||||
data_dir = FROM_DRIVE;
|
||||
|
||||
/* >>> ts B11110 : move this into scsi_log_command() */
|
||||
if (fp == NULL && (burn_sg_log_scsi & 1)) {
|
||||
@ -403,13 +389,10 @@ static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
|
||||
}
|
||||
|
||||
if (fp != NULL)
|
||||
ret = scsi_log_command(cmd, cmd_len, data_dir, NULL, 0,
|
||||
ret = scsi_log_command(cmd, cmd_len, NO_TRANSFER, NULL, 0,
|
||||
fp, flag);
|
||||
if (fp_in == NULL && fp != NULL)
|
||||
fclose(fp);
|
||||
if (fp == stderr || !(burn_sg_log_scsi & 2))
|
||||
return ret;
|
||||
ret = scsi_log_command(cmd, cmd_len, data_dir, NULL, 0, stderr, 0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -481,7 +464,7 @@ static int sgio_inquiry_cd_drive(int fd, char *fname)
|
||||
s.dxfer_len = 36;
|
||||
s.usr_ptr = NULL;
|
||||
|
||||
sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 1);
|
||||
sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 0);
|
||||
|
||||
c_start_time = burn_get_time(0);
|
||||
ret = ioctl(fd, SG_IO, &s);
|
||||
@ -667,7 +650,7 @@ ex:;
|
||||
So libburn will by default use open(O_EXCL) first and afterwards
|
||||
as second assertion will use fcntl(F_SETLK). One lock more should not harm.
|
||||
*/
|
||||
static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbose)
|
||||
static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbous)
|
||||
{
|
||||
struct flock lockthing;
|
||||
char msg[81];
|
||||
@ -688,7 +671,7 @@ static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbose)
|
||||
|
||||
ret = fcntl(*fd, F_SETLK, &lockthing);
|
||||
if (ret == -1) {
|
||||
if (verbose) {
|
||||
if (verbous) {
|
||||
sprintf(msg, "Device busy. Failed to fcntl-lock '%s'",
|
||||
fd_name);
|
||||
libdax_msgs_submit(libdax_messenger, -1, 0x00020008,
|
||||
@ -820,88 +803,6 @@ static int sg_release_siblings(int sibling_fds[],
|
||||
}
|
||||
|
||||
|
||||
/* ts C00806 */
|
||||
/** Urges the operating system to re-assess drive and medium state
|
||||
*/
|
||||
static int sg_os_revalidate_disc(struct burn_drive *d)
|
||||
{
|
||||
|
||||
#ifdef Libburn_use_linux_ioctl_simul_changE
|
||||
|
||||
/* <<< only for compiler tests */
|
||||
#ifndef CDROM_SIMUL_CHANGE
|
||||
/* # def ine CDROM_SIMUL_CHANGE 0x5332 */
|
||||
#endif
|
||||
|
||||
#ifdef CDROM_SIMUL_CHANGE
|
||||
|
||||
int fd, ret;
|
||||
long old_blocks, new_blocks;
|
||||
char *msg = NULL;
|
||||
|
||||
BURN_ALLOC_MEM(msg, char, 161);
|
||||
|
||||
ret = ioctl(d->fd, BLKGETSIZE, &old_blocks);
|
||||
if (ret == -1)
|
||||
old_blocks = -1;
|
||||
|
||||
/* Schedule a simulated medium change event.
|
||||
Although the implemented ioctl cannot fail, the kernel might be too
|
||||
old to know it and then throw errors like ENOTTY.
|
||||
*/
|
||||
ret = ioctl(d->fd, CDROM_SIMUL_CHANGE, 0);
|
||||
if (ret == -1) {
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"ioctl(CDROM_SIMUL_CHANGE) failed", errno, 0);
|
||||
ret = 0; goto ex;
|
||||
}
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"ioctl(CDROM_SIMUL_CHANGE) was performed", 0, 0);
|
||||
/* Try to trigger actual device assessment by a open(2) call */
|
||||
fd = open(d->devname, O_RDONLY | O_NDELAY);
|
||||
if (fd == -1) {
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"Failed to open device file after ioctl(CDROM_SIMUL_CHANGE)",
|
||||
errno, 0);
|
||||
ret = 0; goto ex;
|
||||
}
|
||||
close(fd);
|
||||
ret = ioctl(d->fd, BLKGETSIZE, &new_blocks);
|
||||
if (ret == -1) {
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"BLKGETSIZE failed after ioctl(CDROM_SIMUL_CHANGE)",
|
||||
errno, 0);
|
||||
} else if (old_blocks != new_blocks) {
|
||||
sprintf(msg,
|
||||
"BLKGETSIZE indicates size change from %ld to %ld blocks",
|
||||
old_blocks , new_blocks);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
}
|
||||
ex:
|
||||
BURN_FREE_MEM(msg);
|
||||
return ret;
|
||||
|
||||
#else /* CDROM_SIMUL_CHANGE */
|
||||
|
||||
return 0;
|
||||
|
||||
#endif /* ! CDROM_SIMUL_CHANGE */
|
||||
|
||||
#else /* Libburn_use_linux_ioctl_simul_changE */
|
||||
|
||||
return 0;
|
||||
|
||||
#endif /* ! Libburn_use_linux_ioctl_simul_changE */
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* ts A60926 */
|
||||
static int sg_close_drive(struct burn_drive *d)
|
||||
{
|
||||
@ -911,9 +812,6 @@ static int sg_close_drive(struct burn_drive *d)
|
||||
return 0;
|
||||
sg_release_siblings(d->sibling_fds, d->sibling_fnames,
|
||||
&(d->sibling_count));
|
||||
if(d->medium_state_changed > 0)
|
||||
sg_os_revalidate_disc(d);
|
||||
d->medium_state_changed = -1;
|
||||
ret = sg_close_drive_fd(d->devname, d->global_index, &(d->fd), 0);
|
||||
return ret;
|
||||
}
|
||||
@ -1021,7 +919,7 @@ static int is_ata_drive(char *fname, int fd_in)
|
||||
else
|
||||
fd = sg_open_drive_fd(fname, 1);
|
||||
if (fd == -1) {
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr,"open failed, errno=%d '%s'\n",
|
||||
errno, strerror(errno));
|
||||
return 0;
|
||||
@ -1032,7 +930,7 @@ static int is_ata_drive(char *fname, int fd_in)
|
||||
|
||||
/* not atapi */
|
||||
if (!(tm.config & 0x8000) || (tm.config & 0x4000)) {
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr, "not marked as ATAPI\n");
|
||||
if (fd_in < 0)
|
||||
sg_close_drive_fd(fname, -1, &fd, 0);
|
||||
@ -1042,7 +940,7 @@ static int is_ata_drive(char *fname, int fd_in)
|
||||
/* if SG_IO fails on an atapi device, we should stop trying to
|
||||
use hd* devices */
|
||||
if (sgio_test(fd) == -1) {
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr,
|
||||
"FATAL: sgio_test() failed: errno=%d '%s'\n",
|
||||
errno, strerror(errno));
|
||||
@ -1053,7 +951,7 @@ static int is_ata_drive(char *fname, int fd_in)
|
||||
if (fd_in >= 0)
|
||||
return 1;
|
||||
if (sg_close_drive_fd(fname, -1, &fd, 1) <= 0) {
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr,
|
||||
"cannot close properly, errno=%d '%s'\n",
|
||||
errno, strerror(errno));
|
||||
@ -1143,19 +1041,23 @@ static int is_scsi_drive(char *fname, int fd_in, int *bus_no, int *host_no,
|
||||
{ret = 0; goto ex;}
|
||||
}
|
||||
|
||||
if (sid_ret == -1 || sid.scsi_id < 0) {
|
||||
/* ts A61211 : employ a more general ioctl */
|
||||
/* ts B11001 : re-use fd */
|
||||
/* ts B80902 : call unconditionally because host_no differs
|
||||
between SG_GET_SCSI_ID and SCSI_IOCTL_GET_IDLUN
|
||||
*/
|
||||
ret = sg_obtain_scsi_adr_fd(fname, fd, bus_no, host_no,
|
||||
channel_no, target_no, lun_no);
|
||||
if (ret <= 0) {
|
||||
if (ret>0) {
|
||||
sid.host_no = *host_no;
|
||||
sid.channel = *channel_no;
|
||||
sid.scsi_id = *target_no;
|
||||
sid.lun = *lun_no;
|
||||
} else {
|
||||
if (linux_sg_enumerate_debug)
|
||||
fprintf(stderr,
|
||||
"sg_obtain_scsi_adr_fd() failed\n");
|
||||
{ret = 0; goto ex;}
|
||||
}
|
||||
}
|
||||
|
||||
/* ts A60927 : trying to do locking with growisofs */
|
||||
if(burn_sg_open_o_excl>1) {
|
||||
@ -1174,6 +1076,16 @@ static int is_scsi_drive(char *fname, int fd_in, int *bus_no, int *host_no,
|
||||
sg_release_siblings(sibling_fds, sibling_fnames,
|
||||
&sibling_count);
|
||||
}
|
||||
#ifdef SCSI_IOCTL_GET_BUS_NUMBER
|
||||
if(*bus_no == -1)
|
||||
*bus_no = 1000 * (sid.host_no + 1) + sid.channel;
|
||||
#else
|
||||
*bus_no = sid.host_no;
|
||||
#endif
|
||||
*host_no= sid.host_no;
|
||||
*channel_no= sid.channel;
|
||||
*target_no= sid.scsi_id;
|
||||
*lun_no= sid.lun;
|
||||
ret = 1;
|
||||
ex:;
|
||||
if (fd_in < 0 && fd >= 0) {
|
||||
@ -1199,7 +1111,7 @@ static int sg_open_for_enumeration(char *fname, int flag)
|
||||
|
||||
fd = sg_open_drive_fd(fname, 1 + (flag & 1));
|
||||
if (fd < 0) {
|
||||
if (linux_sg_enumerate_debug || linux_ata_enumerate_verbose)
|
||||
if (linux_sg_enumerate_debug || linux_ata_enumerate_verbous)
|
||||
fprintf(stderr, "open failed, errno=%d '%s'\n",
|
||||
errno, strerror(errno));
|
||||
return -1;
|
||||
@ -1215,7 +1127,7 @@ static void ata_enumerate(void)
|
||||
int ret, i, fd = -1;
|
||||
char fname[10];
|
||||
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr, "libburn_debug: linux_ata_device_family = %s\n",
|
||||
linux_ata_device_family);
|
||||
|
||||
@ -1224,12 +1136,12 @@ static void ata_enumerate(void)
|
||||
|
||||
for (i = 0; i < 26; i++) {
|
||||
sprintf(fname, linux_ata_device_family, 'a' + i);
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr, "libburn_debug: %s : ", fname);
|
||||
|
||||
/* ts A51221 */
|
||||
if (burn_drive_is_banned(fname)) {
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr, "not in whitelist\n");
|
||||
continue;
|
||||
}
|
||||
@ -1241,7 +1153,7 @@ static void ata_enumerate(void)
|
||||
break;
|
||||
if (ret == 0)
|
||||
continue;
|
||||
if (linux_ata_enumerate_verbose)
|
||||
if (linux_ata_enumerate_verbous)
|
||||
fprintf(stderr, "accepting as drive without SCSI address\n");
|
||||
enumerate_common(fname, fd, -1, -1, -1, -1, -1);
|
||||
}
|
||||
@ -1367,18 +1279,11 @@ static int fname_enumerate(char *fname, int flag)
|
||||
is_ata = is_ata_drive(fname, fd);
|
||||
if (is_ata < 0)
|
||||
{ret = -1; goto ex;}
|
||||
if (is_ata) {
|
||||
/* In most cases Linux returns SCSI bus,...,lun even for
|
||||
ATA and SATA drives
|
||||
*/
|
||||
sg_obtain_scsi_adr_fd(fname, fd, &bus_no, &host_no,
|
||||
&channel_no, &target_no, &lun_no);
|
||||
} else {
|
||||
if (!is_ata)
|
||||
is_scsi = is_scsi_drive(fname, fd, &bus_no, &host_no,
|
||||
&channel_no, &target_no, &lun_no);
|
||||
if (is_scsi < 0)
|
||||
{ret = -1; goto ex;}
|
||||
}
|
||||
if (is_ata == 0 && is_scsi == 0)
|
||||
{ret = 0; goto ex;}
|
||||
|
||||
@ -1776,7 +1681,7 @@ int scsi_enumerate_drives(void)
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether libburn has the given drive in use or exclusively reserved.
|
||||
/** Tells wether libburn has the given drive in use or exclusively reserved.
|
||||
If it is "open" then libburn will eventually call sg_release() on it when
|
||||
it is time to give up usage and reservation.
|
||||
*/
|
||||
@ -1831,7 +1736,7 @@ int sg_grab(struct burn_drive *d)
|
||||
/* ts A60813 - A60822
|
||||
After enumeration the drive fd is probably still open.
|
||||
-1337 is the initial value of burn_drive.fd and the value after
|
||||
release of drive. Unclear why not the official error return
|
||||
relase of drive. Unclear why not the official error return
|
||||
value -1 of open(2) war used. */
|
||||
if(! burn_drive_is_open(d)) {
|
||||
char msg[120];
|
||||
@ -1956,7 +1861,7 @@ drive_is_in_use:;
|
||||
}
|
||||
|
||||
|
||||
/** PORTING: Is mainly about the call to sg_close_drive() and whether it
|
||||
/** PORTING: Is mainly about the call to sg_close_drive() and wether it
|
||||
implements the demanded functionality.
|
||||
*/
|
||||
/** Gives up the drive for SCSI commands and releases eventual access locks.
|
||||
@ -2054,15 +1959,9 @@ static int evaluate_transport_success(struct burn_drive *d, struct command *c,
|
||||
(unsigned int) host_status, host_problem);
|
||||
sev = LIBDAX_MSGS_SEV_FAILURE;
|
||||
if (do_retry && !give_up_drive)
|
||||
sev = LIBDAX_MSGS_SEV_NOTE;
|
||||
sev = LIBDAX_MSGS_SEV_DEBUG;
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201a7, sev, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
|
||||
strcpy(msg, "Command: ");
|
||||
if (spc_human_readable_cmd(c, msg + strlen(msg),
|
||||
160 - strlen(msg), 0) > 0)
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201a7, sev, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
sprintf(msg, "--- SG_IO: host_status= 0x%x %s",
|
||||
(unsigned int) host_status, host_problem);
|
||||
scsi_log_message(d, fp, msg, 0);
|
||||
@ -2116,15 +2015,9 @@ static int evaluate_transport_success(struct burn_drive *d, struct command *c,
|
||||
driver_problem, driver_sugg);
|
||||
sev = LIBDAX_MSGS_SEV_FAILURE;
|
||||
if (do_retry && !give_up_drive)
|
||||
sev = LIBDAX_MSGS_SEV_NOTE;
|
||||
sev = LIBDAX_MSGS_SEV_DEBUG;
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201a8, sev, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
|
||||
strcpy(msg, "Command: ");
|
||||
if (spc_human_readable_cmd(c, msg + strlen(msg),
|
||||
160 - strlen(msg), 0) > 0)
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201a8, sev, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
sprintf(msg, "--- SG_IO: driver_status= 0x%x %s / %s",
|
||||
(unsigned int) driver_status,
|
||||
driver_problem, driver_sugg);
|
||||
@ -2154,7 +2047,7 @@ static void react_on_drive_loss(struct burn_drive *d, struct command *c,
|
||||
scsi_log_message(d, fp, "--- SG_IO: Gave up connection to drive", 0);
|
||||
}
|
||||
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates whether
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates wether
|
||||
the command succeeded or shall be retried or finally failed.
|
||||
Returned SCSI errors shall not lead to a return value indicating failure.
|
||||
The callers get notified by c->error. An SCSI failure which leads not to
|
||||
@ -2284,9 +2177,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
}
|
||||
s.usr_ptr = c;
|
||||
|
||||
/* ts B90523 : Record effective transfer length request for debugging*/
|
||||
c->dxfer_len = s.dxfer_len;
|
||||
|
||||
start_time = time(NULL);
|
||||
for(i = 0; !done; i++) {
|
||||
|
||||
@ -2323,19 +2213,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
(unsigned int) s.host_status,
|
||||
(unsigned int) s.driver_status);
|
||||
scsi_log_message(d, fp, msg, 0);
|
||||
|
||||
libdax_msgs_submit(libdax_messenger,
|
||||
d->global_index, 0x0002010c,
|
||||
LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
sprintf(msg, "Attempted command: ");
|
||||
spc_human_readable_cmd(c, msg + strlen(msg),
|
||||
160 - strlen(msg), 0);
|
||||
libdax_msgs_submit(libdax_messenger,
|
||||
d->global_index, 0x0002010c,
|
||||
LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
|
||||
react_on_drive_loss(d, c, fp);
|
||||
{ret = -1; goto ex;}
|
||||
}
|
||||
@ -2354,13 +2231,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
if (d->cancel)
|
||||
break;
|
||||
/* if ! done : loop for retry */;
|
||||
if (!done) {
|
||||
spc_register_retry(c);
|
||||
if (burn_sg_log_scsi & 3) {
|
||||
scsi_log_text("+++ Repeating command", fp, 0);
|
||||
scsi_log_cmd(c, fp, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ret = 1;
|
||||
@ -2385,7 +2255,7 @@ static int sg_obtain_scsi_adr_fd(char *path, int fd_in,
|
||||
};
|
||||
struct my_scsi_idlun idlun;
|
||||
|
||||
/* valgrind called idlun uninitialized because it is blind for ioctl */
|
||||
/* valgrind called idlun unitialized because it is blind for ioctl */
|
||||
idlun.x = 0;
|
||||
idlun.host_unique_id = 0;
|
||||
|
||||
@ -2454,7 +2324,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
|
||||
|
||||
|
||||
/* ts A60922 ticket 33 : called from drive.c */
|
||||
/** Tells whether a text is a persistent address as listed by the enumeration
|
||||
/** Tells wether a text is a persistent address as listed by the enumeration
|
||||
functions.
|
||||
*/
|
||||
int sg_is_enumerable_adr(char *adr)
|
||||
|
||||
@ -51,7 +51,7 @@ sg_initialize() performs global initialization of the SCSI transport
|
||||
facilities. Checks for compatibility of supporting
|
||||
software components.
|
||||
|
||||
sg_shutdown() performs global finalizations and releases globally
|
||||
sg_shutdown() performs global finalizations and releases golbally
|
||||
acquired resources.
|
||||
|
||||
sg_give_next_adr() iterates over the set of potentially useful drive
|
||||
@ -64,7 +64,7 @@ sg_dispose_drive() finalizes adapter specifics of struct burn_drive
|
||||
on destruction. Releases resources which were acquired
|
||||
underneath scsi_enumerate_drives().
|
||||
|
||||
sg_drive_is_open() tells whether libburn has the given drive in use.
|
||||
sg_drive_is_open() tells wether libburn has the given drive in use.
|
||||
|
||||
sg_grab() opens the drive for SCSI commands and ensures
|
||||
undisturbed access.
|
||||
@ -72,7 +72,7 @@ sg_grab() opens the drive for SCSI commands and ensures
|
||||
sg_release() closes a drive opened by sg_grab()
|
||||
|
||||
sg_issue_command() sends a SCSI command to the drive, receives reply,
|
||||
and evaluates whether the command succeeded or shall
|
||||
and evaluates wether the command succeeded or shall
|
||||
be retried or finally failed.
|
||||
|
||||
sg_obtain_scsi_adr() tries to obtain SCSI address parameters.
|
||||
@ -525,7 +525,7 @@ int sg_release(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates whether
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates wether
|
||||
the command succeeded or shall be retried or finally failed.
|
||||
Returned SCSI errors shall not lead to a return value indicating failure.
|
||||
The callers get notified by c->error. An SCSI failure which leads not to
|
||||
@ -587,9 +587,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
req.datalen = 0;
|
||||
}
|
||||
|
||||
/* ts B90523 : Record effective transfer length request for debugging*/
|
||||
c->dxfer_len = req.datalen;
|
||||
|
||||
/* retry-loop */
|
||||
start_time = time(NULL);
|
||||
for(i = 0; !done; i++) {
|
||||
@ -671,8 +668,6 @@ if (c->opcode[0] == 0x5a) {
|
||||
start_time, timeout_ms, i, 0);
|
||||
if (d->cancel)
|
||||
done = 1;
|
||||
if (!done)
|
||||
spc_register_retry(c);
|
||||
} /* end of retry-loop */
|
||||
|
||||
return 1;
|
||||
@ -721,7 +716,7 @@ ex:;
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether a text is a persistent address as listed by the enumeration
|
||||
/** Tells wether a text is a persistent address as listed by the enumeration
|
||||
functions.
|
||||
*/
|
||||
int sg_is_enumerable_adr(char* adr)
|
||||
|
||||
@ -44,7 +44,7 @@ sg_initialize() performs global initialization of the SCSI transport
|
||||
facilities. Checks for compatibility of supporting
|
||||
software components.
|
||||
|
||||
sg_shutdown() performs global finalizations and releases globally
|
||||
sg_shutdown() performs global finalizations and releases golbally
|
||||
acquired resources.
|
||||
|
||||
sg_give_next_adr() iterates over the set of potentially useful drive
|
||||
@ -57,7 +57,7 @@ sg_dispose_drive() finalizes adapter specifics of struct burn_drive
|
||||
on destruction. Releases resources which were acquired
|
||||
underneath scsi_enumerate_drives().
|
||||
|
||||
sg_drive_is_open() tells whether libburn has the given drive in use.
|
||||
sg_drive_is_open() tells wether libburn has the given drive in use.
|
||||
|
||||
sg_grab() opens the drive for SCSI commands and ensures
|
||||
undisturbed access.
|
||||
@ -65,7 +65,7 @@ sg_grab() opens the drive for SCSI commands and ensures
|
||||
sg_release() closes a drive opened by sg_grab()
|
||||
|
||||
sg_issue_command() sends a SCSI command to the drive, receives reply,
|
||||
and evaluates whether the command succeeded or shall
|
||||
and evaluates wether the command succeeded or shall
|
||||
be retried or finally failed.
|
||||
|
||||
sg_obtain_scsi_adr() tries to obtain SCSI address parameters.
|
||||
@ -690,7 +690,7 @@ int sg_release(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates whether
|
||||
/** Sends a SCSI command to the drive, receives reply and evaluates wether
|
||||
the command succeeded or shall be retried or finally failed.
|
||||
Returned SCSI errors shall not lead to a return value indicating failure.
|
||||
The callers get notified by c->error. An SCSI failure which leads not to
|
||||
@ -754,9 +754,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
cgc.uscsi_rqlen = sizeof(c->sense);
|
||||
cgc.uscsi_rqbuf = (caddr_t) c->sense;
|
||||
|
||||
/* ts B90523 : Record effective transfer length request for debugging*/
|
||||
c->dxfer_len = cgc.uscsi_buflen;
|
||||
|
||||
/* retry-loop */
|
||||
start_time = time(NULL);
|
||||
for(i = 0; !done; i++) {
|
||||
@ -802,8 +799,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
|
||||
start_time, timeout_ms, i, 0);
|
||||
if (d->cancel)
|
||||
done = 1;
|
||||
if (!done)
|
||||
spc_register_retry(c);
|
||||
|
||||
} /* end of retry-loop */
|
||||
|
||||
@ -837,7 +832,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
|
||||
}
|
||||
|
||||
|
||||
/** Tells whether a text is a persistent address as listed by the enumeration
|
||||
/** Tells wether a text is a persistent address as listed by the enumeration
|
||||
functions.
|
||||
*/
|
||||
|
||||
|
||||
175
libburn/spc.c
175
libburn/spc.c
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2019 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -75,16 +75,10 @@ int scsi_init_command(struct command *c, unsigned char *opcode, int oplen)
|
||||
c->dir = NO_TRANSFER;
|
||||
c->dxfer_len = -1;
|
||||
memset(c->sense, 0, sizeof(c->sense));
|
||||
c->sense_len = 0;
|
||||
c->error = 0;
|
||||
c->retry = 0;
|
||||
c->page = NULL;
|
||||
c->timeout = Libburn_scsi_default_timeouT;
|
||||
c->start_time = c->end_time = 0.0;
|
||||
c->retry_count = 0;
|
||||
c->last_retry_key = 0;
|
||||
c->last_retry_asc = 0;
|
||||
c->last_retry_ascq = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -159,20 +153,14 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
|
||||
int i, ret = 1, key = 0, asc = 0, ascq = 0, clueless_start = 0;
|
||||
static double tests_per_second = 2.0;
|
||||
int sleep_usecs, loop_limit, clueless_timeout, progress;
|
||||
char *msg = NULL, *cmd_name = NULL, *cmd_cpt;
|
||||
char *msg = NULL;
|
||||
unsigned char sense[14];
|
||||
|
||||
BURN_ALLOC_MEM(msg, char, 320);
|
||||
BURN_ALLOC_MEM(cmd_name, char, 320);
|
||||
clueless_timeout = 5 * tests_per_second + 1;
|
||||
loop_limit = max_sec * tests_per_second + 1;
|
||||
sleep_usecs = 1000000 / tests_per_second;
|
||||
|
||||
strcpy(cmd_name, cmd_text);
|
||||
cmd_cpt = strchr(cmd_name, ':');
|
||||
if (cmd_cpt != NULL)
|
||||
*cmd_cpt = 0;
|
||||
|
||||
if (!(flag & 1))
|
||||
usleep(sleep_usecs);
|
||||
|
||||
@ -195,14 +183,14 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
|
||||
*/
|
||||
break;
|
||||
}
|
||||
if (key == 0x6 && asc == 0x28)
|
||||
/* medium change notice or alike = try again */
|
||||
if (key == 0x6 && asc == 0x28 && ascq == 0x00)
|
||||
/* media change notice = try again */
|
||||
goto slumber;
|
||||
|
||||
handle_error:;
|
||||
/* ts A90213 */
|
||||
sprintf(msg,
|
||||
"Asynchronous SCSI error on %s: ", cmd_name);
|
||||
"Asynchronous SCSI error on %s: ", cmd_text);
|
||||
sense[0] = 0x70; /* Fixed format sense data */
|
||||
sense[2] = key;
|
||||
sense[12] = asc;
|
||||
@ -213,14 +201,6 @@ handle_error:;
|
||||
0x0002014d,
|
||||
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
if (cmd_cpt != NULL) {
|
||||
sprintf(msg, "Attempted SCSI CDB: %s",
|
||||
cmd_cpt + 1);
|
||||
libdax_msgs_submit(libdax_messenger,
|
||||
d->global_index, 0x0002014d,
|
||||
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
}
|
||||
d->cancel = 1;
|
||||
break;
|
||||
} else if (ascq == 0x00) { /* CAUSE NOT REPORTABLE */
|
||||
@ -234,16 +214,6 @@ handle_error:;
|
||||
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"Ended clueless NOT READY cycle",
|
||||
0, 0);
|
||||
if (cmd_cpt != NULL) {
|
||||
sprintf(msg, "Attempted SCSI CDB: %s",
|
||||
cmd_cpt + 1);
|
||||
libdax_msgs_submit(libdax_messenger,
|
||||
d->global_index,
|
||||
0x00000002,
|
||||
LIBDAX_MSGS_SEV_DEBUG,
|
||||
LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
}
|
||||
ret = 1; /* medium not present = ok */
|
||||
break;
|
||||
}
|
||||
@ -255,7 +225,7 @@ slumber:;
|
||||
}
|
||||
if (ret <= 0 || !(flag & 2)) {
|
||||
sprintf(msg, "Async %s %s after %d.%d seconds",
|
||||
cmd_name, (ret > 0 ? "succeeded" : "failed"),
|
||||
cmd_text, (ret > 0 ? "succeeded" : "failed"),
|
||||
i / 10, i % 10);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x00020150, LIBDAX_MSGS_SEV_DEBUG,
|
||||
@ -266,19 +236,12 @@ slumber:;
|
||||
{ret = (ret > 0); goto ex;}
|
||||
|
||||
sprintf(msg, "Timeout (%d s) with asynchronous SCSI command %s\n",
|
||||
max_sec, cmd_name);
|
||||
max_sec, cmd_text);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002014f,
|
||||
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
|
||||
if (cmd_cpt != NULL) {
|
||||
sprintf(msg, "Attempted SCSI CDB: %s", cmd_cpt + 1);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x0002014f, LIBDAX_MSGS_SEV_SORRY,
|
||||
LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
|
||||
}
|
||||
ret = 0;
|
||||
ex:;
|
||||
BURN_FREE_MEM(msg);
|
||||
BURN_FREE_MEM(cmd_name);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1056,7 +1019,7 @@ void spc_probe_write_modes(struct burn_drive *d)
|
||||
struct buffer *buf = NULL;
|
||||
int try_write_type = 1;
|
||||
int try_block_type = 0;
|
||||
int key, asc, ascq, usable_write_type = -1, usable_block_type = -1;
|
||||
int key, asc, ascq, useable_write_type = -1, useable_block_type = -1;
|
||||
int last_try = 0;
|
||||
struct command *c = NULL;
|
||||
|
||||
@ -1071,11 +1034,11 @@ void spc_probe_write_modes(struct burn_drive *d)
|
||||
while (try_write_type != 5) {
|
||||
/* ts A70213 */
|
||||
if (try_write_type == 4) {
|
||||
/* Pseudo write type NONE . Set a usable write mode */
|
||||
if (usable_write_type == -1)
|
||||
/* Pseudo write type NONE . Set a useable write mode */
|
||||
if (useable_write_type == -1)
|
||||
break;
|
||||
try_write_type = usable_write_type;
|
||||
try_block_type = usable_block_type;
|
||||
try_write_type = useable_write_type;
|
||||
try_block_type = useable_block_type;
|
||||
last_try= 1;
|
||||
}
|
||||
|
||||
@ -1118,12 +1081,12 @@ void spc_probe_write_modes(struct burn_drive *d)
|
||||
1 << try_block_type;
|
||||
|
||||
/* ts A70213 */
|
||||
if ((usable_write_type < 0 && try_write_type > 0) ||
|
||||
if ((useable_write_type < 0 && try_write_type > 0) ||
|
||||
(try_write_type == 1 && try_block_type == 8)) {
|
||||
/* Packet is not supported yet.
|
||||
Prefer TAO MODE_1. */
|
||||
usable_write_type = try_write_type;
|
||||
usable_block_type = try_block_type;
|
||||
useable_write_type = try_write_type;
|
||||
useable_block_type = try_block_type;
|
||||
}
|
||||
}
|
||||
switch (try_block_type) {
|
||||
@ -1446,15 +1409,8 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
|
||||
case 0x28:
|
||||
if (*ascq == 0)
|
||||
sprintf(msg, "Medium may have changed");
|
||||
else if (*ascq == 1)
|
||||
sprintf(msg, "Import or export element accessed");
|
||||
else if (*ascq == 2)
|
||||
sprintf(msg, "Format layer may have changed");
|
||||
else if (*ascq == 3)
|
||||
sprintf(msg,
|
||||
"Import/export element accessed, medium changed");
|
||||
else if (*key == 6)
|
||||
sprintf(msg, "Unknown ASCQ with drive event ASC 28");
|
||||
else
|
||||
break;
|
||||
goto return_retry;
|
||||
@ -1588,28 +1544,6 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
|
||||
else
|
||||
break;
|
||||
goto return_fail;
|
||||
case 0x6F:
|
||||
if (*ascq == 0)
|
||||
sprintf(msg, "Copy protection key exchange failure – Authentication failure");
|
||||
else if (*ascq == 1)
|
||||
sprintf(msg, "Copy protection key exchange failure – Key not present");
|
||||
else if (*ascq == 2)
|
||||
sprintf(msg, "Copy protection key exchange failure – Key not established");
|
||||
else if (*ascq == 3)
|
||||
sprintf(msg, "Read of scrambled sector without authentication");
|
||||
else if (*ascq == 4)
|
||||
sprintf(msg, "Media region code is mismatched to logical unit region");
|
||||
else if (*ascq == 5)
|
||||
sprintf(msg, "Logical unit region must be permanent / Region reset count error");
|
||||
else if (*ascq == 6)
|
||||
sprintf(msg, "Insufficient block count for binding nonce recording");
|
||||
else if (*ascq == 7)
|
||||
sprintf(msg, "Conflict in binding nonce recording");
|
||||
else if (*ascq == 8)
|
||||
sprintf(msg, "Insufficient permission");
|
||||
else
|
||||
break;
|
||||
goto return_fail;
|
||||
case 0x72:
|
||||
if (*ascq == 0)
|
||||
sprintf(msg, "Session fixation error");
|
||||
@ -1764,67 +1698,6 @@ static char *scsi_command_name(unsigned int c, int flag)
|
||||
}
|
||||
|
||||
|
||||
/* ts B90206: Avoid publishing more inner API functions which begin by scsi_ */
|
||||
char *spc_command_name(unsigned int c, int flag)
|
||||
{
|
||||
return(scsi_command_name(c, flag));
|
||||
}
|
||||
|
||||
|
||||
/* ts B90616 */
|
||||
void spc_register_retry(struct command *c)
|
||||
{
|
||||
c->retry_count++;
|
||||
spc_decode_sense(c->sense, c->sense_len, &c->last_retry_key,
|
||||
&c->last_retry_asc, &c->last_retry_ascq);
|
||||
}
|
||||
|
||||
|
||||
/* ts B90511 */
|
||||
/* @param flag bit0= do not prepend command name
|
||||
bit1= do not append dxfer_len
|
||||
*/
|
||||
int spc_human_readable_cmd(struct command *c, char *msg, int msg_max, int flag)
|
||||
{
|
||||
int j, l, lname;
|
||||
|
||||
if ((flag & 1) && c->retry_count <= 0) {
|
||||
msg[0] = 0;
|
||||
} else {
|
||||
if (msg_max < 60)
|
||||
return -1;
|
||||
strcpy(msg, spc_command_name( (unsigned int) c->opcode[0], 0));
|
||||
if (c->retry_count > 0) {
|
||||
sprintf(msg + strlen(msg), " #%d", c->retry_count + 1);
|
||||
if (c->last_retry_key > 0)
|
||||
sprintf(msg + strlen(msg), ",[%X %2.2X %2.2X]",
|
||||
c->last_retry_key, c->last_retry_asc,
|
||||
c->last_retry_ascq);
|
||||
}
|
||||
strcat(msg, " : ");
|
||||
}
|
||||
lname = l = strlen(msg);
|
||||
for (j = 0; j < 16 && j < c->oplen; j++) {
|
||||
if (l > msg_max - 3) {
|
||||
if (msg_max - 4 >= lname) {
|
||||
l = msg_max - 4;
|
||||
sprintf(msg + strlen(msg), "... ");
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
sprintf(msg + l, "%2.2x ", c->opcode[j]);
|
||||
l += 3;
|
||||
}
|
||||
if (c->dir != NO_TRANSFER && c->page != NULL && !(flag & 2)) {
|
||||
if (l > msg_max - 24)
|
||||
return 0;
|
||||
sprintf(msg + l, " : dxfer_len= %d", c->dxfer_len);
|
||||
l = strlen(msg);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/* ts A61030 - A61115 */
|
||||
/* @param flag bit0= do report conditions which are considered not an error
|
||||
bit1= report with severity FAILURE rather than DEBUG
|
||||
@ -1863,15 +1736,6 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
|
||||
(flag & 2) && d->silent_on_scsi_error != 3 ?
|
||||
LIBDAX_MSGS_SEV_FAILURE : LIBDAX_MSGS_SEV_DEBUG,
|
||||
LIBDAX_MSGS_PRIO_HIGH, msg,0,0);
|
||||
strcpy(msg, "CDB= ");
|
||||
if (spc_human_readable_cmd(c, msg + strlen(msg), 320 - strlen(msg), 1)
|
||||
> 0) {
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x0002010f,
|
||||
(flag & 2) && d->silent_on_scsi_error != 3 ?
|
||||
LIBDAX_MSGS_SEV_FAILURE : LIBDAX_MSGS_SEV_DEBUG,
|
||||
LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
|
||||
}
|
||||
ex:;
|
||||
BURN_FREE_MEM(msg);
|
||||
BURN_FREE_MEM(scsi_msg);
|
||||
@ -2118,8 +1982,6 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
|
||||
if (burn_sg_log_scsi & 3)
|
||||
scsi_log_err(d, c, fp, sense, sense_len,
|
||||
(sense_len > 0) | (flag & 2));
|
||||
if (sense == c->sense)
|
||||
c->sense_len = sense_len;
|
||||
if (sense_len <= 0)
|
||||
{done = 1; goto ex;}
|
||||
|
||||
@ -2151,13 +2013,6 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
|
||||
0x0002018a,
|
||||
LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
strcpy(msg, "Command: ");
|
||||
if (spc_human_readable_cmd(c, msg + strlen(msg),
|
||||
320 - strlen(msg), 0) > 0)
|
||||
libdax_msgs_submit(libdax_messenger,
|
||||
d->global_index, 0x0002018a,
|
||||
LIBDAX_MSGS_SEV_SORRY,
|
||||
LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
|
||||
goto err_ex;
|
||||
}
|
||||
if (d->cancel)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2019 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -114,16 +114,6 @@ int scsi_log_message(struct burn_drive *d, void *fp, char * msg, int flag);
|
||||
int spc_decode_sense(unsigned char *sense, int senselen,
|
||||
int *key, int *asc, int *ascq);
|
||||
|
||||
/* ts B90206 */
|
||||
char *spc_command_name(unsigned int c, int flag);
|
||||
|
||||
/* ts B90511 */
|
||||
int spc_human_readable_cmd(struct command *c, char *msg, int msg_max,
|
||||
int flag);
|
||||
|
||||
/* ts B90616 */
|
||||
void spc_register_retry(struct command *c);
|
||||
|
||||
/* ts B00808 */
|
||||
/** Evaluates outcome of a single SCSI command, eventually logs sense data,
|
||||
and issues DEBUG error message in case the command is evaluated as done.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2021 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
#include "util.h"
|
||||
#include "transport.h"
|
||||
#include "mmc.h"
|
||||
#include "drive.h"
|
||||
|
||||
#include "libdax_msgs.h"
|
||||
extern struct libdax_msgs *libdax_messenger;
|
||||
@ -320,8 +319,8 @@ void burn_structure_print_track(struct burn_track *t)
|
||||
{
|
||||
char msg[80];
|
||||
|
||||
sprintf(msg, " track size %.f sectors",
|
||||
(double) burn_track_get_sectors_v2(t));
|
||||
sprintf(msg, " track size %d sectors",
|
||||
burn_track_get_sectors(t));
|
||||
libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
|
||||
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
@ -507,14 +506,14 @@ int burn_track_set_postgap_size(struct burn_track *t, int size, int flag)
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* ts B20119 / C40302: outsourced from burn_track_get_sectors()
|
||||
/* ts B20119: outsourced from burn_track_get_sectors()
|
||||
@param flag bit0= do not add post-gap
|
||||
*/
|
||||
off_t burn_track_get_sectors_2_v2(struct burn_track *t, int flag)
|
||||
int burn_track_get_sectors_2(struct burn_track *t, int flag)
|
||||
{
|
||||
/* ts A70125 : was int */
|
||||
off_t size = 0, sectors;
|
||||
int seclen;
|
||||
off_t size = 0;
|
||||
int sectors, seclen;
|
||||
|
||||
seclen = burn_sector_length(t->mode);
|
||||
|
||||
@ -530,58 +529,24 @@ off_t burn_track_get_sectors_2_v2(struct burn_track *t, int flag)
|
||||
} else if(t->entry != NULL) {
|
||||
/* ts A80808 : all burn_toc_entry of track starts should now
|
||||
have (extensions_valid & 1), even those from CD.
|
||||
ts C40302 : Now there should be long_track_blocks.
|
||||
*/
|
||||
if (t->entry->extensions_valid & 8) {
|
||||
size = t->entry->long_track_blocks * (off_t) 2048;
|
||||
} else if (t->entry->extensions_valid & 1) {
|
||||
if (t->entry->extensions_valid & 1)
|
||||
size = ((off_t) t->entry->track_blocks) * (off_t) 2048;
|
||||
}
|
||||
}
|
||||
if (size > BURN_DRIVE_MAX_BYTES) {
|
||||
char msg[80];
|
||||
|
||||
sprintf(msg, "Track size exceeds limit of %.f bytes",
|
||||
(double) (BURN_DRIVE_MAX_BYTES));
|
||||
libdax_msgs_submit(libdax_messenger, -1, 0x000201ae,
|
||||
LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
return -1;
|
||||
}
|
||||
sectors = size / seclen;
|
||||
if (size % seclen)
|
||||
sectors++;
|
||||
return sectors;
|
||||
}
|
||||
|
||||
int burn_track_get_sectors_2(struct burn_track *t, int flag)
|
||||
{
|
||||
/* ts A70125 : was int */
|
||||
off_t sectors = 0;
|
||||
|
||||
sectors = burn_track_get_sectors_2_v2(t, flag);
|
||||
if (sectors > (off_t) 0x7ffffff0) {
|
||||
libdax_msgs_submit(libdax_messenger, -1, 0x000201ae,
|
||||
LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
"Track size exceeds 4 TiB - 32 KiB", 0, 0);
|
||||
return -1;
|
||||
}
|
||||
return (int) sectors;
|
||||
}
|
||||
|
||||
int burn_track_get_sectors(struct burn_track *t)
|
||||
{
|
||||
return burn_track_get_sectors_2(t, 0);
|
||||
}
|
||||
|
||||
/* ts C40302 : API */
|
||||
off_t burn_track_get_sectors_v2(struct burn_track *t)
|
||||
{
|
||||
return burn_track_get_sectors_2_v2(t, 0);
|
||||
}
|
||||
|
||||
/* ts A70125 */
|
||||
int burn_track_set_sectors(struct burn_track *t, off_t sectors)
|
||||
int burn_track_set_sectors(struct burn_track *t, int sectors)
|
||||
{
|
||||
off_t size, seclen;
|
||||
int ret;
|
||||
@ -624,29 +589,17 @@ int burn_track_set_fillup(struct burn_track *t, int fill_up_media)
|
||||
*/
|
||||
int burn_track_apply_fillup(struct burn_track *t, off_t max_size, int flag)
|
||||
{
|
||||
int ret = 2;
|
||||
off_t max_sectors, track_sectors;
|
||||
int max_sectors, ret = 2;
|
||||
char msg[80];
|
||||
|
||||
if (t->fill_up_media <= 0)
|
||||
return 2;
|
||||
if (max_size > BURN_DRIVE_MAX_BYTES) {
|
||||
sprintf(msg, "Track size exceeds limit of %.f bytes",
|
||||
(double) (BURN_DRIVE_MAX_BYTES));
|
||||
libdax_msgs_submit(libdax_messenger, -1, 0x000201ae,
|
||||
LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
return 0;
|
||||
}
|
||||
max_sectors = max_size / 2048;
|
||||
track_sectors = burn_track_get_sectors_v2(t);
|
||||
if (track_sectors < 0)
|
||||
return 0;
|
||||
if (track_sectors < max_sectors || (flag & 1)) {
|
||||
sprintf(msg,
|
||||
"Setting total track size to %.fs (payload %.fs)\n",
|
||||
(double) max_sectors,
|
||||
(double) (t->source->get_size(t->source) / 2048));
|
||||
if (burn_track_get_sectors(t) < max_sectors || (flag & 1)) {
|
||||
sprintf(msg, "Setting total track size to %ds (payload %ds)\n",
|
||||
max_sectors & 0x7fffffff,
|
||||
(int) ((t->source->get_size(t->source) / 2048)
|
||||
& 0x7fffffff));
|
||||
libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
|
||||
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
|
||||
msg, 0, 0);
|
||||
@ -700,7 +653,7 @@ int burn_track_is_data_done(struct burn_track *t)
|
||||
|
||||
int burn_track_get_shortage(struct burn_track *t)
|
||||
{
|
||||
off_t size;
|
||||
int size;
|
||||
int seclen;
|
||||
|
||||
seclen = burn_sector_length(t->mode);
|
||||
@ -712,31 +665,13 @@ int burn_track_get_shortage(struct burn_track *t)
|
||||
|
||||
int burn_session_get_sectors(struct burn_session *s)
|
||||
{
|
||||
int sectors = 0, i, track_sectors;
|
||||
int sectors = 0, i;
|
||||
|
||||
for (i = 0; i < s->tracks; i++) {
|
||||
track_sectors = burn_track_get_sectors(s->track[i]);
|
||||
if (track_sectors < 0)
|
||||
track_sectors = 0;
|
||||
sectors += track_sectors;
|
||||
}
|
||||
for (i = 0; i < s->tracks; i++)
|
||||
sectors += burn_track_get_sectors(s->track[i]);
|
||||
return sectors;
|
||||
}
|
||||
|
||||
/* ts C40302: API */
|
||||
off_t burn_session_get_sectors_v2(struct burn_session *s)
|
||||
{
|
||||
int i;
|
||||
off_t sectors = 0, track_sectors;
|
||||
|
||||
for (i = 0; i < s->tracks; i++) {
|
||||
track_sectors = burn_track_get_sectors_v2(s->track[i]);
|
||||
if (track_sectors < 0)
|
||||
track_sectors = 0;
|
||||
sectors += track_sectors;
|
||||
}
|
||||
return sectors;
|
||||
}
|
||||
|
||||
int burn_disc_get_sectors(struct burn_disc *d)
|
||||
{
|
||||
@ -747,17 +682,6 @@ int burn_disc_get_sectors(struct burn_disc *d)
|
||||
return sectors;
|
||||
}
|
||||
|
||||
/* ts C40302: API */
|
||||
off_t burn_disc_get_sectors_v2(struct burn_disc *d)
|
||||
{
|
||||
int i;
|
||||
off_t sectors = 0;
|
||||
|
||||
for (i = 0; i < d->sessions; i++)
|
||||
sectors += burn_session_get_sectors_v2(d->session[i]);
|
||||
return sectors;
|
||||
}
|
||||
|
||||
void burn_track_get_entry(struct burn_track *t, struct burn_toc_entry *entry)
|
||||
{
|
||||
if (t->entry == NULL)
|
||||
@ -825,7 +749,7 @@ int burn_session_get_hidefirst(struct burn_session *session)
|
||||
}
|
||||
|
||||
|
||||
/* ts A80808,C40226 : Enhance CD toc to DVD toc with Long block addresses */
|
||||
/* ts A80808 : Enhance CD toc to DVD toc */
|
||||
int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
|
||||
{
|
||||
int sidx= 0, tidx= 0, ret, track_offset, alloc_len = 34;
|
||||
@ -893,7 +817,6 @@ int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
|
||||
entry->point_msb = 0;
|
||||
entry->start_lba = burn_msf_to_lba(entry->pmin,
|
||||
entry->psec, entry->pframe);
|
||||
entry->long_start_lba = entry->start_lba;
|
||||
if (tidx > 0) {
|
||||
prev_entry->track_blocks =
|
||||
entry->start_lba
|
||||
@ -913,16 +836,13 @@ int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
|
||||
ret < prev_entry->track_blocks - 2))
|
||||
prev_entry->track_blocks = ret;
|
||||
}
|
||||
prev_entry->long_track_blocks =
|
||||
prev_entry->track_blocks;
|
||||
prev_entry->extensions_valid |= 1 | 8;
|
||||
prev_entry->extensions_valid |= 1;
|
||||
}
|
||||
if (tidx == d->session[sidx]->tracks) {
|
||||
entry->session_msb = 0;
|
||||
entry->point_msb = 0;
|
||||
entry->track_blocks = 0;
|
||||
entry->long_track_blocks = entry->track_blocks;
|
||||
entry->extensions_valid |= 1 | 8;
|
||||
entry->extensions_valid |= 1;
|
||||
}
|
||||
prev_entry = entry;
|
||||
}
|
||||
|
||||
@ -53,7 +53,7 @@ struct burn_track
|
||||
/** 1 means Pad with zeros, 0 means start reading the next track */
|
||||
int pad;
|
||||
|
||||
/* ts A70213 : whether to expand this track to full available media */
|
||||
/* ts A70213 : wether to expand this track to full available media */
|
||||
int fill_up_media;
|
||||
|
||||
/* ts A70218 : a track size to use if it is mandarory to have some */
|
||||
@ -137,7 +137,7 @@ struct burn_session
|
||||
unsigned char cdtext_language[8];
|
||||
|
||||
/* ts B11226 */
|
||||
unsigned char mediacatalog[14]; /* overridable by burn_write_opts */
|
||||
unsigned char mediacatalog[14]; /* overrideable by burn_write_opts */
|
||||
};
|
||||
|
||||
struct burn_disc
|
||||
@ -160,7 +160,7 @@ int burn_track_is_open_ended(struct burn_track *t);
|
||||
int burn_track_is_data_done(struct burn_track *t);
|
||||
|
||||
/* ts A70125 : sets overall sectors of a track: offset+payload+padding */
|
||||
int burn_track_set_sectors(struct burn_track *t, off_t sectors);
|
||||
int burn_track_set_sectors(struct burn_track *t, int sectors);
|
||||
|
||||
/* ts A70218 : sets the payload size alone */
|
||||
int burn_track_set_size(struct burn_track *t, off_t size);
|
||||
@ -185,7 +185,6 @@ void burn_cdtext_free(struct burn_cdtext **cdtext);
|
||||
/* @param flag bit0= do not add post-gap
|
||||
*/
|
||||
int burn_track_get_sectors_2(struct burn_track *t, int flag);
|
||||
off_t burn_track_get_sectors_2_v2(struct burn_track *t, int flag);
|
||||
|
||||
|
||||
#endif /* BURN__STRUCTURE_H */
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -61,7 +61,6 @@ struct command
|
||||
int dir;
|
||||
int dxfer_len;
|
||||
unsigned char sense[128];
|
||||
int sense_len;
|
||||
int error;
|
||||
int retry;
|
||||
struct buffer *page;
|
||||
@ -70,10 +69,6 @@ struct command
|
||||
double start_time;
|
||||
double end_time;
|
||||
|
||||
int retry_count;
|
||||
int last_retry_key;
|
||||
int last_retry_asc;
|
||||
int last_retry_ascq;
|
||||
};
|
||||
|
||||
struct burn_scsi_inquiry_data
|
||||
@ -277,7 +272,7 @@ struct burn_drive
|
||||
(which could need closing after write) */
|
||||
int needs_close_session;
|
||||
/* ts A71003 : whether a random write operation was done and no
|
||||
synchronize cache has happened yet */
|
||||
synchronize chache has happened yet */
|
||||
int needs_sync_cache;
|
||||
|
||||
/* ts A80412 : whether to use WRITE12 with Streaming bit set
|
||||
@ -335,7 +330,7 @@ struct burn_drive
|
||||
|
||||
int stdio_fd;
|
||||
|
||||
off_t nwa; /* next writeable address */
|
||||
int nwa; /* next writeable address */
|
||||
int alba; /* absolute lba */
|
||||
int rlba; /* relative lba in section */
|
||||
int start_lba;
|
||||
@ -371,21 +366,19 @@ struct burn_drive
|
||||
/* ts A70215 : if > 0 : first lba on media that is too high for write*/
|
||||
int media_lba_limit;
|
||||
|
||||
/* ts A81210 / C40303 : Upper limit of readable data size,
|
||||
0x7fffffffffffffff = unknown
|
||||
BURN_DRIVE_MAX_BYTES / 2048 = possibly truncated
|
||||
or unknown stdio size
|
||||
/* ts A81210 : Upper limit of readable data size,
|
||||
0x7fffffff = unknown
|
||||
0x7ffffff0 = 32 bit overflow, or unknown stdio size
|
||||
*/
|
||||
off_t media_read_capacity;
|
||||
|
||||
int media_read_capacity;
|
||||
/* ts B60305 : Whether READ CAPACITY of CD is credible:
|
||||
-1= no READ CAPACITY yet , 0= untrusted READ CAPACITY
|
||||
1= READ CAPACITY confirmed or corrected by other commands
|
||||
*/
|
||||
int mr_capacity_trusted;
|
||||
|
||||
/* ts B10314 / C40302 : Next Writeable Address for drive_role == 5 */
|
||||
off_t role_5_nwa;
|
||||
/* ts B10314 : Next Writeable Address for drive_role == 5 */
|
||||
int role_5_nwa;
|
||||
|
||||
/* ts B60730 */
|
||||
int do_no_immed;
|
||||
@ -394,7 +387,7 @@ struct burn_drive
|
||||
struct burn_disc *disc; /* disc structure */
|
||||
int block_types[4];
|
||||
struct buffer *buffer;
|
||||
struct burn_progress_v2 progress;
|
||||
struct burn_progress progress;
|
||||
|
||||
/* To be used by mmc.c, sbc.c, spc.c for SCSI commands where the struct
|
||||
content surely does not have to persist while another command gets
|
||||
@ -437,19 +430,6 @@ struct burn_drive
|
||||
/* ts B00225 */
|
||||
pthread_t thread_tid;
|
||||
|
||||
/* ts B90513 */
|
||||
unsigned int write_retry_count;
|
||||
|
||||
/* ts C00806 */
|
||||
/* 0=no change, 1=change, -1=already urged OS to revalidate medium */
|
||||
int medium_state_changed;
|
||||
|
||||
/* ts C00822 */
|
||||
/* If set, use Exact bit with SET STREAMING and use SET STREAMING
|
||||
even if the medium is a CD.
|
||||
*/
|
||||
int set_streaming_exact_bit;
|
||||
int set_streaming_err;
|
||||
|
||||
/* transport functions */
|
||||
int (*grab) (struct burn_drive *);
|
||||
@ -467,7 +447,7 @@ struct burn_drive
|
||||
/* ts A61021 */
|
||||
void (*read_atip) (struct burn_drive *);
|
||||
|
||||
int (*write) (struct burn_drive *, off_t, struct buffer *);
|
||||
int (*write) (struct burn_drive *, int, struct buffer *);
|
||||
void (*read_toc) (struct burn_drive *);
|
||||
void (*lock) (struct burn_drive *);
|
||||
void (*unlock) (struct burn_drive *);
|
||||
|
||||
@ -195,8 +195,7 @@ char *burn_guess_manufacturer(int prf,
|
||||
{"RITEK", 5, "Ritek Corp"},
|
||||
{"SONY", 4, "Sony Corporation"},
|
||||
{"TDK", 3, "TDK Corporation"},
|
||||
{"TTG", 3, "TDK Corporation"},
|
||||
{"TTH", 3, "TDK Corporation"},
|
||||
{"TT", 8, "TDK Corporation"},
|
||||
{"TY", 8, "Taiyo Yuden Company Limited"},
|
||||
{"TYG", 3, "Taiyo Yuden Company Limited"},
|
||||
{"UME", 3, "UmeDisc Limited"},
|
||||
|
||||
194
libburn/write.c
194
libburn/write.c
@ -1,7 +1,7 @@
|
||||
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
|
||||
|
||||
/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
|
||||
Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Copyright (c) 2006 - 2017 Thomas Schmitt <scdbackup@gmx.net>
|
||||
Provided under GPL version 2 or later.
|
||||
*/
|
||||
|
||||
@ -440,7 +440,7 @@ static int add_isrc_cue(struct cue_sheet *sheet, unsigned char ctladr, int tno,
|
||||
{
|
||||
unsigned char *unit;
|
||||
int i, ret;
|
||||
char text[8 + 21]; /* should suffice for 64 bit oversize */
|
||||
char text[8];
|
||||
|
||||
ret = new_cue(sheet, 2, 0);
|
||||
if (ret <= 0)
|
||||
@ -454,9 +454,6 @@ static int add_isrc_cue(struct cue_sheet *sheet, unsigned char ctladr, int tno,
|
||||
unit[5] = isrc->owner[1];
|
||||
unit[6] = isrc->owner[2];
|
||||
sprintf(text, "%-2.2u%-5.5u", (unsigned int) isrc->year, isrc->serial);
|
||||
sprintf(text, "%-2.2u", (unsigned int) isrc->year);
|
||||
sprintf(text + 2, "%-5.5u", isrc->serial);
|
||||
text[7] = 0;
|
||||
unit[7] = text[0];
|
||||
for (i = 1; i < 7; i++)
|
||||
unit[9 + i] = text[i];
|
||||
@ -630,13 +627,11 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
|
||||
track length.
|
||||
*/
|
||||
track_length = burn_track_get_sectors_2(tar[i], 1);
|
||||
if (track_length < 0)
|
||||
goto failed;
|
||||
if (track_length < 300 && !burn_track_is_open_ended(tar[i])) {
|
||||
track_length = 300;
|
||||
if (!tar[i]->pad)
|
||||
tar[i]->pad = 1;
|
||||
burn_track_set_sectors(tar[i], (off_t) track_length);
|
||||
burn_track_set_sectors(tar[i], track_length);
|
||||
}
|
||||
|
||||
type_to_form(tar[i]->mode, &ctladr, &form);
|
||||
@ -725,7 +720,7 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
|
||||
runtime += 150;
|
||||
} else if (pform != form) {
|
||||
|
||||
/* ts A70121 : This seems to be the wrong test. Correct would
|
||||
/* ts A70121 : This seems to be thw wrong test. Correct would
|
||||
be to compare tar[]->mode or bit2 of ctladr.
|
||||
*/
|
||||
|
||||
@ -1027,7 +1022,7 @@ static int burn_write_leadin_cdtext(struct burn_write_opts *o,
|
||||
}
|
||||
#endif /* Libburn_debug_cd_texT */
|
||||
|
||||
err = d->write(d, (off_t) write_lba, buf);
|
||||
err = d->write(d, write_lba, buf);
|
||||
if (err == BE_CANCELLED)
|
||||
{ ret = 0; goto ex; }
|
||||
write_lba += sectors;
|
||||
@ -1074,10 +1069,10 @@ ex:;
|
||||
}
|
||||
|
||||
|
||||
/* ts A61218 / C40303 : outsourced from burn_write_track() */
|
||||
/* ts A61218 : outsourced from burn_write_track() */
|
||||
int burn_disc_init_track_status(struct burn_write_opts *o,
|
||||
struct burn_session *s, struct burn_track *t,
|
||||
int tnum, off_t sectors)
|
||||
int tnum, int sectors)
|
||||
{
|
||||
struct burn_drive *d = o->drive;
|
||||
|
||||
@ -1179,8 +1174,8 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
|
||||
|
||||
/* <<< */
|
||||
sprintf(msg,
|
||||
"TAO pre-track %2.2d : get_nwa(%d)=%d, d=%.f , demand=%.f , cap=%.f\n",
|
||||
tnum+1, nwa, ret, (double) d->nwa,
|
||||
"TAO pre-track %2.2d : get_nwa(%d)=%d, d=%d , demand=%.f , cap=%.f\n",
|
||||
tnum+1, nwa, ret, d->nwa,
|
||||
(double) burn_track_get_sectors_2(t, 1) * 2048.0,
|
||||
(double) d->media_capacity_remaining);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
@ -1205,11 +1200,9 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
|
||||
/* user data */
|
||||
|
||||
sectors = burn_track_get_sectors_2(t, 1);
|
||||
if (sectors < 0)
|
||||
{ ret = 0; goto ex; }
|
||||
open_ended = burn_track_is_open_ended(t);
|
||||
|
||||
burn_disc_init_track_status(o, s, t, tnum, (off_t) sectors);
|
||||
burn_disc_init_track_status(o, s, t, tnum, sectors);
|
||||
|
||||
/* ts A61030 : this cannot happen. tnum is always < s->tracks */
|
||||
if (tnum == s->tracks)
|
||||
@ -1358,7 +1351,7 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
|
||||
d->progress.buffer_capacity = 0;
|
||||
d->progress.buffer_available = 0;
|
||||
d->progress.buffered_bytes = 0;
|
||||
d->progress.buffer_min_fill = 0x7fffffffffffffff;
|
||||
d->progress.buffer_min_fill = 0xffffffff;
|
||||
|
||||
/* ts A70711 */
|
||||
d->pessimistic_buffer_free = 0;
|
||||
@ -1383,7 +1376,6 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
|
||||
ret = burn_write_opts_clone(o, &(d->write_opts), 0);
|
||||
if (ret <= 0)
|
||||
return ret;
|
||||
d->write_retry_count = 0;
|
||||
|
||||
d->busy = BURN_DRIVE_WRITING;
|
||||
|
||||
@ -1570,8 +1562,8 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
|
||||
d->send_write_parameters(d, NULL, -1, o);
|
||||
ret = d->get_nwa(d, -1, &lba, &nwa);
|
||||
sprintf(msg,
|
||||
"DVD pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %.f",
|
||||
tnum+1, nwa, ret, (double) d->nwa);
|
||||
"DVD pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %d",
|
||||
tnum+1, nwa, ret, d->nwa);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
|
||||
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg,0,0);
|
||||
if (nwa > d->nwa)
|
||||
@ -1595,8 +1587,6 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
|
||||
if (o->write_type == BURN_WRITE_SAO) { /* DAO */
|
||||
size = ((off_t) burn_track_get_sectors_2(s->track[tnum], 1))
|
||||
* (off_t) 2048;
|
||||
if (size < 0)
|
||||
{ret = 0; goto ex;}
|
||||
|
||||
/* Eventually round track size up to write chunk */
|
||||
if (o->obs_pad && (size % o->obs))
|
||||
@ -1632,8 +1622,8 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
|
||||
BURN_ALLOC_MEM(msg, char, 160);
|
||||
ret = d->get_nwa(d, -1, &lba, &nwa);
|
||||
sprintf(msg,
|
||||
"DVD+R pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %.f",
|
||||
tnum+1, nwa, ret, (double) d->nwa);
|
||||
"DVD+R pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %d",
|
||||
tnum+1, nwa, ret, d->nwa);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
|
||||
LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg,0,0);
|
||||
if (nwa > d->nwa)
|
||||
@ -1646,8 +1636,6 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
|
||||
/* Reserve track */
|
||||
size = ((off_t) burn_track_get_sectors_2(s->track[tnum], 1))
|
||||
* (off_t) 2048;
|
||||
if (size < 0)
|
||||
{ret = 0; goto ex;}
|
||||
if (o->obs_pad) {
|
||||
/* Round track size up to write chunk size */
|
||||
/* o->obs should be 32k or 64k already. But 32k
|
||||
@ -1658,6 +1646,16 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
|
||||
size += (off_t) (o->obs - (size % o->obs));
|
||||
}
|
||||
|
||||
/* <<< Only for now until the first DVD+R succeeded */
|
||||
if (!o->obs_pad) {
|
||||
sprintf(msg, "Program error: encountered DVD+R without chunk padding");
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x00000004,
|
||||
LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
{ret = 0; goto ex;}
|
||||
}
|
||||
|
||||
ret = d->reserve_track(d, size);
|
||||
if (ret <= 0) {
|
||||
sprintf(msg, "Cannot reserve track of %.f bytes",
|
||||
@ -1704,7 +1702,7 @@ int burn_disc_close_track_dvd_minus_r(struct burn_write_opts *o, int tnum)
|
||||
int burn_disc_finalize_dvd_plus_r(struct burn_write_opts *o)
|
||||
{
|
||||
struct burn_drive *d = o->drive;
|
||||
char msg[40 + 80]; /* filltext + profile */
|
||||
char msg[80];
|
||||
|
||||
sprintf(msg, "Finalizing %s ...",
|
||||
d->current_profile_text);
|
||||
@ -1897,14 +1895,11 @@ int burn_dvd_write_track(struct burn_write_opts *o,
|
||||
struct buffer *out = d->buffer;
|
||||
int sectors;
|
||||
int i, open_ended = 0, ret= 0, is_flushed = 0, track_open = 0;
|
||||
off_t first_buf_cap = 0, further_cap = 0, buf_cap_step = 1024;
|
||||
int first_buf_cap = 0, further_cap = 0, buf_cap_step = 1024;
|
||||
|
||||
/* ts A70213 : eventually expand size of track to max */
|
||||
burn_track_apply_fillup(t, d->media_capacity_remaining, 0);
|
||||
|
||||
/* ts C00806 : Consider the track state changed by try to open */
|
||||
d->medium_state_changed = 1;
|
||||
|
||||
if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
|
||||
d->current_profile == 0x15) {
|
||||
/* DVD-R, DVD-RW Sequential, DVD-R/DL Sequential */
|
||||
@ -1930,13 +1925,11 @@ int burn_dvd_write_track(struct burn_write_opts *o,
|
||||
track_open = 1;
|
||||
|
||||
sectors = burn_track_get_sectors_2(t, 1);
|
||||
if (sectors < 0)
|
||||
{ret = 0; goto ex;}
|
||||
open_ended = burn_track_is_open_ended(t);
|
||||
|
||||
/* (offset padding is done within sector_data()) */
|
||||
|
||||
burn_disc_init_track_status(o, s, t, tnum, (off_t) sectors);
|
||||
burn_disc_init_track_status(o, s, t, tnum, sectors);
|
||||
for (i = 0; open_ended || i < sectors; i++) {
|
||||
|
||||
/* From time to time inquire drive buffer */
|
||||
@ -2100,7 +2093,7 @@ int burn_dvd_write_session(struct burn_write_opts *o,
|
||||
is not readable.
|
||||
|
||||
By default the open session gets closed here before the new
|
||||
session is written. E.g. after writing a small dummy session
|
||||
session is written. E.g. after writing a small dummy seesion
|
||||
number 2 one can read session 1 and write session 3 which
|
||||
points to data of session 1.
|
||||
|
||||
@ -2233,8 +2226,7 @@ int burn_disc_setup_dvd_minus_rw(struct burn_write_opts *o,
|
||||
if (o->start_byte >= 0) {
|
||||
d->nwa = o->start_byte / 32768; /* align to 32 kB */
|
||||
|
||||
sprintf(msg, "Write start address is %.f * 32768",
|
||||
(double) d->nwa);
|
||||
sprintf(msg, "Write start address is %d * 32768", d->nwa);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x00020127,
|
||||
LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
@ -2336,8 +2328,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
|
||||
d->nwa = 0;
|
||||
if (o->start_byte >= 0) {
|
||||
d->nwa = o->start_byte / 2048;
|
||||
sprintf(msg, "Write start address is %.f * 2048",
|
||||
(double) d->nwa);
|
||||
sprintf(msg, "Write start address is %d * 2048",
|
||||
d->nwa);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x00020127,
|
||||
LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
@ -2427,17 +2419,9 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
|
||||
msg, 0, 0);
|
||||
goto early_failure;
|
||||
}
|
||||
/* Unaligned BD-R track end works with various drives and
|
||||
produces exact READ CAPACITY results.
|
||||
Nevertheless stream recording hates unaligned WRITE.
|
||||
With DVD+R it seems that obs_pad is silently applied by the
|
||||
drive if a non-aligned final WRITE is received.
|
||||
*/
|
||||
if (o->obs_pad < 2 &&
|
||||
!(d->current_profile == 0x41 && !d->do_stream_recording &&
|
||||
o->bdr_obs_exempt))
|
||||
/* ??? padding needed ??? cowardly doing it for now */
|
||||
if (o->obs_pad < 2)
|
||||
o->obs_pad = 1; /* fill-up track's last obs buffer */
|
||||
|
||||
if (d->current_profile == 0x41) /* BD-R */
|
||||
o->obs = Libburn_bd_r_obS;
|
||||
if (d->do_stream_recording) {
|
||||
@ -2659,7 +2643,7 @@ ex:;
|
||||
|
||||
|
||||
/* ts A70910 : to be used as burn_drive.write(), emulating mmc_write() */
|
||||
int burn_stdio_mmc_write(struct burn_drive *d, off_t start, struct buffer *buf)
|
||||
int burn_stdio_mmc_write(struct burn_drive *d, int start, struct buffer *buf)
|
||||
{
|
||||
int ret;
|
||||
off_t start_byte;
|
||||
@ -2702,7 +2686,7 @@ int burn_stdio_mmc_write(struct burn_drive *d, off_t start, struct buffer *buf)
|
||||
|
||||
/* ts A70910 : to be used as burn_drive.write(),
|
||||
emulating mmc_write() with simulated writing. */
|
||||
int burn_stdio_mmc_dummy_write(struct burn_drive *d, off_t start,
|
||||
int burn_stdio_mmc_dummy_write(struct burn_drive *d, int start,
|
||||
struct buffer *buf)
|
||||
{
|
||||
if (d->cancel)
|
||||
@ -2774,57 +2758,30 @@ void burn_stdio_mmc_sync_cache(struct burn_drive *d)
|
||||
}
|
||||
|
||||
|
||||
/* ts C00824 : API */
|
||||
/* Enforces nominal write speed */
|
||||
int burn_nominal_slowdown(int kb_per_second, int max_corr,
|
||||
struct timeval *prev_time,
|
||||
int *us_corr, off_t b_since_prev, int flag)
|
||||
/* ts A70912 */
|
||||
/* Enforces eventual nominal write speed.
|
||||
@param flag bit0= initialize *prev_time */
|
||||
int burn_stdio_slowdown(struct burn_drive *d, struct timeval *prev_time,
|
||||
int amount, int flag)
|
||||
{
|
||||
struct timeval tnow;
|
||||
double to_wait, goal, corr;
|
||||
int abs_max_corr;
|
||||
double to_wait;
|
||||
|
||||
if (flag & 1) {
|
||||
gettimeofday(prev_time, NULL);
|
||||
*us_corr = 0;
|
||||
return 1;
|
||||
}
|
||||
if (kb_per_second <= 0)
|
||||
if(d->nominal_write_speed <= 0)
|
||||
return 2;
|
||||
|
||||
if (max_corr < -1.0e9 || max_corr > 1.0e9)
|
||||
abs_max_corr = 1000000000;
|
||||
else
|
||||
abs_max_corr = abs(max_corr);
|
||||
gettimeofday(&tnow, NULL);
|
||||
goal = ((double) b_since_prev) / 1000.0 / ((double) kb_per_second) +
|
||||
((double) prev_time->tv_sec) +
|
||||
((double) prev_time->tv_usec) / 1.0e6 +
|
||||
((double) *us_corr) / 1.0e6 ;
|
||||
to_wait = goal - ((double) tnow.tv_sec) -
|
||||
((double) tnow.tv_usec) / 1.0e6;
|
||||
|
||||
/* usleep might be restricted to 999999 microseconds */
|
||||
while (to_wait > 0.0) {
|
||||
if (to_wait >= 0.5) {
|
||||
usleep(500000);
|
||||
to_wait -= 0.5;
|
||||
} else if (to_wait >= 0.00001) {
|
||||
to_wait = ( ((double) amount) / (double) d->nominal_write_speed ) -
|
||||
(double) ( tnow.tv_sec - prev_time->tv_sec ) -
|
||||
(double) ( tnow.tv_usec - prev_time->tv_usec ) / 1.0e6
|
||||
- 0.001; /* best would be 1 / kernel granularity HZ */
|
||||
if (to_wait >= 0.0001) {
|
||||
usleep((int) (to_wait * 1000000.0));
|
||||
to_wait = 0.0;
|
||||
} else {
|
||||
to_wait = 0.0;
|
||||
}
|
||||
}
|
||||
gettimeofday(prev_time, NULL);
|
||||
corr = (goal - ((double) prev_time->tv_sec) -
|
||||
((double) prev_time->tv_usec) / 1.0e6) * 1.0e6;
|
||||
if (corr > abs_max_corr)
|
||||
*us_corr = abs_max_corr;
|
||||
else if (corr < -abs_max_corr)
|
||||
*us_corr = -abs_max_corr;
|
||||
else
|
||||
*us_corr = corr;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -2833,20 +2790,17 @@ int burn_nominal_slowdown(int kb_per_second, int max_corr,
|
||||
int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
|
||||
int tnum, int flag)
|
||||
{
|
||||
int open_ended, bufsize = 16 * 2048, ret;
|
||||
int open_ended, bufsize = 16 * 2048, ret, sectors;
|
||||
struct burn_track *t = s->track[tnum];
|
||||
struct burn_drive *d = o->drive;
|
||||
char *buf = NULL;
|
||||
int us_corr = 0, max_corr = 250000;
|
||||
off_t prev_sync_sector = 0, sectors, i;
|
||||
int i, prev_sync_sector = 0;
|
||||
struct buffer *out = d->buffer;
|
||||
struct timeval prev_time;
|
||||
|
||||
BURN_ALLOC_MEM(buf, char, bufsize);
|
||||
|
||||
sectors = burn_track_get_sectors_2_v2(t, 1);
|
||||
if (sectors < 0)
|
||||
{ret = 0; goto ex;}
|
||||
sectors = burn_track_get_sectors_2(t, 1);
|
||||
burn_disc_init_track_status(o, s, t, tnum, sectors);
|
||||
open_ended = burn_track_is_open_ended(t);
|
||||
|
||||
@ -2860,10 +2814,7 @@ int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
|
||||
d->do_simulate = o->simulate;
|
||||
d->sync_cache = burn_stdio_mmc_sync_cache;
|
||||
|
||||
/* initialize */
|
||||
burn_nominal_slowdown(d->nominal_write_speed, max_corr,
|
||||
&prev_time, &us_corr, (off_t) 0, 1);
|
||||
|
||||
burn_stdio_slowdown(d, &prev_time, 0, 1); /* initialize */
|
||||
for (i = 0; open_ended || i < sectors; i++) {
|
||||
/* transact a (CD sized) sector */
|
||||
if (!sector_data(o, t, 0))
|
||||
@ -2876,25 +2827,14 @@ int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
|
||||
}
|
||||
d->progress.sector++;
|
||||
/* Flush to disk from time to time */
|
||||
if (o->stdio_fsync_size > 0) {
|
||||
if (d->progress.sector - prev_sync_sector >=
|
||||
o->stdio_fsync_size) {
|
||||
if (!o->simulate)
|
||||
burn_stdio_sync_cache(d->stdio_fd, d,
|
||||
1);
|
||||
burn_nominal_slowdown(
|
||||
d->nominal_write_speed, max_corr,
|
||||
&prev_time, &us_corr,
|
||||
(off_t) (d->progress.sector -
|
||||
prev_sync_sector) *
|
||||
(off_t) 2048,
|
||||
0);
|
||||
o->stdio_fsync_size && o->stdio_fsync_size > 0) {
|
||||
prev_sync_sector = d->progress.sector;
|
||||
if (!o->simulate)
|
||||
burn_stdio_sync_cache(d->stdio_fd, d, 1);
|
||||
}
|
||||
} else if ((d->progress.sector % 512) == 0) {
|
||||
burn_nominal_slowdown(d->nominal_write_speed, max_corr,
|
||||
&prev_time, &us_corr, (off_t) (512 * 2048), 0);
|
||||
}
|
||||
if ((d->progress.sector % 512) == 0)
|
||||
burn_stdio_slowdown(d, &prev_time, 512 * 2, 0);
|
||||
}
|
||||
|
||||
/* Pad up buffer to next full o->obs (usually 32 kB) */
|
||||
@ -2982,7 +2922,7 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
|
||||
struct buffer *buffer_mem = o->drive->buffer;
|
||||
struct burn_session *s;
|
||||
struct burn_track *lt, *t;
|
||||
int first = 1, i, ret, lba, nwa = 0, multi_mem, stream_recording_start;
|
||||
int first = 1, i, ret, lba, nwa = 0, multi_mem;
|
||||
off_t default_size;
|
||||
char msg[80];
|
||||
|
||||
@ -2994,13 +2934,12 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
|
||||
/* ts A61224 */
|
||||
burn_disc_init_write_status(o, disc); /* must be done very early */
|
||||
|
||||
/* ts A80412 , A90227 , B90411 */
|
||||
/* ts A80412 , A90227 */
|
||||
d->do_stream_recording = !!o->do_stream_recording;
|
||||
if (o->do_stream_recording >= 16)
|
||||
stream_recording_start = o->do_stream_recording;
|
||||
d->stream_recording_start = o->do_stream_recording;
|
||||
else
|
||||
stream_recording_start = 0;
|
||||
burn_drive_set_stream_recording(d, !!o->do_stream_recording,
|
||||
stream_recording_start, 0);
|
||||
d->stream_recording_start = 0;
|
||||
|
||||
/* ts A91122 : Get buffer suitable for sources made by
|
||||
burn_os_open_track_src() */
|
||||
@ -3130,7 +3069,6 @@ return crap. so we send the command, then ignore the result.
|
||||
/* goto fail_wo_sync; */
|
||||
#endif /* Libburn_write_with_function_print_cuE */
|
||||
|
||||
d->medium_state_changed = 1;
|
||||
ret = 1;
|
||||
if (o->write_type == BURN_WRITE_SAO)
|
||||
ret = d->send_cue_sheet(d, sheet);
|
||||
@ -3252,14 +3190,6 @@ ex:;
|
||||
burn_write_opts_free(d->write_opts);
|
||||
d->write_opts = NULL;
|
||||
}
|
||||
if (d->write_retry_count > 0) {
|
||||
sprintf(msg, "WRITE command repetition happened %u times",
|
||||
d->write_retry_count);
|
||||
libdax_msgs_submit(libdax_messenger, d->global_index,
|
||||
0x000201ad,
|
||||
LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
|
||||
msg, 0, 0);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user