Revert "Implement WFD_EVENT_PIPELINE_BIND_SOURCE attrib"

This reverts commit 480181e07546420c4ca545a6ebb0a2de7670024c.

"The WFD_EVENT_PIPELINE_BIND_SOURCE attribute will be set to the
previously bound source handle", but it was implemnted to point
to the newly bound source handle.

5 files changed, 1 insertions, 33 deletions

diff --git a/src/wfdevent.c b/src/wfdevent.c
index d9e4e3e..16d4729 100644
--- a/src/wfdevent.c
+++ b/src/wfdevent.c
@@ -32,7 +32,6 @@
 #include <WF/wfdext.h>
 
 #include "wflist.h"
-#include "wfhandle.h"
 #include "wfdregistry.h"
 #include "wfdevent.h"
 #include "wfdport.h"
@@ -49,7 +48,6 @@
 
 struct bind_event {
 	WFDint pipeline_id;
-	WFDSource source;
 	WFDint time;
 
 	struct wf_list link;
@@ -369,8 +367,6 @@ wfd_event_get_attribi(struct wfd_device *device,
 			return event->bind.pipeline_id;
 		case WFD_EVENT_PIPELINE_BIND_TIME_EXT:
 			return event->bind.time;
-		case WFD_EVENT_PIPELINE_BIND_SOURCE:
-			return event->bind.source;
 		default:
 			wfd_device_set_error(device,
 					     WFD_ERROR_ILLEGAL_ARGUMENT);
@@ -396,8 +392,6 @@ page_flip_handler(int fd, unsigned int frame,
 	struct bind_event bind;
 
 	wf_list_init(&bind.link);
-	bind.source = wf_handle_get(wfd_pipeline_get_source(pipeline),
-				    SOURCE_HANDLE);
 	bind.pipeline_id = wfd_pipeline_get_id(pipeline);
 	bind.time = (sec * 1000 + usec / 1000) -
 		global_event->start_time_msec;
diff --git a/src/wfdpipeline.c b/src/wfdpipeline.c
index c7d65f9..6360c82 100644
--- a/src/wfdpipeline.c
+++ b/src/wfdpipeline.c
@@ -183,12 +183,6 @@ wfd_pipeline_get_id(struct wfd_pipeline *pipeline)
 	return pipeline->crtc->crtc_id;
 }
 
-struct wfd_source *
-wfd_pipeline_get_source(struct wfd_pipeline *pipeline)
-{
-	return pipeline->source;
-}
-
 WFDint
 wfd_pipeline_get_attribi(struct wfd_device *device,
 			 struct wfd_pipeline *pipeline,
diff --git a/src/wfdpipeline.h b/src/wfdpipeline.h
index 3093d62..e2561fe 100644
--- a/src/wfdpipeline.h
+++ b/src/wfdpipeline.h
@@ -55,9 +55,6 @@ wfd_pipeline_bind_source(struct wfd_device *device,
 int
 wfd_pipeline_get_id(struct wfd_pipeline *pipeline);
 
-struct wfd_source *
-wfd_pipeline_get_source(struct wfd_pipeline *pipeline);
-
 uint32_t
 wfd_pipeline_get_crtc_id(struct wfd_pipeline *pipeline);
 
diff --git a/src/wfhandle.c b/src/wfhandle.c
index c2c5d60..3294bcd 100644
--- a/src/wfhandle.c
+++ b/src/wfhandle.c
@@ -31,7 +31,7 @@ struct handle_entry {
 	void *object;
 };
 
-struct handle_entry **hash_table = NULL;
+void **hash_table = NULL;
 uint32_t next_handle = 1;
 
 uint32_t current_size = 16;
@@ -90,20 +90,6 @@ wf_handle_create(void *object, enum wf_type type)
 	return handle;
 }
 
-uint32_t
-wf_handle_get(void *object, enum wf_type type)
-{
-	int i;
-
-	for (i = 0; i < next_handle; ++i)
-		if (hash_table[i] != NULL &&
-		    hash_table[i]->object == object &&
-		    hash_table[i]->type == type)
-			return i;
-
-	return WF_HANDLE_INVALID;
-}
-
 void *
 wf_handle_get_object(uint32_t handle, enum wf_type type)
 {
diff --git a/src/wfhandle.h b/src/wfhandle.h
index e3de089..3ddad79 100644
--- a/src/wfhandle.h
+++ b/src/wfhandle.h
@@ -46,9 +46,6 @@ wf_handle_create(void *object, enum wf_type type);
 void *
 wf_handle_get_object(uint32_t handle, enum wf_type type);
 
-uint32_t
-wf_handle_get(void *object, enum wf_type type);
-
 void
 wf_handle_destroy(uint32_t handle);