Merge pull request adafruit#937 from tannewt/separate_peripherals_lib

Split out the peripherals library in preparation of sharing with MakeCode

Author: dhalbert

.gitmodules

@@ -67,3 +67,6 @@
 [submodule "frozen/Adafruit_CircuitPython_DotStar"]
 	path = frozen/Adafruit_CircuitPython_DotStar
 	url = https://github.com/adafruit/Adafruit_CircuitPython_DotStar.git
+[submodule "ports/atmel-samd/peripherals"]
+	path = ports/atmel-samd/peripherals
+	url = https://github.com/adafruit/samd-peripherals.git

ports/atmel-samd/Makefile

@@ -55,6 +55,7 @@ INC += -I. \
        -Iasf4_conf/$(CHIP_FAMILY) \
        -Iboards/$(BOARD) \
        -Iboards/ \
+       -Iperipherals/ \
        -Ifreetouch \
        -I$(BUILD)
 
@@ -248,21 +249,21 @@ SRC_C = \
 	flash_api.c \
 	mphalport.c \
 	reset.c \
-	peripherals/clocks.c \
-	peripherals/dma.c \
-	peripherals/events.c \
-	peripherals/external_interrupts.c \
-	peripherals/sercom.c \
-	peripherals/timers.c \
-	peripherals/$(CHIP_FAMILY)/adc.c \
-	peripherals/$(CHIP_FAMILY)/cache.c \
-	peripherals/$(CHIP_FAMILY)/clocks.c \
-	peripherals/$(CHIP_FAMILY)/dma.c \
-	peripherals/$(CHIP_FAMILY)/events.c \
-	peripherals/$(CHIP_FAMILY)/external_interrupts.c \
-	peripherals/$(CHIP_FAMILY)/pins.c \
-	peripherals/$(CHIP_FAMILY)/sercom.c \
-	peripherals/$(CHIP_FAMILY)/timers.c \
+	peripherals/samd/clocks.c \
+	peripherals/samd/dma.c \
+	peripherals/samd/events.c \
+	peripherals/samd/external_interrupts.c \
+	peripherals/samd/sercom.c \
+	peripherals/samd/timers.c \
+	peripherals/samd/$(CHIP_FAMILY)/adc.c \
+	peripherals/samd/$(CHIP_FAMILY)/cache.c \
+	peripherals/samd/$(CHIP_FAMILY)/clocks.c \
+	peripherals/samd/$(CHIP_FAMILY)/dma.c \
+	peripherals/samd/$(CHIP_FAMILY)/events.c \
+	peripherals/samd/$(CHIP_FAMILY)/external_interrupts.c \
+	peripherals/samd/$(CHIP_FAMILY)/pins.c \
+	peripherals/samd/$(CHIP_FAMILY)/sercom.c \
+	peripherals/samd/$(CHIP_FAMILY)/timers.c \
 	tick.c \
 	usb.c \
 	usb_mass_storage.c \
@@ -402,7 +403,7 @@ ifneq ($(CHIP_VARIANT),SAMD51G18A)
 			audiobusio/__init__.c \
 			audiobusio/I2SOut.c \
 			audiobusio/PDMIn.c
-		SRC_C += peripherals/i2s.c peripherals/$(CHIP_FAMILY)/i2s.c
+		SRC_C += peripherals/samd/i2s.c peripherals/samd/$(CHIP_FAMILY)/i2s.c
 	endif
 endif
 

ports/atmel-samd/audio_dma.c

@@ -25,9 +25,9 @@
  */
 
 #include "audio_dma.h"
-#include "peripherals/clocks.h"
-#include "peripherals/events.h"
-#include "peripherals/dma.h"
+#include "samd/clocks.h"
+#include "samd/events.h"
+#include "samd/dma.h"
 
 #include "shared-bindings/audioio/RawSample.h"
 #include "shared-bindings/audioio/WaveFile.h"

ports/atmel-samd/bindings/samd/Clock.c

@@ -25,7 +25,7 @@
  */
 
 #include "bindings/samd/Clock.h"
-#include "peripherals/clocks.h"
+#include "samd/clocks.h"
 #include "py/obj.h"
 #include "py/objproperty.h"
 #include "py/runtime.h"

ports/atmel-samd/board_busses.c

@@ -30,7 +30,7 @@
 
 #include "shared-bindings/microcontroller/Pin.h"
 #include "mpconfigboard.h"
-#include "peripherals/pins.h"
+#include "samd/pins.h"
 #include "py/runtime.h"
 
 #if !defined(DEFAULT_I2C_BUS_SDA) || !defined(DEFAULT_I2C_BUS_SCL)

ports/atmel-samd/common-hal/analogio/AnalogIn.c

@@ -34,7 +34,7 @@
 #include "py/binary.h"
 #include "py/mphal.h"
 
-#include "peripherals/adc.h"
+#include "samd/adc.h"
 #include "shared-bindings/analogio/AnalogIn.h"
 
 #include "atmel_start_pins.h"

ports/atmel-samd/common-hal/audiobusio/I2SOut.c

@@ -45,12 +45,12 @@
 #include "hpl/pm/hpl_pm_base.h"
 #endif
 
-#include "peripherals/clocks.h"
-#include "peripherals/dma.h"
-#include "peripherals/events.h"
-#include "peripherals/i2s.h"
-#include "peripherals/pins.h"
-#include "peripherals/timers.h"
+#include "samd/clocks.h"
+#include "samd/dma.h"
+#include "samd/events.h"
+#include "samd/i2s.h"
+#include "samd/pins.h"
+#include "samd/timers.h"
 
 #include "audio_dma.h"
 

ports/atmel-samd/common-hal/audiobusio/PDMIn.c

@@ -41,11 +41,11 @@
 #include "hal/include/hal_gpio.h"
 #include "hal/utils/include/utils.h"
 
-#include "peripherals/clocks.h"
-#include "peripherals/events.h"
-#include "peripherals/i2s.h"
-#include "peripherals/pins.h"
-#include "peripherals/dma.h"
+#include "samd/clocks.h"
+#include "samd/events.h"
+#include "samd/i2s.h"
+#include "samd/pins.h"
+#include "samd/dma.h"
 
 #include "audio_dma.h"
 #include "tick.h"

ports/atmel-samd/common-hal/audioio/AudioOut.c

@@ -46,10 +46,10 @@
 
 #include "audio_dma.h"
 
-#include "peripherals/dma.h"
-#include "peripherals/events.h"
-#include "peripherals/pins.h"
-#include "peripherals/timers.h"
+#include "samd/dma.h"
+#include "samd/events.h"
+#include "samd/pins.h"
+#include "samd/timers.h"
 
 void audioout_reset(void) {
 }

ports/atmel-samd/common-hal/busio/I2C.c

@@ -32,7 +32,7 @@
 #include "hal/include/hal_i2c_m_sync.h"
 #include "hal/include/hpl_i2c_m_sync.h"
 
-#include "peripherals/sercom.h"
+#include "samd/sercom.h"
 #include "shared-bindings/microcontroller/__init__.h"