TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-17 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass CaptureConfig to StreamInput as pointer.

Browse Source
This commit is contained in:
Jared Boone 2016-04-27 10:31:37 -07:00
parent ca5dadab93
commit 3e08318012
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/baseband/proc_am_audio.cpp
View File

@ -100,7 +100,7 @@ void NarrowbandAMAudio::configure(const AMConfigureMessage& message) {
void NarrowbandAMAudio::capture_config(const CaptureConfigMessage& message) { void NarrowbandAMAudio::capture_config(const CaptureConfigMessage& message) {
if( message.config ) { if( message.config ) {
audio_output.set_stream(std::make_unique<StreamInput>(*message.config)); audio_output.set_stream(std::make_unique<StreamInput>(message.config));
} else { } else {
audio_output.set_stream(nullptr); audio_output.set_stream(nullptr);
} }

2
firmware/baseband/proc_capture.cpp
View File

@ -85,7 +85,7 @@ void CaptureProcessor::on_message(const Message* const message) {
void CaptureProcessor::capture_config(const CaptureConfigMessage& message) { void CaptureProcessor::capture_config(const CaptureConfigMessage& message) {
if( message.config ) { if( message.config ) {
stream = std::make_unique<StreamInput>(*message.config); stream = std::make_unique<StreamInput>(message.config);
} else { } else {
stream.reset(); stream.reset();
} }

2
firmware/baseband/proc_nfm_audio.cpp
View File

@ -88,7 +88,7 @@ void NarrowbandFMAudio::configure(const NBFMConfigureMessage& message) {
void NarrowbandFMAudio::capture_config(const CaptureConfigMessage& message) { void NarrowbandFMAudio::capture_config(const CaptureConfigMessage& message) {
if( message.config ) { if( message.config ) {
audio_output.set_stream(std::make_unique<StreamInput>(*message.config)); audio_output.set_stream(std::make_unique<StreamInput>(message.config));
} else { } else {
audio_output.set_stream(nullptr); audio_output.set_stream(nullptr);
} }

2
firmware/baseband/proc_wfm_audio.cpp
View File

@ -117,7 +117,7 @@ void WidebandFMAudio::configure(const WFMConfigureMessage& message) {
void WidebandFMAudio::capture_config(const CaptureConfigMessage& message) { void WidebandFMAudio::capture_config(const CaptureConfigMessage& message) {
if( message.config ) { if( message.config ) {
audio_output.set_stream(std::make_unique<StreamInput>(*message.config)); audio_output.set_stream(std::make_unique<StreamInput>(message.config));
} else { } else {
audio_output.set_stream(nullptr); audio_output.set_stream(nullptr);
} }

8
firmware/baseband/stream_input.hpp
View File

@ -34,13 +34,13 @@ using namespace lpc43xx;
class StreamInput { class StreamInput {
public: public:
StreamInput(CaptureConfig& config) : StreamInput(CaptureConfig* const config) :
K { config.write_size_log2 + config.buffer_count_log2 }, K { config->write_size_log2 + config->buffer_count_log2 },
event_bytes_mask { (1UL << config.write_size_log2) - 1 }, event_bytes_mask { (1UL << config->write_size_log2) - 1 },
data { std::make_unique<uint8_t[]>(1UL << K) }, data { std::make_unique<uint8_t[]>(1UL << K) },
fifo { data.get(), K } fifo { data.get(), K }
{ {
config.fifo = &fifo; config->fifo = &fifo;
} }
size_t write(const void* const data, const size_t length) { size_t write(const void* const data, const size_t length) {