From 4bbc5ae4d2fa19ac0db754c09c7d729a5fee8b55 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Fri, 14 Aug 2015 13:36:45 +0200
Subject: [PATCH] drivers: nvram_spi: use xtimer
---
Makefile.dep | 4 ++++
drivers/nvram_spi/nvram-spi.c | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile.dep b/Makefile.dep
index 7a39984d2b..51d867b6b0 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -366,3 +366,7 @@ endif
ifneq (,$(filter pcd8544,$(USEMODULE)))
USEMODULE += xtimer
endif
+
+ifneq (,$(filter nvram_spi,$(USEMODULE)))
+ USEMODULE += xtimer
+endif
diff --git a/drivers/nvram_spi/nvram-spi.c b/drivers/nvram_spi/nvram-spi.c
index 441dc4ab13..941e2c42d7 100644
--- a/drivers/nvram_spi/nvram-spi.c
+++ b/drivers/nvram_spi/nvram-spi.c
@@ -13,7 +13,7 @@
#include "byteorder.h"
#include "periph/spi.h"
#include "periph/gpio.h"
-#include "hwtimer.h"
+#include "xtimer.h"
/**
* @ingroup nvram
@@ -143,7 +143,7 @@ static int nvram_spi_write(nvram_t *dev, uint8_t *src, uint32_t dst, size_t len)
}
/* Release CS */
gpio_set(spi_dev->cs);
- hwtimer_spin(NVRAM_SPI_CS_TOGGLE_TICKS);
+ xtimer_spin(NVRAM_SPI_CS_TOGGLE_TICKS);
/* Re-assert CS */
gpio_clear(spi_dev->cs);
/* Write command and address */
@@ -228,7 +228,7 @@ static int nvram_spi_write_9bit_addr(nvram_t *dev, uint8_t *src, uint32_t dst, s
return status;
}
gpio_set(spi_dev->cs);
- hwtimer_spin(NVRAM_SPI_CS_TOGGLE_TICKS);
+ xtimer_spin(NVRAM_SPI_CS_TOGGLE_TICKS);
gpio_clear(spi_dev->cs);
/* Write command and address */
status = spi_transfer_reg(spi_dev->spi, cmd, addr, NULL);
--
GitLab