Browse Source

Changed docs and comments to "GNU/Linux" where appropriate

tags/ZeroSevenEight
Thomas Schmitt 10 years ago
parent
commit
bd017a108e
15 changed files with 31 additions and 30 deletions
  1. +1
    -1
      cdrskin/cdrskin_timestamp.h
  2. +2
    -1
      libburn/cleanup.c
  3. +1
    -1
      libburn/drive.c
  4. +5
    -3
      libburn/init.c
  5. +6
    -8
      libburn/libburn.h
  6. +1
    -1
      libburn/mmc.c
  7. +1
    -1
      libburn/os-libcdio.h
  8. +1
    -1
      libburn/os-linux.h
  9. +2
    -2
      libburn/os.h
  10. +1
    -1
      libburn/read.c
  11. +1
    -1
      libburn/sg-libcdio.c
  12. +3
    -3
      libburn/sg-linux.c
  13. +2
    -2
      libburn/sg.c
  14. +1
    -1
      libburn/toc.c
  15. +3
    -3
      libburn/write.c

+ 1
- 1
cdrskin/cdrskin_timestamp.h View File

@@ -1 +1 @@
#define Cdrskin_timestamP "2010.02.12.173236"
#define Cdrskin_timestamP "2010.02.12.212818"

+ 2
- 1
libburn/cleanup.c View File

@@ -40,7 +40,8 @@ static int non_signal_list_count= BURN_OS_NON_SIGNAL_COUNT;
#else /* ! Cleanup_has_no_libburn_os_H */


/* Outdated. Linux only. For backward compatibility with pre-libburn-0.2.3 */
/* Outdated. GNU/Linux only.
For backward compatibility with pre-libburn-0.2.3 */

