aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/atsamd/serial.c64
-rw-r--r--src/atsamd/timer.c20
-rw-r--r--src/atsamd/usbserial.c91
3 files changed, 90 insertions, 85 deletions
diff --git a/src/atsamd/serial.c b/src/atsamd/serial.c
index 54c3cede..f38fb3d8 100644
--- a/src/atsamd/serial.c
+++ b/src/atsamd/serial.c
@@ -9,6 +9,38 @@
#include "internal.h" // enable_pclock
#include "sched.h" // DECL_INIT
+void
+serial_enable_tx_irq(void)
+{
+ SERCOM0->USART.INTENSET.reg = SERCOM_USART_INTENSET_DRE;
+}
+
+void __visible
+SERCOM0_Handler(void)
+{
+ uint32_t status = SERCOM0->USART.INTFLAG.reg;
+ if (status & SERCOM_USART_INTFLAG_RXC)
+ serial_rx_byte(SERCOM0->USART.DATA.reg);
+ if (status & SERCOM_USART_INTFLAG_DRE) {
+ uint8_t data;
+ int ret = serial_get_tx_byte(&data);
+ if (ret)
+ SERCOM0->USART.INTENCLR.reg = SERCOM_USART_INTENSET_DRE;
+ else
+ SERCOM0->USART.DATA.reg = data;
+ }
+}
+
+// Aliases for irq handler on SAMD51
+void SERCOM0_0_Handler(void)
+ __visible __attribute__((alias("SERCOM0_Handler")));
+void SERCOM0_1_Handler(void)
+ __visible __attribute__((alias("SERCOM0_Handler")));
+void SERCOM0_2_Handler(void)
+ __visible __attribute__((alias("SERCOM0_Handler")));
+void SERCOM0_3_Handler(void)
+ __visible __attribute__((alias("SERCOM0_Handler")));
+
DECL_CONSTANT_STR("RESERVE_PINS_serial", "PA11,PA10");
void
@@ -51,35 +83,3 @@ serial_init(void)
#endif
}
DECL_INIT(serial_init);
-
-void
-serial_enable_tx_irq(void)
-{
- SERCOM0->USART.INTENSET.reg = SERCOM_USART_INTENSET_DRE;
-}
-
-void __visible
-SERCOM0_Handler(void)
-{
- uint32_t status = SERCOM0->USART.INTFLAG.reg;
- if (status & SERCOM_USART_INTFLAG_RXC)
- serial_rx_byte(SERCOM0->USART.DATA.reg);
- if (status & SERCOM_USART_INTFLAG_DRE) {
- uint8_t data;
- int ret = serial_get_tx_byte(&data);
- if (ret)
- SERCOM0->USART.INTENCLR.reg = SERCOM_USART_INTENSET_DRE;
- else
- SERCOM0->USART.DATA.reg = data;
- }
-}
-
-// Aliases for irq handler on SAMD51
-void SERCOM0_0_Handler(void)
- __visible __attribute__((alias("SERCOM0_Handler")));
-void SERCOM0_1_Handler(void)
- __visible __attribute__((alias("SERCOM0_Handler")));
-void SERCOM0_2_Handler(void)
- __visible __attribute__((alias("SERCOM0_Handler")));
-void SERCOM0_3_Handler(void)
- __visible __attribute__((alias("SERCOM0_Handler")));
diff --git a/src/atsamd/timer.c b/src/atsamd/timer.c
index f6b00ab3..a49192b9 100644
--- a/src/atsamd/timer.c
+++ b/src/atsamd/timer.c
@@ -32,6 +32,16 @@ timer_kick(void)
timer_set(timer_read_time() + 50);
}
+// IRQ handler
+void __visible __aligned(16) // aligning helps stabilize perf benchmarks
+TC4_Handler(void)
+{
+ irq_disable();
+ uint32_t next = timer_dispatch_many();
+ timer_set(next);
+ irq_enable();
+}
+
void
timer_init(void)
{
@@ -53,13 +63,3 @@ timer_init(void)
irq_restore(flag);
}
DECL_INIT(timer_init);
-
-// IRQ handler
-void __visible __aligned(16) // aligning helps stabilize perf benchmarks
-TC4_Handler(void)
-{
- irq_disable();
- uint32_t next = timer_dispatch_many();
- timer_set(next);
- irq_enable();
-}
diff --git a/src/atsamd/usbserial.c b/src/atsamd/usbserial.c
index 5e201d1e..6920f4d7 100644
--- a/src/atsamd/usbserial.c
+++ b/src/atsamd/usbserial.c
@@ -58,11 +58,6 @@ static UsbDeviceDescriptor usb_desc[USB_CDC_EP_BULK_IN + 1] = {
} },
};
-
-/****************************************************************
- * Interface
- ****************************************************************/
-
#define EP0 USB->DEVICE.DeviceEndpoint[0]
#define EP_ACM USB->DEVICE.DeviceEndpoint[USB_CDC_EP_ACM]
#define EP_BULKOUT USB->DEVICE.DeviceEndpoint[USB_CDC_EP_BULK_OUT]
@@ -111,6 +106,11 @@ usb_read_packet(uint32_t ep, uint32_t bank, void *data, uint_fast8_t max_len)
return c;
}
+
+/****************************************************************
+ * Interface
+ ****************************************************************/
+
int_fast8_t
usb_read_bulk_out(void *data, uint_fast8_t max_len)
{
@@ -185,45 +185,10 @@ usb_request_bootloader(void)
NVIC_SystemReset();
}
-DECL_CONSTANT_STR("RESERVE_PINS_USB", "PA24,PA25");
-void
-usbserial_init(void)
-{
- // configure usb clock
- enable_pclock(USB_GCLK_ID, ID_USB);
- // configure USBD+ and USBD- pins
- uint32_t ptype = CONFIG_MACH_SAMD21 ? 'G' : 'H';
- gpio_peripheral(GPIO('A', 24), ptype, 0);
- gpio_peripheral(GPIO('A', 25), ptype, 0);
- uint32_t trim = GET_FUSE(USB_FUSES_TRIM);
- uint32_t transp = GET_FUSE(USB_FUSES_TRANSP);
- uint32_t transn = GET_FUSE(USB_FUSES_TRANSN);
- USB->DEVICE.PADCAL.reg = (USB_PADCAL_TRIM(trim) | USB_PADCAL_TRANSP(transp)
- | USB_PADCAL_TRANSN(transn));
- // Enable USB in device mode
- USB->DEVICE.CTRLA.reg = USB_CTRLA_ENABLE;
- USB->DEVICE.DESCADD.reg = (uint32_t)usb_desc;
- EP0.EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE0(1) | USB_DEVICE_EPCFG_EPTYPE1(1);
- EP_ACM.EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE1(4);
- USB->DEVICE.CTRLB.reg = 0;
- // enable irqs
- USB->DEVICE.INTENSET.reg = USB_DEVICE_INTENSET_EORST;
-#if CONFIG_MACH_SAMD21
- NVIC_SetPriority(USB_IRQn, 1);
- NVIC_EnableIRQ(USB_IRQn);
-#elif CONFIG_MACH_SAMD51
- NVIC_SetPriority(USB_0_IRQn, 1);
- NVIC_SetPriority(USB_1_IRQn, 1);
- NVIC_SetPriority(USB_2_IRQn, 1);
- NVIC_SetPriority(USB_3_IRQn, 1);
- NVIC_EnableIRQ(USB_0_IRQn);
- NVIC_EnableIRQ(USB_1_IRQn);
- NVIC_EnableIRQ(USB_2_IRQn);
- NVIC_EnableIRQ(USB_3_IRQn);
-#endif
-}
-DECL_INIT(usbserial_init);
+/****************************************************************
+ * Setup and interrupts
+ ****************************************************************/
void __visible
USB_Handler(void)
@@ -265,3 +230,43 @@ void USB_0_Handler(void) __visible __attribute__((alias("USB_Handler")));
void USB_1_Handler(void) __visible __attribute__((alias("USB_Handler")));
void USB_2_Handler(void) __visible __attribute__((alias("USB_Handler")));
void USB_3_Handler(void) __visible __attribute__((alias("USB_Handler")));
+
+DECL_CONSTANT_STR("RESERVE_PINS_USB", "PA24,PA25");
+
+void
+usbserial_init(void)
+{
+ // configure usb clock
+ enable_pclock(USB_GCLK_ID, ID_USB);
+ // configure USBD+ and USBD- pins
+ uint32_t ptype = CONFIG_MACH_SAMD21 ? 'G' : 'H';
+ gpio_peripheral(GPIO('A', 24), ptype, 0);
+ gpio_peripheral(GPIO('A', 25), ptype, 0);
+ uint32_t trim = GET_FUSE(USB_FUSES_TRIM);
+ uint32_t transp = GET_FUSE(USB_FUSES_TRANSP);
+ uint32_t transn = GET_FUSE(USB_FUSES_TRANSN);
+ USB->DEVICE.PADCAL.reg = (USB_PADCAL_TRIM(trim) | USB_PADCAL_TRANSP(transp)
+ | USB_PADCAL_TRANSN(transn));
+ // Enable USB in device mode
+ USB->DEVICE.CTRLA.reg = USB_CTRLA_ENABLE;
+ USB->DEVICE.DESCADD.reg = (uint32_t)usb_desc;
+ EP0.EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE0(1) | USB_DEVICE_EPCFG_EPTYPE1(1);
+ EP_ACM.EPCFG.reg = USB_DEVICE_EPCFG_EPTYPE1(4);
+ USB->DEVICE.CTRLB.reg = 0;
+ // enable irqs
+ USB->DEVICE.INTENSET.reg = USB_DEVICE_INTENSET_EORST;
+#if CONFIG_MACH_SAMD21
+ NVIC_SetPriority(USB_IRQn, 1);
+ NVIC_EnableIRQ(USB_IRQn);
+#elif CONFIG_MACH_SAMD51
+ NVIC_SetPriority(USB_0_IRQn, 1);
+ NVIC_SetPriority(USB_1_IRQn, 1);
+ NVIC_SetPriority(USB_2_IRQn, 1);
+ NVIC_SetPriority(USB_3_IRQn, 1);
+ NVIC_EnableIRQ(USB_0_IRQn);
+ NVIC_EnableIRQ(USB_1_IRQn);
+ NVIC_EnableIRQ(USB_2_IRQn);
+ NVIC_EnableIRQ(USB_3_IRQn);
+#endif
+}
+DECL_INIT(usbserial_init);
generated by cgit v1.2.3-70-g09d2 (git 2.50.1) at 2025-09-02 14:20:24 +0000