Fixed up reference in the driver layer.

This commit is contained in:
mikeller 2019-02-03 10:11:47 +13:00
parent d833a51317
commit 210e90249e
5 changed files with 26 additions and 6 deletions

View File

@ -39,8 +39,6 @@
#include "pg/rx_spi.h" #include "pg/rx_spi.h"
#include "pg/sdcard.h" #include "pg/sdcard.h"
#include "sensors/initialisation.h"
typedef struct spiPreinit_s { typedef struct spiPreinit_s {
ioTag_t iotag; ioTag_t iotag;
uint8_t iocfg; uint8_t iocfg;
@ -81,8 +79,6 @@ static void spiPreinitPin(spiPreinit_t *preinit, int index)
void spiPreinit(void) void spiPreinit(void)
{ {
sensorsPreInit();
#ifdef USE_SDCARD_SPI #ifdef USE_SDCARD_SPI
sdcard_preInit(sdcardConfig()); sdcard_preInit(sdcardConfig());
#endif #endif

View File

@ -422,7 +422,11 @@ void init(void)
#ifdef USE_SPI #ifdef USE_SPI
spiPinConfigure(spiPinConfig(0)); spiPinConfigure(spiPinConfig(0));
#endif
sensorsPreInit();
#ifdef USE_SPI
spiPreinit(); spiPreinit();
#ifdef USE_SPI_DEVICE_1 #ifdef USE_SPI_DEVICE_1

View File

@ -22,18 +22,25 @@
#include <stdint.h> #include <stdint.h>
#include "platform.h" #include "platform.h"
#include "drivers/bus.h" #include "drivers/bus.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_spi.h" #include "drivers/bus_spi.h"
#include "io/serial.h"
#include "hardware_revision.h" #include "hardware_revision.h"
#include "io/serial.h"
#include "pg/bus_i2c.h" #include "pg/bus_i2c.h"
#include "pg/bus_spi.h" #include "pg/bus_spi.h"
#include "sensors/initialisation.h"
void targetBusInit(void) void targetBusInit(void)
{ {
if (hardwareRevision == AFF3_REV_2) { if (hardwareRevision == AFF3_REV_2) {
spiPinConfigure(spiPinConfig(0)); spiPinConfigure(spiPinConfig(0));
sensorsPreInit();
spiPreinit(); spiPreinit();
spiInit(SPIDEV_3); spiInit(SPIDEV_3);
} }

View File

@ -22,17 +22,23 @@
#include <stdint.h> #include <stdint.h>
#include "platform.h" #include "platform.h"
#include "drivers/bus.h" #include "drivers/bus.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_spi.h" #include "drivers/bus_spi.h"
#include "io/serial.h" #include "io/serial.h"
#include "pg/bus_i2c.h" #include "pg/bus_i2c.h"
#include "pg/bus_spi.h" #include "pg/bus_spi.h"
#include "sensors/initialisation.h"
void targetBusInit(void) void targetBusInit(void)
{ {
#if defined(USE_SPI) && defined(USE_SPI_DEVICE_1) #if defined(USE_SPI) && defined(USE_SPI_DEVICE_1)
spiPinConfigure(spiPinConfig(0)); spiPinConfigure(spiPinConfig(0));
sensorsPreInit();
spiPreinit(); spiPreinit();
spiInit(SPIDEV_1); spiInit(SPIDEV_1);
#endif #endif

View File

@ -22,18 +22,25 @@
#include <stdint.h> #include <stdint.h>
#include "platform.h" #include "platform.h"
#include "drivers/bus.h" #include "drivers/bus.h"
#include "drivers/bus_i2c.h" #include "drivers/bus_i2c.h"
#include "drivers/bus_spi.h" #include "drivers/bus_spi.h"
#include "io/serial.h"
#include "hardware_revision.h" #include "hardware_revision.h"
#include "io/serial.h"
#include "pg/bus_i2c.h" #include "pg/bus_i2c.h"
#include "pg/bus_spi.h" #include "pg/bus_spi.h"
#include "sensors/initialisation.h"
void targetBusInit(void) void targetBusInit(void)
{ {
#ifdef USE_SPI #ifdef USE_SPI
spiPinConfigure(spiPinConfig(0)); spiPinConfigure(spiPinConfig(0));
sensorsPreInit();
spiPreinit(); spiPreinit();
#ifdef USE_SPI_DEVICE_2 #ifdef USE_SPI_DEVICE_2
spiInit(SPIDEV_2); spiInit(SPIDEV_2);