Merge pull request #665 from lioncash/cisms

Get rid of a few C-style struct declarations
This commit is contained in:
Pierre Bourdon 2014-07-25 01:30:29 +02:00
commit 264459457e
8 changed files with 23 additions and 21 deletions

View File

@ -68,7 +68,7 @@ struct param2_t
u16 mask; u16 mask;
}; };
typedef struct struct DSPOPCTemplate
{ {
const char *name; const char *name;
u16 opcode; u16 opcode;
@ -85,7 +85,7 @@ typedef struct
bool uncond_branch; bool uncond_branch;
bool reads_pc; bool reads_pc;
bool updates_sr; bool updates_sr;
} DSPOPCTemplate; };
typedef DSPOPCTemplate opc_t; typedef DSPOPCTemplate opc_t;

View File

@ -609,12 +609,12 @@ void SDRUpdated()
#define TLB_FLAG_MOST_RECENT 0x01 #define TLB_FLAG_MOST_RECENT 0x01
#define TLB_FLAG_INVALID 0x02 #define TLB_FLAG_INVALID 0x02
typedef struct tlb_entry struct tlb_entry
{ {
u32 tag; u32 tag;
u32 paddr; u32 paddr;
u8 flags; u8 flags;
} tlb_entry; };
// TODO: tlb needs to be in ppcState for save-state purposes. // TODO: tlb needs to be in ppcState for save-state purposes.
#ifdef FAST_TLB_CACHE #ifdef FAST_TLB_CACHE

View File

@ -11,10 +11,10 @@
#endif #endif
typedef double Matrix[4][4]; typedef double Matrix[4][4];
typedef struct struct Vertex
{ {
double x,y,z; double x, y, z;
} Vertex; };
inline void MatrixIdentity(Matrix & m) inline void MatrixIdentity(Matrix & m)
{ {

View File

@ -143,7 +143,7 @@ private:
bool IsValid(u64 _TitleID) const; bool IsValid(u64 _TitleID) const;
typedef struct ecc_cert_t struct ecc_cert_t
{ {
u32 sig_type ; u32 sig_type ;
u8 sig [0x3c]; u8 sig [0x3c];
@ -154,5 +154,5 @@ private:
u32 ng_key_id ; u32 ng_key_id ;
u8 ecc_pubkey [0x3c]; u8 ecc_pubkey [0x3c];
u8 padding [0x3c]; u8 padding [0x3c];
} ecc_cert_t; };
}; };

View File

@ -54,7 +54,7 @@ enum SSL_IOCTL
IOCTLV_NET_SSL_DEBUGGETTIME = 0x15, IOCTLV_NET_SSL_DEBUGGETTIME = 0x15,
}; };
typedef struct struct WII_SSL
{ {
ssl_context ctx; ssl_context ctx;
ssl_session session; ssl_session session;
@ -66,7 +66,7 @@ typedef struct
int sockfd; int sockfd;
char hostname[NET_SSL_MAX_HOSTNAME_LEN]; char hostname[NET_SSL_MAX_HOSTNAME_LEN];
bool active; bool active;
} WII_SSL; };
class CWII_IPC_HLE_Device_net_ssl : public IWII_IPC_HLE_Device class CWII_IPC_HLE_Device_net_ssl : public IWII_IPC_HLE_Device
{ {

View File

@ -16,11 +16,11 @@ template class ForceFeedbackDevice::Force<DICONSTANTFORCE>;
template class ForceFeedbackDevice::Force<DIRAMPFORCE>; template class ForceFeedbackDevice::Force<DIRAMPFORCE>;
template class ForceFeedbackDevice::Force<DIPERIODIC>; template class ForceFeedbackDevice::Force<DIPERIODIC>;
typedef struct struct ForceType
{ {
GUID guid; GUID guid;
const std::string name; const std::string name;
} ForceType; };
static const ForceType force_type_names[] = static const ForceType force_type_names[] =
{ {

View File

@ -419,10 +419,10 @@ int CD3DFont::DrawTextScaled(float x, float y, float size, float spacing, u32 dw
ID3D11SamplerState* linear_copy_sampler = nullptr; ID3D11SamplerState* linear_copy_sampler = nullptr;
ID3D11SamplerState* point_copy_sampler = nullptr; ID3D11SamplerState* point_copy_sampler = nullptr;
typedef struct { float x,y,z,u,v,w; } STQVertex; struct STQVertex { float x, y, z, u, v, w; };
typedef struct { float x,y,z,u,v,w; } STSQVertex; struct STSQVertex { float x, y, z, u, v, w; };
typedef struct { float x,y,z; u32 col; } ClearVertex; struct ClearVertex { float x, y, z; u32 col; };
typedef struct { float x,y,z; u32 col; } ColVertex; struct ColVertex { float x, y, z; u32 col; };
struct struct
{ {

View File

@ -12,18 +12,20 @@ namespace EfbInterface
// xfb color format - packed so the compiler doesn't mess with alignment // xfb color format - packed so the compiler doesn't mess with alignment
#pragma pack(push,1) #pragma pack(push,1)
typedef struct { struct yuv422_packed
{
u8 Y; u8 Y;
u8 UV; u8 UV;
} yuv422_packed; };
#pragma pack(pop) #pragma pack(pop)
// But this struct is only used internally, so we could optimise alignment // But this struct is only used internally, so we could optimise alignment
typedef struct { struct yuv444
{
u8 Y; u8 Y;
s8 U; s8 U;
s8 V; s8 V;
} yuv444; };
enum { ALP_C, BLU_C, GRN_C, RED_C }; enum { ALP_C, BLU_C, GRN_C, RED_C };