Rename spi_emu in spi_bitbang.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@968 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/drv/spi_bitbang.c b/drv/spi_bitbang.c
new file mode 100644 (file)
index 0000000..9d15ca1
--- /dev/null
+++ b/drv/spi_bitbang.c
@@ -0,0 +1,118 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ *
+ * -->
+ *
+ * \brief Emulated SPI Master for DSP firmware download (impl.)
+ *
+ * \version $Id: spi.c 15328 2007-03-21 15:07:04Z batt $
+ *
+ * \author Francesco Sacchi <batt@develer.com>
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+
+#include <cfg/cpu.h>
+#include <cfg/module.h>
+#include <drv/spi_emu.h>
+#include "hw_spi.h"
+
+void spi_assertSS(void)
+{
+       ATOMIC(SS_ACTIVE());
+}
+
+void spi_deassertSS(void)
+{
+       ATOMIC(SS_INACTIVE());
+}
+
+/**
+ * Send byte \c c over MOSI line, CONFIG_SPI_DATAORDER first.
+ * SS pin state is left unchanged.
+ */
+uint8_t spi_sendRecv(uint8_t c)
+{
+       uint8_t data = 0;
+       uint8_t shift = SPI_DATAORDER_START;
+
+
+       ATOMIC(
+               for (int i = 0; i < 8; i++)
+               {
+                       /* Shift the i-th bit to MOSI */
+                       if (c & shift)
+                               MOSI_HIGH();
+                       else
+                               MOSI_LOW();
+                       /* Assert clock */
+                       SCK_ACTIVE();
+                       data |= IS_MISO_HIGH() ? shift : 0;
+                       /* De-assert clock */
+                       SCK_INACTIVE();
+                       SPI_DATAORDER_SHIFT(shift);
+               }
+       );
+       return data;
+}
+
+MOD_DEFINE(spi);
+void spi_init(void)
+{
+       ATOMIC(SPI_HW_INIT());
+       MOD_INIT(spi);
+}
+
+/**
+ * Read \param len from spi, and put it in \param buff.
+ */
+void spi_read(void *_buff, size_t len)
+{
+       uint8_t *buff = (uint8_t *)_buff;
+
+       while (len--)
+               /* Read byte from spi and put it in buffer. */
+               *buff++ = spi_sendRecv(0);
+
+}
+
+/**
+ * Write \param len to spi, and take it from \param buff.
+ */
+void spi_write(const void *_buff, size_t len)
+{
+       const uint8_t *buff = (const uint8_t *)_buff;
+
+       while (len--)
+               /* Write byte pointed at by *buff to spi */
+               spi_sendRecv(*buff++);
+
+}

diff --git a/drv/spi_bitbang.h b/drv/spi_bitbang.h
new file mode 100644 (file)
index 0000000..ff71690
--- /dev/null
+++ b/drv/spi_bitbang.h
@@ -0,0 +1,72 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
+ *
+ * -->
+ *
+ * \brief Emulated SPI Master for DSP firmware download (interface)
+ *
+ * \version $Id: spi.h 15321 2007-03-21 14:45:12Z asterix $
+ *
+ * \author Francesco Sacchi <batt@develer.com>
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+
+#ifndef DRV_SPI_EMU_H
+#define DRV_SPI_EMU_H
+
+#include <cfg/compiler.h>
+#include <appconfig.h>
+
+/**
+ * Define send and receive order bit.
+ * \{
+ */
+#define SPI_LSB_FIRST 1
+#define SPI_MSB_FIRST 2
+/* \} */
+
+#if CONFIG_SPI_DATAORDER == SPI_LSB_FIRST
+       #define  SPI_DATAORDER_START    1
+       #define  SPI_DATAORDER_SHIFT(i) ((i) <<= 1)
+#elif CONFIG_SPI_DATAORDER == SPI_MSB_FIRST
+       #define  SPI_DATAORDER_START    0x80
+       #define  SPI_DATAORDER_SHIFT(i) ((i) >>= 1)
+#endif
+
+void spi_write(const void *buf, size_t len);
+void spi_read(void *buf, size_t len);
+uint8_t spi_sendRecv(uint8_t c);
+void spi_init(void);
+void spi_assertSS(void);
+void spi_deassertSS(void);
+
+#endif /* DRV_SPI_EMU_H */

