Skip to content

Commit

Permalink
zephyr: Convert from Zephyr to C99 types
Browse files Browse the repository at this point in the history
Convert to use C99 types as we intend to deprecate the zephyr
specific integer types.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
  • Loading branch information
galak authored and utzig committed Jun 4, 2020
1 parent 473f6e6 commit 7658d09
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions cmd/img_mgmt/port/zephyr/src/zephyr_img_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
* Determines if the specified area of flash is completely unwritten.
*/
static int
zephyr_img_mgmt_flash_check_empty(u8_t fa_id, bool *out_empty)
zephyr_img_mgmt_flash_check_empty(uint8_t fa_id, bool *out_empty)
{
const struct flash_area *fa;
uint32_t data[16];
Expand Down Expand Up @@ -88,10 +88,10 @@ zephyr_img_mgmt_flash_check_empty(u8_t fa_id, bool *out_empty)
/**
* Get flash_area ID for a image slot number.
*/
static u8_t
static uint8_t
zephyr_img_mgmt_flash_area_id(int slot)
{
u8_t fa_id;
uint8_t fa_id;

switch (slot) {
case 0:
Expand Down
4 changes: 2 additions & 2 deletions samples/smp_svr/zephyr/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ static void advertise(struct k_work *work)
printk("Advertising successfully started\n");
}

static void connected(struct bt_conn *conn, u8_t err)
static void connected(struct bt_conn *conn, uint8_t err)
{
if (err) {
printk("Connection failed (err 0x%02x)\n", err);
Expand All @@ -104,7 +104,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)
{
printk("Disconnected (reason 0x%02x)\n", reason);
k_work_submit(&advertise_work);
Expand Down

0 comments on commit 7658d09

Please sign in to comment.