Diff: AVR910.cpp

Revision:

3:df6782d01720

Parent:

2:99c56829a2a8

--- a/AVR910.cpp	Thu Sep 09 11:11:37 2010 +0000
+++ b/AVR910.cpp	Sat Jan 31 21:54:05 2015 +0000
@@ -43,11 +43,12 @@
 AVR910::AVR910(PinName mosi,
                PinName miso,
                PinName sclk,
-               PinName nReset) : spi_(mosi, miso, sclk), nReset_(nReset) {
+               PinName nReset) : spi_(mosi, miso, sclk), nReset_(nReset)
+{
 
     //Slow frequency as default to ensure no errors from
     //trying to run it too fast. Increase as appropriate.
-    spi_.frequency(32000);
+    spi_.frequency(5000);
     spi_.format(8, 0);
 
     int response = 0;
@@ -60,11 +61,10 @@
 
     //Issue a programming enable command.
     response = enableProgramming();
+    //printf("R=%d\n\r",response);
 
     //Simple debugging to see if we get trapped
     //in an infinite loop.
-    DigitalOut working(LED1);
-    working = 1;
 
     //TODO: introduce a timeout.
     while (response < 0) {
@@ -77,14 +77,15 @@
 
         //Issue another programming enable.
         response = enableProgramming();
+        // printf("R=%d\n\r",response);
 
     }
 
-    working = 0;
 
 }
 
-int AVR910::program(FILE* binary, int pageSize, int numPages) {
+int AVR910::program(FILE* binary, int pageSize, int numPages)
+{
 
     //Clear memory contents.
     chipErase();
@@ -168,24 +169,118 @@
 
 }
 
-void AVR910::setFrequency(int frequency) {
+int AVR910::programData(char* myData, int fileSize, int pageSize, int numPages)
+{
+
+    //Clear memory contents.
+    chipErase();
+
+    char pageOffset = 0;
+    int  pageNumber = 0;
+    int  address    = 0;
+    int  c          = 0;
+    int  highLow    = 0;
+
+    //We're dealing with paged memory.
+//   if (numPages > 1) {
+
+    //while ((c = getc(binary)) != EOF) {
+    for (int i=0; i<fileSize; i++) {
+        c = myData[i];
+        printf("p %d: 0x%02x\n",i, myData[i]);
+        //Page is fully loaded, time to write it to flash.
+        if (pageOffset == (pageSize)) {
+            writeFlashMemoryPage(pageNumber);
+
+            pageNumber++;
+            if (pageNumber > numPages) {
+                break;
+            }
+            pageOffset = 0;
+        }
+
+        //Write low byte.
+        if (highLow == 0) {
+            loadMemoryPage(WRITE_LOW_BYTE, pageOffset, c);
+            highLow = 1;
+        }
+        //Write high byte.
+        else {
+            loadMemoryPage(WRITE_HIGH_BYTE, pageOffset, c);
+            highLow = 0;
+            pageOffset++;
+        }
+
+    }
+
+//   }
+    //We're dealing with non-paged memory.
+//   else {
+//
+//        while ((c = getc(binary)) != EOF) {
+//
+//            //Write low byte.
+//            if (highLow == 0) {
+//                writeFlashMemoryByte(WRITE_LOW_FLASH_BYTE, address, c);
+//                highLow = 1;
+//            }
+//            //Write high byte.
+//            else {
+//                writeFlashMemoryByte(WRITE_HIGH_FLASH_BYTE, address, c);
+//                highLow = 0;
+//                address++;
+//
+//                //Page size is our memory size in the non-paged memory case.
+//                //Therefore if we've gone beyond our size break because we
+//                //don't have any more room.
+//                if (address > pageSize) {
+//                    break;
+//                }
+//
+//            }
+//
+//        }
+
+//   }
+
+    //We might have partially filled up a page.
+    writeFlashMemoryPage(pageNumber);
+
+    int success = -1;
+    //success = checkMemory(pageNumber, binary);
+    printf("Going to check memory\n");
+    success = checkMemoryData(pageNumber, myData, fileSize);
+
+    //Leave serial programming mode by pulling reset line high.
+    nReset_ = 1;
+
+    return success;
+
+}
+void AVR910::setFrequency(int frequency)
+{
 
     spi_.frequency(frequency);
 
 }
 
-int AVR910::enableProgramming(void) {
+int AVR910::enableProgramming(void)
+{
 
     int response = 0;
     int error    = 0;
 
+
     //Programming Enable Command: 0xAC, 0x53, 0x00, 0x00
     //Byte two echo'd back in byte three.
-    spi_.write(0xAC);
+    response = spi_.write(0xAC);
+    //printf("enableProgramming resp (should be ??) = %x\n\r",response);
 
-    spi_.write(0x53);
+    response = spi_.write(0x53);
+    //printf("enableProgramming resp (should be 0xAC) = %x\n\r",response);
 
     response = spi_.write(0x00);
+    //printf("enableProgramming resp (should be 0x53) = %x\n\r",response);
 
     if (response == 0x53) {
         error =  0;
@@ -193,13 +288,15 @@
         error = -1;
     }
 
-    spi_.write(0x00);
+    response = spi_.write(0x00);
+    //printf("enableProgramming resp (should be 0x00) = %x\n\r",response);
 
     return error;
 
 }
 
-void AVR910::poll(void) {
+void AVR910::poll(void)
+{
 
     int response = 0;
 
@@ -212,7 +309,8 @@
 
 }
 
-int AVR910::readVendorCode(void) {
+int AVR910::readVendorCode(void)
+{
 
     int response = 0;
 
@@ -221,13 +319,17 @@
     spi_.write(0x30);
     spi_.write(0x00);
     spi_.write(0x00);
+    //printf("r1=%d\n\r",spi_.write(0x00));
+    //printf("r2=%d\n\r",spi_.write(0x00));
     response = spi_.write(0x00);
+    //printf("r3=%d\n\r",response);
 
     return response;
 
 }
 
-int AVR910::readPartFamilyAndFlashSize(void) {
+int AVR910::readPartFamilyAndFlashSize(void)
+{
 
     int response = 0;
 
@@ -242,7 +344,8 @@
 
 }
 
-int AVR910::readPartNumber(void) {
+int AVR910::readPartNumber(void)
+{
 
     int response = 0;
 
@@ -257,7 +360,8 @@
 
 }
 
-void AVR910::chipErase(void) {
+void AVR910::chipErase(void)
+{
 
     //Issue chip erase command.
     spi_.write(0xAC);
@@ -273,7 +377,8 @@
 
 }
 
-void AVR910::loadMemoryPage(int highLow, char address, char data) {
+void AVR910::loadMemoryPage(int highLow, char address, char data)
+{
 
     spi_.write(highLow);
     spi_.write(0x00);
@@ -284,7 +389,8 @@
 
 }
 
-void AVR910::writeFlashMemoryByte(int highLow, int address, char data) {
+void AVR910::writeFlashMemoryByte(int highLow, int address, char data)
+{
 
     spi_.write(highLow);
     spi_.write(address & 0xFF00 >> 8);
@@ -293,7 +399,8 @@
 
 }
 
-void AVR910::writeFlashMemoryPage(char pageNumber) {
+void AVR910::writeFlashMemoryPage(char pageNumber)
+{
 
     spi_.write(0x4C);
     spi_.write((pageNumber >> 2) & 0x3F);
@@ -304,7 +411,8 @@
 
 }
 
-char AVR910::readProgramMemory(int highLow, char pageNumber, char pageOffset) {
+char AVR910::readProgramMemory(int highLow, char pageNumber, char pageOffset)
+{
 
     int response = 0;
 
@@ -319,7 +427,8 @@
 
 }
 
-int AVR910::checkMemory(int numPages, FILE* binary) {
+int AVR910::checkMemory(int numPages, FILE* binary)
+{
 
     int success  = 0;
     int response = 0;
@@ -335,8 +444,8 @@
             response = readProgramMemory(READ_LOW_BYTE, i, j);
             //debug.printf("Low byte: 0x%02x\n", response);
             if ( c != response ) {
-                debug.printf("Page %i low byte %i: 0x%02x\n", i, j, response);
-                debug.printf("Correct byte is 0x%02x\n", c);
+                //  debug.printf("Page %i low byte %i: 0x%02x\n", i, j, response);
+                //  debug.printf("Correct byte is 0x%02x\n", c);
                 success = -1;
             }
 
@@ -345,8 +454,8 @@
             response = readProgramMemory(READ_HIGH_BYTE, i, j);
             //debug.printf("High byte: 0x%02x\n", response);
             if ( c != response ) {
-                debug.printf("Page %i high byte %i: 0x%02x\n", i, j, response);
-                debug.printf("Correct byte is 0x%02x\n", c);
+                // debug.printf("Page %i high byte %i: 0x%02x\n", i, j, response);
+                // debug.printf("Correct byte is 0x%02x\n", c);
                 success = -1;
             }
         }
@@ -355,3 +464,53 @@
     return success;
 
 }
+
+
+int AVR910::checkMemoryData(int numPages, char* myData, int fileSize)
+{
+
+    int success  = 0;
+    int response = 0;
+    char c       = 0;
+
+    //Go back to the beginning of the binary file.
+    //fseek(binary, 0, SEEK_SET);
+    int dpoint=0;
+    printf("about to start checking (numPages=%d pagesize=%d)\n",numPages, PAGE_SIZE);
+    for (int i = 0; i <= numPages; i++) {
+        for (int j = 0; j < PAGE_SIZE; j++) {
+
+            //c = getc(binary);
+            c = myData[dpoint];
+            //Read program memory low byte.
+            response = readProgramMemory(READ_LOW_BYTE, i, j);
+            //debug.printf("Low byte: 0x%02x\n", response);
+            printf("dpoint=%d Page %i low byte %i: 0x%02x (should be 0x%02x)\n", dpoint-1, i, j, response,c);
+            if ( c != response ) {
+                // debug.printf("Page %i low byte %i: 0x%02x\n", i, j, response);
+                // debug.printf("Correct byte is 0x%02x\n", c);
+                success = -1;
+            }
+
+            //c = getc(binary);
+            dpoint++;
+            if (dpoint==fileSize) break;
+            c = myData[dpoint];
+            //Read program memory high byte.
+            response = readProgramMemory(READ_HIGH_BYTE, i, j);
+            printf("dpoint=%d Page %i high byte %i: 0x%02x (should be 0x%02x)\n", dpoint-1, i, j, response,c);
+
+            //debug.printf("High byte: 0x%02x\n", response);
+            if ( c != response ) {
+                // debug.printf("Page %i high byte %i: 0x%02x\n", i, j, response);
+                //debug.printf("Correct byte is 0x%02x\n", c);
+                success = -1;
+            }
+            dpoint++;
+            if (dpoint==fileSize) break;
+        }
+    }
+
+    return success;
+
+}