Merge pull request #4026 from lioncash/constness

EXI: Misc const correctness changes

Source/Core/Core/HW/BBA-TAP/TAP_Apple.cpp

@@ -43,7 +43,7 @@ bool CEXIETHERNET::IsActivated()
   return fd != -1;
 }
 
-bool CEXIETHERNET::SendFrame(u8* frame, u32 size)
+bool CEXIETHERNET::SendFrame(const u8* frame, u32 size)
 {
   INFO_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());
 

Source/Core/Core/HW/BBA-TAP/TAP_Unix.cpp

@@ -100,7 +100,7 @@ bool CEXIETHERNET::IsActivated()
 #endif
 }
 
-bool CEXIETHERNET::SendFrame(u8* frame, u32 size)
+bool CEXIETHERNET::SendFrame(const u8* frame, u32 size)
 {
 #ifdef __linux__
   INFO_LOG(SP1, "SendFrame %x\n%s", size, ArrayToString(frame, size, 0x10).c_str());

Source/Core/Core/HW/BBA-TAP/TAP_Win32.cpp

@@ -307,7 +307,7 @@ static void ReadThreadHandler(CEXIETHERNET* self)
   }
 }
 
-bool CEXIETHERNET::SendFrame(u8* frame, u32 size)
+bool CEXIETHERNET::SendFrame(const u8* frame, u32 size)
 {
   DEBUG_LOG(SP1, "SendFrame %u bytes:\n%s", size, ArrayToString(frame, size, 0x10).c_str());
 

Source/Core/Core/HW/EXI_DeviceAGP.cpp

@@ -38,7 +38,7 @@ CEXIAgp::~CEXIAgp()
   SaveFileFromEEPROM(gbapath + ".sav");
 }
 
-void CEXIAgp::CRC8(u8* data, u32 size)
+void CEXIAgp::CRC8(const u8* data, u32 size)
 {
   for (u32 it = 0; it < size; it++)
   {

Source/Core/Core/HW/EXI_DeviceAGP.h

@@ -57,7 +57,7 @@ private:
   void LoadFileToEEPROM(const std::string& filename);
   void SaveFileFromEEPROM(const std::string& filename);
   void LoadRom();
-  void CRC8(u8* data, u32 size);
+  void CRC8(const u8* data, u32 size);
 
   u8 m_hash = 0;
   u32 m_current_cmd = 0;

Source/Core/Core/HW/EXI_DeviceEthernet.cpp

@@ -370,7 +370,7 @@ void CEXIETHERNET::MXCommandHandler(u32 data, u32 size)
   }
 }
 
-void CEXIETHERNET::DirectFIFOWrite(u8* data, u32 size)
+void CEXIETHERNET::DirectFIFOWrite(const u8* data, u32 size)
 {
   // In direct mode, the hardware handles creating the state required by the
   // GMAC instead of finagling with packet descriptors and such
@@ -412,7 +412,7 @@ void CEXIETHERNET::SendComplete()
   mBbaMem[BBA_LTPS] = 0;
 }
 
-inline u8 CEXIETHERNET::HashIndex(u8* dest_eth_addr)
+inline u8 CEXIETHERNET::HashIndex(const u8* dest_eth_addr)
 {
   // Calculate CRC
   u32 crc = 0xffffffff;

Source/Core/Core/HW/EXI_DeviceEthernet.h

@@ -297,11 +297,11 @@ public:
   const char* GetRegisterName() const;
   void MXHardReset();
   void MXCommandHandler(u32 data, u32 size);
-  void DirectFIFOWrite(u8* data, u32 size);
+  void DirectFIFOWrite(const u8* data, u32 size);
   void SendFromDirectFIFO();
   void SendFromPacketBuffer();
   void SendComplete();
-  u8 HashIndex(u8* dest_eth_addr);
+  u8 HashIndex(const u8* dest_eth_addr);
   bool RecvMACFilter();
   void inc_rwp();
   bool RecvHandlePacket();
@@ -313,7 +313,7 @@ public:
   bool Activate();
   void Deactivate();
   bool IsActivated();
-  bool SendFrame(u8* frame, u32 size);
+  bool SendFrame(const u8* frame, u32 size);
   bool RecvInit();
   void RecvStart();
   void RecvStop();

Source/Core/Core/HW/EXI_DeviceMic.cpp

@@ -59,7 +59,7 @@ static int Pa_Callback(const void* inputBuffer, void* outputBuffer, unsigned lon
   if (mic->stream_wpos + mic->buff_size_samples > mic->stream_size)
     mic->stream_wpos = 0;
 
-  s16* buff_in = (s16*)inputBuffer;
+  const s16* buff_in = static_cast<const s16*>(inputBuffer);
   s16* buff_out = &mic->stream_buffer[mic->stream_wpos];
 
   if (buff_in == nullptr)

Source/Core/Core/HW/Sram.cpp

@@ -58,9 +58,9 @@ void InitSRAM()
   }
 }
 
-void SetCardFlashID(u8* buffer, u8 card_index)
+void SetCardFlashID(const u8* buffer, u8 card_index)
 {
-  u64 rand = Common::swap64(*(u64*)&(buffer[12]));
+  u64 rand = Common::swap64(&buffer[12]);
   u8 csum = 0;
   for (int i = 0; i < 12; i++)
   {

Source/Core/Core/HW/Sram.h

@@ -79,7 +79,7 @@ union SRAM {
 };
 #pragma pack(pop)
 void InitSRAM();
-void SetCardFlashID(u8* buffer, u8 card_index);
+void SetCardFlashID(const u8* buffer, u8 card_index);
 void FixSRAMChecksums();
 
 extern SRAM sram_dump;