Emulator-Archive/psOff_public
1
0
Fork 0
mirror of https://github.com/SysRay/psOff_public.git synced 2024-10-07 11:53:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
igor725 2024-03-12 05:50:09 +03:00
parent 93eb34013c
commit ef0c386506
No known key found for this signature in database
GPG Key ID: 46F13BBE46F8569D
12 changed files with 68 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/videoout/vulkan/vulkanSetup.cpp
View File

@ -2,13 +2,12 @@
#include "logging.h"
#include <SDL.h>
#include <SDL_vulkan.h>
#include <format>
#include <utility/utility.h>
#include <vulkan/vk_enum_string_helper.h>
#include <SDL.h>
#include <SDL_vulkan.h>
LOG_DEFINE_MODULE(vulkanSetup);
constexpr std::array<VkValidationFeatureDisableEXT, 0> disabledValidationFeatures {};
@ -119,7 +118,7 @@ VulkanExtensions getExtensions(SDL_Window* window, bool enableValidation) {
VulkanExtensions r = {.enableValidationLayers = enableValidation};
SDL_Vulkan_GetInstanceExtensions(window, &countRequiredExtensions, NULL);
auto extensions = static_cast<const char **>(SDL_malloc(sizeof(char *) * countRequiredExtensions));
auto extensions = static_cast<const char**>(SDL_malloc(sizeof(char*) * countRequiredExtensions));
SDL_Vulkan_GetInstanceExtensions(window, &countRequiredExtensions, extensions);
for (size_t n = 0; n < countRequiredExtensions; n++) {
r.requiredExtensions.push_back(extensions[n]);

3
modules/libSceAppContent/types.h
View File

@ -2,7 +2,6 @@
#include "../libSceNpManager/types.h"
#include "codes.h"
typedef uint32_t SceAppContentMediaType;
typedef uint32_t SceAppContentBootAttribute;
typedef uint32_t SceAppContentAppParamId;
@ -43,4 +42,4 @@ struct SceAppContentEntitlementKey {
struct SceAppContentAddcontDownloadProgress {
uint64_t dataSize;
uint64_t downloadedSize;
};
};

37
modules/libSceAudioOut/entry.cpp
View File

@ -41,11 +41,10 @@ int writeOut(Pimpl* pimpl, int32_t handle, const void* ptr) {
port.lastOutputTime = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
if (SDL_GetAudioDeviceStatus(port.device) != SDL_AUDIO_PLAYING)
SDL_PauseAudioDevice(port.device, 0);
if (SDL_GetAudioDeviceStatus(port.device) != SDL_AUDIO_PLAYING) SDL_PauseAudioDevice(port.device, 0);
while (SDL_GetQueuedAudioSize(port.device) > 0)
SDL_Delay(0);
SDL_Delay(0);
return SDL_QueueAudio(port.device, ptr, port.samplesNum * port.sampleSize * port.channelsNum);
}
@ -84,42 +83,42 @@ EXPORT SYSV_ABI int32_t sceAudioOutOpen(int32_t userId, SceAudioOutPortType type
case SceAudioOutParamFormat::S16_MONO:
sampleFormat = AUDIO_S16SYS;
port.channelsNum = 1;
port.sampleSize = 2;
port.sampleSize = 2;
break;
case SceAudioOutParamFormat::FLOAT_MONO:
sampleFormat = AUDIO_F32SYS;
port.channelsNum = 1;
port.sampleSize = 4;
port.sampleSize = 4;
break;
case SceAudioOutParamFormat::S16_STEREO:
sampleFormat = AUDIO_S16SYS;
port.channelsNum = 2;
port.sampleSize = 2;
port.sampleSize = 2;
break;
case SceAudioOutParamFormat::FLOAT_STEREO:
sampleFormat = AUDIO_F32SYS;
port.channelsNum = 2;
port.sampleSize = 4;
port.sampleSize = 4;
break;
case SceAudioOutParamFormat::S16_8CH:
sampleFormat = AUDIO_S16SYS;
port.channelsNum = 8;
port.sampleSize = 2;
port.sampleSize = 2;
break;
case SceAudioOutParamFormat::FLOAT_8CH:
sampleFormat = AUDIO_F32SYS;
port.channelsNum = 8;
port.sampleSize = 4;
port.sampleSize = 4;
break;
case SceAudioOutParamFormat::S16_8CH_STD:
sampleFormat = AUDIO_S16SYS;
port.channelsNum = 8;
port.sampleSize = 2;
port.sampleSize = 2;
break;
case SceAudioOutParamFormat::FLOAT_8CH_STD:
sampleFormat = AUDIO_F32SYS;
port.channelsNum = 8;
port.sampleSize = 4;
port.sampleSize = 4;
break;
}
@ -127,16 +126,14 @@ EXPORT SYSV_ABI int32_t sceAudioOutOpen(int32_t userId, SceAudioOutPortType type
port.volume[i] = 32768;
}
SDL_AudioSpec fmt {
.freq = static_cast<int>(freq),
.format = sampleFormat,
.channels = static_cast<uint8_t>(port.channelsNum),
.samples = static_cast<uint16_t>(port.samplesNum),
.callback = nullptr,
.userdata = nullptr
};
SDL_AudioSpec fmt {.freq = static_cast<int>(freq),
.format = sampleFormat,
.channels = static_cast<uint8_t>(port.channelsNum),
.samples = static_cast<uint16_t>(port.samplesNum),
.callback = nullptr,
.userdata = nullptr};
char *dname;
char* dname;
SDL_AudioSpec fmt_curr;
SDL_GetDefaultAudioInfo(&dname, &fmt_curr, 0);
LOG_INFO(L"Opening audio device: %s\n", dname);

19
modules/libSceAvPlayer/types.h
View File

@ -3,15 +3,15 @@
#include "utility/utility.h"
typedef void* SceAvPlayerHandle;
using SceAvPlayerLogCallback = SYSV_ABI int (*)(void* userData, const char* format, va_list args);
using SceAvPlayerAllocate = SYSV_ABI void* (*)(void* argP, uint32_t argAlignment, uint32_t argSize);
using SceAvPlayerDeallocate = SYSV_ABI void (*)(void* argP, void* argMemory);
using SceAvPlayerAllocateTexture = SYSV_ABI void* (*)(void* argP, uint32_t argAlignment, uint32_t argSize);
using SceAvPlayerLogCallback = SYSV_ABI int (*)(void* userData, const char* format, va_list args);
using SceAvPlayerAllocate = SYSV_ABI void* (*)(void* argP, uint32_t argAlignment, uint32_t argSize);
using SceAvPlayerDeallocate = SYSV_ABI void (*)(void* argP, void* argMemory);
using SceAvPlayerAllocateTexture = SYSV_ABI void* (*)(void* argP, uint32_t argAlignment, uint32_t argSize);
using SceAvPlayerDeallocateTexture = SYSV_ABI void (*)(void* argP, void* argMemory);
using SceAvPlayerOpenFile = SYSV_ABI int (*)(void* argP, const char* argFilename);
using SceAvPlayerCloseFile = SYSV_ABI int (*)(void* argP);
using SceAvPlayerReadOffsetFile = SYSV_ABI int (*)(void* argP, uint8_t* argBuffer, uint64_t argPosition, uint32_t argLength);
using SceAvPlayerEventCallback = SYSV_ABI void (*)(void* p, int32_t argEventId, int32_t argSourceId, void* argEventData);
using SceAvPlayerOpenFile = SYSV_ABI int (*)(void* argP, const char* argFilename);
using SceAvPlayerCloseFile = SYSV_ABI int (*)(void* argP);
using SceAvPlayerReadOffsetFile = SYSV_ABI int (*)(void* argP, uint8_t* argBuffer, uint64_t argPosition, uint32_t argLength);
using SceAvPlayerEventCallback = SYSV_ABI void (*)(void* p, int32_t argEventId, int32_t argSourceId, void* argEventData);
using SceAvPlayerSizeFile = SYSV_ABI uint64_t (*)(void* argP);
enum class SceAvPlayerVideoDecoderType { DEFAULT = 0, RESERVED1, RESERVED2, SOFTWARE2 };
@ -53,6 +53,7 @@ struct SceAvPlayerDecoderInit {
SceAvPlayerAudioDecoderType audioType;
uint8_t reserved[4];
} decoderType;
union {
struct {
int32_t cpuAffinityMask;
@ -67,10 +68,12 @@ struct SceAvPlayerDecoderInit {
uint8_t reserved[16];
} avcSw2;
struct {
uint8_t audioChannelOrder;
uint8_t reserved[27];
} aac;
uint8_t reserved[28];
} decoderParams;
};

1
modules/libSceAvPlayer/typesEx.h
View File

@ -57,6 +57,7 @@ struct SceAvPlayerVideoEx {
uint8_t reserved1[37];
};
struct SceAvPlayerTimedTextEx {
uint8_t languageCode[4];
uint8_t reserved[12];

7
modules/libSceIme/types.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "common.h"
#include "codes.h"
#include "common.h"
enum class SCE_IME_MAX {
PREEDIT_LENGTH = 30,
@ -391,9 +391,9 @@ struct SceImeEvent {
SceImeEventParam param;
};
typedef void (*SceImeEventHandler)(void* arg, const SceImeEvent* e);
typedef void (*SceImeEventHandler)(void* arg, const SceImeEvent* e);
typedef int32_t (*SceImeTextFilter)(wchar_t* outText, uint32_t* outTextLength, const wchar_t* srcText, uint32_t srcTextLength);
typedef int (*SceImeExtKeyboardFilter)(const SceImeKeycode* srcKeycode, uint16_t* outKeycode, uint32_t* outStatus, void* reserved);
typedef int (*SceImeExtKeyboardFilter)(const SceImeKeycode* srcKeycode, uint16_t* outKeycode, uint32_t* outStatus, void* reserved);
struct SceImeParam {
SceUserServiceUserId userId;
@ -433,6 +433,7 @@ struct SceImeParamExtended {
uint32_t extKeyboardMode;
int8_t reserved[60];
};
struct SceImeKeyboardParam {
uint32_t option;
int8_t reserved1[4];

4
modules/libSceNpManager/types.h
View File

@ -20,8 +20,8 @@ enum class SceNpPlatformType : int {
enum class SceNpState { UNKNOWN = 0, SIGNED_OUT, SIGNED_IN };
enum class SceNpGamePresenceStatus { OFFLINE, ONLINE };
enum class SceNpReachabilityState { UNAVAILABLE = 0, AVAILABLE, REACHABLE };
enum class SceNpServiceLabel : uint32_t { DEFAULT = 0x00000000, INVALID = 0xFFFFFFFF };
struct SceNpTitleId {
char id[SCE_NP_TITLE_ID_LEN + 1];
};
@ -151,4 +151,4 @@ struct SceNpCreateAsyncRequestParameter {
size_t size;
uint64_t cpuAffinityMask;
int threadPriority;
};
};

28
modules/libScePad/entry.cpp
View File

@ -16,8 +16,8 @@ struct Controller {
int32_t userId = -1;
uint8_t countConnect = 0;
SDL_GameController *padPtr;
ScePadData prePadData;
SDL_GameController* padPtr;
ScePadData prePadData;
};
struct Pimpl {
@ -62,7 +62,7 @@ ScePadData getPadData(int handle) {
LOG_USE_MODULE(libScePad);
ScePadData data;
auto pData = getData();
auto pData = getData();
auto pController = pData->controller[handle].padPtr;
if (pController == nullptr) return ScePadData();
@ -130,8 +130,8 @@ ScePadData getPadData(int handle) {
data.touchData.touchNum = 0;
for (int f = 0; f < SDL_GameControllerGetNumTouchpadFingers(pController, 0); f++) {
uint8_t s = 0;
float x = 0.0f, y = 0.0f;
auto& touch = data.touchData.touch[f];
float x = 0.0f, y = 0.0f;
auto& touch = data.touchData.touch[f];
SDL_GameControllerGetTouchpadFinger(pController, 0, f, &s, &x, &y, NULL);
if (s > 0) {
@ -155,7 +155,9 @@ EXPORT SYSV_ABI int scePadInit(void) {
EXPORT SYSV_ABI int scePadOpen(int32_t userId, PadPortType type, int32_t index, const void* pParam) {
LOG_USE_MODULE(libScePad);
auto pData = getData();
std::unique_lock const lock(pData->m_mutexInt);
// Check already opened
@ -170,7 +172,7 @@ EXPORT SYSV_ABI int scePadOpen(int32_t userId, PadPortType type, int32_t index,
pData->controller[n].userId = userId;
++pData->controller[n].countConnect;
pData->controller[n].prePadData = ScePadData();
pData->controller[n].padPtr = SDL_GameControllerOpen(n);
pData->controller[n].padPtr = SDL_GameControllerOpen(n);
SDL_GameControllerSetPlayerIndex(pData->controller[n].padPtr, userId - 1);
LOG_INFO(L"-> Pad[%llu]: userId:%d name:%S", n, userId, SDL_GameControllerNameForIndex(n));
@ -213,7 +215,7 @@ EXPORT SYSV_ABI int scePadRead(int32_t handle, ScePadData* pPadData, int32_t num
LOG_USE_MODULE(libScePad);
if (handle < 0) return Err::INVALID_HANDLE;
auto pData = getData();
auto pData = getData();
auto pController = pData->controller[handle].padPtr;
if (SDL_GameControllerGetAttached(pController) == false) {
SDL_GameControllerClose(pController);
@ -262,7 +264,7 @@ EXPORT SYSV_ABI int scePadResetOrientation(int32_t handle) {
EXPORT SYSV_ABI int scePadSetVibration(int32_t handle, const ScePadVibrationParam* pParam) {
if (handle < 0) return Err::INVALID_HANDLE;
auto pData = getData();
auto pData = getData();
auto pController = pData->controller[handle].padPtr;
SDL_GameControllerRumble(pController, ((float)pParam->smallMotor / 255.0f) * 0xFFFF, ((float)pParam->largeMotor / 255.0f) * 0xFFFF, -1);
@ -272,11 +274,10 @@ EXPORT SYSV_ABI int scePadSetVibration(int32_t handle, const ScePadVibrationPara
EXPORT SYSV_ABI int scePadSetLightBar(int32_t handle, const ScePadColor* pParam) {
if (handle < 0) return Err::INVALID_HANDLE;
auto pData = getData();
auto pData = getData();
auto pController = pData->controller[handle].padPtr;
if (SDL_GameControllerHasLED(pController) == false)
return Err::INVALID_LIGHTBAR_SETTING;
if (SDL_GameControllerHasLED(pController) == false) return Err::INVALID_LIGHTBAR_SETTING;
SDL_GameControllerSetLED(pController, pParam->r, pParam->g, pParam->b);
return Ok;
@ -285,10 +286,9 @@ EXPORT SYSV_ABI int scePadSetLightBar(int32_t handle, const ScePadColor* pParam)
EXPORT SYSV_ABI int scePadResetLightBar(int32_t handle) {
if (handle < 0) return Err::INVALID_HANDLE;
auto pData = getData();
auto pData = getData();
auto pController = pData->controller[handle].padPtr;
if (SDL_GameControllerHasLED(pController) == false)
return Err::INVALID_LIGHTBAR_SETTING;
if (SDL_GameControllerHasLED(pController) == false) return Err::INVALID_LIGHTBAR_SETTING;
SDL_GameControllerSetLED(pController, 0, 0, 0);
return Ok;

3
modules/libScePad/types.h
View File

@ -160,6 +160,7 @@ struct ScePadColor {
struct ScePadTouchPadInformation {
float pixelDensity;
struct {
uint16_t x;
uint16_t y;
@ -203,6 +204,7 @@ struct ScePadDeviceClassData {
uint8_t gear;
uint8_t reserved[1];
} steeringWheel;
struct {
uint8_t toneNumber;
uint8_t whammyBar;
@ -213,6 +215,7 @@ struct ScePadDeviceClassData {
uint8_t fretSolo;
uint8_t reserved[11];
} guitar;
struct {
uint8_t snare;

3
modules/libSceSaveDataDialog/types.h
View File

@ -3,7 +3,6 @@
#include "..\libSceCommonDialog\types.h"
#include "codes.h"
struct SceSaveDataDialogAnimationParam {
SceSaveDataDialogAnimation userOK; /// animation setting when user decide OK or ListItem
SceSaveDataDialogAnimation userCancel; /// animation setting when user cancel
@ -126,4 +125,4 @@ struct SceSaveDataDialogResult {
void* userData; /// Userdata specified at calling function
uint8_t reserved[32]; /// Reserved range (must be filled by zero)
};
};

9
modules/libSceSystemService/types.h
View File

@ -3,38 +3,47 @@
struct SceSystemServiceEvent {
SceSystemServiceEventType eventType;
union {
char param[8192];
struct {
char source[1024];
union {
char arg[4096];
char url[4096];
};
} urlOpen;
struct {
uint32_t size;
uint8_t arg[8188];
} launchApp;
struct {
uint32_t size;
uint8_t arg[2020];
} appLaunchLink;
struct {
int32_t userId;
char eventId[37];
char bootArgument[7169];
} joinEvent;
struct {
int32_t userId;
uint32_t npServiceLabel;
uint8_t reserved[8184];
} serviceEntitlementUpdate;
struct {
int32_t userId;
uint32_t npServiceLabel;
uint8_t reserved[8184];
} unifiedEntitlementUpdate;
uint8_t reserved[8192];
} data;
};

3
tools/logging/logging_dummy.h
View File

@ -23,6 +23,7 @@ void __log(bool doExit, const wchar_t* i_pFormat, ...);
*
*/
constexpr void deinit() {}
/**
* @brief Register thread (for better logging)
*
@ -54,4 +55,4 @@ constexpr uint8_t isIgnored(void* module, eTrace_Level level) {
#define LOG_WARN(...) /**/
#define LOG_ERR(...) __Log::__log(false, __VA_ARGS__)
#define LOG_CRIT(...) __Log::__log(true, __VA_ARGS__)
// -
// -