TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-15 04:28:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hide CaptureThread event mask, only used internally.

Browse Source
This commit is contained in:
Jared Boone 2016-06-19 11:20:45 -07:00
parent 0da48b099c
commit dbc2a5c9ea
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/application/capture_thread.cpp
View File

@ -92,7 +92,7 @@ CaptureThread::CaptureThread(
CaptureThread::~CaptureThread() { CaptureThread::~CaptureThread() {
if( thread ) { if( thread ) {
chThdTerminate(thread); chThdTerminate(thread);
chEvtSignal(thread, EVT_MASK_CAPTURE_THREAD); chEvtSignal(thread, event_mask_loop_wake);
chThdWait(thread); chThdWait(thread);
thread = nullptr; thread = nullptr;
} }
@ -108,7 +108,7 @@ void CaptureThread::check_fifo_isr() {
const auto fifo = StreamOutput::fifo_buffers_full; const auto fifo = StreamOutput::fifo_buffers_full;
if( fifo ) { if( fifo ) {
if( !fifo->is_empty() ) { if( !fifo->is_empty() ) {
chEvtSignalI(thread, EVT_MASK_CAPTURE_THREAD); chEvtSignalI(thread, event_mask_loop_wake);
} }
} }
} }
@ -125,7 +125,7 @@ Optional<File::Error> CaptureThread::run() {
} }
stream.release_buffer(buffer); stream.release_buffer(buffer);
} else { } else {
chEvtWaitAny(EVT_MASK_CAPTURE_THREAD); chEvtWaitAny(event_mask_loop_wake);
} }
} }

2
firmware/application/capture_thread.hpp
View File

@ -57,6 +57,8 @@ public:
static void check_fifo_isr(); static void check_fifo_isr();
private: private:
static constexpr auto event_mask_loop_wake = EVENT_MASK(0);
CaptureConfig config; CaptureConfig config;
std::unique_ptr<Writer> writer; std::unique_ptr<Writer> writer;
Optional<File::Error> last_error; Optional<File::Error> last_error;

1
firmware/application/event_m0.hpp
View File

@ -44,7 +44,6 @@ constexpr auto EVT_MASK_SWITCHES = EVENT_MASK(3);
constexpr auto EVT_MASK_ENCODER = EVENT_MASK(4); constexpr auto EVT_MASK_ENCODER = EVENT_MASK(4);
constexpr auto EVT_MASK_TOUCH = EVENT_MASK(5); constexpr auto EVT_MASK_TOUCH = EVENT_MASK(5);
constexpr auto EVT_MASK_APPLICATION = EVENT_MASK(6); constexpr auto EVT_MASK_APPLICATION = EVENT_MASK(6);
constexpr auto EVT_MASK_CAPTURE_THREAD = EVENT_MASK(7);
class EventDispatcher { class EventDispatcher {
public: public: