# HG changeset patch # User Michael Spacefalcon # Date 1412311275 0 # Node ID 4ee3bc3fc5409681309a9d6b16ca373cc5539bb7 # Parent 857ded4ed2a125915bb5e9c1a042a35ca140bfce dl_state.c compiles diff -r 857ded4ed2a1 -r 4ee3bc3fc540 gsm-fw/g23m-gsm/dl/Makefile --- a/gsm-fw/g23m-gsm/dl/Makefile Fri Oct 03 04:30:17 2014 +0000 +++ b/gsm-fw/g23m-gsm/dl/Makefile Fri Oct 03 04:41:15 2014 +0000 @@ -6,7 +6,7 @@ -I../../cdginc OBJS= dl_com.o dl_dcch0.o dl_dcch3.o dl_dph.o dl_drr.o dl_em.o dl_pei.o \ - dl_sacch0.o dl_signal.o + dl_sacch0.o dl_signal.o dl_state.o all: ${OBJS} diff -r 857ded4ed2a1 -r 4ee3bc3fc540 gsm-fw/g23m-gsm/dl/dl_state.c --- a/gsm-fw/g23m-gsm/dl/dl_state.c Fri Oct 03 04:30:17 2014 +0000 +++ b/gsm-fw/g23m-gsm/dl/dl_state.c Fri Oct 03 04:41:15 2014 +0000 @@ -22,6 +22,10 @@ #ifndef DL_STATE_C #define DL_STATE_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_DL #define NEW_REJ_ACK /* Acknowledgement by valid reject frame * in accordance with 3GPP 04.06, 5.5.3.1 @@ -43,7 +47,7 @@ #include "ccdapi.h" #include "dl.h" #include "dl_em.h" -#include "DL_trc.h" +#include "dl_trc.h" /*==== TYPEDEFS ===================================================*/ typedef struct @@ -152,7 +156,7 @@ int cause; int l2_offset; - GET_INSTANCE_DATA; + GET_INSTANCE_DATA; TRACE_EVENT_WIN_P1 ("downlink(): dcch0_ch_type:%s", CH_TYPE_NAME[dl_data->dcch0_ch_type]); @@ -425,7 +429,6 @@ } - TRACE_EVENT_WIN_P4 ("downlink() out:%s SAPI=%u st=%u vtx=%s", CH_TYPE_NAME[channel_type], cch_i.sapi, cch_i.state, VTX_NAME[cch_i.pcch->vtx]); @@ -1580,7 +1583,7 @@ /* * GSM 04.06, 5.7.4 The data link shall remain in current state - * until itīs release by layer 3 ??? + * until it's release by layer 3 ??? */ pcch_i->mdl_error_ind = SEQUENCE_ERROR; /* send mdl error ind after sequence error */ @@ -2244,7 +2247,6 @@ TRACE_EVENT_WIN_P2 ("TIMER_RECOVERY state: decrement vs to %u, remember m=%u", pcch->vs, m_bit); } - com_build_I_command (pcch->ch_type, sapi, pcch->vs, pcch->vr, p_bit, m_bit, queue); pcch->vs++; @@ -2578,7 +2580,6 @@ break; }/* endswitch vtx */ - return ret; }/* endfunc uplink_mfe */