Replace all bitfields which were only declared with "(un)signed" with their actual types. Let me know if I missed any. It would also be a good idea to test this commit in both x64 and x86.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6232 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 48 insertions, 48 deletions

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.h b/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.h
index 693713cb9e..54c2528e68 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.h
@@ -74,12 +74,12 @@ namespace CommandProcessor
     {
 	    struct
 	    {
-		    unsigned OverflowHiWatermark	:	1;
-		    unsigned UnderflowLoWatermark	:	1;
-		    unsigned ReadIdle				:	1; // done reading
-		    unsigned CommandIdle			:	1; // done processing commands
-		    unsigned Breakpoint				:	1;
-		    unsigned						:	11;
+		    u16 OverflowHiWatermark	:	1;
+		    u16 UnderflowLoWatermark:	1;
+		    u16 ReadIdle			:	1; // done reading
+		    u16 CommandIdle			:	1; // done processing commands
+		    u16 Breakpoint			:	1;
+		    u16						:	11;
 	    };
 	    u16 Hex;
 	    UCPStatusReg() {Hex = 0; }
@@ -91,13 +91,13 @@ namespace CommandProcessor
     {
 	    struct
 	    {
-		    unsigned GPReadEnable			:	1;
-		    unsigned BPEnable           	:	1;
-		    unsigned FifoOverflowIntEnable	:	1;
-		    unsigned FifoUnderflowIntEnable	:	1;
-		    unsigned GPLinkEnable			:	1;
-		    unsigned BreakPointIntEnable	:	1;
-		    unsigned						:	10;
+		    u16 GPReadEnable			:	1;
+		    u16 BPEnable           		:	1;
+		    u16 FifoOverflowIntEnable	:	1;
+		    u16 FifoUnderflowIntEnable	:	1;
+		    u16 GPLinkEnable			:	1;
+		    u16 BreakPointIntEnable		:	1;
+		    u16							:	10;
 	    };
 	    u16 Hex;
 	    UCPCtrlReg() {Hex = 0; }
@@ -109,10 +109,10 @@ namespace CommandProcessor
     {
 	    struct
 	    {
-		    unsigned ClearFifoOverflow		:	1;
-		    unsigned ClearFifoUnderflow		:	1;
-		    unsigned ClearMetrices			:	1;
-		    unsigned						:	13;
+		    u16 ClearFifoOverflow		:	1;
+		    u16 ClearFifoUnderflow		:	1;
+		    u16 ClearMetrices			:	1;
+		    u16							:	13;
 	    };
 	    u16 Hex;
 	    UCPClearReg() {Hex = 0; }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
index 008c2e195a..52977974a4 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.h
@@ -89,14 +89,14 @@ union LitChannel
 {
     struct
     {
-        unsigned matsource      : 1;
-        unsigned enablelighting : 1;
-        unsigned lightMask0_3   : 4;
-        unsigned ambsource      : 1;
-        unsigned diffusefunc    : 2; // LIGHTDIF_X
-        unsigned attnfunc       : 2; // LIGHTATTN_X
-        unsigned lightMask4_7   : 4;
-        unsigned unused         : 17;
+        u32 matsource      : 1;
+        u32 enablelighting : 1;
+        u32 lightMask0_3   : 4;
+        u32 ambsource      : 1;
+        u32 diffusefunc    : 2; // LIGHTDIF_X
+        u32 attnfunc       : 2; // LIGHTATTN_X
+        u32 lightMask4_7   : 4;
+        u32 unused         : 17;
     };
     u32 hex;
     unsigned int GetFullLightMask() const
@@ -109,10 +109,10 @@ union INVTXSPEC
 {
     struct
     {
-        unsigned numcolors : 2;
-        unsigned numnormals : 2; // 0 - nothing, 1 - just normal, 2 - normals and binormals
-        unsigned numtextures : 4;
-        unsigned unused : 24;
+        u32 numcolors : 2;
+        u32 numnormals : 2; // 0 - nothing, 1 - just normal, 2 - normals and binormals
+        u32 numtextures : 4;
+        u32 unused : 24;
     };
     u32 hex;
 };
@@ -121,11 +121,11 @@ union TXFMatrixIndexA
 {
     struct
     {
-        unsigned PosNormalMtxIdx : 6;
-        unsigned Tex0MtxIdx : 6;
-        unsigned Tex1MtxIdx : 6;
-        unsigned Tex2MtxIdx : 6;
-        unsigned Tex3MtxIdx : 6;
+        u32 PosNormalMtxIdx : 6;
+        u32 Tex0MtxIdx : 6;
+        u32 Tex1MtxIdx : 6;
+        u32 Tex2MtxIdx : 6;
+        u32 Tex3MtxIdx : 6;
     };
     struct
     {
@@ -138,10 +138,10 @@ union TXFMatrixIndexB
 {
     struct
     {
-        unsigned Tex4MtxIdx : 6;
-        unsigned Tex5MtxIdx : 6;
-        unsigned Tex6MtxIdx : 6;
-        unsigned Tex7MtxIdx : 6;
+        u32 Tex4MtxIdx : 6;
+        u32 Tex5MtxIdx : 6;
+        u32 Tex6MtxIdx : 6;
+        u32 Tex7MtxIdx : 6;
     };
     struct
     {
@@ -164,13 +164,13 @@ union TexMtxInfo
 {
     struct 
     {
-        unsigned unknown : 1;
-        unsigned projection : 1; // XF_TEXPROJ_X
-        unsigned inputform : 2; // XF_TEXINPUT_X
-        unsigned texgentype : 3; // XF_TEXGEN_X
-        unsigned sourcerow : 5; // XF_SRCGEOM_X
-        unsigned embosssourceshift : 3; // what generated texcoord to use
-        unsigned embosslightshift : 3; // light index that is used
+        u32 unknown : 1;
+        u32 projection : 1; // XF_TEXPROJ_X
+        u32 inputform : 2; // XF_TEXINPUT_X
+        u32 texgentype : 3; // XF_TEXGEN_X
+        u32 sourcerow : 5; // XF_SRCGEOM_X
+        u32 embosssourceshift : 3; // what generated texcoord to use
+        u32 embosslightshift : 3; // light index that is used
     };
     u32 hex;
 };
@@ -179,9 +179,9 @@ union PostMtxInfo
 {
     struct 
     {
-        unsigned index : 6; // base row of dual transform matrix
-        unsigned unused : 2;
-        unsigned normalize : 1; // normalize before send operation
+        u32 index : 6; // base row of dual transform matrix
+        u32 unused : 2;
+        u32 normalize : 1; // normalize before send operation
     };
     u32 hex;
 };