From cd31cb568c4da66cb97239f9f3604e3b95fe4fb0 Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Date: Mon, 23 Apr 2018 17:09:19 +0200
Subject: [PATCH] Rename va_config to config for consistency

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
---
 .gitignore                    |  4 ++--
 configure.ac                  |  2 +-
 src/Makefile.am               |  6 +++---
 src/{va_config.c => config.c} | 14 ++++++++++----
 src/{va_config.h => config.h} |  0
 src/context.c                 |  2 +-
 src/picture.c                 |  2 +-
 src/sunxi_cedrus.c            |  4 ++--
 8 files changed, 20 insertions(+), 14 deletions(-)
 rename src/{va_config.c => config.c} (97%)
 rename src/{va_config.h => config.h} (100%)

diff --git a/.gitignore b/.gitignore
index 87d78a7..f695dcc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,8 +31,8 @@ compile
 missing
 Makefile
 Makefile.in
-config.h
-config.h.in
+autoconfig.h
+autoconfig.h.in
 stamp-h1
 aclocal.m4
 autom4te.cache
diff --git a/configure.ac b/configure.ac
index 2805024..a46722f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_INIT([liva_wrapper], [sunxi_cedrus_version],
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([src/autoconfig.h])
 
 SUNXI_CEDRUS_MAJOR_VERSION=sunxi_cedrus_major_version
 SUNXI_CEDRUS_MINOR_VERSION=sunxi_cedrus_minor_version
diff --git a/src/Makefile.am b/src/Makefile.am
index e4cc60d..8f4b9b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,13 +19,13 @@ driver_libs = \
 	$(X11_DEPS_LIBS)	\
 	$(LIBVA_DEPS_LIBS)
 
-source_c = sunxi_cedrus.c object_heap.c buffer.c va_config.c \
+source_c = sunxi_cedrus.c object_heap.c buffer.c config.c \
 	context.c image.c mpeg2.c picture.c subpicture.c surface.c
 
 source_s = \
 	tiled_yuv.S
 
-source_h = sunxi_cedrus_drv_video.h object_heap.h buffer.h va_config.h \
+source_h = sunxi_cedrus_drv_video.h object_heap.h buffer.h config.h \
 	context.h image.h mpeg2.h picture.h subpicture.h surface.h \
 	tiled_yuv.h
 
@@ -37,4 +37,4 @@ sunxi_cedrus_drv_video_la_LIBADD	= $(driver_libs)
 sunxi_cedrus_drv_video_la_SOURCES	= $(source_c) $(source_s)
 noinst_HEADERS				= $(source_h)
 
-MAINTAINERCLEANFILES = Makefile.in config.h.in
+MAINTAINERCLEANFILES = Makefile.in autoconfig.h.in
diff --git a/src/va_config.c b/src/config.c
similarity index 97%
rename from src/va_config.c
rename to src/config.c
index 9847acd..5222e50 100644
--- a/src/va_config.c
+++ b/src/config.c
@@ -24,7 +24,7 @@
  */
 
 #include "sunxi_cedrus.h"
-#include "va_config.h"
+#include "config.h"
 
 #include <assert.h>
 #include <string.h>
@@ -233,12 +233,18 @@ VAStatus SunxiCedrusQueryConfigAttributes(VADriverContextP context,
 
 VAStatus SunxiCedrusQueryDisplayAttributes(VADriverContextP context,
 	VADisplayAttribute *attributes, int *attributes_count)
-{ return VA_STATUS_ERROR_UNKNOWN; }
+{
+	return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
 
 VAStatus SunxiCedrusGetDisplayAttributes(VADriverContextP context,
 	VADisplayAttribute *attributes, int *attributes_count)
-{ return VA_STATUS_ERROR_UNKNOWN; }
+{
+	return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
 
 VAStatus SunxiCedrusSetDisplayAttributes(VADriverContextP context,
 	VADisplayAttribute *attributes, int *attributes_count)
-{ return VA_STATUS_ERROR_UNKNOWN; }
+{
+	return VA_STATUS_ERROR_UNIMPLEMENTED;
+}
diff --git a/src/va_config.h b/src/config.h
similarity index 100%
rename from src/va_config.h
rename to src/config.h
diff --git a/src/context.c b/src/context.c
index 04b3dd1..e757847 100644
--- a/src/context.c
+++ b/src/context.c
@@ -25,7 +25,7 @@
 
 #include "sunxi_cedrus.h"
 #include "context.h"
-#include "va_config.h"
+#include "config.h"
 #include "surface.h"
 
 #include <stdlib.h>
diff --git a/src/picture.c b/src/picture.c
index 25da3fd..a47d579 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -28,7 +28,7 @@
 #include "buffer.h"
 #include "context.h"
 #include "surface.h"
-#include "va_config.h"
+#include "config.h"
 
 #include "mpeg2.h"
 
diff --git a/src/sunxi_cedrus.c b/src/sunxi_cedrus.c
index 977db56..32b692b 100644
--- a/src/sunxi_cedrus.c
+++ b/src/sunxi_cedrus.c
@@ -29,10 +29,10 @@
 #include "picture.h"
 #include "subpicture.h"
 #include "surface.h"
-#include "va_config.h"
-
 #include "config.h"
 
+#include "autoconfig.h"
+
 #include <va/va_backend.h>
 
 #include "sunxi_cedrus.h"