From 9bc2deb9aa371cfdf7ebe6fbe6f4eda8e21250c9 Mon Sep 17 00:00:00 2001
From: Martin Eckardt <mecry@posteo.net>
Date: Tue, 11 Aug 2020 21:58:56 +0200
Subject: [PATCH] make G4 target compileable with CAN support

---
 targets/TARGET_STM/TARGET_STM32G4/objects.h |  2 +-
 targets/TARGET_STM/can_api.c                | 24 ++++++++++++++++++---
 targets/targets.json                        |  3 ++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/targets/TARGET_STM/TARGET_STM32G4/objects.h b/targets/TARGET_STM/TARGET_STM32G4/objects.h
index 5a33295f3c..00f278c9f0 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/objects.h
+++ b/targets/TARGET_STM/TARGET_STM32G4/objects.h
@@ -133,7 +133,7 @@ struct analogin_s {
 
 #if DEVICE_CAN
 struct can_s {
-    CAN_HandleTypeDef CanHandle;
+    FDCAN_HandleTypeDef CanHandle;
     int index;
     int hz;
 };
diff --git a/targets/TARGET_STM/can_api.c b/targets/TARGET_STM/can_api.c
index 560ca9e321..e80e74171e 100644
--- a/targets/TARGET_STM/can_api.c
+++ b/targets/TARGET_STM/can_api.c
@@ -133,9 +133,12 @@ static void _can_init_freq_direct(can_t *obj, const can_pinmap_t *pinmap, int hz
     obj->CanHandle.Init.DataSyncJumpWidth = 0x1;   // Not used - only in FDCAN
     obj->CanHandle.Init.DataTimeSeg1 = 0x1;        // Not used - only in FDCAN
     obj->CanHandle.Init.DataTimeSeg2 = 0x1;        // Not used - only in FDCAN
+#ifndef TARGET_STM32G4
     obj->CanHandle.Init.MessageRAMOffset = 0;
+#endif
     obj->CanHandle.Init.StdFiltersNbr = 1; // to be aligned with the handle parameter in can_filter
     obj->CanHandle.Init.ExtFiltersNbr = 1; // to be aligned with the handle parameter in can_filter
+#ifndef TARGET_STM32G4
     obj->CanHandle.Init.RxFifo0ElmtsNbr = 8;
     obj->CanHandle.Init.RxFifo0ElmtSize = FDCAN_DATA_BYTES_8;
     obj->CanHandle.Init.RxFifo1ElmtsNbr = 0;
@@ -145,9 +148,11 @@ static void _can_init_freq_direct(can_t *obj, const can_pinmap_t *pinmap, int hz
     obj->CanHandle.Init.TxEventsNbr = 3;
     obj->CanHandle.Init.TxBuffersNbr = 0;
     obj->CanHandle.Init.TxFifoQueueElmtsNbr = 3;
+#endif
     obj->CanHandle.Init.TxFifoQueueMode = FDCAN_TX_FIFO_OPERATION;
+#ifndef TARGET_STM32G4
     obj->CanHandle.Init.TxElmtSize = FDCAN_DATA_BYTES_8;
-
+#endif
     can_internal_init(obj);
 }
 
@@ -198,7 +203,9 @@ void can_irq_free(can_t *obj)
     else {
         return;
     }
+#ifndef TARGET_STM32G4
     HAL_NVIC_DisableIRQ(FDCAN_CAL_IRQn);
+#endif
     can_irq_ids[obj->index] = 0;
 }
 
@@ -441,14 +448,21 @@ static void can_irq(CANName name, int id)
             irq_handler(can_irq_ids[id], IRQ_TX);
         }
     }
-
+#ifndef TARGET_STM32G4
     if (__HAL_FDCAN_GET_IT_SOURCE(&CanHandle, FDCAN_IT_RX_BUFFER_NEW_MESSAGE)) {
         if (__HAL_FDCAN_GET_FLAG(&CanHandle, FDCAN_IT_RX_BUFFER_NEW_MESSAGE)) {
             __HAL_FDCAN_CLEAR_FLAG(&CanHandle, FDCAN_IT_RX_BUFFER_NEW_MESSAGE);
             irq_handler(can_irq_ids[id], IRQ_RX);
         }
     }
-
+#else
+    if (__HAL_FDCAN_GET_IT_SOURCE(&CanHandle, FDCAN_IT_RX_FIFO0_NEW_MESSAGE)) {
+        if (__HAL_FDCAN_GET_FLAG(&CanHandle, FDCAN_IT_RX_FIFO0_NEW_MESSAGE)) {
+            __HAL_FDCAN_CLEAR_FLAG(&CanHandle, FDCAN_IT_RX_FIFO0_NEW_MESSAGE);
+            irq_handler(can_irq_ids[id], IRQ_RX);
+        }
+    }
+#endif
     if (__HAL_FDCAN_GET_IT_SOURCE(&CanHandle, FDCAN_IT_ERROR_WARNING)) {
         if (__HAL_FDCAN_GET_FLAG(&CanHandle, FDCAN_FLAG_ERROR_WARNING)) {
             __HAL_FDCAN_CLEAR_FLAG(&CanHandle, FDCAN_FLAG_ERROR_WARNING);
@@ -501,7 +515,11 @@ void can_irq_set(can_t *obj, CanIrqType type, uint32_t enable)
             interrupts = FDCAN_IT_TX_COMPLETE;
             break;
         case IRQ_RX:
+#ifndef TARGET_STM32G4
             interrupts = FDCAN_IT_RX_BUFFER_NEW_MESSAGE;
+#else
+	    interrupts = FDCAN_IT_RX_FIFO0_NEW_MESSAGE;
+#endif
             break;
         case IRQ_ERROR:
             interrupts = FDCAN_IT_ERROR_WARNING;
diff --git a/targets/targets.json b/targets/targets.json
index 67b809954a..5226cb9090 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2475,7 +2475,8 @@
         "device_has_add": [
             "ANALOGOUT",
             "FLASH",
-            "MPU"
+            "MPU",
+            "CAN"
         ]
     },
     "NUCLEO_G474RE": {