Add FSKburst for rtlomni

src/Makefile

@@ -15,11 +15,11 @@ LDFLAGS	= -lm -lrt -lpthread -lliquid
 CCP = g++ 
 CC = gcc 
 
-librpitx: librpitx.h gpio.h gpio.cpp dma.h dma.cpp mailbox.c raspberry_pi_revision.c fmdmasync.h fmdmasync.cpp ngfmdmasync.h ngfmdmasync.cpp dsp.h dsp.cpp iqdmasync.h iqdmasync.cpp serialdmasync.h serialdmasync.cpp phasedmasync.h phasedmasync.cpp
+librpitx: librpitx.h gpio.h gpio.cpp dma.h dma.cpp mailbox.c raspberry_pi_revision.c fmdmasync.h fmdmasync.cpp ngfmdmasync.h ngfmdmasync.cpp dsp.h dsp.cpp iqdmasync.h iqdmasync.cpp serialdmasync.h serialdmasync.cpp phasedmasync.h phasedmasync.cpp fskburst.h fskburst.cpp
 	$(CC) $(CFLAGS) -c -o mailbox.o mailbox.c
 	$(CC) $(CFLAGS) -c -o raspberry_pi_revision.o raspberry_pi_revision.c
-	$(CCP) $(CFLAGS) -c dsp.cpp iqdmasync.cpp ngfmdmasync.cpp fmdmasync.cpp  dma.cpp gpio.cpp mailbox.o raspberry_pi_revision.o v2rpitx.cpp serialdmasync.cpp phasedmasync.cpp amdmasync.h amdmasync.cpp
-	$(AR) rc librpitx.a dsp.o iqdmasync.o ngfmdmasync.o fmdmasync.o  dma.o gpio.o mailbox.o raspberry_pi_revision.o  serialdmasync.o phasedmasync.o amdmasync.o
+	$(CCP) $(CFLAGS) -c dsp.cpp iqdmasync.cpp ngfmdmasync.cpp fmdmasync.cpp  dma.cpp gpio.cpp mailbox.o raspberry_pi_revision.o v2rpitx.cpp serialdmasync.cpp phasedmasync.cpp amdmasync.h amdmasync.cpp fskburst.cpp
+	$(AR) rc librpitx.a dsp.o iqdmasync.o ngfmdmasync.o fmdmasync.o  dma.o gpio.o mailbox.o raspberry_pi_revision.o  serialdmasync.o phasedmasync.o amdmasync.o fskburst.o
 
 v2rpitx: librpitx.h librpitx.a
 	

src/fskburst.cpp

