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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	firmware/application/audio_thread.cpp
	firmware/application/event_m0.cpp
	firmware/application/time.cpp
	firmware/baseband-tx/clock_recovery.cpp
	firmware/baseband/stream_input.hpp
	firmware/common/message.hpp
This commit is contained in:
furrtek
2016-05-09 21:16:24 +02:00
parent 569f299f42 dc2944d5e9
commit c8d37e215b
3 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/baseband/stream_input.hpp
View File

@@ -22,22 +22,26 @@
#ifndef __STREAM_INPUT_H__
#define __STREAM_INPUT_H__
#include "portapack_shared_memory.hpp"
#include "message.hpp"
#include "fifo.hpp"
#include "lpc43xx_cpp.hpp"
using namespace lpc43xx;
#include <cstdint>
#include <cstddef>
#include <memory>
class StreamInput {
public:
StreamInput(const size_t K, CaptureConfig& config) :
K { K },
StreamInput(CaptureConfig* const config) :
config { config },
K { config->write_size_log2 + config->buffer_count_log2 },
event_bytes_mask { (1UL << config->write_size_log2) - 1 },
data { std::make_unique<uint8_t[]>(1UL << K) },
fifo { data.get(), K }
{
config.fifo = &fifo;
config->fifo = &fifo;
}
size_t write(const void* const data, const size_t length) {
@@ -48,17 +52,16 @@ public:
if( (bytes_written & event_bytes_mask) < (last_bytes_written & event_bytes_mask) ) {
creg::m4txevent::assert();
}
config->baseband_bytes_received += length;
config->baseband_bytes_dropped = config->baseband_bytes_received - bytes_written;
return written;
}
uint64_t written() const {
return bytes_written;
}
private:
CaptureConfig* const config;
const size_t K;
const uint64_t event_bytes_mask = (1ULL << (K - 2)) - 1;
const uint64_t event_bytes_mask;
uint64_t bytes_written = 0;
std::unique_ptr<uint8_t[]> data;
FIFO<uint8_t> fifo;