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_ethernet.rs | |
| parent | 82f7e104d90a6628d1873017ea5ef6a7afb3b3f7 (diff) | |
rp: remove take!, add bind_interrupts!
Diffstat (limited to 'examples/rp/src/bin/usb_ethernet.rs')
| -rw-r--r-- | examples/rp/src/bin/usb_ethernet.rs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/examples/rp/src/bin/usb_ethernet.rs b/examples/rp/src/bin/usb_ethernet.rs index 66a6ed4d0..2ddfb6344 100644 --- a/examples/rp/src/bin/usb_ethernet.rs +++ b/examples/rp/src/bin/usb_ethernet.rs | |||
| @@ -6,8 +6,9 @@ use defmt::*; | |||
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_net::tcp::TcpSocket; | 7 | use embassy_net::tcp::TcpSocket; |
| 8 | use embassy_net::{Stack, StackResources}; | 8 | use embassy_net::{Stack, StackResources}; |
| 9 | use embassy_rp::usb::Driver; | 9 | use embassy_rp::peripherals::USB; |
| 10 | use embassy_rp::{interrupt, peripherals}; | 10 | use embassy_rp::usb::{Driver, InterruptHandler}; |
| 11 | use embassy_rp::{bind_interrupts, peripherals}; | ||
| 11 | use embassy_usb::class::cdc_ncm::embassy_net::{Device, Runner, State as NetState}; | 12 | use embassy_usb::class::cdc_ncm::embassy_net::{Device, Runner, State as NetState}; |
| 12 | use embassy_usb::class::cdc_ncm::{CdcNcmClass, State}; | 13 | use embassy_usb::class::cdc_ncm::{CdcNcmClass, State}; |
| 13 | use embassy_usb::{Builder, Config, UsbDevice}; | 14 | use embassy_usb::{Builder, Config, UsbDevice}; |
| @@ -15,6 +16,10 @@ use embedded_io::asynch::Write; | |||
| 15 | use static_cell::StaticCell; | 16 | use static_cell::StaticCell; |
| 16 | use {defmt_rtt as _, panic_probe as _}; | 17 | use {defmt_rtt as _, panic_probe as _}; |
| 17 | 18 | ||
| 19 | bind_interrupts!(struct Irqs { | ||
| 20 | USBCTRL_IRQ => InterruptHandler<USB>; | ||
| 21 | }); | ||
| 22 | |||
| 18 | type MyDriver = Driver<'static, peripherals::USB>; | 23 | type MyDriver = Driver<'static, peripherals::USB>; |
| 19 | 24 | ||
| 20 | macro_rules! singleton { | 25 | macro_rules! singleton { |
| @@ -48,8 +53,7 @@ async fn main(spawner: Spawner) { | |||
| 48 | let p = embassy_rp::init(Default::default()); | 53 | let p = embassy_rp::init(Default::default()); |
| 49 | 54 | ||
| 50 | // Create the driver, from the HAL. | 55 | // Create the driver, from the HAL. |
| 51 | let irq = interrupt::take!(USBCTRL_IRQ); | 56 | let driver = Driver::new(p.USB, Irqs); |
| 52 | let driver = Driver::new(p.USB, irq); | ||
| 53 | 57 | ||
| 54 | // Create embassy-usb Config | 58 | // Create embassy-usb Config |
| 55 | let mut config = Config::new(0xc0de, 0xcafe); | 59 | let mut config = Config::new(0xc0de, 0xcafe); |