@@ -0,0 +1,114 @@
+
+#include "stdio.h"
+#include "fskburst.h"
+
+
+	fskburst::fskburst(uint64_t TuneFrequency,uint32_t SymbolRate,uint32_t Deviation,int Channel,uint32_t FifoSize):bufferdma(Channel,FifoSize+2,2,1),freqdeviation(Deviation)
+	{
+		
+		clkgpio::SetAdvancedPllMode(true);
+		clkgpio::SetCenterFrequency(TuneFrequency,SymbolRate); // Write Mult Int and Frac : FixMe carrier is already there
+		clkgpio::SetFrequency(0);
+		//clkgpio::enableclk(4); // GPIO 4 CLK by default
+		syncwithpwm=false;
+	
+		if(syncwithpwm)
+		{
+			pwmgpio::SetPllNumber(clk_plld,1);
+			pwmgpio::SetFrequency(SymbolRate);
+		}
+		else
+		{
+			pcmgpio::SetPllNumber(clk_plld,1);
+			pcmgpio::SetFrequency(SymbolRate);
+		}
+	
+	
+	   
+		SetDmaAlgo();
+
+		padgpio pad;
+		Originfsel=pad.gpioreg[PADS_GPIO_0];
+	}
+
+	fskburst::~fskburst()
+	{
+	}
+
+	void fskburst::SetDmaAlgo()
+{
+			sampletab[buffersize*registerbysample-2]=(Originfsel & ~(7 << 12)) | (4 << 12); //Enable Clk
+			sampletab[buffersize*registerbysample-1]=(Originfsel & ~(7 << 12)) | (0 << 12); //Disable Clk
+
+			dma_cb_t *cbp = cbarray;
+			cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP  ;
+			cbp->src = mem_virt_to_phys(&usermem[buffersize*registerbysample-2]); 
+			cbp->dst = 0x7E000000 + (GPFSEL0<<2)+GENERAL_BASE; 				
+			cbp->length = 4;
+			cbp->stride = 0;
+			cbp->next = mem_virt_to_phys(cbp + 1); // Stop DMA
+			cbp++;			
+			
+			for (uint32_t samplecnt = 0; samplecnt < buffersize-2; samplecnt++) 
+			{ 
+			
+			
+				// Write a frequency sample
+
+				cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
+				cbp->src = mem_virt_to_phys(&usermem[samplecnt*registerbysample]);
+				cbp->dst = 0x7E000000 + (PLLA_FRAC<<2) + CLK_BASE ; 
+				cbp->length = 4;
+				cbp->stride = 0;
+				cbp->next = mem_virt_to_phys(cbp + 1);
+				//fprintf(stderr,"cbp : sample %x src %x dest %x next %x\n",samplecnt,cbp->src,cbp->dst,cbp->next);
+				cbp++;
+			
+				
+				// Delay
+				if(syncwithpwm)
+					cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP |BCM2708_DMA_D_DREQ  | BCM2708_DMA_PER_MAP(DREQ_PWM);
+				else
+					cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP |BCM2708_DMA_D_DREQ  | BCM2708_DMA_PER_MAP(DREQ_PCM_TX);
+				cbp->src = mem_virt_to_phys(cbarray); // Data is not important as we use it only to feed the PWM
+				if(syncwithpwm)		
+					cbp->dst = 0x7E000000 + (PWM_FIFO<<2) + PWM_BASE ;
+				else
+					cbp->dst = 0x7E000000 + (PCM_FIFO_A<<2) + PCM_BASE ;
+				cbp->length = 4;
+				cbp->stride = 0;
+				cbp->next = mem_virt_to_phys(cbp + 1);
+				//fprintf(stderr,"cbp : sample %x src %x dest %x next %x\n",samplecnt,cbp->src,cbp->dst,cbp->next);
+				cbp++;
+			
+			}
+			lastcbp=cbp;
+			cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP  ;
+			cbp->src = mem_virt_to_phys(&usermem[(buffersize*registerbysample-1)]); 
+			cbp->dst = 0x7E000000 + (GPFSEL0<<2)+GENERAL_BASE; 				
+			cbp->length = 4;
+			cbp->stride = 0;
+			cbp->next = 0; // Stop DMA			
+		
+		//fprintf(stderr,"Last cbp :  src %x dest %x next %x\n",cbp->src,cbp->dst,cbp->next);
+}
+	void fskburst::SetSymbols(unsigned char *Symbols,uint32_t Size)
+	{
+		if(Size>buffersize-2) {fprintf(stderr,"Buffer overflow\n");return;}
+		
+		dma_cb_t *cbp=cbarray+1+1;
+		for(int i=0;i<Size;i++)
+		{
+			sampletab[i]=(0x5A<<24)|GetMasterFrac((Symbols[i]==0)?-freqdeviation:freqdeviation);
+			
+			cbp = &cbarray[i*cbbysample+1+1];
+			cbp->next = mem_virt_to_phys(cbp + 1);
+		}
+		cbp->next = mem_virt_to_phys(lastcbp);
+
+		
+		dma::start();
+		
+		
+	}
+

src/fskburst.h

