diff options
| author | pennae <[email protected]> | 2023-05-15 15:21:05 +0200 |
|---|---|---|
| committer | pennae <[email protected]> | 2023-05-15 15:24:56 +0200 |
| commit | 14a5d03af2a74eccaa9930bdf81eef43791a4b33 (patch) | |
| tree | 3a0879c21cf09702c670b14672e62b940a2157f0 /examples/rp/src/bin/usb_serial.rs | |
| parent | 82f7e104d90a6628d1873017ea5ef6a7afb3b3f7 (diff) | |
rp: remove take!, add bind_interrupts!
Diffstat (limited to 'examples/rp/src/bin/usb_serial.rs')
| -rw-r--r-- | examples/rp/src/bin/usb_serial.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/examples/rp/src/bin/usb_serial.rs b/examples/rp/src/bin/usb_serial.rs index 8160a1875..ca728536c 100644 --- a/examples/rp/src/bin/usb_serial.rs +++ b/examples/rp/src/bin/usb_serial.rs | |||
| @@ -5,13 +5,18 @@ | |||
| 5 | use defmt::{info, panic}; | 5 | use defmt::{info, panic}; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_futures::join::join; | 7 | use embassy_futures::join::join; |
| 8 | use embassy_rp::interrupt; | 8 | use embassy_rp::bind_interrupts; |
| 9 | use embassy_rp::usb::{Driver, Instance}; | 9 | use embassy_rp::peripherals::USB; |
| 10 | use embassy_rp::usb::{Driver, Instance, InterruptHandler}; | ||
| 10 | use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; | 11 | use embassy_usb::class::cdc_acm::{CdcAcmClass, State}; |
| 11 | use embassy_usb::driver::EndpointError; | 12 | use embassy_usb::driver::EndpointError; |
| 12 | use embassy_usb::{Builder, Config}; | 13 | use embassy_usb::{Builder, Config}; |
| 13 | use {defmt_rtt as _, panic_probe as _}; | 14 | use {defmt_rtt as _, panic_probe as _}; |
| 14 | 15 | ||
| 16 | bind_interrupts!(struct Irqs { | ||
| 17 | USBCTRL_IRQ => InterruptHandler<USB>; | ||
| 18 | }); | ||
| 19 | |||
| 15 | #[embassy_executor::main] | 20 | #[embassy_executor::main] |
| 16 | async fn main(_spawner: Spawner) { | 21 | async fn main(_spawner: Spawner) { |
| 17 | info!("Hello there!"); | 22 | info!("Hello there!"); |
| @@ -19,8 +24,7 @@ async fn main(_spawner: Spawner) { | |||
| 19 | let p = embassy_rp::init(Default::default()); | 24 | let p = embassy_rp::init(Default::default()); |
| 20 | 25 | ||
| 21 | // Create the driver, from the HAL. | 26 | // Create the driver, from the HAL. |
| 22 | let irq = interrupt::take!(USBCTRL_IRQ); | 27 | let driver = Driver::new(p.USB, Irqs); |
| 23 | let driver = Driver::new(p.USB, irq); | ||
| 24 | 28 | ||
| 25 | // Create embassy-usb Config | 29 | // Create embassy-usb Config |
| 26 | let mut config = Config::new(0xc0de, 0xcafe); | 30 | let mut config = Config::new(0xc0de, 0xcafe); |
