Refactored code to improve readability in fill_oai_dci function

openair2/LAYER2/MAC/progran_dci_conversions.h

+/*******************************************************************************
+    OpenAirInterface
+    Copyright(c) 1999 - 2014 Eurecom
+
+    OpenAirInterface 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 3 of the License, or
+    (at your option) any later version.
+
+
+    OpenAirInterface 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 OpenAirInterface.The full GNU General Public License is
+   included in this distribution in the file called "COPYING". If not,
+   see <http://www.gnu.org/licenses/>.
+
+  Contact Information
+  OpenAirInterface Admin: openair_admin@eurecom.fr
+  OpenAirInterface Tech : openair_tech@eurecom.fr
+  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
+
+  Address      : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France.
+
+ *******************************************************************************/
+
+/*! \file dci_conversions.h
+ * \brief Conversion helpers from progran messages to OAI formats DCI  
+ * \author Xenofon Foukas
+ * \date 2016
+ * \version 0.1
+ */
+
+#ifndef LAYER2_MAC_PROGRAN_DCI_CONVERISIONS_H__
+#define LAYER2_MAC_DCI_PROGRAN_CONVERISIONS_H__
+
+#define FILL_DCI_FDD_1(TYPE, DCI, PROGRAN_DCI) \
+  ((TYPE*)DCI)->harq_pid = PROGRAN_DCI->harq_process; \
+  ((TYPE*)DCI)->rv = PROGRAN_DCI->rv[0]; \
+  ((TYPE*)DCI)->rballoc = PROGRAN_DCI->rb_bitmap; \
+  ((TYPE*)DCI)->rah = PROGRAN_DCI->res_alloc; \
+  ((TYPE*)DCI)->mcs = PROGRAN_DCI->mcs[0]; \
+  ((TYPE*)DCI)->TPC = PROGRAN_DCI->tpc; \
+  ((TYPE*)DCI)->ndi = PROGRAN_DCI->ndi[0];
+
+#define FILL_DCI_TDD_1(TYPE, DCI, PROGRAN_DCI) \
+  ((TYPE*)DCI)->harq_pid = PROGRAN_DCI->harq_process; \
+  ((TYPE*)DCI)->rv = PROGRAN_DCI->rv[0]; \
+  ((TYPE*)DCI)->dai = PROGRAN_DCI->dai; \
+  ((TYPE*)DCI)->rballoc = PROGRAN_DCI->rb_bitmap; \
+  ((TYPE*)DCI)->rah = PROGRAN_DCI->res_alloc; \
+  ((TYPE*)DCI)->mcs = PROGRAN_DCI->mcs[0]; \
+  ((TYPE*)DCI)->TPC = PROGRAN_DCI->tpc; \
+  ((TYPE*)DCI)->ndi = PROGRAN_DCI->ndi[0];
+  
+#endif