diff --git a/drv/spi_emu.c b/drv/spi_emu.c
deleted file mode 100644 (file)
index 9d15ca1..0000000
--- a/drv/spi_emu.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/**
- * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- *
- * -->
- *
- * \brief Emulated SPI Master for DSP firmware download (impl.)
- *
- * \version $Id: spi.c 15328 2007-03-21 15:07:04Z batt $
- *
- * \author Francesco Sacchi <batt@develer.com>
- * \author Daniele Basile <asterix@develer.com>
- */
-
-
-#include <cfg/cpu.h>
-#include <cfg/module.h>
-#include <drv/spi_emu.h>
-#include "hw_spi.h"
-
-void spi_assertSS(void)
-{
-       ATOMIC(SS_ACTIVE());
-}
-
-void spi_deassertSS(void)
-{
-       ATOMIC(SS_INACTIVE());
-}
-
-/**
- * Send byte \c c over MOSI line, CONFIG_SPI_DATAORDER first.
- * SS pin state is left unchanged.
- */
-uint8_t spi_sendRecv(uint8_t c)
-{
-       uint8_t data = 0;
-       uint8_t shift = SPI_DATAORDER_START;
-
-
-       ATOMIC(
-               for (int i = 0; i < 8; i++)
-               {
-                       /* Shift the i-th bit to MOSI */
-                       if (c & shift)
-                               MOSI_HIGH();
-                       else
-                               MOSI_LOW();
-                       /* Assert clock */
-                       SCK_ACTIVE();
-                       data |= IS_MISO_HIGH() ? shift : 0;
-                       /* De-assert clock */
-                       SCK_INACTIVE();
-                       SPI_DATAORDER_SHIFT(shift);
-               }
-       );
-       return data;
-}
-
-MOD_DEFINE(spi);
-void spi_init(void)
-{
-       ATOMIC(SPI_HW_INIT());
-       MOD_INIT(spi);
-}
-
-/**
- * Read \param len from spi, and put it in \param buff.
- */
-void spi_read(void *_buff, size_t len)
-{
-       uint8_t *buff = (uint8_t *)_buff;
-
-       while (len--)
-               /* Read byte from spi and put it in buffer. */
-               *buff++ = spi_sendRecv(0);
-
-}
-
-/**
- * Write \param len to spi, and take it from \param buff.
- */
-void spi_write(const void *_buff, size_t len)
-{
-       const uint8_t *buff = (const uint8_t *)_buff;
-
-       while (len--)
-               /* Write byte pointed at by *buff to spi */
-               spi_sendRecv(*buff++);
-
-}

diff --git a/drv/spi_emu.h b/drv/spi_emu.h
deleted file mode 100644 (file)
index ff71690..0000000
--- a/drv/spi_emu.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * \file
- * <!--
- * This file is part of BeRTOS.
- *
- * Bertos is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * As a special exception, you may use this file as part of a free software
- * library without restriction.  Specifically, if other files instantiate
- * templates or use macros or inline functions from this file, or you compile
- * this file and link it with other files to produce an executable, this
- * file does not by itself cause the resulting executable to be covered by
- * the GNU General Public License.  This exception does not however
- * invalidate any other reasons why the executable file might be covered by
- * the GNU General Public License.
- *
- * Copyright 2003, 2004, 2006 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000 Bernardo Innocenti <bernie@codewiz.org>
- *
- * -->
- *
- * \brief Emulated SPI Master for DSP firmware download (interface)
- *
- * \version $Id: spi.h 15321 2007-03-21 14:45:12Z asterix $
- *
- * \author Francesco Sacchi <batt@develer.com>
- * \author Daniele Basile <asterix@develer.com>
- */
-
-
-#ifndef DRV_SPI_EMU_H
-#define DRV_SPI_EMU_H
-
-#include <cfg/compiler.h>
-#include <appconfig.h>
-
-/**
- * Define send and receive order bit.
- * \{
- */
-#define SPI_LSB_FIRST 1
-#define SPI_MSB_FIRST 2
-/* \} */
-
-#if CONFIG_SPI_DATAORDER == SPI_LSB_FIRST
-       #define  SPI_DATAORDER_START    1
-       #define  SPI_DATAORDER_SHIFT(i) ((i) <<= 1)
-#elif CONFIG_SPI_DATAORDER == SPI_MSB_FIRST
-       #define  SPI_DATAORDER_START    0x80
-       #define  SPI_DATAORDER_SHIFT(i) ((i) >>= 1)
-#endif
-
-void spi_write(const void *buf, size_t len);
-void spi_read(void *buf, size_t len);
-uint8_t spi_sendRecv(uint8_t c);
-void spi_init(void);
-void spi_assertSS(void);
-void spi_deassertSS(void);
-
-#endif /* DRV_SPI_EMU_H */