RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2025-12-06 07:12:14 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Update clang-format

Browse source
This commit is contained in:
DH 2025-10-04 17:37:21 +03:00
parent b17f73de88
commit 0370d628e4
4 changed files with 51 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/format.yml vendored
View file

@ -24,4 +24,4 @@ jobs:
uses: jidicula/clang-format-action@v4.15.0 uses: jidicula/clang-format-action@v4.15.0
with: with:
exclude-regex: (libspirv|3rdparty) exclude-regex: (libspirv|3rdparty)
clang-format-version: 20 clang-format-version: 21

2
.github/workflows/rpcsx.yml vendored
View file

@ -23,7 +23,7 @@ jobs:
run: | run: |
sudo apt update sudo apt update
sudo apt install -y cmake build-essential libunwind-dev \ sudo apt install -y cmake build-essential libunwind-dev \
libsox-dev g++-14 ninja-build libasound2-dev nasm libudev-dev libxcb1-dev libx11-dev libsox-dev g++-14 ninja-build libasound2-dev nasm libudev-dev libxcb1-dev libx11-dev libwayland-dev
cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX=/usr cmake -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX=/usr
cmake --build build -j$(($(nproc) + 2)) cmake --build build -j$(($(nproc) + 2))
sudo cmake --build build sudo cmake --build build

2
android/src/rpcsx-android.cpp
View file

@ -4,7 +4,6 @@
#include "Emu/Audio/Null/NullAudioBackend.h" #include "Emu/Audio/Null/NullAudioBackend.h"
#include "Emu/Cell/PPUAnalyser.h" #include "Emu/Cell/PPUAnalyser.h"
#include "Emu/Cell/SPURecompiler.h" #include "Emu/Cell/SPURecompiler.h"
#include "cellos/sys_sync.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
#include "Emu/Io/KeyboardHandler.h" #include "Emu/Io/KeyboardHandler.h"
#include "Emu/Io/Null/NullKeyboardHandler.h" #include "Emu/Io/Null/NullKeyboardHandler.h"
@ -34,6 +33,7 @@
#include "Loader/PSF.h" #include "Loader/PSF.h"
#include "Loader/PUP.h" #include "Loader/PUP.h"
#include "Loader/TAR.h" #include "Loader/TAR.h"
#include "cellos/sys_sync.h"
#include "dev/block_dev.hpp" #include "dev/block_dev.hpp"
#include "dev/iso.hpp" #include "dev/iso.hpp"
#include "hidapi_libusb.h" #include "hidapi_libusb.h"

102
kernel/cellos/include/cellos/sys_timer.h
View file

@ -1,76 +1,70 @@
#pragma once #pragma once
#include "sys_event.h"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "sys_event.h"
// Timer State // Timer State
enum : u32 enum : u32 {
{ SYS_TIMER_STATE_STOP = 0,
SYS_TIMER_STATE_STOP = 0, SYS_TIMER_STATE_RUN = 1,
SYS_TIMER_STATE_RUN = 1,
}; };
struct sys_timer_information_t struct sys_timer_information_t {
{ be_t<u64> next_expire; // system_time_t
be_t<u64> next_expire; // system_time_t be_t<u64> period;
be_t<u64> period; be_t<u32> timer_state;
be_t<u32> timer_state; be_t<u32> pad;
be_t<u32> pad;
}; };
struct lv2_timer : lv2_obj struct lv2_timer : lv2_obj {
{ static const u32 id_base = 0x11000000;
static const u32 id_base = 0x11000000;
shared_mutex mutex; shared_mutex mutex;
atomic_t<u32> state{SYS_TIMER_STATE_STOP}; atomic_t<u32> state{SYS_TIMER_STATE_STOP};
shared_ptr<lv2_event_queue> port; shared_ptr<lv2_event_queue> port;
u64 source; u64 source;
u64 data1; u64 data1;
u64 data2; u64 data2;
atomic_t<u64> expire{0}; // Next expiration time atomic_t<u64> expire{0}; // Next expiration time
atomic_t<u64> period{0}; // Period (oneshot if 0) atomic_t<u64> period{0}; // Period (oneshot if 0)
u64 check(u64 _now) noexcept; u64 check(u64 _now) noexcept;
u64 check_unlocked(u64 _now) noexcept; u64 check_unlocked(u64 _now) noexcept;
lv2_timer() noexcept lv2_timer() noexcept : lv2_obj(1) {}
: lv2_obj(1)
{
}
void get_information(sys_timer_information_t& info) const void get_information(sys_timer_information_t &info) const {
{ if (state == SYS_TIMER_STATE_RUN) {
if (state == SYS_TIMER_STATE_RUN) info.timer_state = state;
{ info.next_expire = expire;
info.timer_state = state; info.period = period;
info.next_expire = expire; } else {
info.period = period; info.timer_state = SYS_TIMER_STATE_STOP;
} info.next_expire = 0;
else info.period = 0;
{ }
info.timer_state = SYS_TIMER_STATE_STOP; }
info.next_expire = 0;
info.period = 0;
}
}
lv2_timer(utils::serial& ar); lv2_timer(utils::serial &ar);
void save(utils::serial& ar); void save(utils::serial &ar);
}; };
class ppu_thread; class ppu_thread;
// Syscalls // Syscalls
error_code sys_timer_create(ppu_thread&, vm::ptr<u32> timer_id); error_code sys_timer_create(ppu_thread &, vm::ptr<u32> timer_id);
error_code sys_timer_destroy(ppu_thread&, u32 timer_id); error_code sys_timer_destroy(ppu_thread &, u32 timer_id);
error_code sys_timer_get_information(ppu_thread&, u32 timer_id, vm::ptr<sys_timer_information_t> info); error_code sys_timer_get_information(ppu_thread &, u32 timer_id,
error_code _sys_timer_start(ppu_thread&, u32 timer_id, u64 basetime, u64 period); // basetime type changed from s64 vm::ptr<sys_timer_information_t> info);
error_code sys_timer_stop(ppu_thread&, u32 timer_id); error_code _sys_timer_start(ppu_thread &, u32 timer_id, u64 basetime,
error_code sys_timer_connect_event_queue(ppu_thread&, u32 timer_id, u32 queue_id, u64 name, u64 data1, u64 data2); u64 period); // basetime type changed from s64
error_code sys_timer_disconnect_event_queue(ppu_thread&, u32 timer_id); error_code sys_timer_stop(ppu_thread &, u32 timer_id);
error_code sys_timer_sleep(ppu_thread&, u32 sleep_time); error_code sys_timer_connect_event_queue(ppu_thread &, u32 timer_id,
error_code sys_timer_usleep(ppu_thread&, u64 sleep_time); u32 queue_id, u64 name, u64 data1,
u64 data2);
error_code sys_timer_disconnect_event_queue(ppu_thread &, u32 timer_id);
error_code sys_timer_sleep(ppu_thread &, u32 sleep_time);
error_code sys_timer_usleep(ppu_thread &, u64 sleep_time);