1 files changed, 15 insertions, 47 deletions

diff --git a/product/synquacer/module/synquacer_system/src/gpio.c b/product/synquacer/module/synquacer_system/src/gpio.c
index 6c496c0b..eb4a0ffd 100644
--- a/product/synquacer/module/synquacer_system/src/gpio.c
+++ b/product/synquacer/module/synquacer_system/src/gpio.c
@@ -17,6 +17,7 @@
 #include <fwk_log.h>
 #include <fwk_macros.h>
 
+#include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -27,11 +28,7 @@ static const uint8_t gpio_function[] = CONFIG_SCB_GPIO_FUNCTION;
 void prmux_set_pingrp(void *prmux_base_addr, uint32_t idx, uint32_t pingrp)
 {
     if (idx > PRMUX_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return;
     }
 
@@ -41,11 +38,7 @@ void prmux_set_pingrp(void *prmux_base_addr, uint32_t idx, uint32_t pingrp)
 void gpio_set_data(void *gpio_base_addr, uint32_t idx, uint8_t value)
 {
     if (idx > GPIO_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return;
     }
 
@@ -55,11 +48,7 @@ void gpio_set_data(void *gpio_base_addr, uint32_t idx, uint8_t value)
 uint8_t gpio_get_data(void *gpio_base_addr, uint32_t idx)
 {
     if (idx > GPIO_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return 0;
     }
 
@@ -69,11 +58,7 @@ uint8_t gpio_get_data(void *gpio_base_addr, uint32_t idx)
 void gpio_set_direction(void *gpio_base_addr, uint32_t idx, uint8_t value)
 {
     if (idx > GPIO_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return;
     }
 
@@ -83,11 +68,7 @@ void gpio_set_direction(void *gpio_base_addr, uint32_t idx, uint8_t value)
 uint8_t gpio_get_direction(void *gpio_base_addr, uint32_t idx)
 {
     if (idx > GPIO_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return 0;
     }
 
@@ -97,11 +78,7 @@ uint8_t gpio_get_direction(void *gpio_base_addr, uint32_t idx)
 void gpio_set_function(void *gpio_base_addr, uint32_t idx, uint8_t value)
 {
     if (idx > GPIO_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return;
     }
 
@@ -111,11 +88,7 @@ void gpio_set_function(void *gpio_base_addr, uint32_t idx, uint8_t value)
 uint8_t gpio_get_function(void *gpio_base_addr, uint32_t idx)
 {
     if (idx > GPIO_MAX_IDX) {
-        FWK_LOG_ERR(
-            synquacer_system_ctx.log_api,
-            "Error@%s idx(%d) too big\n",
-            __func__,
-            idx);
+        FWK_LOG_ERR("Error@%s idx(%" PRIu32 ") too big", __func__, idx);
         return 0;
     }
 
@@ -130,15 +103,14 @@ void fw_gpio_init(void)
     uint32_t gpio_desc_num;
     const struct sysdef_option_gpio_desc *gpio_desc_p;
 
-    FWK_LOG_INFO(synquacer_system_ctx.log_api, "[SYSTEM] Setting up PRMUX\n");
+    FWK_LOG_INFO("[SYSTEM] Setting up PRMUX");
     for (i = 0; i < FWK_ARRAY_SIZE(prmux_pingrp); i++) {
         prmux_set_pingrp(
             (void *)CONFIG_SOC_PRMUX_BASE_ADDR, i, prmux_pingrp[i]);
     }
-    FWK_LOG_INFO(
-        synquacer_system_ctx.log_api, "[SYSTEM] Finished setting up PRMUX\n");
+    FWK_LOG_INFO("[SYSTEM] Finished setting up PRMUX");
 
-    FWK_LOG_INFO(synquacer_system_ctx.log_api, "[SYSTEM] Setting up GPIO\n");
+    FWK_LOG_INFO("[SYSTEM] Setting up GPIO");
     for (i = 0; i < FWK_ARRAY_SIZE(gpio_function); i++)
         gpio_set_function((void *)CONFIG_SOC_AP_GPIO_BASE, i, gpio_function[i]);
 
@@ -146,8 +118,7 @@ void fw_gpio_init(void)
         gpio_set_direction(
             (void *)CONFIG_SOC_AP_GPIO_BASE, i, gpio_direction[i]);
 
-    FWK_LOG_INFO(
-        synquacer_system_ctx.log_api, "[SYSTEM] Finished setting up GPIO\n");
+    FWK_LOG_INFO("[SYSTEM] Finished setting up GPIO");
 
     gpio_initial_values =
         (gpio_get_data((void *)CONFIG_SOC_AP_GPIO_BASE, 3) << 24) |
@@ -156,8 +127,7 @@ void fw_gpio_init(void)
         gpio_get_data((void *)CONFIG_SOC_AP_GPIO_BASE, 0);
 
     FWK_LOG_INFO(
-        synquacer_system_ctx.log_api,
-        "[SYSTEM] Initial GPIO input values = 0x%08x: ",
+        "[SYSTEM] Initial GPIO input values = 0x%08" PRIx32 ": ",
         gpio_initial_values);
 
     gpio_desc_num = sysdef_option_get_gpio_desc(&gpio_desc_p);
@@ -165,10 +135,8 @@ void fw_gpio_init(void)
         if (((gpio_initial_values >> gpio_desc_p->pin_no) & 0x1) ==
             (gpio_desc_p->inv ? 1 : 0)) {
             /* prepend "!" if the target signal is not asserted */
-            FWK_LOG_INFO(synquacer_system_ctx.log_api, "!");
+            FWK_LOG_INFO("!");
         }
-        FWK_LOG_INFO(synquacer_system_ctx.log_api, "%s ", gpio_desc_p->str);
+        FWK_LOG_INFO("%s ", gpio_desc_p->str);
     }
-
-    FWK_LOG_INFO(synquacer_system_ctx.log_api, "\n");
 }