From 62c1a507383c0858abf47f1f1ab8472ba42973d6 Mon Sep 17 00:00:00 2001
From: Dongwoo Lee <dwoo08.lee@samsung.com>
Date: Tue, 17 Mar 2020 13:44:33 +0900
Subject: [PATCH] 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>
---
 src/interface.c       | 1 -
 src/main.c            | 2 +-
 src/net.c             | 2 +-
 src/thor.c            | 1 -
 src/{tfm.h => thor.h} | 7 ++-----
 5 files changed, 4 insertions(+), 9 deletions(-)
 rename src/{tfm.h => thor.h} (89%)

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/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/tfm.h b/src/thor.h
similarity index 89%
rename from src/tfm.h
rename to src/thor.h
index 7d18f4e..7a88006 100644
--- a/src/tfm.h
+++ b/src/thor.h
@@ -14,11 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __TFM_H
-#define __TFM_H
-#include <string.h>
-#include <pthread.h>
-#include <sys/queue.h>
+#ifndef __THOR_H
+#define __THOR_H
 
 #include "dfu.h"
 #include "interface.h"
-- 
2.34.1