Skip to content

Commit

Permalink
Merge pull request #2 from scdwyer/master
Browse files Browse the repository at this point in the history
Add support so one can terminate the worker thread
  • Loading branch information
mabl committed Nov 13, 2014
2 parents 173cb53 + 5d4b61c commit 3d78ebe
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 3 deletions.
22 changes: 20 additions & 2 deletions fatfsWrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
* @brief Enumeration of all possible actions depending on activated functions.
*/
enum wrapper_action {
eTERMINATE,
#if HAS_MOUNT
eFMOUNT,
#endif
Expand Down Expand Up @@ -295,7 +296,7 @@ static msg_t ThreadFatFSWorker(void *arg) {
Thread* p;

chRegSetThreadName("fatfsWorker");
while (TRUE) {
while (!chThdShouldTerminate()) {

/* Wait for msg with work to do. */
p = chMsgWait();
Expand All @@ -307,6 +308,10 @@ static msg_t ThreadFatFSWorker(void *arg) {

switch(msg->action) {

case eTERMINATE: {
break;
}

#if HAS_MOUNT
case eFMOUNT: {
const struct wrapper_msg_vBYTEpFATFS* exmsg = \
Expand Down Expand Up @@ -551,10 +556,23 @@ static msg_t ThreadFatFSWorker(void *arg) {
}


void wf_init (tprio_t priority) {
Thread* wf_init (tprio_t priority) {
workerThread = chThdCreateStatic(waFatFSWorkerThread,
sizeof(waFatFSWorkerThread),
priority, ThreadFatFSWorker, NULL);
return workerThread;
}

void wf_terminate (void) {
struct wrapper_msg_base msg;

if (workerThread) {
msg.action = eTERMINATE;

chThdTerminate(workerThread);
chMsgSend(workerThread, (msg_t) &msg);
}
return;
}


Expand Down
3 changes: 2 additions & 1 deletion fatfsWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
extern "C" {
#endif

void wf_init (tprio_t priority);
Thread* wf_init (tprio_t priority);
void wf_terminate (void);

FRESULT wf_mount (BYTE, FATFS*); /* Mount/Unmount a logical drive */
FRESULT wf_open (FIL*, const TCHAR*, BYTE); /* Open or create a file */
Expand Down

0 comments on commit 3d78ebe

Please sign in to comment.