311 Commits

Author SHA1 Message Date
Jared Boone
f7a42e0747 Move USB API for CPLD management into separate files. 2013-09-19 19:52:14 -07:00
Jared Boone
82ce660932 Broke some application-specific USB code into separate files within hackrf_usb/. Hoping I can use them as necessary in other projects, or push them into a library eventually. 2013-09-19 19:51:32 -07:00
Jared Boone
5b7b98be6c Clean up SGPIO vector assignment code. 2013-09-17 22:37:40 -07:00
Jared Boone
c06facdd25 Push SGPIO configuration into RF path API. 2013-09-17 22:32:10 -07:00
Jared Boone
2e2275ed51 Pull out leaky tri-state transceiver_mode value from sgpio_configure(), replace with SGPIO_DIRECTION_* #defines. 2013-09-17 22:29:41 -07:00
Jared Boone
aebea16b0f Remove USB endpoint fiddling from baseband_streaming_disable().
Create baseband_streaming_enable() to do SGPIO IRQ and stream enable.
2013-09-17 22:23:18 -07:00
Jared Boone
1ec9f560b4 Move more RF path stuff (initialization and MAX5864 state management) into rf_path.c.
Changed initial RF path mode to lowest power (OFF).
Remove initial MAX2837 IF setting -- it's a waste of effort when the first (and necessary) tuning operation will reset it anyway (perhaps to a different value).
2013-09-17 17:25:00 -07:00
Jared Boone
53415a620d Allow set_transceiver_mode(OFF) to fall through the rest of the function, now that sgpio_configure() is expecting OFF as a value. 2013-09-17 15:33:07 -07:00
Jared Boone
0e8e3c8d53 Push MAX2837 state management into rf_path_set_direction(). 2013-09-17 15:27:16 -07:00
Jared Boone
e02d2f0325 Remove dependencies on application-specific USB descriptors. 2013-09-17 15:13:12 -07:00
Jared Boone
fe2a700f8f Move files that have no application-specific bits (e.g. USB stack, tuning, and RF path APIs) to ../common/. 2013-09-17 15:10:46 -07:00
Jared Boone
78121f5a3e Merge branch 'refs/heads/bgamari_usb_merge' into jboone_refactor_20130906
Conflicts:
	firmware/hackrf_usb/hackrf_usb.c
2013-09-17 13:10:30 -07:00
Jared Boone
4984a8b681 Fix to SPIFI addressing during hackrf_spiflash read operation. This fixes mismatches between programmed and read-back data. 2013-09-17 12:18:33 -07:00
Jared Boone
d13e80b520 With bgamari's new USB configuration for CPLD, be sure to turn up CPU clock to maximum. 2013-09-16 15:21:28 -07:00
Jared Boone
c0274cd2d3 Merge remote-tracking branch 'bgamari/usb' into bgamari_usb_merge
Conflicts:
	firmware/hackrf_usb/hackrf_usb.c
	firmware/hackrf_usb/usb.c
	firmware/hackrf_usb/usb_queue.c
	firmware/hackrf_usb/usb_queue.h
	firmware/hackrf_usb/usb_standard_request.c
2013-09-16 15:18:14 -07:00
Ben Gamari
67a181ac36 hackrf_usb: Update transceiver_mode on all configuration changes 2013-09-14 18:24:26 -04:00
Ben Gamari
64ef3f71c0 hackrf_usb: Make main loop non-blocking 2013-09-14 18:24:26 -04:00
Ben Gamari
3ba8d33de8 hackrf: Enter cpld_update from main loop
Otherwise we never respond to SET_CONFIGURATION
2013-09-14 18:24:26 -04:00
Ben Gamari
dc9c6c9667 cpld: Stream CPLD data from host
Previously CPLD programming involved a large 64kbyte buffer into which
the the entire bitstream would be completely downloaded, and at which
point the programming process would commence. This is needlessly
wasteful of memory. Moreover, it could lead to USB timeouts as the
firmware needs to wait the entire duration of the programming process
before returning an ACK to the host after the final SETUP data phase
packet.