/* Signals to be caught */
static int signal_list[]= {


+ 1
- 1
libburn/drive.c View File

@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <sys/stat.h>

/* #include <m alloc.h> ts A61013 : not in Linux man 3 malloc */
/* #include <m alloc.h> ts A61013 : not in GNU/Linux man 3 malloc */

#include <stdlib.h>
#include <unistd.h>


+ 5
- 3
libburn/init.c View File

@@ -32,14 +32,16 @@ struct libdax_msgs *libdax_messenger= NULL;

int burn_running = 0;

/* ts A60813 : Linux: wether to use O_EXCL on open() of device files */
/* ts A60813 : GNU/Linux: whether to use O_EXCL on open() of device files
ts B00212 : FreeBSD: whether to use flock(LOCK_EX) after open()
*/
int burn_sg_open_o_excl = 1;

/* ts A70403 : Linux: wether 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;

/* ts A70314 : Linux: what device family to use :
/* ts A70314 : GNU/Linux: what device family to use :
0= default family
1= sr
2= scd


+ 6
- 8
libburn/libburn.h View File

@@ -765,7 +765,7 @@ int burn_abort_pacifier(void *handle, int patience, int elapsed);
void burn_set_verbosity(int level);

/* ts A91111 */
/** Enable resp. disable logging of SCSI commands (currently Linux only).
/** Enable resp. disable logging of SCSI commands (currently GNU/Linux only).
This call can be made at any time - even before burn_initialize().
It is in effect for all active drives and currently not very thread
safe for multiple drives.
@@ -782,12 +782,11 @@ void burn_set_scsi_logging(int flag);
after burn_initialize() and before any bus scan. But not mandatory at all.
Parameter value 1 enables a feature, 0 disables.
Default is (1,0,0). Have a good reason before you change it.
@param exclusive Linux only:
@param exclusive
0 = no attempt to make drive access exclusive.
1 = Try to open only devices which are not marked as busy
and try to mark them busy if opened sucessfully. (O_EXCL)
There are kernels which simply don't care about O_EXCL.
Some have it off, some have it on, some are switchable.
and try to mark them busy if opened sucessfully. (O_EXCL
on GNU/Linux , flock(LOCK_EX) on FreeBSD.)
2 = in case of a SCSI device, also try to open exclusively
the matching /dev/sr, /dev/scd and /dev/st .
One may select a device SCSI file family by adding
@@ -796,8 +795,8 @@ void burn_set_scsi_logging(int flag);
8 = /dev/scd%d
16 = /dev/sg%d
Do not use other values !
Add 32 to demand an exclusive lock by fcntl(,F_SETLK,)
after open() has succeeded.
Add 32 to demand on GNU/Linux an exclusive lock by
fcntl(,F_SETLK,) after open() has succeeded.
@param blocking Try to wait for drives which do not open immediately but
also do not return an error as well. (O_NONBLOCK)
This might stall indefinitely with /dev/hdX hard disks.
@@ -1097,7 +1096,6 @@ int burn_drive_snooze(struct burn_drive *d, int flag);

/** Release a drive. This should not be done until the drive is no longer
busy (see burn_drive_get_status).
Linux: The drive device file is not reserved afterwards. (O_EXCL, F_SETLK).
@param drive The drive to release.
@param eject Nonzero to make the drive eject the disc in it.
*/


+ 1
- 1
libburn/mmc.c View File

@@ -4078,7 +4078,7 @@ int mmc_read_disc_structure(struct burn_drive *d,
desired payload bytes. The drive then returns 35
bytes as requested and the media id is "RITEKF1".
Nevertheless this is not a generally usable gesture
because older Linux USB dislikes requests to fetch
because older GNU/Linux USB dislikes requests to fetch
more bytes than the drive will deliver.

# define Libburn_enforce_structure_code_0x0E 1


+ 1
- 1
libburn/os-libcdio.h View File

@@ -41,7 +41,7 @@ SIGKILL, SIGCHLD, SIGSTOP
/* Important : MUST be at least 32768 ! */
/* My Blu-ray burner LG GGW-H20 writes junk if stream recording is combined
with buffer size 32 kB. So stream recording is allowed only with size 64k.
This makes it worth to have a special case for Linux buffer size here.
This makes it worth to have a special case for GNU/Linux buffer size here.
*/
#ifdef __linux
#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536


+ 1
- 1
libburn/os-linux.h View File

@@ -2,7 +2,7 @@
/* os-linux.h
Operating system specific libburn definitions and declarations. Included
by os.h in case of compilation for
GNU/Linux kernels 2.4 and 2.6 with Linux SCSI Generic (sg)
Linux kernels 2.4 and 2.6, GNU/Linux SCSI Generic (sg)

Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
*/


+ 2
- 2
libburn/os.h View File

@@ -3,7 +3,7 @@
Operating system specific libburn definitions and declarations.
The macros defined here are used by libburn modules in order to
avoid own system dependent case distinctions.
Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
*/

#ifndef BURN_OS_H_INCLUDED
@@ -41,7 +41,7 @@
#ifdef __linux


/* --------- Linux kernels 2.4 and 2.6 with Linux SCSI Generic (sg) -------- */
/* ------- Linux kernels 2.4 and 2.6 with GNU/Linux SCSI Generic (sg) ------ */
#include "os-linux.h"




+ 1
- 1
libburn/read.c View File

@@ -1,6 +1,6 @@
/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */

/* #include <m alloc.h> ts A61013 : not in Linux man 3 malloc */
/* #include <m alloc.h> ts A61013 : not in GNU/Linux man 3 malloc */

#include <stdlib.h>
#include <unistd.h>


+ 1
- 1
libburn/sg-libcdio.c View File

@@ -834,7 +834,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)

#ifdef __linux

/* Linux specific determination of block device size */
/* GNU/Linux specific determination of block device size */
} else if(S_ISBLK(stbuf.st_mode)) {
int open_mode = O_RDONLY, fd, ret;



+ 3
- 3
libburn/sg-linux.c View File

@@ -143,7 +143,7 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
#include <linux/cdrom.h>


/** Indication of the GNU/Linux kernel this software is running on */
/** Indication of the Linux kernel this software is running on */
/* -1 = not evaluated , 0 = unrecognizable , 1 = 2.4 , 2 = 2.6 */
static int sg_kernel_age = -1;

@@ -543,7 +543,7 @@ static int sg_open_drive_fd(char *fname, int scan_mode)

/* ts A60813 - A60927
O_EXCL with devices is a non-POSIX feature
of GNU/Linux kernels. Possibly introduced 2002.
of Linux kernels. Possibly introduced 2002.
Mentioned in "The Linux SCSI Generic (sg) HOWTO" */
if(burn_sg_open_o_excl)
open_mode |= O_EXCL;
@@ -1657,7 +1657,7 @@ int sg_grab(struct burn_drive *d)

/* ts A60813 - A60927
O_EXCL with devices is a non-POSIX feature
of GNU/Linux kernels. Possibly introduced 2002.
of Linux kernels. Possibly introduced 2002.
Mentioned in "The Linux SCSI Generic (sg) HOWTO".
*/
if(burn_sg_open_o_excl)


+ 2
- 2
libburn/sg.c View File

@@ -34,11 +34,11 @@
static int intentional_compiler_warning(void)
{
int INTENTIONAL_COMPILER_WARNING_;
int Cannot_recognize_Linux_nor_FreeBSD_;
int Cannot_recognize_GNU_Linux_nor_FreeBSD_;
int Have_to_use_dummy_MMC_transport_adapter_;
int This_libburn_will_not_be_able_to_operate_on_real_CD_drives;
int Have_to_use_dummy_MMC_transport_adapter;
int Cannot_recognize_Linux_nor_FreeBSD;
int Cannot_recognize_GNU_Linux_nor_FreeBSD;
int INTENTIONAL_COMPILER_WARNING;

return(0);


+ 1
- 1
libburn/toc.c View File

@@ -130,7 +130,7 @@ void toc_find_modes(struct burn_drive *d)
} else {

t->mode = BURN_MODE1;
/* ts A70519 : this does not work with Linux 2.4 USB because one cannot
/* ts A70519 : this does not work with GNU/Linux 2.4 USB because one cannot
predict the exact dxfer_size without knowing the sector type.
mem.sectors = 1;
d->read_sectors(d, lba, mem.sectors, &o, &mem);


+ 3
- 3
libburn/write.c View File

@@ -1263,8 +1263,8 @@ int burn_disc_close_track_dvd_plus_r(struct burn_write_opts *o,

/* ts A91114 : EXPERIMENTAL, NOT COMPLETELY IMPLEMENTED

Simplified data transmission for DVD. libburn via Linux USB is 30 % slower
than growisofs or cdrecord when transmitting 32 KB chunks.
Simplified data transmission for DVD. libburn via GNU/Linux USB is 30 %
slower than growisofs or cdrecord when transmitting 32 KB chunks.
With 64 KB chunks it is 20% faster than the competitors.
No heavy CPU load is visible but there might be subtle race conditions in
the USB driver which work better with shorter time gaps between WRITE
@@ -2397,7 +2397,7 @@ calloc() seems not to have the desired effect. valgrind warns:
goto ex;
}

/* ts A70521 : Linux 2.4 USB audio fails with 64 kiB */
/* ts A70521 : GNU/Linux 2.4 USB audio fails with 64 kiB */
/* ts A80414 : might need 64 kiB for BD-RE streaming */
/* buffer flush trigger for sector.c:get_sector() */
o->obs = Libburn_cd_obS;


Loading…
Cancel
Save