Linux build fix

This commit is contained in:
Connor McLaughlin 2020-01-24 16:44:13 +10:00
parent 1b9609ef61
commit 4c59d8a9ea
3 changed files with 7 additions and 7 deletions

View File

@ -94,7 +94,7 @@ private:
struct ChannelState struct ChannelState
{ {
std::unique_ptr<TimingEvent> transfer_event; std::unique_ptr<TimingEvent> transfer_event;
u32 base_address; u32 base_address = 0;
union BlockControl union BlockControl
{ {
@ -113,7 +113,7 @@ private:
u32 GetBlockSize() const { return (block_size == 0) ? 0x10000 : block_size; } u32 GetBlockSize() const { return (block_size == 0) ? 0x10000 : block_size; }
u32 GetBlockCount() const { return (block_count == 0) ? 0x10000 : block_count; } u32 GetBlockCount() const { return (block_count == 0) ? 0x10000 : block_count; }
} request; } request;
} block_control; } block_control = {};
union ChannelControl union ChannelControl
{ {
@ -128,12 +128,12 @@ private:
BitField<u32, bool, 28, 1> start_trigger; BitField<u32, bool, 28, 1> start_trigger;
static constexpr u32 WRITE_MASK = 0b01110001'01110111'00000111'00000011; static constexpr u32 WRITE_MASK = 0b01110001'01110111'00000111'00000011;
} channel_control; } channel_control = {};
bool request = false; bool request = false;
}; };
std::array<ChannelState, NUM_CHANNELS> m_state = {}; std::array<ChannelState, NUM_CHANNELS> m_state;
union DPCR union DPCR
{ {
@ -161,7 +161,7 @@ private:
{ {
return ConvertToBoolUnchecked((bits >> (static_cast<u8>(channel) * 4 + 3)) & u32(1)); return ConvertToBoolUnchecked((bits >> (static_cast<u8>(channel) * 4 + 3)) & u32(1));
} }
} m_DPCR; } m_DPCR = {};
static constexpr u32 DICR_WRITE_MASK = 0b00000000'11111111'10000000'00111111; static constexpr u32 DICR_WRITE_MASK = 0b00000000'11111111'10000000'00111111;
static constexpr u32 DICR_RESET_MASK = 0b01111111'00000000'00000000'00000000; static constexpr u32 DICR_RESET_MASK = 0b01111111'00000000'00000000'00000000;

View File

@ -290,7 +290,7 @@ private:
System* m_system = nullptr; System* m_system = nullptr;
DMA* m_dma = nullptr; DMA* m_dma = nullptr;
InterruptController* m_interrupt_controller = nullptr; InterruptController* m_interrupt_controller = nullptr;
std::unique_ptr<TimingEvent> m_sample_event = nullptr; std::unique_ptr<TimingEvent> m_sample_event;
SPUCNT m_SPUCNT = {}; SPUCNT m_SPUCNT = {};
SPUSTAT m_SPUSTAT = {}; SPUSTAT m_SPUSTAT = {};

View File

@ -86,7 +86,7 @@ private:
System* m_system = nullptr; System* m_system = nullptr;
InterruptController* m_interrupt_controller = nullptr; InterruptController* m_interrupt_controller = nullptr;
GPU* m_gpu = nullptr; GPU* m_gpu = nullptr;
std::unique_ptr<TimingEvent> m_sysclk_event = nullptr; std::unique_ptr<TimingEvent> m_sysclk_event;
std::array<CounterState, NUM_TIMERS> m_states{}; std::array<CounterState, NUM_TIMERS> m_states{};
u32 m_sysclk_div_8_carry = 0; // partial ticks for timer 3 with sysclk/8 u32 m_sysclk_div_8_carry = 0; // partial ticks for timer 3 with sysclk/8