forked from enlightenment/efl
drm - shut up warnings (not actual bugs)
This commit is contained in:
parent
4de2059d41
commit
4da1081c4d
|
@ -213,6 +213,7 @@ _send_msg(int opcode, int fd, void *data, size_t bytes)
|
||||||
struct iovec iov[2];
|
struct iovec iov[2];
|
||||||
struct msghdr msg;
|
struct msghdr msg;
|
||||||
ssize_t size;
|
ssize_t size;
|
||||||
|
int *iptr;
|
||||||
|
|
||||||
/* send a message to the calling process */
|
/* send a message to the calling process */
|
||||||
/* 'fd' is the fd to send */
|
/* 'fd' is the fd to send */
|
||||||
|
@ -242,7 +243,8 @@ _send_msg(int opcode, int fd, void *data, size_t bytes)
|
||||||
msg.msg_controllen = RIGHTS_LEN;
|
msg.msg_controllen = RIGHTS_LEN;
|
||||||
|
|
||||||
fprintf(stderr, "Launcher Sending FD: %d\n", fd);
|
fprintf(stderr, "Launcher Sending FD: %d\n", fd);
|
||||||
*((int *)CMSG_DATA(cmsgptr)) = fd;
|
iptr = (int *)(CMSG_DATA(cmsgptr));
|
||||||
|
*iptr = fd;
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
size = sendmsg(_write_fd, &msg, MSG_EOR);
|
size = sendmsg(_write_fd, &msg, MSG_EOR);
|
||||||
|
@ -267,6 +269,7 @@ _recv_msg(void)
|
||||||
struct cmsghdr *cmsg = NULL;
|
struct cmsghdr *cmsg = NULL;
|
||||||
char data[BUFSIZ];
|
char data[BUFSIZ];
|
||||||
ssize_t size;
|
ssize_t size;
|
||||||
|
int *iptr;
|
||||||
|
|
||||||
fprintf(stderr, "Received Message\n");
|
fprintf(stderr, "Received Message\n");
|
||||||
|
|
||||||
|
@ -307,7 +310,8 @@ _recv_msg(void)
|
||||||
switch (cmsg->cmsg_type)
|
switch (cmsg->cmsg_type)
|
||||||
{
|
{
|
||||||
case SCM_RIGHTS:
|
case SCM_RIGHTS:
|
||||||
fd = *((int *)CMSG_DATA(cmsg));
|
iptr = (int *)(CMSG_DATA(cmsg));
|
||||||
|
fd = *iptr;
|
||||||
switch (dmsg.opcode)
|
switch (dmsg.opcode)
|
||||||
{
|
{
|
||||||
case ECORE_DRM_OP_DEVICE_OPEN:
|
case ECORE_DRM_OP_DEVICE_OPEN:
|
||||||
|
|
|
@ -116,6 +116,7 @@ _ecore_drm_socket_send(int opcode, int fd, void *data, size_t bytes)
|
||||||
struct iovec iov[2];
|
struct iovec iov[2];
|
||||||
struct msghdr msg;
|
struct msghdr msg;
|
||||||
ssize_t size;
|
ssize_t size;
|
||||||
|
int *iptr;
|
||||||
|
|
||||||
/* Simplified version of sending messages. We don't need to send any
|
/* Simplified version of sending messages. We don't need to send any
|
||||||
* 'credentials' with this as it is just basically an IPC to send over
|
* 'credentials' with this as it is just basically an IPC to send over
|
||||||
|
@ -147,10 +148,9 @@ _ecore_drm_socket_send(int opcode, int fd, void *data, size_t bytes)
|
||||||
msg.msg_control = cmsgptr;
|
msg.msg_control = cmsgptr;
|
||||||
msg.msg_controllen = RIGHTS_LEN;
|
msg.msg_controllen = RIGHTS_LEN;
|
||||||
|
|
||||||
if (fd > -1)
|
iptr = (int *)(CMSG_DATA(cmsgptr));
|
||||||
*((int *)CMSG_DATA(cmsgptr)) = fd;
|
if (fd > -1) *iptr = fd;
|
||||||
else
|
else *iptr = _ecore_drm_sockets[1];
|
||||||
*((int *)CMSG_DATA(cmsgptr)) = _ecore_drm_sockets[1];
|
|
||||||
|
|
||||||
errno = 0;
|
errno = 0;
|
||||||
size = sendmsg(_ecore_drm_sockets[1], &msg, MSG_EOR);
|
size = sendmsg(_ecore_drm_sockets[1], &msg, MSG_EOR);
|
||||||
|
@ -173,6 +173,7 @@ _ecore_drm_socket_receive(int opcode EINA_UNUSED, int *fd, void **data, size_t b
|
||||||
struct iovec iov[2];
|
struct iovec iov[2];
|
||||||
struct msghdr msg;
|
struct msghdr msg;
|
||||||
char buff[CMSG_SPACE(sizeof(fd))];
|
char buff[CMSG_SPACE(sizeof(fd))];
|
||||||
|
int *iptr;
|
||||||
/* ssize_t size; */
|
/* ssize_t size; */
|
||||||
|
|
||||||
memset(&dmsg, 0, sizeof(dmsg));
|
memset(&dmsg, 0, sizeof(dmsg));
|
||||||
|
@ -212,7 +213,8 @@ _ecore_drm_socket_receive(int opcode EINA_UNUSED, int *fd, void **data, size_t b
|
||||||
switch (cmsg->cmsg_type)
|
switch (cmsg->cmsg_type)
|
||||||
{
|
{
|
||||||
case SCM_RIGHTS:
|
case SCM_RIGHTS:
|
||||||
if (fd) *fd = *((int *)CMSG_DATA(cmsg));
|
iptr = (int *)(CMSG_DATA(cmsg));
|
||||||
|
if (fd) *fd = *iptr;
|
||||||
switch (dmsg.opcode)
|
switch (dmsg.opcode)
|
||||||
{
|
{
|
||||||
case ECORE_DRM_OP_DEVICE_OPEN:
|
case ECORE_DRM_OP_DEVICE_OPEN:
|
||||||
|
|
|
@ -140,7 +140,7 @@ static Ecore_Evas_Engine_Func _ecore_evas_drm_engine_func =
|
||||||
};
|
};
|
||||||
|
|
||||||
EAPI Ecore_Evas *
|
EAPI Ecore_Evas *
|
||||||
ecore_evas_drm_new_internal(const char *device, unsigned int parent, int x, int y, int w, int h)
|
ecore_evas_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
Ecore_Evas *ee;
|
Ecore_Evas *ee;
|
||||||
Evas_Engine_Info_Drm *einfo;
|
Evas_Engine_Info_Drm *einfo;
|
||||||
|
@ -737,13 +737,13 @@ _ecore_evas_drm_render_updates_process(Ecore_Evas *ee, Eina_List *updates)
|
||||||
|
|
||||||
if ((ee->visible) && (updates))
|
if ((ee->visible) && (updates))
|
||||||
{
|
{
|
||||||
Eina_List *l = NULL;
|
// Eina_List *l = NULL;
|
||||||
Eina_Rectangle *r;
|
// Eina_Rectangle *r;
|
||||||
|
//
|
||||||
EINA_LIST_FOREACH(updates, l, r)
|
// EINA_LIST_FOREACH(updates, l, r)
|
||||||
{
|
// {
|
||||||
/* TODO */
|
// /* TODO */
|
||||||
}
|
// }
|
||||||
|
|
||||||
_ecore_evas_idle_timeout_update(ee);
|
_ecore_evas_idle_timeout_update(ee);
|
||||||
rend = 1;
|
rend = 1;
|
||||||
|
|
Loading…
Reference in New Issue