OmniNX/Atmosphere
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

strat: use m_ for member variables

Browse Source
This commit is contained in:
Michael Scire
2021-10-10 00:14:06 -07:00
parent ce28591ab2
commit a595c232b9
425 changed files with 8531 additions and 8484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.cpp
View File

@@ -33,7 +33,7 @@ namespace ams::pwm::driver::board::nintendo::nx::impl {
}
PwmDriverImpl::PwmDriverImpl(dd::PhysicalAddress paddr, size_t sz, const ChannelDefinition *c, size_t nc) : registers_phys_addr(paddr), registers_size(sz), channels(c), num_channels(nc), registers(0) {
PwmDriverImpl::PwmDriverImpl(dd::PhysicalAddress paddr, size_t sz, const ChannelDefinition *c, size_t nc) : m_registers_phys_addr(paddr), m_registers_size(sz), m_channels(c), m_num_channels(nc), m_registers(0) {
/* ... */
}
@@ -60,8 +60,8 @@ namespace ams::pwm::driver::board::nintendo::nx::impl {
void PwmDriverImpl::InitializeDriver() {
/* Get the registers virtual address. */
this->registers = dd::QueryIoMapping(this->registers_phys_addr, this->registers_size);
AMS_ABORT_UNLESS(this->registers != 0);
m_registers = dd::QueryIoMapping(m_registers_phys_addr, m_registers_size);
AMS_ABORT_UNLESS(m_registers != 0);
/* Setup power to pwm. */
this->PowerOn();

26
libraries/libstratosphere/source/pwm/driver/board/nintendo/nx/impl/pwm_pwm_driver_impl.hpp
View File

@@ -24,16 +24,16 @@ namespace ams::pwm::driver::board::nintendo::nx::impl {
NON_MOVEABLE(PwmDeviceImpl);
AMS_DDSF_CASTABLE_TRAITS(ams::pwm::driver::board::nintendo::nx::impl::PwmDeviceImpl, ::ams::pwm::driver::IPwmDevice);
private:
os::SdkMutex suspend_mutex;
u32 suspend_value;
os::SdkMutex m_suspend_mutex;
u32 m_suspend_value;
public:
PwmDeviceImpl(int channel) : IPwmDevice(channel), suspend_mutex(), suspend_value() { /* ... */ }
PwmDeviceImpl(int channel) : IPwmDevice(channel), m_suspend_mutex(), m_suspend_value() { /* ... */ }
void SetSuspendValue(u32 v) { this->suspend_value = v; }
u32 GetSuspendValue() const { return this->suspend_value; }
void SetSuspendValue(u32 v) { m_suspend_value = v; }
u32 GetSuspendValue() const { return m_suspend_value; }
void lock() { return this->suspend_mutex.lock(); }
void unlock() { return this->suspend_mutex.unlock(); }
void lock() { return m_suspend_mutex.lock(); }
void unlock() { return m_suspend_mutex.unlock(); }
};
class PwmDriverImpl : public ::ams::pwm::driver::IPwmDriver {
@@ -41,14 +41,14 @@ namespace ams::pwm::driver::board::nintendo::nx::impl {
NON_MOVEABLE(PwmDriverImpl);
AMS_DDSF_CASTABLE_TRAITS(ams::pwm::driver::board::nintendo::nx::impl::PwmDriverImpl, ::ams::pwm::driver::IPwmDriver);
private:
dd::PhysicalAddress registers_phys_addr;
size_t registers_size;
const ChannelDefinition *channels;
size_t num_channels;
uintptr_t registers;
dd::PhysicalAddress m_registers_phys_addr;
size_t m_registers_size;
const ChannelDefinition *m_channels;
size_t m_num_channels;
uintptr_t m_registers;
private:
ALWAYS_INLINE uintptr_t GetRegistersFor(IPwmDevice &device) {
return registers + PWM_CONTROLLER_PWM_CHANNEL_OFFSET(device.GetChannelIndex());
return m_registers + PWM_CONTROLLER_PWM_CHANNEL_OFFSET(device.GetChannelIndex());
}
ALWAYS_INLINE uintptr_t GetRegistersFor(IPwmDevice *device) {

34
libraries/libstratosphere/source/pwm/server/pwm_server_channel_session_impl.hpp
View File

@@ -22,64 +22,64 @@ namespace ams::pwm::server {
class ChannelSessionImpl {
private:
ManagerImpl *parent; /* NOTE: this is an sf::SharedPointer<> in Nintendo's code. */
pwm::driver::ChannelSession internal_session;
bool has_session;
ManagerImpl *m_parent; /* NOTE: this is an sf::SharedPointer<> in Nintendo's code. */
pwm::driver::ChannelSession m_internal_session;
bool m_has_session;
public:
explicit ChannelSessionImpl(ManagerImpl *p) : parent(p), has_session(false) { /* ... */ }
explicit ChannelSessionImpl(ManagerImpl *p) : m_parent(p), m_has_session(false) { /* ... */ }
~ChannelSessionImpl() {
if (this->has_session) {
pwm::driver::CloseSession(this->internal_session);
if (m_has_session) {
pwm::driver::CloseSession(m_internal_session);
}
}
Result OpenSession(DeviceCode device_code) {
AMS_ABORT_UNLESS(!this->has_session);
AMS_ABORT_UNLESS(!m_has_session);
R_TRY(pwm::driver::OpenSession(std::addressof(this->internal_session), device_code));
this->has_session = true;
R_TRY(pwm::driver::OpenSession(std::addressof(m_internal_session), device_code));
m_has_session = true;
return ResultSuccess();
}
public:
/* Actual commands. */
Result SetPeriod(TimeSpanType period) {
pwm::driver::SetPeriod(this->internal_session, period);
pwm::driver::SetPeriod(m_internal_session, period);
return ResultSuccess();
}
Result GetPeriod(ams::sf::Out<TimeSpanType> out) {
out.SetValue(pwm::driver::GetPeriod(this->internal_session));
out.SetValue(pwm::driver::GetPeriod(m_internal_session));
return ResultSuccess();
}
Result SetDuty(int duty) {
pwm::driver::SetDuty(this->internal_session, duty);
pwm::driver::SetDuty(m_internal_session, duty);
return ResultSuccess();
}
Result GetDuty(ams::sf::Out<int> out) {
out.SetValue(pwm::driver::GetDuty(this->internal_session));
out.SetValue(pwm::driver::GetDuty(m_internal_session));
return ResultSuccess();
}
Result SetEnabled(bool enabled) {
pwm::driver::SetEnabled(this->internal_session, enabled);
pwm::driver::SetEnabled(m_internal_session, enabled);
return ResultSuccess();
}
Result GetEnabled(ams::sf::Out<bool> out) {
out.SetValue(pwm::driver::GetEnabled(this->internal_session));
out.SetValue(pwm::driver::GetEnabled(m_internal_session));
return ResultSuccess();
}
Result SetScale(double scale) {
pwm::driver::SetScale(this->internal_session, scale);
pwm::driver::SetScale(m_internal_session, scale);
return ResultSuccess();
}
Result GetScale(ams::sf::Out<double> out) {
out.SetValue(pwm::driver::GetScale(this->internal_session));
out.SetValue(pwm::driver::GetScale(m_internal_session));
return ResultSuccess();
}
};

8
libraries/libstratosphere/source/pwm/server/pwm_server_manager_impl.cpp
View File

@@ -19,12 +19,12 @@
namespace ams::pwm::server {
ManagerImpl::ManagerImpl() {
this->heap_handle = lmem::CreateExpHeap(this->heap_buffer, sizeof(this->heap_buffer), lmem::CreateOption_None);
this->allocator.Attach(this->heap_handle);
m_heap_handle = lmem::CreateExpHeap(m_heap_buffer, sizeof(m_heap_buffer), lmem::CreateOption_None);
m_allocator.Attach(m_heap_handle);
}
ManagerImpl::~ManagerImpl() {
lmem::DestroyExpHeap(this->heap_handle);
lmem::DestroyExpHeap(m_heap_handle);
}
Result ManagerImpl::OpenSessionForDev(ams::sf::Out<ams::sf::SharedPointer<pwm::sf::IChannelSession>> out, int channel) {
@@ -39,7 +39,7 @@ namespace ams::pwm::server {
Result ManagerImpl::OpenSession2(ams::sf::Out<ams::sf::SharedPointer<pwm::sf::IChannelSession>> out, DeviceCode device_code) {
/* Allocate a session. */
auto session = Factory::CreateSharedEmplaced<pwm::sf::IChannelSession, ChannelSessionImpl>(std::addressof(this->allocator), this);
auto session = Factory::CreateSharedEmplaced<pwm::sf::IChannelSession, ChannelSessionImpl>(std::addressof(m_allocator), this);
/* Open the session. */
R_TRY(session.GetImpl().OpenSession(device_code));

6
libraries/libstratosphere/source/pwm/server/pwm_server_manager_impl.hpp
View File

@@ -24,9 +24,9 @@ namespace ams::pwm::server {
using Allocator = ams::sf::ExpHeapAllocator;
using Factory = ams::sf::ObjectFactory<Allocator::Policy>;
private:
lmem::HeapHandle heap_handle;
Allocator allocator;
u8 heap_buffer[4_KB];
lmem::HeapHandle m_heap_handle;
Allocator m_allocator;
u8 m_heap_buffer[4_KB];
public:
ManagerImpl();