Merge snapshot for v1.1.2 (#12)

Commits:
 12f3954 Support SPI 16bit buffer transfer
 e46ff4c Fix the way of the alloc/free output variables
 30ca3f8 Fix doxygen comments
 60aceda Prevent NULL reference by box brackets
 e847708 Fix unexpected free memory

Author: SPRESENSE

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/DNNRT/DNNRT.cpp

@@ -94,7 +94,7 @@ DNNRT::begin(File& nnbfile)
   // Allocate input and output data array from network model
 
   _input = (void **)malloc(sizeof(void *) * _nr_inputs);
-  _output = (DNNVariable *)malloc(sizeof(DNNVariable) * _nr_outputs);
+  _output = new DNNVariable[_nr_outputs];
 
   return 0;
 }
@@ -119,14 +119,14 @@ DNNRT::end()
     }
   if (_output)
     {
-      free(_output);
+      delete[] _output;
     }
 
   return 0;
 }
 
 int
-DNNRT::inputVariable(DNNVariable var, unsigned int index)
+DNNRT::inputVariable(DNNVariable &var, unsigned int index)
 {
   if (index >= (unsigned int)_nr_inputs)
     {

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/DNNRT/DNNRT.h

@@ -45,16 +45,14 @@ class DNNRT {
 
   /**
    * Initialize runtime object from .nnb file
-   *  
-   * User must be generate a network model data file (.nnb) by NNabla before
-   * run this library.
-   *  
-   * About NNabla:
-   *  https://nnabla.readthedocs.io/en/latest/python/index.html
-   * About NNB file:
-   *  https://nnabla.readthedocs.io/en/latest/python/file_format_converter/file_format_converter.html
-   *
-   * @param nnbfile nnb network model database file
+   *
+   * User must be generate a network model data file (.nnb) by Neural Network
+   * Console (NNC) before use this library.
+   *
+   * About Neural Network Console:
+   *  https://dl.sony.com/
+   *
+   * @param nnbfile nnb network model binary file
    * @return 0 on success, otherwise error.
    */  
   int begin(SDHCILib::File &nnbfile);
@@ -74,7 +72,7 @@ class DNNRT {
    * @return 0 on success, otherwise error.
    * @note Number of input data is depends on the network model.
    */
-  int inputVariable(DNNVariable var, unsigned int index);
+  int inputVariable(DNNVariable &var, unsigned int index);
 
   /**
    * Get output data at index
@@ -170,7 +168,6 @@ class DNNVariable {
   friend class DNNRT;
 
 public:
-  DNNVariable();
   DNNVariable(unsigned int size);
   ~DNNVariable();
 
@@ -207,6 +204,7 @@ class DNNVariable {
   int maxIndex();
 
 private:
+  DNNVariable();
   float *_data;
   unsigned int _size;
   bool _allocated;

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/SPI/SPI.cpp

@@ -308,3 +308,46 @@ void SPIClass::transfer(void *buf, size_t count)
     if (do_free)
         free(recv);
 }
+
+void SPIClass::transfer16(void *buf, size_t count)
+{
+    bool do_free = false;
+    uint16_t *recv = NULL;
+    if (ref_count == 0 || !buf || count == 0)
+        return;
+
+    if ((count * sizeof(uint16_t)) > 256) {
+        recv = (uint16_t*)malloc(count * sizeof(uint16_t));
+        do_free = true;
+        if (!recv)
+            return;
+    }
+    else {
+        recv = (uint16_t*)__builtin_alloca(count * sizeof(uint16_t));
+    }
+
+    SPI_SETBITS(spi_dev, 16);
+    SPI_EXCHANGE(spi_dev, buf, recv, count);
+
+    memcpy(buf, recv, count * sizeof(uint16_t));
+    if (do_free)
+        free(recv);
+}
+
+void SPIClass::send(void *buf, size_t count)
+{
+    if (ref_count == 0 || !buf || count == 0)
+        return;
+
+    SPI_SETBITS(spi_dev, 8);
+    SPI_EXCHANGE(spi_dev, buf, NULL, count);
+}
+
+void SPIClass::send16(void *buf, size_t count)
+{
+    if (ref_count == 0 || !buf || count == 0)
+        return;
+
+    SPI_SETBITS(spi_dev, 16);
+    SPI_EXCHANGE(spi_dev, buf, NULL, count);
+}

Arduino15/packages/SPRESENSE/hardware/spresense/1.0.0/libraries/SPI/SPI.h

@@ -232,11 +232,41 @@ class SPIClass {
     /**
      * @brief Write data to the SPI bus and also receive data
      * 
-     * @param [in] data Buffer to send
+     * @param [in,out] buf Buffer to send and receive
      * @param [in] count The number of bytes to transmit 
      */
     void transfer(void *buf, size_t count);
 
+    /**
+     * @brief Write 16-bit data to the SPI bus and also receive data
+     *
+     * @param [in,out] buf Buffer to send and receive
+     * @param [in] count The number of 16-bit data to transmit
+     */
+    void transfer16(void *buf, size_t count);
+
+    /**
+     * @brief Write buffer to the SPI bus (only write transfer)
+     *
+     * @note  This supports only Tx transfer. There is no Rx received data.
+     *        It assumes that this is used for LCD display.
+     *
+     * @param [in] buf Buffer to send
+     * @param [in] count The number of bytes to transmit
+     */
+    void send(void *buf, size_t count);
+
+    /**
+     * @brief Write 16-bit buffer the SPI bus (only write transfer)
+     *
+     * @note  This supports only Tx transfer. There is no Rx received data.
+     *        It assumes that this is used for LCD display.
+     *
+     * @param [in] buf Buffer to send
+     * @param [in] count The number of 16-bit data to transmit
+     */
+    void send16(void *buf, size_t count);
+
 private:
     int spi_port;                  /**< SPI port number */
     uint8_t ref_count;             /**< Count of SPI references */