]> rtime.felk.cvut.cz Git - pes-rpp/rpp-lwip.git/commitdiff
Remove inline from non-static functions
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 19 Aug 2014 17:13:05 +0000 (19:13 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 19 Aug 2014 17:16:17 +0000 (19:16 +0200)
It seems that the compiler/CCS is somehow buggy when it sees non-static
inline functions, because the build is successful on desktop computers
but not buildbot's server. This change solves the buildbot failure. The
error message was:

Building target: rpp-test-sw.out
Invoking: ARM Linker
"/opt/ti/ccsv5/tools/compiler/arm_5.0.1/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 --abi=eabi -g --gcc --diag_warning=225 --display_error_number --enum_type=packed -z -m"rpp-test-sw.map" -i"/opt/ti/ccsv5/tools/compiler/arm_5.0.1/lib" -i"/opt/ti/ccsv5/tools/compiler/arm_5.0.1/include" --reread_libs --warn_sections --display_error_number --rom_model --be32 -o "rpp-test-sw.out"  "./cmdproc/src/i2str.obj" "./cmdproc/src/cmdproc_utils.obj" "./cmdproc/src/cmdproc_run.obj" "./cmdproc/src/cmdproc_io_tisci.obj" "./cmdproc/src/cmdproc_io_std_line.obj" "./cmdproc/src/cmdproc_io_line.obj" "./cmdproc/src/cmdproc_io.obj" "./cmdproc/src/cmdproc_freertos_tms570.obj" "./cmdproc/src/cmdproc.obj" "./commands/main.obj" "./commands/cmd_vbat.obj" "./commands/cmd_spi.obj" "./commands/cmd_sdram.obj" "./commands/cmd_port.obj" "./commands/cmd_pin.obj" "./commands/cmd_netstats.obj" "./commands/cmd_nc.obj" "./commands/cmd_motor_example.obj" "./commands/cmd_lout.obj" "./commands/cmd_lin.obj" "./commands/cmd_hout.obj" "./commands/cmd_hbr.obj" "./commands/cmd_fray.obj" "./commands/cmd_fr_basic_test.obj" "./commands/cmd_emac.obj" "./commands/cmd_din.obj" "./commands/cmd_dac.obj" "./commands/cmd_can.obj" "./commands/cmd_adc.obj" "./commands/cmd.obj" -l"/home/rpp/buildbot/slave/test-sw-lib-head/build/rpp-lib/rpp/TMS570LS313xFlashLnk.cmd" -l"/home/rpp/buildbot/slave/test-sw-lib-head/build/rpp-lib/rpp-lib.lib" -l"rtsv7R4_T_be_v3D16_eabi.lib"
<Linking>

 undefined        first referenced
  symbol              in file
 ---------        ----------------
 sys_mutex_lock   /home/rpp/buildbot/slave/test-sw-lib-head/build/rpp-lib/rpp-lib.lib<mem.obj>
 sys_mutex_unlock /home/rpp/buildbot/slave/test-sw-lib-head/build/rpp-lib/rpp-lib.lib<mem.obj>

error #10234-D: unresolved symbols remain
error #10010: errors encountered during linking; "rpp-test-sw.out" not built

src/arch/sys_arch.c

index ec28329a410237df2235408bed1335d46205cfef..726e2dd77dd7bfb9f20318c0d9bd102dfd5819d7 100644 (file)
@@ -58,17 +58,17 @@ err_t sys_mutex_new(sys_mutex_t *mutex)
     return ERR_MEM;
 }
 /* locks a mutex */
-void inline sys_mutex_lock(sys_mutex_t *mutex)
+void sys_mutex_lock(sys_mutex_t *mutex)
 {
        xSemaphoreTake(*mutex,portMAX_DELAY); /* block time changed from 0 to portMAX_DELAY -- it might break timers! - just testing stability */
 }
 /* unlocks a mutex */
-void inline sys_mutex_unlock(sys_mutex_t *mutex)
+void sys_mutex_unlock(sys_mutex_t *mutex)
 {
        xSemaphoreGive(*mutex);
 }
 /* frees memory space formerly taken by mutex */
-void inline sys_mutex_free(sys_mutex_t *mutex)
+void sys_mutex_free(sys_mutex_t *mutex)
 {
        vSemaphoreDelete(*mutex);
 }
@@ -82,7 +82,7 @@ err_t sys_sem_new(sys_sem_t *sem, u8_t count)
     return ERR_MEM;
 }
 /* signals a semaphore */
-void inline sys_sem_signal(sys_sem_t *sem)
+void sys_sem_signal(sys_sem_t *sem)
 {
        xSemaphoreGive(*sem);
 }
@@ -102,7 +102,7 @@ u32_t sys_arch_sem_wait(sys_sem_t *sem, u32_t timeout)
     return ( (xTaskGetTickCount() - ticksBeforeSemphr) / portTICK_RATE_MS ); /* return time spent waiting for the semaphore - u can use xTaskGetTickCount() */
 }
 /* deletes a semaphore */
-void inline sys_sem_free(sys_sem_t *sem)
+void sys_sem_free(sys_sem_t *sem)
 {
        vSemaphoreDelete(*sem);
 }
@@ -115,7 +115,7 @@ err_t sys_mbox_new(sys_mbox_t *mbox, int size)
        return ERR_OK;
 }
 /* posts the "msg" to the mailbox, blocks if mbox full */
-void inline sys_mbox_post(sys_mbox_t *mbox, void *msg)
+void sys_mbox_post(sys_mbox_t *mbox, void *msg)
 {
        while(xQueueSendToBack(*mbox, &msg, portMAX_DELAY) == errQUEUE_FULL);
 }
@@ -160,7 +160,7 @@ u32_t sys_arch_mbox_tryfetch(sys_mbox_t *mbox, void **msg)
        return 0; /* we waited 0ms */
 }
 /* deletes a mbox */
-void inline sys_mbox_free(sys_mbox_t *mbox)
+void sys_mbox_free(sys_mbox_t *mbox)
 {
        vQueueDelete(*mbox);
 }