/*
* This file is part of the libCEC(R) library.
*
- * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved.
+ * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved.
* libCEC(R) is an original work, containing original code.
*
* libCEC(R) is a trademark of Pulse-Eight Limited.
#include "RPi/RPiCECAdapterCommunication.h"
#endif
-#if defined(HAVE_NXP_API)
-#include "CuBox/NxpCECAdapterDetection.h"
-#include "CuBox/NxpCECAdapterCommunication.h"
+#if defined(HAVE_TDA995X_API)
+#include "TDA995x/TDA995xCECAdapterDetection.h"
+#include "TDA995x/TDA995xCECAdapterCommunication.h"
#endif
using namespace std;
using namespace CEC;
int8_t CAdapterFactory::FindAdapters(cec_adapter *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
+{
+ cec_adapter_descriptor devices[50];
+ int8_t iReturn = DetectAdapters(devices, iBufSize, strDevicePath);
+ for (int8_t iPtr = 0; iPtr < iReturn; iPtr++)
+ {
+ strncpy(deviceList[iPtr].comm, devices[iPtr].strComName, sizeof(deviceList[iPtr].comm));
+ strncpy(deviceList[iPtr].path, devices[iPtr].strComPath, sizeof(deviceList[iPtr].path));
+ }
+ return iReturn;
+}
+
+int8_t CAdapterFactory::DetectAdapters(cec_adapter_descriptor *deviceList, uint8_t iBufSize, const char *strDevicePath /* = NULL */)
{
int8_t iAdaptersFound(0);
if (iAdaptersFound < iBufSize && CRPiCECAdapterDetection::FindAdapter() &&
(!strDevicePath || !strcmp(strDevicePath, CEC_RPI_VIRTUAL_COM)))
{
- snprintf(deviceList[iAdaptersFound].path, 1024, CEC_RPI_VIRTUAL_PATH);
- snprintf(deviceList[iAdaptersFound++].comm, 1024, CEC_RPI_VIRTUAL_COM);
+ snprintf(deviceList[iAdaptersFound].strComPath, sizeof(deviceList[iAdaptersFound].strComPath), CEC_RPI_VIRTUAL_PATH);
+ snprintf(deviceList[iAdaptersFound].strComName, sizeof(deviceList[iAdaptersFound].strComName), CEC_RPI_VIRTUAL_COM);
+ deviceList[iAdaptersFound].iVendorId = RPI_ADAPTER_VID;
+ deviceList[iAdaptersFound].iProductId = RPI_ADAPTER_PID;
+ deviceList[iAdaptersFound].adapterType = ADAPTERTYPE_RPI;
+ iAdaptersFound++;
}
#endif
-#if defined(HAVE_NXP_API)
- if (iAdaptersFound < iBufSize && CNxpCECAdapterDetection::FindAdapter())
+#if defined(HAVE_TDA995X_API)
+ if (iAdaptersFound < iBufSize && CTDA995xCECAdapterDetection::FindAdapter() &&
+ (!strDevicePath || !strcmp(strDevicePath, CEC_TDA995x_VIRTUAL_COM)))
{
- snprintf(deviceList[iAdaptersFound].path, 1024, CEC_NXP_PATH);
- snprintf(deviceList[iAdaptersFound++].comm, 1024, CEC_NXP_VIRTUAL_COM);
+ snprintf(deviceList[iAdaptersFound].strComPath, sizeof(deviceList[iAdaptersFound].strComPath), CEC_TDA995x_PATH);
+ snprintf(deviceList[iAdaptersFound].strComName, sizeof(deviceList[iAdaptersFound].strComName), CEC_TDA995x_VIRTUAL_COM);
+ deviceList[iAdaptersFound].iVendorId = TDA995X_ADAPTER_VID;
+ deviceList[iAdaptersFound].iProductId = TDA995X_ADAPTER_PID;
+ deviceList[iAdaptersFound].adapterType = ADAPTERTYPE_TDA995x;
+ iAdaptersFound++;
}
#endif
-#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_NXP_API)
+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API)
#error "libCEC doesn't have support for any type of adapter. please check your build system or configuration"
#endif
IAdapterCommunication *CAdapterFactory::GetInstance(const char *strPort, uint16_t iBaudRate)
{
-#if defined(HAVE_NXP_API)
- if (!strcmp(strPort, CEC_NXP_VIRTUAL_COM))
- return new CNxpCECAdapterCommunication(m_lib->m_cec, CEC_NXP_PATH);
+#if defined(HAVE_TDA995X_API)
+ if (!strcmp(strPort, CEC_TDA995x_VIRTUAL_COM))
+ return new CTDA995xCECAdapterCommunication(m_lib->m_cec);
#endif
#if defined(HAVE_RPI_API)
return new CUSBCECAdapterCommunication(m_lib->m_cec, strPort, iBaudRate);
#endif
-#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_NXP_API)
+#if !defined(HAVE_RPI_API) && !defined(HAVE_P8_USB) && !defined(HAVE_TDA995X_API)
return NULL;
#endif
}