From 755117d64899833a959ed61777be27cb2ba1fa98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C5=ABnas=20Ma=C5=BEeikis?= <ramunasnezinomas@gmail.com>
Date: Wed, 29 May 2019 14:00:38 +0300
Subject: Protocol: now renamed things properly and updated build files.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ramūnas Mažeikis <ramunasnezinomas@gmail.com>
---
 include/meson.build      |  2 +-
 src/common/meson.build   |  2 ++
 src/common/tlv.c         |  4 ++--
 src/common/tlv_private.h | 48 ------------------------------------------------
 src/device/main.ino      |  2 +-
 5 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 src/common/tlv_private.h

diff --git a/include/meson.build b/include/meson.build
index 33e9426..77a8d53 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,7 +1,7 @@
 header_filenames = [
 	'utils.h',
 	'net.h',
-	'protocol.h'
+	'tlv.h'
 ]
 
 fw_headers = files(header_filenames)
diff --git a/src/common/meson.build b/src/common/meson.build
index b0f0c82..82ebaa7 100644
--- a/src/common/meson.build
+++ b/src/common/meson.build
@@ -1,4 +1,6 @@
 common_filenames = [
+	'tlv_private.h',
+	'tlv.c'
 ]
 
 common_sources = files(common_filenames)
diff --git a/src/common/tlv.c b/src/common/tlv.c
index 0002a96..748d3fb 100644
--- a/src/common/tlv.c
+++ b/src/common/tlv.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "protocol.h"
-#include "protocol_private.h"
+#include "tlv.h"
+#include "tlv_private.h"
 #include "net.h"
 #include "utils.h"
 
diff --git a/src/common/tlv_private.h b/src/common/tlv_private.h
deleted file mode 100644
index 51d5431..0000000
--- a/src/common/tlv_private.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Usurpataion --- clinet-server protocol implementation.
- *
- * Copyright (C) 2019 Ramūnas Mažeikis
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1
- * of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/**
- * Common parts of protocol implementation. Handling of anything that actually
- * deals with connection descriptor has to be implemented by device and daemon
- * separately.
- */
-
-#ifndef PROTOCOL_PRIVATE_H
-#define PROTOCOL_PRIVATE_H
-
-#include "protocol_private.h"
-
-/**
- * Convenience function that pushes bytes to the end of a packet and reports
- * potential overflow.
- *
- * In case of detected overflow nothing is done to the packet.
- */
-int push_bytes(struct tlv_packet *packet, char *data, size_t size);
-
-/**
- * Convenience function that forms a tlv header at the end of a packet. Reports
- * potential overflow.
- *
- * In case of detected overflow nothing is done to the packet.
- */
-int push_tlv_header(struct tlv_packet *packet, enum tlv_type type, size_t size);
-
-#endif /* PROTOCOL_PRIVATE_H */
diff --git a/src/device/main.ino b/src/device/main.ino
index 8f2c1a6..24cfb9c 100644
--- a/src/device/main.ino
+++ b/src/device/main.ino
@@ -29,7 +29,7 @@
 #include "device_network.h"
 #include "screen.h"
 #include "net.h"
-#include "protocol.h"
+#include "tlv.h"
 
 static const unsigned int internal_led = 2;
 static unsigned int led_state = 0;
-- 
cgit v1.2.3