From 7d12de0cb9af8a15c87b6c5de2a341ad519ff62b Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Mon, 6 Oct 2014 00:37:08 -0700
Subject: [PATCH] Move BLDCNT definition from video-softare to gba-video

---
 src/gba/gba-video.h                | 15 +++++++++++++++
 src/gba/renderers/video-software.c | 15 ---------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/gba/gba-video.h b/src/gba/gba-video.h
index 5d011cea5..c973f7a05 100644
--- a/src/gba/gba-video.h
+++ b/src/gba/gba-video.h
@@ -129,6 +129,21 @@ DECL_BITS(GBARegisterBGCNT, ScreenBase, 8, 5);
 DECL_BIT(GBARegisterBGCNT, Overflow, 13);
 DECL_BITS(GBARegisterBGCNT, Size, 14, 2);
 
+DECL_BITFIELD(GBARegisterBLDCNT, uint16_t);
+DECL_BIT(GBARegisterBLDCNT, Target1Bg0, 0);
+DECL_BIT(GBARegisterBLDCNT, Target1Bg1, 1);
+DECL_BIT(GBARegisterBLDCNT, Target1Bg2, 2);
+DECL_BIT(GBARegisterBLDCNT, Target1Bg3, 3);
+DECL_BIT(GBARegisterBLDCNT, Target1Obj, 4);
+DECL_BIT(GBARegisterBLDCNT, Target1Bd, 5);
+DECL_BITS(GBARegisterBLDCNT, Effect, 6, 2);
+DECL_BIT(GBARegisterBLDCNT, Target2Bg0, 8);
+DECL_BIT(GBARegisterBLDCNT, Target2Bg1, 9);
+DECL_BIT(GBARegisterBLDCNT, Target2Bg2, 10);
+DECL_BIT(GBARegisterBLDCNT, Target2Bg3, 11);
+DECL_BIT(GBARegisterBLDCNT, Target2Obj, 12);
+DECL_BIT(GBARegisterBLDCNT, Target2Bd, 13);
+
 struct GBAVideoRenderer {
 	void (*init)(struct GBAVideoRenderer* renderer);
 	void (*reset)(struct GBAVideoRenderer* renderer);
diff --git a/src/gba/renderers/video-software.c b/src/gba/renderers/video-software.c
index 182893839..0ca8f9ccb 100644
--- a/src/gba/renderers/video-software.c
+++ b/src/gba/renderers/video-software.c
@@ -22,21 +22,6 @@ static const int _objSizes[32] = {
 	0, 0
 };
 
-DECL_BITFIELD(GBARegisterBLDCNT, uint16_t);
-DECL_BIT(GBARegisterBLDCNT, Target1Bg0, 0);
-DECL_BIT(GBARegisterBLDCNT, Target1Bg1, 1);
-DECL_BIT(GBARegisterBLDCNT, Target1Bg2, 2);
-DECL_BIT(GBARegisterBLDCNT, Target1Bg3, 3);
-DECL_BIT(GBARegisterBLDCNT, Target1Obj, 4);
-DECL_BIT(GBARegisterBLDCNT, Target1Bd, 5);
-DECL_BITS(GBARegisterBLDCNT, Effect, 6, 2);
-DECL_BIT(GBARegisterBLDCNT, Target2Bg0, 8);
-DECL_BIT(GBARegisterBLDCNT, Target2Bg1, 9);
-DECL_BIT(GBARegisterBLDCNT, Target2Bg2, 10);
-DECL_BIT(GBARegisterBLDCNT, Target2Bg3, 11);
-DECL_BIT(GBARegisterBLDCNT, Target2Obj, 12);
-DECL_BIT(GBARegisterBLDCNT, Target2Bd, 13);
-
 static void GBAVideoSoftwareRendererInit(struct GBAVideoRenderer* renderer);
 static void GBAVideoSoftwareRendererDeinit(struct GBAVideoRenderer* renderer);
 static void GBAVideoSoftwareRendererWriteOAM(struct GBAVideoRenderer* renderer, uint32_t oam);