diff --git a/lib/_cdio_generic.c b/lib/_cdio_generic.c index dacaa0ed..6baad6c7 100644 --- a/lib/_cdio_generic.c +++ b/lib/_cdio_generic.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_generic.c,v 1.3 2003/03/30 13:01:22 rocky Exp $ + $Id: _cdio_generic.c,v 1.4 2003/04/06 18:12:37 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.3 2003/03/30 13:01:22 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.4 2003/04/06 18:12:37 rocky Exp $"; #include "cdio_assert.h" #include "cdio_private.h" @@ -128,7 +128,7 @@ cdio_generic_read_mode2_sectors (CdIo *obj, void *buf, lsn_t lsn, bool mode2raw, unsigned num_sectors) { char *_buf = buf; - const int blocksize = mode2raw ? M2RAW_SECTOR_SIZE : M2F1_SECTOR_SIZE; + const int blocksize = mode2raw ? M2RAW_SECTOR_SIZE : CDIO_CD_FRAMESIZE; int n, rc; cdio_assert (obj != NULL); diff --git a/lib/_cdio_linux.c b/lib/_cdio_linux.c index 19c3986b..4e099961 100644 --- a/lib/_cdio_linux.c +++ b/lib/_cdio_linux.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_linux.c,v 1.6 2003/04/06 17:57:20 rocky Exp $ + $Id: _cdio_linux.c,v 1.7 2003/04/06 18:12:37 rocky Exp $ Copyright (C) 2001 Herbert Valerio Riedel Copyright (C) 2002,2003 Rocky Bernstein @@ -27,7 +27,7 @@ # include "config.h" #endif -static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.6 2003/04/06 17:57:20 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.7 2003/04/06 18:12:37 rocky Exp $"; #include "cdio_assert.h" #include "cdio_private.h" @@ -280,7 +280,7 @@ _cdio_read_mode2_sector (void *user_data, void *data, lsn_t lsn, if (mode2_form2) memcpy (data, buf, M2RAW_SECTOR_SIZE); else - memcpy (((char *)data), buf + 8, FORM1_DATA_SIZE); + memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE); return 0; } @@ -310,8 +310,8 @@ _cdio_read_mode2_sectors (void *user_data, void *data, lsn_t lsn, if ( (retval = _cdio_read_mode2_sector (_obj, buf, lsn + i, true)) ) return retval; - memcpy (((char *)data) + (FORM1_DATA_SIZE * i), buf + 8, - FORM1_DATA_SIZE); + memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i), + buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE); } } return 0; diff --git a/lib/_cdio_nrg.c b/lib/_cdio_nrg.c index 29a54083..f81f5920 100644 --- a/lib/_cdio_nrg.c +++ b/lib/_cdio_nrg.c @@ -1,5 +1,5 @@ /* - $Id: _cdio_nrg.c,v 1.6 2003/04/06 17:57:20 rocky Exp $ + $Id: _cdio_nrg.c,v 1.7 2003/04/06 18:12:37 rocky Exp $ Copyright (C) 2001,2003 Herbert Valerio Riedel @@ -38,7 +38,7 @@ #include "util.h" #include "_cdio_stdio.h" -static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.6 2003/04/06 17:57:20 rocky Exp $"; +static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.7 2003/04/06 18:12:37 rocky Exp $"; /* structures used */ @@ -526,10 +526,10 @@ _cdio_lseek (void *user_data, off_t offset, int whence) user_datasize=CDIO_CD_FRAMESIZE_RAW; break; case TRACK_FORMAT_CDI: - user_datasize=FORM1_DATA_SIZE; + user_datasize=CDIO_CD_FRAMESIZE; break; case TRACK_FORMAT_XA: - user_datasize=FORM1_DATA_SIZE; + user_datasize=CDIO_CD_FRAMESIZE; break; default: user_datasize=CDIO_CD_FRAMESIZE_RAW; @@ -617,9 +617,10 @@ _read_mode2_sector (void *user_data, void *data, lsn_t lsn, bool form2) cdio_warn ("reading into pre gap (lsn %d)", lsn); if (form2) - memcpy (data, buf + 12 + 4, M2RAW_SECTOR_SIZE); + memcpy (data, buf + CDIO_CD_SYNC_SIZE + CDIO_CD_HEADER_SIZE, + M2RAW_SECTOR_SIZE); else - memcpy (data, buf + 12 + 4 + 8, FORM1_DATA_SIZE); + memcpy (data, buf + CDIO_CD_XA_SYNC_HEADER, CDIO_CD_FRAMESIZE); return 0; } @@ -648,8 +649,8 @@ _read_mode2_sectors (void *user_data, void *data, uint32_t lsn, if ( (retval = _read_mode2_sector (_obj, buf, lsn + i, true)) ) return retval; - memcpy (((char *)data) + (FORM1_DATA_SIZE * i), buf + 8, - FORM1_DATA_SIZE); + memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i), + buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE); } } return 0; diff --git a/lib/sector.h b/lib/sector.h index 1d5c4d29..9b9202d7 100644 --- a/lib/sector.h +++ b/lib/sector.h @@ -1,5 +1,5 @@ /* - $Id: sector.h,v 1.5 2003/04/06 17:57:20 rocky Exp $ + $Id: sector.h,v 1.6 2003/04/06 18:12:37 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel Copyright (C) 2003 Rocky Bernstein @@ -106,9 +106,6 @@ /* The leadout track is always 0xAA, regardless of # of tracks on disc */ #define CDIO_CDROM_LEADOUT_TRACK 0xAA -#define M1F1_SECTOR_SIZE 2048 -#define M2F1_SECTOR_SIZE 2048 -#define FORM1_DATA_SIZE 2048 /* Mode 1 or Mode 2 user data */ #define M2F2_SECTOR_SIZE 2324 #define M2SUB_SECTOR_SIZE 2332 #define M2RAW_SECTOR_SIZE 2336 @@ -118,10 +115,12 @@ #define CDIO_CD_FRAMES_PER_MINUTE \ (CDIO_CD_FRAMES_PER_SEC*CDIO_CD_SECS_PER_MINUTE) -#define CD_74MIN_SECTORS (UINT32_C(74)*CDIO_CD_FRAMES_PER_MINUTE) -#define CD_80MIN_SECTORS (UINT32_C(80)*CDIO_CD_FRAMES_PER_MINUTE) -#define CD_90MIN_SECTORS (UINT32_C(90)*CD_FRAMES_PER_MINUTE) -#define CD_MAX_SECTORS (UINT32_C(100)*CD_FRAMES_PER_MINUTE-CDIO_PREGAP_SECTORS) +#define CDIO_CD_74MIN_SECTORS (UINT32_C(74)*CDIO_CD_FRAMES_PER_MINUTE) +#define CDIO_CD_80MIN_SECTORS (UINT32_C(80)*CDIO_CD_FRAMES_PER_MINUTE) +#define CDIO_CD_90MIN_SECTORS (UINT32_C(90)*CDIO_CD_FRAMES_PER_MINUTE) + +#define CDIO_CD_MAX_SECTORS \ + (UINT32_C(100)*CDIO_CD_FRAMES_PER_MINUTE-CDIO_PREGAP_SECTORS) #define msf_t_SIZEOF 3 diff --git a/src/cdinfo.c b/src/cdinfo.c index d1eeeb37..a66c3088 100644 --- a/src/cdinfo.c +++ b/src/cdinfo.c @@ -1,5 +1,5 @@ /* - $Id: cdinfo.c,v 1.6 2003/04/06 17:57:20 rocky Exp $ + $Id: cdinfo.c,v 1.7 2003/04/06 18:12:37 rocky Exp $ Copyright (C) 2003 Rocky Bernstein Copyright (C) 1996,1997,1998 Gerd Knorr @@ -411,7 +411,7 @@ static int read_block(int superblock, uint32_t offset, uint8_t bufnum, track_t track_num) { unsigned int track_sec_count = cdio_get_track_sec_count(img, track_num); - memset(buffer[bufnum],0,M2F1_SECTOR_SIZE); + memset(buffer[bufnum], 0, CDIO_CD_FRAMESIZE); if ( track_sec_count < superblock) { dbg_print(1, "reading block %u skipped track %d has only %u sectors\n", @@ -421,11 +421,11 @@ read_block(int superblock, uint32_t offset, uint8_t bufnum, track_t track_num) dbg_print(2, "about to read sector %u\n", offset+superblock); - if (0 > cdio_lseek(img, FORM1_DATA_SIZE*(offset+superblock),SEEK_SET)) + if (0 > cdio_lseek(img, CDIO_CD_FRAMESIZE*(offset+superblock),SEEK_SET)) return -1; - if (0 > cdio_read(img, buffer[bufnum], FORM1_DATA_SIZE)) + if (0 > cdio_read(img, buffer[bufnum], CDIO_CD_FRAMESIZE)) return -1; return 0;