mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-28 14:54:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dimensions: make some functions static

Browse Source
This commit is contained in:
Megamouse 2024-08-04 11:57:28 +02:00
parent 4030193f31
commit 5bd2fd3391
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/Io/Dimensions.cpp
View File

@ -34,7 +34,7 @@ void dimensions_figure::save()
dim_file.write(data.data(), 0x2D * 0x04);
}
u8 dimensions_toypad::generate_checksum(const std::array<u8, 32>& data, u32 num_of_bytes) const
u8 dimensions_toypad::generate_checksum(const std::array<u8, 32>& data, u32 num_of_bytes)
{
int checksum = 0;
ensure(num_of_bytes <= data.size());
@ -90,7 +90,7 @@ void dimensions_toypad::initialize_rng(u32 seed)
u32 dimensions_toypad::get_next()
{
u32 e = random_a - std::rotl(random_b, 21);
const u32 e = random_a - std::rotl(random_b, 21);
random_a = random_b ^ std::rotl(random_c, 19);
random_b = random_c + std::rotl(random_d, 6);
random_c = random_d + e;
@ -237,9 +237,9 @@ std::array<u8, 4> dimensions_toypad::dimensions_randomize(const std::vector<u8>
u32 dimensions_toypad::get_figure_id(const std::array<u8, 0x2D * 0x04>& buf)
{
std::array<u8, 16> figure_key = generate_figure_key(buf);
const std::array<u8, 16> figure_key = generate_figure_key(buf);
std::array<u8, 8> decrypted = decrypt(&buf[36 * 4], figure_key);
const std::array<u8, 8> decrypted = decrypt(&buf[36 * 4], figure_key);
const u32 fig_num = read_from_ptr<le_t<u32>>(decrypted);
// Characters have their model number encrypted in page 36
@ -295,7 +295,7 @@ void dimensions_toypad::query_block(u8 index, u8 page, std::array<u8, 32>& reply
std::lock_guard lock(dimensions_mutex);
// Index from game begins at 1 rather than 0, so minus 1 here
dimensions_figure& figure = get_figure_by_index(index - 1);
const dimensions_figure& figure = get_figure_by_index(index - 1);
reply_buf[0] = 0x55;
reply_buf[1] = 0x12;
@ -341,7 +341,7 @@ void dimensions_toypad::get_model(const u8* buf, u8 sequence, std::array<u8, 32>
const u8 index = value[0];
const u32 conf = read_from_ptr<be_t<u32>>(value, 4);
// Index from game begins at 1 rather than 0, so minus 1 here
dimensions_figure& figure = get_figure_by_index(index - 1);
const dimensions_figure& figure = get_figure_by_index(index - 1);
std::array<u8, 8> value_to_encrypt = {};
// Response is the figure's id (little endian) followed by the confirmation from payload
write_to_ptr<le_t<u32>>(value_to_encrypt, figure.id);

22
rpcs3/Emu/Io/Dimensions.h
View File

@ -19,7 +19,7 @@ struct dimensions_figure
class dimensions_toypad
{
public:
void get_blank_response(u8 type, u8 sequence, std::array<u8, 32>& reply_buf);
static void get_blank_response(u8 type, u8 sequence, std::array<u8, 32>& reply_buf);
void generate_random_number(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf);
void initialize_rng(u32 seed);
void get_challenge_response(const u8* buf, u8 sequence, std::array<u8, 32>& reply_buf);
@ -31,22 +31,22 @@ public:
bool remove_figure(u8 pad, u8 index, bool save);
u32 load_figure(const std::array<u8, 0x2D * 0x04>& buf, fs::file in_file, u8 pad, u8 index);
bool move_figure(u8 pad, u8 index, u8 old_pad, u8 old_index);
bool create_blank_character(std::array<u8, 0x2D * 0x04>& buf, u16 id);
static bool create_blank_character(std::array<u8, 0x2D * 0x04>& buf, u16 id);
protected:
shared_mutex dimensions_mutex;
std::array<dimensions_figure, 7> m_figures;
private:
void random_uid(u8* uid_buffer);
u8 generate_checksum(const std::array<u8, 32>& data, u32 num_of_bytes) const;
std::array<u8, 8> decrypt(const u8* buf, std::optional<std::array<u8, 16>> key);
std::array<u8, 8> encrypt(const u8* buf, std::optional<std::array<u8, 16>> key);
std::array<u8, 16> generate_figure_key(const std::array<u8, 0x2D * 0x04>& buf);
u32 scramble(const std::array<u8, 7>& uid, u8 count);
std::array<u8, 4> pwd_generate(const std::array<u8, 7>& uid);
std::array<u8, 4> dimensions_randomize(const std::vector<u8> key, u8 count);
u32 get_figure_id(const std::array<u8, 0x2D * 0x04>& buf);
static void random_uid(u8* uid_buffer);
static u8 generate_checksum(const std::array<u8, 32>& data, u32 num_of_bytes);
static std::array<u8, 8> decrypt(const u8* buf, std::optional<std::array<u8, 16>> key);
static std::array<u8, 8> encrypt(const u8* buf, std::optional<std::array<u8, 16>> key);
static std::array<u8, 16> generate_figure_key(const std::array<u8, 0x2D * 0x04>& buf);
static u32 scramble(const std::array<u8, 7>& uid, u8 count);
static std::array<u8, 4> pwd_generate(const std::array<u8, 7>& uid);
static std::array<u8, 4> dimensions_randomize(const std::vector<u8> key, u8 count);
static u32 get_figure_id(const std::array<u8, 0x2D * 0x04>& buf);
u32 get_next();
dimensions_figure& get_figure_by_index(u8 index);