move basic descriptors to lv_disp_t

lv_core/lv_disp.c

@@ -32,23 +32,6 @@
  *   GLOBAL FUNCTIONS
  **********************/
 
-lv_coord_t lv_disp_get_hor_res(lv_disp_t * disp)
-{
-    if(disp == NULL) disp = lv_disp_get_active();
-
-    if(disp == NULL) return LV_HOR_RES_MAX;
-    else return disp->driver.hor_res;
-}
-
-
-lv_coord_t lv_disp_get_ver_res(lv_disp_t * disp)
-{
-    if(disp == NULL) disp = lv_disp_get_active();
-
-    if(disp == NULL) return LV_VER_RES_MAX;
-    else return disp->driver.ver_res;
-}
-
 /**********************
  *   STATIC FUNCTIONS
  **********************/

lv_core/lv_disp.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_hal/lv_hal_disp.h"
+#include "../lv_hal/lv_hal.h"
 
 /*********************
  *      DEFINES

lv_core/lv_indev.c

@@ -121,12 +121,13 @@ void lv_indev_reset_lpr(lv_indev_t * indev)
  */
 void lv_indev_enable(lv_hal_indev_type_t type, bool enable)
 {
-    lv_indev_t * i = lv_indev_next(NULL);
 
-    while(i) {
+//    lv_indev_t * i = lv_indev_next(NULL);
-        if(i->driver.type == type) i->proc.disabled = enable == false ? 1 : 0;
+//
-        i = lv_indev_next(i);
+//    while(i) {
-    }
+//        if(i->driver.type == type) i->proc.disabled = enable == false ? 1 : 0;
+//        i = lv_indev_next(i);
+//    }
 }
 
 /**
@@ -244,19 +245,23 @@ void lv_indev_get_vect(const lv_indev_t * indev, lv_point_t * point)
  */
 uint32_t lv_indev_get_inactive_time(const lv_indev_t * indev)
 {
-    uint32_t t;
 
-    if(indev) return t = lv_tick_elaps(indev->last_activity_time);
+    //TODO
+//    uint32_t t;
+//
+//    if(indev) return t = lv_tick_elaps(indev->last_activity_time);
+//
+//    lv_indev_t * i;
+//    t = UINT16_MAX;
+//    i = lv_indev_next(NULL);
+//    while(i) {
+//        t = LV_MATH_MIN(t, lv_tick_elaps(i->last_activity_time));
+//        i = lv_indev_next(i);
+//    }
+//
+//    return t;
 
-    lv_indev_t * i;
+    return 0;
-    t = UINT16_MAX;
-    i = lv_indev_next(NULL);
-    while(i) {
-        t = LV_MATH_MIN(t, lv_tick_elaps(i->last_activity_time));
-        i = lv_indev_next(i);
-    }
-
-    return t;
 }
 
 /**
@@ -583,14 +588,14 @@ static void indev_proc_press(lv_indev_proc_t * proc)
 
     /*If there is no last object then search*/
     if(proc->act_obj == NULL) {
-        pr_obj = indev_search_obj(proc, lv_layer_top());
+        pr_obj = indev_search_obj(proc, lv_layer_top(NULL));
-        if(pr_obj == NULL) pr_obj = indev_search_obj(proc, lv_scr_act());
+        if(pr_obj == NULL) pr_obj = indev_search_obj(proc, lv_scr_act(NULL));
     }
     /*If there is last object but it is not dragged and not protected also search*/
     else if(proc->drag_in_prog == 0 &&
             lv_obj_is_protected(proc->act_obj, LV_PROTECT_PRESS_LOST) == false) {/*Now act_obj != NULL*/
-        pr_obj = indev_search_obj(proc, lv_layer_top());
+        pr_obj = indev_search_obj(proc, lv_layer_top(NULL));
-        if(pr_obj == NULL) pr_obj = indev_search_obj(proc, lv_scr_act());
+        if(pr_obj == NULL) pr_obj = indev_search_obj(proc, lv_scr_act(NULL));
     }
     /*If a dragable or a protected object was the last then keep it*/
     else {

lv_core/lv_obj.c

@@ -17,6 +17,7 @@
 #include "../lv_misc/lv_task.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_ufs.h"
+#include "../lv_hal/lv_hal.h"
 #include <stdint.h>
 #include <string.h>
 #include "../lv_misc/lv_gc.h"
@@ -62,13 +63,6 @@ static lv_res_t lv_obj_signal(lv_obj_t * obj, lv_signal_t sign, void * param);
  */
 void lv_init(void)
 {
-    LV_GC_ROOT(_lv_def_scr) = NULL;
-    LV_GC_ROOT(_lv_act_scr) = NULL;
-    LV_GC_ROOT(_lv_top_layer) = NULL;
-    LV_GC_ROOT(_lv_sys_layer) = NULL;
-    LV_GC_ROOT(_lv_disp_list) = NULL;
-    LV_GC_ROOT(_lv_indev_list) = NULL;
-
     LV_LOG_TRACE("lv_init started");
 
     /*Initialize the lv_misc modules*/
@@ -91,20 +85,9 @@ void lv_init(void)
     /*Initialize the screen refresh system*/
     lv_refr_init();
 
-    /*Create the default screen*/
+    lv_ll_init(&LV_GC_ROOT(_lv_disp_ll), sizeof(lv_disp_t));
-    lv_ll_init(&LV_GC_ROOT(_lv_scr_ll), sizeof(lv_obj_t));
+    lv_ll_init(&LV_GC_ROOT(_lv_indev_ll), sizeof(lv_indev_t));
-    LV_GC_ROOT(_lv_def_scr) = lv_obj_create(NULL, NULL);
 
-    LV_GC_ROOT(_lv_act_scr) = LV_GC_ROOT(_lv_def_scr);
-
-    LV_GC_ROOT(_lv_top_layer) = lv_obj_create(NULL, NULL);
-    lv_obj_set_style(LV_GC_ROOT(_lv_top_layer), &lv_style_transp_fit);
-
-    LV_GC_ROOT(_lv_sys_layer) = lv_obj_create(NULL, NULL);
-    lv_obj_set_style(LV_GC_ROOT(_lv_sys_layer), &lv_style_transp_fit);
-
-    /*Refresh the screen*/
-    lv_obj_invalidate(LV_GC_ROOT(_lv_act_scr));
 
 #if LV_INDEV_READ_PERIOD != 0
     /*Init the input device handling*/
@@ -133,8 +116,12 @@ lv_obj_t * lv_obj_create(lv_obj_t * parent, const  lv_obj_t * copy)
     /*Create a screen if the parent is NULL*/
     if(parent == NULL) {
         LV_LOG_TRACE("Screen create started");
+        lv_disp_t * disp = lv_disp_get_last();
+        if(!disp) {
+            LV_LOG_WARN("lv_obj_create: not display created to so far. No place to assign the new screen")
+        }
 
-        new_obj = lv_ll_ins_head(&LV_GC_ROOT(_lv_scr_ll));
+        new_obj = lv_ll_ins_head(&disp->scr_ll);
         lv_mem_assert(new_obj);
         if(new_obj == NULL) return NULL;
 
@@ -357,7 +344,8 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
     /*Remove the object from parent's children list*/
     lv_obj_t * par = lv_obj_get_parent(obj);
     if(par == NULL) { /*It is a screen*/
-        lv_ll_rem(&LV_GC_ROOT(_lv_scr_ll), obj);
+        lv_disp_t * d = lv_scr_get_disp(obj);
+        lv_ll_rem(&d->scr_ll, obj);
     } else {
         lv_ll_rem(&(par->child_ll), obj);
     }
@@ -415,9 +403,9 @@ void lv_obj_invalidate(const lv_obj_t * obj)
 
     /*Invalidate the object only if it belongs to the 'LV_GC_ROOT(_lv_act_scr)'*/
     lv_obj_t * obj_scr = lv_obj_get_screen(obj);
-    if(obj_scr == lv_scr_act() ||
+    lv_disp_t * disp = lv_scr_get_disp(obj_scr);
-            obj_scr == lv_layer_top() ||
+    if(obj_scr == lv_scr_act(disp) ||
-            obj_scr == lv_layer_sys()) {
+            obj_scr == lv_layer_top(disp)) {
         /*Truncate recursively to the parents*/
         lv_area_t area_trunc;
         lv_obj_t * par = lv_obj_get_parent(obj);
@@ -448,9 +436,24 @@ void lv_obj_invalidate(const lv_obj_t * obj)
  * Setter functions
  *====================*/
 
+
 /*--------------
  * Screen set
  *--------------*/
+lv_disp_t * lv_scr_get_disp(lv_obj_t * scr)
+{
+    lv_disp_t * d;
+
+    LL_READ(LV_GC_ROOT(_lv_disp_ll), d) {
+        lv_obj_t * s;
+        LL_READ(d->scr_ll, s) {
+            if(s == scr) return d;
+        }
+    }
+
+    LV_LOG_WARN("lv_scr_get_disp: screen not found")
+    return NULL;
+}
 
 /**
  * Load a new screen
@@ -458,9 +461,11 @@ void lv_obj_invalidate(const lv_obj_t * obj)
  */
 void lv_scr_load(lv_obj_t * scr)
 {
-    LV_GC_ROOT(_lv_act_scr) = scr;
+    lv_disp_t * d = lv_scr_get_disp(scr);
 
-    lv_obj_invalidate(LV_GC_ROOT(_lv_act_scr));
+    d->act_scr = scr;
+
+    lv_obj_invalidate(scr);
 }
 
 /*--------------------
@@ -1006,13 +1011,17 @@ void lv_obj_refresh_style(lv_obj_t * obj)
  */
 void lv_obj_report_style_mod(lv_style_t * style)
 {
-    lv_obj_t * i;
+    lv_disp_t * d = lv_disp_get_next(NULL);
-    LL_READ(LV_GC_ROOT(_lv_scr_ll), i) {
-        if(i->style_p == style || style == NULL) {
-            lv_obj_refresh_style(i);
-        }
 
-        report_style_mod_core(style, i);
+    while(d) {
+        lv_obj_t * i;
+        LL_READ(d->scr_ll, i) {
+            if(i->style_p == style || style == NULL) {
+                lv_obj_refresh_style(i);
+            }
+
+            report_style_mod_core(style, i);
+        }
     }
 }
 
@@ -1302,28 +1311,30 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
  * Return with a pointer to the active screen
  * @return pointer to the active screen object (loaded by 'lv_scr_load()')
  */
-lv_obj_t * lv_scr_act(void)
+lv_obj_t * lv_scr_act(lv_disp_t * disp)
 {
-    return LV_GC_ROOT(_lv_act_scr);
+    if(!disp) disp = lv_disp_get_last();
+    if(!disp) {
+        LV_LOG_WARN("lv_layer_top: no display registered to get its top layer");
+        return NULL;
+    }
+
+    return disp->act_scr;
 }
 
 /**
  * Return with the top layer. (Same on every screen and it is above the normal screen layer)
  * @return pointer to the top layer object  (transparent screen sized lv_obj)
  */
-lv_obj_t * lv_layer_top(void)
+lv_obj_t * lv_layer_top(lv_disp_t * disp)
 {
-    return LV_GC_ROOT(_lv_top_layer);
+    if(!disp) disp = lv_disp_get_last();
-}
+    if(!disp) {
+        LV_LOG_WARN("lv_layer_top: no display registered to get its top layer");
+        return NULL;
+    }
 
-/**
+    return disp->top_layer;
- * Return with the system layer. (Same on every screen and it is above the all other layers)
- * It is used for example by the cursor
- * @return pointer to the system layer object (transparent screen sized lv_obj)
- */
-lv_obj_t * lv_layer_sys(void)
-{
-    return LV_GC_ROOT(_lv_sys_layer);
 }
 
 /**

lv_core/lv_obj.h

@@ -27,6 +27,7 @@ extern "C" {
 #include "../lv_misc/lv_ll.h"
 #include "../lv_misc/lv_color.h"
 #include "../lv_misc/lv_log.h"
+#include "../lv_hal/lv_hal.h"
 
 /*********************
  *      DEFINES
@@ -277,6 +278,8 @@ void lv_obj_invalidate(const lv_obj_t * obj);
  * Screen set
  *--------------*/
 
+lv_disp_t * lv_scr_get_disp(lv_obj_t * scr);
+
 /**
  * Load a new screen
  * @param scr pointer to a screen
@@ -560,20 +563,13 @@ void lv_obj_animate(lv_obj_t * obj, lv_anim_builtin_t type, uint16_t time, uint1
  * Return with a pointer to the active screen
  * @return pointer to the active screen object (loaded by 'lv_scr_load()')
  */
-lv_obj_t * lv_scr_act(void);
+lv_obj_t * lv_scr_act(lv_disp_t * disp);
 
 /**
  * Return with the top layer. (Same on every screen and it is above the normal screen layer)
  * @return pointer to the top layer object  (transparent screen sized lv_obj)
  */
-lv_obj_t * lv_layer_top(void);
+lv_obj_t * lv_layer_top(lv_disp_t * disp);
-
-/**
- * Return with the system layer. (Same on every screen and it is above the all other layers)
- * It is used for example by the cursor
- * @return pointer to the system layer object (transparent screen sized lv_obj)
- */
-lv_obj_t * lv_layer_sys(void);
 
 /**
  * Return with the screen of an object

lv_draw/lv_draw_rbasic.c

@@ -9,7 +9,7 @@
 #include "lv_draw_rbasic.h"
 #if USE_LV_REAL_DRAW != 0
 
-#include "../lv_hal/lv_hal_disp.h"
+#include "../lv_hal/lv_hal.h"
 #include "../lv_misc/lv_font.h"
 #include "lv_draw.h"
 

lv_draw/lv_draw_vbasic.c

@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "../lv_hal/lv_hal_disp.h"
+#include "../lv_hal/lv_hal.h"
 #include "../lv_misc/lv_area.h"
 #include "../lv_misc/lv_font.h"
 #include "../lv_misc/lv_color.h"

lv_hal/lv_hal.h

@@ -1,10 +1,10 @@
 /**
- * @file hal.h
+ * @file lv_hal.h
  *
  */
 
-#ifndef HAL_H
+#ifndef LV_HAL_H
-#define HAL_H
+#define LV_HAL_H
 
 #ifdef __cplusplus
 extern "C" {

lv_hal/lv_hal_disp.c

@@ -11,7 +11,7 @@
  *********************/
 #include <stdint.h>
 #include <stddef.h>
-#include "../lv_hal/lv_hal_disp.h"
+#include "lv_hal.h"
 #include "../lv_misc/lv_mem.h"
 #include "../lv_core/lv_obj.h"
 #include "../lv_misc/lv_gc.h"
@@ -57,6 +57,8 @@ void lv_disp_drv_init(lv_disp_drv_t * driver)
     driver->disp_fill = NULL;
     driver->disp_map = NULL;
     driver->disp_flush = NULL;
+    driver->hor_res = LV_HOR_RES_MAX;
+    driver->ver_res = LV_VER_RES_MAX;
 
 #if USE_LV_GPU
     driver->mem_blend = NULL;
@@ -76,47 +78,36 @@ void lv_disp_drv_init(lv_disp_drv_t * driver)
  */
 lv_disp_t * lv_disp_drv_register(lv_disp_drv_t * driver)
 {
-    lv_disp_t * node;
 
-    node = lv_mem_alloc(sizeof(lv_disp_t));
+    lv_disp_t * node = lv_ll_ins_head(&LV_GC_ROOT(_lv_disp_ll));
-    lv_mem_assert(node);
+    if(!node) {
-    if(node == NULL) return NULL;
+        lv_mem_assert(node);
+        return NULL;
+    }
 
     memcpy(&node->driver, driver, sizeof(lv_disp_drv_t));
-    node->next = NULL;
 
-    /* Set first display as active by default */
+    lv_ll_init(&node->scr_ll, sizeof(lv_obj_t));
-    if(LV_GC_ROOT(_lv_disp_list) == NULL) {
+
-        LV_GC_ROOT(_lv_disp_list) = node;
+    node->act_scr = lv_obj_create(NULL, NULL);  /*Create a default screen on the display*/
-        active = node;
+    node->top_layer = lv_obj_create(NULL, NULL);  /*Create top layer on the display*/
-        lv_obj_invalidate(lv_scr_act());
-    } else {
-        ((lv_disp_t*)LV_GC_ROOT(_lv_disp_list))->next = node;
-    }
 
     return node;
 }
 
-
+void * lv_disp_get_next(lv_disp_t * disp)
-/**
- * Set the active display
- * @param disp pointer to a display (return value of 'lv_disp_register')
- */
-void lv_disp_set_active(lv_disp_t * disp)
 {
-    active = disp;
+    if(disp == NULL) return lv_ll_get_head(&LV_GC_ROOT(_lv_disp_ll));
-    lv_obj_invalidate(lv_scr_act());
+    else return lv_ll_get_next(&LV_GC_ROOT(_lv_disp_ll), disp);
 }
 
-/**
+
- * Get a pointer to the active display
+lv_disp_t * lv_disp_get_last(void)
- * @return pointer to the active display
- */
-lv_disp_t * lv_disp_get_active(void)
 {
-    return active;
+    return lv_ll_get_head(&LV_GC_ROOT(_lv_disp_ll));
 }
 
+
 /**
  * Get the next display.
  * @param disp pointer to the current display. NULL to initialize.
@@ -124,12 +115,25 @@ lv_disp_t * lv_disp_get_active(void)
  */
 lv_disp_t * lv_disp_next(lv_disp_t * disp)
 {
-    if(disp == NULL) {
+    if(disp == NULL) return lv_ll_get_head(&LV_GC_ROOT(_lv_disp_ll));
-        return LV_GC_ROOT(_lv_disp_list);
+    else return lv_ll_get_next(&LV_GC_ROOT(_lv_disp_ll), disp);
-    } else {
+}
-        if(((lv_disp_t*)LV_GC_ROOT(_lv_disp_list))->next == NULL) return NULL;
+
-        else return ((lv_disp_t*)LV_GC_ROOT(_lv_disp_list))->next;
+lv_coord_t lv_disp_get_hor_res(lv_disp_t * disp)
-    }
+{
+    if(disp == NULL) disp = lv_disp_get_active();
+
+    if(disp == NULL) return LV_HOR_RES_MAX;
+    else return disp->driver.hor_res;
+}
+
+
+lv_coord_t lv_disp_get_ver_res(lv_disp_t * disp)
+{
+    if(disp == NULL) disp = lv_disp_get_active();
+
+    if(disp == NULL) return LV_VER_RES_MAX;
+    else return disp->driver.ver_res;
 }
 
 /**

lv_hal/lv_hal_disp.h

@@ -1,12 +1,12 @@
 /**
- * @file hal_disp.h
+ * @file lv_hal_disp.h
  *
  * @description Display Driver HAL interface header file
  *
  */
 
-#ifndef HAL_DISP_H
+#ifndef LV_HAL_DISP_H
-#define HAL_DISP_H
+#define LV_HAL_DISP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,7 +20,7 @@ extern "C" {
 #include "lv_hal.h"
 #include "../lv_misc/lv_color.h"
 #include "../lv_misc/lv_area.h"
-#include "../lv_core/lv_obj.h"
+#include "../lv_misc/lv_ll.h"
 
 /*********************
  *      DEFINES
@@ -62,14 +62,15 @@ typedef struct _disp_drv_t {
 #endif
 } lv_disp_drv_t;
 
+struct _lv_obj_t;
+
 typedef struct _disp_t {
     lv_disp_drv_t driver;
     lv_area_t inv_buf[32];
     lv_ll_t scr_ll;
-    lv_obj_t * act_scr;
+    struct _lv_obj_t * act_scr;
-    lv_obj_t * top_scr;
+    struct _lv_obj_t * top_layer;
     uint8_t orientation:2;
-    struct _disp_t *next;
 } lv_disp_t;
 
 /**********************
@@ -92,17 +93,8 @@ void lv_disp_drv_init(lv_disp_drv_t *driver);
  */
 lv_disp_t * lv_disp_drv_register(lv_disp_drv_t *driver);
 
-/**
- * Set the active display
- * @param disp pointer to a display (return value of 'lv_disp_register')
- */
-void lv_disp_set_active(lv_disp_t * disp);
 
-/**
+lv_disp_t * lv_disp_get_last(void);
- * Get a pointer to the active display
- * @return pointer to the active display
- */
-lv_disp_t * lv_disp_get_active(void);
 
 /**
  * Get the next display.

lv_hal/lv_hal_indev.c

@@ -51,6 +51,7 @@ void lv_indev_drv_init(lv_indev_drv_t * driver)
 {
     driver->read = NULL;
     driver->type = LV_INDEV_TYPE_NONE;
+    driver->disp = NULL;
     driver->user_data = NULL;
 }
 
@@ -61,30 +62,28 @@ void lv_indev_drv_init(lv_indev_drv_t * driver)
  */
 lv_indev_t * lv_indev_drv_register(lv_indev_drv_t * driver)
 {
-    lv_indev_t * node;
 
-    node = lv_mem_alloc(sizeof(lv_indev_t));
+    if(driver->disp == NULL) driver->disp = lv_disp_get_last();
-    if(!node) return NULL;
+
+    if(driver->disp == NULL) {
+        LV_LOG_WARN("lv_indev_drv_register: no display registered hence can't attache the indev to a display");
+        return NULL;
+    }
+
+    lv_indev_t * node = lv_ll_ins_head(&LV_GC_ROOT(_lv_indev_ll));
+    if(!node) {
+        lv_mem_assert(node);
+        return NULL;
+    }
 
     memset(node, 0, sizeof(lv_indev_t));
     memcpy(&node->driver, driver, sizeof(lv_indev_drv_t));
 
-    node->next = NULL;
     node->proc.reset_query = 1;
     node->cursor = NULL;
     node->group = NULL;
     node->btn_points = NULL;
 
-    if(LV_GC_ROOT(_lv_indev_list) == NULL) {
-        LV_GC_ROOT(_lv_indev_list) = node;
-    } else {
-        lv_indev_t * last = LV_GC_ROOT(_lv_indev_list);
-        while(last->next)
-            last = last->next;
-
-        last->next = node;
-    }
-
     return node;
 }
 
@@ -95,13 +94,8 @@ lv_indev_t * lv_indev_drv_register(lv_indev_drv_t * driver)
  */
 lv_indev_t * lv_indev_next(lv_indev_t * indev)
 {
-
+    if(indev == NULL) return lv_ll_get_head(LV_GC_ROOT(&_lv_indev_ll));
-    if(indev == NULL) {
+    else return lv_ll_get_next(LV_GC_ROOT(&_lv_indev_ll), indev);
-        return LV_GC_ROOT(_lv_indev_list);
-    } else {
-        if(indev->next == NULL) return NULL;
-        else return indev->next;
-    }
 }
 
 /**

lv_hal/lv_hal_indev.h

@@ -1,12 +1,12 @@
 /**
- * @file hal_indev.h
+ * @file lv_hal_indev.h
  *
  * @description Input Device HAL interface layer header file
  *
  */
 
-#ifndef HAL_INDEV_H
+#ifndef LV_HAL_INDEV_H
-#define HAL_INDEV_H
+#define LV_HAL_INDEV_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,7 +19,7 @@ extern "C" {
 #include <stdint.h>
 #include "lv_hal.h"
 #include "../lv_misc/lv_area.h"
-#include "../lv_core/lv_obj.h"
+//#include "../lv_core/lv_obj.h"
 
 /*********************
  *      DEFINES
@@ -62,7 +62,9 @@ typedef struct {
 typedef struct {
     lv_hal_indev_type_t type;                   /*Input device type*/
     bool (*read)(lv_indev_data_t *data);        /*Function pointer to read data. Return 'true' if there is still data to be read (buffered)*/
+    lv_disp_t * disp;
     void *user_data;                            /*Pointer to user defined data, passed in 'lv_indev_data_t' on read*/
+
 } lv_indev_drv_t;
 
 struct _lv_obj_t;
@@ -101,7 +103,7 @@ typedef struct _lv_indev_proc_t {
 
 struct _lv_indev_t;
 
-typedef void (*lv_indev_feedback_t)(struct _lv_indev_t *, lv_signal_t);
+typedef void (*lv_indev_feedback_t)(struct _lv_indev_t *, uint8_t);
 
 struct _lv_obj_t;
 struct _lv_group_t;
@@ -112,13 +114,13 @@ typedef struct _lv_indev_t {
     lv_indev_proc_t proc;
     lv_indev_feedback_t feedback;
     uint32_t last_activity_time;
+    lv_disp_t * disp;
     union {
         struct _lv_obj_t *cursor;       /*Cursor for LV_INPUT_TYPE_POINTER*/
         struct _lv_group_t *group;      /*Keypad destination group*/
         const lv_point_t * btn_points;      /*Array points assigned to the button ()screen will be pressed here by the buttons*/
 
     };
-    struct _lv_indev_t *next;
 } lv_indev_t;
 
 /**********************
@@ -143,7 +145,7 @@ lv_indev_t * lv_indev_drv_register(lv_indev_drv_t *driver);
 /**
  * Get the next input device.
  * @param indev pointer to the current input device. NULL to initialize.
- * @return the next input devise or NULL if no more. Gives the first input device when the parameter is NULL
+ * @return the next input devise or NULL if no more. Give the first input device when the parameter is NULL
  */
 lv_indev_t * lv_indev_next(lv_indev_t * indev);
 

lv_misc/lv_gc.h

@@ -31,17 +31,12 @@ extern "C" {
 
 #define LV_GC_ROOTS(prefix) \
     prefix lv_ll_t _lv_task_ll;      /*Linked list to store the lv_tasks*/ \
-    prefix lv_ll_t _lv_scr_ll;          /*Linked list of screens*/ \
+    prefix lv_ll_t _lv_disp_ll;          /*Linked list of screens*/ \
+    prefix lv_ll_t _lv_indev_ll;          /*Linked list of screens*/ \
     prefix lv_ll_t _lv_drv_ll;\
     prefix lv_ll_t _lv_file_ll;\
     prefix lv_ll_t _lv_anim_ll;\
-    prefix void * _lv_def_scr;\
-    prefix void * _lv_act_scr;\
-    prefix void * _lv_top_layer;\
-    prefix void * _lv_sys_layer;\
     prefix void * _lv_task_act;\
-    prefix void * _lv_indev_list;\
-    prefix void * _lv_disp_list;\
     
     
 #define LV_NO_PREFIX