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

Revert "WiFi: Fix compiling for Cocoa port by eliminating typed enums. (Regression from commit 43b00fb2, for which the regression was caused by commit 5f76ba8b.)" 

This reverts commit 9f82cea20b.

If cocoa compiling is broken let's discuss it instead of reverting work
This commit is contained in:
zeromus 2022-01-11 19:12:37 -05:00
parent 8510948f6c
commit 81573818a9
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
desmume/src/wifi.cpp
View File

@ -4678,7 +4678,7 @@ void WifiHandler::CommTrigger()
if((io.US_COUNT & 3) == 0) if((io.US_COUNT & 3) == 0)
{ {
const WifiTXLocIndex txSlotIndex = (WifiTXLocIndex)wifi.txCurrentSlot; const WifiTXLocIndex txSlotIndex = wifi.txCurrentSlot;
bool isTXSlotBusy = false; bool isTXSlotBusy = false;
switch(txSlotIndex) switch(txSlotIndex)

30
desmume/src/wifi.h
View File

@ -1,7 +1,7 @@
/* /*
Copyright (C) 2007 Tim Seidel Copyright (C) 2007 Tim Seidel
Copyright (C) 2014 pleonex Copyright (C) 2014 pleonex
Copyright (C) 2008-2021 DeSmuME team Copyright (C) 2008-2018 DeSmuME team
This file is part of DeSmuME This file is part of DeSmuME
@ -210,7 +210,7 @@ struct slock;
typedef slock slock_t; typedef slock slock_t;
// RF2958 Register Addresses // RF2958 Register Addresses
enum RegAddrRF2958 enum RegAddrRF2958 : s32
{ {
REG_RF2958_CFG1 = 0, REG_RF2958_CFG1 = 0,
REG_RF2958_IPLL1 = 1, REG_RF2958_IPLL1 = 1,
@ -753,7 +753,7 @@ typedef struct
u8 data[105]; u8 data[105];
} bb_t; } bb_t;
enum WifiRFStatus enum WifiRFStatus : s32
{ {
WifiRFStatus0_Initial = 0, WifiRFStatus0_Initial = 0,
WifiRFStatus1_TXComplete = 1, WifiRFStatus1_TXComplete = 1,
@ -767,7 +767,7 @@ enum WifiRFStatus
WifiRFStatus9_Idle = 9 WifiRFStatus9_Idle = 9
}; };
enum WifiIRQ enum WifiIRQ : s32
{ {
WifiIRQ00_RXComplete = 0, WifiIRQ00_RXComplete = 0,
WifiIRQ01_TXComplete = 1, WifiIRQ01_TXComplete = 1,
@ -787,14 +787,14 @@ enum WifiIRQ
WifiIRQ15_TimeslotPreBeacon = 15 WifiIRQ15_TimeslotPreBeacon = 15
}; };
enum EAPStatus enum EAPStatus : s32
{ {
APStatus_Disconnected = 0, APStatus_Disconnected = 0,
APStatus_Authenticated, APStatus_Authenticated,
APStatus_Associated APStatus_Associated
}; };
enum WifiTXLocIndex enum WifiTXLocIndex : s32
{ {
WifiTXLocIndex_LOC1 = 0, WifiTXLocIndex_LOC1 = 0,
WifiTXLocIndex_CMD = 1, WifiTXLocIndex_CMD = 1,
@ -804,7 +804,7 @@ enum WifiTXLocIndex
WifiTXLocIndex_CMDREPLY = 5 WifiTXLocIndex_CMDREPLY = 5
}; };
enum WifiStageID enum WifiStageID : s32
{ {
WifiStageID_PreambleDone = 0, WifiStageID_PreambleDone = 0,
WifiStageID_TransmitDone = 1, WifiStageID_TransmitDone = 1,
@ -813,14 +813,14 @@ enum WifiStageID
WifiStageID_CmdReplyTransferDone = 4 WifiStageID_CmdReplyTransferDone = 4
}; };
enum WifiEmulationLevel enum WifiEmulationLevel : s32
{ {
WifiEmulationLevel_Off = 0, WifiEmulationLevel_Off = 0,
WifiEmulationLevel_Normal = 10000, WifiEmulationLevel_Normal = 10000,
WifiEmulationLevel_Compatibility = 65535 WifiEmulationLevel_Compatibility = 65535
}; };
enum WifiCommInterfaceID enum WifiCommInterfaceID : s32
{ {
WifiCommInterfaceID_AdHoc = 0, WifiCommInterfaceID_AdHoc = 0,
WifiCommInterfaceID_Infrastructure = 1 WifiCommInterfaceID_Infrastructure = 1
@ -2787,7 +2787,7 @@ typedef struct
bb_t bb; bb_t bb;
u8 RAM[0x2000]; u8 RAM[0x2000];
s32 txCurrentSlot; // Possible values are declared in WifiTXLocIndex. WifiTXLocIndex txCurrentSlot;
TXPacketInfo txPacketInfo[6]; TXPacketInfo txPacketInfo[6];
u32 cmdCount_u32; u32 cmdCount_u32;
u64 usecCounter; u64 usecCounter;
@ -2822,14 +2822,14 @@ typedef struct
} DesmumeFrameHeader; // Should total 16 bytes } DesmumeFrameHeader; // Should total 16 bytes
// IEEE 802.11 Frame Information // IEEE 802.11 Frame Information
enum WifiFrameType enum WifiFrameType : s32
{ {
WifiFrameType_Management = 0, WifiFrameType_Management = 0,
WifiFrameType_Control = 1, WifiFrameType_Control = 1,
WifiFrameType_Data = 2 WifiFrameType_Data = 2
}; };
enum WifiFrameManagementSubtype enum WifiFrameManagementSubtype : s32
{ {
WifiFrameManagementSubtype_AssociationRequest = 0x00, WifiFrameManagementSubtype_AssociationRequest = 0x00,
WifiFrameManagementSubtype_AssociationResponse = 0x01, WifiFrameManagementSubtype_AssociationResponse = 0x01,
@ -2849,7 +2849,7 @@ enum WifiFrameManagementSubtype
WifiFrameManagementSubtype_RESERVED0F = 0x0F WifiFrameManagementSubtype_RESERVED0F = 0x0F
}; };
enum WifiFrameControlSubtype enum WifiFrameControlSubtype : s32
{ {
WifiFrameControlSubtype_RESERVED00 = 0x00, WifiFrameControlSubtype_RESERVED00 = 0x00,
WifiFrameControlSubtype_RESERVED01 = 0x01, WifiFrameControlSubtype_RESERVED01 = 0x01,
@ -2869,7 +2869,7 @@ enum WifiFrameControlSubtype
WifiFrameControlSubtype_EndAck = 0x0F WifiFrameControlSubtype_EndAck = 0x0F
}; };
enum WifiFrameDataSubtype enum WifiFrameDataSubtype : s32
{ {
WifiFrameDataSubtype_Data = 0x00, WifiFrameDataSubtype_Data = 0x00,
WifiFrameDataSubtype_DataAck = 0x01, WifiFrameDataSubtype_DataAck = 0x01,
@ -2889,7 +2889,7 @@ enum WifiFrameDataSubtype
WifiFrameDataSubtype_RESERVED0F = 0x0F WifiFrameDataSubtype_RESERVED0F = 0x0F
}; };
enum WifiFCFromToState enum WifiFCFromToState : s32
{ {
WifiFCFromToState_STA2STA = 0x0, WifiFCFromToState_STA2STA = 0x0,
WifiFCFromToState_STA2DS = 0x1, WifiFCFromToState_STA2DS = 0x1,