Merge pull request #3034 from jepler/terminology-cleanup6.0.0-alpha.0

M/S Terminology cleanup

32 files changed, 55 insertions, 58 deletions

diff --git a/ports/atmel-samd/boards/bdmicro_vina_m0/mpconfigboard.mk b/ports/atmel-samd/boards/bdmicro_vina_m0/mpconfigboard.mk
index 5a47a5890..a36966b87 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bdmicro_vina_m0/mpconfigboard.mk
@@ -12,7 +12,7 @@ EXTERNAL_FLASH_DEVICES = "MX25L51245G"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
 
 CFLAGS_INLINE_LIMIT = 60
diff --git a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
index a71728e2d..da5f1ffac 100755
--- a/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitbrains_basic_m0/mpconfigboard.mk
@@ -13,5 +13,5 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
index cdbdf44f8..81391b953 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
@@ -14,7 +14,7 @@ LONGINT_IMPL = MPZ
 # Make room for frozen libs.
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 
 SUPEROPT_GC = 0
 CFLAGS_INLINE_LIMIT = 55
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
index 46a245e60..7aa45eb39 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -15,7 +15,7 @@ LONGINT_IMPL = NONE
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_PIXELBUF = 1
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
diff --git a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
index 4220aa77f..863b97d31 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.mk
@@ -14,7 +14,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = NONE
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_RTC = 0
 # So not all of displayio, sorry!
diff --git a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
index 199cef362..cec87f2bf 100644
--- a/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express/mpconfigboard.mk
@@ -13,7 +13,7 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
 
 CFLAGS_INLINE_LIMIT = 60
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
index d5e03b49d..9e27ec7b4 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
@@ -15,7 +15,7 @@ LONGINT_IMPL = MPZ
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_GAMEPAD = 0
 CFLAGS_INLINE_LIMIT = 50
 
diff --git a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
index a94dd3c4e..8bd4b818d 100644
--- a/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_supersized/mpconfigboard.mk
@@ -13,7 +13,7 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 # supersized, not ultra-supersized
 CIRCUITPY_VECTORIO = 0
 
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
index a8390fd97..15c5ad817 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_COUNTIO = 0
diff --git a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
index 812c208cc..09420ed3d 100644
--- a/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/itsybitsy_m0_express/mpconfigboard.mk
@@ -15,7 +15,7 @@ CIRCUITPY_BITBANG_APA102 = 1
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_RTC = 0
 # too itsy bitsy for all of displayio
 CIRCUITPY_VECTORIO = 0
diff --git a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
index 588e50ee1..e3948565d 100644
--- a/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/metro_m0_express/mpconfigboard.mk
@@ -12,7 +12,7 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
 
 CFLAGS_INLINE_LIMIT = 60
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 864d31909..b6490433e 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NETWORK = 0
 CIRCUITPY_PIXELBUF = 0
diff --git a/ports/atmel-samd/boards/shirtty/mpconfigboard.mk b/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
index 295ba4bce..a04e09769 100644
--- a/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/shirtty/mpconfigboard.mk
@@ -9,7 +9,7 @@ CHIP_FAMILY = samd21
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
-CIRCUITPY_I2CSLAVE = 1
+CIRCUITPY_I2CPERIPHERAL = 1
 CIRCUITPY_TOUCHIO = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
index 08f8d431e..eae50d70b 100644
--- a/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/snekboard/mpconfigboard.mk
@@ -13,7 +13,7 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
 
 CFLAGS_INLINE_LIMIT = 60
diff --git a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
index 7a9b44e4c..c17600fc7 100755
--- a/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_redboard_turbo/mpconfigboard.mk
@@ -12,7 +12,7 @@ EXTERNAL_FLASH_DEVICES = "W25Q32FV"
 LONGINT_IMPL = MPZ
 
 CIRCUITPY_BITBANGIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_VECTORIO = 0
 
 CFLAGS_INLINE_LIMIT = 60
