[OTA] Move OTARequestorInterface to clusters directory (#15926)

project-chip · Jun 28, 2023 · 1182024 · 1182024
1 parent feacc27
commit 1182024
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 11 deletions.
diff --git a/examples/ota-requestor-app/esp32/main/main.cpp b/examples/ota-requestor-app/esp32/main/main.cpp
@@ -41,7 +41,6 @@
 
 #include "OTAImageProcessorImpl.h"
 #include "platform/GenericOTARequestorDriver.h"
-#include "platform/OTARequestorInterface.h"
 
 using namespace ::chip;
 using namespace ::chip::System;

diff --git a/src/app/clusters/ota-requestor/OTARequestor.h b/src/app/clusters/ota-requestor/OTARequestor.h
@@ -26,10 +26,10 @@
 #include <app/clusters/ota-requestor/ota-requestor-server.h>
 #include <app/server/Server.h>
 #include <platform/OTARequestorDriver.h>
-#include <platform/OTARequestorInterface.h>
 #include <protocols/bdx/BdxMessages.h>
 
 #include "BDXDownloader.h"
+#include "OTARequestorInterface.h"
 
 namespace chip {
 

diff --git a/src/include/platform/OTARequestorInterface.h → ...ers/ota-requestor/OTARequestorInterface.h b/src/include/platform/OTARequestorInterface.h → ...ers/ota-requestor/OTARequestorInterface.h
diff --git a/src/app/clusters/ota-requestor/ota-requestor-server.cpp b/src/app/clusters/ota-requestor/ota-requestor-server.cpp
@@ -22,9 +22,9 @@
 
 #include <app/AttributeAccessInterface.h>
 #include <app/EventLogging.h>
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <app/clusters/ota-requestor/ota-requestor-server.h>
 #include <app/util/attribute-storage.h>
-#include <platform/OTARequestorInterface.h>
 
 using namespace chip;
 using namespace chip::app;

diff --git a/src/lib/shell/commands/Ota.cpp b/src/lib/shell/commands/Ota.cpp
@@ -15,13 +15,13 @@
  *    limitations under the License.
  */
 
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <lib/shell/Commands.h>
 #include <lib/shell/Engine.h>
 #include <lib/shell/commands/Help.h>
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/OTAImageProcessor.h>
-#include <platform/OTARequestorInterface.h>
 
 using namespace chip::DeviceLayer;
 

diff --git a/src/platform/Ameba/AmebaOTAImageProcessor.cpp b/src/platform/Ameba/AmebaOTAImageProcessor.cpp
@@ -17,8 +17,8 @@
  */
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <lib/support/logging/CHIPLogging.h>
-#include <platform/OTARequestorInterface.h>
 
 #include <platform/Ameba/AmebaOTAImageProcessor.h>
 

diff --git a/src/platform/ExtendedOTARequestorDriver.cpp b/src/platform/ExtendedOTARequestorDriver.cpp
@@ -14,8 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
+
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <platform/ExtendedOTARequestorDriver.h>
-#include <platform/OTARequestorInterface.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/GenericOTARequestorDriver.cpp b/src/platform/GenericOTARequestorDriver.cpp
@@ -31,9 +31,9 @@
 
 #include "GenericOTARequestorDriver.h"
 
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <platform/CHIPDeviceLayer.h>
 #include <platform/OTAImageProcessor.h>
-#include <platform/OTARequestorInterface.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/Linux/OTAImageProcessorImpl.cpp b/src/platform/Linux/OTAImageProcessorImpl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
-#include <platform/OTARequestorInterface.h>
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 
 #include "OTAImageProcessorImpl.h"
 

diff --git a/src/platform/P6/OTAImageProcessorImpl.cpp b/src/platform/P6/OTAImageProcessorImpl.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
-#include <platform/OTARequestorInterface.h>
 
 #include "OTAImageProcessorImpl.h"
 

diff --git a/src/platform/cc13x2_26x2/OTAImageProcessorImpl.cpp b/src/platform/cc13x2_26x2/OTAImageProcessorImpl.cpp
@@ -17,7 +17,6 @@
  */
 
 #include <app/clusters/ota-requestor/OTADownloader.h>
-#include <platform/OTARequestorInterface.h>
 
 #include "OTAImageProcessorImpl.h"
 

diff --git a/src/platform/mbed/OTARequestorDriverImpl.h b/src/platform/mbed/OTARequestorDriverImpl.h
@@ -24,7 +24,7 @@
 
 #include <GenericOTARequestorDriver.h>
 #include <OTARequestorDriver.h>
-#include <OTARequestorInterface.h>
+#include <app/clusters/ota-requestor/OTARequestorInterface.h>
 #include <lib/core/CHIPCallback.h>
 #include <lib/core/CHIPError.h>
 #include <lib/support/logging/CHIPLogging.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
      */
     #include <app/clusters/ota-requestor/OTADownloader.h>
-    #include <platform/OTARequestorInterface.h>
     #include "OTAImageProcessorImpl.h"
@@ Expand Down @@