Merge pull request #68 from apullin/dfmem_unique_id

dfmem unique ID

Author: fgb

dfmem.c

@@ -57,7 +57,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include "spi.h"
 #include "dfmem.h"
 #include "spi_controller.h"        // For DMA
@@ -162,6 +162,9 @@ union {
     unsigned char chr_addr[4];
 } MemAddr;
 
+unsigned char userSecRegID[64];
+unsigned char factorySecRegID[64];
+
 /*----------------------------------------------------------------------------
  *          Declaration of private functions
  ---------------------------------------------------------------------------*/
@@ -172,6 +175,7 @@ static inline void dfmemSelectChip(void);
 static inline void dfmemDeselectChip(void);
 static void dfmemSetupPeripheral(void);
 static void dfmemGeometrySetup(void);
+static void dfmemReadSecurityRegister(void);
 
 static void spiCallback(unsigned int irq_source);
 
@@ -186,6 +190,10 @@ void dfmemSetup(void)
     spic2SetCallback(&spiCallback);
     while(!dfmemIsReady());
     dfmemGeometrySetup();
+
+    //Readback security register, which gets chip-unique identifiers
+    // ID is stored in a static var here, and dfmem has a public getter
+    dfmemReadSecurityRegister();
 }
 
 void dfmemWrite (unsigned char *data, unsigned int length, unsigned int page,
@@ -508,6 +516,12 @@ void dfmemZeroIndex()
     nextPage = 0;
 }
 
+uint64_t dfmemGetUnqiueID(){
+    //Grab first 8 bytes of 64-byte factory value
+    uint64_t id = *((uint64_t*)(factorySecRegID));
+    return id;
+}
+
 /*-----------------------------------------------------------------------------
  *          Private functions
 -----------------------------------------------------------------------------*/
@@ -619,3 +633,27 @@ static void dfmemGeometrySetup(void)
             break;
     }
 }
+
+static void dfmemReadSecurityRegister(void){
+
+    int i; // Loop variable, MPLABX is not C99 standard
+
+    dfmemSelectChip();
+
+    dfmemWriteByte(0x77); //Read security register opcode
+    dfmemWriteByte(0x77); //Dummy write, 3 bytes required for opcode 0x77
+    dfmemWriteByte(0x77); //Dummy write, 3 bytes required for opcode 0x77
+    dfmemWriteByte(0x77); //Dummy write, 3 bytes required for opcode 0x77
+
+    //User ID is the first 64 bytes
+    for(i = 0; i < 64; i++){
+        userSecRegID[i] = dfmemReadByte();
+    }
+
+    //Factory ID is the second 64 bytes
+    for(i = 0; i < 64; i++){
+        factorySecRegID[i] = dfmemReadByte();
+    }
+    dfmemDeselectChip();
+
+}

dfmem.h

@@ -55,6 +55,7 @@
 #ifndef __DFMEM_H
 #define __DFMEM_H
 
+#include <stdint.h>
 
 typedef struct {
     unsigned int byte_address_bits;
@@ -216,5 +217,8 @@ void dfmemSync();
 // This resets the current page and offset tracking variable to zero.
 void dfmemZeroIndex();
 
+//Get the factory programmed unique identifier, which is the first 8 bytes
+// of a 64-byte array
+uint64_t dfmemGetUnqiueID();
 
 #endif // __DFMEM_H

init_default.c

@@ -39,7 +39,7 @@
  *
  */
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include "adc.h"
 
 

ovcam.c

@@ -40,7 +40,7 @@
  *  - Uses an I2C(SCCB) port for configuring the camera.
  */
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include "i2c.h"
 #include "ovcam.h"
 #include "utils.h"

ovcam.h

@@ -59,7 +59,7 @@
 #define __OVCAM_H
 
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 
 
 // OVCAM Pins

packet_queue.c

@@ -40,7 +40,7 @@
  *
  */
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include "queue.h"
 #include "packet_queue.h"
 #include "radio.h"

payload_queue.c

@@ -43,7 +43,7 @@
 #include "queue.h"
 #include "payload_queue.h"
 #include "payload.h"
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include <stdio.h>      // for NULL
 #include <stdlib.h>     // for malloc
 

progmem.c

@@ -43,7 +43,7 @@
  *
  */
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include "progmem.h"
 
 //#include "lcd.h"

queue.c

@@ -42,7 +42,7 @@
 
 #include "queue.h"
 #include "utils.h"
-#include "p33Fxxxx.h"
+#include <xc.h>
 #include <stdio.h>      // for NULL
 #include <stdlib.h>     // for malloc
 

utils.h

@@ -44,7 +44,7 @@
 #define __UTILS_H
 
 
-#include "p33Fxxxx.h"
+#include <xc.h>
 
 // Abstracting LEDs for easier control of their status
 #if defined(__IMAGEPROC1)