zcy
/
tinySA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7730 35acf78f-673a-0410-8e92-d51de3d6d3f4

master
Giovanni Di Sirio 2015-03-07 13:43:27 +00:00
parent e09208306b
commit d3f5e53d03
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/various/RT-Win32-Simulator/Makefile
View File

@ -21,7 +21,7 @@ CC = $(TRGT)gcc
AS = $(TRGT)gcc -x assembler-with-cpp AS = $(TRGT)gcc -x assembler-with-cpp
# List all default C defines here, like -D_DEBUG=1 # List all default C defines here, like -D_DEBUG=1
DDEFS = -DSIMULATOR -DSHELL_USE_IPRINTF=FALSE DDEFS = -DSIMULATOR
# List all default ASM defines here, like -D_DEBUG=1 # List all default ASM defines here, like -D_DEBUG=1
DADEFS = DADEFS =
@ -93,7 +93,7 @@ ULIBDIR =
ULIBS = ULIBS =
# Define optimisation level here # Define optimisation level here
OPT = -ggdb -O2 -fomit-frame-pointer OPT = -ggdb -O2
# #
# End of user defines # End of user defines
@ -108,7 +108,7 @@ LIBS = $(DLIBS) $(ULIBS)
LDFLAGS = -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR) LDFLAGS = -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)
ASFLAGS = -Wa,-amhls=$(<:.s=.lst) $(ADEFS) ASFLAGS = -Wa,-amhls=$(<:.s=.lst) $(ADEFS)
CPFLAGS = $(OPT) -Wall -Wextra -Wstrict-prototypes -fverbose-asm -Wa,-alms=$(<:.c=.lst) $(DEFS) CPFLAGS = -Wall -Wextra -Wstrict-prototypes -fverbose-asm -Wa,-alms=$(<:.c=.lst) $(DEFS)
# Generate dependency information # Generate dependency information
CPFLAGS += -MD -MP -MF .dep/$(@F).d CPFLAGS += -MD -MP -MF .dep/$(@F).d
@ -120,13 +120,13 @@ CPFLAGS += -MD -MP -MF .dep/$(@F).d
all: $(OBJS) $(PROJECT).exe all: $(OBJS) $(PROJECT).exe
%.o : %.c %.o : %.c
$(CC) -c $(CPFLAGS) -I . $(INCDIR) $< -o $@ $(CC) -c $(OPT) $(CPFLAGS) -I . $(INCDIR) $< -o $@
%.o : %.s %.o : %.s
$(AS) -c $(ASFLAGS) $< -o $@ $(AS) -c $(OPT) $(ASFLAGS) $< -o $@
%exe: $(OBJS) %exe: $(OBJS)
$(CC) $(OBJS) $(LDFLAGS) $(LIBS) -o $@ $(CC) $(OPT) $(OBJS) $(LDFLAGS) $(LIBS) -o $@
gcov: gcov:
-mkdir gcov -mkdir gcov

3
os/rt/src/chdynamic.c
View File

@ -119,7 +119,8 @@ void chThdRelease(thread_t *tp) {
break; break;
#endif #endif
default: default:
chDbgAssert(false, "unexpected case"); /* Nothing to do for static threads, those are removed from the
registry on exit.*/
break; break;
} }
} }

1
os/rt/src/chthreads.c
View File

@ -494,6 +494,7 @@ msg_t chThdWait(thread_t *tp) {
chSysUnlock(); chSysUnlock();
#if CH_CFG_USE_DYNAMIC == TRUE #if CH_CFG_USE_DYNAMIC == TRUE
/* Releasing a lock if it is a dynamic thread.*/
chThdRelease(tp); chThdRelease(tp);
#endif #endif