1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
From e2c33aac88d2fa42723db5a68960ad7dfa9f4f75 Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Fri, 7 Nov 2014 11:12:41 -0800
Subject: [PATCH 14/68] MAX2837: Remove test code.
Hardware abstraction should make for easier test harnessing in the future.
---
firmware/common/max2837.c | 39 ---------------------------------------
firmware/common/max2837_drv.c | 16 ----------------
2 files changed, 55 deletions(-)
diff --git a/firmware/common/max2837.c b/firmware/common/max2837.c
index 835751c..f951dec 100644
--- a/firmware/common/max2837.c
+++ b/firmware/common/max2837.c
@@ -34,13 +34,7 @@
#include "max2837_drv.h"
#include "max2837_regs.def" // private register def macros
-#if (defined DEBUG || defined BUS_PIRATE)
-#include <stdio.h>
-#define LOG printf
-#else
-#define LOG(x,...)
#include "hackrf_core.h"
-#endif
/* Default register values. */
static const uint16_t max2837_regs_default[MAX2837_NUM_REGS] = {
@@ -85,7 +79,6 @@ static const uint16_t max2837_regs_default[MAX2837_NUM_REGS] = {
/* Set up all registers according to defaults specified in docs. */
void max2837_init(max2837_driver_t* const drv)
{
- LOG("# max2837_init\n");
memcpy(drv->regs, max2837_regs_default, sizeof(drv->regs));
drv->regs_dirty = 0xffffffff;
@@ -99,11 +92,9 @@ void max2837_init(max2837_driver_t* const drv)
*/
void max2837_setup(max2837_driver_t* const drv)
{
- LOG("# max2837_setup\n");
max2837_pin_config(drv);
max2837_init(drv);
- LOG("# max2837_init done\n");
/* Use SPI control instead of B1-B7 pins for gain settings. */
set_MAX2837_TXVGA_GAIN_SPI_EN(drv, 1);
@@ -185,45 +176,30 @@ void max2837_set_mode(max2837_driver_t* const drv, const max2837_mode_t new_mode
void max2837_start(max2837_driver_t* const drv)
{
- LOG("# max2837_start\n");
set_MAX2837_EN_SPI(drv, 1);
max2837_regs_commit(drv);
-#if !defined TEST
max2837_mode_standby(drv);
-#endif
}
void max2837_tx(max2837_driver_t* const drv)
{
- LOG("# max2837_tx\n");
-#if !defined TEST
-
set_MAX2837_ModeCtrl(drv, MAX2837_ModeCtrl_TxLPF);
max2837_regs_commit(drv);
max2837_mode_tx(drv);
-#endif
}
void max2837_rx(max2837_driver_t* const drv)
{
- LOG("# max2837_rx\n");
-
set_MAX2837_ModeCtrl(drv, MAX2837_ModeCtrl_RxLPF);
max2837_regs_commit(drv);
-
-#if !defined TEST
max2837_mode_rx(drv);
-#endif
}
void max2837_stop(max2837_driver_t* const drv)
{
- LOG("# max2837_stop\n");
set_MAX2837_EN_SPI(drv, 0);
max2837_regs_commit(drv);
-#if !defined TEST
max2837_mode_shutdown(drv);
-#endif
}
void max2837_set_frequency(max2837_driver_t* const drv, uint32_t freq)
@@ -254,9 +230,6 @@ void max2837_set_frequency(max2837_driver_t* const drv, uint32_t freq)
lna_band = MAX2837_LNAband_2_6;
}
- LOG("# max2837_set_frequency %ld, band %d, lna band %d\n",
- freq, band, lna_band);
-
/* ASSUME 40MHz PLL. Ratio = F*(4/3)/40,000,000 = F/30,000,000 */
div_int = freq / 30000000;
div_rem = freq % 30000000;
@@ -270,7 +243,6 @@ void max2837_set_frequency(max2837_driver_t* const drv, uint32_t freq)
div_rem -= div_cmp;
}
}
- LOG("# int %ld, frac %ld\n", div_int, div_frac);
/* Band settings */
set_MAX2837_LOGEN_BSW(drv, band);
@@ -382,14 +354,3 @@ bool max2837_set_txvga_gain(max2837_driver_t* const drv, const uint32_t gain_db)
max2837_reg_commit(drv, 29);
return true;
}
-
-#ifdef TEST
-int main(int ac, char **av)
-{
- max2837_setup(drv);
- max2837_set_frequency(drv, 2441000000);
- max2837_start(drv);
- max2837_tx(drv);
- max2837_stop(drv);
-}
-#endif //TEST
diff --git a/firmware/common/max2837_drv.c b/firmware/common/max2837_drv.c
index 51adcd2..14df9f7 100644
--- a/firmware/common/max2837_drv.c
+++ b/firmware/common/max2837_drv.c
@@ -22,19 +22,12 @@
#include "max2837_drv.h"
-#if (defined DEBUG || defined BUS_PIRATE)
-#include <stdio.h>
-#define LOG printf
-#else
-#define LOG(x,...)
#include <libopencm3/lpc43xx/ssp.h>
#include <libopencm3/lpc43xx/scu.h>
#include <libopencm3/lpc43xx/gpio.h>
#include "hackrf_core.h"
-#endif
void max2837_pin_config(max2837_driver_t* const drv) {
-#if !defined TEST
/* Configure XCVR_CTL GPIO pins. */
#ifdef JELLYBEAN
scu_pinmux(SCU_XCVR_RXHP, SCU_GPIO_FAST);
@@ -78,7 +71,6 @@ void max2837_pin_config(max2837_driver_t* const drv) {
| PIN_XCVR_B7
);
#endif
-#endif
}
void max2837_mode_shutdown(max2837_driver_t* const drv) {
@@ -152,15 +144,7 @@ uint16_t max2837_spi_read(max2837_driver_t* const drv, uint8_t r) {
/* SPI register write */
void max2837_spi_write(max2837_driver_t* const drv, uint8_t r, uint16_t v) {
(void)drv;
-
-#ifdef BUS_PIRATE
- LOG("{0x%02x 0x%02x]\n", 0x00 | ((uint16_t)r<<2) | ((v>>8) & 0x3),
- v & 0xff);
-#elif DEBUG
- LOG("0x%03x -> reg%d\n", v, r);
-#else
gpio_clear(PORT_XCVR_CS, PIN_XCVR_CS);
ssp_transfer(SSP1_NUM, (uint16_t)((r << 10) | (v & 0x3ff)));
gpio_set(PORT_XCVR_CS, PIN_XCVR_CS);
-#endif
}
--
2.1.4
|
