diff options
author | innovaker <66737976+innovaker@users.noreply.github.com> | 2020-12-02 16:41:57 +0000 |
---|---|---|
committer | Pete Johanson <peter@peterjohanson.com> | 2020-12-14 12:41:25 -0500 |
commit | bac1f17cf6ce225876dc7b6b2a809bcd98010391 (patch) | |
tree | 9783743b31fdadd66d1b3c9e5a3e14dc661ec313 /app/src/ble.c | |
parent | a4652fa25da83ae036613157fb566eb1ce1426fe (diff) |
refactor(app): replace Zephyr integer types with C99 integer types
u8_t → uint8_t
u16_t → uint16_t
u32_t → uint32_t
u64_t → uint64_t
s8_t → int8_t
s16_t → int16_t
s32_t → int32_t
s64_t → int64_t
Prerequisite for #223
See: https://github.com/zephyrproject-rtos/zephyr/releases/tag/zephyr-v2.4.0
PR: #467
Diffstat (limited to 'app/src/ble.c')
-rw-r--r-- | app/src/ble.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/app/src/ble.c b/app/src/ble.c index 32c1350..5f5f94a 100644 --- a/app/src/ble.c +++ b/app/src/ble.c @@ -36,8 +36,8 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/events/ble-active-profile-changed.h> static struct bt_conn *auth_passkey_entry_conn; -static u8_t passkey_entries[6] = {0, 0, 0, 0, 0, 0}; -static u8_t passkey_digit = 0; +static uint8_t passkey_entries[6] = {0, 0, 0, 0, 0, 0}; +static uint8_t passkey_digit = 0; #if IS_ENABLED(CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL) #define PROFILE_COUNT (CONFIG_BT_MAX_PAIRED - 1) @@ -58,7 +58,7 @@ enum advertising_type { BT_GAP_ADV_FAST_INT_MAX_2, NULL) static struct zmk_ble_profile profiles[PROFILE_COUNT]; -static u8_t active_profile; +static uint8_t active_profile; #define DEVICE_NAME CONFIG_BT_DEVICE_NAME #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1) @@ -104,7 +104,7 @@ bool zmk_ble_active_profile_is_open() { return !bt_addr_le_cmp(&profiles[active_profile].peer, BT_ADDR_LE_ANY); } -void set_profile_address(u8_t index, const bt_addr_le_t *addr) { +void set_profile_address(uint8_t index, const bt_addr_le_t *addr) { char setting_name[15]; char addr_str[BT_ADDR_LE_STR_LEN]; @@ -228,7 +228,7 @@ int zmk_ble_clear_bonds() { int zmk_ble_active_profile_index() { return active_profile; } -int zmk_ble_prof_select(u8_t index) { +int zmk_ble_prof_select(uint8_t index) { LOG_DBG("profile %d", index); if (active_profile == index) { return 0; @@ -277,7 +277,7 @@ static int ble_profiles_handle_set(const char *name, size_t len, settings_read_c if (settings_name_steq(name, "profiles", &next) && next) { char *endptr; - u8_t idx = strtoul(next, &endptr, 10); + uint8_t idx = strtoul(next, &endptr, 10); if (*endptr != '\0') { LOG_WRN("Invalid profile index: %s", log_strdup(next)); return -EINVAL; @@ -339,7 +339,7 @@ static bool is_conn_active_profile(const struct bt_conn *conn) { return bt_addr_le_cmp(bt_conn_get_dst(conn), &profiles[active_profile].peer) == 0; } -static void connected(struct bt_conn *conn, u8_t err) { +static void connected(struct bt_conn *conn, uint8_t err) { char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); LOG_DBG("Connected thread: %p", k_current_get()); @@ -372,7 +372,7 @@ static void connected(struct bt_conn *conn, u8_t err) { } } -static void disconnected(struct bt_conn *conn, u8_t reason) { +static void disconnected(struct bt_conn *conn, uint8_t reason) { char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); @@ -581,12 +581,12 @@ bool zmk_ble_handle_key_user(struct zmk_key_event *key_event) { return true; } - u32_t val = (key == NUMBER_0) ? 0 : (key - NUMBER_1 + 1); + uint32_t val = (key == NUMBER_0) ? 0 : (key - NUMBER_1 + 1); passkey_entries[passkey_digit++] = val; if (passkey_digit == 6) { - u32_t passkey = 0; + uint32_t passkey = 0; for (int i = 5; i >= 0; i--) { passkey = (passkey * 10) + val; } |