ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enums - last enum value should not have a comma

This commit is contained in:
twinaphex 2016-08-16 08:42:39 +02:00 committed by zeromus
parent a607264086
commit aab3a7d0a6
10 changed files with 86 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/GPU.h
View File

@ -98,7 +98,7 @@ enum DisplayCaptureSize
DisplayCaptureSize_128x128 = 0, DisplayCaptureSize_128x128 = 0,
DisplayCaptureSize_256x64 = 1, DisplayCaptureSize_256x64 = 1,
DisplayCaptureSize_256x128 = 2, DisplayCaptureSize_256x128 = 2,
DisplayCaptureSize_256x192 = 3, DisplayCaptureSize_256x192 = 3
}; };
union FragmentColor union FragmentColor

6
desmume/src/MMU.h
View File

@ -52,7 +52,7 @@ enum EDMAMode
EDMAMode_GBASlot = 6, EDMAMode_GBASlot = 6,
EDMAMode_GXFifo = 7, EDMAMode_GXFifo = 7,
EDMAMode7_Wifi = 8, EDMAMode7_Wifi = 8,
EDMAMode7_GBASlot = 9, EDMAMode7_GBASlot = 9
}; };
enum EDMABitWidth enum EDMABitWidth
@ -66,7 +66,7 @@ enum EDMASourceUpdate
EDMASourceUpdate_Increment = 0, EDMASourceUpdate_Increment = 0,
EDMASourceUpdate_Decrement = 1, EDMASourceUpdate_Decrement = 1,
EDMASourceUpdate_Fixed = 2, EDMASourceUpdate_Fixed = 2,
EDMASourceUpdate_Invalid = 3, EDMASourceUpdate_Invalid = 3
}; };
enum EDMADestinationUpdate enum EDMADestinationUpdate
@ -74,7 +74,7 @@ enum EDMADestinationUpdate
EDMADestinationUpdate_Increment = 0, EDMADestinationUpdate_Increment = 0,
EDMADestinationUpdate_Decrement = 1, EDMADestinationUpdate_Decrement = 1,
EDMADestinationUpdate_Fixed = 2, EDMADestinationUpdate_Fixed = 2,
EDMADestinationUpdate_IncrementReload = 3, EDMADestinationUpdate_IncrementReload = 3
}; };
//TODO //TODO

4
desmume/src/NDSSystem.h
View File

@ -157,7 +157,7 @@ enum ENSATA_HANDSHAKE
ENSATA_HANDSHAKE_query = 1, ENSATA_HANDSHAKE_query = 1,
ENSATA_HANDSHAKE_ack = 2, ENSATA_HANDSHAKE_ack = 2,
ENSATA_HANDSHAKE_confirm = 3, ENSATA_HANDSHAKE_confirm = 3,
ENSATA_HANDSHAKE_complete = 4, ENSATA_HANDSHAKE_complete = 4
}; };
enum NDS_CONSOLE_TYPE enum NDS_CONSOLE_TYPE
@ -598,7 +598,7 @@ extern struct TCommonSettings {
InternalNoise = 0, InternalNoise = 0,
Sample = 1, Sample = 1,
Random = 2, Random = 2,
Physical = 3, Physical = 3
} micMode; } micMode;

2
desmume/src/driver.h
View File

@ -47,7 +47,7 @@ public:
{ {
ESTEP_NOT_IMPLEMENTED = -1, ESTEP_NOT_IMPLEMENTED = -1,
ESTEP_CALL_AGAIN = 0, ESTEP_CALL_AGAIN = 0,
ESTEP_DONE = 1, ESTEP_DONE = 1
}; };
virtual eStepMainLoopResult EMU_StepMainLoop(bool allowSleep, bool allowPause, int frameSkip, bool disableUser, bool disableCore) { return ESTEP_NOT_IMPLEMENTED; } // -1 frameSkip == useCurrentDefault virtual eStepMainLoopResult EMU_StepMainLoop(bool allowSleep, bool allowPause, int frameSkip, bool disableUser, bool disableCore) { return ESTEP_NOT_IMPLEMENTED; } // -1 frameSkip == useCurrentDefault
virtual void EMU_PauseEmulation(bool pause) {} virtual void EMU_PauseEmulation(bool pause) {}

4
desmume/src/gfx3d.h
View File

