Skip to content

Commit 69f7356

Browse files
At-ECAt-EC
committed
Remove type_def.h
1 parent 88ba9c9 commit 69f7356

9 files changed

Lines changed: 83 additions & 289 deletions

File tree

‎.github/remote_build/native_gcc/main.c‎

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#include "psm.h"
99
#include "hsm.h"
1010

11-
#ifdef __cplusplus
12-
extern "C" {
13-
#endif
14-
1511
/* The PSM user specific signal */
1612
enum {
1713
PSM_SIGNAL_1 = PSM_SIGNAL_USER_DEFINE,
@@ -24,6 +20,7 @@ enum {
2420
PSM_INST_0 = 0,
2521
PSM_INST_1,
2622
PSM_INST_2,
23+
PSM_INST_NUM,
2724
};
2825

2926
/* The HSM user specific signal */
@@ -43,22 +40,23 @@ enum {
4340
HSM_INST_210,
4441
HSM_INST_10,
4542
HSM_INST_100,
43+
HSM_INST_NUM,
4644
};
4745

4846
static void* psm_state_1(psm_state_input_t input);
4947
static void* psm_state_2(psm_state_input_t input);
5048
static void* psm_state_3(psm_state_input_t input);
51-
static i32_t psm_transducer_handler(const psm_state_t *pStateContext, psm_instance_t from, psm_instance_t to, psm_state_input_t input);
52-
53-
static i32_t hsm_state_0(hsm_state_input_t input);
54-
static i32_t hsm_state_1(hsm_state_input_t input);
55-
static i32_t hsm_state_2(hsm_state_input_t input);
56-
static i32_t hsm_state_20(hsm_state_input_t input);
57-
static i32_t hsm_state_21(hsm_state_input_t input);
58-
static i32_t hsm_state_210(hsm_state_input_t input);
59-
static i32_t hsm_state_10(hsm_state_input_t input);
60-
static i32_t hsm_state_100(hsm_state_input_t input);
61-
static i32_t hsm_transducer_handler(const hsm_state_t *pStateContext, hsm_instance_t from, hsm_instance_t to, hsm_state_input_t input);
49+
static unsigned int psm_transducer_handler(const psm_state_t *pStateContext, psm_instance_t from, psm_instance_t to, psm_state_input_t input);
50+
51+
static unsigned int hsm_state_0(hsm_state_input_t input);
52+
static unsigned int hsm_state_1(hsm_state_input_t input);
53+
static unsigned int hsm_state_2(hsm_state_input_t input);
54+
static unsigned int hsm_state_20(hsm_state_input_t input);
55+
static unsigned int hsm_state_21(hsm_state_input_t input);
56+
static unsigned int hsm_state_210(hsm_state_input_t input);
57+
static unsigned int hsm_state_10(hsm_state_input_t input);
58+
static unsigned int hsm_state_100(hsm_state_input_t input);
59+
static unsigned int hsm_transducer_handler(const hsm_state_t *pStateContext, hsm_instance_t from, hsm_instance_t to, hsm_state_input_t input);
6260

6361
/* The PSM states' init tables */
6462
static psm_state_t g_psm_state_init[] = {
@@ -131,13 +129,13 @@ static hsm_state_manager_t g_hsm_mngr_context = {0u};
131129

132130
int main(void)
133131
{
134-
psm_init(&g_psm_mngr_context, &g_psm_state_init[0], PSM_INST_0, psm_transducer_handler);
132+
psm_init(&g_psm_mngr_context, &g_psm_state_init[0], PSM_INST_NUM, PSM_INST_0, psm_transducer_handler);
135133

136134
psm_state_input_t data = {0};
137135
data.signal = PSM_SIGNAL_1;
138136
psm_activities(&g_psm_mngr_context, data);
139137

140-
hsm_init(&g_hsm_mngr_context, &g_hsm_state_init[0], HSM_INST_210, hsm_transducer_handler);
138+
hsm_init(&g_hsm_mngr_context, &g_hsm_state_init[0], HSM_INST_NUM, HSM_INST_210, hsm_transducer_handler);
141139

142140
hsm_state_input_t input = {0};
143141
input.signal = HSM_SIGNAL_INIT;
@@ -149,7 +147,7 @@ int main(void)
149147
while(1) {};
150148
}
151149

152-
static i32_t psm_transducer_handler(const psm_state_t *pStateContext, psm_instance_t from, psm_instance_t to, psm_state_input_t input)
150+
static unsigned int psm_transducer_handler(const psm_state_t *pStateContext, psm_instance_t from, psm_instance_t to, psm_state_input_t input)
153151
{
154152
if (pStateContext) {
155153
printf("psm_transducer_handler: from %d to %d, signal: %d\n", from, to, input.signal);
@@ -250,15 +248,15 @@ static void* psm_state_3(psm_state_input_t input)
250248
return PSM_ACTION_DONE;
251249
}
252250

253-
static i32_t hsm_transducer_handler(const hsm_state_t *pStateContext, hsm_instance_t from, hsm_instance_t to, hsm_state_input_t input)
251+
static unsigned int hsm_transducer_handler(const hsm_state_t *pStateContext, hsm_instance_t from, hsm_instance_t to, hsm_state_input_t input)
254252
{
255253
if (pStateContext) {
256254
printf("hsm_transducer_handler: from %d to %d, signal: %d\n", from, to, input.signal);
257255
}
258256
return 0;
259257
}
260258

261-
static i32_t hsm_state_0(hsm_state_input_t input)
259+
static unsigned int hsm_state_0(hsm_state_input_t input)
262260
{
263261
switch(input.signal)
264262
{
@@ -293,7 +291,7 @@ static i32_t hsm_state_0(hsm_state_input_t input)
293291
return 0;
294292
}
295293

296-
static i32_t hsm_state_1(hsm_state_input_t input)
294+
static unsigned int hsm_state_1(hsm_state_input_t input)
297295
{
298296
switch(input.signal)
299297
{
@@ -328,7 +326,7 @@ static i32_t hsm_state_1(hsm_state_input_t input)
328326
return 0;
329327
}
330328

331-
static i32_t hsm_state_2(hsm_state_input_t input)
329+
static unsigned int hsm_state_2(hsm_state_input_t input)
332330
{
333331
switch(input.signal)
334332
{
@@ -363,7 +361,7 @@ static i32_t hsm_state_2(hsm_state_input_t input)
363361
return 0;
364362
}
365363

366-
static i32_t hsm_state_20(hsm_state_input_t input)
364+
static unsigned int hsm_state_20(hsm_state_input_t input)
367365
{
368366
switch(input.signal)
369367
{
@@ -398,7 +396,7 @@ static i32_t hsm_state_20(hsm_state_input_t input)
398396
return 0;
399397
}
400398

401-
static i32_t hsm_state_21(hsm_state_input_t input)
399+
static unsigned int hsm_state_21(hsm_state_input_t input)
402400
{
403401
switch(input.signal)
404402
{
@@ -434,7 +432,7 @@ static i32_t hsm_state_21(hsm_state_input_t input)
434432
return 0;
435433
}
436434

437-
static i32_t hsm_state_210(hsm_state_input_t input)
435+
static unsigned int hsm_state_210(hsm_state_input_t input)
438436
{
439437
switch(input.signal)
440438
{
@@ -469,7 +467,7 @@ static i32_t hsm_state_210(hsm_state_input_t input)
469467
return 0;
470468
}
471469

472-
static i32_t hsm_state_10(hsm_state_input_t input)
470+
static unsigned int hsm_state_10(hsm_state_input_t input)
473471
{
474472
switch(input.signal)
475473
{
@@ -504,7 +502,7 @@ static i32_t hsm_state_10(hsm_state_input_t input)
504502
return 0;
505503
}
506504

507-
static i32_t hsm_state_100(hsm_state_input_t input)
505+
static unsigned int hsm_state_100(hsm_state_input_t input)
508506
{
509507
switch(input.signal)
510508
{
@@ -538,7 +536,3 @@ static i32_t hsm_state_100(hsm_state_input_t input)
538536

539537
return 0;
540538
}
541-
542-
#ifdef __cplusplus
543-
}
544-
#endif

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ enum {
7272
PSM_INST_0 = 0,
7373
PSM_INST_1,
7474
PSM_INST_2,
75+
PSM_INST_NUM,
7576
};
7677

7778
/* The PSM states' init tables */
@@ -156,6 +157,7 @@ enum {
156157
HSM_INST_210,
157158
HSM_INST_10,
158159
HSM_INST_100,
160+
HSM_INST_NUM,
159161
};
160162

161163
/* The HSM states' init tables */

‎build_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
#ifndef _BUILD_VERSION_H_
99
#define _BUILD_VERSION_H_
1010

11-
#define AT_FSM_FW_VERSION "1.0.3"
11+
#define AT_FSM_FW_VERSION "1.0.4"
1212

1313
#endif

‎include/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@ target_sources(kernel_include
66
PUBLIC
77
${KERNEL_PATH}/include/hsm.h
88
${KERNEL_PATH}/include/psm.h
9-
${KERNEL_PATH}/include/type_def.h
109
)

‎include/hsm.h‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
#ifndef _HSM_H_
88
#define _HSM_H_
99

10-
#include "type_def.h"
10+
#include <stdint.h>
11+
#include <stdio.h>
12+
#include <string.h>
13+
#include <stdbool.h>
1114

1215
#define EOR_INVALID_ARGUMENT (-1)
1316
#define EOR_INVALID_DATA (-2)
@@ -22,9 +25,9 @@ enum hsm_signal {
2225
HSM_SIGNAL_EXIT,
2326
HSM_SIGNAL_USER_DEFINE,
2427
};
25-
typedef u32_t hsm_signal_t;
28+
typedef unsigned int hsm_signal_t;
2629

27-
typedef u16_t hsm_instance_t;
30+
typedef unsigned short hsm_instance_t;
2831
#define HSM_STATE_INSTANCE_ROOT (0xFFFEu)
2932
#define HSM_STATE_INSTANCE_INVALID (0xFFFFu)
3033

@@ -34,26 +37,26 @@ typedef struct {
3437
void *pUserContext;
3538
} hsm_state_input_t;
3639

37-
typedef i32_t (*pEntryFunc_t)(hsm_state_input_t);
40+
typedef signed int (*pEntryFunc_t)(hsm_state_input_t);
3841

3942
typedef struct hsm_state {
4043
struct hsm_state *pMasterState;
4144

4245
hsm_instance_t instance;
4346

44-
u32_t id;
47+
unsigned int id;
4548

46-
const char_t *pName;
49+
const char *pName;
4750

4851
pEntryFunc_t pEntryFunc;
4952
} hsm_state_t;
5053

51-
typedef i32_t (*pHsmTransducerFunc_t)(const hsm_state_t *, hsm_instance_t, hsm_instance_t, hsm_state_input_t);
54+
typedef signed int (*pHsmTransducerFunc_t)(const hsm_state_t *, hsm_instance_t, hsm_instance_t, hsm_state_input_t);
5255

5356
typedef struct {
5457
const hsm_state_t *pInitState;
5558

56-
u16_t number;
59+
unsigned short number;
5760

5861
hsm_instance_t current;
5962

@@ -62,14 +65,14 @@ typedef struct {
6265
pHsmTransducerFunc_t pTransucerFunc;
6366
} hsm_state_manager_t;
6467

65-
i32_t hsm_init(hsm_state_manager_t *pInitManagerContext, const hsm_state_t *pInitStateList, hsm_instance_t initInstance,
66-
pHsmTransducerFunc_t pTransucerFunc);
67-
i32_t hsm_inst_isInvalid(hsm_state_manager_t *pStateManager, hsm_instance_t instance);
68-
const char_t *hsm_inst_nameGet(hsm_state_manager_t *pStateManager, hsm_instance_t instance);
69-
i32_t hsm_inst_idGet(hsm_state_manager_t *pStateManager, hsm_instance_t instance);
68+
signed int hsm_init(hsm_state_manager_t *pInitManagerContext, const hsm_state_t *pInitStateList, unsigned short number,
69+
hsm_instance_t initInstance, pHsmTransducerFunc_t pTransucerFunc);
70+
signed int hsm_inst_isInvalid(hsm_state_manager_t *pStateManager, hsm_instance_t instance);
71+
const char *hsm_inst_nameGet(hsm_state_manager_t *pStateManager, hsm_instance_t instance);
72+
signed int hsm_inst_idGet(hsm_state_manager_t *pStateManager, hsm_instance_t instance);
7073
hsm_instance_t hsm_inst_middleware_get(hsm_state_manager_t *pStateManager);
7174
hsm_instance_t hsm_inst_current_get(hsm_state_manager_t *pStateManager);
72-
i32_t hsm_activities(hsm_state_manager_t *pStateManager, hsm_state_input_t input);
73-
i32_t hsm_transition(hsm_state_manager_t *pStateManager, hsm_instance_t next);
75+
signed int hsm_activities(hsm_state_manager_t *pStateManager, hsm_state_input_t input);
76+
signed int hsm_transition(hsm_state_manager_t *pStateManager, hsm_instance_t next);
7477

7578
#endif /* _HSM_H_ */

‎include/psm.h‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
#ifndef _PSM_H_
88
#define _PSM_H_
99

10-
#include "type_def.h"
10+
#include <stdint.h>
11+
#include <stdio.h>
12+
#include <string.h>
13+
#include <stdbool.h>
1114

1215
#define EOR_INVALID_ARGUMENT (-1)
1316
#define EOR_INVALID_DATA (-2)
@@ -19,9 +22,9 @@ enum psm_signal {
1922
PSM_SIGNAL_EXIT,
2023
PSM_SIGNAL_USER_DEFINE,
2124
};
22-
typedef u32_t psm_signal_t;
25+
typedef unsigned int psm_signal_t;
2326

24-
typedef u16_t psm_instance_t;
27+
typedef unsigned short psm_instance_t;
2528
#define PSM_STATE_INSTANCE_INVALID (0xFFFFu)
2629
#define PSM_FAULT_ERROR (0xFFFFFFFFu)
2730
#define PSM_ACTION_DONE (NULL)
@@ -36,19 +39,19 @@ typedef void *(*pPsmEntryFunc_t)(psm_state_input_t);
3639
typedef struct psm_state {
3740
psm_instance_t instance;
3841

39-
u32_t id;
42+
unsigned int id;
4043

41-
const char_t *pName;
44+
const char *pName;
4245

4346
pPsmEntryFunc_t pEntryFunc;
4447
} psm_state_t;
4548

46-
typedef i32p_t (*pPsmTransducerFunc_t)(const psm_state_t *, psm_instance_t, psm_instance_t, psm_state_input_t);
49+
typedef _i32p_t (*pPsmTransducerFunc_t)(const psm_state_t *, psm_instance_t, psm_instance_t, psm_state_input_t);
4750

4851
typedef struct {
4952
const psm_state_t *pInitState;
5053

51-
u16_t number;
54+
unsigned short number;
5255

5356
psm_instance_t previous;
5457

@@ -59,13 +62,13 @@ typedef struct {
5962
pPsmTransducerFunc_t pTransucerFunc;
6063
} psm_state_manager_t;
6164

62-
i32_t psm_init(psm_state_manager_t *pInitManager, const psm_state_t *pInitStateList, psm_instance_t initInstance,
63-
pPsmTransducerFunc_t pTransucerFunc);
64-
i32_t psm_state_inst_isInvalid(psm_state_manager_t *pStateManager, psm_instance_t instance);
65-
const char_t *psm_state_nameGet(psm_state_manager_t *pStateManager, psm_instance_t instance);
66-
i32_t psm_state_idGet(psm_state_manager_t *pStateManager, psm_instance_t instance);
65+
signed int psm_init(psm_state_manager_t *pInitManager, const psm_state_t *pInitStateList, unsigned short number,
66+
psm_instance_t initInstance, pPsmTransducerFunc_t pTransucerFunc);
67+
signed int psm_state_inst_isInvalid(psm_state_manager_t *pStateManager, psm_instance_t instance);
68+
const char *psm_state_nameGet(psm_state_manager_t *pStateManager, psm_instance_t instance);
69+
signed int psm_state_idGet(psm_state_manager_t *pStateManager, psm_instance_t instance);
6770
psm_instance_t psm_inst_current_get(psm_state_manager_t *pStateManager);
68-
i32_t psm_activities(psm_state_manager_t *pStateManager, psm_state_input_t input);
71+
signed int psm_activities(psm_state_manager_t *pStateManager, psm_state_input_t input);
6972
void *psm_transition(psm_state_manager_t *pStateManager, psm_instance_t next);
7073

7174
#endif /* _PSM_H_ */

0 commit comments

Comments
 (0)