diff options
Diffstat (limited to 'src/dev/nuttx')
| -rw-r--r-- | src/dev/nuttx/lv_nuttx_lcd.c | 8 | ||||
| -rw-r--r-- | src/dev/nuttx/lv_nuttx_touchscreen.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/dev/nuttx/lv_nuttx_lcd.c b/src/dev/nuttx/lv_nuttx_lcd.c index 9f29359d0..d7bd69653 100644 --- a/src/dev/nuttx/lv_nuttx_lcd.c +++ b/src/dev/nuttx/lv_nuttx_lcd.c @@ -44,7 +44,7 @@ typedef struct { * STATIC PROTOTYPES **********************/ -static lv_coord_t align_round_up(lv_coord_t v, uint16_t align); +static int32_t align_round_up(int32_t v, uint16_t align); static void rounder_cb(lv_event_t * e); static void flush_cb(lv_display_t * disp, const lv_area_t * area_p, uint8_t * color_p); @@ -109,7 +109,7 @@ lv_display_t * lv_nuttx_lcd_create(const char * dev_path) * STATIC FUNCTIONS **********************/ -static lv_coord_t align_round_up(lv_coord_t v, uint16_t align) +static int32_t align_round_up(int32_t v, uint16_t align) { return (v + align - 1) & ~(align - 1); } @@ -120,8 +120,8 @@ static void rounder_cb(lv_event_t * e) lv_nuttx_lcd_t * lcd = lv_event_get_user_data(e); lv_area_t * area = lv_event_get_param(e); struct lcddev_area_align_s * align_info = &lcd->align_info; - lv_coord_t w; - lv_coord_t h; + int32_t w; + int32_t h; area->x1 &= ~(align_info->col_start_align - 1); area->y1 &= ~(align_info->row_start_align - 1); diff --git a/src/dev/nuttx/lv_nuttx_touchscreen.c b/src/dev/nuttx/lv_nuttx_touchscreen.c index 23d4c0d54..91e33da50 100644 --- a/src/dev/nuttx/lv_nuttx_touchscreen.c +++ b/src/dev/nuttx/lv_nuttx_touchscreen.c @@ -100,8 +100,8 @@ static void touchscreen_read(lv_indev_t * drv, lv_indev_data_t * data) if(touch_flags & TOUCH_DOWN || touch_flags & TOUCH_MOVE) { const lv_display_t * disp_drv = drv->disp; - lv_coord_t ver_max = disp_drv->ver_res - 1; - lv_coord_t hor_max = disp_drv->hor_res - 1; + int32_t ver_max = disp_drv->ver_res - 1; + int32_t hor_max = disp_drv->hor_res - 1; data->point.x = LV_CLAMP(0, sample.point[0].x, hor_max); data->point.y = LV_CLAMP(0, sample.point[0].y, ver_max); |