From d2cbbd46ce296912d6489c2202e2be1d4c95cb90 Mon Sep 17 00:00:00 2001
From: Cendio <cendio@pairstation.lkpg.cendio.se>
Date: Thu, 9 Nov 2017 17:03:59 +0100
Subject: [PATCH] Move dvc_hdr_t into dvc.c

---
 dvc.c   | 16 ++++++++++++----
 types.h | 10 ----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/dvc.c b/dvc.c
index f512371..05ee01e 100644
--- a/dvc.c
+++ b/dvc.c
@@ -33,9 +33,14 @@
 #define DYNVC_SOFT_SYNC_REQUEST		0x08
 #define DYNVC_SOFT_SYNC_RESPONSE	0x09
 
-static VCHANNEL *dvc_channel;
-
-static uint32 dvc_in_channelid(STREAM s, dvc_hdr_t hdr);
+typedef union dvc_hdr_t {
+    uint8 data;
+    struct {
+      uint8 cbid:2;
+      uint8 sp:2;
+      uint8 cmd:4;
+    } hdr;
+} dvc_hdr_t;
 
 typedef struct dvc_channel_t
 {
@@ -44,7 +49,10 @@ typedef struct dvc_channel_t
 	dvc_channel_process_fn handler;
 } dvc_channel_t;
 
-dvc_channel_t channels[MAX_DVC_CHANNELS];
+static VCHANNEL *dvc_channel;
+static dvc_channel_t channels[MAX_DVC_CHANNELS];
+
+static uint32 dvc_in_channelid(STREAM s, dvc_hdr_t hdr);
 
 static RD_BOOL
 dvc_channels_exists(const char *name)
diff --git a/types.h b/types.h
index 94df8e5..f2d6aef 100644
--- a/types.h
+++ b/types.h
@@ -306,16 +306,6 @@ typedef struct fileinfo
 }
 FILEINFO;
 
-
-typedef union dvc_hdr_t {
-    uint8 data;
-    struct {
-      uint8 cbid:2;
-      uint8 sp:2;
-      uint8 cmd:4;
-    } hdr;
-} dvc_hdr_t;
-
 typedef RD_BOOL(*str_handle_lines_t) (const char *line, void *data);
 
 #endif /* _TYPES_H */