Merge commit '50ee248'

This commit is contained in:
Phillip Stephens 2017-12-15 18:10:28 -08:00
commit beb7f00b18
2 changed files with 33 additions and 0 deletions

View File

@ -51,6 +51,11 @@ public:
bool sendUSBInterruptTransfer(const uint8_t* data, size_t length); bool sendUSBInterruptTransfer(const uint8_t* data, size_t length);
size_t receiveUSBInterruptTransfer(uint8_t* data, size_t length); size_t receiveUSBInterruptTransfer(uint8_t* data, size_t length);
inline unsigned getVendorId();
inline unsigned getProductId();
inline std::string_view getVendorName();
inline std::string_view getProductName();
/* High-Level API */ /* High-Level API */
#if _WIN32 #if _WIN32
#if !WINDOWS_STORE #if !WINDOWS_STORE

View File

@ -50,6 +50,34 @@ size_t DeviceBase::receiveUSBInterruptTransfer(uint8_t* data, size_t length)
return false; return false;
} }
unsigned DeviceBase::getVendorId()
{
if (m_token)
return m_token->getVendorId();
return -1;
}
unsigned DeviceBase::getProductId()
{
if (m_token)
return m_token->getProductId();
return -1;
}
std::string_view DeviceBase::getVendorName()
{
if (m_token)
return m_token->getVendorName();
return {};
}
std::string_view DeviceBase::getProductName()
{
if (m_token)
return m_token->getProductName();
return {};
}
#if _WIN32 #if _WIN32
#if !WINDOWS_STORE #if !WINDOWS_STORE
const PHIDP_PREPARSED_DATA DeviceBase::getReportDescriptor() const PHIDP_PREPARSED_DATA DeviceBase::getReportDescriptor()