From 12cbab967cc342ebd55bc57c9d1b0972c610f9ef Mon Sep 17 00:00:00 2001
From: 9names <60134748+9names@users.noreply.github.com>
Date: Sun, 10 Apr 2022 21:54:56 +1000
Subject: [PATCH] Update all BSP examples to use the BSP's re-exported entry
 macro

---
 .../adafruit-feather-rp2040/examples/adafruit_feather_blinky.rs | 2 +-
 .../examples/adafruit_feather_neopixel_rainbow.rs               | 2 +-
 .../examples/adafruit_itsy_bitsy_blinky.rs                      | 2 +-
 .../examples/adafruit_itsy_bitsy_rainbow.rs                     | 2 +-
 boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs      | 2 +-
 .../examples/adafruit_qt_py_rp2040_rainbow.rs                   | 2 +-
 .../examples/adafruit_trinkey_qt2040_rainbow.rs                 | 2 +-
 .../examples/pimoroni_pico_explorer_showcase.rs                 | 2 +-
 .../examples/pimoroni_pico_lipo_16mb_blinky.rs                  | 2 +-
 boards/pimoroni-tiny2040/examples/tiny2040_blinky.rs            | 2 +-
 boards/rp-pico/examples/pico_blinky.rs                          | 2 +-
 boards/rp-pico/examples/pico_countdown_blinky.rs                | 2 +-
 boards/rp-pico/examples/pico_gpio_in_out.rs                     | 2 +-
 boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs        | 2 +-
 boards/rp-pico/examples/pico_i2c_pio.rs                         | 2 +-
 boards/rp-pico/examples/pico_pwm_blink.rs                       | 2 +-
 boards/rp-pico/examples/pico_spi_sd_card.rs                     | 2 +-
 boards/rp-pico/examples/pico_uart_irq_buffer.rs                 | 2 +-
 boards/rp-pico/examples/pico_uart_irq_echo.rs                   | 2 +-
 boards/rp-pico/examples/pico_usb_serial.rs                      | 2 +-
 boards/rp-pico/examples/pico_usb_serial_interrupt.rs            | 2 +-
 boards/rp-pico/examples/pico_usb_twitchy_mouse.rs               | 2 +-
 boards/rp-pico/examples/pico_ws2812_led.rs                      | 2 +-
 .../examples/solderparty_stamp_neopixel_rainbow.rs              | 2 +-
 .../examples/sparkfun_pro_micro_rainbow.rs                      | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/boards/adafruit-feather-rp2040/examples/adafruit_feather_blinky.rs b/boards/adafruit-feather-rp2040/examples/adafruit_feather_blinky.rs
index d41d650..71467a0 100644
--- a/boards/adafruit-feather-rp2040/examples/adafruit_feather_blinky.rs
+++ b/boards/adafruit-feather-rp2040/examples/adafruit_feather_blinky.rs
@@ -4,6 +4,7 @@
 #![no_std]
 #![no_main]
 
