cdda_interface.h   cdda_interface.h 
skipping to change at line 45 skipping to change at line 45
#define TEST_INTERFACE 2 #define TEST_INTERFACE 2
#define SGIO_SCSI 3 #define SGIO_SCSI 3
#define SGIO_SCSI_BUGGY1 4 #define SGIO_SCSI_BUGGY1 4
#define CDDA_MESSAGE_FORGETIT 0 #define CDDA_MESSAGE_FORGETIT 0
#define CDDA_MESSAGE_PRINTIT 1 #define CDDA_MESSAGE_PRINTIT 1
#define CDDA_MESSAGE_LOGIT 2 #define CDDA_MESSAGE_LOGIT 2
/* cdrom access function pointer */ /* cdrom access function pointer */
typedef struct cdda_private_data cdda_private_data_t;
typedef struct cdrom_drive{ typedef struct cdrom_drive{
int opened; /* This struct may just represent a candidate for opening */ int opened; /* This struct may just represent a candidate for opening */
char *cdda_device_name; char *cdda_device_name;
char *ioctl_device_name; char *ioctl_device_name;
int cdda_fd; int cdda_fd;
int ioctl_fd; int ioctl_fd;
skipping to change at line 85 skipping to change at line 87
int (*read_toc) (struct cdrom_drive *d); int (*read_toc) (struct cdrom_drive *d);
long (*read_audio) (struct cdrom_drive *d, void *p, long begin, long (*read_audio) (struct cdrom_drive *d, void *p, long begin,
long sectors); long sectors);
int (*set_speed) (struct cdrom_drive *d, int speed); int (*set_speed) (struct cdrom_drive *d, int speed);
int error_retry; int error_retry;
int report_all; int report_all;
int is_atapi; int is_atapi;
int is_mmc; int is_mmc;
/* SCSI command buffer and offset pointers */ cdda_private_data_t *c_private;
/* this should have been private hidden data, but it isn't. At void *reserved;
this point, sg and sg_buffer are treated internally as void *
pointing to internal private data, which is correct even if it is
semantically confusing. This problem will be corrected in the
next major release increment. */
unsigned char *sg;
unsigned char *sg_buffer;
unsigned char inqbytes[4]; unsigned char inqbytes[4];
/* Scsi parameters and state */ /* Scsi parameters and state */
unsigned char density; unsigned char density;
unsigned char orgdens; unsigned char orgdens;
unsigned int orgsize; unsigned int orgsize;
long bigbuff; long bigbuff;
int adjust_ssize; int adjust_ssize;
int fua; int fua;
skipping to change at line 128 skipping to change at line 124
extern cdrom_drive *cdda_identify_scsi(const char *generic_device, extern cdrom_drive *cdda_identify_scsi(const char *generic_device,
const char *ioctl_device, const char *ioctl_device,
int messagedest, char **message); int messagedest, char **message);
#ifdef CDDA_TEST #ifdef CDDA_TEST
extern cdrom_drive *cdda_identify_test(const char *filename, extern cdrom_drive *cdda_identify_test(const char *filename,
int messagedest, char **message); int messagedest, char **message);
#endif #endif
/******** Drive oriented functions */ /******** Drive oriented functions */
extern char *cdda_version();
extern int cdda_speed_set(cdrom_drive *d, int speed); extern int cdda_speed_set(cdrom_drive *d, int speed);
extern void cdda_verbose_set(cdrom_drive *d,int err_action, int mes_action) ; extern void cdda_verbose_set(cdrom_drive *d,int err_action, int mes_action) ;
extern char *cdda_messages(cdrom_drive *d); extern char *cdda_messages(cdrom_drive *d);
extern char *cdda_errors(cdrom_drive *d); extern char *cdda_errors(cdrom_drive *d);
extern int cdda_close(cdrom_drive *d); extern int cdda_close(cdrom_drive *d);
extern int cdda_open(cdrom_drive *d); extern int cdda_open(cdrom_drive *d);
extern long cdda_read(cdrom_drive *d, void *buffer, extern long cdda_read(cdrom_drive *d, void *buffer,
long beginsector, long sectors); long beginsector, long sectors);
extern long cdda_read_timed(cdrom_drive *d, void *buffer,
long beginsector, long sectors, int *millisecond
s);
extern long cdda_track_firstsector(cdrom_drive *d,int track); extern long cdda_track_firstsector(cdrom_drive *d,int track);
extern long cdda_track_lastsector(cdrom_drive *d,int track); extern long cdda_track_lastsector(cdrom_drive *d,int track);
extern long cdda_tracks(cdrom_drive *d); extern long cdda_tracks(cdrom_drive *d);
extern int cdda_sector_gettrack(cdrom_drive *d,long sector); extern int cdda_sector_gettrack(cdrom_drive *d,long sector);
extern int cdda_track_channels(cdrom_drive *d,int track); extern int cdda_track_channels(cdrom_drive *d,int track);
extern int cdda_track_audiop(cdrom_drive *d,int track); extern int cdda_track_audiop(cdrom_drive *d,int track);
extern int cdda_track_copyp(cdrom_drive *d,int track); extern int cdda_track_copyp(cdrom_drive *d,int track);
extern int cdda_track_preemp(cdrom_drive *d,int track); extern int cdda_track_preemp(cdrom_drive *d,int track);
extern long cdda_disc_firstsector(cdrom_drive *d); extern long cdda_disc_firstsector(cdrom_drive *d);
skipping to change at line 203 skipping to change at line 202
101: Drive is neither a CDROM nor a WORM device 101: Drive is neither a CDROM nor a WORM device
102: Permision denied on cdrom (ioctl) device 102: Permision denied on cdrom (ioctl) device
103: Permision denied on cdrom (data) device 103: Permision denied on cdrom (data) device
300: Kernel memory error 300: Kernel memory error
400: Device not open 400: Device not open
401: Invalid track number 401: Invalid track number
402: Track not audio data 402: Track not audio data
403: No audio tracks on disc 403: No audio tracks on disc
404: No medium present
405: Option not supported by drive
*/ */
#endif #endif
 End of changes. 5 change blocks. 
8 lines changed or deleted 10 lines changed or added


 cdda_paranoia.h   cdda_paranoia.h 
skipping to change at line 25 skipping to change at line 25
#define PARANOIA_CB_FIXUP_ATOM 3 #define PARANOIA_CB_FIXUP_ATOM 3
#define PARANOIA_CB_SCRATCH 4 #define PARANOIA_CB_SCRATCH 4
#define PARANOIA_CB_REPAIR 5 #define PARANOIA_CB_REPAIR 5
#define PARANOIA_CB_SKIP 6 #define PARANOIA_CB_SKIP 6
#define PARANOIA_CB_DRIFT 7 #define PARANOIA_CB_DRIFT 7
#define PARANOIA_CB_BACKOFF 8 #define PARANOIA_CB_BACKOFF 8
#define PARANOIA_CB_OVERLAP 9 #define PARANOIA_CB_OVERLAP 9
#define PARANOIA_CB_FIXUP_DROPPED 10 #define PARANOIA_CB_FIXUP_DROPPED 10
#define PARANOIA_CB_FIXUP_DUPED 11 #define PARANOIA_CB_FIXUP_DUPED 11
#define PARANOIA_CB_READERR 12 #define PARANOIA_CB_READERR 12
#define PARANOIA_CB_CACHEERR 13
#define PARANOIA_MODE_FULL 0xff #define PARANOIA_MODE_FULL 0xff
#define PARANOIA_MODE_DISABLE 0 #define PARANOIA_MODE_DISABLE 0
#define PARANOIA_MODE_VERIFY 1 #define PARANOIA_MODE_VERIFY 1
#define PARANOIA_MODE_FRAGMENT 2 #define PARANOIA_MODE_FRAGMENT 2
#define PARANOIA_MODE_OVERLAP 4 #define PARANOIA_MODE_OVERLAP 4
#define PARANOIA_MODE_SCRATCH 8 #define PARANOIA_MODE_SCRATCH 8
#define PARANOIA_MODE_REPAIR 16 #define PARANOIA_MODE_REPAIR 16
#define PARANOIA_MODE_NEVERSKIP 32 #define PARANOIA_MODE_NEVERSKIP 32
#ifndef CDP_COMPILE #ifndef CDP_COMPILE
typedef void cdrom_paranoia; typedef void cdrom_paranoia;
#endif #endif
#include <stdio.h>
extern char *paranoia_version();
extern cdrom_paranoia *paranoia_init(cdrom_drive *d); extern cdrom_paranoia *paranoia_init(cdrom_drive *d);
extern void paranoia_modeset(cdrom_paranoia *p,int mode); extern void paranoia_modeset(cdrom_paranoia *p,int mode);
extern long paranoia_seek(cdrom_paranoia *p,long seek,int mode); extern long paranoia_seek(cdrom_paranoia *p,long seek,int mode);
extern int16_t *paranoia_read(cdrom_paranoia *p,void(*callback)(long,int)); extern int16_t *paranoia_read(cdrom_paranoia *p,void(*callback)(long,int));
extern int16_t *paranoia_read_limited(cdrom_paranoia *p,void(*callback)(lon g,int),int maxretries); extern int16_t *paranoia_read_limited(cdrom_paranoia *p,void(*callback)(lon g,int),int maxretries);
extern void paranoia_free(cdrom_paranoia *p); extern void paranoia_free(cdrom_paranoia *p);
extern void paranoia_overlapset(cdrom_paranoia *p,long overlap); extern void paranoia_overlapset(cdrom_paranoia *p,long overlap);
extern int paranoia_cachemodel_size(cdrom_paranoia *p,int sectors);
#endif #endif
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/