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

Merge branch 'master' of git://github.com/mossmann/hackrf

Browse Source 
Conflicts:
	firmware/usb_performance/usb_performance.c
This commit is contained in:
TitanMKD
2013-03-07 23:47:21 +01:00
parent e3784c886e 50f7481682
commit 64a3356a8e
3 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/.gitignore vendored
View File

@ -6,3 +6,4 @@
*.map *.map
*.o *.o
*.srec *.srec
*.dfu

36
firmware/usb_performance/usb_performance.c
View File

@ -520,12 +520,43 @@ usb_request_status_t usb_vendor_request_set_freq(
return USB_REQUEST_STATUS_OK; return USB_REQUEST_STATUS_OK;
} }
return USB_REQUEST_STATUS_STALL; return USB_REQUEST_STATUS_STALL;
} else } else
{ {
return USB_REQUEST_STATUS_OK; return USB_REQUEST_STATUS_OK;
} }
} }
usb_request_status_t usb_vendor_request_set_amp_enable(
usb_endpoint_t* const endpoint, const usb_transfer_stage_t stage)
{
if (stage == USB_TRANSFER_STAGE_SETUP) {
switch (endpoint->setup.value) {
case 0:
switchctrl |= SWITCHCTRL_AMP_BYPASS;
if (transceiver_mode == TRANSCEIVER_MODE_RX) {
rffc5071_rx(switchctrl);
} else if (transceiver_mode == TRANSCEIVER_MODE_TX) {
rffc5071_tx(switchctrl);
}
usb_endpoint_schedule_ack(endpoint->in);
return USB_REQUEST_STATUS_OK;
case 1:
switchctrl &= ~SWITCHCTRL_AMP_BYPASS;
if (transceiver_mode == TRANSCEIVER_MODE_RX) {
rffc5071_rx(switchctrl);
} else if (transceiver_mode == TRANSCEIVER_MODE_TX) {
rffc5071_tx(switchctrl);
}
usb_endpoint_schedule_ack(endpoint->in);
return USB_REQUEST_STATUS_OK;
default:
return USB_REQUEST_STATUS_STALL;
}
} else {
return USB_REQUEST_STATUS_OK;
}
}
static const usb_request_handler_fn vendor_request_handler[] = { static const usb_request_handler_fn vendor_request_handler[] = {
NULL, NULL,
usb_vendor_request_set_transceiver_mode, usb_vendor_request_set_transceiver_mode,
@ -543,7 +574,8 @@ static const usb_request_handler_fn vendor_request_handler[] = {
usb_vendor_request_write_cpld, usb_vendor_request_write_cpld,
usb_vendor_request_read_board_id, usb_vendor_request_read_board_id,
usb_vendor_request_read_version_string, usb_vendor_request_read_version_string,
usb_vendor_request_set_freq usb_vendor_request_set_freq,
usb_vendor_request_set_amp_enable
}; };
static const uint32_t vendor_request_handler_count = static const uint32_t vendor_request_handler_count =

2
hardware/.gitignore vendored
View File

@ -19,3 +19,5 @@ $savepcb.*
# other kicad generated files # other kicad generated files
*.csv *.csv
*.svg
*.pdf