Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

W25Q80BV: Finish abstracting SPI code.

Browse Source
This commit is contained in:
Jared Boone
2014-11-09 16:15:28 -08:00
parent 20d6d5a5a2
commit 58e3465ce5
7 changed files with 67 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/common/hackrf_core.c
View File

@ -67,12 +67,10 @@ spi_t rffc5071_spi = {
.transfer_gather = rffc5071_spi_transfer_gather, .transfer_gather = rffc5071_spi_transfer_gather,
}; };
w25q80bv_driver_t spi_flash;
rffc5071_driver_t rffc5072 = { rffc5071_driver_t rffc5072 = {
.spi = &rffc5071_spi, .spi = &rffc5071_spi,
}; };
void delay(uint32_t duration) void delay(uint32_t duration)
{ {
uint32_t i; uint32_t i;

2
firmware/common/hackrf_core.h
View File

@ -35,7 +35,6 @@ extern "C"
#include "max2837.h" #include "max2837.h"
#include "max5864.h" #include "max5864.h"
#include "rffc5071.h" #include "rffc5071.h"
#include "w25q80bv.h"
/* hardware identification number */ /* hardware identification number */
#define BOARD_ID_JELLYBEAN 0 #define BOARD_ID_JELLYBEAN 0
@ -357,7 +356,6 @@ void delay(uint32_t duration);
extern max2837_driver_t max2837; extern max2837_driver_t max2837;
extern max5864_driver_t max5864; extern max5864_driver_t max5864;
extern rffc5071_driver_t rffc5072; extern rffc5071_driver_t rffc5072;
extern w25q80bv_driver_t spi_flash;
void cpu_clock_init(void); void cpu_clock_init(void);
void cpu_clock_pll1_low_speed(void); void cpu_clock_pll1_low_speed(void);

29
firmware/common/w25q80bv.c
View File

@ -28,8 +28,9 @@
*/ */
#include <stdint.h> #include <stdint.h>
#include "w25q80bv.h" #include "w25q80bv.h"
#include "w25q80bv_drv.h" #include "w25q80bv_spi.h"
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@ -57,7 +58,7 @@ void w25q80bv_setup(w25q80bv_driver_t* const drv)
drv->num_pages = 4096U; drv->num_pages = 4096U;
drv->num_bytes = 1048576U; drv->num_bytes = 1048576U;
w25q80bv_hw_init(drv->hw); spi_init(drv->spi);
device_id = 0; device_id = 0;
while(device_id != W25Q80BV_DEVICE_ID_RES) while(device_id != W25Q80BV_DEVICE_ID_RES)
@ -69,7 +70,7 @@ void w25q80bv_setup(w25q80bv_driver_t* const drv)
uint8_t w25q80bv_get_status(w25q80bv_driver_t* const drv) uint8_t w25q80bv_get_status(w25q80bv_driver_t* const drv)
{ {
uint8_t data[] = { W25Q80BV_READ_STATUS1, 0xFF }; uint8_t data[] = { W25Q80BV_READ_STATUS1, 0xFF };
w25q80bv_hw_transfer(drv->hw, data, ARRAY_SIZE(data)); spi_transfer(drv->spi, data, ARRAY_SIZE(data));
return data[1]; return data[1];
} }
@ -80,7 +81,7 @@ uint8_t w25q80bv_get_device_id(w25q80bv_driver_t* const drv)
W25Q80BV_DEVICE_ID, W25Q80BV_DEVICE_ID,
0xFF, 0xFF, 0xFF, 0xFF 0xFF, 0xFF, 0xFF, 0xFF
}; };
w25q80bv_hw_transfer(drv->hw, data, ARRAY_SIZE(data)); spi_transfer(drv->spi, data, ARRAY_SIZE(data));
return data[4]; return data[4];
} }
@ -91,7 +92,7 @@ void w25q80bv_get_unique_id(w25q80bv_driver_t* const drv, w25q80bv_unique_id_t*
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
}; };
w25q80bv_hw_transfer(drv->hw, data, ARRAY_SIZE(data)); spi_transfer(drv->spi, data, ARRAY_SIZE(data));
for(size_t i=0; i<8; i++) { for(size_t i=0; i<8; i++) {
unique_id->id_8b[i] = data[5+i]; unique_id->id_8b[i] = data[5+i];
@ -108,7 +109,7 @@ void w25q80bv_write_enable(w25q80bv_driver_t* const drv)
w25q80bv_wait_while_busy(drv); w25q80bv_wait_while_busy(drv);
uint8_t data[] = { W25Q80BV_WRITE_ENABLE }; uint8_t data[] = { W25Q80BV_WRITE_ENABLE };
w25q80bv_hw_transfer(drv->hw, data, ARRAY_SIZE(data)); spi_transfer(drv->spi, data, ARRAY_SIZE(data));
} }
void w25q80bv_chip_erase(w25q80bv_driver_t* const drv) void w25q80bv_chip_erase(w25q80bv_driver_t* const drv)
@ -125,7 +126,7 @@ void w25q80bv_chip_erase(w25q80bv_driver_t* const drv)
w25q80bv_wait_while_busy(drv); w25q80bv_wait_while_busy(drv);
uint8_t data[] = { W25Q80BV_CHIP_ERASE }; uint8_t data[] = { W25Q80BV_CHIP_ERASE };
w25q80bv_hw_transfer(drv->hw, data, ARRAY_SIZE(data)); spi_transfer(drv->spi, data, ARRAY_SIZE(data));
} }
/* write up a 256 byte page or partial page */ /* write up a 256 byte page or partial page */
@ -149,12 +150,12 @@ static void w25q80bv_page_program(w25q80bv_driver_t* const drv, const uint32_t a
addr & 0xFF addr & 0xFF
}; };
const w25q80bv_transfer_t transfers[] = { const spi_transfer_t transfers[] = {
{ header, ARRAY_SIZE(header) }, { header, ARRAY_SIZE(header) },
{ data, len } { data, len }
}; };
w25q80bv_hw_transfer_multiple(drv->hw, transfers, ARRAY_SIZE(transfers)); spi_transfer_gather(drv->spi, transfers, ARRAY_SIZE(transfers));
} }
/* write an arbitrary number of bytes */ /* write an arbitrary number of bytes */
@ -198,3 +199,13 @@ void w25q80bv_program(w25q80bv_driver_t* const drv, uint32_t addr, uint32_t len,
w25q80bv_page_program(drv, addr, len, data); w25q80bv_page_program(drv, addr, len, data);
} }
} }
spi_t w25q80bv_spi = {
.init = w25q80bv_spi_init,
.transfer = w25q80bv_spi_transfer,
.transfer_gather = w25q80bv_spi_transfer_gather,
};
w25q80bv_driver_t spi_flash = {
.spi = &w25q80bv_spi,
};

7
firmware/common/w25q80bv.h
View File

@ -24,9 +24,10 @@
#ifndef __W25Q80BV_H__ #ifndef __W25Q80BV_H__
#define __W25Q80BV_H__ #define __W25Q80BV_H__
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include "w25q80bv_drv.h" #include "spi.h"
typedef union typedef union
{ {
@ -36,7 +37,7 @@ typedef union
} w25q80bv_unique_id_t; } w25q80bv_unique_id_t;
typedef struct { typedef struct {
w25q80bv_hw_t* hw; spi_t* spi;
size_t page_len; size_t page_len;
size_t num_pages; size_t num_pages;
size_t num_bytes; size_t num_bytes;
@ -48,4 +49,6 @@ void w25q80bv_program(w25q80bv_driver_t* const drv, uint32_t addr, uint32_t len,
uint8_t w25q80bv_get_device_id(w25q80bv_driver_t* const drv); uint8_t w25q80bv_get_device_id(w25q80bv_driver_t* const drv);
void w25q80bv_get_unique_id(w25q80bv_driver_t* const drv, w25q80bv_unique_id_t* unique_id); void w25q80bv_get_unique_id(w25q80bv_driver_t* const drv, w25q80bv_unique_id_t* unique_id);
extern w25q80bv_driver_t spi_flash;
#endif//__W25Q80BV_H__ #endif//__W25Q80BV_H__

76
firmware/common/w25q80bv_drv.c → firmware/common/w25q80bv_spi.c
View File

@ -21,37 +21,35 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "w25q80bv_drv.h" #include "w25q80bv_spi.h"
#include <libopencm3/lpc43xx/gpio.h>
#include <libopencm3/lpc43xx/rgu.h>
#include <libopencm3/lpc43xx/scu.h>
#include <libopencm3/lpc43xx/ssp.h>
#include "hackrf_core.h" #include "hackrf_core.h"
#include <libopencm3/lpc43xx/ssp.h> void w25q80bv_spi_init(spi_t* const spi) {
#include <libopencm3/lpc43xx/scu.h> (void)spi;
#include <libopencm3/lpc43xx/gpio.h>
#include <libopencm3/lpc43xx/rgu.h>
static void w25q80bv_spi_select(w25q80bv_hw_t* const hw) {
(void)hw;
gpio_clear(PORT_SSP0_SSEL, PIN_SSP0_SSEL);
}
static void w25q80bv_spi_unselect(w25q80bv_hw_t* const hw) {
(void)hw;
gpio_set(PORT_SSP0_SSEL, PIN_SSP0_SSEL);
}
static uint16_t w25q80bv_spi_transfer(w25q80bv_hw_t* const hw, const uint16_t tx_data) {
(void)hw;
return ssp_transfer(SSP0_NUM, tx_data);
}
void w25q80bv_hw_init(w25q80bv_hw_t* const hw) {
const uint8_t serial_clock_rate = 2; const uint8_t serial_clock_rate = 2;
const uint8_t clock_prescale_rate = 2; const uint8_t clock_prescale_rate = 2;
/* Reset SPIFI peripheral before to Erase/Write SPIFI memory through SPI */ /* Reset SPIFI peripheral before to Erase/Write SPIFI memory through SPI */
RESET_CTRL1 = RESET_CTRL1_SPIFI_RST; RESET_CTRL1 = RESET_CTRL1_SPIFI_RST;
/* initialize SSP0 */
ssp_init(SSP0_NUM,
SSP_DATA_8BITS,
SSP_FRAME_SPI,
SSP_CPOL_0_CPHA_0,
serial_clock_rate,
clock_prescale_rate,
SSP_MODE_NORMAL,
SSP_MASTER,
SSP_SLAVE_OUT_ENABLE);
/* Init SPIFI GPIO to Normal GPIO */ /* Init SPIFI GPIO to Normal GPIO */
scu_pinmux(P3_3, (SCU_SSP_IO | SCU_CONF_FUNCTION2)); // P3_3 SPIFI_SCK => SSP0_SCK scu_pinmux(P3_3, (SCU_SSP_IO | SCU_CONF_FUNCTION2)); // P3_3 SPIFI_SCK => SSP0_SCK
scu_pinmux(P3_4, (SCU_GPIO_FAST | SCU_CONF_FUNCTION0)); // P3_4 SPIFI SPIFI_SIO3 IO3 => GPIO1[14] scu_pinmux(P3_4, (SCU_GPIO_FAST | SCU_CONF_FUNCTION0)); // P3_4 SPIFI SPIFI_SIO3 IO3 => GPIO1[14]
@ -72,41 +70,33 @@ void w25q80bv_hw_init(w25q80bv_hw_t* const hw) {
/* drive SSEL, HOLD, and WP pins high */ /* drive SSEL, HOLD, and WP pins high */
gpio_set(PORT_FLASH, (PIN_FLASH_HOLD | PIN_FLASH_WP)); gpio_set(PORT_FLASH, (PIN_FLASH_HOLD | PIN_FLASH_WP));
w25q80bv_spi_unselect(hw); gpio_set(PORT_SSP0_SSEL, PIN_SSP0_SSEL);
/* Set GPIO pins as outputs. */ /* Set GPIO pins as outputs. */
GPIO1_DIR |= (PIN_FLASH_HOLD | PIN_FLASH_WP); GPIO1_DIR |= (PIN_FLASH_HOLD | PIN_FLASH_WP);
GPIO5_DIR |= PIN_SSP0_SSEL; GPIO5_DIR |= PIN_SSP0_SSEL;
/* initialize SSP0 */
ssp_init(SSP0_NUM,
SSP_DATA_8BITS,
SSP_FRAME_SPI,
SSP_CPOL_0_CPHA_0,
serial_clock_rate,
clock_prescale_rate,
SSP_MODE_NORMAL,
SSP_MASTER,
SSP_SLAVE_OUT_ENABLE);
} }
void w25q80bv_hw_transfer_multiple( void w25q80bv_spi_transfer_gather(
w25q80bv_hw_t* const hw, spi_t* const spi,
const w25q80bv_transfer_t* const transfers, const spi_transfer_t* const transfers,
const size_t transfer_count const size_t transfer_count
) { ) {
w25q80bv_spi_select(hw); (void)spi;
gpio_clear(PORT_SSP0_SSEL, PIN_SSP0_SSEL);
for(size_t i=0; i<transfer_count; i++) { for(size_t i=0; i<transfer_count; i++) {
uint8_t* const p = transfers[i].data;
for(size_t j=0; j<transfers[i].count; j++) { for(size_t j=0; j<transfers[i].count; j++) {
transfers[i].data[j] = w25q80bv_spi_transfer(hw, transfers[i].data[j]); p[j] = ssp_transfer(SSP0_NUM, p[j]);
} }
} }
w25q80bv_spi_unselect(hw); gpio_set(PORT_SSP0_SSEL, PIN_SSP0_SSEL);
} }
void w25q80bv_hw_transfer(w25q80bv_hw_t* const hw, uint8_t* data, const size_t count) { void w25q80bv_spi_transfer(spi_t* const spi, void* const data, const size_t count) {
const w25q80bv_transfer_t transfer = { const spi_transfer_t transfers[] = {
data, count { data, count },
}; };
w25q80bv_hw_transfer_multiple(hw, &transfer, 1); w25q80bv_spi_transfer_gather(spi, transfers, 1);
} }

26
firmware/common/w25q80bv_drv.h → firmware/common/w25q80bv_spi.h
View File

@ -21,27 +21,15 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __W25Q80BV_DRV_H__ #ifndef __W25Q80BV_SPI_H__
#define __W25Q80BV_DRV_H__ #define __W25Q80BV_SPI_H__
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
typedef struct { #include "spi.h"
uint8_t* const data;
const size_t count;
} w25q80bv_transfer_t;
typedef struct { void w25q80bv_spi_init(spi_t* const spi);
/* Empty for now */ void w25q80bv_spi_transfer_gather(spi_t* const spi, const spi_transfer_t* const transfers, const size_t transfer_count);
} w25q80bv_hw_t; void w25q80bv_spi_transfer(spi_t* const spi, void* const data, const size_t count);
void w25q80bv_hw_init(w25q80bv_hw_t* const hw); #endif/*__W25Q80BV_SPI_H__*/
void w25q80bv_hw_transfer(w25q80bv_hw_t* const hw, uint8_t* data, const size_t count);
void w25q80bv_hw_transfer_multiple(
w25q80bv_hw_t* const hw,
const w25q80bv_transfer_t* const transfers,
const size_t transfer_count
);
#endif//__W25Q80BV_DRV_H__

2
firmware/hackrf_usb/CMakeLists.txt
View File

@ -45,7 +45,7 @@ set(SRC_M4
"${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c" "${PATH_HACKRF_FIRMWARE_COMMON}/usb_queue.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/fault_handler.c" "${PATH_HACKRF_FIRMWARE_COMMON}/fault_handler.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/w25q80bv.c" "${PATH_HACKRF_FIRMWARE_COMMON}/w25q80bv.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/w25q80bv_drv.c" "${PATH_HACKRF_FIRMWARE_COMMON}/w25q80bv_spi.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/cpld_jtag.c" "${PATH_HACKRF_FIRMWARE_COMMON}/cpld_jtag.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/lenval.c" "${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/lenval.c"
"${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/micro.c" "${PATH_HACKRF_FIRMWARE_COMMON}/xapp058/micro.c"