2010-09-27 06:51:11 +02:00
|
|
|
/******************************************************************************
|
2010-04-26 00:08:56 +02:00
|
|
|
* The MIT License
|
|
|
|
*
|
|
|
|
* Copyright (c) 2010 Perry Hung.
|
|
|
|
*
|
2011-06-07 20:44:39 +02:00
|
|
|
* Permission is hereby granted, free of charge, to any person
|
|
|
|
* obtaining a copy of this software and associated documentation
|
|
|
|
* files (the "Software"), to deal in the Software without
|
|
|
|
* restriction, including without limitation the rights to use, copy,
|
|
|
|
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
|
|
* of the Software, and to permit persons to whom the Software is
|
2010-04-26 00:08:56 +02:00
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
2011-06-07 20:44:39 +02:00
|
|
|
* The above copyright notice and this permission notice shall be
|
|
|
|
* included in all copies or substantial portions of the Software.
|
2010-04-26 00:08:56 +02:00
|
|
|
*
|
2011-06-07 20:44:39 +02:00
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
2010-09-27 06:51:11 +02:00
|
|
|
*****************************************************************************/
|
2010-04-26 00:08:56 +02:00
|
|
|
|
|
|
|
/**
|
2011-04-28 19:52:58 +02:00
|
|
|
* @author Marti Bolivar <mbolivar@leaflabs.com>
|
|
|
|
* @brief Wirish SPI implementation.
|
2010-04-26 00:08:56 +02:00
|
|
|
*/
|
|
|
|
|
Move public headers to include directories; related cleanups.
Move libmaple/*.h to (new) libmaple/include/libmaple/. The new
accepted way to include a libmaple header foo.h is with:
#include <libmaple/foo.h>
This is more polite in terms of the include namespace. It also allows
us to e.g. implement the Arduino SPI library at all (which has header
SPI.h; providing it was previously impossible on case-insensitive
filesystems due to libmaple's spi.h).
Similarly for Wirish.
The old include style (#include "header.h") is now deprecated.
libmaple/*.h:
- Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_.
- Add license headers where they're missing
- Add conditional extern "C" { ... } blocks where they're missing
(they aren't always necessary, but we might was well do it against
the future, while we're at it.).
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
- Move includes after extern "C".
- Remove extra trailing newlines
Note that this doesn't include the headers under libmaple/usb/ or
libmaple/usb/usb_lib. These will get fixed later.
libmaple/*.c:
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
Makefile:
- Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows
for users (including Wirish) to migrate their code, but should go
away ASAP, since it slows down compilation.
Wirish:
- Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores
the USB headers, which, as usual, are getting handled after
everything else.
- Similarly generify wirish/boards/ structure. For each supported
board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to
wirish/boards/foo/include/board/board.h and
wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef
hacks around the .cpp files.
- wirish/rules.mk: put wirish/boards/foo/include in the include path
(and add wirish/boards/foo/board.cpp to the list of sources to be
compiled). This allows saying:
#include <board/board.h>
instead of the hack currently in place. We can allow the user to
override this setting later to make adding custom board definitions
easier.
- Disable -Werror in libmaple/rules.mk, as the current USB warnings
don't let the olimex_stm32_h103 board compile. We can re-enable
-Werror once we've moved the board-specific bits out of libmaple
proper.
libraries, examples:
- Update includes accordingly.
- Miscellaneous cosmetic fixups.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2011-11-15 18:45:43 +01:00
|
|
|
#include <wirish/HardwareSPI.h>
|
2010-04-26 00:08:56 +02:00
|
|
|
|
Move public headers to include directories; related cleanups.
Move libmaple/*.h to (new) libmaple/include/libmaple/. The new
accepted way to include a libmaple header foo.h is with:
#include <libmaple/foo.h>
This is more polite in terms of the include namespace. It also allows
us to e.g. implement the Arduino SPI library at all (which has header
SPI.h; providing it was previously impossible on case-insensitive
filesystems due to libmaple's spi.h).
Similarly for Wirish.
The old include style (#include "header.h") is now deprecated.
libmaple/*.h:
- Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_.
- Add license headers where they're missing
- Add conditional extern "C" { ... } blocks where they're missing
(they aren't always necessary, but we might was well do it against
the future, while we're at it.).
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
- Move includes after extern "C".
- Remove extra trailing newlines
Note that this doesn't include the headers under libmaple/usb/ or
libmaple/usb/usb_lib. These will get fixed later.
libmaple/*.c:
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
Makefile:
- Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows
for users (including Wirish) to migrate their code, but should go
away ASAP, since it slows down compilation.
Wirish:
- Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores
the USB headers, which, as usual, are getting handled after
everything else.
- Similarly generify wirish/boards/ structure. For each supported
board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to
wirish/boards/foo/include/board/board.h and
wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef
hacks around the .cpp files.
- wirish/rules.mk: put wirish/boards/foo/include in the include path
(and add wirish/boards/foo/board.cpp to the list of sources to be
compiled). This allows saying:
#include <board/board.h>
instead of the hack currently in place. We can allow the user to
override this setting later to make adding custom board definitions
easier.
- Disable -Werror in libmaple/rules.mk, as the current USB warnings
don't let the olimex_stm32_h103 board compile. We can re-enable
-Werror once we've moved the board-specific bits out of libmaple
proper.
libraries, examples:
- Update includes accordingly.
- Miscellaneous cosmetic fixups.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2011-11-15 18:45:43 +01:00
|
|
|
#include <libmaple/timer.h>
|
|
|
|
#include <libmaple/util.h>
|
|
|
|
#include <libmaple/rcc.h>
|
2011-03-22 21:59:29 +01:00
|
|
|
|
Move public headers to include directories; related cleanups.
Move libmaple/*.h to (new) libmaple/include/libmaple/. The new
accepted way to include a libmaple header foo.h is with:
#include <libmaple/foo.h>
This is more polite in terms of the include namespace. It also allows
us to e.g. implement the Arduino SPI library at all (which has header
SPI.h; providing it was previously impossible on case-insensitive
filesystems due to libmaple's spi.h).
Similarly for Wirish.
The old include style (#include "header.h") is now deprecated.
libmaple/*.h:
- Change include guard #defines from _FOO_H_ to _LIBMAPLE_FOO_H_.
- Add license headers where they're missing
- Add conditional extern "C" { ... } blocks where they're missing
(they aren't always necessary, but we might was well do it against
the future, while we're at it.).
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
- Move includes after extern "C".
- Remove extra trailing newlines
Note that this doesn't include the headers under libmaple/usb/ or
libmaple/usb/usb_lib. These will get fixed later.
libmaple/*.c:
- Change includes from #include "foo.h" to #include <libmaple/foo.h>.
Makefile:
- Add I$(LIBMAPLE_PATH)/include/libmaple to GLOBAL_FLAGS. This allows
for users (including Wirish) to migrate their code, but should go
away ASAP, since it slows down compilation.
Wirish:
- Move wirish/**/*.h to (new) wirish/include/wirish/. This ignores
the USB headers, which, as usual, are getting handled after
everything else.
- Similarly generify wirish/boards/ structure. For each supported
board "foo", move wirish/boards/foo.h and wirish/boards/foo.cpp to
wirish/boards/foo/include/board/board.h and
wirish/boards/foo/board.cpp, respectively. Also remove the #ifdef
hacks around the .cpp files.
- wirish/rules.mk: put wirish/boards/foo/include in the include path
(and add wirish/boards/foo/board.cpp to the list of sources to be
compiled). This allows saying:
#include <board/board.h>
instead of the hack currently in place. We can allow the user to
override this setting later to make adding custom board definitions
easier.
- Disable -Werror in libmaple/rules.mk, as the current USB warnings
don't let the olimex_stm32_h103 board compile. We can re-enable
-Werror once we've moved the board-specific bits out of libmaple
proper.
libraries, examples:
- Update includes accordingly.
- Miscellaneous cosmetic fixups.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2011-11-15 18:45:43 +01:00
|
|
|
#include <wirish/wirish.h>
|
|
|
|
#include <wirish/boards.h>
|
2010-04-26 00:08:56 +02:00
|
|
|
|
2012-08-27 22:50:39 +02:00
|
|
|
#if CYCLES_PER_MICROSECOND != 72
|
|
|
|
/* TODO [0.2.0?] something smarter than this */
|
|
|
|
#warning "Unexpected clock speed; SPI frequency calculation will be incorrect"
|
|
|
|
#endif
|
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
struct spi_pins {
|
|
|
|
uint8 nss;
|
|
|
|
uint8 sck;
|
|
|
|
uint8 miso;
|
|
|
|
uint8 mosi;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const spi_pins* dev_to_spi_pins(spi_dev *dev);
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
static void enable_device(spi_dev *dev,
|
|
|
|
bool as_master,
|
|
|
|
SPIFrequency frequency,
|
|
|
|
spi_cfg_flag endianness,
|
|
|
|
spi_mode mode);
|
2010-04-26 00:08:56 +02:00
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
static const spi_pins board_spi_pins[] __FLASH__ = {
|
|
|
|
{BOARD_SPI1_NSS_PIN,
|
|
|
|
BOARD_SPI1_SCK_PIN,
|
|
|
|
BOARD_SPI1_MISO_PIN,
|
|
|
|
BOARD_SPI1_MOSI_PIN},
|
|
|
|
{BOARD_SPI2_NSS_PIN,
|
|
|
|
BOARD_SPI2_SCK_PIN,
|
|
|
|
BOARD_SPI2_MISO_PIN,
|
|
|
|
BOARD_SPI2_MOSI_PIN},
|
|
|
|
#ifdef STM32_HIGH_DENSITY
|
|
|
|
{BOARD_SPI3_NSS_PIN,
|
|
|
|
BOARD_SPI3_SCK_PIN,
|
|
|
|
BOARD_SPI3_MISO_PIN,
|
|
|
|
BOARD_SPI3_MOSI_PIN},
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
/*
|
2011-08-16 09:07:55 +02:00
|
|
|
* Constructor
|
2010-04-26 00:08:56 +02:00
|
|
|
*/
|
2011-04-28 19:52:58 +02:00
|
|
|
|
|
|
|
HardwareSPI::HardwareSPI(uint32 spi_num) {
|
|
|
|
switch (spi_num) {
|
|
|
|
case 1:
|
|
|
|
this->spi_d = SPI1;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
this->spi_d = SPI2;
|
|
|
|
break;
|
|
|
|
#ifdef STM32_HIGH_DENSITY
|
|
|
|
case 3:
|
|
|
|
this->spi_d = SPI3;
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
ASSERT(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
/*
|
|
|
|
* Set up/tear down
|
|
|
|
*/
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
void HardwareSPI::begin(SPIFrequency frequency, uint32 bitOrder, uint32 mode) {
|
|
|
|
if (mode >= 4) {
|
|
|
|
ASSERT(0);
|
2010-09-27 06:51:11 +02:00
|
|
|
return;
|
|
|
|
}
|
2011-04-28 19:52:58 +02:00
|
|
|
spi_cfg_flag end = bitOrder == MSBFIRST ? SPI_FRAME_MSB : SPI_FRAME_LSB;
|
|
|
|
spi_mode m = (spi_mode)mode;
|
|
|
|
enable_device(this->spi_d, true, frequency, end, m);
|
|
|
|
}
|
2010-09-27 06:51:11 +02:00
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
void HardwareSPI::begin(void) {
|
|
|
|
this->begin(SPI_1_125MHZ, MSBFIRST, 0);
|
|
|
|
}
|
2010-09-27 06:51:11 +02:00
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
void HardwareSPI::beginSlave(uint32 bitOrder, uint32 mode) {
|
|
|
|
if (mode >= 4) {
|
|
|
|
ASSERT(0);
|
|
|
|
return;
|
2010-09-27 06:51:11 +02:00
|
|
|
}
|
2011-04-28 19:52:58 +02:00
|
|
|
spi_cfg_flag end = bitOrder == MSBFIRST ? SPI_FRAME_MSB : SPI_FRAME_LSB;
|
|
|
|
spi_mode m = (spi_mode)mode;
|
|
|
|
enable_device(this->spi_d, false, (SPIFrequency)0, end, m);
|
|
|
|
}
|
2010-09-27 06:51:11 +02:00
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
void HardwareSPI::beginSlave(void) {
|
|
|
|
this->beginSlave(MSBFIRST, 0);
|
|
|
|
}
|
2010-09-27 06:51:11 +02:00
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
void HardwareSPI::end(void) {
|
|
|
|
if (!spi_is_enabled(this->spi_d)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Follows RM0008's sequence for disabling a SPI in master/slave
|
|
|
|
// full duplex mode.
|
|
|
|
while (spi_is_rx_nonempty(this->spi_d)) {
|
|
|
|
// FIXME [0.1.0] remove this once you have an interrupt based driver
|
|
|
|
volatile uint16 rx __attribute__((unused)) = spi_rx_reg(this->spi_d);
|
|
|
|
}
|
|
|
|
while (!spi_is_tx_empty(this->spi_d))
|
|
|
|
;
|
|
|
|
while (spi_is_busy(this->spi_d))
|
|
|
|
;
|
|
|
|
spi_peripheral_disable(this->spi_d);
|
2010-04-26 00:08:56 +02:00
|
|
|
}
|
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
/*
|
|
|
|
* I/O
|
|
|
|
*/
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
uint8 HardwareSPI::read(void) {
|
|
|
|
uint8 buf[1];
|
|
|
|
this->read(buf, 1);
|
|
|
|
return buf[0];
|
2010-04-26 00:08:56 +02:00
|
|
|
}
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
void HardwareSPI::read(uint8 *buf, uint32 len) {
|
|
|
|
uint32 rxed = 0;
|
|
|
|
while (rxed < len) {
|
|
|
|
while (!spi_is_rx_nonempty(this->spi_d))
|
|
|
|
;
|
|
|
|
buf[rxed++] = (uint8)spi_rx_reg(this->spi_d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void HardwareSPI::write(uint8 byte) {
|
2011-05-04 23:23:54 +02:00
|
|
|
this->write(&byte, 1);
|
2011-04-28 19:52:58 +02:00
|
|
|
}
|
|
|
|
|
2011-05-04 23:23:54 +02:00
|
|
|
void HardwareSPI::write(const uint8 *data, uint32 length) {
|
2011-04-28 19:52:58 +02:00
|
|
|
uint32 txed = 0;
|
|
|
|
while (txed < length) {
|
|
|
|
txed += spi_tx(this->spi_d, data + txed, length - txed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8 HardwareSPI::transfer(uint8 byte) {
|
|
|
|
this->write(byte);
|
|
|
|
return this->read();
|
|
|
|
}
|
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
/*
|
|
|
|
* Pin accessors
|
|
|
|
*/
|
|
|
|
|
|
|
|
uint8 HardwareSPI::misoPin(void) {
|
|
|
|
return dev_to_spi_pins(this->spi_d)->miso;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8 HardwareSPI::mosiPin(void) {
|
|
|
|
return dev_to_spi_pins(this->spi_d)->mosi;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8 HardwareSPI::sckPin(void) {
|
|
|
|
return dev_to_spi_pins(this->spi_d)->sck;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint8 HardwareSPI::nssPin(void) {
|
|
|
|
return dev_to_spi_pins(this->spi_d)->nss;
|
|
|
|
}
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
/*
|
|
|
|
* Deprecated functions
|
2010-04-26 00:08:56 +02:00
|
|
|
*/
|
2011-04-28 19:52:58 +02:00
|
|
|
|
2010-04-29 01:19:34 +02:00
|
|
|
uint8 HardwareSPI::send(uint8 data) {
|
2011-04-28 19:52:58 +02:00
|
|
|
uint8 buf[] = {data};
|
|
|
|
return this->send(buf, 1);
|
2010-04-28 00:30:46 +02:00
|
|
|
}
|
|
|
|
|
2010-04-29 01:19:34 +02:00
|
|
|
uint8 HardwareSPI::send(uint8 *buf, uint32 len) {
|
2011-04-28 19:52:58 +02:00
|
|
|
uint32 txed = 0;
|
2011-08-16 09:09:52 +02:00
|
|
|
uint8 ret = 0;
|
2011-04-28 19:52:58 +02:00
|
|
|
while (txed < len) {
|
|
|
|
this->write(buf[txed++]);
|
|
|
|
ret = this->read();
|
|
|
|
}
|
|
|
|
return ret;
|
2010-04-26 00:08:56 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
uint8 HardwareSPI::recv(void) {
|
2011-04-28 19:52:58 +02:00
|
|
|
return this->read();
|
2010-04-26 00:08:56 +02:00
|
|
|
}
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
/*
|
|
|
|
* Auxiliary functions
|
|
|
|
*/
|
|
|
|
|
|
|
|
static void configure_gpios(spi_dev *dev, bool as_master);
|
|
|
|
static spi_baud_rate determine_baud_rate(spi_dev *dev, SPIFrequency freq);
|
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
static const spi_pins* dev_to_spi_pins(spi_dev *dev) {
|
|
|
|
switch (dev->clk_id) {
|
|
|
|
case RCC_SPI1: return board_spi_pins;
|
|
|
|
case RCC_SPI2: return board_spi_pins + 1;
|
|
|
|
#ifdef STM32_HIGH_DENSITY
|
|
|
|
case RCC_SPI3: return board_spi_pins + 2;
|
|
|
|
#endif
|
|
|
|
default: return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-04-28 19:52:58 +02:00
|
|
|
/* Enables the device in master or slave full duplex mode. If you
|
|
|
|
* change this code, you must ensure that appropriate changes are made
|
|
|
|
* to HardwareSPI::end(). */
|
|
|
|
static void enable_device(spi_dev *dev,
|
|
|
|
bool as_master,
|
|
|
|
SPIFrequency freq,
|
|
|
|
spi_cfg_flag endianness,
|
|
|
|
spi_mode mode) {
|
|
|
|
spi_baud_rate baud = determine_baud_rate(dev, freq);
|
|
|
|
uint32 cfg_flags = (endianness | SPI_DFF_8_BIT | SPI_SW_SLAVE |
|
|
|
|
(as_master ? SPI_SOFT_SS : 0));
|
|
|
|
|
|
|
|
spi_init(dev);
|
|
|
|
configure_gpios(dev, as_master);
|
|
|
|
if (as_master) {
|
|
|
|
spi_master_enable(dev, baud, mode, cfg_flags);
|
|
|
|
} else {
|
|
|
|
spi_slave_enable(dev, mode, cfg_flags);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void disable_pwm(const stm32_pin_info *i) {
|
|
|
|
if (i->timer_device) {
|
|
|
|
timer_set_mode(i->timer_device, i->timer_channel, TIMER_DISABLED);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void configure_gpios(spi_dev *dev, bool as_master) {
|
2011-08-16 09:07:55 +02:00
|
|
|
const spi_pins *pins = dev_to_spi_pins(dev);
|
2011-04-28 19:52:58 +02:00
|
|
|
|
2011-08-16 09:07:55 +02:00
|
|
|
if (!pins) {
|
2011-04-28 19:52:58 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const stm32_pin_info *nssi = &PIN_MAP[pins->nss];
|
|
|
|
const stm32_pin_info *scki = &PIN_MAP[pins->sck];
|
|
|
|
const stm32_pin_info *misoi = &PIN_MAP[pins->miso];
|
|
|
|
const stm32_pin_info *mosii = &PIN_MAP[pins->mosi];
|
|
|
|
|
|
|
|
disable_pwm(nssi);
|
|
|
|
disable_pwm(scki);
|
|
|
|
disable_pwm(misoi);
|
|
|
|
disable_pwm(mosii);
|
|
|
|
|
Globally switch style for GPIO config routines.
Stupidly, spi_gpio_cfg() didn't take a spi_dev* argument on F1,
because it doesn't matter there. On F2, where we need to set an
alternate function when configuring GPIOs for SPI, we need to know the
dev.
We can't add break backwards compatibility, so we need a new
function. However, we've since added a bunch of foo_gpio_cfg()
routines, and we don't want confusing asymmetry in the names. So a
global style change is needed. (Fortunately, the new functions weren't
part of a release, so it's no problem to change their names).
Change all foo_gpio_cfg() routines to foo_config_gpios() (or
foo_config_gpio(), if there's only one GPIO to configure). For
backwards compatibility, make spi_gpio_cfg() on F1 an __always_inline
call to spi_config_gpios().
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
2012-06-03 08:11:07 +02:00
|
|
|
spi_config_gpios(dev, as_master, nssi->gpio_device, nssi->gpio_bit,
|
|
|
|
scki->gpio_device, scki->gpio_bit, misoi->gpio_bit,
|
|
|
|
mosii->gpio_bit);
|
2011-04-28 19:52:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const spi_baud_rate baud_rates[MAX_SPI_FREQS] __FLASH__ = {
|
|
|
|
SPI_BAUD_PCLK_DIV_2,
|
|
|
|
SPI_BAUD_PCLK_DIV_4,
|
|
|
|
SPI_BAUD_PCLK_DIV_8,
|
|
|
|
SPI_BAUD_PCLK_DIV_16,
|
|
|
|
SPI_BAUD_PCLK_DIV_32,
|
|
|
|
SPI_BAUD_PCLK_DIV_64,
|
|
|
|
SPI_BAUD_PCLK_DIV_128,
|
|
|
|
SPI_BAUD_PCLK_DIV_256,
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Note: This assumes you're on a LeafLabs-style board
|
|
|
|
* (CYCLES_PER_MICROSECOND == 72, APB2 at 72MHz, APB1 at 36MHz).
|
|
|
|
*/
|
|
|
|
static spi_baud_rate determine_baud_rate(spi_dev *dev, SPIFrequency freq) {
|
|
|
|
if (rcc_dev_clk(dev->clk_id) == RCC_APB2 && freq == SPI_140_625KHZ) {
|
|
|
|
/* APB2 peripherals are too fast for 140.625 KHz */
|
|
|
|
ASSERT(0);
|
|
|
|
return (spi_baud_rate)~0;
|
|
|
|
}
|
|
|
|
return (rcc_dev_clk(dev->clk_id) == RCC_APB2 ?
|
|
|
|
baud_rates[freq + 1] :
|
|
|
|
baud_rates[freq]);
|
2010-04-26 00:08:56 +02:00
|
|
|
}
|