atmel-samd: Add preliminary support for UART

Author: turbinenreiter

atmel-samd/Makefile

@@ -106,7 +106,7 @@ CFLAGS_CORTEX_M0 = \
 	-DSYSTICK_MODE \
 	-DEXTINT_CALLBACK_MODE=true \
 	-DUDD_ENABLE \
-	-DUSART_CALLBACK_MODE=true \
+	-DUSART_CALLBACK_MODE=false \
 	-DSPI_CALLBACK_MODE=false \
 	-DI2C_MASTER_CALLBACK_MODE=false \
 	-DDAC_CALLBACK_MODE=false \
@@ -155,7 +155,6 @@ SRC_ASF = $(addprefix asf/sam0/,\
 	drivers/sercom/sercom_interrupt.c \
 	drivers/sercom/spi/spi.c \
 	drivers/sercom/usart/usart.c \
-	drivers/sercom/usart/usart_interrupt.c \
 	drivers/system/clock/clock_samd21_r21_da/clock.c \
 	drivers/system/clock/clock_samd21_r21_da/gclk.c \
 	drivers/system/interrupt/system_interrupt.c   \
@@ -219,6 +218,7 @@ SRC_BINDINGS = \
 	nativeio/I2C.c \
 	nativeio/PWMOut.c \
 	nativeio/SPI.c \
+	nativeio/UART.c \
 	neopixel_write/__init__.c \
 	time/__init__.c
 

atmel-samd/asf/sam0/drivers/sercom/usart/usart.c

@@ -187,7 +187,7 @@ static enum status_code _usart_set_config(
 	}
 
 	/* Set stopbits and enable transceivers */
-	ctrlb =  
+	ctrlb =
 		#ifdef FEATURE_USART_IRDA
 			(config->encoding_format_enable << SERCOM_USART_CTRLB_ENC_Pos) |
 		#endif
@@ -207,18 +207,18 @@ static enum status_code _usart_set_config(
 			ctrla |= SERCOM_USART_CTRLA_TXINV | SERCOM_USART_CTRLA_RXINV;
 		}
 		ctrlb |=  USART_CHARACTER_SIZE_8BIT;
-		
+
 		switch(config->iso7816_config.protocol_t) {
 			case ISO7816_PROTOCOL_T_0:
-				ctrlb |= (uint32_t)config->stopbits;	
+				ctrlb |= (uint32_t)config->stopbits;
 				ctrlc |= SERCOM_USART_CTRLC_GTIME(config->iso7816_config.guard_time) | \
 						(config->iso7816_config.inhibit_nack) | \
 						(config->iso7816_config.successive_recv_nack) | \
 						SERCOM_USART_CTRLC_MAXITER(config->iso7816_config.max_iterations);
-				break;	
+				break;
 			case ISO7816_PROTOCOL_T_1:
 				ctrlb |= USART_STOPBITS_1;
-				break;		
+				break;
 		}
 	} else {
 #endif
@@ -334,8 +334,8 @@ enum status_code usart_init(
 	SercomUsart *const usart_hw = &(module->hw->USART);
 
 	uint32_t sercom_index = _sercom_get_sercom_inst_index(module->hw);
-	uint32_t pm_index, gclk_index; 
-#if (SAML22) || (SAMC20) 
+	uint32_t pm_index, gclk_index;
+#if (SAML22) || (SAMC20)
 	pm_index	= sercom_index + MCLK_APBCMASK_SERCOM0_Pos;
 	gclk_index	= sercom_index + SERCOM0_GCLK_ID_CORE;
 #elif (SAML21) || (SAMR30)
@@ -348,7 +348,7 @@ enum status_code usart_init(
 	}
 #elif (SAMC21)
 	pm_index	= sercom_index + MCLK_APBCMASK_SERCOM0_Pos;
-	
+
 	if (sercom_index == 5){
 		gclk_index	= SERCOM5_GCLK_ID_CORE;
     } else {
@@ -374,7 +374,7 @@ enum status_code usart_init(
 	if (sercom_index == 5) {
 		system_apb_clock_set_mask(SYSTEM_CLOCK_APB_APBD, 1 << pm_index);
 	} else {
-		system_apb_clock_set_mask(SYSTEM_CLOCK_APB_APBC, 1 << pm_index);	
+		system_apb_clock_set_mask(SYSTEM_CLOCK_APB_APBC, 1 << pm_index);
 	}
 #else
 	system_apb_clock_set_mask(SYSTEM_CLOCK_APB_APBC, 1 << pm_index);
@@ -639,8 +639,8 @@ enum status_code usart_read_wait(
  * \param[in]  tx_data  Pointer to data to transmit
  * \param[in]  length   Number of characters to transmit
  *
- * \note If using 9-bit data, the array that *tx_data point to should be defined 
- *       as uint16_t array and should be casted to uint8_t* pointer. Because it 
+ * \note If using 9-bit data, the array that *tx_data point to should be defined
+ *       as uint16_t array and should be casted to uint8_t* pointer. Because it
  *       is an address pointer, the highest byte is not discarded. For example:
  *   \code
           #define TX_LEN 3
@@ -733,8 +733,8 @@ enum status_code usart_write_buffer_wait(
  * \param[out] rx_data  Pointer to receive buffer
  * \param[in]  length   Number of characters to receive
  *
- * \note If using 9-bit data, the array that *rx_data point to should be defined 
- *       as uint16_t array and should be casted to uint8_t* pointer. Because it 
+ * \note If using 9-bit data, the array that *rx_data point to should be defined
+ *       as uint16_t array and should be casted to uint8_t* pointer. Because it
  *       is an address pointer, the highest byte is not discarded. For example:
  *   \code
           #define RX_LEN 3

atmel-samd/boards/feather_m0_flash/pins.c

@@ -10,8 +10,10 @@ STATIC const mp_map_elem_t board_global_dict_table[] = {
   { MP_OBJ_NEW_QSTR(MP_QSTR_SCK), (mp_obj_t)&pin_PB11 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_MOSI), (mp_obj_t)&pin_PB10 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_MISO), (mp_obj_t)&pin_PA12 },
-  { MP_OBJ_NEW_QSTR(MP_QSTR_0RX), (mp_obj_t)&pin_PA11 },
-  { MP_OBJ_NEW_QSTR(MP_QSTR_1TX), (mp_obj_t)&pin_PA10 },
+  { MP_OBJ_NEW_QSTR(MP_QSTR_D0), (mp_obj_t)&pin_PA11 },
+  { MP_OBJ_NEW_QSTR(MP_QSTR_RX), (mp_obj_t)&pin_PA11 },
+  { MP_OBJ_NEW_QSTR(MP_QSTR_D1), (mp_obj_t)&pin_PA10 },
+  { MP_OBJ_NEW_QSTR(MP_QSTR_TX), (mp_obj_t)&pin_PA10 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_SDA), (mp_obj_t)&pin_PA22 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_SCL), (mp_obj_t)&pin_PA23 },
   { MP_OBJ_NEW_QSTR(MP_QSTR_D5), (mp_obj_t)&pin_PA15 },

atmel-samd/boards/metro_m0_flash/mpconfigboard.mk

@@ -1,4 +1,4 @@
-LD_FILE = boards/samd21x18-bootloader-external-flash.ld
+LD_FILE = boards/samd21x18-external-flash.ld
 USB_VID = 0x239A
 USB_PID = 0x8015
 

atmel-samd/common-hal/nativeio/SPI.c

@@ -125,12 +125,12 @@ void common_hal_nativeio_spi_construct(nativeio_spi_obj_t *self,
                              &config_spi_master.pinmux_pad3};
     *pinmuxes[clock_pad] = clock_pinmux;
     self->clock_pin = clock->pin;
-    self->MOSI_pin = 0;
+    self->MOSI_pin = NO_PIN;
     if (!mosi_none) {
         *pinmuxes[mosi_pad] = mosi_pinmux;
         self->MOSI_pin = mosi->pin;
     }
-    self->MISO_pin = 0;
+    self->MISO_pin = NO_PIN;
     if (!miso_none) {
         *pinmuxes[miso_pad] = miso_pinmux;
         self->MISO_pin = miso->pin;