diff --git a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
index c4b1f6d5a..6f3febfe5 100644
--- a/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/stringcar_m0_express/mpconfigboard.mk
@@ -16,7 +16,7 @@ CIRCUITPY_BITBANG_APA102 = 1
 
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_VECTORIO = 0
 
diff --git a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
index 46f727131..9e0621810 100644
--- a/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/trinket_m0_haxpress/mpconfigboard.mk
@@ -15,6 +15,6 @@ CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_COUNTIO = 0
 CIRCUITPY_RTC = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 
 SUPEROPT_GC = 0
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index 1c4336907..d641a89eb 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -21,7 +21,7 @@ CIRCUITPY_DISPLAYIO = 1
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_PIXELBUF = 0
 CIRCUITPY_RTC = 0
diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
index de9b61764..e06a2af7e 100644
--- a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
@@ -19,12 +19,11 @@ CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_BITBANGIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_BLEIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NETWORK = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
index e96497b3e..11592073f 100644
--- a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -22,7 +22,7 @@ CIRCUITPY_BLEIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GAMEPAD = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NETWORK = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_RGBMATRIX = 0
diff --git a/ports/atmel-samd/common-hal/i2cslave/I2CSlave.c b/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c
index 79c1449e2..84642d404 100644
--- a/ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
+++ b/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.c
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#include "shared-bindings/i2cslave/I2CSlave.h"
+#include "shared-bindings/i2cperipheral/I2CPeripheral.h"
 #include "common-hal/busio/I2C.h"
 
 #include "lib/utils/interrupt_char.h"
@@ -35,7 +35,7 @@
 #include "hal/include/hal_gpio.h"
 #include "peripherals/samd/sercom.h"
 
