diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h index f5d126ed4c..ba63a9d652 100644 --- a/rpcs3/Emu/Cell/Modules/cellAudio.h +++ b/rpcs3/Emu/Cell/Modules/cellAudio.h @@ -64,6 +64,7 @@ enum CELL_AUDIO_PORTATTR_OUT_PERSONAL_2 = 0x0000000004000000ULL, CELL_AUDIO_PORTATTR_OUT_PERSONAL_3 = 0x0000000008000000ULL, CELL_AUDIO_PORTATTR_OUT_SECONDARY = 0x0000000000000001ULL, + CELL_AUDIO_PORTATTR_OUT_STREAM1 = 0x0000000000000001ULL, CELL_AUDIO_STATUS_CLOSE = 0x1010, CELL_AUDIO_STATUS_READY = 1, diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 44c41412b3..becb5718c7 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -26,7 +26,9 @@ void fmt_class_string::format(std::string& out, u64 arg) STR_CASE(CELL_CAMERA_ERROR_RESOLUTION_UNKNOWN); STR_CASE(CELL_CAMERA_ERROR_BAD_FRAMERATE); STR_CASE(CELL_CAMERA_ERROR_TIMEOUT); + STR_CASE(CELL_CAMERA_ERROR_BUSY); STR_CASE(CELL_CAMERA_ERROR_FATAL); + STR_CASE(CELL_CAMERA_ERROR_MUTEX); } return unknown; diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.h b/rpcs3/Emu/Cell/Modules/cellCamera.h index 895cdde575..571c54c731 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.h +++ b/rpcs3/Emu/Cell/Modules/cellCamera.h @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include "Utilities/Timer.h" #include "Emu/Cell/lv2/sys_memory.h" @@ -22,7 +22,9 @@ enum CellCameraError : u32 CELL_CAMERA_ERROR_RESOLUTION_UNKNOWN = 0x8014080b, CELL_CAMERA_ERROR_BAD_FRAMERATE = 0x8014080c, CELL_CAMERA_ERROR_TIMEOUT = 0x8014080d, + CELL_CAMERA_ERROR_BUSY = 0x8014080e, CELL_CAMERA_ERROR_FATAL = 0x8014080f, + CELL_CAMERA_ERROR_MUTEX = 0x80140810, }; // Event masks @@ -322,6 +324,39 @@ enum GET_DEF = 0x87, }; +enum // version +{ + CELL_CAMERA_INFO_VER_100 = 0x0100, + CELL_CAMERA_INFO_VER_101 = 0x0101, + CELL_CAMERA_INFO_VER_200 = 0x0200, + CELL_CAMERA_INFO_VER = CELL_CAMERA_INFO_VER_200, + + CELL_CAMERA_READ_VER_100 = 0x0100, + CELL_CAMERA_READ_VER = CELL_CAMERA_READ_VER_100, +}; + +// Other +enum +{ + CELL_CAMERA_MAX_CAMERAS = 1 +}; + +struct CellCameraInfo +{ + // filled in by application as inputs for open + be_t format; + be_t resolution; + be_t framerate; + + // filled in by open + vm::bptr buffer; + be_t bytesize; + be_t width; + be_t height; + be_t dev_num; + be_t guid; +}; + struct CellCameraInfoEx { be_t format; // CellCameraFormat diff --git a/rpcs3/Emu/Cell/Modules/cellKb.h b/rpcs3/Emu/Cell/Modules/cellKb.h index 3dfaa90b0d..139a7dbb3a 100644 --- a/rpcs3/Emu/Cell/Modules/cellKb.h +++ b/rpcs3/Emu/Cell/Modules/cellKb.h @@ -15,6 +15,31 @@ enum CellKbError : u32 CELL_KB_ERROR_SYS_SETTING_FAILED = 0x80121008, }; +enum CellKbLedMode +{ + CELL_KB_LED_MODE_MANUAL = 0, + CELL_KB_LED_MODE_AUTO1 = 1, + CELL_KB_LED_MODE_AUTO2 = 2, +}; + +enum +{ + CELL_KB_RAWDAT = 0x8000U, + CELL_KB_KEYPAD = 0x4000U, +}; + +enum +{ + CELL_KB_ARRANGEMENT_101 = CELL_KB_MAPPING_101, + CELL_KB_ARRANGEMENT_106 = CELL_KB_MAPPING_106, + CELL_KB_ARRANGEMENT_106_KANA = CELL_KB_MAPPING_106_KANA, +}; + +enum +{ + CELL_KB_INFO_INTERCEPTED = 1 +}; + struct CellKbInfo { be_t max_connect;