claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Change mmc_have_interface() to mmc_get_interface() as only one interface can ever be returned.

Browse Source 
Change example to the correct behaviour, that the application should do the checking not the library.
Added new interfaces defined from MMC >=3 (IEEE1394B, SATA, USB) and the Vendor Unique one (can be important) that was missing.
This commit is contained in:
Natalia Portillo
2012-04-29 22:01:05 +01:00
parent f1cc4e29d3
commit 0ecb310357
5 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/cdio++/mmc.hpp
View File

@@ -153,14 +153,19 @@ void mmcAudioGetVolume (mmc_audio_volume_t *p_volume)
}
/**
Report if CD-ROM has a praticular kind of interface (ATAPI, SCSCI, ...)
Is it possible for an interface to have serveral? If not this
routine could probably return the single mmc_feature_interface_t.
@return true if we have the interface and false if not.
*/
bool_3way_t mmcHaveInterface( cdio_mmc_feature_interface_t e_interface )
Return interface of device.
As per MMC6, Table 94, Note 7, in the case of a two-interface
scheme (USB-ATAPI bridge) the drive may not be aware, so only
ATAPI is returned.
Also it seems there is no way for the drive to return more than
one interface at all.
On MMC1 devices, where it is not specified, we will return
interface as CDIO_MMC_FEATURE_INTERFACE_UNSPECIFIED.
@return interface of the device.
*/
cdio_mmc_feature_interface_t mmcGetInterface()
{
return mmc_have_interface( p_cdio, e_interface );
return mmc_get_interface( p_cdio );
}
/**

23
include/cdio/mmc.h
View File

@@ -409,7 +409,11 @@ typedef enum {
CDIO_MMC_FEATURE_INTERFACE_ATAPI = 2,
CDIO_MMC_FEATURE_INTERFACE_IEEE_1394 = 3,
CDIO_MMC_FEATURE_INTERFACE_IEEE_1394A = 4,
CDIO_MMC_FEATURE_INTERFACE_FIBRE_CH = 5
CDIO_MMC_FEATURE_INTERFACE_FIBRE_CH = 5,
CDIO_MMC_FEATURE_INTERFACE_IEEE_1394B = 6,
CDIO_MMC_FEATURE_INTERFACE_SATA = 7,
CDIO_MMC_FEATURE_INTERFACE_USB = 8,
CDIO_MMC_FEATURE_INTERFACE_VENDOR_UNIQ = 0xFFFF
} cdio_mmc_feature_interface_t;
@@ -660,15 +664,18 @@ driver_return_code_t mmc_audio_get_volume (CdIo_t *p_cdio, /*out*/
char * mmc_get_mcn(const CdIo_t *p_cdio);
/**
Report if CD-ROM has a particular kind of interface (ATAPI, SCSCI, ...)
Is it possible for an interface to have several? If not this
routine could probably return the single mmc_feature_interface_t.
Return interface of device.
As per MMC6, Table 94, Note 7, in the case of a two-interface
scheme (USB-ATAPI bridge) the drive may not be aware, so only
ATAPI is returned.
Also it seems there is no way for the drive to return more than
one interface at all.
On MMC1 devices, where it is not specified, we will return
interface as CDIO_MMC_FEATURE_INTERFACE_UNSPECIFIED.
@param p_cdio the CD object to be acted upon.
@param e_interface
@return true if we have the interface and false if not.
@return interface of the device.
*/
bool_3way_t mmc_have_interface(CdIo_t *p_cdio,
cdio_mmc_feature_interface_t e_interface );
cdio_mmc_feature_interface_t mmc_get_interface(CdIo_t *p_cdio);
/**