FreeCalypso > hg > freecalypso-sw
changeset 310:083f262b7bbe
gsm-fw: disabled DAR links
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Mon, 17 Mar 2014 05:56:06 +0000 |
| parents | a7087f91c752 |
| children | a2194416fd7c |
| files | gsm-fw/finlink/Makefile gsm-fw/services/Makefile gsm-fw/services/dar/dar_emergency.c gsm-fw/services/dar/dar_msg_ft.c |
| diffstat | 4 files changed, 11 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/finlink/Makefile Mon Mar 17 04:51:36 2014 +0000 +++ b/gsm-fw/finlink/Makefile Mon Mar 17 05:56:06 2014 +0000 @@ -16,7 +16,7 @@ INT_PIECES= ../bsp/niq32.o EXT_PIECES= ../bsp/xipcode.o ../serial/xipcode.o ../sysglue/xipcode.o \ - ../services/ffs/xipcode.o + ../services/ffs/xipcode.o ../services/dar/xipcode.o ifeq (${RVM_ETM_SWE},1) EXT_PIECES+= ../services/etm/xipcode.o endif
--- a/gsm-fw/services/Makefile Mon Mar 17 04:51:36 2014 +0000 +++ b/gsm-fw/services/Makefile Mon Mar 17 05:56:06 2014 +0000 @@ -2,7 +2,7 @@ ALL_SUBDIR= dar etm ffs -BUILD_SUBDIR= ffs +BUILD_SUBDIR= dar ffs ifeq (${RVM_ETM_SWE},1) BUILD_SUBDIR+= etm endif
--- a/gsm-fw/services/dar/dar_emergency.c Mon Mar 17 04:51:36 2014 +0000 +++ b/gsm-fw/services/dar/dar_emergency.c Mon Mar 17 05:56:06 2014 +0000 @@ -62,8 +62,6 @@ /**** Extern functions ****/ extern void * dar_read_mbox (UINT8 mbox); - extern void exception(void); - /***************************************************************************/ /* */ @@ -250,10 +248,7 @@ } } - #ifndef _WINDOWS - /* branch to "exception" defined in the int.s*/ - exception(); - #endif + dar_reset(); } /* dar_exception_arm_undefined */ @@ -302,10 +297,7 @@ } } - #ifndef _WINDOWS - /* branch to "exception" defined in the int.s*/ - exception(); - #endif + dar_reset(); } /* dar_exception_arm_swi */ @@ -382,10 +374,9 @@ } #endif - /* branch to "exception" defined in the int.s*/ - exception(); + dar_reset(); #endif - + } /* dar_exception_arm_abort_prefetch */ /***************************************************************************/ @@ -462,8 +453,7 @@ } #endif - /* branch to "exception" defined in the int.s*/ - exception(); + dar_reset(); #endif } /* dar_exception_arm_abort_data */ @@ -513,10 +503,7 @@ } } - #ifndef _WINDOWS - /* branch to "exception" defined in the int.s*/ - exception(); - #endif + dar_reset(); } /* dar_exception_arm_reserved */ @@ -571,10 +558,9 @@ void dar_exception(int abort_type) { - #ifndef _WINDOWS - /* branch to "exception" defined in the int.s*/ - exception(); - #endif + /* TODO: emit low-level serial message */ + while (1) + ; } /* dar_exception */ #endif /* #ifdef RVM_DAR_SWE */
--- a/gsm-fw/services/dar/dar_msg_ft.c Mon Mar 17 04:51:36 2014 +0000 +++ b/gsm-fw/services/dar/dar_msg_ft.c Mon Mar 17 05:56:06 2014 +0000 @@ -54,8 +54,6 @@ /**** Extern functions ****/ extern void * dar_read_mbox (UINT8 mbox); - extern void exception(void); - /***************************************************************************/ /* Function dar_filter_request */ /* */