# HG changeset patch # User Michael Spacefalcon # Date 1412306757 0 # Node ID 900be07de4e8f56728c528a97a562fe85bd0ef82 # Parent 615fb8847d3fc4f78da8589c9c0ad8a74c044d83 dl_com.c compiles diff -r 615fb8847d3f -r 900be07de4e8 gsm-fw/g23m-gsm/dl/Makefile --- a/gsm-fw/g23m-gsm/dl/Makefile Thu Oct 02 18:48:12 2014 +0000 +++ b/gsm-fw/g23m-gsm/dl/Makefile Fri Oct 03 03:25:57 2014 +0000 @@ -1,5 +1,13 @@ -# stub Makefile, to be filled out -all: +CC= arm-elf-gcc +LD= arm-elf-ld + +CFLAGS= -O2 -fno-builtin -mthumb-interwork -mthumb +CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \ + -I../../cdginc + +OBJS= dl_com.o + +all: ${OBJS} clean: rm -f *.[oa] *.out *errs diff -r 615fb8847d3f -r 900be07de4e8 gsm-fw/g23m-gsm/dl/dl.h --- a/gsm-fw/g23m-gsm/dl/dl.h Thu Oct 02 18:48:12 2014 +0000 +++ b/gsm-fw/g23m-gsm/dl/dl.h Fri Oct 03 03:25:57 2014 +0000 @@ -46,7 +46,7 @@ /* * DL_TRACE_ENABLED * is set : Enables the trace feature (buffered or immediately trace) - * isīnt set: Disables the trace feature + * isn't set: Disables the trace feature */ #define DL_TRACE_ENABLED @@ -56,10 +56,10 @@ * is set : Enables unbuffered trace. Write out the trace immediately without * buffering (or rather delayed by signalling to itself while the MS * is in interrupt context state). - * isīnt set: Enables buffered trace (write out in idle mode only) + * isn't set: Enables buffered trace (write out in idle mode only) * Attention: Due to the interrupt context of the uplink and downlink trace - this feature requires very fast trace capability. The normal trace - transfer rate of 115200 Baud is not sufficient! + * this feature requires very fast trace capability. The normal trace + * transfer rate of 115200 Baud is not sufficient! */ #define DL_IMMEDIATE_TRACE @@ -67,14 +67,14 @@ * DISABLE_MEASREPORT_TRACE * operates only with enabled buffered trace! * is set : Disables trace of measurement reports - * isīnt set: Normal trace of measurement reports + * isn't set: Normal trace of measurement reports #define DISABLE_MEASREPORT_TRACE */ /* * DISABLE_EMPTY_UI * operates only with enabled buffered trace! * is set : Disables trace of empty frames - * isīnt set: Normal trace of empty frames + * isn't set: Normal trace of empty frames */ #define DISABLE_EMPTY_UI @@ -87,7 +87,7 @@ * opportunities (see DL_FACCH_RELEASE_DELAY_VALUE and * DL_SDCCH_RELEASE_DELAY_VALUE). The delay stops after the given * count of uplinked dummy frames or at a downlink on this channel. - * isīnt set: No delayed release indication + * isn't set: No delayed release indication */ #define DELAYED_RELEASE_IND @@ -108,7 +108,7 @@ * DL delays the transmit of the SABM frame. After (re-)establishment * request from RR, DL sends only dummies (return NULL) for the first * uplink opportunities (see DL_FACCH_SABM_DELAY_VALUE). - * isīnt set: No delayed uplink of the SABM frame. + * isn't set: No delayed uplink of the SABM frame. */ #define DELAYED_SABM @@ -131,7 +131,7 @@ * is set : The leaving of dedicated mode happens in latest moment, after * the reception of an UA frame after sent of DISC * or before uplink of the UA frame after reception of a DISC frame. - * isīnt set: In this case the dedicated mode is leaving immediately after + * isn't set: In this case the dedicated mode is leaving immediately after * the detection of a release (after the incoming L3 message * CHANNEL RELEASE, or after reception of a DISC frame or before * the uplink of a DISC frame). @@ -141,7 +141,7 @@ /* * IFRAME_AS_RR * is set : I frame might response with I frame - * isīnt set: I frame must response with RR frame + * isn't set: I frame must response with RR frame */ #define IFRAME_AS_RR @@ -150,7 +150,7 @@ * is set : DL does not send primitives or traces within L1 interrupt context * anymore. It sends signals instead. The primitives or traces are * delayed until the entity will be in the own context. - * isīnt set: Primitves or traces are processed immediately even is DL within + * isn't set: Primitves or traces are processed immediately even is DL within * in L1 interrupt context. */ #define INVOKE_SIGNAL @@ -574,7 +574,7 @@ typedef USHORT T_SIGNAL_OPC; #define FRAME_2_3_X #else /* frame version unknown */ -#pragma error("unknown frame version, missing PEI_H or __PEI_H__") +#error "unknown frame version, missing PEI_H or __PEI_H__" #endif /* frame version */ @@ -797,7 +797,7 @@ T_DL_DATA_IND * dcch3_in_msg; T_QUEUE dcch0_queue; T_QUEUE dcch3_queue; - BOOL dcch0_unserved; /* storing of indication (unserved DL-DATA_REQīs) */ + BOOL dcch0_unserved; /* storing of indication (unserved DL-DATA_REQ's) */ BOOL dcch3_unserved; /* for use with DL-ESTABLISHMENT-CNF */ T_RADIO_FRAME l2_frame;/* Buffer for l2_frame and empty l2 frame */ BOOL RR_dedicated;/* Flag for RR dedictated mode @@ -1225,7 +1225,12 @@ #define DL_OFFLINE_TRACE(type, ch, ch_type, data) /* do nothing */ #endif /* DL_TRACE_ENABLED */ -#if !defined(_FILE10_) +/* + * FreeCalypso change: this __FILE10__ thing is gross, so let's try + * removing it. We run gcc from the directory where the source is, + * pathname=filename, so __FILE__ should be short enough. + */ +#if 0 && !defined(_FILE10_) #define __FILE10__ (__FILE__+strlen(__FILE__)-11) #endif /* !_FILE10_ */ @@ -1243,7 +1248,7 @@ #if defined (DL_TRACE_ENABLED) && defined(DL_TRACE_PFREE) -#define MY_PFREE(p) p = my_pfree (p, __LINE__, __FILE10__) +#define MY_PFREE(p) p = my_pfree (p, __LINE__, __FILE__) void* my_pfree(void *pointer, int line, char *file); #else #define MY_PFREE(p) PFREE(p) @@ -1274,5 +1279,3 @@ #endif /* 0 */ #endif /* !__DL_H__ */ - - diff -r 615fb8847d3f -r 900be07de4e8 gsm-fw/g23m-gsm/dl/dl_com.c --- a/gsm-fw/g23m-gsm/dl/dl_com.c Thu Oct 02 18:48:12 2014 +0000 +++ b/gsm-fw/g23m-gsm/dl/dl_com.c Fri Oct 03 03:25:57 2014 +0000 @@ -22,6 +22,10 @@ #ifndef DL_COM_C #define DL_COM_C +#include "config.h" +#include "fixedconf.h" +#include "condat-features.h" + #define ENTITY_DL /*==== INCLUDES ===================================================*/ @@ -86,7 +90,7 @@ } #endif /* INVOKE_SIGNAL */ -TRACE_ASSERT(pointer); + TRACE_ASSERT(pointer); MY_PFREE (pointer); } @@ -1324,4 +1328,3 @@ #endif /* defined (DL_TRACE_ENABLED) || defined (FF_EM_MODE) */ #endif /* DL_COM_C */ -