+use adafruit_feather_rp2040::entry;
 use adafruit_feather_rp2040::{
     hal::{
         clocks::{init_clocks_and_plls, Clock},
@@ -13,7 +14,6 @@ use adafruit_feather_rp2040::{
     },
     Pins, XOSC_CRYSTAL_FREQ,
 };
-use cortex_m_rt::entry;
 use embedded_hal::digital::v2::OutputPin;
 use embedded_time::rate::*;
 use panic_halt as _;
diff --git a/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs b/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs
index 019ebbf..0bfb918 100644
--- a/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs
+++ b/boards/adafruit-feather-rp2040/examples/adafruit_feather_neopixel_rainbow.rs
@@ -6,6 +6,7 @@
 #![no_std]
 #![no_main]
 
+use adafruit_feather_rp2040::entry;
 use adafruit_feather_rp2040::{
     hal::{
         clocks::{init_clocks_and_plls, Clock},
@@ -18,7 +19,6 @@ use adafruit_feather_rp2040::{
     Pins, XOSC_CRYSTAL_FREQ,
 };
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
diff --git a/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_blinky.rs b/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_blinky.rs
index 5350994..6706dd0 100644
--- a/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_blinky.rs
+++ b/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_blinky.rs
@@ -10,7 +10,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use adafruit_itsy_bitsy_rp2040::entry;
 
 // Ensure we halt the program on panic (if we don't mention this crate it won't
 // be linked)
diff --git a/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs b/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs
index f9f71ae..70d81d5 100644
--- a/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs
+++ b/boards/adafruit-itsy-bitsy-rp2040/examples/adafruit_itsy_bitsy_rainbow.rs
@@ -2,8 +2,8 @@
 #![no_std]
 #![no_main]
 
+use adafruit_itsy_bitsy_rp2040::entry;
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::digital::v2::OutputPin;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
diff --git a/boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs b/boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs
index 7ade80b..9fa15c0 100644
--- a/boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs
+++ b/boards/adafruit-kb2040/examples/adafruit_kb2040_rainbow.rs
@@ -8,8 +8,8 @@
 #![no_std]
 #![no_main]
 
+use adafruit_kb2040::entry;
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
diff --git a/boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs b/boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs
index e445d7e..2d5b30d 100644
--- a/boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs
+++ b/boards/adafruit-qt-py-rp2040/examples/adafruit_qt_py_rp2040_rainbow.rs
@@ -2,8 +2,8 @@
 #![no_std]
 #![no_main]
 
+use adafruit_qt_py_rp2040::entry;
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::digital::v2::OutputPin;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
diff --git a/boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs b/boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs
index dcc0c96..95afc55 100644
--- a/boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs
+++ b/boards/adafruit-trinkey-qt2040/examples/adafruit_trinkey_qt2040_rainbow.rs
@@ -8,8 +8,8 @@
 #![no_std]
 #![no_main]
 
+use adafruit_trinkey_qt2040::entry;
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
diff --git a/boards/pimoroni-pico-explorer/examples/pimoroni_pico_explorer_showcase.rs b/boards/pimoroni-pico-explorer/examples/pimoroni_pico_explorer_showcase.rs
index 72b2009..b4901e0 100644
--- a/boards/pimoroni-pico-explorer/examples/pimoroni_pico_explorer_showcase.rs
+++ b/boards/pimoroni-pico-explorer/examples/pimoroni_pico_explorer_showcase.rs
@@ -3,7 +3,6 @@
 
 use arrayvec::ArrayString;
 use core::fmt::Write;
-use cortex_m_rt::entry;
 use embedded_graphics::{
     mono_font::{ascii::FONT_10X20, MonoTextStyleBuilder},
     pixelcolor::Rgb565,
@@ -14,6 +13,7 @@ use embedded_hal::digital::v2::OutputPin;
 use embedded_time::rate::*;
 use hal::{adc::Adc, clocks::*, watchdog::Watchdog, Sio};
 use panic_halt as _;
+use pimoroni_pico_explorer::entry;
 use pimoroni_pico_explorer::{hal, pac, Button, PicoExplorer, XOSC_CRYSTAL_FREQ};
 
 // See 4.9.5 from RP2040 datasheet
diff --git a/boards/pimoroni-pico-lipo-16mb/examples/pimoroni_pico_lipo_16mb_blinky.rs b/boards/pimoroni-pico-lipo-16mb/examples/pimoroni_pico_lipo_16mb_blinky.rs
index 9674e9d..dbca822 100644
--- a/boards/pimoroni-pico-lipo-16mb/examples/pimoroni_pico_lipo_16mb_blinky.rs
+++ b/boards/pimoroni-pico-lipo-16mb/examples/pimoroni_pico_lipo_16mb_blinky.rs
@@ -11,7 +11,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use pimoroni_pico_lipo_16mb::entry;
 
 // GPIO traits
 use embedded_hal::digital::v2::OutputPin;
diff --git a/boards/pimoroni-tiny2040/examples/tiny2040_blinky.rs b/boards/pimoroni-tiny2040/examples/tiny2040_blinky.rs
index bb7cd73..6380f49 100644
--- a/boards/pimoroni-tiny2040/examples/tiny2040_blinky.rs
+++ b/boards/pimoroni-tiny2040/examples/tiny2040_blinky.rs
@@ -2,7 +2,7 @@
 #![no_std]
 #![no_main]
 
-use cortex_m_rt::entry;
+use bsp::entry;
 use defmt::*;
 use defmt_rtt as _;
 use embedded_hal::digital::v2::OutputPin;
diff --git a/boards/rp-pico/examples/pico_blinky.rs b/boards/rp-pico/examples/pico_blinky.rs
index 87c2b34..087015c 100644
--- a/boards/rp-pico/examples/pico_blinky.rs
+++ b/boards/rp-pico/examples/pico_blinky.rs
@@ -11,7 +11,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // GPIO traits
 use embedded_hal::digital::v2::OutputPin;
diff --git a/boards/rp-pico/examples/pico_countdown_blinky.rs b/boards/rp-pico/examples/pico_countdown_blinky.rs
index 15a79dd..f986b25 100644
--- a/boards/rp-pico/examples/pico_countdown_blinky.rs
+++ b/boards/rp-pico/examples/pico_countdown_blinky.rs
@@ -11,7 +11,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 use cortex_m::prelude::*;
 
diff --git a/boards/rp-pico/examples/pico_gpio_in_out.rs b/boards/rp-pico/examples/pico_gpio_in_out.rs
index fce0686..b27fe14 100644
--- a/boards/rp-pico/examples/pico_gpio_in_out.rs
+++ b/boards/rp-pico/examples/pico_gpio_in_out.rs
@@ -13,7 +13,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // GPIO traits
 use embedded_hal::digital::v2::{InputPin, OutputPin};
diff --git a/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs b/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs
index c3d4fef..248ca81 100644
--- a/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs
+++ b/boards/rp-pico/examples/pico_i2c_oled_display_ssd1306.rs
@@ -45,7 +45,7 @@
 use core::fmt::Write;
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // Time handling traits:
 use embedded_time::duration::*;
diff --git a/boards/rp-pico/examples/pico_i2c_pio.rs b/boards/rp-pico/examples/pico_i2c_pio.rs
index 7552e7a..23706bc 100644
--- a/boards/rp-pico/examples/pico_i2c_pio.rs
+++ b/boards/rp-pico/examples/pico_i2c_pio.rs
@@ -15,7 +15,7 @@
 use core::fmt::Write as FmtWrite;
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // I2C HAL traits & Types.
 use embedded_hal::blocking::i2c::{Operation, Read, Transactional, Write};
diff --git a/boards/rp-pico/examples/pico_pwm_blink.rs b/boards/rp-pico/examples/pico_pwm_blink.rs
index 5a0a986..1610ac5 100644
--- a/boards/rp-pico/examples/pico_pwm_blink.rs
+++ b/boards/rp-pico/examples/pico_pwm_blink.rs
@@ -11,7 +11,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // GPIO traits
 use embedded_hal::PwmPin;
diff --git a/boards/rp-pico/examples/pico_spi_sd_card.rs b/boards/rp-pico/examples/pico_spi_sd_card.rs
index 3410dec..7f31f8b 100644
--- a/boards/rp-pico/examples/pico_spi_sd_card.rs
+++ b/boards/rp-pico/examples/pico_spi_sd_card.rs
@@ -93,7 +93,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // info!() and error!() macros for printing information to the debug output
 use defmt::*;
diff --git a/boards/rp-pico/examples/pico_uart_irq_buffer.rs b/boards/rp-pico/examples/pico_uart_irq_buffer.rs
index 4166207..fa249a8 100644
--- a/boards/rp-pico/examples/pico_uart_irq_buffer.rs
+++ b/boards/rp-pico/examples/pico_uart_irq_buffer.rs
@@ -31,7 +31,7 @@ use core::fmt::Write;
 use rp2040_hal::Clock;
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // Ensure we halt the program on panic (if we don't mention this crate it won't
 // be linked)
diff --git a/boards/rp-pico/examples/pico_uart_irq_echo.rs b/boards/rp-pico/examples/pico_uart_irq_echo.rs
index 314c5d7..aae9082 100644
--- a/boards/rp-pico/examples/pico_uart_irq_echo.rs
+++ b/boards/rp-pico/examples/pico_uart_irq_echo.rs
@@ -29,7 +29,7 @@ use embedded_time::fixed_point::FixedPoint;
 use rp2040_hal::Clock;
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // Ensure we halt the program on panic (if we don't mention this crate it won't
 // be linked)
diff --git a/boards/rp-pico/examples/pico_usb_serial.rs b/boards/rp-pico/examples/pico_usb_serial.rs
index b28dba2..ef84eca 100644
--- a/boards/rp-pico/examples/pico_usb_serial.rs
+++ b/boards/rp-pico/examples/pico_usb_serial.rs
@@ -13,7 +13,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // Ensure we halt the program on panic (if we don't mention this crate it won't
 // be linked)
diff --git a/boards/rp-pico/examples/pico_usb_serial_interrupt.rs b/boards/rp-pico/examples/pico_usb_serial_interrupt.rs
index d7e38e5..e2f154c 100644
--- a/boards/rp-pico/examples/pico_usb_serial_interrupt.rs
+++ b/boards/rp-pico/examples/pico_usb_serial_interrupt.rs
@@ -13,7 +13,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // The macro for marking our interrupt functions
 use rp_pico::hal::pac::interrupt;
diff --git a/boards/rp-pico/examples/pico_usb_twitchy_mouse.rs b/boards/rp-pico/examples/pico_usb_twitchy_mouse.rs
index 09818b9..8efb2fd 100644
--- a/boards/rp-pico/examples/pico_usb_twitchy_mouse.rs
+++ b/boards/rp-pico/examples/pico_usb_twitchy_mouse.rs
@@ -15,7 +15,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // The macro for marking our interrupt functions
 use rp_pico::hal::pac::interrupt;
diff --git a/boards/rp-pico/examples/pico_ws2812_led.rs b/boards/rp-pico/examples/pico_ws2812_led.rs
index cba725b..a0cace0 100644
--- a/boards/rp-pico/examples/pico_ws2812_led.rs
+++ b/boards/rp-pico/examples/pico_ws2812_led.rs
@@ -41,7 +41,7 @@
 #![no_main]
 
 // The macro for our start-up function
-use cortex_m_rt::entry;
+use rp_pico::entry;
 
 // Ensure we halt the program on panic (if we don't mention this crate it won't
 // be linked)
diff --git a/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs b/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs
index a22aba6..70db5da 100644
--- a/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs
+++ b/boards/solderparty-rp2040-stamp/examples/solderparty_stamp_neopixel_rainbow.rs
@@ -7,11 +7,11 @@
 #![no_main]
 
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
 use smart_leds::{brightness, SmartLedsWrite, RGB8};
+use solderparty_rp2040_stamp::entry;
 use solderparty_rp2040_stamp::{
     hal::{
         clocks::{init_clocks_and_plls, Clock},
diff --git a/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs b/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs
index a7df773..db73e64 100644
--- a/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs
+++ b/boards/sparkfun-pro-micro-rp2040/examples/sparkfun_pro_micro_rainbow.rs
@@ -9,10 +9,10 @@
 #![no_main]
 
 use core::iter::once;
-use cortex_m_rt::entry;
 use embedded_hal::timer::CountDown;
 use embedded_time::duration::Extensions;
 use panic_halt as _;
+use sparkfun_pro_micro_rp2040::entry;
 
 use smart_leds::{brightness, SmartLedsWrite, RGB8};
 use sparkfun_pro_micro_rp2040::{