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

Simpify TX loop in the same way as RX loop.

Browse Source
This commit is contained in:
Martin Ling
2022-07-25 10:40:07 +01:00
parent 0175c2e84e
commit a943610cd4
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/hackrf_usb/usb_api_transceiver.c
View File

@ -391,7 +391,7 @@ void rx_mode(uint32_t seq) {
} }
void tx_mode(uint32_t seq) { void tx_mode(uint32_t seq) {
unsigned int phase = 0; unsigned int usb_count = 0;
transceiver_startup(TRANSCEIVER_MODE_TX); transceiver_startup(TRANSCEIVER_MODE_TX);
@ -403,6 +403,7 @@ void tx_mode(uint32_t seq) {
transceiver_bulk_transfer_complete, transceiver_bulk_transfer_complete,
NULL NULL
); );
usb_count += 0x4000;
// Enable streaming. The M0 is in TX_START mode, and will automatically // Enable streaming. The M0 is in TX_START mode, and will automatically
// send zeroes until the host fills buffer 0. Once that buffer is filled, // send zeroes until the host fills buffer 0. Once that buffer is filled,
@ -411,28 +412,15 @@ void tx_mode(uint32_t seq) {
baseband_streaming_enable(&sgpio_config); baseband_streaming_enable(&sgpio_config);
while (transceiver_request.seq == seq) { while (transceiver_request.seq == seq) {
uint32_t m0_offset = m0_state.m0_count & USB_BULK_BUFFER_MASK; if ((usb_count - m0_state.m0_count) <= 0x4000) {
// Set up OUT transfer of buffer 0.
if (16384 <= m0_offset && 1 == phase) {
usb_transfer_schedule_block( usb_transfer_schedule_block(
&usb_endpoint_bulk_out, &usb_endpoint_bulk_out,
&usb_bulk_buffer[0x0000], &usb_bulk_buffer[usb_count & USB_BULK_BUFFER_MASK],
0x4000, 0x4000,
transceiver_bulk_transfer_complete, transceiver_bulk_transfer_complete,
NULL NULL
); );
phase = 0; usb_count += 0x4000;
}
// Set up OUT transfer of buffer 1.
if (16384 > m0_offset && 0 == phase) {
usb_transfer_schedule_block(
&usb_endpoint_bulk_out,
&usb_bulk_buffer[0x4000],
0x4000,
transceiver_bulk_transfer_complete,
NULL
);
phase = 1;
} }
} }