forked from flipperdevices/flipperzero-firmware
-
-
Notifications
You must be signed in to change notification settings - Fork 548
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Make printf great again (flipperdevices#1438)"
This reverts commit bc34689.
- Loading branch information
1 parent
b8c0b25
commit 67d2451
Showing
20 changed files
with
169 additions
and
1,477 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| #include "stdglue.h" | ||
| #include "check.h" | ||
| #include "memmgr.h" | ||
|
|
||
| #include <FreeRTOS.h> | ||
| #include <task.h> | ||
|
|
||
| #include <furi_hal.h> | ||
| #include <m-dict.h> | ||
|
|
||
| DICT_DEF2( | ||
| FuriStdglueCallbackDict, | ||
| uint32_t, | ||
| M_DEFAULT_OPLIST, | ||
| FuriStdglueWriteCallback, | ||
| M_PTR_OPLIST) | ||
|
|
||
| typedef struct { | ||
| FuriMutex* mutex; | ||
| FuriStdglueCallbackDict_t thread_outputs; | ||
| } FuriStdglue; | ||
|
|
||
| static FuriStdglue* furi_stdglue = NULL; | ||
|
|
||
| static ssize_t stdout_write(void* _cookie, const char* data, size_t size) { | ||
| furi_assert(furi_stdglue); | ||
| bool consumed = false; | ||
| FuriThreadId task_id = furi_thread_get_current_id(); | ||
| if(xTaskGetSchedulerState() == taskSCHEDULER_RUNNING && task_id && | ||
| furi_mutex_acquire(furi_stdglue->mutex, FuriWaitForever) == FuriStatusOk) { | ||
| // We are in the thread context | ||
| // Handle thread callbacks | ||
| FuriStdglueWriteCallback* callback_ptr = | ||
| FuriStdglueCallbackDict_get(furi_stdglue->thread_outputs, (uint32_t)task_id); | ||
| if(callback_ptr) { | ||
| (*callback_ptr)(_cookie, data, size); | ||
| consumed = true; | ||
| } | ||
| furi_check(furi_mutex_release(furi_stdglue->mutex) == FuriStatusOk); | ||
| } | ||
| // Flush | ||
| if(data == 0) { | ||
| /* | ||
| * This means that we should flush internal buffers. Since we | ||
| * don't we just return. (Remember, "handle" == -1 means that all | ||
| * handles should be flushed.) | ||
| */ | ||
| return 0; | ||
| } | ||
| // Debug uart | ||
| if(!consumed) furi_hal_console_tx((const uint8_t*)data, size); | ||
| // All data consumed | ||
| return size; | ||
| } | ||
|
|
||
| void furi_stdglue_init() { | ||
| furi_stdglue = malloc(sizeof(FuriStdglue)); | ||
| // Init outputs structures | ||
| furi_stdglue->mutex = furi_mutex_alloc(FuriMutexTypeNormal); | ||
| furi_check(furi_stdglue->mutex); | ||
| FuriStdglueCallbackDict_init(furi_stdglue->thread_outputs); | ||
| // Prepare and set stdout descriptor | ||
| FILE* fp = fopencookie( | ||
| NULL, | ||
| "w", | ||
| (cookie_io_functions_t){ | ||
| .read = NULL, | ||
| .write = stdout_write, | ||
| .seek = NULL, | ||
| .close = NULL, | ||
| }); | ||
| setvbuf(fp, NULL, _IOLBF, 0); | ||
| stdout = fp; | ||
| } | ||
|
|
||
| bool furi_stdglue_set_thread_stdout_callback(FuriStdglueWriteCallback callback) { | ||
| furi_assert(furi_stdglue); | ||
| FuriThreadId task_id = furi_thread_get_current_id(); | ||
| if(task_id) { | ||
| furi_check(furi_mutex_acquire(furi_stdglue->mutex, FuriWaitForever) == FuriStatusOk); | ||
| if(callback) { | ||
| FuriStdglueCallbackDict_set_at( | ||
| furi_stdglue->thread_outputs, (uint32_t)task_id, callback); | ||
| } else { | ||
| FuriStdglueCallbackDict_erase(furi_stdglue->thread_outputs, (uint32_t)task_id); | ||
| } | ||
| furi_check(furi_mutex_release(furi_stdglue->mutex) == FuriStatusOk); | ||
| return true; | ||
| } else { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| void __malloc_lock(struct _reent* REENT) { | ||
| UNUSED(REENT); | ||
| vTaskSuspendAll(); | ||
| } | ||
|
|
||
| void __malloc_unlock(struct _reent* REENT) { | ||
| UNUSED(REENT); | ||
| xTaskResumeAll(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /** | ||
| * @file stdglue.h | ||
| * Furi: stdlibc glue | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <stdbool.h> | ||
| #include <stdlib.h> | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| /** Write callback | ||
| * @param _cookie pointer to cookie (see stdio gnu extension) | ||
| * @param data pointer to data | ||
| * @param size data size @warnign your handler must consume everything | ||
| */ | ||
| typedef void (*FuriStdglueWriteCallback)(void* _cookie, const char* data, size_t size); | ||
|
|
||
| /** Initialized std library glue code */ | ||
| void furi_stdglue_init(); | ||
|
|
||
| /** Set STDOUT callback for your thread | ||
| * | ||
| * @param callback callback or NULL to clear | ||
| * | ||
| * @return true on success, otherwise fail | ||
| * @warning function is thread aware, use this API from the same thread | ||
| */ | ||
| bool furi_stdglue_set_thread_stdout_callback(FuriStdglueWriteCallback callback); | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif |
Oops, something went wrong.