Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move init/configure details into RSSI/BasebandThread classes.

Browse Source
This commit is contained in:
Jared Boone 2015-12-10 16:32:00 -08:00
parent ed25f65e8b
commit 818790e734
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/baseband/baseband_thread.cpp
View File

@ -23,6 +23,7 @@
#include "dsp_types.hpp"
#include "baseband.hpp"
#include "baseband_stats_collector.hpp"
#include "baseband_dma.hpp"
@ -39,6 +40,8 @@
#include "portapack_shared_memory.hpp"
#include <array>
Thread* BasebandThread::start(const tprio_t priority) {
return chThdCreateStatic(wa, sizeof(wa),
priority, ThreadBase::fn,
@ -64,6 +67,15 @@ void BasebandThread::set_configuration(const BasebandConfiguration& new_configur
}
void BasebandThread::run() {
baseband::dma::init();
const auto baseband_buffer = new std::array<baseband::sample_t, 8192>();
baseband::dma::configure(
baseband_buffer->data(),
direction()
);
//baseband::dma::allocate(4, 2048);
BasebandStatsCollector stats {
chSysGetIdleThread(),
thread_main,
@ -89,6 +101,8 @@ void BasebandThread::run() {
}
);
}
delete baseband_buffer;
}
BasebandProcessor* BasebandThread::create_processor(const int32_t mode) {

21
firmware/baseband/main.cpp
View File

@ -29,15 +29,10 @@
#include "gpdma.hpp"
#include "baseband_dma.hpp"
#include "event_m4.hpp"
#include "irq_ipc_m4.hpp"
#include "rssi.hpp"
#include "rssi_dma.hpp"
#include "touch_dma.hpp"
#include "baseband_thread.hpp"
@ -101,9 +96,6 @@ static void init() {
gpdma::controller.enable();
nvicEnableVector(DMA_IRQn, CORTEX_PRIORITY_MASK(LPC_DMA_IRQ_PRIORITY));
baseband::dma::init();
rf::rssi::init();
touch::dma::init();
}
@ -199,25 +191,14 @@ int main(void) {
);
/* TODO: Ensure DMAs are configured to point at first LLI in chain. */
baseband_thread.thread_main = chThdSelf();
baseband_thread.thread_rssi = rssi_thread.start(NORMALPRIO + 10);
baseband_thread.start(NORMALPRIO + 20);
if( baseband_thread.direction() == baseband::Direction::Receive ) {
rf::rssi::dma::allocate(4, 400);
}
touch::dma::allocate();
touch::dma::enable();
const auto baseband_buffer =
new std::array<baseband::sample_t, 8192>();
baseband::dma::configure(
baseband_buffer->data(),
baseband_thread.direction()
);
//baseband::dma::allocate(4, 2048);
event_dispatcher.run();
shutdown();

5
firmware/baseband/rssi_thread.cpp
View File

@ -36,6 +36,9 @@ Thread* RSSIThread::start(const tprio_t priority) {
}
void RSSIThread::run() {
rf::rssi::init();
rf::rssi::dma::allocate(4, 400);
RSSIStatisticsCollector stats;
while(true) {
@ -53,4 +56,6 @@ void RSSIThread::run() {
}
);
}
rf::rssi::dma::free();
}