X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2FAdapterCommunication.cpp;h=f880d982e80175a7ab54590116528b2eca81bfce;hb=b2da27686d4fa820f7f17d25a804450fa02f4dd2;hp=84ec74c118bc966eb6fdb8e88a4e41b80696200c;hpb=25701fa60407a0fc0bc1dfcd4049fc01ad9e4fd1;p=deb_libcec.git

diff --git a/src/lib/AdapterCommunication.cpp b/src/lib/AdapterCommunication.cpp
index 84ec74c..f880d98 100644
--- a/src/lib/AdapterCommunication.cpp
+++ b/src/lib/AdapterCommunication.cpp
@@ -44,9 +44,7 @@ CAdapterCommunication::CAdapterCommunication(CLibCEC *controller) :
     m_controller(controller),
     m_inbuf(NULL),
     m_iInbufSize(0),
-    m_iInbufUsed(0),
-    m_bStarted(false),
-    m_bStop(false)
+    m_iInbufUsed(0)
 {
   m_port = new CSerialPort;
 }
@@ -67,8 +65,17 @@ CAdapterCommunication::~CAdapterCommunication(void)
 
 bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38400 */, uint32_t iTimeoutMs /* = 10000 */)
 {
-  if (m_bStarted || !m_port)
+  CLockObject lock(&m_commMutex);
+  if (!m_port)
+  {
+    m_controller->AddLog(CEC_LOG_ERROR, "port is NULL");
     return false;
+  }
+
+  if (IsOpen())
+  {
+    m_controller->AddLog(CEC_LOG_ERROR, "port is already open");
+  }
 
   if (!m_port->Open(strPort, iBaudRate))
   {
@@ -84,17 +91,14 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
   uint8_t buff[1024];
   m_port->Read(buff, sizeof(buff), 50);
 
-  Sleep(CEC_SETTLE_DOWN_TIME);
-
   if (CreateThread())
   {
-    m_controller->AddLog(CEC_LOG_DEBUG, "reader thread created");
-    m_bStarted = true;
+    m_controller->AddLog(CEC_LOG_DEBUG, "communication thread created");
     return true;
   }
   else
   {
-    m_controller->AddLog(CEC_LOG_DEBUG, "could not create a reader thread");
+    m_controller->AddLog(CEC_LOG_DEBUG, "could not create a communication thread");
   }
 
   return false;
@@ -102,66 +106,62 @@ bool CAdapterCommunication::Open(const char *strPort, uint16_t iBaudRate /* = 38
 
 void CAdapterCommunication::Close(void)
 {
-  m_bStop = true;
-  m_rcvCondition.Broadcast();
-
+  CLockObject lock(&m_commMutex);
   StopThread();
 
-  if (m_port)
-    m_port->Close();
+  if (m_inbuf)
+  {
+    free(m_inbuf);
+    m_inbuf = NULL;
+    m_iInbufSize = 0;
+    m_iInbufUsed = 0;
+  }
+
+  m_rcvCondition.Broadcast();
 }
 
 void *CAdapterCommunication::Process(void)
 {
   m_controller->AddLog(CEC_LOG_DEBUG, "communication thread started");
 
-  while (!m_bStop)
+  while (!IsStopped())
   {
-    if (!ReadFromDevice(1000))
     {
-      m_bStarted = false;
-      break;
+      CLockObject lock(&m_commMutex);
+      ReadFromDevice(100);
     }
 
-    if (!m_bStop)
-      Sleep(50);
+    if (!IsStopped())
+      Sleep(5);
   }
 
-  m_bStarted = false;
   return NULL;
 }
 
 bool CAdapterCommunication::ReadFromDevice(uint32_t iTimeout)
 {
   int32_t iBytesRead;
+  uint8_t buff[1024];
+  if (!m_port)
+    return false;
 
+  iBytesRead = m_port->Read(buff, sizeof(buff), iTimeout);
+  if (iBytesRead < 0 || iBytesRead > 256)
   {
-    CLockObject lock(&m_mutex);
-
-    uint8_t buff[1024];
-    if (!m_port)
-      return false;
-
-    iBytesRead = m_port->Read(buff, sizeof(buff), iTimeout);
-    if (iBytesRead < 0 || iBytesRead > 256)
-    {
-      CStdString strError;
-      strError.Format("error reading from serial port: %s", m_port->GetError().c_str());
-      m_controller->AddLog(CEC_LOG_ERROR, strError);
-      return false;
-    }
-    else if (iBytesRead > 0)
-      AddData(buff, (uint8_t) iBytesRead);
+    CStdString strError;
+    strError.Format("error reading from serial port: %s", m_port->GetError().c_str());
+    m_controller->AddLog(CEC_LOG_ERROR, strError);
+    return false;
   }
+  else if (iBytesRead > 0)
+    AddData(buff, (uint8_t) iBytesRead);
 
-  if (iBytesRead > 0)
-    m_rcvCondition.Signal();
-
-  return true;
+  return iBytesRead > 0;
 }
 
 void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
 {
+  CLockObject lock(&m_bufferMutex);
   if (m_iInbufUsed + iLen > m_iInbufSize)
   {
     m_iInbufSize = m_iInbufUsed + iLen;
@@ -170,36 +170,38 @@ void CAdapterCommunication::AddData(uint8_t *data, uint8_t iLen)
 
   memcpy(m_inbuf + m_iInbufUsed, data, iLen);
   m_iInbufUsed += iLen;
+
+  m_rcvCondition.Signal();
 }
 
-bool CAdapterCommunication::Write(const cec_frame &data)
+bool CAdapterCommunication::Write(const cec_adapter_message &data)
 {
+  CLockObject lock(&m_commMutex);
+  if (m_port->Write(data) != (int32_t) data.size())
   {
-    CLockObject lock(&m_mutex);
-    if (m_port->Write(data) != (int32_t) data.size)
-    {
-      CStdString strError;
-      strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
-      m_controller->AddLog(CEC_LOG_ERROR, strError);
-      return false;
-    }
-
-    m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
-
-    CCondition::Sleep((uint32_t) data.size * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/ + (uint32_t)50 /* to be on the safe side */);
+    CStdString strError;
+    strError.Format("error writing to serial port: %s", m_port->GetError().c_str());
+    m_controller->AddLog(CEC_LOG_ERROR, strError);
+    return false;
   }
 
+  m_controller->AddLog(CEC_LOG_DEBUG, "command sent");
+  CCondition::Sleep((uint32_t) data.size() * (uint32_t)24 /*data*/ + (uint32_t)5 /*start bit (4.5 ms)*/);
+
   return true;
 }
 
