From eadee1ab8df0e4fa0ef236f2f265b04439efcfea Mon Sep 17 00:00:00 2001 From: Andy Piper Date: Wed, 17 Aug 2022 15:16:15 +0200 Subject: [PATCH] AP_HAL_Empty: rename QSPIDevice to WSPIDevice --- libraries/AP_HAL_Empty/AP_HAL_Empty_Namespace.h | 4 ++-- libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h | 2 +- .../AP_HAL_Empty/{QSPIDevice.h => WSPIDevice.h} | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) rename libraries/AP_HAL_Empty/{QSPIDevice.h => WSPIDevice.h} (84%) diff --git a/libraries/AP_HAL_Empty/AP_HAL_Empty_Namespace.h b/libraries/AP_HAL_Empty/AP_HAL_Empty_Namespace.h index a66a5156ac..3a1680b394 100644 --- a/libraries/AP_HAL_Empty/AP_HAL_Empty_Namespace.h +++ b/libraries/AP_HAL_Empty/AP_HAL_Empty_Namespace.h @@ -16,8 +16,8 @@ namespace Empty { class SPIDevice; class SPIDeviceDriver; class SPIDeviceManager; - class QSPIDevice; - class QSPIDeviceManager; + class WSPIDevice; + class WSPIDeviceManager; class Storage; class UARTDriver; class Util; diff --git a/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h b/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h index 602bdc0dee..31b71f2167 100644 --- a/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h +++ b/libraries/AP_HAL_Empty/AP_HAL_Empty_Private.h @@ -13,7 +13,7 @@ #include "Scheduler.h" #include "Semaphores.h" #include "SPIDevice.h" -#include "QSPIDevice.h" +#include "WSPIDevice.h" #include "Storage.h" #include "UARTDriver.h" #include "Util.h" diff --git a/libraries/AP_HAL_Empty/QSPIDevice.h b/libraries/AP_HAL_Empty/WSPIDevice.h similarity index 84% rename from libraries/AP_HAL_Empty/QSPIDevice.h rename to libraries/AP_HAL_Empty/WSPIDevice.h index 18be33c1e9..53646d210d 100644 --- a/libraries/AP_HAL_Empty/QSPIDevice.h +++ b/libraries/AP_HAL_Empty/WSPIDevice.h @@ -17,21 +17,21 @@ #pragma once #include -#include +#include #include -#ifndef HAL_USE_QSPI_DEFAULT_CFG -#define HAL_USE_QSPI_DEFAULT_CFG 1 +#ifndef HAL_USE_WSPI_DEFAULT_CFG +#define HAL_USE_WSPI_DEFAULT_CFG 1 #endif namespace Empty { -class QSPIDevice : public AP_HAL::QSPIDevice +class WSPIDevice : public AP_HAL::WSPIDevice { public: - QSPIDevice() { } + WSPIDevice() { } /* See AP_HAL::Device::transfer() */ bool transfer(const uint8_t *send, uint32_t send_len, @@ -52,7 +52,7 @@ public: } }; -class QSPIDeviceManager : public AP_HAL::QSPIDeviceManager +class WSPIDeviceManager : public AP_HAL::WSPIDeviceManager { };