all repos — mgba @ 7d12de0cb9af8a15c87b6c5de2a341ad519ff62b

mGBA Game Boy Advance Emulator

Move BLDCNT definition from video-softare to gba-video
Jeffrey Pfau jeffrey@endrift.com
Mon, 06 Oct 2014 00:37:08 -0700
commit

7d12de0cb9af8a15c87b6c5de2a341ad519ff62b

parent

abccc2d804c56cdc596c49efc4bbe03cd86d0355

2 files changed, 15 insertions(+), 15 deletions(-)

jump to
M src/gba/gba-video.h → 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);
M src/gba/renderers/video-software.c → src/gba/renderers/video-software.c 
@@ -22,21 +22,6 @@ 0, 0,
 	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);