Merge remote-tracking branch 'tangocash/master'

Origin commit data
------------------
Branch: master
Commit: ca4703cfe2
Author: max_10 <max_10@gmx.de>
Date: 2017-11-05 (Sun, 05 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2017-11-05 16:16:00 +01:00
11 changed files with 844 additions and 388 deletions

View File

@@ -40,7 +40,7 @@ inline void cs_api_exit()
#define cs_free_uncached free
// Callback function helpers
static inline void cs_register_messenger(cs_messenger) { return; };
void cs_register_messenger(cs_messenger messenger);
static inline void cs_deregister_messenger(void) { return; };
//cs_messenger cs_get_messenger(void);

View File

@@ -29,7 +29,7 @@ hw_caps_t *get_hwcaps(void)
memset(&caps, 0, sizeof(hw_caps_t));
initialized = 1;
caps.has_CI = 0;
caps.has_CI = 1;
caps.can_cec = 1;
caps.can_shutdown = 1;
caps.display_xres = 16;

View File

@@ -994,8 +994,10 @@ void cVideo::SetCECState(bool state)
usleep(10000);
message.address = 0x0f; /* broadcast */
message.data[0] = CEC_MSG_ACTIVE_SOURCE;
message.data[1] = ((((int)physicalAddress >> 12) & 0xf) << 4) + (((int)physicalAddress >> 8) & 0xf);
message.data[2] = ((((int)physicalAddress >> 4) & 0xf) << 4) + (((int)physicalAddress >> 0) & 0xf);
//message.data[1] = ((((int)physicalAddress >> 12) & 0xf) << 4) + (((int)physicalAddress >> 8) & 0xf);
//message.data[2] = ((((int)physicalAddress >> 4) & 0xf) << 4) + (((int)physicalAddress >> 0) & 0xf);
message.data[1] = physicalAddress[0];
message.data[2] = physicalAddress[1];
message.length = 3;
SendCECMessage(message);
}