mirror
/
fm_transmitter
kopia lustrzana https://github.com/markondej/fm_transmitter
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Reverted volatile type qualifiers

pull/71/head
Marcin Kondej 2019-01-10 12:44:09 +01:00
rodzic cf9158af49
commit a20a34ed10
2 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
transmitter.cpp
Wyświetl plik

@ -175,7 +175,7 @@ void Transmitter::freeMemory()
memSize = 0;
}
unsigned Transmitter::getMemoryAddress(void *object)
unsigned Transmitter::getMemoryAddress(volatile void *object)
{
return (memSize) ? memAddress + ((unsigned)object - (unsigned)memAllocated) : 0x00000000;
}
@ -255,9 +255,9 @@ void Transmitter::play(WaveReader &reader, double frequency, double bandwidth, u
PreEmp preEmp(header.sampleRate);
#endif
DMAControllBlock *dmaCb = (DMAControllBlock *)memAllocated;
unsigned *clkDiv = (unsigned *)memAllocated + 2 * (sizeof(DMAControllBlock) / sizeof(unsigned)) * bufferSize;
unsigned *pwmFifoData = (unsigned *)memAllocated + 2 * ((sizeof(DMAControllBlock) / sizeof(unsigned)) + 1) * bufferSize;
volatile DMAControllBlock *dmaCb = (DMAControllBlock *)memAllocated;
volatile unsigned *clkDiv = (unsigned *)memAllocated + 2 * (sizeof(DMAControllBlock) / sizeof(unsigned)) * bufferSize;
volatile unsigned *pwmFifoData = (unsigned *)memAllocated + 2 * ((sizeof(DMAControllBlock) / sizeof(unsigned)) + 1) * bufferSize;
for (i = 0; i < bufferSize; i++) {
value = (*samples)[i].getMonoValue();
#ifndef NO_PREEMP

2
transmitter.h
Wyświetl plik

@ -51,7 +51,7 @@ class Transmitter
Transmitter &operator=(const Transmitter &source);
bool allocateMemory(unsigned size);
void freeMemory();
unsigned getMemoryAddress(void *object);
unsigned getMemoryAddress(volatile void *object);
unsigned getPeripheralAddress(volatile void *object);
static void *getPeripheral(unsigned offset);
static void *transmit(void *params);