PowLu/TencentOS-tiny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix "redefinition of typedef 'k_task_t'"

Browse Source 
1. remove re-typedef of k_task_st to k_task_t in tos_task.h
2. add "typedef struct k_task_st k_task_t" to tos_ktypes.h
This commit is contained in:
daishengdong
2020-03-12 11:04:17 +08:00
parent 6d0c6d3721
commit 441f57c837
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fs/vfs/include/tos_vfs_device.h
View File

@@ -17,7 +17,7 @@ typedef struct vfs_char_device_operations_st {
int (*resume) (void); int (*resume) (void);
} vfs_chrdev_ops_t; } vfs_chrdev_ops_t;
typedef struct vfs_block_device_geometry_t { typedef struct vfs_block_device_geometry_st {
int is_available; int is_available;
uint32_t sector_size; uint32_t sector_size;
uint32_t nsectors; uint32_t nsectors;

36
kernel/core/include/tos_ktypes.h
View File

@@ -21,34 +21,36 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
typedef uint8_t k_prio_t; typedef uint8_t k_prio_t;
typedef uint8_t k_stack_t; typedef uint8_t k_stack_t;
typedef uint8_t k_task_state_t; typedef uint8_t k_task_state_t;
typedef struct k_task_st k_task_t;
typedef uint8_t k_nesting_t; typedef uint8_t k_nesting_t;
typedef uint16_t k_opt_t; typedef uint16_t k_opt_t;
typedef uint16_t k_sem_cnt_t;
typedef uint32_t k_event_flag_t;
typedef uint16_t k_barrier_cnt_t;
typedef uint16_t k_countdownlatch_cnt_t;
typedef uint32_t k_time_t; typedef uint16_t k_sem_cnt_t;
typedef uint32_t k_timeslice_t; typedef uint32_t k_event_flag_t;
typedef uint16_t k_barrier_cnt_t;
typedef uint16_t k_countdownlatch_cnt_t;
typedef uint32_t k_cycle_t; typedef uint32_t k_time_t;
typedef uint32_t k_timeslice_t;
typedef uint32_t k_cycle_t;
#if TOS_CFG_CPU_DATA_SIZE == CPU_WORD_SIZE_08 #if TOS_CFG_CPU_DATA_SIZE == CPU_WORD_SIZE_08
typedef uint32_t k_tick_t; typedef uint32_t k_tick_t;
#else #else
typedef uint64_t k_tick_t; typedef uint64_t k_tick_t;
#endif #endif
#define K_TRUE (1u) #define K_TRUE (1u)
#define K_FALSE (0u) #define K_FALSE (0u)
#ifndef K_NULL #ifndef K_NULL
#define K_NULL 0 #define K_NULL 0
#endif #endif
#endif /* _TOS_KTYPES_H_ */ #endif /* _TOS_KTYPES_H_ */

2
kernel/core/include/tos_pend.h
View File

@@ -20,8 +20,6 @@
__CDECLS_BEGIN __CDECLS_BEGIN
typedef struct k_task_st k_task_t;
/** /**
* The reason why we wakeup from a pend. * The reason why we wakeup from a pend.
* when we wakeup, we need to know why. * when we wakeup, we need to know why.

4
kernel/core/include/tos_task.h
View File

@@ -71,7 +71,7 @@ typedef void (*k_task_walker_t)(k_task_t *task);
/** /**
* task control block * task control block
*/ */
typedef struct k_task_st { struct k_task_st {
k_stack_t *sp; /**< task stack pointer. This lady always comes first, we count on her in port_s.S for context switch. */ k_stack_t *sp; /**< task stack pointer. This lady always comes first, we count on her in port_s.S for context switch. */
knl_obj_t knl_obj; /**< just for verification, test whether current object is really a task. */ knl_obj_t knl_obj; /**< just for verification, test whether current object is really a task. */
@@ -130,7 +130,7 @@ typedef struct k_task_st {
k_event_flag_t *flag_match; /**< if we pend an event successfully, flag_match will be set by the event poster, and will be returned k_event_flag_t *flag_match; /**< if we pend an event successfully, flag_match will be set by the event poster, and will be returned
by tos_event_pend to the caller */ by tos_event_pend to the caller */
#endif #endif
} k_task_t; };
/** /**
* @brief Create a task. * @brief Create a task.