@@ -0,0 +1,23 @@
+#ifndef DEF_FSKBURST
+#define DEF_FSKBURST
+
+#include "stdint.h"
+#include "dma.h"
+#include "gpio.h"
+
+class fskburst:public bufferdma,public clkgpio,public pwmgpio,public pcmgpio
+{
+	protected:
+	uint32_t freqdeviation;
+	uint32_t Originfsel;
+	bool syncwithpwm;
+	dma_cb_t *lastcbp;
+	public:
+	fskburst(uint64_t TuneFrequency,uint32_t SymbolRate,uint32_t Deviation,int Channel,uint32_t FifoSize);
+	~fskburst();
+	void SetDmaAlgo();
+	
+	void SetSymbols(unsigned char *Symbols,uint32_t Size);
+}; 
+
+#endif

src/librpitx.h

@@ -6,4 +6,5 @@
 #include "serialdmasync.h"
 #include "phasedmasync.h"
 #include "amdmasync.h"
+#include "fskburst.h"
 #include "dsp.h"

src/ngfmdmasync.cpp

@@ -54,18 +54,7 @@ void ngfmdmasync::SetDmaAlgo()
 			for (uint32_t samplecnt = 0; samplecnt < buffersize; samplecnt++) 
 			{ 
 			
-			// Write INT Mult
-			/*
-			cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;
-			cbp->src = mem_virt_to_phys(&usermem[samplecnt*registerbysample+1]);
-			cbp->dst = 0x7E000000 + (PLLA_CTRL<<2) + CLK_BASE ; 
-			cbp->length = 4;
-			cbp->stride = 0;
-			cbp->next = mem_virt_to_phys(cbp + 1);
-			//fprintf(stderr,"cbp : sample %x src %x dest %x next %x\n",samplecnt,cbp->src,cbp->dst,cbp->next);
-			cbp++;
-			*/
-
+			
 			// Write a frequency sample
 
 			cbp->info = BCM2708_DMA_NO_WIDE_BURSTS | BCM2708_DMA_WAIT_RESP ;

src/v2rpitx.cpp

@@ -21,7 +21,7 @@ void SimpleTest(uint64_t Freq)
 
 	clkgpio clk;
 	clk.print_clock_tree();
-	//clk.SetPllNumber(clk_plla,0);
+	//clk.SetPllNumber(clk_plld,2);
 	clk.SetAdvancedPllMode(true);
 	clk.SetCenterFrequency(Freq,100000);
 	int Deviation=0;
@@ -338,6 +338,34 @@ void SimpleTestOOK(uint64_t Freq)
 	amtest.stop();
 }
 
+void SimpleTestBurstFsk(uint64_t Freq)
+{
+	
+	//int SR=40625;
+	int SR=10000;
+	int Deviation=26370;
+	int FiFoSize=4000;
+	fskburst fsktest(Freq,SR,Deviation,14,FiFoSize);
+	
+	unsigned char TabSymbol[FiFoSize];
+	int BurstSize=100;
+	
+	while(running)
+	{
+		int i;
+		for(i=0;i<FiFoSize;i++)
+		{
+			TabSymbol[i]=(i/10)%2;
+		}	
+		fsktest.SetSymbols(TabSymbol,FiFoSize);
+		sleep(1);
+		fsktest.SetSymbols(TabSymbol,FiFoSize/2);
+		sleep(1);
+	
+		
+	}
+	fsktest.stop();
+}
 static void
 terminate(int num)
 {
@@ -362,12 +390,13 @@ int main(int argc, char* argv[])
         sigaction(i, &sa, NULL);
     }
 
-	SimpleTest(Freq);
+	//SimpleTest(Freq);
 	//SimpleTestbpsk(Freq);
 	//SimpleTestFileIQ(Freq);
 	//SimpleTestDMA(Freq);
 	//SimpleTestAm(Freq);
 	//SimpleTestOOK(Freq);
+	SimpleTestBurstFsk(Freq);
 	
 }