repositories
/
deb_libcec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cec: changed debug level of 'did not receive ack' from error to debug
[deb_libcec.git]
/
src
/
lib
/
CECProcessor.cpp
diff --git
a/src/lib/CECProcessor.cpp
b/src/lib/CECProcessor.cpp
index 8238de77ca8d318cfd35addcc52b589673bae08c..30a8acce8f9fdba27f2511960c6e18d5900dbc4d 100644
(file)
--- a/
src/lib/CECProcessor.cpp
+++ b/
src/lib/CECProcessor.cpp
@@
-74,29
+74,29
@@
CCECProcessor::CCECProcessor(CLibCEC *controller, CAdapterCommunication *serComm
switch(iPtr)
{
case CECDEVICE_AUDIOSYSTEM:
switch(iPtr)
{
case CECDEVICE_AUDIOSYSTEM:
- m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECAudioSystem(this, (cec_logical_address) iPtr, 0
xFFFF
);
break;
case CECDEVICE_PLAYBACKDEVICE1:
case CECDEVICE_PLAYBACKDEVICE2:
case CECDEVICE_PLAYBACKDEVICE3:
break;
case CECDEVICE_PLAYBACKDEVICE1:
case CECDEVICE_PLAYBACKDEVICE2:
case CECDEVICE_PLAYBACKDEVICE3:
- m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECPlaybackDevice(this, (cec_logical_address) iPtr, 0
xFFFF
);
break;
case CECDEVICE_RECORDINGDEVICE1:
case CECDEVICE_RECORDINGDEVICE2:
case CECDEVICE_RECORDINGDEVICE3:
break;
case CECDEVICE_RECORDINGDEVICE1:
case CECDEVICE_RECORDINGDEVICE2:
case CECDEVICE_RECORDINGDEVICE3:
- m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECRecordingDevice(this, (cec_logical_address) iPtr, 0
xFFFF
);
break;
case CECDEVICE_TUNER1:
case CECDEVICE_TUNER2:
case CECDEVICE_TUNER3:
case CECDEVICE_TUNER4:
break;
case CECDEVICE_TUNER1:
case CECDEVICE_TUNER2:
case CECDEVICE_TUNER3:
case CECDEVICE_TUNER4:
- m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECTuner(this, (cec_logical_address) iPtr, 0
xFFFF
);
break;
case CECDEVICE_TV:
m_busDevices[iPtr] = new CCECTV(this, (cec_logical_address) iPtr, 0);
break;
default:
break;
case CECDEVICE_TV:
m_busDevices[iPtr] = new CCECTV(this, (cec_logical_address) iPtr, 0);
break;
default:
- m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0);
+ m_busDevices[iPtr] = new CCECBusDevice(this, (cec_logical_address) iPtr, 0
xFFFF
);
break;
}
}
break;
}
}
@@
-143,7
+143,7
@@
bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
AddLog(CEC_LOG_DEBUG, strLog);
SetAckMask(0x1 << address);
AddLog(CEC_LOG_DEBUG, strLog);
SetAckMask(0x1 << address);
- if (!m_busDevices[address]->
PollDevice
(address))
+ if (!m_busDevices[address]->
TransmitPoll
(address))
{
strLog.Format("using logical address '%s'", strLabel);
AddLog(CEC_LOG_NOTICE, strLog);
{
strLog.Format("using logical address '%s'", strLabel);
AddLog(CEC_LOG_NOTICE, strLog);
@@
-155,7
+155,7
@@
bool CCECProcessor::TryLogicalAddress(cec_logical_address address, const char *s
m_logicalAddresses.set(address);
// TODO
m_logicalAddresses.set(address);
// TODO
- m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS +
iIndex
);
+ m_busDevices[address]->SetPhysicalAddress(CEC_DEFAULT_PHYSICAL_ADDRESS +
(iIndex * 0x100)
);
return true;
}
return true;
}
@@
-354,7
+354,7
@@
bool CCECProcessor::SwitchMonitoring(bool bEnable)
bool CCECProcessor::PollDevice(cec_logical_address iAddress)
{
if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress])
bool CCECProcessor::PollDevice(cec_logical_address iAddress)
{
if (iAddress != CECDEVICE_UNKNOWN && m_busDevices[iAddress])
- return m_busDevices[
iAddress]->PollDevice(
);
+ return m_busDevices[
m_logicalAddresses.primary]->TransmitPoll(iAddress
);
return false;
}
return false;
}
@@
-420,7
+420,7
@@
bool CCECProcessor::Transmit(CCECAdapterMessage *output)
if (output->transmit_timeout > 0)
{
if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
if (output->transmit_timeout > 0)
{
if ((bReturn = WaitForTransmitSucceeded(output->size(), output->transmit_timeout)) == false)
- m_controller->AddLog(CEC_LOG_
ERROR
, "did not receive ack");
+ m_controller->AddLog(CEC_LOG_
DEBUG
, "did not receive ack");
}
else
bReturn = true;
}
else
bReturn = true;