Instead, we now receive 512 byte chunks of the bitstream and stream them
to the CPLD one at a time. We wait for each packet to be streamed out to
the CPLD before ACKing the packet to prevent active data being
overwritten.
2013-09-14 18:24:25 -04:00
Ben Gamari
8e897be975 usb_standard_request: Multiple config support
GET_DESCRIPTOR would only return one configurations. This fixes that.
2013-09-14 18:24:25 -04:00
Ben Gamari
34fabad121 usb_standard_request: Sent descriptors can be const 2013-09-14 18:24:25 -04:00
Ben Gamari
4773ee5a53 hackrf_usb: Port to use usb_queue 2013-09-14 18:24:25 -04:00
Ben Gamari
500aa5888c usb_queue: Introduce queue management 2013-09-14 18:24:25 -04:00
Ben Gamari
24d5a5c4f1 usb: Add usb_endpoint_append_td
This implements the procedure for adding a TD to the end of an active
queue described in UM10503 Section 23.10.11.3.
2013-09-14 18:24:25 -04:00
Ben Gamari
1a44890095 usb_descriptor: Add description strings for configurations 2013-09-14 18:24:25 -04:00
Ben Gamari
21ad0778d2 usb_descriptor: Fix whitespace 2013-09-14 18:24:25 -04:00
Jared Boone
042229ea19 Set transceiver mode to OFF whenever USB configuration changes. 2013-09-08 15:52:36 -07:00
Jared Boone
0411ffe3f0 Set RF path direction to "off" when transceiver_mode is OFF. 2013-09-08 15:44:37 -07:00
Jared Boone
98e33fbb5b Remove commented RFFC5071 code in set_transceiver_mode. 2013-09-08 15:36:25 -07:00
Jared Boone
d00123ed24 Update RFFC5071 enable state when switching RF path direction. TODO: There's some stuff here that needs refactoring -- duplicate code is showing up. 2013-09-08 15:20:47 -07:00
Jared Boone
a897c4f016 Add RF_PATH_DIRECTION_OFF enum and code. 2013-09-08 15:19:27 -07:00
Jared Boone
217630d82c Convert rf_path_set_direction from if/else to switch/case. 2013-09-08 15:13:44 -07:00
Jared Boone
9b2b7b0817 Move SGPIO ISRs to separate .c/.h files.
Move usb_bulk_buffer* to separate .c/.h files.
2013-09-08 15:10:19 -07:00
Jared Boone
ddf4c01f66 Forgot to propagate license to rf_path.[ch]. 2013-09-07 22:30:48 -07:00
Jared Boone
14eba3d947 Extract tuning code into separate .c/.h file. 2013-09-07 22:30:13 -07:00
Jared Boone
b5dc264d22 Extract rf_path code into a separate .c/.h.
Add an rf_path_init() function to do initial, idle configuration during start-up.
2013-09-07 22:22:03 -07:00
Jared Boone
7cf4058372 Move various switchctrl manipulation into clearly-defined rf_path_*() implementations. 2013-09-07 22:06:01 -07:00
Jared Boone
bf297e0e08 I might've been a bit hasty removing volatile from transceiver_mode. 2013-09-07 22:01:46 -07:00
Jared Boone
4ad3680428 Break SGPIO interrupt handlers in two -- RX and TX.
Assign an SGPIO interrupt handler function at runtime, based on RX or TX mode. NOTE: This is incompatible with placing the vector table in ROM, which is fine on a device with no internal flash).
Remove SGPIO interrupt-time dependency on volatile transceiver_mode variable. Side effect is that a few cycles are probably saved inside the SGPIO interrupt.
2013-09-07 21:04:36 -07:00
Jared Boone
e7c6408473 Add comment describing SWITCHCTRL pins vs. RF path configurations. 2013-09-07 20:21:43 -07:00
Jared Boone
d65314db37 Clean up switchctrl code a bit -- redundant #ifdefs and complex if conditions. 2013-09-07 20:20:48 -07:00
Jared Boone
bafe97e302 Extract knowledge of RF path configurations from the RFFC5071 driver.
Change initial RF path mode to SWITCHCTRL_SAFE. (Previously started at SWITCHCTRL_SAFE and then immediately switched to SWITCHCTRL_AMP_BYPASS.)
2013-09-07 12:59:57 -07:00
Jared Boone
6dee455ef2 Contain calls to rffc5071_(rx|tr) to a single location. 2013-09-07 12:40:09 -07:00
Jared Boone
b89f43e97e Replace transceiver_mode dependent MAX2837 mode management with max2837_mode() -> max2837_set_mode() calls. 2013-09-06 22:50:04 -07:00
Jared Boone
a5c0b5deeb Add MAX2837 functions to control operating mode.
Replace direct manipulation of GPIOs controlling MAX2837 with operating mode functions.
2013-09-06 21:29:31 -07:00
Jared Boone
7c5db57f02 Hide the MAX2837 intermediate frequency behind a function. It also prevents leakage of the freq_*_cache variables. 2013-09-06 16:46:03 -07:00
Jared Boone
b893b0a694 Merge remote-tracking branch 'bgamari/usb' into bgamari_usb_merge
Conflicts:
	firmware/hackrf_usb/hackrf_usb.c
	firmware/libopencm3
2013-09-06 15:20:58 -07:00
Jared Boone
6c0d803647 Cleaned up management of SGPIO and transceiver mode state vs. USB configuration state. This should help with power management. It may also be necessary when operating at low speed (48MHz), to keep the SGPIO interrupts from chewing up ALL available CPU cycles. 2013-09-04 16:27:43 -07:00
Jared Boone
1f5b979fd9 Added usb_set_configuration_changed_cb() call that bgamari fixed in his as-yet-unmerged USB branch. 2013-09-04 16:24:19 -07:00
Jared Boone
189d245868 Merge remote-tracking branch 'TitanMKD/master' into titanmkd_overclock_fix
Conflicts:
	firmware/hackrf_usb/hackrf_usb.c
2013-09-04 12:41:03 -07:00