py: Be more specific with MP_DECLARE_CONST_FUN_OBJ macros.

In order to have more fine-grained control over how builtin functions are
constructed, the MP_DECLARE_CONST_FUN_OBJ macros are made more specific,
with suffix of _0, _1, _2, _3, _VAR, _VAR_BETEEN or _KW.  These names now
match the MP_DEFINE_CONST_FUN_OBJ macros.

7 files changed, 22 insertions, 22 deletions

diff --git a/extmod/fsusermount.h b/extmod/fsusermount.h
index e1f26f2ce..af6867d23 100644
--- a/extmod/fsusermount.h
+++ b/extmod/fsusermount.h
@@ -57,6 +57,6 @@ typedef struct _fs_user_mount_t {
 fs_user_mount_t *fatfs_mount_mkfs(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args, bool mkfs);
 mp_obj_t fatfs_umount(mp_obj_t bdev_or_path_in);
 
-MP_DECLARE_CONST_FUN_OBJ(fsuser_mount_obj);
-MP_DECLARE_CONST_FUN_OBJ(fsuser_umount_obj);
-MP_DECLARE_CONST_FUN_OBJ(fsuser_mkfs_obj);
+MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mount_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(fsuser_umount_obj);
+MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mkfs_obj);
diff --git a/extmod/machine_pulse.h b/extmod/machine_pulse.h
index 3d5d81c07..cc1c4eda5 100644
--- a/extmod/machine_pulse.h
+++ b/extmod/machine_pulse.h
@@ -32,6 +32,6 @@
 
 mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us);
 
-MP_DECLARE_CONST_FUN_OBJ(machine_time_pulse_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(machine_time_pulse_us_obj);
 
 #endif // __MICROPY_INCLUDED_EXTMOD_MACHINE_PULSE_H__
diff --git a/extmod/machine_spi.h b/extmod/machine_spi.h
index 316d06646..62f42a885 100644
--- a/extmod/machine_spi.h
+++ b/extmod/machine_spi.h
@@ -47,9 +47,9 @@ typedef struct _mp_machine_soft_spi_obj_t {
 
 void mp_machine_soft_spi_transfer(mp_obj_base_t *self, size_t len, const uint8_t *src, uint8_t *dest);
 
-MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_read_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_readinto_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_write_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_machine_spi_write_readinto_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_read_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_machine_spi_readinto_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_machine_spi_write_obj);
+MP_DECLARE_CONST_FUN_OBJ_3(mp_machine_spi_write_readinto_obj);
 
 #endif // MICROPY_INCLUDED_EXTMOD_MACHINE_SPI_H
diff --git a/extmod/misc.h b/extmod/misc.h
index 634ea924d..d7ead0654 100644
--- a/extmod/misc.h
+++ b/extmod/misc.h
@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include "py/runtime.h"
 
-MP_DECLARE_CONST_FUN_OBJ(mp_uos_dupterm_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mp_uos_dupterm_obj);
 
 #if MICROPY_PY_OS_DUPTERM
 void mp_uos_dupterm_tx_strn(const char *str, size_t len);
diff --git a/extmod/modubinascii.h b/extmod/modubinascii.h
index 71dd8a693..33d0f1cbd 100644
--- a/extmod/modubinascii.h
+++ b/extmod/modubinascii.h
@@ -33,10 +33,10 @@ extern mp_obj_t mod_binascii_a2b_base64(mp_obj_t data);
 extern mp_obj_t mod_binascii_b2a_base64(mp_obj_t data);
 extern mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args);
 
-MP_DECLARE_CONST_FUN_OBJ(mod_binascii_hexlify_obj);
-MP_DECLARE_CONST_FUN_OBJ(mod_binascii_unhexlify_obj);
-MP_DECLARE_CONST_FUN_OBJ(mod_binascii_a2b_base64_obj);
-MP_DECLARE_CONST_FUN_OBJ(mod_binascii_b2a_base64_obj);
-MP_DECLARE_CONST_FUN_OBJ(mod_binascii_crc32_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_hexlify_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mod_binascii_unhexlify_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mod_binascii_a2b_base64_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj);
+MP_DECLARE_CONST_FUN_OBJ_VAR_BETWEEN(mod_binascii_crc32_obj);
 
 #endif /* MICROPY_EXTMOD_MODUBINASCII */
diff --git a/extmod/utime_mphal.h b/extmod/utime_mphal.h
index 4f2395a09..c7611e251 100644
--- a/extmod/utime_mphal.h
+++ b/extmod/utime_mphal.h
@@ -27,10 +27,10 @@
 
 #include "py/obj.h"
 
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_sleep_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_sleep_ms_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_sleep_us_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_ms_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_us_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_cpu_obj);
-MP_DECLARE_CONST_FUN_OBJ(mp_utime_ticks_diff_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_ms_obj);
+MP_DECLARE_CONST_FUN_OBJ_1(mp_utime_sleep_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_ms_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_us_obj);
+MP_DECLARE_CONST_FUN_OBJ_0(mp_utime_ticks_cpu_obj);
+MP_DECLARE_CONST_FUN_OBJ_2(mp_utime_ticks_diff_obj);
diff --git a/extmod/vfs_fat_file.h b/extmod/vfs_fat_file.h
index 6d6888955..5c271b6ee 100644
--- a/extmod/vfs_fat_file.h
+++ b/extmod/vfs_fat_file.h
@@ -27,6 +27,6 @@
 extern const byte fresult_to_errno_table[20];
 
 mp_obj_t fatfs_builtin_open(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwargs);
-MP_DECLARE_CONST_FUN_OBJ(mp_builtin_open_obj);
+MP_DECLARE_CONST_FUN_OBJ_KW(mp_builtin_open_obj);
 
 mp_obj_t fat_vfs_listdir(const char *path, bool is_str_type);