Diff: dma.cpp

Revision:

41:3e0623d81b9a

Parent:

40:bd6d8c35e822

Child:

42:52a92a8d2cc7

diff -r bd6d8c35e822 -r 3e0623d81b9a dma.cpp
--- a/dma.cpp	Fri Jan 30 06:16:39 2015 +0000
+++ b/dma.cpp	Fri Jan 30 06:59:19 2015 +0000
@@ -16,9 +16,19 @@
  * @len = the length of array1 and array2, and the number of reads the DMA completes
  * */
  
-void dma_init(int len)
+DMA::DMA(uint16_t* sample_array1, uint16_t* sample_array2, uint16_t* sample_array3,int len, int* relative_angle)
 {
-    
+    _array1 = sample_array1;
+    _array2 = sample_array2;
+    _array3 = sample_array3;
+    _len = len;
+    _angle = relative_angle;
+    init();
+}
+
+
+void DMA::init()
+{
     // select round-robin arbitration priority
     DMA_CR |= DMA_CR_ERCA_MASK;
     
@@ -37,11 +47,11 @@
         
     // Set memory address for source and destination for DMA0, DMA1, and DMA2
     DMA_TCD0_SADDR = (uint32_t)&ADC0_RA;
-    DMA_TCD0_DADDR = (uint32_t) sample_array1;
+    DMA_TCD0_DADDR = (uint32_t) _array1;
     DMA_TCD1_SADDR = (uint32_t)&ADC1_RA;
-    DMA_TCD1_DADDR = (uint32_t) sample_array2;
-    DMA_TCD2_SADDR = (uint32_t)&rotary_count;
-    DMA_TCD2_DADDR = (uint32_t) angle_array;
+    DMA_TCD1_DADDR = (uint32_t) _array2;
+    DMA_TCD2_SADDR = (uint32_t) _angle;
+    DMA_TCD2_DADDR = (uint32_t) _array3;
     
     // Set an offset for source and destination address
     DMA_TCD0_SOFF = 0x00; // Source address offset of 2 bits per transaction
@@ -62,21 +72,21 @@
     DMA_TCD2_NBYTES_MLNO = 0x02;
         
     // Current major iteration count (a single iteration of 5 bytes)
-    DMA_TCD0_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(len);
-    DMA_TCD0_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(len);
-    DMA_TCD1_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(len);
-    DMA_TCD1_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(len);
-    DMA_TCD2_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(len);
-    DMA_TCD2_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(len);
+    DMA_TCD0_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(_len);
+    DMA_TCD0_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(_len);
+    DMA_TCD1_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(_len);
+    DMA_TCD1_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(_len);
+    DMA_TCD2_CITER_ELINKNO = DMA_CITER_ELINKNO_CITER(_len);
+    DMA_TCD2_BITER_ELINKNO = DMA_BITER_ELINKNO_BITER(_len);
     
     // Adjustment value used to restore the source and destiny address to the initial value
     // After reading 'len' number of times, the DMA goes back to the beginning by subtracting len*2 from the address (going back to the address of 'array0')
     DMA_TCD0_SLAST = 0x00;      // Source address adjustment
-    DMA_TCD0_DLASTSGA = -(len*2);  // Destination address adjustment
+    DMA_TCD0_DLASTSGA = -(_len*2);  // Destination address adjustment
     DMA_TCD1_SLAST = 0x00;      // Source address adjustment
-    DMA_TCD1_DLASTSGA = -(len*2);  // Destination address adjustment
+    DMA_TCD1_DLASTSGA = -(_len*2);  // Destination address adjustment
     DMA_TCD2_SLAST = 0x00;      // Source address adjustment
-    DMA_TCD2_DLASTSGA = -(len*2);  // Destination address adjustment
+    DMA_TCD2_DLASTSGA = -(_len*2);  // Destination address adjustment
     
     // Setup control and status register
     DMA_TCD0_CSR = 0;
@@ -100,9 +110,7 @@
     pc.printf("DMA_HRS: %08x\r\n", DMA_HRS);*/
 }
 
-void reset_dma() {
+void DMA::reset() {
     // Set memory address for destinations back to the beginning
-    DMA_TCD0_DADDR = (uint32_t) sample_array1;
-    DMA_TCD1_DADDR = (uint32_t) sample_array2;
-    DMA_TCD2_DADDR = (uint32_t) angle_array;
+    init();
 }