pull/71/head
Marcin Kondej 2019-01-10 11:51:55 +01:00
rodzic 9ac1a0f361
commit ae1fbd4a6d
2 zmienionych plików z 5 dodań i 5 usunięć

Wyświetl plik

@ -175,12 +175,12 @@ void Transmitter::freeMemory()
memSize = 0;
}
unsigned Transmitter::getMemoryAddress(volatile *object)
unsigned Transmitter::getMemoryAddress(void *object)
{
return (memSize) ? memAddress + ((unsigned)object - (unsigned)memAllocated) : 0x00000000;
}
unsigned Transmitter::getPeriheralAddress(volatile void *object) {
unsigned Transmitter::getPeripheralAddress(volatile void *object) {
return PERIPHERALS_PHYS_BASE + ((unsigned)object - (unsigned)peripherals);
}
@ -274,7 +274,7 @@ void Transmitter::play(WaveReader &reader, double frequency, double bandwidth, u
dmaCb[cbIndex].transferInfo = (0x01 << 26) | (0x05 << 16) | (0x01 << 6) | (0x01 << 3);
dmaCb[cbIndex].srcAddress = getMemoryAddress(pwmFifoData);
dmaCb[cbIndex].dstAddress = getPeriheralAddress(&pwm->fifoIn);
dmaCb[cbIndex].dstAddress = getPeripheralAddress(&pwm->fifoIn);
dmaCb[cbIndex].transferLen = sizeof(unsigned) * PWM_WRITES_PER_SAMPLE;
dmaCb[cbIndex].stride = 0;
dmaCb[cbIndex].nextCbAddress = getMemoryAddress((i < bufferSize - 1) ? &dmaCb[cbIndex + 1] : dmaCb);

Wyświetl plik

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