1
0
mirror of https://github.com/TomHarte/CLK.git synced 2025-11-01 11:16:16 +00:00

Simplify all namespace usages.:wq

This commit is contained in:
Thomas Harte
2023-04-23 12:08:07 -04:00
parent 6d092e0633
commit f22aa6eb36
6 changed files with 7 additions and 22 deletions

View File

@@ -14,8 +14,7 @@
#include <cstdint> #include <cstdint>
namespace TI { namespace TI::TMS {
namespace TMS {
enum Personality { enum Personality {
TMS9918A, // includes the 9928 and 9929; set TV standard and output device as desired. TMS9918A, // includes the 9928 and 9929; set TV standard and output device as desired.
@@ -36,13 +35,11 @@ enum class TVStandard {
NTSC NTSC
}; };
}
} }
#include "Implementation/9918Base.hpp" #include "Implementation/9918Base.hpp"
namespace TI { namespace TI::TMS {
namespace TMS {
/*! /*!
Provides emulation of the TMS9918a, TMS9928 and TMS9929. Likely in the future to be the Provides emulation of the TMS9918a, TMS9928 and TMS9929. Likely in the future to be the
@@ -127,7 +124,6 @@ template <Personality personality> class TMS9918: private Base<personality> {
bool get_interrupt_line() const; bool get_interrupt_line() const;
}; };
}
} }
#endif /* TMS9918_hpp */ #endif /* TMS9918_hpp */

View File

@@ -28,8 +28,7 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
namespace TI { namespace TI::TMS {
namespace TMS {
constexpr uint8_t StatusInterrupt = 0x80; constexpr uint8_t StatusInterrupt = 0x80;
constexpr uint8_t StatusSpriteOverflow = 0x40; constexpr uint8_t StatusSpriteOverflow = 0x40;
@@ -622,7 +621,6 @@ template <Personality personality> struct Base: public Storage<personality> {
#include "Fetch.hpp" #include "Fetch.hpp"
#include "Draw.hpp" #include "Draw.hpp"
}
} }
#endif /* TMS9918Base_hpp */ #endif /* TMS9918Base_hpp */

View File

@@ -10,8 +10,7 @@
#define AccessEnums_hpp #define AccessEnums_hpp
namespace TI { namespace TI::TMS {
namespace TMS {
// The screen mode is a necessary predecessor to picking the line mode, // The screen mode is a necessary predecessor to picking the line mode,
// which is the thing latched per line. // which is the thing latched per line.
@@ -108,7 +107,6 @@ enum class SpriteMode {
MasterSystem, MasterSystem,
}; };
}
} }
#endif /* AccessEnums_hpp */ #endif /* AccessEnums_hpp */

View File

@@ -12,8 +12,7 @@
#include "../9918.hpp" #include "../9918.hpp"
#include "PersonalityTraits.hpp" #include "PersonalityTraits.hpp"
namespace TI { namespace TI::TMS {
namespace TMS {
enum class Clock { enum class Clock {
Internal, Internal,
@@ -215,7 +214,6 @@ template <Personality personality> struct LineLayout<personality, std::enable_if
constexpr static int EndOfRightBorder = 1341; constexpr static int EndOfRightBorder = 1341;
}; };
}
} }
#endif /* ClockConverter_hpp */ #endif /* ClockConverter_hpp */

View File

@@ -9,8 +9,7 @@
#ifndef PersonalityTraits_hpp #ifndef PersonalityTraits_hpp
#define PersonalityTraits_hpp #define PersonalityTraits_hpp
namespace TI { namespace TI::TMS {
namespace TMS {
// Genus determinants for the various personalityes. // Genus determinants for the various personalityes.
constexpr bool is_sega_vdp(Personality p) { constexpr bool is_sega_vdp(Personality p) {
@@ -47,7 +46,5 @@ constexpr size_t memory_mask(Personality p) {
} }
} }
}
#endif /* PersonalityTraits_hpp */ #endif /* PersonalityTraits_hpp */

View File

@@ -15,8 +15,7 @@
#include <optional> #include <optional>
namespace TI { namespace TI::TMS {
namespace TMS {
/// A container for personality-specific storage; see specific instances below. /// A container for personality-specific storage; see specific instances below.
template <Personality personality, typename Enable = void> struct Storage { template <Personality personality, typename Enable = void> struct Storage {
@@ -493,7 +492,6 @@ template <Personality personality> struct Storage<personality, std::enable_if_t<
void begin_line(ScreenMode, bool) {} void begin_line(ScreenMode, bool) {}
}; };
}
} }
#endif /* Storage_h */ #endif /* Storage_h */