-void common_hal_i2cslave_i2c_slave_construct(i2cslave_i2c_slave_obj_t *self,
+void common_hal_i2cperipheral_i2c_peripheral_construct(i2cperipheral_i2c_peripheral_obj_t *self,
         const mcu_pin_obj_t *scl, const mcu_pin_obj_t *sda,
         uint8_t *addresses, unsigned int num_addresses, bool smbus) {
     uint8_t sercom_index;
@@ -87,19 +87,19 @@ void common_hal_i2cslave_i2c_slave_construct(i2cslave_i2c_slave_obj_t *self,
 
     if (smbus) {
         sercom->I2CS.CTRLA.bit.LOWTOUTEN = 1; // Errata 12003
-        sercom->I2CS.CTRLA.bit.SEXTTOEN = 1; // Slave SCL Low Extend/Cumulative Time-Out 25ms
+        sercom->I2CS.CTRLA.bit.SEXTTOEN = 1; // SCL Low Extend/Cumulative Time-Out 25ms
     }
     sercom->I2CS.CTRLA.bit.SCLSM = 0; // Clock stretch before ack
-    sercom->I2CS.CTRLA.bit.MODE = 0x04; // Slave mode
+    sercom->I2CS.CTRLA.bit.MODE = 0x04; // Device mode
     sercom->I2CS.CTRLA.bit.ENABLE = 1;
 }
 
-bool common_hal_i2cslave_i2c_slave_deinited(i2cslave_i2c_slave_obj_t *self) {
+bool common_hal_i2cperipheral_i2c_peripheral_deinited(i2cperipheral_i2c_peripheral_obj_t *self) {
     return self->sda_pin == NO_PIN;
 }
 
-void common_hal_i2cslave_i2c_slave_deinit(i2cslave_i2c_slave_obj_t *self) {
-    if (common_hal_i2cslave_i2c_slave_deinited(self)) {
+void common_hal_i2cperipheral_i2c_peripheral_deinit(i2cperipheral_i2c_peripheral_obj_t *self) {
+    if (common_hal_i2cperipheral_i2c_peripheral_deinited(self)) {
         return;
     }
 
@@ -111,7 +111,7 @@ void common_hal_i2cslave_i2c_slave_deinit(i2cslave_i2c_slave_obj_t *self) {
     self->scl_pin = NO_PIN;
 }
 
-static int i2c_slave_check_error(i2cslave_i2c_slave_obj_t *self, bool raise) {
+static int i2c_peripheral_check_error(i2cperipheral_i2c_peripheral_obj_t *self, bool raise) {
     if (!self->sercom->I2CS.INTFLAG.bit.ERROR) {
         return 0;
     }
@@ -130,9 +130,9 @@ static int i2c_slave_check_error(i2cslave_i2c_slave_obj_t *self, bool raise) {
     return -err;
 }
 
-int common_hal_i2cslave_i2c_slave_is_addressed(i2cslave_i2c_slave_obj_t *self, uint8_t *address, bool *is_read, bool *is_restart)
+int common_hal_i2cperipheral_i2c_peripheral_is_addressed(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t *address, bool *is_read, bool *is_restart)
 {
-    int err = i2c_slave_check_error(self, false);
+    int err = i2c_peripheral_check_error(self, false);
     if (err) {
         return err;
     }
@@ -149,22 +149,22 @@ int common_hal_i2cslave_i2c_slave_is_addressed(i2cslave_i2c_slave_obj_t *self, u
 
     for (unsigned int i = 0; i < self->num_addresses; i++) {
         if (*address == self->addresses[i]) {
-            common_hal_i2cslave_i2c_slave_ack(self, true);
+            common_hal_i2cperipheral_i2c_peripheral_ack(self, true);
             return 1;
         }
     }
 
     // This should clear AMATCH, but it doesn't...
-    common_hal_i2cslave_i2c_slave_ack(self, false);
+    common_hal_i2cperipheral_i2c_peripheral_ack(self, false);
     return 0;
 }
 
-int common_hal_i2cslave_i2c_slave_read_byte(i2cslave_i2c_slave_obj_t *self, uint8_t *data) {
+int common_hal_i2cperipheral_i2c_peripheral_read_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t *data) {
     for (int t = 0; t < 100 && !self->sercom->I2CS.INTFLAG.reg; t++) {
         mp_hal_delay_us(10);
     }
 
-    i2c_slave_check_error(self, true);
+    i2c_peripheral_check_error(self, true);
 
     if (!self->sercom->I2CS.INTFLAG.bit.DRDY ||
         self->sercom->I2CS.INTFLAG.bit.PREC ||
@@ -176,12 +176,12 @@ int common_hal_i2cslave_i2c_slave_read_byte(i2cslave_i2c_slave_obj_t *self, uint
     return 1;
 }
 
-int common_hal_i2cslave_i2c_slave_write_byte(i2cslave_i2c_slave_obj_t *self, uint8_t data) {
+int common_hal_i2cperipheral_i2c_peripheral_write_byte(i2cperipheral_i2c_peripheral_obj_t *self, uint8_t data) {
     for (int t = 0; !self->sercom->I2CS.INTFLAG.reg && t < 100; t++) {
         mp_hal_delay_us(10);
     }
 
-    i2c_slave_check_error(self, true);
+    i2c_peripheral_check_error(self, true);
 
     if (self->sercom->I2CS.INTFLAG.bit.PREC) {
         return 0;
@@ -203,12 +203,12 @@ int common_hal_i2cslave_i2c_slave_write_byte(i2cslave_i2c_slave_obj_t *self, uin
     return 1;
 }
 
-void common_hal_i2cslave_i2c_slave_ack(i2cslave_i2c_slave_obj_t *self, bool ack) {
+void common_hal_i2cperipheral_i2c_peripheral_ack(i2cperipheral_i2c_peripheral_obj_t *self, bool ack) {
     self->sercom->I2CS.CTRLB.bit.ACKACT = !ack;
     self->sercom->I2CS.CTRLB.bit.CMD = 0x03;
 }
 
-void common_hal_i2cslave_i2c_slave_close(i2cslave_i2c_slave_obj_t *self) {
+void common_hal_i2cperipheral_i2c_peripheral_close(i2cperipheral_i2c_peripheral_obj_t *self) {
     for (int t = 0; !self->sercom->I2CS.INTFLAG.reg && t < 100; t++) {
         mp_hal_delay_us(10);
     }
@@ -218,7 +218,7 @@ void common_hal_i2cslave_i2c_slave_close(i2cslave_i2c_slave_obj_t *self) {
     }
 
     if (!self->sercom->I2CS.STATUS.bit.DIR) {
-        common_hal_i2cslave_i2c_slave_ack(self, false);
+        common_hal_i2cperipheral_i2c_peripheral_ack(self, false);
     } else {
         int i = 0;
         while (self->sercom->I2CS.INTFLAG.reg == SERCOM_I2CS_INTFLAG_DRDY) {
@@ -246,7 +246,7 @@ void common_hal_i2cslave_i2c_slave_close(i2cslave_i2c_slave_obj_t *self) {
 
     if (self->sercom->I2CS.STATUS.bit.CLKHOLD) {
         // Unable to release the clock.
-        // The slave might have to be re-initialized to get unstuck.
+        // The device might have to be re-initialized to get unstuck.
         mp_raise_OSError(MP_EIO);
     }
 }
diff --git a/ports/atmel-samd/common-hal/i2cslave/I2CSlave.h b/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.h
index bf4f877bd..03ae3a288 100644
--- a/ports/atmel-samd/common-hal/i2cslave/I2CSlave.h
+++ b/ports/atmel-samd/common-hal/i2cperipheral/I2CPeripheral.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_SLAVE_H
-#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_SLAVE_H
+#ifndef MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
+#define MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
 
 #include "common-hal/microcontroller/Pin.h"
 #include "py/obj.h"
@@ -40,6 +40,6 @@ typedef struct {
     uint8_t scl_pin;
     uint8_t sda_pin;
     bool writing;
-} i2cslave_i2c_slave_obj_t;
+} i2cperipheral_i2c_peripheral_obj_t;
 
-#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_SLAVE_H
+#endif // MICROPY_INCLUDED_ATMEL_SAMD_COMMON_HAL_BUSIO_I2C_PERIPHERAL_H
diff --git a/ports/atmel-samd/common-hal/i2cperipheral/__init__.c b/ports/atmel-samd/common-hal/i2cperipheral/__init__.c
new file mode 100644
index 000000000..c67511c53
--- /dev/null
+++ b/ports/atmel-samd/common-hal/i2cperipheral/__init__.c
@@ -0,0 +1 @@
+// No i2cperipheral module functions.
diff --git a/ports/atmel-samd/common-hal/i2cslave/__init__.c b/ports/atmel-samd/common-hal/i2cslave/__init__.c
deleted file mode 100644
index f289bbc0e..000000000
--- a/ports/atmel-samd/common-hal/i2cslave/__init__.c
+++ /dev/null
@@ -1 +0,0 @@
-// No i2cslave module functions.
diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
index c60bb83e7..23f60f8a7 100644
--- a/ports/cxd56/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
@@ -14,7 +14,7 @@ CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
 CIRCUITPY_GAMEPAD = 0
 CIRCUITPY_GNSS = 1
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ROTARYIO = 0
diff --git a/ports/esp32s2/mpconfigport.mk b/ports/esp32s2/mpconfigport.mk
index 040022052..ad2310539 100644
--- a/ports/esp32s2/mpconfigport.mk
+++ b/ports/esp32s2/mpconfigport.mk
@@ -22,7 +22,7 @@ CIRCUITPY_DIGITALIO = 1
 CIRCUITPY_BUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_MICROCONTROLLER = 1
 CIRCUITPY_NVM = 0
 CIRCUITPY_PULSEIO = 0
diff --git a/ports/litex/mpconfigport.mk b/ports/litex/mpconfigport.mk
index 004930ba7..311c87b5d 100644
--- a/ports/litex/mpconfigport.mk
+++ b/ports/litex/mpconfigport.mk
@@ -20,7 +20,7 @@ CIRCUITPY_BOARD = 0
 CIRCUITPY_BUSIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PULSEIO = 0
 CIRCUITPY_ROTARYIO = 0
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 49d998508..12f34343b 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -22,7 +22,7 @@ INTERNAL_FLASH_FILESYSTEM = 1
 CIRCUITPY_AUDIOIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_COUNTIO = 0
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.mk b/ports/nrf/boards/pca10100/mpconfigboard.mk
index 715b65e63..385870a65 100644
--- a/ports/nrf/boards/pca10100/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10100/mpconfigboard.mk
@@ -14,7 +14,7 @@ CIRCUITPY_COUNTIO = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_FREQUENCYIO = 0
-CIRCUITPY_I2CSLAVE = 0
+CIRCUITPY_I2CPERIPHERAL = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_PIXELBUF  = 0
diff --git a/ports/nrf/mpconfigport.mk b/ports/nrf/mpconfigport.mk
index dda9b2436..ed689545d 100644
--- a/ports/nrf/mpconfigport.mk
+++ b/ports/nrf/mpconfigport.mk
@@ -25,8 +25,8 @@ CIRCUITPY_AUDIOPWMIO ?= 1
 
 CIRCUITPY_BLEIO ?= 1
 
-# No I2CSlave implementation
-CIRCUITPY_I2CSLAVE = 0
+# No I2CPeripheral implementation
+CIRCUITPY_I2CPERIPHERAL = 0
 
 CIRCUITPY_RTC ?= 1
 
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 7b720d156..896d78bba 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -14,7 +14,7 @@ ifeq ($(MCU_SERIES),F4)
 	CIRCUITPY_AUDIOIO ?= 0
 	CIRCUITPY_COUNTIO ?= 0
 	CIRCUITPY_FREQUENCYIO ?= 0
-	CIRCUITPY_I2CSLAVE ?= 0
+	CIRCUITPY_I2CPERIPHERAL ?= 0
 	CIRCUITPY_NVM ?= 0
 	CIRCUITPY_ROTARYIO ?= 0
 	CIRCUITPY_RTC ?= 0
@@ -29,7 +29,7 @@ ifeq ($(MCU_SERIES),H7)
 	CIRCUITPY_AUDIOIO ?= 0
 	CIRCUITPY_COUNTIO ?= 0
 	CIRCUITPY_FREQUENCYIO ?= 0
-	CIRCUITPY_I2CSLAVE ?= 0
+	CIRCUITPY_I2CPERIPHERAL ?= 0
 	CIRCUITPY_NEOPIXEL_WRITE ?= 0
 	CIRCUITPY_NVM ?= 0
 	CIRCUITPY_PULSEIO ?= 0
@@ -46,7 +46,7 @@ ifeq ($(MCU_SERIES),F7)
 	CIRCUITPY_AUDIOIO ?= 0
 	CIRCUITPY_COUNTIO ?= 0
 	CIRCUITPY_FREQUENCYIO ?= 0
-	CIRCUITPY_I2CSLAVE ?= 0
+	CIRCUITPY_I2CPERIPHERAL ?= 0
 	CIRCUITPY_NEOPIXEL_WRITE ?= 0
 	CIRCUITPY_NVM ?= 0
 	CIRCUITPY_ROTARYIO ?= 0
diff --git a/ports/unix/Makefile b/ports/unix/Makefile
index 63c4980c3..5d4b168fe 100644
--- a/ports/unix/Makefile
+++ b/ports/unix/Makefile
@@ -161,8 +161,6 @@ PY_EXTMOD_O_BASENAME += \
 	extmod/machine_pinbase.o \
 	extmod/machine_signal.o \
 	extmod/machine_pulse.o \
-	extmod/machine_i2c.o \
-	extmod/machine_spi.o
 
 LIB_SRC_C = $(addprefix lib/,\
 	$(LIB_SRC_C_EXTRA) \