-bool CAdapterCommunication::Read(cec_frame &msg, uint32_t iTimeout)
+bool CAdapterCommunication::Read(cec_adapter_message &msg, uint32_t iTimeout)
 {
-  CLockObject lock(&m_mutex);
+  CLockObject lock(&m_bufferMutex);
 
   if (m_iInbufUsed < 1)
-    m_rcvCondition.Wait(&m_mutex, iTimeout);
+  {
+    if (!m_rcvCondition.Wait(&m_bufferMutex, iTimeout))
+      return false;
+  }
 
-  if (m_iInbufUsed < 1 || m_bStop)
+  if (m_iInbufUsed < 1 || IsStopped())
     return false;
 
   //search for first start of message
@@ -294,7 +296,7 @@ bool CAdapterCommunication::StartBootloader(void)
     return false;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "starting the bootloader");
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
 
   output.push_back(MSGSTART);
@@ -310,7 +312,7 @@ bool CAdapterCommunication::StartBootloader(void)
   return true;
 }
 
-void CAdapterCommunication::PushEscaped(cec_frame &vec, uint8_t byte)
+void CAdapterCommunication::PushEscaped(cec_adapter_message &vec, uint8_t byte)
 {
   if (byte >= MSGESC && byte != MSGSTART)
   {
@@ -332,7 +334,7 @@ bool CAdapterCommunication::SetAckMask(uint16_t iMask)
   strLog.Format("setting ackmask to %2x", iMask);
   m_controller->AddLog(CEC_LOG_DEBUG, strLog.c_str());
 
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
 
   output.push_back(MSGSTART);
@@ -356,7 +358,7 @@ bool CAdapterCommunication::PingAdapter(void)
     return false;
 
   m_controller->AddLog(CEC_LOG_DEBUG, "sending ping");
-  cec_frame output;
+  cec_adapter_message output;
   output.clear();
 
   output.push_back(MSGSTART);
@@ -374,3 +376,51 @@ bool CAdapterCommunication::PingAdapter(void)
   // TODO check for pong
   return true;
 }
+
+bool CAdapterCommunication::IsOpen(void) const
+{
+  return !IsStopped() && m_port->IsOpen();
+}
+
+void CAdapterCommunication::FormatAdapterMessage(const cec_command &command, cec_adapter_message &packet)
+{
+  packet.clear();
+
+  //set ack polarity to high when transmitting to the broadcast address
+  //set ack polarity low when transmitting to any other address
+  packet.push_back(MSGSTART);
+  PushEscaped(packet, MSGCODE_TRANSMIT_ACK_POLARITY);
+  if (command.destination == CECDEVICE_BROADCAST)
+    PushEscaped(packet, CEC_TRUE);
+  else
+    PushEscaped(packet, CEC_FALSE);
+  packet.push_back(MSGEND);
+
+  // add source and destination
+  packet.push_back(MSGSTART);
+  PushEscaped(packet, MSGCODE_TRANSMIT);
+  packet.push_back(((uint8_t)command.initiator << 4) + (uint8_t)command.destination);
+  packet.push_back(MSGEND);
+
+  // add opcode
+  packet.push_back(MSGSTART);
+  PushEscaped(packet, command.parameters.empty() ? (uint8_t)MSGCODE_TRANSMIT_EOM : (uint8_t)MSGCODE_TRANSMIT);
+  packet.push_back((uint8_t) command.opcode);
+  packet.push_back(MSGEND);
+
+  // add parameters
+  for (int8_t iPtr = 0; iPtr < command.parameters.size; iPtr++)
+  {
+    packet.push_back(MSGSTART);
+
+    if (iPtr == command.parameters.size - 1)
+      PushEscaped(packet, MSGCODE_TRANSMIT_EOM);
+    else
+      PushEscaped(packet, MSGCODE_TRANSMIT);
+
+    PushEscaped(packet, command.parameters[iPtr]);
+
+    packet.push_back(MSGEND);
+  }
+}
+