summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2018-05-30 07:45:09 +0200
committerGitHub <noreply@github.com>2018-05-30 07:45:09 +0200
commit6cb81ca851dfe5be51d9511ce47627fcddcc2bf9 (patch)
treede32c03cb99d92282bf0a60e34b07973fdbf2926 /Source
parent2f561dafd9e7dedfd3cecf933dac9edf79dc093e (diff)
parent97c5a840dbe0912e81c7ad10bea1c35991095fb8 (diff)
Merge pull request #7015 from lioncash/pcap
PcapFile: Namespace code under the Common namespace
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Common/PcapFile.cpp3
-rw-r--r--Source/Core/Common/PcapFile.h3
-rw-r--r--Source/Core/Core/DSP/DSPCaptureLogger.cpp7
-rw-r--r--Source/Core/Core/DSP/DSPCaptureLogger.h9
4 files changed, 16 insertions, 6 deletions
diff --git a/Source/Core/Common/PcapFile.cpp b/Source/Core/Common/PcapFile.cpp
index 5ce626f279..0d9ce9a5a3 100644
--- a/Source/Core/Common/PcapFile.cpp
+++ b/Source/Core/Common/PcapFile.cpp
@@ -8,6 +8,8 @@
#include "Common/File.h"
#include "Common/PcapFile.h"
+namespace Common
+{
namespace
{
const u32 PCAP_MAGIC = 0xa1b2c3d4;
@@ -61,3 +63,4 @@ void PCAP::AddPacket(const u8* bytes, size_t size)
m_fp->WriteBytes(&rec_hdr, sizeof(rec_hdr));
m_fp->WriteBytes(bytes, size);
}
+} // namespace Common
diff --git a/Source/Core/Common/PcapFile.h b/Source/Core/Common/PcapFile.h
index 4e33b25802..e01c06bb11 100644
--- a/Source/Core/Common/PcapFile.h
+++ b/Source/Core/Common/PcapFile.h
@@ -19,6 +19,8 @@
#include "Common/CommonTypes.h"
#include "Common/File.h"
+namespace Common
+{
class PCAP final
{
public:
@@ -38,3 +40,4 @@ private:
std::unique_ptr<File::IOFile> m_fp;
};
+} // namespace Common
diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.cpp b/Source/Core/Core/DSP/DSPCaptureLogger.cpp
index f3206505f6..2703d6b3cc 100644
--- a/Source/Core/Core/DSP/DSPCaptureLogger.cpp
+++ b/Source/Core/Core/DSP/DSPCaptureLogger.cpp
@@ -40,15 +40,16 @@ struct DMAPacket
#pragma pack(pop)
PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(const std::string& pcap_filename)
- : m_pcap(new PCAP(new File::IOFile(pcap_filename, "wb")))
+ : m_pcap(new Common::PCAP(new File::IOFile(pcap_filename, "wb")))
{
}
-PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(PCAP* pcap) : m_pcap(pcap)
+PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(Common::PCAP* pcap) : m_pcap(pcap)
{
}
-PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap) : m_pcap(std::move(pcap))
+PCAPDSPCaptureLogger::PCAPDSPCaptureLogger(std::unique_ptr<Common::PCAP>&& pcap)
+ : m_pcap(std::move(pcap))
{
}
diff --git a/Source/Core/Core/DSP/DSPCaptureLogger.h b/Source/Core/Core/DSP/DSPCaptureLogger.h
index 07ac068349..14869ffde1 100644
--- a/Source/Core/Core/DSP/DSPCaptureLogger.h
+++ b/Source/Core/Core/DSP/DSPCaptureLogger.h
@@ -9,7 +9,10 @@
#include "Common/CommonTypes.h"
+namespace Common
+{
class PCAP;
+}
namespace DSP
{
@@ -56,8 +59,8 @@ public:
// Automatically creates a writeable file (truncate existing file).
PCAPDSPCaptureLogger(const std::string& pcap_filename);
// Takes ownership of pcap.
- PCAPDSPCaptureLogger(PCAP* pcap);
- PCAPDSPCaptureLogger(std::unique_ptr<PCAP>&& pcap);
+ PCAPDSPCaptureLogger(Common::PCAP* pcap);
+ PCAPDSPCaptureLogger(std::unique_ptr<Common::PCAP>&& pcap);
void LogIFXRead(u16 address, u16 read_value) override { LogIFXAccess(true, address, read_value); }
void LogIFXWrite(u16 address, u16 written_value) override
@@ -69,6 +72,6 @@ public:
private:
void LogIFXAccess(bool read, u16 address, u16 value);
- std::unique_ptr<PCAP> m_pcap;
+ std::unique_ptr<Common::PCAP> m_pcap;
};
} // namespace DSP