# HG changeset patch # User Michael Spacefalcon # Date 1397866724 0 # Node ID ffb0442ffccfc175a45277c32bd201541e8d224b # Parent 7228920a0834ae3525798440cef4266ce51f9739 gsm-fw/gpf/tst_drv: got as far as compiling tr2.c diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/Makefile --- a/gsm-fw/gpf/Makefile Sun Apr 13 08:19:38 2014 +0000 +++ b/gsm-fw/gpf/Makefile Sat Apr 19 00:18:44 2014 +0000 @@ -1,4 +1,4 @@ -SUBDIR= frame misc tst_pei +SUBDIR= frame misc tst_drv tst_pei all: ${SUBDIR} diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/tst_drv/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gsm-fw/gpf/tst_drv/Makefile Sat Apr 19 00:18:44 2014 +0000 @@ -0,0 +1,12 @@ +SUBDIR= iram xip + +all: ${SUBDIR} + +${SUBDIR}: FRC + cd $@; ${MAKE} ${MFLAGS} + +clean: FRC + rm -f *.[oa] *.out *errs + for i in ${SUBDIR}; do (cd $$i; ${MAKE} ${MFLAGS} clean); done + +FRC: diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/tst_drv/iram/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gsm-fw/gpf/tst_drv/iram/Makefile Sat Apr 19 00:18:44 2014 +0000 @@ -0,0 +1,11 @@ +CC= arm-elf-gcc +CFLAGS= -O2 -fno-builtin -mthumb-interwork +CPPFLAGS=-I../../inc -DRUN_INT_RAM +VPATH= .. + +OBJS= ser_tr.o titrc.o + +all: ${OBJS} + +clean: + rm -f *.[oa] *errs diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/tst_drv/ser_tr.c --- a/gsm-fw/gpf/tst_drv/ser_tr.c Sun Apr 13 08:19:38 2014 +0000 +++ b/gsm-fw/gpf/tst_drv/ser_tr.c Sat Apr 19 00:18:44 2014 +0000 @@ -21,9 +21,10 @@ #define __SER_TR_C__ #endif +#include "gpfconf.h" #include "typedefs.h" -#include "traceswitch.h" -#include "serialswitch.h" +#include "../../serial/traceswitch.h" +#include "../../serial/serialswitch.h" #include "gdi.h" #include "tstheader.h" @@ -68,10 +69,10 @@ */ void Callback ( void ) { - if ( SER_TR_Data.EnabledSignalType & DRV_SIGTYPE_READ ) + if ( SER_TR_Data.EnabledSignalType & DRV_SIGTYPE_READ ) { Signal.SignalType = DRV_SIGTYPE_READ; - Signal.DrvHandle = SER_TR_Data.Handle; + Signal.DrvHandle = SER_TR_Data.Handle; (SER_TR_Data.Callback)( &Signal ); } @@ -149,7 +150,7 @@ */ USHORT SER_TR_SetSignal ( USHORT SignalType ) { - if ( !(SignalType & ALLOWED_SER_TR_SIGNALS) ) + if ( !(SignalType & ALLOWED_SER_TR_SIGNALS) ) return DRV_INVALID_PARAMS; else SER_TR_Data.EnabledSignalType |= SignalType; @@ -170,7 +171,7 @@ */ USHORT SER_TR_ResetSignal ( USHORT SignalType ) { - if ( !(SignalType & ALLOWED_SER_TR_SIGNALS) ) + if ( !(SignalType & ALLOWED_SER_TR_SIGNALS) ) return DRV_INVALID_PARAMS; else SER_TR_Data.EnabledSignalType &= ~SignalType; @@ -195,7 +196,7 @@ if ( !SER_TR_Data.Connected ) { Signal.SignalType = DRV_SIGTYPE_CONNECT; - Signal.DrvHandle = SER_TR_Data.Handle; + Signal.DrvHandle = SER_TR_Data.Handle; Signal.UserData = NULL; (SER_TR_Data.Callback)( &Signal ); SER_TR_Data.Connected = TRUE; diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/tst_drv/titrc.c --- a/gsm-fw/gpf/tst_drv/titrc.c Sun Apr 13 08:19:38 2014 +0000 +++ b/gsm-fw/gpf/tst_drv/titrc.c Sat Apr 19 00:18:44 2014 +0000 @@ -23,12 +23,13 @@ #define __TITRC_C__ #endif +#include +#include "gpfconf.h" #include "typedefs.h" -#include "string.h" #include "tstheader.h" -#include "rvt_gen.h" +#include "../../riviera/rvt/rvt_gen.h" #include "gdi.h" -#include "serialswitch.h" +#include "../../serial/serialswitch.h" /*==== TYPES ======================================================*/ @@ -185,7 +186,7 @@ */ USHORT TITRC_SetSignal ( USHORT SignalType ) { - if ( !(SignalType & ALLOWED_TITRC_SIGNALS) ) + if ( !(SignalType & ALLOWED_TITRC_SIGNALS) ) return DRV_INVALID_PARAMS; else TITRC_Data.EnabledSignalType |= SignalType; @@ -206,7 +207,7 @@ */ USHORT TITRC_ResetSignal ( USHORT SignalType ) { - if ( !(SignalType & ALLOWED_TITRC_SIGNALS) ) + if ( !(SignalType & ALLOWED_TITRC_SIGNALS) ) return DRV_INVALID_PARAMS; else TITRC_Data.EnabledSignalType &= ~SignalType; @@ -231,7 +232,7 @@ if ( TITRC_Data.connected == FALSE ) { Signal.SignalType = DRV_SIGTYPE_CONNECT; - Signal.DrvHandle = TITRC_Data.Handle; + Signal.DrvHandle = TITRC_Data.Handle; (TITRC_Data.Callback)( &Signal ); TITRC_Data.connected = TRUE; } @@ -256,16 +257,16 @@ for (;;) ; - callback_busy = 1; + callback_busy = 1; if ( TITRC_Data.EnabledSignalType & DRV_SIGTYPE_READ ) { TITRC_Data.read_ptr = ptr; TITRC_Data.read_len = len; Signal.SignalType = DRV_SIGTYPE_READ; - Signal.DrvHandle = TITRC_Data.Handle; + Signal.DrvHandle = TITRC_Data.Handle; (TITRC_Data.Callback)( &Signal ); } - callback_busy = 0; + callback_busy = 0; } #endif diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/tst_drv/tr2.c --- a/gsm-fw/gpf/tst_drv/tr2.c Sun Apr 13 08:19:38 2014 +0000 +++ b/gsm-fw/gpf/tst_drv/tr2.c Sat Apr 19 00:18:44 2014 +0000 @@ -21,7 +21,8 @@ #define __TR_C__ #endif -#include "string.h" +#include +#include "gpfconf.h" #include "typedefs.h" #include "gdi.h" #include "vsi.h" diff -r 7228920a0834 -r ffb0442ffccf gsm-fw/gpf/tst_drv/xip/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gsm-fw/gpf/tst_drv/xip/Makefile Sat Apr 19 00:18:44 2014 +0000 @@ -0,0 +1,11 @@ +CC= arm-elf-gcc +CFLAGS= -O2 -fno-builtin -mthumb-interwork -mthumb +CPPFLAGS=-I../../inc -DRUN_FLASH +VPATH= .. + +OBJS= ser_tr.o titrc.o tr2.o + +all: ${OBJS} + +clean: + rm -f *.[oa] *errs