TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

extmod/modmachine: Clean up decls of machine types to use common ones.

Browse Source 
The machine_i2c_type, machine_spi_type and machine_timer_type symbols are
already declared in extmod/modmachine.h and should not be declared anywhere
else.

Also move declarations of machine_pin_type and machine_rtc_type to the
common header in extmod.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2023-10-26 11:39:40 +11:00
parent 5b4a2baff6
commit 90023b4dcf
59 changed files with 44 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/samd/machine_i2c.c
View File

@@ -32,7 +32,7 @@
#include "py/mphal.h"
#include "py/mperrno.h"
#include "extmod/machine_i2c.h"
#include "modmachine.h"
#include "extmod/modmachine.h"
#include "samd_soc.h"
#include "pin_af.h"
#include "clock_config.h"

2
ports/samd/machine_rtc.c
View File

@@ -27,8 +27,8 @@
#include "py/runtime.h"
#include "shared/timeutils/timeutils.h"
#include "modmachine.h"
#include "py/mphal.h"
#include "extmod/modmachine.h"
#include "sam.h"
#if MICROPY_PY_MACHINE_RTC

2
ports/samd/machine_spi.c
View File

@@ -31,7 +31,7 @@
#include "py/mphal.h"
#include "extmod/machine_spi.h"
#include "modmachine.h"
#include "extmod/modmachine.h"
#include "samd_soc.h"
#include "pin_af.h"
#include "clock_config.h"

11
ports/samd/modmachine.h
View File

@@ -32,17 +32,6 @@
#if MICROPY_PY_MACHINE_DAC
extern const mp_obj_type_t machine_dac_type;
#endif
#if MICROPY_PY_MACHINE_I2C
extern const mp_obj_type_t machine_i2c_type;
#endif
extern const mp_obj_type_t machine_pin_type;
#if MICROPY_PY_MACHINE_SPI
extern const mp_obj_type_t machine_spi_type;
#endif
extern const mp_obj_type_t machine_timer_type;
#if MICROPY_PY_MACHINE_RTC
extern const mp_obj_type_t machine_rtc_type;
#endif
NORETURN mp_obj_t machine_bootloader(size_t n_args, const mp_obj_t *args);

2
ports/samd/pin_af.c
View File

@@ -31,9 +31,9 @@
#include <stdint.h>
#include "string.h"
#include "modmachine.h"
#include "py/runtime.h"
#include "py/misc.h"
#include "extmod/modmachine.h"
#include "pin_af.h"
#include "sam.h"

2
ports/samd/samd_spiflash.c
View File

@@ -31,8 +31,8 @@
#include "py/runtime.h"
#include "py/mphal.h"
#include "extmod/machine_spi.h"
#include "extmod/modmachine.h"
#include "extmod/vfs.h"
#include "modmachine.h"
#include "pin_af.h"
#if MICROPY_HW_SPIFLASH