diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am index a0055e40..209b074a 100644 --- a/include/cdio/Makefile.am +++ b/include/cdio/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.28 2005/11/06 00:39:37 rocky Exp $ +# $Id: Makefile.am,v 1.29 2006/02/16 20:09:27 rocky Exp $ # # Copyright (C) 2003, 2004 Rocky Bernstein # @@ -45,7 +45,6 @@ libcdioinclude_HEADERS = \ read.h \ rock.h \ sector.h \ - scsi_mmc.h \ track.h \ types.h \ udf.h \ diff --git a/include/cdio/cdda.h b/include/cdio/cdda.h index 855a91c4..a02bbb6b 100644 --- a/include/cdio/cdda.h +++ b/include/cdio/cdda.h @@ -1,5 +1,5 @@ /* - $Id: cdda.h,v 1.25 2006/01/14 09:44:53 rocky Exp $ + $Id: cdda.h,v 1.26 2006/02/16 20:09:27 rocky Exp $ Copyright (C) 2004, 2005, 2006 Rocky Bernstein Copyright (C) 2001 Xiph.org @@ -41,7 +41,8 @@ extern "C" { typedef struct cdrom_paranoia_s cdrom_paranoia_t; typedef struct cdrom_drive_s cdrom_drive_t; -/** For compatibility. cdrom_drive_t is depricated, use cdrom_drive_t instead. */ +/** For compatibility. cdrom_drive_t is deprecated, use cdrom_drive_t + instead. */ extern enum paranoia_cdda_enums { CDDA_MESSAGE_FORGETIT = 0, @@ -66,7 +67,7 @@ typedef struct TOC_s { int32_t dwStartSector; } TOC_t; -/** For compatibility. TOC is depricated, use TOC_t instead. */ +/** For compatibility. TOC is deprecated, use TOC_t instead. */ #define TOC TOC_t #define CDDA_MESSAGE_FORGETIT 0 diff --git a/include/cdio/disc.h b/include/cdio/disc.h index a6bf1c3e..cc74630e 100644 --- a/include/cdio/disc.h +++ b/include/cdio/disc.h @@ -1,5 +1,5 @@ /* -*- c -*- - $Id: disc.h,v 1.6 2006/01/17 12:53:41 rocky Exp $ + $Id: disc.h,v 1.7 2006/02/16 20:09:27 rocky Exp $ Copyright (C) 2004, 2005, 2006 Rocky Bernstein @@ -99,10 +99,6 @@ extern "C" { */ bool cdio_is_discmode_dvd (discmode_t discmode); - - /*! cdio_stat_size is deprecated. @see cdio_get_disc_last_lsn */ -#define cdio_stat_size cdio_get_disc_last_lsn - #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/include/cdio/mmc.h b/include/cdio/mmc.h index eba3e1ed..14cd375f 100644 --- a/include/cdio/mmc.h +++ b/include/cdio/mmc.h @@ -1,7 +1,7 @@ /* - $Id: mmc.h,v 1.23 2005/10/21 11:27:09 rocky Exp $ + $Id: mmc.h,v 1.24 2006/02/16 20:09:27 rocky Exp $ - Copyright (C) 2003, 2004, 2005 Rocky Bernstein + Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -735,7 +735,7 @@ mmc_audio_read_subchannel (CdIo_t *p_cdio, uint16_t i_blocksize, uint32_t i_blocks ); - /*! issue a MMC read mode2 sectors. - depricated. + /*! issue a MMC read mode2 sectors. - deprecated. */ driver_return_code_t mmc_read_sectors ( const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn, int read_sector_type, @@ -802,26 +802,6 @@ extern cdio_mmc_get_conf_t debug_cdio_mmc_get_conf; extern cdio_mmc_gpcmd_t debug_cdio_mmc_gpcmd; extern cdio_mmc_read_sub_state_t debug_cdio_mmc_read_sub_state; -/** For backward compatibility. */ -#define mmc_direction_t cdio_mmc_direction_t -#define mmc_feature_interface_t cdio_mmc_feature_interface_t -#define mmc_subchannel_t cdio_mmc_subchannel_t -#define scsi_mmc_cdb_t mmc_cdb_t -#define scsi_mmc_direction_t mmc_direction_t -#define scsi_mmc_get_cmd_len mmc_get_cmd_len -#define scsi_mmc_run_cmd mmc_run_cmd -#define scsi_mmc_eject_media mmc_eject_media -#define scsi_mmc_get_disc_last_lsn mmc_get_disc_last_lsn -#define scsi_mmc_get_discmode mmc_get_discmode -#define scsi_mmc_get_drive_cap mmc_get_drive_cap -#define scsi_mmc_get_dvd_struct_physical mmc_get_dvd_struct_physical -#define scsi_mmc_get_hwinfo mmc_get_hwinfo -#define scsi_mmc_get_mcn mmc_get_mcn -#define scsi_mmc_read_sectors mmc_read_sectors -#define scsi_mmc_set_blocksize mmc_set_blocksize -#define scsi_mmc_get_blocksize mmc_get_blocksize -#define scsi_mmc_set_speed mmc_set_speed - #endif /* __MMC_H__ */ /* diff --git a/include/cdio/util.h b/include/cdio/util.h index 5cfaf70e..17839f44 100644 --- a/include/cdio/util.h +++ b/include/cdio/util.h @@ -1,8 +1,8 @@ /* - $Id: util.h,v 1.8 2005/04/27 23:31:47 rocky Exp $ + $Id: util.h,v 1.9 2006/02/16 20:09:27 rocky Exp $ Copyright (C) 2000 Herbert Valerio Riedel - Copyright (C) 2004, 2005 Rocky Bernstein + Copyright (C) 2004, 2005, 2006 Rocky Bernstein This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -103,20 +103,6 @@ _cdio_strsplit(const char str[], char delim); uint8_t cdio_to_bcd8(uint8_t n); uint8_t cdio_from_bcd8(uint8_t p); -#if defined(__GNUC__) && __GNUC__ >= 3 -static inline __attribute__((deprecated)) -uint8_t to_bcd8(uint8_t n) { - return cdio_to_bcd8(n); -} -static inline __attribute__((deprecated)) -uint8_t from_bcd8(uint8_t p) { - return cdio_from_bcd8(p); -} -#else -#define to_bcd8 cdio_to_bcd8 -#define from_bcd8 cdio_from_bcd8 -#endif - #ifdef __cplusplus } #endif