CODK-M firmware changes

-add CurieSMC library
-changes for cdc-acm compatibility
-changes for zephyr based firmware compatibility

Author: bigdinotech

libraries/CurieSMC/keywords.txt

@@ -0,0 +1,23 @@
+#######################################
+# Syntax Coloring Map For CurieSMC
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+CurieSMC KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+write   KEYWORD2
+reaD   KEYWORD2
+begin   KEYWORD2
+end     KEYWORD2
+availableForRead  KEYWORD2
+availableForWrite     KEYWORD2
+#######################################
+# Constants (LITERAL1)
+#######################################

libraries/CurieSMC/library.properties

@@ -0,0 +1,9 @@
+name=CurieSMC
+version=1.0
+author=Intel
+maintainer=Intel <dino.tinitigan@intel.com>
+sentence=Enables passing of data between the quark and ARC cores
+paragraph=
+category=Communication
+url=
+architectures=arc32

libraries/CurieSMC/src/CurieSMC.cpp

@@ -0,0 +1,78 @@
+
+#include "CurieSMC.h"
+
+CurieSMC SMC;
+void CurieSMC::begin()
+{
+  QUARK_BUFF_HEAD = 0;
+  QUARK_BUFF_TAIL = 0;
+  QUARK_BUFF_FLAG = 2;
+  ARC_BUFF_HEAD = 0;
+  ARC_BUFF_TAIL = 0;
+  ARC_BUFF_FLAG = 2; 
+}
+int CurieSMC::write(uint8_t data)
+{
+  //check if buffer is available
+  if(ARC_BUFF_FLAG == 1)
+  {
+    return 1;
+  }
+  
+  //lock the buffer
+  ARC_BUFF_FLAG = 0;
+  
+  int new_head = (int)(ARC_BUFF_HEAD+1)%SHARED_BUFFER_SIZE;
+  if(new_head != ARC_BUFF_TAIL)
+  {
+    ARC_BUFF[ARC_BUFF_HEAD] = data;
+    ARC_BUFF_HEAD = new_head;
+  }
+  else
+  {
+    return 2; //buffer is full
+  }
+
+  //unlock the buffer
+  ARC_BUFF_FLAG = 2;
+
+  return 0;
+}
+
+uint8_t CurieSMC::read()
+{
+  //check if buffer is available
+  if(QUARK_BUFF_FLAG == 1)
+    return 0;
+
+  //lock the buffer
+  QUARK_BUFF_FLAG = 0;
+  
+  if(availableForRead())
+  {
+    uint8_t data = QUARK_BUFF[QUARK_BUFF_TAIL];
+    QUARK_BUFF_TAIL = (QUARK_BUFF_TAIL + 1) % SHARED_BUFFER_SIZE;
+    QUARK_BUFF_FLAG = 2; //unlock the buffer
+    return data;
+  }
+  else
+  {
+    QUARK_BUFF_FLAG = 2; //unlock the buffer
+    return 0;
+  }
+}
+
+int CurieSMC::availableForWrite()
+{
+  int head = ARC_BUFF_HEAD;
+  int tail = ARC_BUFF_TAIL;
+  
+  if(head >= tail)
+    return SHARED_BUFFER_SIZE - head + tail - 1;
+  return tail - head - 1;
+}
+
+int CurieSMC::availableForRead()
+{
+  return (int)(SHARED_BUFFER_SIZE + QUARK_BUFF_HEAD-QUARK_BUFF_TAIL) % SHARED_BUFFER_SIZE;
+}

libraries/CurieSMC/src/CurieSMC.h

@@ -0,0 +1,31 @@
+
+#define QUARK_BUFF 	    shared_data->quark_to_ARC.data
+#define QUARK_BUFF_HEAD	shared_data->quark_to_ARC.head
+#define QUARK_BUFF_TAIL	shared_data->quark_to_ARC.tail
+#define QUARK_BUFF_FLAG	shared_data->quark_to_ARC.flag
+#define ARC_BUFF	    shared_data->ARC_to_quark.data
+#define ARC_BUFF_HEAD	shared_data->ARC_to_quark.head
+#define ARC_BUFF_TAIL	shared_data->ARC_to_quark.tail
+#define ARC_BUFF_FLAG	shared_data->ARC_to_quark.flag
+
+#include "Arduino.h"
+#include "platform.h"
+
+class CurieSMC 
+{
+public:
+  CurieSMC()
+  {
+  }
+  
+  void begin();
+  void end();
+  int write(uint8_t data);
+  uint8_t read();
+  int availableForWrite();
+  int availableForRead();
+
+private:
+};
+
+extern CurieSMC SMC;

system/libarc32_arduino101/framework/include/platform.h

@@ -40,6 +40,7 @@
 #define NUM_CPU     4
 
 #define CDCACM_BUFFER_SIZE 256
+#define SHARED_BUFFER_SIZE 64
 
 struct cdc_ring_buffer
 {
@@ -62,6 +63,30 @@ struct cdc_acm_shared_data {
     int device_open;
 };
 
+struct shared_ring_buffer
+{
+    /** Ring buffer data */
+    volatile uint8_t data[SHARED_BUFFER_SIZE];
+    /** Ring buffer head index, modified by producer */
+    volatile int head;
+    /** Ring buffer tail index, modified by consumer */
+    volatile int tail;
+
+    /** Buffer status
+     * 0 - locked by X86 core
+     * 1 - locked by arc core
+     * 2 - available to be taken by any core
+    **/
+    volatile int flag;
+};
+
+struct ipm_shared_data
+{
+    struct shared_ring_buffer *quark_buffer;
+    struct shared_ring_buffer *arc_buffer;
+};
+
+
 /**
  * LMT / ARC global shared structure. This structure lies in the beginning of
  * the RAM.
@@ -109,6 +134,18 @@ struct platform_shared_block_ {
      * The ARC core counts on QRK to find valid pointers in place.
      */
     struct cdc_acm_shared_data	* cdc_acm_buffers;
+    
+    struct cdc_acm_shared_data cdc_acm_buffers_obj;
+
+    struct cdc_ring_buffer cdc_acm_shared_rx_buffer;
+    struct cdc_ring_buffer cdc_acm_shared_tx_buffer;
+    
+    struct ipm_shared_data *ipm_shared_data_ptr;
+
+    struct ipm_shared_data ipm_shared_data_obj;
+
+    struct shared_ring_buffer quark_to_ARC;
+    struct shared_ring_buffer ARC_to_quark;
 };
 
 #define RAM_START           0xA8000000

variants/arduino_101/linker_scripts/flash.ld

@@ -40,7 +40,7 @@ OUTPUT_FORMAT("elf32-littlearc", "elf32-bigarc", "elf32-littlearc")
 MEMORY
     {
     FLASH                 (rx) : ORIGIN = 0x40034000, LENGTH = 152K
-    SRAM                  (wx) : ORIGIN = 0xa800e000, LENGTH = 24K
+    SRAM                  (wx) : ORIGIN = 0xa8000400, LENGTH = 24K
     DCCM                  (wx) : ORIGIN = 0x80000000, LENGTH = 8K
     }