X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FCECParser.cpp;h=7a6d871700a7d701ec0eccf572a9c62d3e883afa;hb=5f39c4d854ec7441761bc6db870b6bbc73016309;hp=dad7a0d038a31340caeed08329afcfd58d6645d3;hpb=f99bc83187bb0daa81bc58a4559ff9832a8dad9f;p=deb_libcec.git

diff --git a/src/lib/CECParser.cpp b/src/lib/CECParser.cpp
index dad7a0d..7a6d871 100644
--- a/src/lib/CECParser.cpp
+++ b/src/lib/CECParser.cpp
@@ -42,91 +42,78 @@
 #include "util/threads.h"
 #include "util/timeutils.h"
 #include "CECDetect.h"
+#include "Communication.h"
 
 using namespace CEC;
 using namespace std;
 
 #define CEC_MAX_RETRY 5
+#define CEC_BUTTON_TIMEOUT 500
 
 /*!
  * ICECDevice implementation
  */
 //@{
 CCECParser::CCECParser(const char *strDeviceName, cec_logical_address iLogicalAddress /* = CECDEVICE_PLAYBACKDEVICE1 */, int iPhysicalAddress /* = CEC_DEFAULT_PHYSICAL_ADDRESS*/) :
-    m_inbuf(NULL),
-    m_iInbufSize(0),
-    m_iInbufUsed(0),
     m_iCurrentButton(CEC_USER_CONTROL_CODE_UNKNOWN),
     m_physicaladdress(iPhysicalAddress),
     m_iLogicalAddress(iLogicalAddress),
     m_strDeviceName(strDeviceName),
     m_bRunning(false)
 {
-  m_serialport = new CSerialPort;
+  m_communication = new CCommunication(this);
 }
 
 CCECParser::~CCECParser(void)
 {
-  Close(0);
-  m_serialport->Close();
-  delete m_serialport;
+  Close();
+  m_communication->Close();
+  delete m_communication;
 }
 
 bool CCECParser::Open(const char *strPort, int iTimeoutMs /* = 10000 */)
 {
-  bool bReturn(false);
+  if (!m_communication)
+    return false;
 
-  if (!(bReturn = m_serialport->Open(strPort, 38400)))
+  if (m_communication->IsOpen())
   {
-    CStdString strError;
-    strError.Format("error opening serial port '%s': %s", strPort, m_serialport->GetError().c_str());
-    AddLog(CEC_LOG_ERROR, strError);
-    return bReturn;
+    AddLog(CEC_LOG_ERROR, "connection already open");
+    return false;
   }
 
-  //clear any input bytes
-  uint8_t buff[1024];
-  m_serialport->Read(buff, sizeof(buff), CEC_SETTLE_DOWN_TIME);
-
-  if (bReturn)
-    bReturn = SetLogicalAddress(m_iLogicalAddress);
-
-  if (!bReturn)
+  if (!m_communication->Open(strPort, 38400, iTimeoutMs))
   {
-    CStdString strError;
-    strError.Format("error opening serial port '%s': %s", strPort, m_serialport->GetError().c_str());
-    AddLog(CEC_LOG_ERROR, strError);
-    return bReturn;
+    AddLog(CEC_LOG_ERROR, "could not open a connection");
+    return false;
   }
 
-  if (bReturn)
+  if (!SetLogicalAddress(m_iLogicalAddress))
   {
-    m_bRunning = true;
-    if (pthread_create(&m_thread, NULL, (void *(*) (void *))&CCECParser::ThreadHandler, (void *)this) == 0)
-      pthread_detach(m_thread);
-    else
-      m_bRunning = false;
+    AddLog(CEC_LOG_ERROR, "could not set the logical address");
+    return false;
   }
 
-  return bReturn;
-}
-
-bool CCECParser::Close(int iTimeoutMs /* = 2000 */)
-{
-  m_bRunning = false;
-  bool bExit(false);
-  if (iTimeoutMs > 0)
+  if (pthread_create(&m_thread, NULL, (void *(*) (void *))&CCECParser::ThreadHandler, (void *)this) == 0)
   {
-    bExit = m_exitCondition.Wait(&m_mutex, iTimeoutMs);
-    m_mutex.Unlock();
+    m_bRunning = true;
+    AddLog(CEC_LOG_DEBUG, "processor thread created");
+    pthread_detach(m_thread);
+    return true;
   }
   else
   {
-    pthread_join(m_thread, NULL);
-    bExit = true;
+    AddLog(CEC_LOG_ERROR, "could not create a processor thread");
+    m_bRunning = false;
   }
 
-  return bExit;
+  return false;
+}
+
+void CCECParser::Close(void)
+{
+  m_bRunning = false;
+  pthread_join(m_thread, NULL);
 }
 
 void *CCECParser::ThreadHandler(CCECParser *parser)
