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

Generalize FIFO to specify FIFO size as 2^K.

Browse Source 
Configure baseband queue to be larger (4K) than application queue (2K).
This commit is contained in:
Jared Boone 2015-08-20 15:59:25 -07:00
parent 4126f1ab1f
commit 52e8093618
3 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
firmware/common/message_queue.cpp
View File

@ -20,33 +20,3 @@
*/
#include "message_queue.hpp"
#include "ch.h"
#include "lpc43xx_cpp.hpp"
using namespace lpc43xx;
bool MessageQueue::push(const void* const buf, const size_t len) {
const auto result = fifo.in_r(buf, len);
const bool success = (result == len);
if( success ) {
signal();
}
return success;
}
size_t MessageQueue::pop(void* const buf, const size_t len) {
return fifo.out_r(buf, len);
}
#if defined(LPC43XX_M0)
void MessageQueue::signal() {
creg::m0apptxevent::assert();
}
#endif
#if defined(LPC43XX_M4)
void MessageQueue::signal() {
creg::m4txevent::assert();
}
#endif

32
firmware/common/message_queue.hpp
View File

@ -27,6 +27,10 @@
#include "message.hpp"
#include "fifo.hpp"
#include "lpc43xx_cpp.hpp"
using namespace lpc43xx;
template<size_t K>
class MessageQueue {
public:
template<typename T>
@ -37,7 +41,9 @@ public:
return push(&message, sizeof(message));
}
size_t pop(void* const buf, const size_t len);
size_t pop(void* const buf, const size_t len) {
return fifo.out_r(buf, len);
}
size_t len() const {
return fifo.len();
@ -48,11 +54,29 @@ public:
}
private:
FIFO<uint8_t, 11> fifo;
FIFO<uint8_t, K> fifo;
bool push(const void* const buf, const size_t len);
bool push(const void* const buf, const size_t len) {
const auto result = fifo.in_r(buf, len);
const bool success = (result == len);
if( success ) {
signal();
}
return success;
}
void signal();
#if defined(LPC43XX_M0)
void signal() {
creg::m0apptxevent::assert();
}
#endif
#if defined(LPC43XX_M4)
void signal() {
creg::m4txevent::assert();
}
#endif
};
#endif/*__MESSAGE_QUEUE_H__*/

8
firmware/common/portapack_shared_memory.hpp
View File

@ -32,8 +32,8 @@ struct TouchADCFrame {
/* NOTE: These structures must be located in the same location in both M4 and M0 binaries */
struct SharedMemory {
MessageQueue baseband_queue;
MessageQueue application_queue;
MessageQueue<12> baseband_queue;
MessageQueue<11> application_queue;
// TODO: M0 should directly configure and control DMA channel that is
// acquiring ADC samples.
@ -44,8 +44,8 @@ extern SharedMemory& shared_memory;
#if defined(LPC43XX_M0)
inline void init_message_queues() {
new (&shared_memory.baseband_queue) MessageQueue();
new (&shared_memory.application_queue) MessageQueue();
new (&shared_memory.baseband_queue) MessageQueue<12>();
new (&shared_memory.application_queue) MessageQueue<11>();
}
#endif