aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-11-07 08:01:49 +0100
committerHolger Hans Peter Freyther <holger@moiji-mobile.com>2013-11-07 08:02:10 +0100
commitbe57081721c13d1d2896f0a843f8759add7f58b9 (patch)
tree3e065d2ca33d780319ab64d0bab95598350e2127 /src
parentb7840466ceea8c68eb5db86c1fc98219b39ad086 (diff)
llc: Move the llc structure to a new header file
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/llc.h45
-rw-r--r--src/tbf.h23
3 files changed, 48 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 857d049..daa91ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,7 +88,8 @@ noinst_HEADERS = \
ta.h \
sba.h \
rlc.h \
- decoding.h
+ decoding.h \
+ llc.h
osmo_pcu_SOURCES = pcu_main.cpp
diff --git a/src/llc.h b/src/llc.h
new file mode 100644
index 0000000..3144362
--- /dev/null
+++ b/src/llc.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 by Holger Hans Peter Freyther
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#pragma once
+
+#include <stdint.h>
+
+#define LLC_MAX_LEN 1543
+
+/**
+ * I represent the LLC data to a MS
+ */
+struct gprs_llc {
+ void init();
+ void reset();
+ void reset_frame_space();
+
+ void enqueue(struct msgb *llc_msg);
+ struct msgb *dequeue();
+
+ void update_frame(struct msgb *msg);
+ void put_frame(const uint8_t *data, size_t len);
+ void clear(BTS *bts);
+
+ uint8_t frame[LLC_MAX_LEN]; /* current DL or UL frame */
+ uint16_t index; /* current write/read position of frame */
+ uint16_t length; /* len of current DL LLC_frame, 0 == no frame */
+ struct llist_head queue; /* queued LLC DL data */
+};
+
diff --git a/src/tbf.h b/src/tbf.h
index 374a289..9bb40a3 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -19,6 +19,7 @@
#pragma once
#include "gprs_rlcmac.h"
+#include "llc.h"
#include <stdint.h>
@@ -30,7 +31,6 @@ struct msgb;
* TBF instance
*/
-#define LLC_MAX_LEN 1543
#define RLC_MAX_SNS 128 /* GPRS, must be power of 2 */
#define RLC_MAX_WS 64 /* max window size */
#define RLC_MAX_LEN 54 /* CS-4 including spare bits */
@@ -85,27 +85,6 @@ enum gprs_rlcmac_tbf_direction {
#define GPRS_RLCMAC_FLAG_TO_DL_ASS 7
#define GPRS_RLCMAC_FLAG_TO_MASK 0xf0 /* timeout bits */
-/**
- * I represent the LLC data to a MS
- */
-struct gprs_llc {
- void init();
- void reset();
- void reset_frame_space();
-
- void enqueue(struct msgb *llc_msg);
- struct msgb *dequeue();
-
- void update_frame(struct msgb *msg);
- void put_frame(const uint8_t *data, size_t len);
- void clear(BTS *bts);
-
- uint8_t frame[LLC_MAX_LEN]; /* current DL or UL frame */
- uint16_t index; /* current write/read position of frame */
- uint16_t length; /* len of current DL LLC_frame, 0 == no frame */
- struct llist_head queue; /* queued LLC DL data */
-};
-
struct gprs_rlcmac_tbf {
static void free_all(struct gprs_rlcmac_trx *trx);