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

Remove USB endpoint fiddling from baseband_streaming_disable().

Browse Source 
Create baseband_streaming_enable() to do SGPIO IRQ and stream enable.
This commit is contained in:
Jared Boone
2013-09-17 22:23:18 -07:00
parent 76704be008
commit aebea16b0f
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/hackrf_usb/hackrf_usb.c
View File

@ -161,18 +161,26 @@ usb_endpoint_t usb_endpoint_bulk_out = {
}; };
static USB_DEFINE_QUEUE(usb_endpoint_bulk_out, 4); static USB_DEFINE_QUEUE(usb_endpoint_bulk_out, 4);
void baseband_streaming_enable() {
nvic_set_priority(NVIC_SGPIO_IRQ, 0);
nvic_enable_irq(NVIC_SGPIO_IRQ);
SGPIO_SET_EN_1 = (1 << SGPIO_SLICE_A);
sgpio_cpld_stream_enable();
}
void baseband_streaming_disable() { void baseband_streaming_disable() {
sgpio_cpld_stream_disable(); sgpio_cpld_stream_disable();
nvic_disable_irq(NVIC_SGPIO_IRQ); nvic_disable_irq(NVIC_SGPIO_IRQ);
usb_endpoint_disable(&usb_endpoint_bulk_in);
usb_endpoint_disable(&usb_endpoint_bulk_out);
} }
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(); baseband_streaming_disable();
usb_endpoint_disable(&usb_endpoint_bulk_in);
usb_endpoint_disable(&usb_endpoint_bulk_out);
transceiver_mode = new_transceiver_mode; transceiver_mode = new_transceiver_mode;
if( transceiver_mode == TRANSCEIVER_MODE_RX ) { if( transceiver_mode == TRANSCEIVER_MODE_RX ) {
@ -199,12 +207,7 @@ void set_transceiver_mode(const transceiver_mode_t new_transceiver_mode) {
sgpio_isr_fn = sgpio_isr_tx; sgpio_isr_fn = sgpio_isr_tx;
} }
vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_fn; vector_table.irq[NVIC_SGPIO_IRQ] = sgpio_isr_fn;
baseband_streaming_enable();
nvic_set_priority(NVIC_SGPIO_IRQ, 0);
nvic_enable_irq(NVIC_SGPIO_IRQ);
SGPIO_SET_EN_1 = (1 << SGPIO_SLICE_A);
sgpio_cpld_stream_enable();
} }
} }