@@ -141,26 +128,16 @@ bool CCECParser::Process(void)
   int64_t now = GetTimeMs();
   while (m_bRunning)
   {
-    {
-      CLockObject lock(&m_mutex, 1000);
-      if (lock.IsLocked())
-      {
-        if (!ReadFromDevice(100))
-        {
-          m_bRunning = false;
-          return false;
-        }
-      }
-    }
+    cec_frame msg;
+    while (m_bRunning && m_communication->IsOpen() && m_communication->Read(msg, CEC_BUTTON_TIMEOUT))
+      ParseMessage(msg);
 
-    //AddLog(CEC_LOG_DEBUG, "processing messages");
-    ProcessMessages();
     now = GetTimeMs();
     CheckKeypressTimeout(now);
     CCondition::Sleep(50);
   }
 
-  AddLog(CEC_LOG_DEBUG, "reader thread terminated");
+  AddLog(CEC_LOG_DEBUG, "processor thread terminated");
   m_bRunning = false;
   m_exitCondition.Signal();
   return true;
@@ -177,7 +154,7 @@ bool CCECParser::Ping(void)
   PushEscaped(output, MSGCODE_PING);
   output.push_back(MSGEND);
 
-  if (!TransmitFormatted(output, false, (int64_t) 5000))
+  if (!TransmitFormatted(output, false))
   {
     AddLog(CEC_LOG_ERROR, "could not send ping command");
     return false;
@@ -200,7 +177,7 @@ bool CCECParser::StartBootloader(void)
   PushEscaped(output, MSGCODE_START_BOOTLOADER);
   output.push_back(MSGEND);
 
-  if (!TransmitFormatted(output, false, (int64_t) 5000))
+  if (!TransmitFormatted(output, false))
   {
     AddLog(CEC_LOG_ERROR, "could not start the bootloader");
     return false;
@@ -217,19 +194,10 @@ uint8_t CCECParser::GetSourceDestination(cec_logical_address destination /* = CE
 
 bool CCECParser::PowerOffDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
 {
-  if (!m_bRunning)
-    return false;
-
-  CStdString strLog;
-  strLog.Format("powering off devices with logical address %d", (int8_t)address);
-  AddLog(CEC_LOG_DEBUG, strLog.c_str());
-  cec_frame frame;
-  frame.push_back(GetSourceDestination(address));
-  frame.push_back(CEC_OPCODE_STANDBY);
-  return Transmit(frame);
+  return StandbyDevices(address);
 }
 
-bool CCECParser::PowerOnDevices(cec_logical_address address /* = CECDEVICE_BROADCAST */)
+bool CCECParser::PowerOnDevices(cec_logical_address address /* = CECDEVICE_TV */)
 {
   if (!m_bRunning)
     return false;
@@ -287,7 +255,7 @@ bool CCECParser::SetInactiveView(void)
 
 bool CCECParser::GetNextLogMessage(cec_log_message *message)
 {
-  return m_bRunning ? m_logBuffer.Pop(*message) : false;
+  return m_logBuffer.Pop(*message);
 }
 
 bool CCECParser::GetNextKeypress(cec_keypress *key)
@@ -397,23 +365,10 @@ void CCECParser::BroadcastActiveSource(void)
   Transmit(frame);
 }
 
-bool CCECParser::TransmitFormatted(const cec_frame &data, bool bWaitForAck /* = true */, int64_t iTimeout /* = 2000 */)
+bool CCECParser::TransmitFormatted(const cec_frame &data, bool bWaitForAck /* = true */)
 {
-  CLockObject lock(&m_mutex, iTimeout);
-  if (!lock.IsLocked())
-  {
-    AddLog(CEC_LOG_ERROR, "could not get a write lock");
+  if (!m_communication || !m_communication->Write(data))
     return false;
-  }
-
-  if (m_serialport->Write(data) != data.size())
-  {
-    CStdString strError;
-    strError.Format("error writing to serial port: %s", m_serialport->GetError().c_str());
-    AddLog(CEC_LOG_ERROR, strError);
-    return false;
-  }
-  AddLog(CEC_LOG_DEBUG, "command sent");
 
   CCondition::Sleep((int) data.size() * 24 /*data*/ + 5 /*start bit (4.5 ms)*/ + 50 /* to be on the safe side */);
   if (bWaitForAck && !WaitForAck())
@@ -425,7 +380,7 @@ bool CCECParser::TransmitFormatted(const cec_frame &data, bool bWaitForAck /* =
   return true;
 }
 
-bool CCECParser::Transmit(const cec_frame &data, bool bWaitForAck /* = true */, int64_t iTimeout /* = 5000 */)
+bool CCECParser::Transmit(const cec_frame &data, bool bWaitForAck /* = true */)
 {
   CStdString txStr = "transmit ";
   for (unsigned int i = 0; i < data.size(); i++)
@@ -466,27 +421,21 @@ bool CCECParser::Transmit(const cec_frame &data, bool bWaitForAck /* = true */,
     output.push_back(MSGEND);
   }
 
-  return TransmitFormatted(output, bWaitForAck, iTimeout);
+  return TransmitFormatted(output, bWaitForAck);
 }
 
-bool CCECParser::WaitForAck(int64_t iTimeout /* = 1000 */)
+bool CCECParser::WaitForAck(int iTimeout /* = 1000 */)
 {
   bool bGotAck(false);
   bool bError(false);
 
   int64_t iNow = GetTimeMs();
-  int64_t iTargetTime = iNow + iTimeout;
+  int64_t iTargetTime = iNow + (int64_t) iTimeout;
 
   while (!bGotAck && !bError && (iTimeout <= 0 || iNow < iTargetTime))
   {
-    if (!ReadFromDevice((int) iTimeout))
-    {
-      AddLog(CEC_LOG_ERROR, "failed to read from device");
-      return false;
-    }
-
     cec_frame msg;
-    while (!bGotAck && !bError && GetMessage(msg, false))
+    while (!bGotAck && !bError && m_communication->Read(msg, iTimeout))
     {
       uint8_t iCode = msg[0] & ~(MSGCODE_FRAME_EOM | MSGCODE_FRAME_ACK);
 
@@ -536,119 +485,6 @@ bool CCECParser::WaitForAck(int64_t iTimeout /* = 1000 */)
   return bGotAck && !bError;
 }
 
-bool CCECParser::ReadFromDevice(int iTimeout)
-{
-  uint8_t buff[1024];
-  int iBytesRead = m_serialport->Read(buff, sizeof(buff), iTimeout);
-  if (iBytesRead < 0)
-  {
-    CStdString strError;
-    strError.Format("error reading from serial port: %s", m_serialport->GetError().c_str());
-    AddLog(CEC_LOG_ERROR, strError);
-    return false;
-  }
-  else if (iBytesRead > 0)
-    AddData(buff, iBytesRead);
-
-  return true;
-}
-
-void CCECParser::ProcessMessages(void)
-{
-  cec_frame msg;
-  while (m_bRunning && GetMessage(msg))
-    ParseMessage(msg);
-}
-
-bool CCECParser::GetMessage(cec_frame &msg, bool bFromBuffer /* = true */)
-{
-  if (bFromBuffer && m_frameBuffer.Pop(msg))
-    return true;
-
-  if (m_iInbufUsed < 1)
-    return false;
-
-  //search for first start of message
-  int startpos = -1;
-  for (int i = 0; i < m_iInbufUsed; i++)
-  {
-    if (m_inbuf[i] == MSGSTART)
-    {
-      startpos = i;
-      break;
-    }
-  }
-
-  if (startpos == -1)
-    return false;
-
-  //move anything from the first start of message to the beginning of the buffer
-  if (startpos > 0)
-  {
-    memmove(m_inbuf, m_inbuf + startpos, m_iInbufUsed - startpos);
-    m_iInbufUsed -= startpos;
-  }
-
-  if (m_iInbufUsed < 2)
-    return false;
-
-  //look for end of message
-  startpos = -1;
-  int endpos = -1;
-  for (int i = 1; i < m_iInbufUsed; i++)
-  {
-    if (m_inbuf[i] == MSGEND)
-    {
-      endpos = i;
-      break;
-    }
-    else if (m_inbuf[i] == MSGSTART)
-    {
-      startpos = i;
-      break;
-    }
-  }
-
-  if (startpos > 0) //we found a msgstart before msgend, this is not right, remove
-  {
-    AddLog(CEC_LOG_ERROR, "received MSGSTART before MSGEND");
-    memmove(m_inbuf, m_inbuf + startpos, m_iInbufUsed - startpos);
-    m_iInbufUsed -= startpos;
-    return false;
-  }
-
-  if (endpos > 0) //found a MSGEND
-  {
-    msg.clear();
-    bool isesc = false;
-    for (int i = 1; i < endpos; i++)
-    {
-      if (isesc)
-      {
-        msg.push_back(m_inbuf[i] + (uint8_t)ESCOFFSET);
-        isesc = false;
-      }
-      else if (m_inbuf[i] == MSGESC)
-      {
-        isesc = true;
-      }
-      else
-      {
-        msg.push_back(m_inbuf[i]);
-      }
-    }
-
-    if (endpos + 1 < m_iInbufUsed)
-      memmove(m_inbuf, m_inbuf + endpos + 1, m_iInbufUsed - endpos - 1);
-
-    m_iInbufUsed -= endpos + 1;
-
-    return true;
-  }
-
-  return false;
-}
-
 void CCECParser::ParseMessage(cec_frame &msg)
 {
   if (msg.empty())
@@ -815,18 +651,6 @@ void CCECParser::ParseCurrentFrame(void)
   }
 }
 
-void CCECParser::AddData(uint8_t *data, int iLen)
-{
-  if (iLen + m_iInbufUsed > m_iInbufSize)
-  {
-    m_iInbufSize = iLen + m_iInbufUsed;
-    m_inbuf = (uint8_t*)realloc(m_inbuf, m_iInbufSize);
-  }
-
-  memcpy(m_inbuf + m_iInbufUsed, data, iLen);
-  m_iInbufUsed += iLen;
-}
-
 void CCECParser::PushEscaped(cec_frame &vec, uint8_t byte)
 {
   if (byte >= MSGESC && byte != MSGSTART)
@@ -842,7 +666,7 @@ void CCECParser::PushEscaped(cec_frame &vec, uint8_t byte)
 
 void CCECParser::CheckKeypressTimeout(int64_t now)
 {
-  if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && now - m_buttontime > 500)
+  if (m_iCurrentButton != CEC_USER_CONTROL_CODE_UNKNOWN && now - m_buttontime > CEC_BUTTON_TIMEOUT)
   {
     AddKey();
     m_iCurrentButton = CEC_USER_CONTROL_CODE_UNKNOWN;
@@ -873,10 +697,9 @@ bool CCECParser::SetAckMask(uint16_t iMask)
   PushEscaped(output, (uint8_t)iMask);
   output.push_back(MSGEND);
 
-  if (m_serialport->Write(output) == -1)
+  if (!m_communication->Write(output))
   {
-    strLog.Format("error writing to serial port: %s", m_serialport->GetError().c_str());
-    AddLog(CEC_LOG_ERROR, strLog);
+    AddLog(CEC_LOG_ERROR, "could not set the ackmask");
     return false;
   }