mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-21 10:53:23 +02:00
hle/swkbd: specify endianness for enum and other members
This commit is contained in:
parent
39feb0610b
commit
18e94897c4
@ -110,7 +110,7 @@ void SoftwareKeyboard::Update() {
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
LOG_CRITICAL(Applet_SWKBD, "Unknown button config {}",
|
LOG_CRITICAL(Applet_SWKBD, "Unknown button config {}",
|
||||||
static_cast<int>(config.num_buttons_m1));
|
static_cast<u32>(config.num_buttons_m1));
|
||||||
UNREACHABLE();
|
UNREACHABLE();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -143,8 +143,9 @@ Frontend::KeyboardConfig SoftwareKeyboard::ToFrontendConfig(
|
|||||||
const SoftwareKeyboardConfig& config) const {
|
const SoftwareKeyboardConfig& config) const {
|
||||||
using namespace Frontend;
|
using namespace Frontend;
|
||||||
KeyboardConfig frontend_config;
|
KeyboardConfig frontend_config;
|
||||||
frontend_config.button_config = static_cast<ButtonConfig>(config.num_buttons_m1);
|
frontend_config.button_config =
|
||||||
frontend_config.accept_mode = static_cast<AcceptedInput>(config.valid_input);
|
static_cast<ButtonConfig>(static_cast<u32>(config.num_buttons_m1));
|
||||||
|
frontend_config.accept_mode = static_cast<AcceptedInput>(static_cast<u32>(config.valid_input));
|
||||||
frontend_config.multiline_mode = config.multiline;
|
frontend_config.multiline_mode = config.multiline;
|
||||||
frontend_config.max_text_length = config.max_text_length;
|
frontend_config.max_text_length = config.max_text_length;
|
||||||
frontend_config.max_digits = config.max_digits;
|
frontend_config.max_digits = config.max_digits;
|
||||||
|
@ -121,20 +121,20 @@ enum class SoftwareKeyboardResult : s32 {
|
|||||||
};
|
};
|
||||||
|
|
||||||
struct SoftwareKeyboardConfig {
|
struct SoftwareKeyboardConfig {
|
||||||
SoftwareKeyboardType type;
|
enum_le<SoftwareKeyboardType> type;
|
||||||
SoftwareKeyboardButtonConfig num_buttons_m1;
|
enum_le<SoftwareKeyboardButtonConfig> num_buttons_m1;
|
||||||
SoftwareKeyboardValidInput valid_input;
|
enum_le<SoftwareKeyboardValidInput> valid_input;
|
||||||
SoftwareKeyboardPasswordMode password_mode;
|
enum_le<SoftwareKeyboardPasswordMode> password_mode;
|
||||||
s32 is_parental_screen;
|
s32_le is_parental_screen;
|
||||||
s32 darken_top_screen;
|
s32_le darken_top_screen;
|
||||||
u32 filter_flags;
|
u32_le filter_flags;
|
||||||
u32 save_state_flags;
|
u32_le save_state_flags;
|
||||||
u16 max_text_length;
|
u16_le max_text_length;
|
||||||
u16 dict_word_count;
|
u16_le dict_word_count;
|
||||||
u16 max_digits;
|
u16_le max_digits;
|
||||||
std::array<std::array<u16, MAX_BUTTON_TEXT_LEN + 1>, MAX_BUTTON> button_text;
|
std::array<std::array<u16_le, MAX_BUTTON_TEXT_LEN + 1>, MAX_BUTTON> button_text;
|
||||||
std::array<u16, 2> numpad_keys;
|
std::array<u16_le, 2> numpad_keys;
|
||||||
std::array<u16, MAX_HINT_TEXT_LEN + 1>
|
std::array<u16_le, MAX_HINT_TEXT_LEN + 1>
|
||||||
hint_text; ///< Text to display when asking the user for input
|
hint_text; ///< Text to display when asking the user for input
|
||||||
bool predictive_input;
|
bool predictive_input;
|
||||||
bool multiline;
|
bool multiline;
|
||||||
@ -145,25 +145,25 @@ struct SoftwareKeyboardConfig {
|
|||||||
bool unknown;
|
bool unknown;
|
||||||
bool default_qwerty;
|
bool default_qwerty;
|
||||||
std::array<bool, 4> button_submits_text;
|
std::array<bool, 4> button_submits_text;
|
||||||
u16 language;
|
u16_le language;
|
||||||
|
|
||||||
u32 initial_text_offset; ///< Offset of the default text in the output SharedMemory
|
u32_le initial_text_offset; ///< Offset of the default text in the output SharedMemory
|
||||||
u32 dict_offset;
|
u32_le dict_offset;
|
||||||
u32 initial_status_offset;
|
u32_le initial_status_offset;
|
||||||
u32 initial_learning_offset;
|
u32_le initial_learning_offset;
|
||||||
u32 shared_memory_size; ///< Size of the SharedMemory
|
u32_le shared_memory_size; ///< Size of the SharedMemory
|
||||||
u32 version;
|
u32_le version;
|
||||||
|
|
||||||
SoftwareKeyboardResult return_code;
|
enum_le<SoftwareKeyboardResult> return_code;
|
||||||
|
|
||||||
u32 status_offset;
|
u32_le status_offset;
|
||||||
u32 learning_offset;
|
u32_le learning_offset;
|
||||||
|
|
||||||
u32 text_offset; ///< Offset in the SharedMemory where the output text starts
|
u32_le text_offset; ///< Offset in the SharedMemory where the output text starts
|
||||||
u16 text_length; ///< Length in characters of the output text
|
u16_le text_length; ///< Length in characters of the output text
|
||||||
|
|
||||||
int callback_result;
|
s32_le callback_result;
|
||||||
std::array<u16, MAX_CALLBACK_MSG_LEN + 1> callback_msg;
|
std::array<u16_le, MAX_CALLBACK_MSG_LEN + 1> callback_msg;
|
||||||
bool skip_at_check;
|
bool skip_at_check;
|
||||||
INSERT_PADDING_BYTES(0xAB);
|
INSERT_PADDING_BYTES(0xAB);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user