X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/35a7d633d3f16c1e0539af6ca5d8e7482926cd93..refs/heads/arm64-irq-premerge:/lunaix-os/hal/devtree/dtm.c?ds=sidebyside diff --git a/lunaix-os/hal/devtree/dtm.c b/lunaix-os/hal/devtree/dtm.c index 69ec2e5..215180a 100644 --- a/lunaix-os/hal/devtree/dtm.c +++ b/lunaix-os/hal/devtree/dtm.c @@ -104,7 +104,7 @@ __try_match(const char* str, const char* pattern, size_t pat_sz) } static struct device_meta* -__try_create_categorical(struct dt_node_base *p) +__try_create_categorical(struct dtn_base *p) { if (!p) return NULL; @@ -118,19 +118,19 @@ __try_create_categorical(struct dt_node_base *p) return parent; } - if (p->binded_dev) { - cat = changeling_reveal(p->binded_dev, devcat_morpher); + if (p->binded_obj) { + cat = changeling_reveal(p->binded_obj, devcat_morpher); } else { cat = device_addcat(parent, HSTR_VAL(dt_mobj(p)->name)); - p->binded_dev = dev_mobj(cat); + p->binded_obj = dev_mobj(cat); } return dev_meta(cat); } static bool -compat_matched(struct dtm_driver_record* rec, struct dt_node_base *base) +compat_matched(struct dtm_driver_record* rec, struct dtn_base *base) { const char *compat; struct dtm_driver_info *p, *n; @@ -156,7 +156,7 @@ dtm_try_create_from(struct device_def* def) const char *name; struct dt_context* dtctx; struct dtm_driver_record* rec; - struct dt_node_base *p, *n; + struct dtn_base *p, *n; dtctx = dt_main_context();