@ -131,7 +131,7 @@ enum
POLYGON_ATTR_ENABLE_FOG_BIT = 15, POLYGON_ATTR_ENABLE_FOG_BIT = 15,
POLYGON_ATTR_ALPHA_BIT = 16, // Bits 16 - 20 POLYGON_ATTR_ALPHA_BIT = 16, // Bits 16 - 20
// Bits 21 - 23 unused // Bits 21 - 23 unused
POLYGON_ATTR_POLYGON_ID_BIT = 24, // Bits 24 - 29 POLYGON_ATTR_POLYGON_ID_BIT = 24 // Bits 24 - 29
// Bits 30 - 31 unused // Bits 30 - 31 unused
}; };
@ -145,7 +145,7 @@ enum
POLYGON_ATTR_MODE_MASK = 0x03 << POLYGON_ATTR_MODE_BIT, POLYGON_ATTR_MODE_MASK = 0x03 << POLYGON_ATTR_MODE_BIT,
POLYGON_ATTR_ENABLE_BACK_SURFACE_MASK = 0x01 << POLYGON_ATTR_ENABLE_BACK_SURFACE_BIT, POLYGON_ATTR_ENABLE_BACK_SURFACE_MASK = 0x01 << POLYGON_ATTR_ENABLE_BACK_SURFACE_BIT,
POLYGON_ATTR_ENABLE_FRONT_SURFACE_MASK = 0x01 << POLYGON_ATTR_ENABLE_FRONT_SURFACE_BIT, POLYGON_ATTR_ENABLE_FRONT_SURFACE_MASK = 0x01 << POLYGON_ATTR_ENABLE_FRONT_SURFACE_BIT,
POLYGON_ATTR_ENABLE_ALPHA_DEPTH_WRITE_MASK = 0x01 << POLYGON_ATTR_ENABLE_ALPHA_DEPTH_WRITE_BIT, POLYGON_ATTR_ENABLE_ALPHA_DEPTH_WRITE_MASK= 0x01 << POLYGON_ATTR_ENABLE_ALPHA_DEPTH_WRITE_BIT,
POLYGON_ATTR_ENABLE_RENDER_ON_FAR_PLANE_INTERSECT_MASK = 0x01 << POLYGON_ATTR_ENABLE_RENDER_ON_FAR_PLANE_INTERSECT_BIT, POLYGON_ATTR_ENABLE_RENDER_ON_FAR_PLANE_INTERSECT_MASK = 0x01 << POLYGON_ATTR_ENABLE_RENDER_ON_FAR_PLANE_INTERSECT_BIT,
POLYGON_ATTR_ENABLE_ONE_DOT_RENDER_MASK = 0x01 << POLYGON_ATTR_ENABLE_ONE_DOT_RENDER_BIT, POLYGON_ATTR_ENABLE_ONE_DOT_RENDER_MASK = 0x01 << POLYGON_ATTR_ENABLE_ONE_DOT_RENDER_BIT,
POLYGON_ATTR_ENABLE_DEPTH_EQUAL_TEST_MASK = 0x01 << POLYGON_ATTR_ENABLE_DEPTH_EQUAL_TEST_BIT, POLYGON_ATTR_ENABLE_DEPTH_EQUAL_TEST_MASK = 0x01 << POLYGON_ATTR_ENABLE_DEPTH_EQUAL_TEST_BIT,

2
desmume/src/mem.h
View File

@ -31,7 +31,7 @@ enum MMU_ACCESS_TYPE
MMU_AT_DATA, //used for cpu read/write MMU_AT_DATA, //used for cpu read/write
MMU_AT_GPU, //used for gpu read/write MMU_AT_GPU, //used for gpu read/write
MMU_AT_DMA, //used for dma read/write (blocks access to TCM) MMU_AT_DMA, //used for dma read/write (blocks access to TCM)
MMU_AT_DEBUG, //used for emulator debugging functions (bypasses some debug handling) MMU_AT_DEBUG //used for emulator debugging functions (bypasses some debug handling)
}; };
static INLINE u8 T1ReadByte(u8* const mem, const u32 addr) static INLINE u8 T1ReadByte(u8* const mem, const u32 addr)

4
desmume/src/movie.h
View File

@ -50,14 +50,14 @@ enum EMOVIEMODE
MOVIEMODE_INACTIVE = 0, MOVIEMODE_INACTIVE = 0,
MOVIEMODE_RECORD = 1, MOVIEMODE_RECORD = 1,
MOVIEMODE_PLAY = 2, MOVIEMODE_PLAY = 2,
MOVIEMODE_FINISHED = 3, MOVIEMODE_FINISHED = 3
}; };
enum EMOVIECMD enum EMOVIECMD
{ {
MOVIECMD_MIC = 1, MOVIECMD_MIC = 1,
MOVIECMD_RESET = 2, MOVIECMD_RESET = 2,
MOVIECMD_LID = 4, MOVIECMD_LID = 4
}; };
//RLDUTSBAYXWEG //RLDUTSBAYXWEG

2
desmume/src/slot1.h
View File

@ -96,7 +96,7 @@ typedef ISlot1Interface* TISlot1InterfaceConstructor();
enum NDS_SLOT1_TYPE enum NDS_SLOT1_TYPE
{ {
NDS_SLOT1_NONE, // 0xFF - None NDS_SLOT1_NONE = 0, // 0xFF - None
NDS_SLOT1_RETAIL_AUTO, // 0xFE - autodetect which kind of retail card to use NDS_SLOT1_RETAIL_AUTO, // 0xFE - autodetect which kind of retail card to use
NDS_SLOT1_R4, // 0x03 - R4 flash card NDS_SLOT1_R4, // 0x03 - R4 flash card
NDS_SLOT1_RETAIL_NAND, // 0x02 - Made in Ore/WarioWare D.I.Y. NDS_SLOT1_RETAIL_NAND, // 0x02 - Made in Ore/WarioWare D.I.Y.

2
desmume/src/texcache.h
View File

@ -28,7 +28,7 @@
enum TexCache_TexFormat enum TexCache_TexFormat
{ {
TexFormat_None, //used when nothing yet is cached TexFormat_None = 0, //used when nothing yet is cached
TexFormat_32bpp, //used by ogl renderer TexFormat_32bpp, //used by ogl renderer
TexFormat_15bpp //used by rasterizer TexFormat_15bpp //used by rasterizer
}; };