diff options
| author | Shell <[email protected]> | 2022-12-20 17:49:37 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-12-20 17:49:37 +0800 |
| commit | e8504c7cf1d03c07608e2197eaef728a6aecde7a (patch) | |
| tree | 744bbacef2efbd8afbf04cc63e4d287b38ebcc65 /components | |
| parent | f0ef8ada33833942684a6280314160de8c355302 (diff) | |
[smart/aarch64] code sync (#6750)
* [smart/aarch64] sync aarch64
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/fdt/inc/dtb_node.h | 3 | ||||
| -rw-r--r-- | components/drivers/fdt/libfdt/fdt.h | 84 | ||||
| -rw-r--r-- | components/drivers/tty/pty.c | 3 |
3 files changed, 52 insertions, 38 deletions
diff --git a/components/drivers/fdt/inc/dtb_node.h b/components/drivers/fdt/inc/dtb_node.h index be304a48c8..cc5aa1de49 100644 --- a/components/drivers/fdt/inc/dtb_node.h +++ b/components/drivers/fdt/inc/dtb_node.h @@ -8,6 +8,7 @@ #include "libfdt_env.h" #include <rtthread.h> +#include <stdint.h> //#define RT_DTB_DEBUG #ifdef RT_DTB_DEBUG @@ -326,7 +327,7 @@ struct dtb_node *dtb_node_first_subnode(const struct dtb_node *node); struct dtb_node *dtb_node_next_subnode(const struct dtb_node *node); struct dtb_node *dtb_node_get_parent(const struct dtb_node *node); const char *dtb_node_get_name(const struct dtb_node *node); -struct dtb_node *dtb_node_get_by_phandle(uint phandle); +struct dtb_node *dtb_node_get_by_phandle(uint32_t phandle); int dtb_node_read_size(const struct dtb_node *node, const char *propname); size_t dtb_node_get_addr_index(const struct dtb_node *node, int index); size_t dtb_node_get_addr(const struct dtb_node *node); diff --git a/components/drivers/fdt/libfdt/fdt.h b/components/drivers/fdt/libfdt/fdt.h index 526aedb515..4b6c40ff3e 100644 --- a/components/drivers/fdt/libfdt/fdt.h +++ b/components/drivers/fdt/libfdt/fdt.h @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2006-2022, RT-Thread Development Team + * + * SPDX-License-Identifier: Apache-2.0 + * + * Change Logs: + * Date Author Notes + * 2022-12-20 RT-Thread the first version + */ + #ifndef _FDT_H #define _FDT_H /* @@ -54,58 +64,62 @@ #ifndef __ASSEMBLY__ +#include <errno.h> +#include <unistd.h> +#include <fcntl.h> + struct fdt_header { - fdt32_t magic; /* magic word FDT_MAGIC */ - fdt32_t totalsize; /* total size of DT block */ - fdt32_t off_dt_struct; /* offset to structure */ - fdt32_t off_dt_strings; /* offset to strings */ - fdt32_t off_mem_rsvmap; /* offset to memory reserve map */ - fdt32_t version; /* format version */ - fdt32_t last_comp_version; /* last compatible version */ + fdt32_t magic; /* magic word FDT_MAGIC */ + fdt32_t totalsize; /* total size of DT block */ + fdt32_t off_dt_struct; /* offset to structure */ + fdt32_t off_dt_strings; /* offset to strings */ + fdt32_t off_mem_rsvmap; /* offset to memory reserve map */ + fdt32_t version; /* format version */ + fdt32_t last_comp_version; /* last compatible version */ - /* version 2 fields below */ - fdt32_t boot_cpuid_phys; /* Which physical CPU id we're - booting on */ - /* version 3 fields below */ - fdt32_t size_dt_strings; /* size of the strings block */ + /* version 2 fields below */ + fdt32_t boot_cpuid_phys; /* Which physical CPU id we're + booting on */ + /* version 3 fields below */ + fdt32_t size_dt_strings; /* size of the strings block */ - /* version 17 fields below */ - fdt32_t size_dt_struct; /* size of the structure block */ + /* version 17 fields below */ + fdt32_t size_dt_struct; /* size of the structure block */ }; struct fdt_reserve_entry { - fdt64_t address; - fdt64_t size; + fdt64_t address; + fdt64_t size; }; struct fdt_node_header { - fdt32_t tag; - char name[0]; + fdt32_t tag; + char name[0]; }; struct fdt_property { - fdt32_t tag; - fdt32_t len; - fdt32_t nameoff; - char data[0]; + fdt32_t tag; + fdt32_t len; + fdt32_t nameoff; + char data[0]; }; #endif /* !__ASSEMBLY */ -#define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ -#define FDT_TAGSIZE sizeof(fdt32_t) +#define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ +#define FDT_TAGSIZE sizeof(fdt32_t) -#define FDT_BEGIN_NODE 0x1 /* Start node: full name */ -#define FDT_END_NODE 0x2 /* End node */ -#define FDT_PROP 0x3 /* Property: name off, - size, content */ -#define FDT_NOP 0x4 /* nop */ -#define FDT_END 0x9 +#define FDT_BEGIN_NODE 0x1 /* Start node: full name */ +#define FDT_END_NODE 0x2 /* End node */ +#define FDT_PROP 0x3 /* Property: name off, + size, content */ +#define FDT_NOP 0x4 /* nop */ +#define FDT_END 0x9 -#define FDT_V1_SIZE (7*sizeof(fdt32_t)) -#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(fdt32_t)) -#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(fdt32_t)) -#define FDT_V16_SIZE FDT_V3_SIZE -#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) +#define FDT_V1_SIZE (7*sizeof(fdt32_t)) +#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(fdt32_t)) +#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(fdt32_t)) +#define FDT_V16_SIZE FDT_V3_SIZE +#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) #endif /* _FDT_H */ diff --git a/components/drivers/tty/pty.c b/components/drivers/tty/pty.c index b3e6e7519a..34b366f399 100644 --- a/components/drivers/tty/pty.c +++ b/components/drivers/tty/pty.c @@ -308,7 +308,7 @@ static int ptmx_register(void) level = rt_hw_interrupt_disable(); RT_ASSERT(ptm_drv->init_flag == TTY_INIT_FLAG_NONE); - + device = &(ptm_drv->parent); device->type = RT_Device_Class_Char; @@ -348,7 +348,6 @@ static int ptmx_register(void) } tty_initstack(ptm_drv->head); - rt_spin_lock_init(&ptm_drv->spinlock); ptm_drv->pgrp = -1; ptm_drv->session = -1; ptm_drv->foreground = RT_NULL; |
