diff --git a/include/cdio++/mmc.hpp b/include/cdio++/mmc.hpp index b4b98586..e2910ba1 100644 --- a/include/cdio++/mmc.hpp +++ b/include/cdio++/mmc.hpp @@ -1,7 +1,7 @@ /* - $Id: mmc.hpp,v 1.1 2005/11/14 01:15:33 rocky Exp $ + $Id: mmc.hpp,v 1.2 2006/01/18 21:31:37 rocky Exp $ - Copyright (C) 2005 Rocky Bernstein + Copyright (C) 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 @@ -28,21 +28,27 @@ @param p_cdio the CD object to be acted upon. @param p_subchannel place for returned subchannel information + + A DriverOpException is raised on error. */ -driver_return_code_t +void mmcAudioReadSubchannel (/*out*/ cdio_subchannel_t *p_subchannel) { - return mmc_audio_read_subchannel (p_cdio, p_subchannel); + driver_return_code_t drc = mmc_audio_read_subchannel (p_cdio, p_subchannel); + possible_throw_device_exception(drc); } /*! Eject using MMC commands. If CD-ROM is "locked" we'll unlock it. Command is not "immediate" -- we'll wait for the command to complete. For a more general (and lower-level) routine, @see mmc_start_stop_media. + + A DriverOpException is raised on error. */ -driver_return_code_t mmcEjectMedia() +void mmcEjectMedia() { - return mmc_eject_media( p_cdio ); + driver_return_code_t drc = mmc_eject_media( p_cdio ); + possible_throw_device_exception(drc); } /*! @@ -138,10 +144,13 @@ char * mmcGetMcn () /** Get the output port volumes and port selections used on AUDIO PLAY commands via a MMC MODE SENSE command using the CD Audio Control Page. + + A DriverOpException is raised on error. */ -driver_return_code_t mmcAudioGetVolume (mmc_audio_volume_t *p_volume) +void mmcAudioGetVolume (mmc_audio_volume_t *p_volume) { - return mmc_audio_get_volume (p_cdio, p_volume); + driver_return_code_t drc = mmc_audio_get_volume (p_cdio, p_volume); + possible_throw_device_exception(drc); } /*! @@ -280,19 +289,22 @@ int mmcModeSense6( /*out*/ void *p_buf, int i_size, int page) @param i_blocksize size of the a block expected to be returned @param i_blocks number of blocks expected to be returned. - + + A DriverOpException is raised on error. */ -driver_return_code_t +void mmcReadCd ( void *p_buf, lsn_t i_lsn, int expected_sector_type, bool b_digital_audio_play, bool b_sync, uint8_t header_codes, bool b_user_data, bool b_edc_ecc, uint8_t c2_error_information, uint8_t subchannel_selection, uint16_t i_blocksize, uint32_t i_blocks ) { - return mmc_read_cd ( p_cdio, p_buf, i_lsn, expected_sector_type, - b_digital_audio_play, b_sync, header_codes, - b_user_data, b_edc_ecc, c2_error_information, - subchannel_selection, i_blocksize, i_blocks ); + driver_return_code_t drc = + mmc_read_cd ( p_cdio, p_buf, i_lsn, expected_sector_type, + b_digital_audio_play, b_sync, header_codes, + b_user_data, b_edc_ecc, c2_error_information, + subchannel_selection, i_blocksize, i_blocks ); + possible_throw_device_exception(drc); } /*! Read just the user data part of some sort of data sector (via @@ -313,20 +325,25 @@ mmcReadCd ( void *p_buf, lsn_t i_lsn, int expected_sector_type, @param i_blocks number of blocks to read */ -driver_return_code_t mmcReadDataSectors ( void *p_buf, lsn_t i_lsn, - uint16_t i_blocksize, - uint32_t i_blocks ) +void mmcReadDataSectors ( void *p_buf, lsn_t i_lsn, uint16_t i_blocksize, + uint32_t i_blocks=1) { - return mmc_read_data_sectors ( p_cdio, p_buf, i_lsn, i_blocksize, i_blocks ); + driver_return_code_t drc = mmc_read_data_sectors ( p_cdio, p_buf, i_lsn, + i_blocksize, i_blocks ); + possible_throw_device_exception(drc); } -/*! issue a MMC read mode2 sectors. - depricated. +/*! Read MMC read mode2 sectors + + A DriverOpException is raised on error. */ -driver_return_code_t mmcReadSectors ( void *p_buf, lsn_t i_lsn, - int read_sector_type, uint32_t i_blocks) +void mmcReadSectors ( void *p_buf, lsn_t i_lsn, int read_sector_type, + uint32_t i_blocks=1) { - return mmc_read_sectors ( p_cdio, p_buf, i_lsn, read_sector_type, i_blocks); + driver_return_code_t drc = mmc_read_sectors ( p_cdio, p_buf, i_lsn, + read_sector_type, i_blocks); + possible_throw_device_exception(drc); } /*! @@ -352,20 +369,30 @@ int mmcRunCmd( unsigned int i_timeout_ms, const mmc_cdb_t *p_cdb, } /*! - Set the block size for subsequest read requests, via MMC. + Set the block size for subsequent read requests, via MMC. + + @param i_blocksize size to set for subsequent requests + + A DriverOpException is raised on error. */ -driver_return_code_t mmcSetBlocksize ( uint16_t i_blocksize) +void mmcSetBlocksize ( uint16_t i_blocksize) { - return mmc_set_blocksize ( p_cdio, i_blocksize); + driver_return_code_t drc = mmc_set_blocksize ( p_cdio, i_blocksize); + possible_throw_device_exception(drc); } /*! - Set the drive speed. + Set the drive speed via MMC. + + @param i_speed speed to set drive to. + + A DriverOpException is raised on error. */ -driver_return_code_t mmcSetSpeed( int i_speed ) +void mmcSetSpeed( int i_speed ) { - return mmc_set_speed( p_cdio, i_speed ); + driver_return_code_t drc = mmc_set_speed( p_cdio, i_speed ); + possible_throw_device_exception(drc); } /*! @@ -378,11 +405,15 @@ driver_return_code_t mmcSetSpeed( int i_speed ) eject/load is ignored, so set to 0 if you want to eject or load. @see mmc_eject_media or mmc_close_tray + + A DriverOpException is raised on error. */ -driver_return_code_t -mmcStartStopMedia(bool b_eject, bool b_immediate, uint8_t power_condition) +void mmcStartStopMedia(bool b_eject, bool b_immediate, + uint8_t power_condition) { - return mmc_start_stop_media(p_cdio, b_eject, b_immediate, power_condition); + driver_return_code_t drc = + mmc_start_stop_media(p_cdio, b_eject, b_immediate, power_condition); + possible_throw_device_exception(drc); } diff --git a/include/cdio++/read.hpp b/include/cdio++/read.hpp index b132bbc3..8dc9dbe9 100644 --- a/include/cdio++/read.hpp +++ b/include/cdio++/read.hpp @@ -1,7 +1,7 @@ /* -*- C++ -*- - $Id: read.hpp,v 1.1 2005/11/10 11:11:16 rocky Exp $ + $Id: read.hpp,v 1.2 2006/01/18 21:31:37 rocky Exp $ - Copyright (C) 2005 Rocky Bernstein + Copyright (C) 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 @@ -62,9 +62,7 @@ ssize_t read(void *p_buf, size_t i_size) @param read_mode the kind of "mode" to use in reading. @param i_lsn sector to read @param i_blocks number of sectors to read - @return DRIVER_OP_SUCCESS (0) if no error, other (negative) enumerations - are returned on error. - + If read_mode is CDIO_MODE_AUDIO, *p_buf should hold at least CDIO_FRAMESIZE_RAW * i_blocks bytes. @@ -81,25 +79,17 @@ ssize_t read(void *p_buf, size_t i_size) If read_mode is CDIO_MODE_M2F2, *p_buf should hold at least CDIO_CD_FRAMESIZE * i_blocks bytes. - + A DriverOpException is raised on error. */ -driver_return_code_t readSectors(void *p_buf, lsn_t i_lsn, - cdio_read_mode_t read_mode, uint32_t i_blocks) +void readSectors(void *p_buf, lsn_t i_lsn, cdio_read_mode_t read_mode, + uint32_t i_blocks=1) { - return cdio_read_sectors(p_cdio, p_buf, i_lsn, read_mode, i_blocks); + driver_return_code_t drc = cdio_read_sectors(p_cdio, p_buf, i_lsn, read_mode, + i_blocks); + possible_throw_device_exception(drc); } -/** The special case of reading a single block is a common one so we - provide a routine for that as a convenience. - */ -driver_return_code_t readSector(void *p_buf, lsn_t i_lsn, - cdio_read_mode_t read_mode) -{ - return cdio_read_sectors(p_cdio, p_buf, i_lsn, read_mode, 1); -} - - /*! Reads a number of data sectors (AKA blocks). @@ -119,40 +109,14 @@ driver_return_code_t readSector(void *p_buf, lsn_t i_lsn, @param i_blocks number of sectors to read - @return DRIVER_OP_SUCCESS (0) if no error, other (negative) enumerations - are returned on error. + A DriverOpException is raised on error. */ -driver_return_code_t readDataBlocks(void *p_buf, lsn_t i_lsn, - uint16_t i_blocksize, uint32_t i_blocks) +void readDataBlocks(void *p_buf, lsn_t i_lsn, uint16_t i_blocksize, + uint32_t i_blocks=1) { - return cdio_read_data_sectors (p_cdio, p_buf, i_lsn, i_blocksize, i_blocks); -} - -/** The special case of reading a single block is a common one so we - provide a routine for that as a convenience. - - @param p_buf place to read data into. The caller should make sure - this location is large enough. See below for size information. - - *p_buf should hold at least i_blocks times either ISO_BLOCKSIZE, - M1RAW_SECTOR_SIZE or M2F2_SECTOR_SIZE depending on the kind of - sector getting read. If you don't know whether you have a Mode 1/2, - Form 1/ Form 2/Formless sector best to reserve space for the maximum - which is M2RAW_SECTOR_SIZE. - - @param i_lsn sector to read - - @param i_blocksize size of block. Should be either CDIO_CD_FRAMESIZE, - M2RAW_SECTOR_SIZE, or M2F2_SECTOR_SIZE. See comment above under p_buf. - - @return DRIVER_OP_SUCCESS (0) if no error, other (negative) enumerations - are returned on error. - -*/ -driver_return_code_t readDataBlock(void *p_buf, lsn_t i_lsn, - uint16_t i_blocksize) -{ - return readDataBlocks(p_buf, i_lsn, i_blocksize, 1); + driver_return_code_t drc = cdio_read_data_sectors (p_cdio, p_buf, i_lsn, + i_blocksize, i_blocks); + possible_throw_device_exception(drc); }