diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp b/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp index e2155cca63..a2af86a8ae 100644 --- a/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" #include "Emu/Cell/PPUModule.h" #include "cellSubDisplay.h" @@ -17,6 +17,7 @@ void fmt_class_string::format(std::string& out, u64 arg) STR_CASE(CELL_SUBDISPLAY_ERROR_NOT_FOUND); STR_CASE(CELL_SUBDISPLAY_ERROR_INVALID_VALUE); STR_CASE(CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED); + STR_CASE(CELL_SUBDISPLAY_ERROR_NOT_SUPPORTED); STR_CASE(CELL_SUBDISPLAY_ERROR_SET_SAMPLE); STR_CASE(CELL_SUBDISPLAY_ERROR_AUDIOOUT_IS_BUSY); STR_CASE(CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED); diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h index a219eeef56..901315d561 100644 --- a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h +++ b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Utilities/BEType.h" @@ -10,9 +10,10 @@ enum CellSubDisplayError : u32 CELL_SUBDISPLAY_ERROR_NOT_FOUND = 0x80029853, CELL_SUBDISPLAY_ERROR_INVALID_VALUE = 0x80029854, CELL_SUBDISPLAY_ERROR_NOT_INITIALIZED = 0x80029855, + CELL_SUBDISPLAY_ERROR_NOT_SUPPORTED = 0x80029856, CELL_SUBDISPLAY_ERROR_SET_SAMPLE = 0x80029860, CELL_SUBDISPLAY_ERROR_AUDIOOUT_IS_BUSY = 0x80029861, - CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED = 0x80029813, + CELL_SUBDISPLAY_ERROR_ZERO_REGISTERED = 0x80029813, // = CELL_REMOTEPLAY_ERROR_ZERO_REGISTERED }; // Different constants @@ -37,10 +38,25 @@ enum CELL_SUBDISPLAY_0001_MEMORY_CONTAINER_SIZE = 8 * 1024 * 1024, CELL_SUBDISPLAY_0002_MEMORY_CONTAINER_SIZE = 10 * 1024 * 1024, CELL_SUBDISPLAY_0003_MEMORY_CONTAINER_SIZE = 10 * 1024 * 1024, + CELL_SUBDISPLAY_0003_WIDTH = 864, + CELL_SUBDISPLAY_0003_PITCH = 864, + CELL_SUBDISPLAY_0003_HEIGHT = 480, CELL_SUBDISPLAY_NICKNAME_LEN = 256, CELL_SUBDISPLAY_PSPID_LEN = 16, }; +// Touch +enum +{ + CELL_SUBDISPLAY_TOUCH_STATUS_NONE = 0, + CELL_SUBDISPLAY_TOUCH_STATUS_PRESS = 1, + CELL_SUBDISPLAY_TOUCH_STATUS_RELEASE = 2, + CELL_SUBDISPLAY_TOUCH_STATUS_MOVE = 3, + CELL_SUBDISPLAY_TOUCH_STATUS_ABORT = 4, + + CELL_SUBDISPLAY_TOUCH_MAX_TOUCH_INFO = 6, +}; + struct CellSubDisplayVideoParam { be_t format;