Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tools-mirror
Micropython
提交
6d3c5e43
M
Micropython
项目概览
tools-mirror
/
Micropython
12 个月 前同步成功
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
Micropython
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6d3c5e43
编写于
4月 26, 2014
作者:
D
Damien George
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add ARRAY_SIZE macro, and use it where possible.
上级
d139c489
变更
28
隐藏空白更改
内联
并排
Showing
28 changed file
with
63 addition
and
59 deletion
+63
-59
py/builtin.c
py/builtin.c
+1
-1
py/builtintables.c
py/builtintables.c
+4
-4
py/compile.c
py/compile.c
+2
-2
py/emitinlinethumb.c
py/emitinlinethumb.c
+2
-2
py/misc.h
py/misc.h
+5
-0
py/modarray.c
py/modarray.c
+2
-2
py/modcmath.c
py/modcmath.c
+2
-2
py/modcollections.c
py/modcollections.c
+2
-2
py/modio.c
py/modio.c
+2
-2
py/modmath.c
py/modmath.c
+2
-2
py/modmicropython.c
py/modmicropython.c
+2
-2
py/modstruct.c
py/modstruct.c
+2
-2
py/modsys.c
py/modsys.c
+2
-2
stmhal/dac.c
stmhal/dac.c
+1
-1
stmhal/extint.c
stmhal/extint.c
+1
-1
stmhal/i2c.c
stmhal/i2c.c
+5
-6
stmhal/led.c
stmhal/led.c
+1
-1
stmhal/main.c
stmhal/main.c
+1
-1
stmhal/modos.c
stmhal/modos.c
+2
-2
stmhal/modpyb.c
stmhal/modpyb.c
+2
-2
stmhal/modstm.c
stmhal/modstm.c
+2
-2
stmhal/modtime.c
stmhal/modtime.c
+2
-2
stmhal/spi.c
stmhal/spi.c
+5
-5
stmhal/timer.c
stmhal/timer.c
+2
-2
stmhal/uart.c
stmhal/uart.c
+3
-3
unix/modffi.c
unix/modffi.c
+2
-2
unix/modsocket.c
unix/modsocket.c
+2
-2
unix/modtime.c
unix/modtime.c
+2
-2
未找到文件。
py/builtin.c
浏览文件 @
6d3c5e43
...
...
@@ -128,7 +128,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(mp_builtin_any_obj, mp_builtin_any);
STATIC
mp_obj_t
mp_builtin_bin
(
mp_obj_t
o_in
)
{
mp_obj_t
args
[]
=
{
MP_OBJ_NEW_QSTR
(
MP_QSTR__brace_open__colon__hash_b_brace_close_
),
o_in
};
return
mp_obj_str_format
(
sizeof
(
args
)
/
sizeof
(
args
[
0
]
),
args
);
return
mp_obj_str_format
(
ARRAY_SIZE
(
args
),
args
);
}
MP_DEFINE_CONST_FUN_OBJ_1
(
mp_builtin_bin_obj
,
mp_builtin_bin
);
...
...
py/builtintables.c
浏览文件 @
6d3c5e43
...
...
@@ -118,8 +118,8 @@ const mp_obj_dict_t mp_builtin_object_dict_obj = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_builtin_object_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_builtin_object_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_builtin_object_table
),
.
alloc
=
ARRAY_SIZE
(
mp_builtin_object_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_builtin_object_table
,
},
};
...
...
@@ -158,8 +158,8 @@ const mp_obj_dict_t mp_builtin_module_dict_obj = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_builtin_module_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_builtin_module_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_builtin_module_table
),
.
alloc
=
ARRAY_SIZE
(
mp_builtin_module_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_builtin_module_table
,
},
};
py/compile.c
浏览文件 @
6d3c5e43
...
...
@@ -86,8 +86,8 @@ STATIC const mp_map_elem_t mp_constants_table[] = {
STATIC
const
mp_map_t
mp_constants_map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_constants_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_constants_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_constants_table
),
.
alloc
=
ARRAY_SIZE
(
mp_constants_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_constants_table
,
};
...
...
py/emitinlinethumb.c
浏览文件 @
6d3c5e43
...
...
@@ -141,7 +141,7 @@ STATIC uint get_arg_reg(emit_inline_asm_t *emit, const char *op, mp_parse_node_t
if
(
MP_PARSE_NODE_IS_ID
(
pn
))
{
qstr
reg_qstr
=
MP_PARSE_NODE_LEAF_ARG
(
pn
);
const
char
*
reg_str
=
qstr_str
(
reg_qstr
);
for
(
uint
i
=
0
;
i
<
sizeof
(
reg_name_table
)
/
sizeof
(
reg_name_table
[
0
]
);
i
++
)
{
for
(
uint
i
=
0
;
i
<
ARRAY_SIZE
(
reg_name_table
);
i
++
)
{
const
reg_name_t
*
r
=
&
reg_name_table
[
i
];
if
(
reg_str
[
0
]
==
r
->
name
[
0
]
&&
reg_str
[
1
]
==
r
->
name
[
1
]
&&
reg_str
[
2
]
==
r
->
name
[
2
]
&&
(
reg_str
[
2
]
==
'\0'
||
reg_str
[
3
]
==
'\0'
))
{
if
(
r
->
reg
>
max_reg
)
{
...
...
@@ -260,7 +260,7 @@ STATIC void emit_inline_thumb_op(emit_inline_asm_t *emit, qstr op, int n_args, m
asm_thumb_b_n
(
emit
->
as
,
label_num
);
}
else
if
(
op_str
[
0
]
==
'b'
&&
op_len
==
3
)
{
uint
cc
=
-
1
;
for
(
uint
i
=
0
;
i
<
(
sizeof
cc_name_table
)
/
(
sizeof
cc_name_table
[
0
]
);
i
++
)
{
for
(
uint
i
=
0
;
i
<
ARRAY_SIZE
(
cc_name_table
);
i
++
)
{
if
(
op_str
[
1
]
==
cc_name_table
[
i
].
name
[
0
]
&&
op_str
[
2
]
==
cc_name_table
[
i
].
name
[
1
])
{
cc
=
cc_name_table
[
i
].
cc
;
}
...
...
py/misc.h
浏览文件 @
6d3c5e43
...
...
@@ -52,6 +52,11 @@ int m_get_total_bytes_allocated(void);
int
m_get_current_bytes_allocated
(
void
);
int
m_get_peak_bytes_allocated
(
void
);
/** array helpers ***********************************************/
// get the number of elements in a fixed-size array
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
/** unichar / UTF-8 *********************************************/
typedef
int
unichar
;
// TODO
...
...
py/modarray.c
浏览文件 @
6d3c5e43
...
...
@@ -14,8 +14,8 @@ STATIC const mp_obj_dict_t mp_module_array_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_array_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_array_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_array_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_array_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_array_globals_table
,
},
};
...
...
py/modcmath.c
浏览文件 @
6d3c5e43
...
...
@@ -116,8 +116,8 @@ STATIC const mp_obj_dict_t mp_module_cmath_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_cmath_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_cmath_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_cmath_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_cmath_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_cmath_globals_table
,
},
};
...
...
py/modcollections.c
浏览文件 @
6d3c5e43
...
...
@@ -16,8 +16,8 @@ STATIC const mp_obj_dict_t mp_module_collections_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_collections_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_collections_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_collections_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_collections_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_collections_globals_table
,
},
};
...
...
py/modio.c
浏览文件 @
6d3c5e43
...
...
@@ -18,8 +18,8 @@ STATIC const mp_obj_dict_t mp_module_io_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_io_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_io_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_io_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_io_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_io_globals_table
,
},
};
...
...
py/modmath.c
浏览文件 @
6d3c5e43
...
...
@@ -145,8 +145,8 @@ STATIC const mp_obj_dict_t mp_module_math_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_math_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_math_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_math_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_math_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_math_globals_table
,
},
};
...
...
py/modmicropython.c
浏览文件 @
6d3c5e43
...
...
@@ -39,8 +39,8 @@ STATIC const mp_obj_dict_t mp_module_micropython_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_micropython_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_micropython_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_micropython_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_micropython_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_micropython_globals_table
,
},
};
...
...
py/modstruct.c
浏览文件 @
6d3c5e43
...
...
@@ -98,8 +98,8 @@ STATIC const mp_obj_dict_t mp_module_struct_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_struct_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_struct_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_struct_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_struct_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_struct_globals_table
,
},
};
...
...
py/modsys.c
浏览文件 @
6d3c5e43
...
...
@@ -49,8 +49,8 @@ STATIC const mp_obj_dict_t mp_module_sys_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_sys_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_sys_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_sys_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_sys_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_sys_globals_table
,
},
};
...
...
stmhal/dac.c
浏览文件 @
6d3c5e43
...
...
@@ -167,7 +167,7 @@ STATIC const mp_arg_parse_t pyb_dac_write_timed_accepted_args[] = {
{
MP_QSTR_freq
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_INT
,
{.
u_int
=
0
}
},
{
MP_QSTR_mode
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
DMA_NORMAL
}
},
};
#define PYB_DAC_WRITE_TIMED_NUM_ARGS
(sizeof(pyb_dac_write_timed_accepted_args) / sizeof(pyb_dac_write_timed_accepted_args[0])
)
#define PYB_DAC_WRITE_TIMED_NUM_ARGS
ARRAY_SIZE(pyb_dac_write_timed_accepted_args
)
mp_obj_t
pyb_dac_write_timed
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
pyb_dac_obj_t
*
self
=
args
[
0
];
...
...
stmhal/extint.c
浏览文件 @
6d3c5e43
...
...
@@ -245,7 +245,7 @@ STATIC const mp_arg_parse_t pyb_extint_make_new_accepted_args[] = {
{
MP_QSTR_pull
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_INT
,
{.
u_int
=
0
}
},
{
MP_QSTR_callback
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
MP_OBJ_NULL
}
},
};
#define PYB_EXTINT_MAKE_NEW_NUM_ARGS
(sizeof(pyb_extint_make_new_accepted_args) / sizeof(pyb_extint_make_new_accepted_args[0])
)
#define PYB_EXTINT_MAKE_NEW_NUM_ARGS
ARRAY_SIZE(pyb_extint_make_new_accepted_args
)
STATIC
mp_obj_t
extint_make_new
(
mp_obj_t
type_in
,
uint
n_args
,
uint
n_kw
,
const
mp_obj_t
*
args
)
{
// type_in == extint_obj_type
...
...
stmhal/i2c.c
浏览文件 @
6d3c5e43
...
...
@@ -157,7 +157,6 @@ STATIC const pyb_i2c_obj_t pyb_i2c_obj[] = {
#endif
{{
&
pyb_i2c_type
},
&
I2CHandle2
}
};
#define PYB_NUM_I2C (sizeof(pyb_i2c_obj) / sizeof(pyb_i2c_obj[0]))
STATIC
void
pyb_i2c_print
(
void
(
*
print
)(
void
*
env
,
const
char
*
fmt
,
...),
void
*
env
,
mp_obj_t
self_in
,
mp_print_kind_t
kind
)
{
pyb_i2c_obj_t
*
self
=
self_in
;
...
...
@@ -183,7 +182,7 @@ STATIC const mp_arg_parse_t pyb_i2c_init_accepted_args[] = {
{
MP_QSTR_baudrate
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
400000
}
},
{
MP_QSTR_gencall
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_BOOL
,
{.
u_bool
=
false
}
},
};
#define PYB_I2C_INIT_NUM_ARGS
(sizeof(pyb_i2c_init_accepted_args) / sizeof(pyb_i2c_init_accepted_args[0])
)
#define PYB_I2C_INIT_NUM_ARGS
ARRAY_SIZE(pyb_i2c_init_accepted_args
)
STATIC
mp_obj_t
pyb_i2c_init_helper
(
const
pyb_i2c_obj_t
*
self
,
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// parse args
...
...
@@ -222,7 +221,7 @@ STATIC mp_obj_t pyb_i2c_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const
machine_int_t
i2c_id
=
mp_obj_get_int
(
args
[
0
])
-
1
;
// check i2c number
if
(
!
(
0
<=
i2c_id
&&
i2c_id
<
PYB_NUM_I2C
&&
pyb_i2c_obj
[
i2c_id
].
i2c
!=
NULL
))
{
if
(
!
(
0
<=
i2c_id
&&
i2c_id
<
ARRAY_SIZE
(
pyb_i2c_obj
)
&&
pyb_i2c_obj
[
i2c_id
].
i2c
!=
NULL
))
{
nlr_raise
(
mp_obj_new_exception_msg_varg
(
&
mp_type_ValueError
,
"I2C bus %d does not exist"
,
i2c_id
+
1
));
}
...
...
@@ -301,7 +300,7 @@ STATIC const mp_arg_parse_t pyb_i2c_send_accepted_args[] = {
{
MP_QSTR_addr
,
MP_ARG_PARSE_INT
,
{.
u_int
=
PYB_I2C_MASTER_ADDRESS
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_I2C_SEND_NUM_ARGS
(sizeof(pyb_i2c_send_accepted_args) / sizeof(pyb_i2c_send_accepted_args[0])
)
#define PYB_I2C_SEND_NUM_ARGS
ARRAY_SIZE(pyb_i2c_send_accepted_args
)
STATIC
mp_obj_t
pyb_i2c_send
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
pyb_i2c_obj_t
*
self
=
args
[
0
];
...
...
@@ -341,7 +340,7 @@ STATIC const mp_arg_parse_t pyb_i2c_recv_accepted_args[] = {
{
MP_QSTR_addr
,
MP_ARG_PARSE_INT
,
{.
u_int
=
PYB_I2C_MASTER_ADDRESS
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_I2C_RECV_NUM_ARGS
(sizeof(pyb_i2c_recv_accepted_args) / sizeof(pyb_i2c_recv_accepted_args[0])
)
#define PYB_I2C_RECV_NUM_ARGS
ARRAY_SIZE(pyb_i2c_recv_accepted_args
)
STATIC
mp_obj_t
pyb_i2c_recv
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
pyb_i2c_obj_t
*
self
=
args
[
0
];
...
...
@@ -386,7 +385,7 @@ STATIC const mp_arg_parse_t pyb_i2c_mem_read_accepted_args[] = {
{
MP_QSTR_memaddr
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_INT
,
{.
u_int
=
0
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_I2C_MEM_READ_NUM_ARGS
(sizeof(pyb_i2c_mem_read_accepted_args) / sizeof(pyb_i2c_mem_read_accepted_args[0])
)
#define PYB_I2C_MEM_READ_NUM_ARGS
ARRAY_SIZE(pyb_i2c_mem_read_accepted_args
)
STATIC
mp_obj_t
pyb_i2c_mem_read
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
pyb_i2c_obj_t
*
self
=
args
[
0
];
...
...
stmhal/led.c
浏览文件 @
6d3c5e43
...
...
@@ -30,7 +30,7 @@ STATIC const pyb_led_obj_t pyb_led_obj[] = {
#endif
#endif
};
#define NUM_LEDS
(sizeof(pyb_led_obj) / sizeof(pyb_led_obj[0])
)
#define NUM_LEDS
ARRAY_SIZE(pyb_led_obj
)
void
led_init
(
void
)
{
/* GPIO structure */
...
...
stmhal/main.c
浏览文件 @
6d3c5e43
...
...
@@ -279,7 +279,7 @@ soft_reset:
MP_OBJ_NEW_SMALL_INT(115200),
};
pyb_uart_global_debug = pyb_uart_type.make_new((mp_obj_t)&pyb_uart_type,
sizeof(args) / sizeof(args[0]
),
ARRAY_SIZE(args
),
0, args);
}
#else
...
...
stmhal/modos.c
浏览文件 @
6d3c5e43
...
...
@@ -167,8 +167,8 @@ STATIC const mp_obj_dict_t os_module_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
os_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
os_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
os_module_globals_table
),
.
alloc
=
ARRAY_SIZE
(
os_module_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
os_module_globals_table
,
},
};
...
...
stmhal/modpyb.c
浏览文件 @
6d3c5e43
...
...
@@ -324,8 +324,8 @@ STATIC const mp_obj_dict_t pyb_module_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
pyb_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
pyb_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
pyb_module_globals_table
),
.
alloc
=
ARRAY_SIZE
(
pyb_module_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
pyb_module_globals_table
,
},
};
...
...
stmhal/modstm.c
浏览文件 @
6d3c5e43
...
...
@@ -105,8 +105,8 @@ STATIC const mp_obj_dict_t stm_module_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
stm_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
stm_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
stm_module_globals_table
),
.
alloc
=
ARRAY_SIZE
(
stm_module_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
stm_module_globals_table
,
},
};
...
...
stmhal/modtime.c
浏览文件 @
6d3c5e43
...
...
@@ -33,8 +33,8 @@ STATIC const mp_obj_dict_t time_module_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
time_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
time_module_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
time_module_globals_table
),
.
alloc
=
ARRAY_SIZE
(
time_module_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
time_module_globals_table
,
},
};
...
...
stmhal/spi.c
浏览文件 @
6d3c5e43
...
...
@@ -158,7 +158,7 @@ STATIC const pyb_spi_obj_t pyb_spi_obj[] = {
{{
&
pyb_spi_type
},
NULL
},
#endif
};
#define PYB_NUM_SPI
(sizeof(pyb_spi_obj) / sizeof(pyb_spi_obj[0])
)
#define PYB_NUM_SPI
ARRAY_SIZE(pyb_spi_obj
)
STATIC
void
pyb_spi_print
(
void
(
*
print
)(
void
*
env
,
const
char
*
fmt
,
...),
void
*
env
,
mp_obj_t
self_in
,
mp_print_kind_t
kind
)
{
pyb_spi_obj_t
*
self
=
self_in
;
...
...
@@ -206,7 +206,7 @@ STATIC const mp_arg_parse_t pyb_spi_init_accepted_args[] = {
{
MP_QSTR_ti
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_BOOL
,
{.
u_bool
=
false
}
},
{
MP_QSTR_crc
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
mp_const_none
}
},
};
#define PYB_SPI_INIT_NUM_ARGS
(sizeof(pyb_spi_init_accepted_args) / sizeof(pyb_spi_init_accepted_args[0])
)
#define PYB_SPI_INIT_NUM_ARGS
ARRAY_SIZE(pyb_spi_init_accepted_args
)
STATIC
mp_obj_t
pyb_spi_init_helper
(
const
pyb_spi_obj_t
*
self
,
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// parse args
...
...
@@ -299,7 +299,7 @@ STATIC const mp_arg_parse_t pyb_spi_send_accepted_args[] = {
{
MP_QSTR_send
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
MP_OBJ_NULL
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_SPI_SEND_NUM_ARGS
(sizeof(pyb_spi_send_accepted_args) / sizeof(pyb_spi_send_accepted_args[0])
)
#define PYB_SPI_SEND_NUM_ARGS
ARRAY_SIZE(pyb_spi_send_accepted_args
)
STATIC
mp_obj_t
pyb_spi_send
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// TODO assumes transmission size is 8-bits wide
...
...
@@ -331,7 +331,7 @@ STATIC const mp_arg_parse_t pyb_spi_recv_accepted_args[] = {
{
MP_QSTR_recv
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
MP_OBJ_NULL
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_SPI_RECV_NUM_ARGS
(sizeof(pyb_spi_recv_accepted_args) / sizeof(pyb_spi_recv_accepted_args[0])
)
#define PYB_SPI_RECV_NUM_ARGS
ARRAY_SIZE(pyb_spi_recv_accepted_args
)
STATIC
mp_obj_t
pyb_spi_recv
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// TODO assumes transmission size is 8-bits wide
...
...
@@ -368,7 +368,7 @@ STATIC const mp_arg_parse_t pyb_spi_send_recv_accepted_args[] = {
{
MP_QSTR_recv
,
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
MP_OBJ_NULL
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_SPI_SEND_RECV_NUM_ARGS
(sizeof(pyb_spi_send_recv_accepted_args) / sizeof(pyb_spi_send_recv_accepted_args[0])
)
#define PYB_SPI_SEND_RECV_NUM_ARGS
ARRAY_SIZE(pyb_spi_send_recv_accepted_args
)
STATIC
mp_obj_t
pyb_spi_send_recv
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// TODO assumes transmission size is 8-bits wide
...
...
stmhal/timer.c
浏览文件 @
6d3c5e43
...
...
@@ -57,7 +57,7 @@ static uint32_t tim3_counter = 0;
// Used to do callbacks to Python code on interrupt
STATIC
pyb_timer_obj_t
*
pyb_timer_obj_all
[
14
];
#define PYB_TIMER_OBJ_ALL_NUM
(sizeof(pyb_timer_obj_all) / sizeof(pyb_timer_obj_all[0])
)
#define PYB_TIMER_OBJ_ALL_NUM
ARRAY_SIZE(pyb_timer_obj_all
)
void
timer_init0
(
void
)
{
tim3_counter
=
0
;
...
...
@@ -180,7 +180,7 @@ STATIC const mp_arg_parse_t pyb_timer_init_accepted_args[] = {
{
MP_QSTR_mode
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
TIM_COUNTERMODE_UP
}
},
{
MP_QSTR_div
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
TIM_CLOCKDIVISION_DIV1
}
},
};
#define PYB_TIMER_INIT_NUM_ARGS
(sizeof(pyb_timer_init_accepted_args) / sizeof(pyb_timer_init_accepted_args[0])
)
#define PYB_TIMER_INIT_NUM_ARGS
ARRAY_SIZE(pyb_timer_init_accepted_args
)
STATIC
mp_obj_t
pyb_timer_init_helper
(
pyb_timer_obj_t
*
self
,
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// parse args
...
...
stmhal/uart.c
浏览文件 @
6d3c5e43
...
...
@@ -231,7 +231,7 @@ STATIC const mp_arg_parse_t pyb_uart_init_accepted_args[] = {
{
MP_QSTR_stop
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
1
}
},
{
MP_QSTR_parity
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
mp_const_none
}
},
};
#define PYB_UART_INIT_NUM_ARGS
(sizeof(pyb_uart_init_accepted_args) / sizeof(pyb_uart_init_accepted_args[0])
)
#define PYB_UART_INIT_NUM_ARGS
ARRAY_SIZE(pyb_uart_init_accepted_args
)
STATIC
mp_obj_t
pyb_uart_init_helper
(
pyb_uart_obj_t
*
self
,
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// parse args
...
...
@@ -331,7 +331,7 @@ STATIC const mp_arg_parse_t pyb_uart_send_accepted_args[] = {
{
MP_QSTR_send
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
MP_OBJ_NULL
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_UART_SEND_NUM_ARGS
(sizeof(pyb_uart_send_accepted_args) / sizeof(pyb_uart_send_accepted_args[0])
)
#define PYB_UART_SEND_NUM_ARGS
ARRAY_SIZE(pyb_uart_send_accepted_args
)
STATIC
mp_obj_t
pyb_uart_send
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// TODO assumes transmission size is 8-bits wide
...
...
@@ -363,7 +363,7 @@ STATIC const mp_arg_parse_t pyb_uart_recv_accepted_args[] = {
{
MP_QSTR_recv
,
MP_ARG_PARSE_REQUIRED
|
MP_ARG_PARSE_OBJ
,
{.
u_obj
=
MP_OBJ_NULL
}
},
{
MP_QSTR_timeout
,
MP_ARG_PARSE_KW_ONLY
|
MP_ARG_PARSE_INT
,
{.
u_int
=
5000
}
},
};
#define PYB_UART_RECV_NUM_ARGS
(sizeof(pyb_uart_recv_accepted_args) / sizeof(pyb_uart_recv_accepted_args[0])
)
#define PYB_UART_RECV_NUM_ARGS
ARRAY_SIZE(pyb_uart_recv_accepted_args
)
STATIC
mp_obj_t
pyb_uart_recv
(
uint
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kw_args
)
{
// TODO assumes transmission size is 8-bits wide
...
...
unix/modffi.c
浏览文件 @
6d3c5e43
...
...
@@ -394,8 +394,8 @@ STATIC const mp_obj_dict_t mp_module_ffi_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_ffi_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_ffi_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_ffi_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_ffi_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_ffi_globals_table
,
},
};
...
...
unix/modsocket.c
浏览文件 @
6d3c5e43
...
...
@@ -378,8 +378,8 @@ STATIC const mp_obj_dict_t mp_module_socket_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_socket_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_socket_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_socket_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_socket_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_socket_globals_table
,
},
};
...
...
unix/modtime.c
浏览文件 @
6d3c5e43
...
...
@@ -63,8 +63,8 @@ STATIC const mp_obj_dict_t mp_module_time_globals = {
.
map
=
{
.
all_keys_are_qstrs
=
1
,
.
table_is_fixed_array
=
1
,
.
used
=
sizeof
(
mp_module_time_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
alloc
=
sizeof
(
mp_module_time_globals_table
)
/
sizeof
(
mp_map_elem_t
),
.
used
=
ARRAY_SIZE
(
mp_module_time_globals_table
),
.
alloc
=
ARRAY_SIZE
(
mp_module_time_globals_table
),
.
table
=
(
mp_map_elem_t
*
)
mp_module_time_globals_table
,
},
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录