From 521f41023b2450808af932dc5068bff0838642b9 Mon Sep 17 00:00:00 2001
From: Rick Tillery <rtillery@ti.com>
Date: Thu, 19 Jul 2012 13:40:02 -0500
Subject: BV: Update headers to 2.2: Add bvbltparams.src2auxdstrect,
 bvbltparams.maskauxdstrect, BVFLAG_SRC2_AUXDSTRECT and
 BVFLAG_MASK_AUXDSTRECT; Add BVAT_reserved2 bvauxtype; Updated documentation
 (+ new images)

Change-Id: I6a427019ab8d5ca4d6fd725d37f8d6abf8b2e55b
Signed-off-by: Rick Tillery <rtillery@ti.com>
---
 bltsville/include/bltsville.h  | 11 +++++++++--
 bltsville/include/bvbuffdesc.h |  3 ++-
 bltsville/include/bverror.h    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'bltsville/include')

diff --git a/bltsville/include/bltsville.h b/bltsville/include/bltsville.h
index eb32bf8..96baebb 100644
--- a/bltsville/include/bltsville.h
+++ b/bltsville/include/bltsville.h
@@ -88,7 +88,11 @@ struct bvrect {
 
 #define BVFLAG_SCALE_RETURN	0x00100000 /* return scale type used */
 #define BVFLAG_DITHER_RETURN	0x00200000 /* return dither type used */
-/**** Bits 31-22 reserved ****/
+
+
+#define BVFLAG_SRC2_AUXDSTRECT	0x00400000 /* src2auxdstrect used */
+#define BVFLAG_MASK_AUXDSTRECT	0x00800000 /* maskauxdstrect used */
+/**** Bits 31-24 reserved ****/
 
 /*
  * BVIMPL_* - BLTsville implementations may be combined under managers to
@@ -501,7 +505,7 @@ struct bvcallbackerror {
 struct bvbatch;
 
 /*
- * bvinbuff - provides the buffer in bvbltparams 
+ * bvinbuff - provides the buffer in bvbltparams
  */
 union bvinbuff {
 	struct bvbuffdesc *desc;	 /* buffer description when
@@ -588,6 +592,9 @@ struct bvbltparams {
 							 error; handle contains
 							 callbackdata below */
 	unsigned long callbackdata;	/* (i) callback data */
+
+	struct bvrect src2auxdstrect;
+	struct bvrect maskauxdstrect;
 };
 
 #endif /* BLTSVILLE_H */
diff --git a/bltsville/include/bvbuffdesc.h b/bltsville/include/bvbuffdesc.h
index d86e317..98934bc 100644
--- a/bltsville/include/bvbuffdesc.h
+++ b/bltsville/include/bvbuffdesc.h
@@ -37,6 +37,8 @@ enum bvauxtype {
 	BVAT_NONE = 0,	/* auxptr not used */
 	BVAT_reserved1 = /* reserved */
 		BVATDEF_VENDOR_ALL + 1,
+	BVAT_reserved2 = /* reserved */
+		BVATDEF_VENDOR_ALL + 2,
 #ifdef BVAT_EXTERNAL_INCLUDE
 #include BVAT_EXTERNAL_INCLUDE
 #endif
@@ -56,5 +58,4 @@ struct bvbuffdesc {
 					type depends on auxtype */
 };
 
-
 #endif /* BVBUFFDESC_H */
diff --git a/bltsville/include/bverror.h b/bltsville/include/bverror.h
index 787dfaf..15c3ba7 100644
--- a/bltsville/include/bverror.h
+++ b/bltsville/include/bverror.h
@@ -293,7 +293,7 @@ enum bverror {
 	BVERR_MEMORY_ERROR =	/* async operation triggered memory error */
 		BVERRDEF_VENDOR_ALL + 51000,
 
-	BVERR_FORMAT =		/* unsupported bvcopparams.bvsurfgeom.format */
+	BVERR_FORMAT =		/* unsupported format */
 		BVERRDEF_VENDOR_ALL + 52000,
 
 	BVERR_CACHEOP =		/* unsupported cache operation */
-- 
cgit v1.1