Unverified Commit b57ac668 authored by Earle F. Philhower, III's avatar Earle F. Philhower, III Committed by GitHub

Cleanup legacy includes (#1452)

parent a851a928
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include "api/ArduinoAPI.h" #include "api/ArduinoAPI.h"
#include "api/itoa.h" // ARM toolchain doesn't provide itoa etc, provide them #include "api/itoa.h" // ARM toolchain doesn't provide itoa etc, provide them
#include <pins_arduino.h> #include <pins_arduino.h>
#include "hardware/gpio.h" // Required for the port*Register macros #include <hardware/gpio.h> // Required for the port*Register macros
#include "debug_internal.h" #include "debug_internal.h"
#include <RP2040.h> // CMSIS #include <RP2040.h> // CMSIS
......
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
SPDX-License-Identifier: BSD-3-Clause SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <Arduino.h> #include <Arduino.h>
#include "pico/stdlib.h" #include <pico/stdlib.h>
#include "hardware/gpio.h" #include <hardware/gpio.h>
#include "hardware/sync.h" #include <hardware/sync.h>
#include "hardware/structs/ioqspi.h" #include <hardware/structs/ioqspi.h>
#include "hardware/structs/sio.h" #include <hardware/structs/sio.h>
// This example blinks the Pico LED when the BOOTSEL button is pressed. // This example blinks the Pico LED when the BOOTSEL button is pressed.
// //
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#pragma once #pragma once
#include "pico/mutex.h" #include <pico/mutex.h>
#include "_freertos.h" #include "_freertos.h"
enum { enum {
......
...@@ -25,17 +25,16 @@ ...@@ -25,17 +25,16 @@
#include "CoreMutex.h" #include "CoreMutex.h"
#include "RP2040USB.h" #include "RP2040USB.h"
#include "tusb.h" #include <tusb.h>
#include "class/hid/hid_device.h" #include <class/hid/hid_device.h>
#include "class/audio/audio.h" #include <class/audio/audio.h>
#include "class/midi/midi.h" #include <pico/time.h>
#include "pico/time.h" #include <hardware/irq.h>
#include "hardware/irq.h" #include <pico/mutex.h>
#include "pico/mutex.h" #include <pico/unique_id.h>
#include "pico/unique_id.h" #include <pico/usb_reset_interface.h>
#include "pico/usb_reset_interface.h" #include <hardware/watchdog.h>
#include "hardware/watchdog.h" #include <pico/bootrom.h>
#include "pico/bootrom.h"
#include "sdkoverride/tusb_absmouse.h" #include "sdkoverride/tusb_absmouse.h"
#include <device/usbd_pvt.h> #include <device/usbd_pvt.h>
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "pico/mutex.h" #include <pico/mutex.h>
// Weak function definitions for each type of endpoint // Weak function definitions for each type of endpoint
extern void __USBInstallSerial() __attribute__((weak)); extern void __USBInstallSerial() __attribute__((weak));
......
...@@ -25,15 +25,15 @@ ...@@ -25,15 +25,15 @@
#include <Arduino.h> #include <Arduino.h>
#include "CoreMutex.h" #include "CoreMutex.h"
#include "tusb.h" #include <tusb.h>
#include "pico/time.h" #include <pico/time.h>
#include "pico/binary_info.h" #include <pico/binary_info.h>
#include "pico/bootrom.h" #include <pico/bootrom.h>
#include "hardware/irq.h" #include <hardware/irq.h>
#include "pico/mutex.h" #include <pico/mutex.h>
#include "hardware/watchdog.h" #include <hardware/watchdog.h>
#include "pico/unique_id.h" #include <pico/unique_id.h>
#include "hardware/resets.h" #include <hardware/resets.h>
#ifndef DISABLE_USB_SERIAL #ifndef DISABLE_USB_SERIAL
// Ensure we are installed in the USB chain // Ensure we are installed in the USB chain
...@@ -179,7 +179,7 @@ static bool _rebooting = false; ...@@ -179,7 +179,7 @@ static bool _rebooting = false;
static void CheckSerialReset() { static void CheckSerialReset() {
if (!_rebooting && (_bps == 1200) && (!_dtr)) { if (!_rebooting && (_bps == 1200) && (!_dtr)) {
if (__isFreeRTOS) { if (__isFreeRTOS) {
vTaskPreemptionDisable(nullptr); __freertos_idle_other_core();
} }
_rebooting = true; _rebooting = true;
// Disable NVIC IRQ, so that we don't get bothered anymore // Disable NVIC IRQ, so that we don't get bothered anymore
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "stdlib.h" #include <stdlib.h>
#include "stdint.h" #include <stdint.h>
void randomSeed(uint32_t dwSeed) { void randomSeed(uint32_t dwSeed) {
if (dwSeed != 0) { if (dwSeed != 0) {
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*/ */
#include "_freertos.h" #include "_freertos.h"
#include "pico/mutex.h" #include <pico/mutex.h>
#include <stdlib.h> #include <stdlib.h>
#include "Arduino.h" #include "Arduino.h"
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
*/ */
#pragma once #pragma once
#include "pico/mutex.h" #include <pico/mutex.h>
// Cannot include refs to FreeRTOS's actual semaphore calls because they // Cannot include refs to FreeRTOS's actual semaphore calls because they
// are implemented as macros, so we have a wrapper in our variant hook // are implemented as macros, so we have a wrapper in our variant hook
...@@ -50,15 +50,6 @@ extern "C" { ...@@ -50,15 +50,6 @@ extern "C" {
extern int __freertos_recursive_mutex_try_take(SemaphoreHandle_t mtx) __attribute__((weak)); extern int __freertos_recursive_mutex_try_take(SemaphoreHandle_t mtx) __attribute__((weak));
extern void __freertos_recursive_mutex_give(SemaphoreHandle_t mtx) __attribute__((weak)); extern void __freertos_recursive_mutex_give(SemaphoreHandle_t mtx) __attribute__((weak));
#ifndef INC_FREERTOS_H
extern void vTaskSuspendAll() __attribute__((weak));
extern int32_t xTaskResumeAll() __attribute__((weak));
typedef struct tskTaskControlBlock * TaskHandle_t;
extern void vTaskPreemptionDisable(TaskHandle_t p) __attribute__((weak));
extern void vTaskPreemptionEnable(TaskHandle_t p) __attribute__((weak));
#endif
extern void __freertos_idle_other_core() __attribute__((weak)); extern void __freertos_idle_other_core() __attribute__((weak));
extern void __freertos_resume_other_core() __attribute__((weak)); extern void __freertos_resume_other_core() __attribute__((weak));
} }
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
#if defined(ARDUINO_RASPBERRY_PI_PICO_W) #if defined(ARDUINO_RASPBERRY_PI_PICO_W)
#include "lwip/netif.h" #include <lwip/netif.h>
extern "C" { extern "C" {
#include "cyw43.h" #include <cyw43.h>
#include "cyw43_stats.h" #include <cyw43_stats.h>
} }
#include "pico/cyw43_arch.h" #include <pico/cyw43_arch.h>
#include <Arduino.h> #include <Arduino.h>
// From cyw43_ctrl.c // From cyw43_ctrl.c
......
/* /*
LWIP wrappers to protect against timer-based re-entrancy LWIP wrappers to protect against timer-based re-entrancy
Copyright (c) 202s Earle F. Philhower, III <earlephilhower@yahoo.com> Copyright (c) 2023 Earle F. Philhower, III <earlephilhower@yahoo.com>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment