Renaming

Author: uweseimet

api/s2p_interface.proto api/target_api.proto

@@ -2,7 +2,7 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2021-2024 Uwe Seimet
+// Copyright (C) 2021-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
@@ -13,8 +13,8 @@
 // All operations accept an optional access token, specified by the "token" parameter.
 // All operations also accept an optional locale, specified with the "locale" parameter. If there is
 // a localized error message it is returned, with English being the fallback language.
-// This interface is backwards compatible with PiSCSI. Numbers 100 and higher are used for messages
-// and fields not known by PISCSI 23.11.01 and newer.
+// This interface is backwards compatible with PiSCSI 24.04.01. Numbers 100 and higher are used for
+// messages and fields not supported by PiSCSI.
 //
 
 syntax = "proto3";

cpp/Makefile

@@ -168,9 +168,9 @@ DIR_CONTROLLERS := controllers
 DIR_DEVICES := devices
 DIR_PI := pi
 
-PROTO_TARGET_API := ../api/s2p_interface.proto
+PROTO_TARGET_API := ../api/target_api.proto
 
-SRC_TARGET_API = $(GENERATED_DIR)/s2p_interface.pb.cpp
+SRC_TARGET_API = $(GENERATED_DIR)/target_api.pb.cpp
 
 SRC_SHARED = $(shell ls -1 $(DIR_SHARED)/*.cpp | grep -v sg_)
 ifdef IS_LINUX
@@ -375,7 +375,7 @@ $(OBJ_TARGET_API): | $(OBJDIR)
 
 $(SRC_TARGET_API): $(PROTO_TARGET_API) | $(GENERATED_DIR)
 	protoc -I ../api --cpp_out=$(GENERATED_DIR) $(PROTO_TARGET_API)
-	mv $(GENERATED_DIR)/s2p_interface.pb.cc $@
+	mv $(GENERATED_DIR)/target_api.pb.cc $@
 
 ## Build targets:
 ##   all             Buidl all executable files (default target)

cpp/base/device.h

@@ -11,7 +11,7 @@
 #include <spdlog/spdlog.h>
 #include "shared/s2p_util.h"
 #include "shared/s2p_version.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace spdlog;
 using namespace s2p_interface;

cpp/base/device_factory.h

@@ -12,7 +12,7 @@
 
 #include <unordered_map>
 #include "shared/s2p_util.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace s2p_interface;

cpp/command/command_context.h

@@ -10,7 +10,7 @@
 
 #include <spdlog/spdlog.h>
 #include "command_localizer.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace spdlog;

cpp/command/command_response.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <unordered_set>
 #include <spdlog/spdlog.h>
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 class PrimaryDevice;
 

cpp/devices/cache.h

@@ -9,7 +9,7 @@
 #pragma once
 
 #include "shared/s2p_defs.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace s2p_interface;

cpp/protobuf/protobuf_util.h

@@ -11,7 +11,7 @@
 #include <span>
 #include <unordered_map>
 #include <vector>
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace s2p_interface;

cpp/s2p/s2p_parser.cpp

@@ -13,7 +13,7 @@
 #include <spdlog/spdlog.h>
 #include "controllers/controller_factory.h"
 #include "shared/s2p_exceptions.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace s2p_util;
 using namespace s2p_interface;

cpp/s2pctl/s2pctl_commands.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace s2p_interface;

cpp/s2pctl/s2pctl_core.h

@@ -11,7 +11,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace s2p_interface;

cpp/s2pctl/s2pctl_display.h

@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace std;
 using namespace s2p_interface;

cpp/s2pproto/s2pproto_core.cpp

@@ -16,7 +16,7 @@
 #include "buses/bus_factory.h"
 #include "initiator/initiator_util.h"
 #include "shared/s2p_exceptions.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace google::protobuf;
 using namespace google::protobuf::util;

cpp/s2pproto/s2pproto_executor.cpp

@@ -12,7 +12,7 @@
 #include <sstream>
 #include <google/protobuf/text_format.h>
 #include <google/protobuf/util/json_util.h>
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace filesystem;
 using namespace google::protobuf;

cpp/test/s2p_parser_test.cpp

@@ -10,7 +10,7 @@
 #include "base/property_handler.h"
 #include "s2p/s2p_parser.h"
 #include "shared/s2p_exceptions.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace s2p_interface;
 using namespace s2p_parser;

cpp/test/test_shared.h

@@ -13,7 +13,7 @@
 #include "shared/scsi.h"
 #include "base/property_handler.h"
 #include "devices/storage_device.h"
-#include "generated/s2p_interface.pb.h"
+#include "generated/target_api.pb.h"
 
 using namespace filesystem;
 using namespace s2p_interface;