Skip to content

Commit 3e2706a

Browse files
dpgeorgedpgeorge
committed
extmod/modmachine: Consolidate mem, i2c and spi headers to modmachine.h.
The contents of machine_mem.h, machine_i2c.h and machine_spi.h have been moved into extmod/modmachine.h. Signed-off-by: Damien George <damien@micropython.org>
1 parent 6989aba commit 3e2706a

45 files changed

Lines changed: 149 additions & 265 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎drivers/esp-hosted/esp_hosted_hal.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <string.h>
3535

3636
#include "py/runtime.h"
37-
#include "extmod/machine_spi.h"
3837
#include "extmod/modmachine.h"
3938
#ifdef MICROPY_HW_WIFI_LED
4039
#include "led.h"

‎drivers/ninaw10/nina_wifi_bsp.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include <string.h>
3636

3737
#include "py/runtime.h"
38-
#include "extmod/machine_spi.h"
3938
#include "extmod/modmachine.h"
4039

4140
#include "nina_bsp.h"

‎extmod/machine_i2c.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "py/mperrno.h"
3232
#include "py/mphal.h"
3333
#include "py/runtime.h"
34-
#include "extmod/machine_i2c.h"
34+
#include "extmod/modmachine.h"
3535

3636
#define SOFT_I2C_DEFAULT_TIMEOUT_US (50000) // 50ms
3737

‎extmod/machine_i2c.h‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎extmod/machine_mem.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626

2727
#include "py/runtime.h"
28-
#include "extmod/machine_mem.h"
28+
#include "extmod/modmachine.h"
2929

3030
#if MICROPY_PY_MACHINE
3131

‎extmod/machine_mem.h‎

Lines changed: 0 additions & 49 deletions
This file was deleted.

‎extmod/machine_spi.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#if MICROPY_PY_MACHINE_SPI || MICROPY_PY_MACHINE_SOFTSPI
3333

34-
#include "extmod/machine_spi.h"
34+
#include "extmod/modmachine.h"
3535

3636
// if a port didn't define MSB/LSB constants then provide them
3737
#ifndef MICROPY_PY_MACHINE_SPI_MSB

‎extmod/machine_spi.h‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)