From: Dongwoo Lee <dwoo08.lee@samsung.com>
Date: Tue, 17 Mar 2020 04:44:33 +0000 (+0900)
Subject: tfm: Get rid of unnecessary global header tfm.h
X-Git-Tag: submit/tizen/20200320.075241~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F223028%2F10;p=platform%2Fcore%2Fsystem%2Finitrd-flash.git

tfm: Get rid of unnecessary global header tfm.h

Global tfm context is no more used, so global header tfm.h is neither
required. This just removes unnecessary header, thus has no functional
changes.

Change-Id: I69daaaa255dea57676e04bdb0c8145cf4049ed87
Signed-off-by: Dongwoo Lee <dwoo08.lee@samsung.com>
---

diff --git a/src/interface.c b/src/interface.c
index de6f559..69d2084 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -21,7 +21,6 @@
 #include <pthread.h>
 #include <sys/queue.h>
 
-#include "tfm.h"
 #include "interface.h"
 
 struct tfm_interface_context {
diff --git a/src/main.c b/src/main.c
index 141f165..0281c30 100644
--- a/src/main.c
+++ b/src/main.c
@@ -20,7 +20,7 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include "tfm.h"
+#include "thor.h"
 #include "dfu.h"
 #include "interface.h"
 
diff --git a/src/net.c b/src/net.c
index 9de6741..6cd8587 100644
--- a/src/net.c
+++ b/src/net.c
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -23,7 +24,6 @@
 #include <sys/wait.h>
 #include <arpa/inet.h>
 
-#include "tfm.h"
 #include "interface.h"
 
 #define DEFAULT_PORT		23456
diff --git a/src/tfm.h b/src/tfm.h
deleted file mode 100644
index 7d18f4e..0000000
--- a/src/tfm.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * flash-manager - Tizen kernel-level image flashing solution
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TFM_H
-#define __TFM_H
-#include <string.h>
-#include <pthread.h>
-#include <sys/queue.h>
-
-#include "dfu.h"
-#include "interface.h"
-
-int thor_setup(struct tfm_interface *intf);
-int thor_process(struct tfm_interface *intf, struct dfu_context *dfu);
-#endif
diff --git a/src/thor.c b/src/thor.c
index 426dd40..6cb6984 100644
--- a/src/thor.c
+++ b/src/thor.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include <sys/reboot.h>
 
-#include "tfm.h"
 #include "dfu.h"
 #include "interface.h"
 #include "thor-proto.h"
diff --git a/src/thor.h b/src/thor.h
new file mode 100644
index 0000000..7a88006
--- /dev/null
+++ b/src/thor.h
@@ -0,0 +1,25 @@
+/*
+ * flash-manager - Tizen kernel-level image flashing solution
+ *
+ * Licensed under the Apache License, Version 2.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __THOR_H
+#define __THOR_H
+
+#include "dfu.h"
+#include "interface.h"
+
+int thor_setup(struct tfm_interface *intf);
+int thor_process(struct tfm_interface *intf, struct dfu_context *dfu);
+#endif