SPI: Rename spi_t to spi_bus_t to match I2C naming.

glockwork · Nov 13, 2014 · ea13603 · ea13603
1 parent 05b8c4c
commit ea13603
Show file tree

Hide file tree

Showing 24 changed files with 166 additions and 166 deletions.
diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c
@@ -72,7 +72,7 @@ const ssp_config_t ssp_config_max5864 = {
 	.unselect = max5864_target_spi_unselect,
 };
 
-spi_t spi_ssp1 = {
+spi_bus_t spi_bus_ssp1 = {
 	.obj = (void*)SSP1_BASE,
 	.config = &ssp_config_max2837,
 	.start = spi_ssp_start,
@@ -82,17 +82,17 @@ spi_t spi_ssp1 = {
 };
 
 max2837_driver_t max2837 = {
-	.spi = &spi_ssp1,
+	.bus = &spi_bus_ssp1,
 	.target_init = max2837_target_init,
 	.set_mode = max2837_target_set_mode,
 };
 
 max5864_driver_t max5864 = {
-	.spi = &spi_ssp1,
+	.bus = &spi_bus_ssp1,
 	.target_init = max5864_target_init,
 };
 
-spi_t rffc5071_spi = {
+spi_bus_t spi_bus_rffc5071 = {
 	.config = NULL,
 	.start = rffc5071_spi_start,
 	.stop = rffc5071_spi_stop,
@@ -101,7 +101,7 @@ spi_t rffc5071_spi = {
 };
 
 rffc5071_driver_t rffc5072 = {
-	.spi = &rffc5071_spi,
+	.bus = &spi_bus_rffc5071,
 };
 
 const ssp_config_t ssp_config_w25q80bv = {
@@ -112,7 +112,7 @@ const ssp_config_t ssp_config_w25q80bv = {
 	.unselect = w25q80bv_target_spi_unselect,
 };
 
-spi_t spi_ssp0 = {
+spi_bus_t spi_bus_ssp0 = {
 	.obj = (void*)SSP0_BASE,
 	.config = &ssp_config_w25q80bv,
 	.start = spi_ssp_start,
@@ -122,7 +122,7 @@ spi_t spi_ssp0 = {
 };
 
 w25q80bv_driver_t spi_flash = {
-	.spi = &spi_ssp0,
+	.bus = &spi_bus_ssp0,
 	.target_init = w25q80bv_target_init,
 };
 
@@ -603,12 +603,12 @@ void cpu_clock_pll1_max_speed(void)
 
 void ssp1_set_mode_max2837(void)
 {
-	spi_start(max2837.spi, &ssp_config_max2837);
+	spi_bus_start(max2837.bus, &ssp_config_max2837);
 }
 
 void ssp1_set_mode_max5864(void)
 {
-	spi_start(max5864.spi, &ssp_config_max5864);
+	spi_bus_start(max5864.bus, &ssp_config_max5864);
 }
 
 void pin_setup(void) {
@@ -652,8 +652,8 @@ void pin_setup(void) {
 	/* GPIO3[6] on P6_10  as output. */
 	GPIO3_DIR |= PIN_EN1V8;
 
-	spi_start(&spi_ssp1, &ssp_config_max2837);
-	spi_start(&rffc5071_spi, NULL);
+	spi_bus_start(&spi_bus_ssp1, &ssp_config_max2837);
+	spi_bus_start(&spi_bus_rffc5071, NULL);
 
 	rf_path_pin_setup();
 

diff --git a/firmware/common/max2837.c b/firmware/common/max2837.c
@@ -121,13 +121,13 @@ void max2837_setup(max2837_driver_t* const drv)
 
 static uint16_t max2837_read(max2837_driver_t* const drv, uint8_t r) {
 	uint16_t value = (1 << 15) | (r << 10);
-	spi_transfer(drv->spi, &value, 1);
+	spi_bus_transfer(drv->bus, &value, 1);
 	return value & 0x3ff;
 }
 
 static void max2837_write(max2837_driver_t* const drv, uint8_t r, uint16_t v) {
 	uint16_t value = (r << 10) | (v & 0x3ff);
-	spi_transfer(drv->spi, &value, 1);
+	spi_bus_transfer(drv->bus, &value, 1);
 }
 
 uint16_t max2837_reg_read(max2837_driver_t* const drv, uint8_t r)

diff --git a/firmware/common/max2837.h b/firmware/common/max2837.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "spi.h"
+#include "spi_bus.h"
 
 /* 32 registers, each containing 10 bits of data. */
 #define MAX2837_NUM_REGS 32
@@ -43,7 +43,7 @@ struct max2837_driver_t;
 typedef struct max2837_driver_t max2837_driver_t;
 
 struct max2837_driver_t {
-	spi_t* const spi;
+	spi_bus_t* const bus;
 	void (*target_init)(max2837_driver_t* const drv);
 	void (*set_mode)(max2837_driver_t* const drv, const max2837_mode_t new_mode);
 	max2837_mode_t mode;

diff --git a/firmware/common/max2837_target.c b/firmware/common/max2837_target.c
@@ -82,13 +82,13 @@ void max2837_target_init(max2837_driver_t* const drv) {
 #endif
 }
 
-void max2837_target_spi_select(spi_t* const spi) {
-	(void)spi;
+void max2837_target_spi_select(spi_bus_t* const bus) {
+	(void)bus;
 	gpio_clear(PORT_XCVR_CS, PIN_XCVR_CS);
 }
 
-void max2837_target_spi_unselect(spi_t* const spi) {
-	(void)spi;
+void max2837_target_spi_unselect(spi_bus_t* const bus) {
+	(void)bus;
 	gpio_set(PORT_XCVR_CS, PIN_XCVR_CS);
 }
 

diff --git a/firmware/common/max2837_target.h b/firmware/common/max2837_target.h
@@ -24,12 +24,12 @@
 #define __MAX2837_TARGET_H
 
 #include "max2837.h"
-#include "spi.h"
+#include "spi_bus.h"
 
 void max2837_target_init(max2837_driver_t* const drv);
 void max2837_target_set_mode(max2837_driver_t* const drv, const max2837_mode_t new_mode);
 
-void max2837_target_spi_select(spi_t* const spi);
-void max2837_target_spi_unselect(spi_t* const spi);
+void max2837_target_spi_select(spi_bus_t* const bus);
+void max2837_target_spi_unselect(spi_bus_t* const bus);
 
 #endif // __MAX2837_TARGET_H
diff --git a/firmware/common/max5864.c b/firmware/common/max5864.c
@@ -24,7 +24,7 @@
 #include "max5864.h"
 
 static void max5864_write(max5864_driver_t* const drv, uint8_t value) {
-	spi_transfer(drv->spi, &value, 1);
+	spi_bus_transfer(drv->bus, &value, 1);
 }
 
 static void max5864_init(max5864_driver_t* const drv) {

diff --git a/firmware/common/max5864.h b/firmware/common/max5864.h
@@ -22,13 +22,13 @@
 #ifndef __MAX5864_H
 #define __MAX5864_H
 
-#include "spi.h"
+#include "spi_bus.h"
 
 struct max5864_driver_t;
 typedef struct max5864_driver_t max5864_driver_t;
 
 struct max5864_driver_t {
-	spi_t* const spi;
+	spi_bus_t* const bus;
 	void (*target_init)(max5864_driver_t* const drv);
 };
 

diff --git a/firmware/common/max5864_target.c b/firmware/common/max5864_target.c
@@ -42,12 +42,12 @@ void max5864_target_init(max5864_driver_t* const drv) {
 	GPIO_DIR(PORT_AD_CS) |= PIN_AD_CS;
 }
 
-void max5864_target_spi_select(spi_t* const spi) {
-	(void)spi;
+void max5864_target_spi_select(spi_bus_t* const bus) {
+	(void)bus;
 	gpio_clear(PORT_AD_CS, PIN_AD_CS);
 }
 
-void max5864_target_spi_unselect(spi_t* const spi) {
-	(void)spi;
+void max5864_target_spi_unselect(spi_bus_t* const bus) {
+	(void)bus;
 	gpio_set(PORT_AD_CS, PIN_AD_CS);
 }
diff --git a/firmware/common/max5864_target.h b/firmware/common/max5864_target.h
@@ -23,10 +23,10 @@
 #define __MAX5864_TARGET_H__
 
 #include "max5864.h"
-#include "spi.h"
+#include "spi_bus.h"
 
 void max5864_target_init(max5864_driver_t* const drv);
-void max5864_target_spi_select(spi_t* const spi);
-void max5864_target_spi_unselect(spi_t* const spi);
+void max5864_target_spi_select(spi_bus_t* const bus);
+void max5864_target_spi_unselect(spi_bus_t* const bus);
 
 #endif/*__MAX5864_TARGET_H__*/
diff --git a/firmware/common/rffc5071.c b/firmware/common/rffc5071.c
@@ -121,15 +121,15 @@ static uint16_t rffc5071_spi_read(rffc5071_driver_t* const drv, uint8_t r) {
 	(void)drv;
 
 	uint16_t data[] = { 0x80 | (r & 0x7f), 0xffff };
-	spi_transfer(drv->spi, data, 2);
+	spi_bus_transfer(drv->bus, data, 2);
 	return data[1];
 }
 
 static void rffc5071_spi_write(rffc5071_driver_t* const drv, uint8_t r, uint16_t v) {
 	(void)drv;
 
 	uint16_t data[] = { 0x00 | (r & 0x7f), v };
-	spi_transfer(drv->spi, data, 2);
+	spi_bus_transfer(drv->bus, data, 2);
 }
 
 uint16_t rffc5071_reg_read(rffc5071_driver_t* const drv, uint8_t r)

diff --git a/firmware/common/rffc5071.h b/firmware/common/rffc5071.h
@@ -25,13 +25,13 @@
 
 #include <stdint.h>
 
-#include "spi.h"
+#include "spi_bus.h"
 
 /* 31 registers, each containing 16 bits of data. */
 #define RFFC5071_NUM_REGS 31
 
 typedef struct {
-	spi_t* const spi;
+	spi_bus_t* const bus;
 	uint16_t regs[RFFC5071_NUM_REGS];
 	uint32_t regs_dirty;
 } rffc5071_driver_t;