From ff032d7101ab3e3d05700c1acce4b8b691fe43fa Mon Sep 17 00:00:00 2001 From: Boram Park Date: Tue, 26 Apr 2016 16:29:35 +0900 Subject: [PATCH] add sw_timer param Need to implement more Change-Id: I44ef299564d09e3c8788a04dc191518f7ab67436 --- client/tdm_client.c | 5 +++-- client/tdm_client.h | 3 ++- protocol/tdm.xml | 1 + src/tdm_server.c | 6 ++++-- tools/tdm_test_client.c | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/client/tdm_client.c b/client/tdm_client.c index b4ce7de..1639d9c 100644 --- a/client/tdm_client.c +++ b/client/tdm_client.c @@ -220,7 +220,8 @@ static const struct wl_tdm_vblank_listener tdm_client_vblank_listener = { }; tdm_client_error -tdm_client_wait_vblank(tdm_client *client, char *name, int interval, int sync, +tdm_client_wait_vblank(tdm_client *client, char *name, + int sw_timer, int interval, int sync, tdm_client_vblank_handler func, void *user_data) { tdm_private_client *private_client = (tdm_private_client*)client; @@ -245,7 +246,7 @@ tdm_client_wait_vblank(tdm_client *client, char *name, int interval, int sync, vblank_info->req_usec = (unsigned int)(tp.tv_nsec/1000L); vblank_info->vblank = - wl_tdm_wait_vblank(private_client->tdm, name, interval, + wl_tdm_wait_vblank(private_client->tdm, name, sw_timer, interval, vblank_info->req_sec, vblank_info->req_usec); if (!vblank_info->vblank) { TDM_ERR("couldn't create vblank resource"); diff --git a/client/tdm_client.h b/client/tdm_client.h index 6312d9d..58221e0 100644 --- a/client/tdm_client.h +++ b/client/tdm_client.h @@ -77,7 +77,8 @@ tdm_client_error tdm_client_handle_events(tdm_client *client); tdm_client_error -tdm_client_wait_vblank(tdm_client *client, char *name, int interval, int sync, +tdm_client_wait_vblank(tdm_client *client, char *name, + int sw_timer, int interval, int sync, tdm_client_vblank_handler func, void *user_data); #ifdef __cplusplus diff --git a/protocol/tdm.xml b/protocol/tdm.xml index 18af57d..29f741d 100644 --- a/protocol/tdm.xml +++ b/protocol/tdm.xml @@ -22,6 +22,7 @@ + diff --git a/src/tdm_server.c b/src/tdm_server.c index 50d552c..69abc20 100644 --- a/src/tdm_server.c +++ b/src/tdm_server.c @@ -102,8 +102,8 @@ destroy_vblank_callback(struct wl_resource *resource) static void _tdm_server_cb_wait_vblank(struct wl_client *client, struct wl_resource *resource, - uint32_t id, const char *name, int32_t interval, - uint32_t req_sec, uint32_t req_usec) + uint32_t id, const char *name, int32_t sw_timer, + int32_t interval, uint32_t req_sec, uint32_t req_usec) { tdm_private_loop *private_loop = wl_resource_get_user_data(resource); tdm_private_server *private_server = private_loop->private_server; @@ -144,6 +144,8 @@ _tdm_server_cb_wait_vblank(struct wl_client *client, return; } + /* TODO: need to implement things related with sw_timer */ + vblank_resource = wl_resource_create(client, &wl_tdm_vblank_interface, wl_resource_get_version(resource), id); diff --git a/tools/tdm_test_client.c b/tools/tdm_test_client.c index cb71c10..fcedae5 100644 --- a/tools/tdm_test_client.c +++ b/tools/tdm_test_client.c @@ -95,7 +95,7 @@ main(int argc, char *argv[]) while (1) { int ret; - error = tdm_client_wait_vblank(client, "unknown-0", 1, 0, + error = tdm_client_wait_vblank(client, "unknown-0", 1, 1, 0, _client_vblank_handler, NULL); if (error != TDM_CLIENT_ERROR_NONE) { printf("tdm_client_wait_vblank failed\n"); -- 2.7.4