From 36b7bba14fa42cf51b24d9d6038ff393e5e87a69 Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon, 23 Apr 2018 10:13:05 +0200
Subject: [PATCH] config: Use object config structure directly instead of
 abstract type

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 src/context.c                | 2 +-
 src/picture.c                | 4 ++--
 src/sunxi_cedrus_drv_video.c | 6 +++---
 src/va_config.c              | 8 ++++----
 src/va_config.h              | 6 ++----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/context.c b/src/context.c
index af8c54c..32396fd 100644
--- a/src/context.c
+++ b/src/context.c
@@ -51,7 +51,7 @@ VAStatus sunxi_cedrus_CreateContext(VADriverContextP ctx, VAConfigID config_id,
 {
 	INIT_DRIVER_DATA
 	VAStatus vaStatus = VA_STATUS_SUCCESS;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 	int i;
 	struct v4l2_create_buffers create_bufs;
 	struct v4l2_format fmt;
diff --git a/src/picture.c b/src/picture.c
index b7fce2a..5f6f360 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -87,7 +87,7 @@ VAStatus sunxi_cedrus_RenderPicture(VADriverContextP ctx, VAContextID context,
 	VAStatus vaStatus = VA_STATUS_SUCCESS;
 	struct object_context *obj_context;
 	struct object_surface *obj_surface;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 	int i;
 
 	obj_context = CONTEXT(context);
@@ -152,7 +152,7 @@ VAStatus sunxi_cedrus_EndPicture(VADriverContextP ctx, VAContextID context)
 	struct v4l2_ext_control ctrl;
 	struct v4l2_ext_controls ctrls;
 	struct media_request_new media_request;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 	int request_fd;
 	int rc;
 
diff --git a/src/sunxi_cedrus_drv_video.c b/src/sunxi_cedrus_drv_video.c
index f253ed3..edc6d6d 100644
--- a/src/sunxi_cedrus_drv_video.c
+++ b/src/sunxi_cedrus_drv_video.c
@@ -65,7 +65,7 @@ VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx)
 {
 	INIT_DRIVER_DATA
 	struct object_buffer *obj_buffer;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 	object_heap_iterator iter;
 
 	for (int i = 0; i < INPUT_BUFFERS_NB; i++)
@@ -88,11 +88,11 @@ VAStatus sunxi_cedrus_Terminate(VADriverContextP ctx)
 	object_heap_destroy(&driver_data->context_heap);
 
 	/* Clean up configIDs */
-	obj_config = (object_config_p) object_heap_first(&driver_data->config_heap, &iter);
+	obj_config = (struct object_config *) object_heap_first(&driver_data->config_heap, &iter);
 	while (obj_config)
 	{
 		object_heap_free(&driver_data->config_heap, (object_base_p) obj_config);
-		obj_config = (object_config_p) object_heap_next(&driver_data->config_heap, &iter);
+		obj_config = (struct object_config *) object_heap_next(&driver_data->config_heap, &iter);
 	}
 	object_heap_destroy(&driver_data->config_heap);
 
diff --git a/src/va_config.c b/src/va_config.c
index e755e7f..7be5b4e 100644
--- a/src/va_config.c
+++ b/src/va_config.c
@@ -123,7 +123,7 @@ VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx,
 	return VA_STATUS_SUCCESS;
 }
 
-VAStatus sunxi_cedrus_update_attribute(object_config_p obj_config,
+VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config,
 		VAConfigAttrib *attrib)
 {
 	int i;
@@ -155,7 +155,7 @@ VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile,
 	INIT_DRIVER_DATA
 	VAStatus vaStatus;
 	int configID;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 	int i;
 
 	/* Validate profile & entrypoint */
@@ -220,7 +220,7 @@ VAStatus sunxi_cedrus_DestroyConfig(VADriverContextP ctx, VAConfigID config_id)
 {
 	INIT_DRIVER_DATA
 	VAStatus vaStatus;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 
 	obj_config = CONFIG(config_id);
 	if (NULL == obj_config)
@@ -240,7 +240,7 @@ VAStatus sunxi_cedrus_QueryConfigAttributes(VADriverContextP ctx,
 {
 	INIT_DRIVER_DATA
 	VAStatus vaStatus = VA_STATUS_SUCCESS;
-	object_config_p obj_config;
+	struct object_config *obj_config;
 	int i;
 
 	obj_config = CONFIG(config_id);
diff --git a/src/va_config.h b/src/va_config.h
index fb071d7..c1c0fbc 100644
--- a/src/va_config.h
+++ b/src/va_config.h
@@ -30,7 +30,7 @@
 
 #include "object_heap.h"
 
-#define CONFIG(id)  ((object_config_p)  object_heap_lookup(&driver_data->config_heap,  id))
+#define CONFIG(id)  ((struct object_config *)  object_heap_lookup(&driver_data->config_heap,  id))
 #define CONFIG_ID_OFFSET		0x01000000
 
 struct object_config {
@@ -41,8 +41,6 @@ struct object_config {
 	int attrib_count;
 };
 
-typedef struct object_config *object_config_p;
-
 VAStatus sunxi_cedrus_QueryConfigProfiles(VADriverContextP ctx,
 		VAProfile *profile_list, int *num_profiles);
 
@@ -54,7 +52,7 @@ VAStatus sunxi_cedrus_GetConfigAttributes(VADriverContextP ctx,
 		VAProfile profile, VAEntrypoint entrypoint,
 		VAConfigAttrib *attrib_list, int num_attribs);
 
-VAStatus sunxi_cedrus_update_attribute(object_config_p obj_config,
+VAStatus sunxi_cedrus_update_attribute(struct object_config *obj_config,
 		VAConfigAttrib *attrib);
 
 VAStatus sunxi_cedrus_CreateConfig(VADriverContextP ctx, VAProfile profile,