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

Merge remote-tracking branch 'upstream/rad1o' into rad1o

Browse Source
This commit is contained in:
Tobias Schneider
2015-08-11 11:08:08 +02:00
parent 5ce0cc853b a5d234ded7
commit dfbbbfb956
3 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Makefile Normal file
View File

@ -0,0 +1,50 @@
default: lib hackrf-usb
all: lib hackrf-usb hackrf-tools
force: clean all
ifeq ($(MAKECMDGOALS),rebuild)
FORCE=FORCE
rebuild: all
endif
firmware/libopencm3/README:
git submodule init
firmware/libopencm3/lib/libopencm3_lpc43xx.a: $(FORCE)
git submodule update
$(MAKE) -C firmware/libopencm3
lib: firmware/libopencm3/README firmware/libopencm3/lib/libopencm3_lpc43xx.a
FDIR=firmware/hackrf_usb/build
hackrf-usb: $(FDIR)/hackrf_usb.bin
$(FDIR)/hackrf_usb.bin: $(FDIR) $(FDIR)/Makefile $(FORCE)
$(MAKE) -C $(FDIR)
$(FDIR)/Makefile:
cd $(FDIR) && cmake -DBOARD=RAD1O -DRUN_FROM=RAM ..
$(FDIR):
mkdir $(FDIR)
TDIR=host/build
$(TDIR):
mkdir $(TDIR)
hackrf-tools: $(TDIR) $(TDIR)/hackrf-tools/src/hackrf_info
$(TDIR)/hackrf-tools/src/hackrf_info: $(FORCE)
cd $(TDIR) && cmake .. && $(MAKE)
hack-clean:
$(RM) -r $(FDIR) $(TDIR)
clean: hack-clean
$(MAKE) -C firmware/libopencm3 clean
FORCE:

21
firmware/common/w25q80bv.c
View File

@ -85,11 +85,10 @@ void w25q80bv_setup(void)
SSP_MASTER, SSP_MASTER,
SSP_SLAVE_OUT_ENABLE); SSP_SLAVE_OUT_ENABLE);
device_id = 0; do {
while(device_id != W25Q80BV_DEVICE_ID_RES)
{
device_id = w25q80bv_get_device_id(); device_id = w25q80bv_get_device_id();
} } while(device_id != W25Q80BV_DEVICE_ID_RES &&
device_id != W25Q16DV_DEVICE_ID_RES);
} }
uint8_t w25q80bv_get_status(void) uint8_t w25q80bv_get_status(void)
@ -163,11 +162,10 @@ void w25q80bv_chip_erase(void)
{ {
uint8_t device_id; uint8_t device_id;
device_id = 0; do {
while(device_id != W25Q80BV_DEVICE_ID_RES)
{
device_id = w25q80bv_get_device_id(); device_id = w25q80bv_get_device_id();
} } while(device_id != W25Q80BV_DEVICE_ID_RES &&
device_id != W25Q16DV_DEVICE_ID_RES);
w25q80bv_write_enable(); w25q80bv_write_enable();
w25q80bv_wait_while_busy(); w25q80bv_wait_while_busy();
@ -208,11 +206,10 @@ void w25q80bv_program(uint32_t addr, uint32_t len, const uint8_t* data)
uint16_t first_block_len; uint16_t first_block_len;
uint8_t device_id; uint8_t device_id;
device_id = 0; do {
while(device_id != W25Q80BV_DEVICE_ID_RES)
{
device_id = w25q80bv_get_device_id(); device_id = w25q80bv_get_device_id();
} } while(device_id != W25Q80BV_DEVICE_ID_RES &&
device_id != W25Q16DV_DEVICE_ID_RES);
/* do nothing if we would overflow the flash */ /* do nothing if we would overflow the flash */
if ((len > W25Q80BV_NUM_BYTES) || (addr > W25Q80BV_NUM_BYTES) if ((len > W25Q80BV_NUM_BYTES) || (addr > W25Q80BV_NUM_BYTES)

1
firmware/common/w25q80bv.h
View File

@ -38,6 +38,7 @@
#define W25Q80BV_DEVICE_ID_RES 0x13 /* Expected device_id for W25Q80BV */ #define W25Q80BV_DEVICE_ID_RES 0x13 /* Expected device_id for W25Q80BV */
#define W25Q16DV_DEVICE_ID_RES 0x14 /* Expected device_id for W25Q16DV */
typedef union typedef union
{ {