Skip to content

Commit 0dca1e5

Browse files
committed
firmware: move clkin_ctrl_set to clkin.h|c
1 parent 2ad32a6 commit 0dca1e5

4 files changed

Lines changed: 21 additions & 12 deletions

File tree

firmware/common/clkin.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
#include <libopencm3/lpc43xx/creg.h>
3131

3232
#include "gpdma.h"
33+
#if defined(PRALINE)
34+
#include "gpio.h"
35+
#include "platform_gpio.h"
36+
#endif
3337

3438
#define CLOCK_CYCLES_1_MS (204000)
3539
#define MEASUREMENT_WINDOW_MS (50)
@@ -114,4 +118,11 @@ void clkin_detect_init(void)
114118
uint32_t clkin_frequency(void)
115119
{
116120
return TIMER2_CR3 * (1000 / MEASUREMENT_WINDOW_MS);
117-
};
121+
}
122+
123+
#ifdef PRALINE
124+
void clkin_ctrl_set(const clkin_signal_t signal)
125+
{
126+
gpio_write(platform_gpio()->clkin_ctrl, signal & 1);
127+
}
128+
#endif

firmware/common/clkin.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,12 @@
2525

2626
void clkin_detect_init(void);
2727
uint32_t clkin_frequency(void);
28+
29+
#ifdef PRALINE
30+
typedef enum {
31+
CLKIN_SIGNAL_P1 = 0,
32+
CLKIN_SIGNAL_P22 = 1,
33+
} clkin_signal_t;
34+
35+
void clkin_ctrl_set(const clkin_signal_t value);
36+
#endif

firmware/common/hackrf_core.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,11 +460,6 @@ void trigger_enable(const bool enable)
460460
}
461461

462462
#ifdef PRALINE
463-
void clkin_ctrl_set(const clkin_signal_t signal)
464-
{
465-
gpio_write(platform_gpio()->clkin_ctrl, signal & 1);
466-
}
467-
468463
void narrowband_filter_set(const uint8_t value)
469464
{
470465
gpio_write(platform_gpio()->aa_en, value & 1);

firmware/common/hackrf_core.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,7 @@ void pin_setup(void);
7777
void trigger_enable(const bool enable);
7878

7979
#ifdef PRALINE
80-
typedef enum {
81-
CLKIN_SIGNAL_P1 = 0,
82-
CLKIN_SIGNAL_P22 = 1,
83-
} clkin_signal_t;
84-
8580
void narrowband_filter_set(const uint8_t value);
86-
void clkin_ctrl_set(const clkin_signal_t value);
8781
#endif
8882

8983
#ifdef __cplusplus

0 commit comments

Comments
 (0)