Merge port and gpio definitions into one file in the DRV layer

[pes-rpp/rpp-lib.git] / rpp / src / drv / hbridge.c

diff --git a/rpp/src/drv/hbridge.c b/rpp/src/drv/hbridge.c
index f0d19aa8f367fbe17e9fd34766a3337254ddca77..36d0552869c944392f5ca0eb9b5cfdd93ecb858a 100644 (file)
--- a/rpp/src/drv/hbridge.c
+++ b/rpp/src/drv/hbridge.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Czech Technical University in Prague
+/* Copyright (C) 2013, 2015 Czech Technical University in Prague
  *
  * Authors:
  *     - Michal Horn
@@ -22,6 +22,7 @@
 // PWM is available for HBR control.
 #include "drv/drv.h"
 #include <os/semphr.h>
+#include "drv/spi.h"
 
 //Flag variable if pwm was initialized and is ready to start.
 static boolean_t pwm_initialized = FALSE;
@@ -81,8 +82,8 @@ spi_msg_head_t hbr_spi_wdg = {
        .flags = 0,
        .addr = 0,
        .rq_len = 2,
-       .tx_buf = (uint8_t*)&hbr_spi_wdg_tx_shd,
-       .rx_buf = (uint8_t*)&hbr_spi_wdg_rx_shd,
+       .tx_buf = (uint8_t *)&hbr_spi_wdg_tx_shd,
+       .rx_buf = (uint8_t *)&hbr_spi_wdg_rx_shd,
        .callback = drv_hbr_spi_wdg_callback,
        .private = 1
 };
@@ -145,7 +146,7 @@ int8_t drv_hbr_wdg_start()
                if (wdg_sync == NULL )
                        return -RPP_ENOMEM;
                if (xTaskCreate(drv_hbr_wdg_task,
-                                               (const signed char*)"hbr_wdg_task",
+                                               (const signed char *)"hbr_wdg_task",
                                                1024, NULL, 1, &wdg_handle) != pdPASS) {
                        wdg_start = FALSE;
                        return -RPP_ENOMEM;
@@ -276,7 +277,7 @@ double drv_hbr_pwm_get_period()
  */
 void drv_hbr_set_dir(int direction)
 {
-       hal_gpio_pin_set_value(PIN_DSC_HBRDIR, direction);
+       dio_gpio_pin_set_value(*dio_gpio_pin_get_dsc(DIO_PIN_NAME_HBRDIR, -1), direction);
 }
 
 /**
@@ -286,7 +287,7 @@ void drv_hbr_set_dir(int direction)
  */
 int drv_hbr_get_dir()
 {
-       return hal_gpio_pin_get_value(PIN_DSC_HBRDIR);
+       return dio_gpio_pin_get_value(*dio_gpio_pin_get_dsc(DIO_PIN_NAME_HBRDIR, -1));
 }
 
 /**
@@ -296,7 +297,7 @@ int drv_hbr_get_dir()
  */
 void drv_hbr_set_en(int value)
 {
-       hal_gpio_pin_set_value(PIN_DSC_HBREN, value);
+       dio_gpio_pin_set_value(*dio_gpio_pin_get_dsc(DIO_PIN_NAME_HBREN, -1), value);
 }
 
 /**
@@ -306,5 +307,5 @@ void drv_hbr_set_en(int value)
  */
 int drv_hbr_get_en()
 {
-       return hal_gpio_pin_get_value(PIN_DSC_HBREN);
+       return dio_gpio_pin_get_value(*dio_gpio_pin_get_dsc(DIO_PIN_NAME_HBREN, -1));
 }