mirror of https://github.com/rusefi/ChibiOS.git
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8919 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
adcc516668
commit
8f89ec3c0b
|
@ -91,7 +91,7 @@ include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Bxx/platform.mk
|
||||||
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
||||||
# RTOS files (optional).
|
# RTOS files (optional).
|
||||||
include $(CHIBIOS)/os/rt/rt.mk
|
include $(CHIBIOS)/os/rt/rt.mk
|
||||||
include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/port.mk
|
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.mk
|
||||||
# Other files (optional).
|
# Other files (optional).
|
||||||
include $(CHIBIOS)/test/rt/test.mk
|
include $(CHIBIOS)/test/rt/test.mk
|
||||||
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
||||||
|
|
|
@ -136,8 +136,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -91,7 +91,7 @@ include $(CHIBIOS)/os/hal/ports/SPC5/SPC560Dxx/platform.mk
|
||||||
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
include $(CHIBIOS)/os/hal/osal/rt/osal.mk
|
||||||
# RTOS files (optional).
|
# RTOS files (optional).
|
||||||
include $(CHIBIOS)/os/rt/rt.mk
|
include $(CHIBIOS)/os/rt/rt.mk
|
||||||
include $(CHIBIOS)/os/common/startup/e200/compilers/GCC/mk/port.mk
|
include $(CHIBIOS)/os/common/ports/e200/compilers/GCC/mk/port.mk
|
||||||
# Other files (optional).
|
# Other files (optional).
|
||||||
include $(CHIBIOS)/test/rt/test.mk
|
include $(CHIBIOS)/test/rt/test.mk
|
||||||
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
||||||
|
|
|
@ -136,8 +136,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -136,8 +136,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -119,8 +119,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -119,8 +119,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -136,8 +136,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -136,8 +136,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -36,7 +36,7 @@ static void Thread1(void const *arg) {
|
||||||
/*
|
/*
|
||||||
* Thread definition block.
|
* Thread definition block.
|
||||||
*/
|
*/
|
||||||
osThreadDef(Thread1, osPriorityAboveNormal, 128);
|
osThreadDef(Thread1, osPriorityAboveNormal, 128, "blinker");
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Application entry point.
|
* Application entry point.
|
||||||
|
|
|
@ -150,8 +150,8 @@ int __attribute__((noreturn)) main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -317,8 +317,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE)) {
|
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE)) {
|
||||||
shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
}
|
}
|
||||||
chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));
|
chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -150,8 +150,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -249,8 +249,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,6 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk
|
||||||
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
||||||
# Other files (optional).
|
# Other files (optional).
|
||||||
include $(CHIBIOS)/test/rt/test.mk
|
include $(CHIBIOS)/test/rt/test.mk
|
||||||
|
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
||||||
|
include $(CHIBIOS)/os/various/shell/shell.mk
|
||||||
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
|
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
|
||||||
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
|
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
|
||||||
|
|
||||||
|
@ -117,10 +119,9 @@ CSRC = $(STARTUPSRC) \
|
||||||
$(TESTSRC) \
|
$(TESTSRC) \
|
||||||
$(LWSRC) \
|
$(LWSRC) \
|
||||||
$(FATFSSRC) \
|
$(FATFSSRC) \
|
||||||
|
$(STREAMSSRC) \
|
||||||
|
$(SHELLSRC) \
|
||||||
$(CHIBIOS)/os/various/evtimer.c \
|
$(CHIBIOS)/os/various/evtimer.c \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
|
||||||
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
|
||||||
$(CHIBIOS)/os/various/shell.c \
|
|
||||||
web/web.c usbcfg.c main.c
|
web/web.c usbcfg.c main.c
|
||||||
|
|
||||||
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
||||||
|
@ -152,8 +153,8 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
|
||||||
|
|
||||||
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
||||||
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
||||||
$(LWINC) $(FATFSINC) \
|
$(STREAMSINC) $(SHELLINC) $(LWINC) $(FATFSINC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various
|
$(CHIBIOS)/os/various
|
||||||
|
|
||||||
#
|
#
|
||||||
# Project, sources and paths
|
# Project, sources and paths
|
||||||
|
|
|
@ -157,58 +157,6 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
||||||
#define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256)
|
|
||||||
|
|
||||||
static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
size_t n, size;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: mem\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
n = chHeapStatus(NULL, &size);
|
|
||||||
chprintf(chp, "core free memory : %u bytes\r\n", chCoreGetStatusX());
|
|
||||||
chprintf(chp, "heap fragments : %u\r\n", n);
|
|
||||||
chprintf(chp, "heap free total : %u bytes\r\n", size);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
static const char *states[] = {CH_STATE_NAMES};
|
|
||||||
thread_t *tp;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: threads\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
chprintf(chp, " addr stack prio refs state time\r\n");
|
|
||||||
tp = chRegFirstThread();
|
|
||||||
do {
|
|
||||||
chprintf(chp, "%08lx %08lx %4lu %4lu %9s\r\n",
|
|
||||||
(uint32_t)tp, (uint32_t)tp->p_ctx.r13,
|
|
||||||
(uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
|
|
||||||
states[tp->p_state]);
|
|
||||||
tp = chRegNextThread(tp);
|
|
||||||
} while (tp != NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
thread_t *tp;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: test\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),
|
|
||||||
TestThread, chp);
|
|
||||||
if (tp == NULL) {
|
|
||||||
chprintf(chp, "out of memory\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
chThdWait(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
|
static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
FRESULT err;
|
FRESULT err;
|
||||||
|
@ -238,9 +186,6 @@ static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static const ShellCommand commands[] = {
|
static const ShellCommand commands[] = {
|
||||||
{"mem", cmd_mem},
|
|
||||||
{"threads", cmd_threads},
|
|
||||||
{"test", cmd_test},
|
|
||||||
{"tree", cmd_tree},
|
{"tree", cmd_tree},
|
||||||
{NULL, NULL}
|
{NULL, NULL}
|
||||||
};
|
};
|
||||||
|
@ -254,6 +199,8 @@ static const ShellConfig shell_cfg1 = {
|
||||||
/* Main and generic code. */
|
/* Main and generic code. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
|
static thread_t *shelltp = NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Card insertion event.
|
* Card insertion event.
|
||||||
*/
|
*/
|
||||||
|
@ -285,6 +232,18 @@ static void RemoveHandler(eventid_t id) {
|
||||||
fs_ready = FALSE;
|
fs_ready = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Shell exit event.
|
||||||
|
*/
|
||||||
|
static void ShellHandler(eventid_t id) {
|
||||||
|
|
||||||
|
(void)id;
|
||||||
|
if (chThdTerminatedX(shelltp)) {
|
||||||
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
|
shelltp = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Green LED blinker thread, times are in milliseconds.
|
* Green LED blinker thread, times are in milliseconds.
|
||||||
*/
|
*/
|
||||||
|
@ -303,12 +262,12 @@ static THD_FUNCTION(Thread1, arg) {
|
||||||
* Application entry point.
|
* Application entry point.
|
||||||
*/
|
*/
|
||||||
int main(void) {
|
int main(void) {
|
||||||
static thread_t *shelltp = NULL;
|
|
||||||
static const evhandler_t evhndl[] = {
|
static const evhandler_t evhndl[] = {
|
||||||
InsertHandler,
|
InsertHandler,
|
||||||
RemoveHandler
|
RemoveHandler,
|
||||||
|
ShellHandler
|
||||||
};
|
};
|
||||||
event_listener_t el0, el1;
|
event_listener_t el0, el1, el2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* System initializations.
|
* System initializations.
|
||||||
|
@ -367,19 +326,17 @@ int main(void) {
|
||||||
http_server, NULL);
|
http_server, NULL);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Normal main() thread activity, in this demo it does nothing except
|
* Normal main() thread activity, handling SD card events and shell
|
||||||
* sleeping in a loop and listen for events.
|
* start/exit.
|
||||||
*/
|
*/
|
||||||
chEvtRegister(&inserted_event, &el0, 0);
|
chEvtRegister(&inserted_event, &el0, 0);
|
||||||
chEvtRegister(&removed_event, &el1, 1);
|
chEvtRegister(&removed_event, &el1, 1);
|
||||||
|
chEvtRegister(&shell_terminated, &el2, 2);
|
||||||
while (true) {
|
while (true) {
|
||||||
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))
|
if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE)) {
|
||||||
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
else if (chThdTerminatedX(shelltp)) {
|
"shell", NORMALPRIO + 1,
|
||||||
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
shellThread, (void *)&shell_cfg1);
|
||||||
shelltp = NULL; /* Triggers spawning of a new shell. */
|
|
||||||
}
|
|
||||||
if (palReadPad(GPIOA, GPIOA_BUTTON_WKUP) != 0) {
|
|
||||||
}
|
}
|
||||||
chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));
|
chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -124,8 +124,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,6 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk
|
||||||
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
|
||||||
# Other files (optional).
|
# Other files (optional).
|
||||||
include $(CHIBIOS)/test/rt/test.mk
|
include $(CHIBIOS)/test/rt/test.mk
|
||||||
|
include $(CHIBIOS)/os/hal/lib/streams/streams.mk
|
||||||
|
include $(CHIBIOS)/os/various/shell/shell.mk
|
||||||
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
|
include $(CHIBIOS)/os/various/lwip_bindings/lwip.mk
|
||||||
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
|
include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
|
||||||
|
|
||||||
|
@ -117,10 +119,9 @@ CSRC = $(STARTUPSRC) \
|
||||||
$(TESTSRC) \
|
$(TESTSRC) \
|
||||||
$(LWSRC) \
|
$(LWSRC) \
|
||||||
$(FATFSSRC) \
|
$(FATFSSRC) \
|
||||||
|
$(STREAMSSRC) \
|
||||||
|
$(SHELLSRC) \
|
||||||
$(CHIBIOS)/os/various/evtimer.c \
|
$(CHIBIOS)/os/various/evtimer.c \
|
||||||
$(CHIBIOS)/os/hal/lib/streams/memstreams.c \
|
|
||||||
$(CHIBIOS)/os/hal/lib/streams/chprintf.c \
|
|
||||||
$(CHIBIOS)/os/various/shell.c \
|
|
||||||
web/web.c usbcfg.c main.c
|
web/web.c usbcfg.c main.c
|
||||||
|
|
||||||
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
# C++ sources that can be compiled in ARM or THUMB mode depending on the global
|
||||||
|
@ -152,8 +153,8 @@ ASMSRC = $(STARTUPASM) $(PORTASM) $(OSALASM)
|
||||||
|
|
||||||
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
|
||||||
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
$(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
|
||||||
$(LWINC) $(FATFSINC) \
|
$(STREAMSINC) $(SHELLINC) $(LWINC) $(FATFSINC) \
|
||||||
$(CHIBIOS)/os/hal/lib/streams $(CHIBIOS)/os/various
|
$(CHIBIOS)/os/various
|
||||||
|
|
||||||
#
|
#
|
||||||
# Project, sources and paths
|
# Project, sources and paths
|
||||||
|
|
|
@ -157,58 +157,6 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
#define SHELL_WA_SIZE THD_WORKING_AREA_SIZE(2048)
|
||||||
#define TEST_WA_SIZE THD_WORKING_AREA_SIZE(256)
|
|
||||||
|
|
||||||
static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
size_t n, size;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: mem\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
n = chHeapStatus(NULL, &size);
|
|
||||||
chprintf(chp, "core free memory : %u bytes\r\n", chCoreGetStatusX());
|
|
||||||
chprintf(chp, "heap fragments : %u\r\n", n);
|
|
||||||
chprintf(chp, "heap free total : %u bytes\r\n", size);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
static const char *states[] = {CH_STATE_NAMES};
|
|
||||||
thread_t *tp;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: threads\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
chprintf(chp, " addr stack prio refs state time\r\n");
|
|
||||||
tp = chRegFirstThread();
|
|
||||||
do {
|
|
||||||
chprintf(chp, "%08lx %08lx %4lu %4lu %9s\r\n",
|
|
||||||
(uint32_t)tp, (uint32_t)tp->p_ctx.r13,
|
|
||||||
(uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
|
|
||||||
states[tp->p_state]);
|
|
||||||
tp = chRegNextThread(tp);
|
|
||||||
} while (tp != NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
|
|
||||||
thread_t *tp;
|
|
||||||
|
|
||||||
(void)argv;
|
|
||||||
if (argc > 0) {
|
|
||||||
chprintf(chp, "Usage: test\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
tp = chThdCreateFromHeap(NULL, TEST_WA_SIZE, chThdGetPriorityX(),
|
|
||||||
TestThread, chp);
|
|
||||||
if (tp == NULL) {
|
|
||||||
chprintf(chp, "out of memory\r\n");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
chThdWait(tp);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
|
static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
FRESULT err;
|
FRESULT err;
|
||||||
|
@ -238,9 +186,6 @@ static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
}
|
}
|
||||||
|
|
||||||
static const ShellCommand commands[] = {
|
static const ShellCommand commands[] = {
|
||||||
{"mem", cmd_mem},
|
|
||||||
{"threads", cmd_threads},
|
|
||||||
{"test", cmd_test},
|
|
||||||
{"tree", cmd_tree},
|
{"tree", cmd_tree},
|
||||||
{NULL, NULL}
|
{NULL, NULL}
|
||||||
};
|
};
|
||||||
|
@ -254,6 +199,8 @@ static const ShellConfig shell_cfg1 = {
|
||||||
/* Main and generic code. */
|
/* Main and generic code. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
|
static thread_t *shelltp = NULL;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Card insertion event.
|
* Card insertion event.
|
||||||
*/
|
*/
|
||||||
|
@ -285,6 +232,18 @@ static void RemoveHandler(eventid_t id) {
|
||||||
fs_ready = FALSE;
|
fs_ready = FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Shell exit event.
|
||||||
|
*/
|
||||||
|
static void ShellHandler(eventid_t id) {
|
||||||
|
|
||||||
|
(void)id;
|
||||||
|
if (chThdTerminatedX(shelltp)) {
|
||||||
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
|
shelltp = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Green LED blinker thread, times are in milliseconds.
|
* Green LED blinker thread, times are in milliseconds.
|
||||||
*/
|
*/
|
||||||
|
@ -303,12 +262,12 @@ static THD_FUNCTION(Thread1, arg) {
|
||||||
* Application entry point.
|
* Application entry point.
|
||||||
*/
|
*/
|
||||||
int main(void) {
|
int main(void) {
|
||||||
static thread_t *shelltp = NULL;
|
|
||||||
static const evhandler_t evhndl[] = {
|
static const evhandler_t evhndl[] = {
|
||||||
InsertHandler,
|
InsertHandler,
|
||||||
RemoveHandler
|
RemoveHandler,
|
||||||
|
ShellHandler
|
||||||
};
|
};
|
||||||
event_listener_t el0, el1;
|
event_listener_t el0, el1, el2;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* System initializations.
|
* System initializations.
|
||||||
|
@ -372,19 +331,17 @@ int main(void) {
|
||||||
http_server, NULL);
|
http_server, NULL);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Normal main() thread activity, in this demo it does nothing except
|
* Normal main() thread activity, handling SD card events and shell
|
||||||
* sleeping in a loop and listen for events.
|
* start/exit.
|
||||||
*/
|
*/
|
||||||
chEvtRegister(&inserted_event, &el0, 0);
|
chEvtRegister(&inserted_event, &el0, 0);
|
||||||
chEvtRegister(&removed_event, &el1, 1);
|
chEvtRegister(&removed_event, &el1, 1);
|
||||||
|
chEvtRegister(&shell_terminated, &el2, 2);
|
||||||
while (true) {
|
while (true) {
|
||||||
if (!shelltp && (SDU2.config->usbp->state == USB_ACTIVE))
|
if (!shelltp && (SDU2.config->usbp->state == USB_ACTIVE)) {
|
||||||
shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);
|
shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
else if (chThdTerminatedX(shelltp)) {
|
"shell", NORMALPRIO + 1,
|
||||||
chThdRelease(shelltp); /* Recovers memory of the previous shell. */
|
shellThread, (void *)&shell_cfg1);
|
||||||
shelltp = NULL; /* Triggers spawning of a new shell. */
|
|
||||||
}
|
|
||||||
if (palReadPad(GPIOI, GPIOI_BUTTON_USER) != 0) {
|
|
||||||
}
|
}
|
||||||
chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));
|
chEvtDispatch(evhndl, chEvtWaitOneTimeout(ALL_EVENTS, MS2ST(500)));
|
||||||
}
|
}
|
||||||
|
|
|
@ -73,12 +73,13 @@ extern "C" {
|
||||||
#endif
|
#endif
|
||||||
#if CH_CFG_USE_HEAP == TRUE
|
#if CH_CFG_USE_HEAP == TRUE
|
||||||
thread_t *chThdCreateFromHeap(memory_heap_t *heapp, size_t size,
|
thread_t *chThdCreateFromHeap(memory_heap_t *heapp, size_t size,
|
||||||
tprio_t prio, tfunc_t pf, void *arg);
|
const char *name, tprio_t prio,
|
||||||
|
tfunc_t pf, void *arg);
|
||||||
void chThdFreeToHeap(thread_t *tp);
|
void chThdFreeToHeap(thread_t *tp);
|
||||||
#endif
|
#endif
|
||||||
#if CH_CFG_USE_MEMPOOLS == TRUE
|
#if CH_CFG_USE_MEMPOOLS == TRUE
|
||||||
thread_t *chThdCreateFromMemoryPool(memory_pool_t *mp, tprio_t prio,
|
thread_t *chThdCreateFromMemoryPool(memory_pool_t *mp, const char *name,
|
||||||
tfunc_t pf, void *arg);
|
tprio_t prio, tfunc_t pf, void *arg);
|
||||||
void chThdFreeToMemoryPool(thread_t *tp, memory_pool_t *mp);
|
void chThdFreeToMemoryPool(thread_t *tp, memory_pool_t *mp);
|
||||||
#endif
|
#endif
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
|
@ -69,6 +69,7 @@
|
||||||
* @param[in] heapp heap from which allocate the memory or @p NULL for the
|
* @param[in] heapp heap from which allocate the memory or @p NULL for the
|
||||||
* default heap
|
* default heap
|
||||||
* @param[in] size size of the working area to be allocated
|
* @param[in] size size of the working area to be allocated
|
||||||
|
* @param[in] name thread name
|
||||||
* @param[in] prio the priority level for the new thread
|
* @param[in] prio the priority level for the new thread
|
||||||
* @param[in] pf the thread function
|
* @param[in] pf the thread function
|
||||||
* @param[in] arg an argument passed to the thread function. It can be
|
* @param[in] arg an argument passed to the thread function. It can be
|
||||||
|
@ -80,7 +81,8 @@
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
thread_t *chThdCreateFromHeap(memory_heap_t *heapp, size_t size,
|
thread_t *chThdCreateFromHeap(memory_heap_t *heapp, size_t size,
|
||||||
tprio_t prio, tfunc_t pf, void *arg) {
|
const char *name, tprio_t prio,
|
||||||
|
tfunc_t pf, void *arg) {
|
||||||
void *wsp;
|
void *wsp;
|
||||||
|
|
||||||
wsp = chHeapAllocAligned(heapp, size, PORT_WORKING_AREA_ALIGN);
|
wsp = chHeapAllocAligned(heapp, size, PORT_WORKING_AREA_ALIGN);
|
||||||
|
@ -88,13 +90,16 @@ thread_t *chThdCreateFromHeap(memory_heap_t *heapp, size_t size,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if CH_DBG_FILL_THREADS == TRUE
|
thread_descriptor_t td = {
|
||||||
_thread_memfill((uint8_t *)wsp,
|
name,
|
||||||
(uint8_t *)wsp + size,
|
wsp,
|
||||||
CH_DBG_STACK_FILL_VALUE);
|
(stkalign_t *)((uint8_t *)wsp + size),
|
||||||
#endif
|
prio,
|
||||||
|
pf,
|
||||||
|
arg
|
||||||
|
};
|
||||||
|
|
||||||
return chThdCreateStatic(wsp, size, prio, pf, arg);
|
return chThdCreate(&td);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -131,6 +136,7 @@ void chThdFreeToHeap(thread_t *tp) {
|
||||||
* and then release the allocated memory.
|
* and then release the allocated memory.
|
||||||
*
|
*
|
||||||
* @param[in] mp pointer to the memory pool object
|
* @param[in] mp pointer to the memory pool object
|
||||||
|
* @param[in] name thread name
|
||||||
* @param[in] prio the priority level for the new thread
|
* @param[in] prio the priority level for the new thread
|
||||||
* @param[in] pf the thread function
|
* @param[in] pf the thread function
|
||||||
* @param[in] arg an argument passed to the thread function. It can be
|
* @param[in] arg an argument passed to the thread function. It can be
|
||||||
|
@ -141,8 +147,8 @@ void chThdFreeToHeap(thread_t *tp) {
|
||||||
*
|
*
|
||||||
* @api
|
* @api
|
||||||
*/
|
*/
|
||||||
thread_t *chThdCreateFromMemoryPool(memory_pool_t *mp, tprio_t prio,
|
thread_t *chThdCreateFromMemoryPool(memory_pool_t *mp, const char *name,
|
||||||
tfunc_t pf, void *arg) {
|
tprio_t prio, tfunc_t pf, void *arg) {
|
||||||
void *wsp;
|
void *wsp;
|
||||||
|
|
||||||
chDbgCheck(mp != NULL);
|
chDbgCheck(mp != NULL);
|
||||||
|
@ -152,13 +158,16 @@ thread_t *chThdCreateFromMemoryPool(memory_pool_t *mp, tprio_t prio,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if CH_DBG_FILL_THREADS == TRUE
|
thread_descriptor_t td = {
|
||||||
_thread_memfill((uint8_t *)wsp,
|
name,
|
||||||
(uint8_t *)wsp + mp->object_size,
|
wsp,
|
||||||
CH_DBG_STACK_FILL_VALUE);
|
(stkalign_t *)((uint8_t *)wsp + mp->object_size),
|
||||||
#endif
|
prio,
|
||||||
|
pf,
|
||||||
|
arg
|
||||||
|
};
|
||||||
|
|
||||||
return chThdCreateStatic(wsp, mp->object_size, prio, pf, arg);
|
return chThdCreate(&td);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -119,6 +119,7 @@ osThreadId osThreadCreate(const osThreadDef_t *thread_def, void *argument) {
|
||||||
thread_def->stacksize;
|
thread_def->stacksize;
|
||||||
return (osThreadId)chThdCreateFromHeap(0,
|
return (osThreadId)chThdCreateFromHeap(0,
|
||||||
THD_WORKING_AREA_SIZE(size),
|
THD_WORKING_AREA_SIZE(size),
|
||||||
|
thread_def->name,
|
||||||
NORMALPRIO+thread_def->tpriority,
|
NORMALPRIO+thread_def->tpriority,
|
||||||
(tfunc_t)thread_def->pthread,
|
(tfunc_t)thread_def->pthread,
|
||||||
argument);
|
argument);
|
||||||
|
|
|
@ -243,6 +243,7 @@ typedef struct os_thread_def {
|
||||||
os_pthread pthread;
|
os_pthread pthread;
|
||||||
osPriority tpriority;
|
osPriority tpriority;
|
||||||
uint32_t stacksize;
|
uint32_t stacksize;
|
||||||
|
const char *name;
|
||||||
} osThreadDef_t;
|
} osThreadDef_t;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -301,14 +302,15 @@ typedef struct os_messageQ_def {
|
||||||
* @brief Create a Thread definition.
|
* @brief Create a Thread definition.
|
||||||
*/
|
*/
|
||||||
#if defined(osObjectsExternal)
|
#if defined(osObjectsExternal)
|
||||||
#define osThreadDef(name, priority, instances, stacksz) \
|
#define osThreadDef(thd, priority, stacksz, name) \
|
||||||
extern const osThreadDef_t os_thread_def_##name
|
extern const osThreadDef_t os_thread_def_##thd
|
||||||
#else
|
#else
|
||||||
#define osThreadDef(name, priority, stacksz) \
|
#define osThreadDef(thd, priority, stacksz, name) \
|
||||||
const osThreadDef_t os_thread_def_##name = { \
|
const osThreadDef_t os_thread_def_##thd = { \
|
||||||
(name), \
|
(thd), \
|
||||||
(priority), \
|
(priority), \
|
||||||
(stacksz) \
|
(stacksz), \
|
||||||
|
(name) \
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -204,32 +204,10 @@ void sys_mbox_set_invalid(sys_mbox_t *mbox) {
|
||||||
|
|
||||||
sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread,
|
sys_thread_t sys_thread_new(const char *name, lwip_thread_fn thread,
|
||||||
void *arg, int stacksize, int prio) {
|
void *arg, int stacksize, int prio) {
|
||||||
size_t wsz;
|
|
||||||
void *wsp;
|
|
||||||
syssts_t sts;
|
|
||||||
thread_t *tp;
|
thread_t *tp;
|
||||||
|
|
||||||
(void)name;
|
tp = chThdCreateFromHeap(NULL, THD_WORKING_AREA_SIZE(stacksize),
|
||||||
wsz = THD_WORKING_AREA_SIZE(stacksize);
|
name, prio, (tfunc_t)thread, arg);
|
||||||
wsp = chCoreAlloc(wsz);
|
|
||||||
if (wsp == NULL)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
#if CH_DBG_FILL_THREADS == TRUE
|
|
||||||
_thread_memfill((uint8_t *)wsp,
|
|
||||||
(uint8_t *)wsp + sizeof(thread_t),
|
|
||||||
CH_DBG_THREAD_FILL_VALUE);
|
|
||||||
_thread_memfill((uint8_t *)wsp + sizeof(thread_t),
|
|
||||||
(uint8_t *)wsp + wsz,
|
|
||||||
CH_DBG_STACK_FILL_VALUE);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
sts = chSysGetStatusAndLockX();
|
|
||||||
tp = chThdCreateI(wsp, wsz, prio, (tfunc_t)thread, arg);
|
|
||||||
chRegSetThreadNameX(tp, name);
|
|
||||||
chThdStartI(tp);
|
|
||||||
chSysRestoreStatusX(sts);
|
|
||||||
|
|
||||||
return (sys_thread_t)tp;
|
return (sys_thread_t)tp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -130,7 +130,6 @@ THD_FUNCTION(shellThread, p) {
|
||||||
char *lp, *cmd, *tokp, line[SHELL_MAX_LINE_LENGTH];
|
char *lp, *cmd, *tokp, line[SHELL_MAX_LINE_LENGTH];
|
||||||
char *args[SHELL_MAX_ARGUMENTS + 1];
|
char *args[SHELL_MAX_ARGUMENTS + 1];
|
||||||
|
|
||||||
chRegSetThreadName("shell");
|
|
||||||
chprintf(chp, "\r\nChibiOS/RT Shell\r\n");
|
chprintf(chp, "\r\nChibiOS/RT Shell\r\n");
|
||||||
while (true) {
|
while (true) {
|
||||||
chprintf(chp, "ch> ");
|
chprintf(chp, "ch> ");
|
||||||
|
|
|
@ -165,7 +165,8 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
|
||||||
chprintf(chp, "Usage: test\r\n");
|
chprintf(chp, "Usage: test\r\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
tp = chThdCreateFromHeap(NULL, SHELL_CMD_TEST_WA_SIZE, chThdGetPriorityX(),
|
tp = chThdCreateFromHeap(NULL, SHELL_CMD_TEST_WA_SIZE,
|
||||||
|
"test", chThdGetPriorityX(),
|
||||||
TestThread, chp);
|
TestThread, chp);
|
||||||
if (tp == NULL) {
|
if (tp == NULL) {
|
||||||
chprintf(chp, "out of memory\r\n");
|
chprintf(chp, "out of memory\r\n");
|
||||||
|
|
|
@ -152,8 +152,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -151,8 +151,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,8 +158,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -159,8 +159,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,13 +171,13 @@ int main(void) {
|
||||||
/* Starting shells.*/
|
/* Starting shells.*/
|
||||||
if (shelltp1 == NULL) {
|
if (shelltp1 == NULL) {
|
||||||
shelltp1 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
shelltp1 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell1", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
}
|
}
|
||||||
if (shelltp2 == NULL) {
|
if (shelltp2 == NULL) {
|
||||||
shelltp2 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
shelltp2 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell2", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg2);
|
shellThread, (void *)&shell_cfg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Waiting for an exit event then freeing terminated shells.*/
|
/* Waiting for an exit event then freeing terminated shells.*/
|
||||||
|
|
|
@ -328,8 +328,8 @@ int main(void) {
|
||||||
*/
|
*/
|
||||||
while (true) {
|
while (true) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
chThdSleepMilliseconds(1000);
|
chThdSleepMilliseconds(1000);
|
||||||
|
|
|
@ -159,8 +159,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
if (SDU1.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
|
@ -164,13 +164,13 @@ int main(void) {
|
||||||
/* Starting shells.*/
|
/* Starting shells.*/
|
||||||
if (shelltp1 == NULL) {
|
if (shelltp1 == NULL) {
|
||||||
shelltp1 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
shelltp1 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell1", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
}
|
}
|
||||||
if (shelltp2 == NULL) {
|
if (shelltp2 == NULL) {
|
||||||
shelltp2 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
shelltp2 = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell2", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg2);
|
shellThread, (void *)&shell_cfg2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Waiting for an exit event then freeing terminated shells.*/
|
/* Waiting for an exit event then freeing terminated shells.*/
|
||||||
|
|
|
@ -158,8 +158,8 @@ int main(void) {
|
||||||
while (true) {
|
while (true) {
|
||||||
if (SDU2.config->usbp->state == USB_ACTIVE) {
|
if (SDU2.config->usbp->state == USB_ACTIVE) {
|
||||||
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
thread_t *shelltp = chThdCreateFromHeap(NULL, SHELL_WA_SIZE,
|
||||||
NORMALPRIO + 1, shellThread,
|
"shell", NORMALPRIO + 1,
|
||||||
(void *)&shell_cfg1);
|
shellThread, (void *)&shell_cfg1);
|
||||||
chThdWait(shelltp); /* Waiting termination. */
|
chThdWait(shelltp); /* Waiting termination. */
|
||||||
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
chThdFreeToHeap(shelltp); /* Returning memory to heap. */
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue