Skip to content

Commit 356d1f8

Browse files
committed
firmware: move narrowband_filter_set to fpga.h|c
1 parent d1b6110 commit 356d1f8

5 files changed

Lines changed: 9 additions & 15 deletions

File tree

firmware/common/fpga.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "gpio.h"
2828
#include "hackrf_core.h"
2929
#include "ice40_spi.h"
30+
#include "platform_gpio.h"
3031

3132
/* Set up all registers according to the loaded bitstream's defaults. */
3233
void fpga_init(fpga_driver_t* const drv)
@@ -137,3 +138,8 @@ void fpga_set_tx_nco_pstep(fpga_driver_t* const drv, const uint8_t phase_increme
137138
set_FPGA_STANDARD_TX_PSTEP(drv, phase_increment);
138139
fpga_regs_commit(drv);
139140
}
141+
142+
void narrowband_filter_set(const uint8_t value)
143+
{
144+
gpio_write(platform_gpio()->aa_en, value & 1);
145+
}

firmware/common/fpga.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,5 @@ bool fpga_image_load(struct fpga_loader_t* loader, unsigned int index);
9090
bool fpga_spi_selftest(void);
9191
bool fpga_sgpio_selftest(void);
9292
bool fpga_if_xcvr_selftest(void);
93+
94+
void narrowband_filter_set(const uint8_t value);

firmware/common/hackrf_core.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -458,10 +458,3 @@ void trigger_enable(const bool enable)
458458
fpga_set_trigger_enable(&fpga, enable);
459459
#endif
460460
}
461-
462-
#ifdef PRALINE
463-
void narrowband_filter_set(const uint8_t value)
464-
{
465-
gpio_write(platform_gpio()->aa_en, value & 1);
466-
}
467-
#endif

firmware/common/hackrf_core.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ void pin_setup(void);
7676

7777
void trigger_enable(const bool enable);
7878

79-
#ifdef PRALINE
80-
void narrowband_filter_set(const uint8_t value);
81-
#endif
82-
8379
#ifdef __cplusplus
8480
}
8581
#endif

firmware/hackrf_usb/usb_api_praline.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@
2525

2626
#include <clkin.h>
2727
#include <clock_gen.h>
28-
#include <rf_path.c>
28+
#include <fpga.h>
2929
#include <usb_queue.h>
3030
#include <usb_request.h>
3131
#include <usb_type.h>
32-
#if !(defined(DFU_MODE) || defined(RAM_MODE))
33-
#include <fpga.h>
34-
#endif
3532

3633
usb_request_status_t usb_vendor_request_p1_ctrl(
3734
usb_endpoint_t* const endpoint,

0 commit comments

Comments
 (0)