Fix some compile warnings

Author: kbumsik

cores/arduino/VirtIOSerial.cpp

@@ -128,7 +128,6 @@ int VirtIOSerial::read(void)
 size_t VirtIOSerial::readBytes(char *buffer, size_t length)
 {
   checkMessageFromISR();
-  uint16_t prev_write_available = virtio_buffer_write_available(&_VirtIOSerialObj.ring);
   const size_t size = virtio_buffer_read(&_VirtIOSerialObj.ring, reinterpret_cast<uint8_t *>(buffer), length);
   // The ring buffer might be available enough to write after reading
   checkMessageFromISR();

cores/arduino/stm32/OpenAMP/mbox_ipcc.c

@@ -33,9 +33,10 @@
 
 /* Includes ------------------------------------------------------------------*/
 #include "virtio_config.h"
-#include "openamp/open_amp.h"
+#include <openamp/open_amp.h>
 #include "stm32_def.h"
 #include "openamp_conf.h"
+#include "mbox_ipcc.h"
 #include "core_debug.h"
 
 /* Private define ------------------------------------------------------------*/
@@ -103,6 +104,7 @@ int MAILBOX_Poll(struct virtio_device *vdev, uint32_t vring_id)
   switch (vring_id) {
     case VRING0_ID:
       if (msg_received_ch1 == RX_BUF_FREE) {
+        core_debug("Running vring0 (ch_1 buf free)\n");
         /* This calls rpmsg_virtio_tx_callback(), which actually does nothing. */
         rproc_virtio_notified(vdev, VRING0_ID);
         msg_received_ch1 = RX_NO_MSG;
@@ -111,6 +113,7 @@ int MAILBOX_Poll(struct virtio_device *vdev, uint32_t vring_id)
       break;
     case VRING1_ID:
       if (msg_received_ch2 == RX_NEW_MSG) {
+        core_debug("Running vring1 (ch_2 new msg)\n");
         /**
          * This calls rpmsg_virtio_rx_callback(), which calls virt_uart rx callback
          * RING_NUM_BUFFS times at maximum.
@@ -139,8 +142,8 @@ int MAILBOX_Poll(struct virtio_device *vdev, uint32_t vring_id)
   */
 int MAILBOX_Notify(void *priv, uint32_t vring_id)
 {
-  uint32_t channel;
   (void)priv;
+  uint32_t channel;
 
   /* Called after virtqueue processing: time to inform the remote */
   if (vring_id == VRING0_ID) {
@@ -170,6 +173,7 @@ int MAILBOX_Notify(void *priv, uint32_t vring_id)
 void IPCC_channel1_callback(IPCC_HandleTypeDef *hipcc,
                             uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
 {
+  (void) ChannelDir;
   msg_received_ch1 = RX_BUF_FREE;
 
   /* Inform A7 that we have received the 'buff free' msg */
@@ -180,6 +184,7 @@ void IPCC_channel1_callback(IPCC_HandleTypeDef *hipcc,
 void IPCC_channel2_callback(IPCC_HandleTypeDef *hipcc,
                             uint32_t ChannelIndex, IPCC_CHANNELDirTypeDef ChannelDir)
 {
+  (void) ChannelDir;
   msg_received_ch2 = RX_NEW_MSG;
 
   /* Don't inform A7 here */

cores/arduino/stm32/OpenAMP/openamp.c

@@ -24,6 +24,7 @@
 #include "rsc_table.h"
 #include "metal/sys.h"
 #include "metal/device.h"
+#include "mbox_ipcc.h"
 /* Private define ------------------------------------------------------------*/
 
 #define SHM_DEVICE_NAME         "STM32_SHM"

cores/arduino/stm32/OpenAMP/openamp_conf.h

@@ -23,59 +23,16 @@
 
 #ifdef VIRTIOCON
 
-/**
- * Note: Do not remove this. Removing this might not trigger compile error but
- * the configuration can be significantly different.
- */
-#include "virtio_config.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Includes ------------------------------------------------------------------*/
-/* ########################## Mailbox Interface Selection ############################## */
 /**
-  * @brief This is the list of Mailbox interface  to be used in the OpenAMP MW
-  *        Please note that not all interfaces are supported by a STM32 device
-  */
-#define MAILBOX_IPCC_IF_ENABLED
-//#define MAILBOX_HSEM_IF_ENABLED
-
-/* Includes ------------------------------------------------------------------*/
-/**
-  * @brief Include Maibox interface  header file
-  */
-
-#ifdef MAILBOX_IPCC_IF_ENABLED
-#include "mbox_ipcc.h"
-#endif /* MAILBOX_IPCC_IF_ENABLED */
-
-#ifdef MAILBOX_HSEM_IF_ENABLED
-#include "mbox_hsem.h"
-#endif /* MAILBOX_HSEM_IF_ENABLED */
-
-/* ########################## Virtual Diver Module Selection ############################## */
-/**
-  * @brief This is the list of modules to be used in the OpenAMP Virtual driver module
-  *        Please note that virtual driver are not supported on all stm32 families
-  */
-#define VIRTUAL_UART_MODULE_ENABLED
-//#define VIRTUAL_I2C_MODULE_ENABLED
-
-
-/* Includes ------------------------------------------------------------------*/
-/**
-  * @brief Include Virtual Driver module's  header file
-  */
-
-#ifdef VIRTUAL_UART_MODULE_ENABLED
+ * Note: Do not remove this. Removing this might not trigger compile error but
+ * the configuration can be significantly different.
+ */
+#include "virtio_config.h"
 #include "virt_uart.h"
-#endif /* VIRTUAL_UART_MODULE_ENABLED */
-
-#ifdef VIRTUAL_I2C_MODULE_ENABLED
-#include "virt_i2c.h"
-#endif /* VIRTUAL_I2C_MODULE_ENABLED */
 
 /*
  * for GCC add the following content to the .ld file: