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

Sync ready

Browse Source
This commit is contained in:
Mike Davis
2017-01-03 22:25:32 +02:00
parent 25929965f5
commit 4b4cd181d8
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/common/streaming.c
View File

@ -25,6 +25,8 @@
#include <libopencm3/lpc43xx/m4/nvic.h> #include <libopencm3/lpc43xx/m4/nvic.h>
#include <libopencm3/lpc43xx/sgpio.h> #include <libopencm3/lpc43xx/sgpio.h>
#include "hackrf_core.h"
void baseband_streaming_enable(sgpio_config_t* const sgpio_config) { void baseband_streaming_enable(sgpio_config_t* const sgpio_config) {
nvic_set_priority(NVIC_SGPIO_IRQ, 0); nvic_set_priority(NVIC_SGPIO_IRQ, 0);
nvic_enable_irq(NVIC_SGPIO_IRQ); nvic_enable_irq(NVIC_SGPIO_IRQ);
@ -37,4 +39,4 @@ void baseband_streaming_disable(sgpio_config_t* const sgpio_config) {
sgpio_cpld_stream_disable(sgpio_config); sgpio_cpld_stream_disable(sgpio_config);
nvic_disable_irq(NVIC_SGPIO_IRQ); nvic_disable_irq(NVIC_SGPIO_IRQ);
} }

32
firmware/hackrf_usb/hackrf_usb.c
View File

@ -50,8 +50,6 @@ static volatile transceiver_mode_t _transceiver_mode = TRANSCEIVER_MODE_OFF;
void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) { void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
baseband_streaming_disable(&sgpio_config); baseband_streaming_disable(&sgpio_config);
disable_sync
usb_endpoint_disable(&usb_endpoint_bulk_in); usb_endpoint_disable(&usb_endpoint_bulk_in);
usb_endpoint_disable(&usb_endpoint_bulk_out); usb_endpoint_disable(&usb_endpoint_bulk_out);
@ -74,14 +72,15 @@ void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
led_off(LED3); led_off(LED3);
rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_OFF); rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_OFF);
vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_rx; vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_rx;
hw_sync_stop();
} }
if( _transceiver_mode != TRANSCEIVER_MODE_OFF ) { if( _transceiver_mode != TRANSCEIVER_MODE_OFF ) {
si5351c_activate_best_clock_source(&clock_gen); si5351c_activate_best_clock_source(&clock_gen);
wait_for_sync hw_sync_stop();
hw_sync_syn();
baseband_streaming_enable(&sgpio_config);
} }
} }
@ -253,28 +252,23 @@ int main(void) {
rf_path_init(&rf_path); rf_path_init(&rf_path);
bool synced = false;
int hw_sync_count = 0;
unsigned int phase = 0; unsigned int phase = 0;
led_off(LED3);
hw_sync_syn();
while(true) { while(true) {
// Check whether we need to initiate a CPLD update // Check whether we need to initiate a CPLD update
if (start_cpld_update) if (start_cpld_update)
cpld_update(); cpld_update();
// if(!synced) { while(true) {
if(hw_sync_ready()) { if(hw_sync_ready()) {
synced = true; hw_sync_ack();
hw_sync_ack(); led_on(LED3);
led_on(LED3);
}
// }
//int gpio_sync_in_flag = gpio_get(gpio_sync_in); baseband_streaming_enable(&sgpio_config);
break;
}
}
// Set up IN transfer of buffer 0. // Set up IN transfer of buffer 0.
if ( usb_bulk_buffer_offset >= 16384 if ( usb_bulk_buffer_offset >= 16384
@ -283,7 +277,6 @@ int main(void) {
usb_transfer_schedule_block( usb_transfer_schedule_block(
(transceiver_mode() == TRANSCEIVER_MODE_RX) (transceiver_mode() == TRANSCEIVER_MODE_RX)
? &usb_endpoint_bulk_in : &usb_endpoint_bulk_out, ? &usb_endpoint_bulk_in : &usb_endpoint_bulk_out,
//synced ? &usb_bulk_buffer[0x0000] : &usb_dummy_buffer[0x0000],
&usb_bulk_buffer[0x0000], &usb_bulk_buffer[0x0000],
0x4000, 0x4000,
NULL, NULL NULL, NULL
@ -298,7 +291,6 @@ int main(void) {
usb_transfer_schedule_block( usb_transfer_schedule_block(
(transceiver_mode() == TRANSCEIVER_MODE_RX) (transceiver_mode() == TRANSCEIVER_MODE_RX)
? &usb_endpoint_bulk_in : &usb_endpoint_bulk_out, ? &usb_endpoint_bulk_in : &usb_endpoint_bulk_out,
//synced ? &usb_bulk_buffer[0x4000] : &usb_dummy_buffer[0x4000],
&usb_bulk_buffer[0x4000], &usb_bulk_buffer[0x4000],
0x4000, 0x4000,
NULL, NULL NULL, NULL