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

Merge pull request #40 from TitanMKD/master

Browse Source 
Fixed problems/merge and code tested on both linux/windows with hackrf board
This commit is contained in:
Michael Ossmann
2013-03-24 06:36:02 -07:00
parent 9f5057d154 a498208b12
commit ddad4873b2
4 changed files with 153 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/common/fault_handler.c
View File

@ -1,5 +1,6 @@
/* /*
* Copyright 2012 Jared Boone <jared@sharebrained.com> * Copyright 2012 Jared Boone <jared@sharebrained.com>
* Copyright 2013 Benjamin Vernoux <titanmkd@gmail.com>
* *
* This file is part of HackRF. * This file is part of HackRF.
* *
@ -23,6 +24,18 @@
#include "fault_handler.h" #include "fault_handler.h"
typedef struct
{
uint32_t r0;
uint32_t r1;
uint32_t r2;
uint32_t r3;
uint32_t r12;
uint32_t lr; /* Link Register. */
uint32_t pc; /* Program Counter. */
uint32_t psr;/* Program Status Register. */
} hard_fault_stack_t;
__attribute__((naked)) __attribute__((naked))
void hard_fault_handler(void) { void hard_fault_handler(void) {
__asm__("TST LR, #4"); __asm__("TST LR, #4");
@ -32,9 +45,13 @@ void hard_fault_handler(void) {
__asm__("B hard_fault_handler_c"); __asm__("B hard_fault_handler_c");
} }
volatile hard_fault_stack_t* hard_fault_stack_pt;
void hard_fault_handler_c(uint32_t* args) { void hard_fault_handler_c(uint32_t* args)
(void)args; {
/* hard_fault_stack_pt contains registers saved before the hard fault */
hard_fault_stack_pt = (hard_fault_stack_t*)args;
// args[0-7]: r0, r1, r2, r3, r12, lr, pc, psr // args[0-7]: r0, r1, r2, r3, r12, lr, pc, psr
// Other interesting registers to examine: // Other interesting registers to examine:
// CFSR: Configurable Fault Status Register // CFSR: Configurable Fault Status Register

16
firmware/common/hackrf_core.c
View File

@ -312,9 +312,15 @@ void ssp1_init(void)
void ssp1_set_mode_max2837(void) void ssp1_set_mode_max2837(void)
{ {
/* FIXME speed up once everything is working reliably */ /* FIXME speed up once everything is working reliably */
/*
// Freq About 0.0498MHz / 49.8KHz => Freq = PCLK / (CPSDVSR * [SCR+1]) with PCLK=PLL1=204MHz
const uint8_t serial_clock_rate = 32; const uint8_t serial_clock_rate = 32;
const uint8_t clock_prescale_rate = 128; const uint8_t clock_prescale_rate = 128;
*/
// Freq About 4.857MHz => Freq = PCLK / (CPSDVSR * [SCR+1]) with PCLK=PLL1=204MHz
const uint8_t serial_clock_rate = 21;
const uint8_t clock_prescale_rate = 2;
ssp_init(SSP1_NUM, ssp_init(SSP1_NUM,
SSP_DATA_16BITS, SSP_DATA_16BITS,
SSP_FRAME_SPI, SSP_FRAME_SPI,
@ -329,9 +335,15 @@ void ssp1_set_mode_max2837(void)
void ssp1_set_mode_max5864(void) void ssp1_set_mode_max5864(void)
{ {
/* FIXME speed up once everything is working reliably */ /* FIXME speed up once everything is working reliably */
/*
// Freq About 0.0498MHz / 49.8KHz => Freq = PCLK / (CPSDVSR * [SCR+1]) with PCLK=PLL1=204MHz
const uint8_t serial_clock_rate = 32; const uint8_t serial_clock_rate = 32;
const uint8_t clock_prescale_rate = 128; const uint8_t clock_prescale_rate = 128;
*/
// Freq About 4.857MHz => Freq = PCLK / (CPSDVSR * [SCR+1]) with PCLK=PLL1=204MHz
const uint8_t serial_clock_rate = 21;
const uint8_t clock_prescale_rate = 2;
ssp_init(SSP1_NUM, ssp_init(SSP1_NUM,
SSP_DATA_8BITS, SSP_DATA_8BITS,
SSP_FRAME_SPI, SSP_FRAME_SPI,

194
host/libhackrf/examples/hackrf_transfer.c
View File

@ -42,9 +42,17 @@
#include <sys/time.h> #include <sys/time.h>
#include <signal.h> #include <signal.h>
#define FREQ_ONE_MHZ (1000000)
#define FREQ_MIN_HZ (30000000ull) /* 30MHz */ #define FREQ_MIN_HZ (30000000ull) /* 30MHz */
#define FREQ_MAX_HZ (6000000000ull) /* 6000MHz */ #define FREQ_MAX_HZ (6000000000ull) /* 6000MHz */
#define DEFAULT_SAMPLE_RATE_HZ (10000000) /* 10MHz default sample rate */
#define DEFAULT_BASEBAND_FILTER_BANDWIDTH (5000000) /* 5MHz default */
#define SAMPLES_TO_XFER_MAX (0x8000000000000000ull) /* Max value */
#if defined _WIN32 #if defined _WIN32
#define sleep(a) Sleep( (a*1000) ) #define sleep(a) Sleep( (a*1000) )
#endif #endif
@ -86,7 +94,7 @@ int parse_u64(char* s, uint64_t* const value) {
} }
} }
int parse_int(char* s, uint32_t* const value) { int parse_u32(char* s, uint32_t* const value) {
uint_fast8_t base = 10; uint_fast8_t base = 10;
if( strlen(s) > 2 ) { if( strlen(s) > 2 ) {
if( s[0] == '0' ) { if( s[0] == '0' ) {
@ -110,6 +118,8 @@ int parse_int(char* s, uint32_t* const value) {
} }
} }
volatile bool do_exit = false;
FILE* fd = NULL; FILE* fd = NULL;
volatile uint32_t byte_count = 0; volatile uint32_t byte_count = 0;
@ -124,6 +134,10 @@ uint64_t freq_hz;
bool amp = false; bool amp = false;
uint32_t amp_enable; uint32_t amp_enable;
bool sample_rate = false;
uint32_t sample_rate_hz;
bool limit_num_samples = false; bool limit_num_samples = false;
uint64_t samples_to_xfer = 0; uint64_t samples_to_xfer = 0;
uint64_t bytes_to_xfer = 0; uint64_t bytes_to_xfer = 0;
@ -190,8 +204,9 @@ static void usage() {
printf("Usage:\n"); printf("Usage:\n");
printf("\t-r <filename> # Receive data into file.\n"); printf("\t-r <filename> # Receive data into file.\n");
printf("\t-t <filename> # Transmit data from file.\n"); printf("\t-t <filename> # Transmit data from file.\n");
printf("\t[-f set_freq_hz] # Set Freq in Hz (between [%lld, %lld[).\n", FREQ_MIN_HZ, FREQ_MAX_HZ); printf("\t[-f set_freq_hz] # Set Freq in Hz between [%lldMHz, %lldMHz[.\n", FREQ_MIN_HZ/FREQ_ONE_MHZ, FREQ_MAX_HZ/FREQ_ONE_MHZ);
printf("\t[-a set_amp] # Set Amp 1=Enable, 0=Disable.\n"); printf("\t[-a set_amp] # Set Amp 1=Enable, 0=Disable.\n");
printf("\t[-s sample_rate_hz] # Set sample rate in Hz (5/10/12.5/16/20MHz, default %dMHz).\n", DEFAULT_SAMPLE_RATE_HZ/FREQ_ONE_MHZ);
printf("\t[-n num_samples] # Number of samples to transfer (default is unlimited).\n"); printf("\t[-n num_samples] # Number of samples to transfer (default is unlimited).\n");
} }
@ -199,58 +214,8 @@ static hackrf_device* device = NULL;
void sigint_callback_handler(int signum) void sigint_callback_handler(int signum)
{ {
int result; fprintf(stdout, "Caught signal %d\n", signum);
printf("Caught signal %d\n", signum); do_exit = true;
struct timeval t_end;
gettimeofday(&t_end, NULL);
const float time_diff = TimevalDiff(&t_end, &t_start);
printf("Total time: %5.5f s\n", time_diff);
if(device != NULL)
{
if( receive )
{
printf("hackrf_stop_rx \n");
result = hackrf_stop_rx(device);
if( result != HACKRF_SUCCESS ) {
printf("hackrf_stop_rx() failed: %s (%d)\n", hackrf_error_name(result), result);
}else {
printf("hackrf_stop_rx() done\n");
}
}
if( transmit )
{
result = hackrf_stop_tx(device);
if( result != HACKRF_SUCCESS ) {
printf("hackrf_stop_tx() failed: %s (%d)\n", hackrf_error_name(result), result);
}else {
printf("hackrf_stop_tx() done\n");
}
}
result = hackrf_close(device);
if( result != HACKRF_SUCCESS )
{
printf("hackrf_close() failed: %s (%d)\n", hackrf_error_name(result), result);
}
printf("hackrf_close() done\n");
hackrf_exit();
}
if(fd != NULL)
{
fclose(fd);
fd = NULL;
printf("fclose() file handle done\n");
}
printf("Exit\n");
/* Terminate program */
exit(signum);
} }
int main(int argc, char** argv) { int main(int argc, char** argv) {
@ -258,7 +223,8 @@ int main(int argc, char** argv) {
const char* path = NULL; const char* path = NULL;
int result; int result;
while( (opt = getopt(argc, argv, "r:t:f:a:n:")) != EOF ) { while( (opt = getopt(argc, argv, "r:t:f:a:s:n:")) != EOF )
{
result = HACKRF_SUCCESS; result = HACKRF_SUCCESS;
switch( opt ) { switch( opt ) {
case 'r': case 'r':
@ -278,13 +244,18 @@ int main(int argc, char** argv) {
case 'a': case 'a':
amp = true; amp = true;
result = parse_int(optarg, &amp_enable); result = parse_u32(optarg, &amp_enable);
break;
case 's':
sample_rate = true;
result = parse_u32(optarg, &sample_rate_hz);
break; break;
case 'n': case 'n':
limit_num_samples = true; limit_num_samples = true;
result = parse_u64(optarg, &samples_to_xfer); result = parse_u64(optarg, &samples_to_xfer);
bytes_to_xfer = samples_to_xfer * 2; bytes_to_xfer = samples_to_xfer * 2ull;
break; break;
default: default:
@ -293,14 +264,14 @@ int main(int argc, char** argv) {
} }
if( result != HACKRF_SUCCESS ) { if( result != HACKRF_SUCCESS ) {
printf("argument error: %s (%d)\n", hackrf_error_name(result), result); printf("argument error: '-%c %s' %s (%d)\n", opt, optarg, hackrf_error_name(result), result);
usage(); usage();
break; return EXIT_FAILURE;
} }
} }
if (samples_to_xfer >= 0x8000000000000000ul) { if (samples_to_xfer >= SAMPLES_TO_XFER_MAX) {
printf("argument error: num_samples must be less than %lu\n", 0x8000000000000000ul); printf("argument error: num_samples must be less than %llu/%lluMio\n", SAMPLES_TO_XFER_MAX, SAMPLES_TO_XFER_MAX/FREQ_ONE_MHZ);
usage(); usage();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -308,7 +279,7 @@ int main(int argc, char** argv) {
if( freq ) { if( freq ) {
if( (freq_hz >= FREQ_MAX_HZ) || (freq_hz < FREQ_MIN_HZ) ) if( (freq_hz >= FREQ_MAX_HZ) || (freq_hz < FREQ_MIN_HZ) )
{ {
printf("argument error: set_freq_hz shall be between [%lld, %lld[.\n", FREQ_MIN_HZ, FREQ_MAX_HZ); printf("argument error: set_freq_hz shall be between [%llu, %llu[.\n", FREQ_MIN_HZ, FREQ_MAX_HZ);
usage(); usage();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -321,7 +292,7 @@ int main(int argc, char** argv) {
usage(); usage();
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
if( transmit == receive ) if( transmit == receive )
{ {
@ -374,15 +345,34 @@ int main(int argc, char** argv) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
signal(SIGINT, sigint_callback_handler); signal(SIGINT, &sigint_callback_handler);
signal(SIGILL, &sigint_callback_handler);
signal(SIGFPE, &sigint_callback_handler);
signal(SIGSEGV, &sigint_callback_handler);
signal(SIGTERM, &sigint_callback_handler);
signal(SIGABRT, &sigint_callback_handler);
result = hackrf_sample_rate_set(device, 10000000); if( sample_rate )
if( result != HACKRF_SUCCESS ) { {
printf("hackrf_sample_rate_set() failed: %s (%d)\n", hackrf_error_name(result), result); printf("call hackrf_sample_rate_set(%u Hz/%u MHz)\n", sample_rate_hz, sample_rate_hz/FREQ_ONE_MHZ);
return EXIT_FAILURE; result = hackrf_sample_rate_set(device, sample_rate_hz);
if( result != HACKRF_SUCCESS ) {
printf("hackrf_sample_rate_set() failed: %s (%d)\n", hackrf_error_name(result), result);
return EXIT_FAILURE;
}
}else
{
printf("call hackrf_sample_rate_set(%u Hz/%u MHz)\n", DEFAULT_SAMPLE_RATE_HZ, DEFAULT_SAMPLE_RATE_HZ/FREQ_ONE_MHZ);
result = hackrf_sample_rate_set(device, DEFAULT_SAMPLE_RATE_HZ);
if( result != HACKRF_SUCCESS ) {
printf("hackrf_sample_rate_set() failed: %s (%d)\n", hackrf_error_name(result), result);
return EXIT_FAILURE;
}
} }
result = hackrf_baseband_filter_bandwidth_set(device, 5000000); printf("call hackrf_baseband_filter_bandwidth_set(%d Hz/%d MHz)\n",
DEFAULT_BASEBAND_FILTER_BANDWIDTH, DEFAULT_BASEBAND_FILTER_BANDWIDTH/FREQ_ONE_MHZ);
result = hackrf_baseband_filter_bandwidth_set(device, DEFAULT_BASEBAND_FILTER_BANDWIDTH);
if( result != HACKRF_SUCCESS ) { if( result != HACKRF_SUCCESS ) {
printf("hackrf_baseband_filter_bandwidth_set() failed: %s (%d)\n", hackrf_error_name(result), result); printf("hackrf_baseband_filter_bandwidth_set() failed: %s (%d)\n", hackrf_error_name(result), result);
return EXIT_FAILURE; return EXIT_FAILURE;
@ -399,7 +389,7 @@ int main(int argc, char** argv) {
} }
if( freq ) { if( freq ) {
printf("call hackrf_set_freq(%lu Hz)\n", freq_hz); printf("call hackrf_set_freq(%llu Hz/%llu MHz)\n", freq_hz, (freq_hz/FREQ_ONE_MHZ) );
result = hackrf_set_freq(device, freq_hz); result = hackrf_set_freq(device, freq_hz);
if( result != HACKRF_SUCCESS ) { if( result != HACKRF_SUCCESS ) {
printf("hackrf_set_freq() failed: %s (%d)\n", hackrf_error_name(result), result); printf("hackrf_set_freq() failed: %s (%d)\n", hackrf_error_name(result), result);
@ -416,10 +406,16 @@ int main(int argc, char** argv) {
} }
} }
if( limit_num_samples ) {
printf("samples_to_xfer %llu/%lluMio\n", samples_to_xfer, (samples_to_xfer/FREQ_ONE_MHZ) );
}
gettimeofday(&t_start, NULL); gettimeofday(&t_start, NULL);
gettimeofday(&time_start, NULL); gettimeofday(&time_start, NULL);
while( hackrf_is_streaming(device) ) printf("Stop with Ctrl-C\n");
while( (hackrf_is_streaming(device)) &&
(do_exit == false) )
{ {
sleep(1); sleep(1);
@ -437,18 +433,56 @@ int main(int argc, char** argv) {
time_start = time_now; time_start = time_now;
} }
result = hackrf_close(device); if (do_exit)
if( result != HACKRF_SUCCESS ) { printf("\nUser cancel, exiting...\n");
printf("hackrf_close() failed: %s (%d)\n", hackrf_error_name(result), result); else
return -1; printf("\nExiting...\n");
struct timeval t_end;
gettimeofday(&t_end, NULL);
const float time_diff = TimevalDiff(&t_end, &t_start);
printf("Total time: %5.5f s\n", time_diff);
if(device != NULL)
{
if( receive )
{
result = hackrf_stop_rx(device);
if( result != HACKRF_SUCCESS ) {
printf("hackrf_stop_rx() failed: %s (%d)\n", hackrf_error_name(result), result);
}else {
printf("hackrf_stop_rx() done\n");
}
}
if( transmit )
{
result = hackrf_stop_tx(device);
if( result != HACKRF_SUCCESS ) {
printf("hackrf_stop_tx() failed: %s (%d)\n", hackrf_error_name(result), result);
}else {
printf("hackrf_stop_tx() done\n");
}
}
result = hackrf_close(device);
if( result != HACKRF_SUCCESS )
{
printf("hackrf_close() failed: %s (%d)\n", hackrf_error_name(result), result);
}else {
printf("hackrf_close() done\n");
}
hackrf_exit();
printf("hackrf_exit() done\n");
} }
hackrf_exit();
if(fd != NULL) if(fd != NULL)
{ {
fclose(fd); fclose(fd);
fd = NULL;
printf("fclose(fd) done\n");
} }
printf("exit\n");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

7
host/libhackrf/src/hackrf.c
View File

@ -67,6 +67,8 @@ struct hackrf_device {
bool streaming; bool streaming;
}; };
volatile bool do_exit = false;
static const uint16_t hackrf_usb_vid = 0x1d50; static const uint16_t hackrf_usb_vid = 0x1d50;
static const uint16_t hackrf_usb_pid = 0x604b; static const uint16_t hackrf_usb_pid = 0x604b;
@ -221,6 +223,7 @@ int hackrf_open(hackrf_device** device) {
lib_device->transfer_count = 4; lib_device->transfer_count = 4;
lib_device->buffer_size = 262144; /* 1048576; */ lib_device->buffer_size = 262144; /* 1048576; */
lib_device->streaming = false; lib_device->streaming = false;
do_exit = false;
result = allocate_transfers(lib_device); result = allocate_transfers(lib_device);
if( result != 0 ) { if( result != 0 ) {
@ -659,7 +662,8 @@ static void* transfer_threadproc(void* arg) {
struct timeval timeout = { 0, 500000 }; struct timeval timeout = { 0, 500000 };
while( device->streaming ) { while( (device->streaming) && (do_exit == false) )
{
int error = libusb_handle_events_timeout(g_libusb_context, &timeout); int error = libusb_handle_events_timeout(g_libusb_context, &timeout);
if( error != 0 ) { if( error != 0 ) {
device->streaming = false; device->streaming = false;
@ -691,6 +695,7 @@ static void hackrf_libusb_transfer_callback(struct libusb_transfer* usb_transfer
static int kill_transfer_thread(hackrf_device* device) { static int kill_transfer_thread(hackrf_device* device) {
device->streaming = false; device->streaming = false;
do_exit = true;
if( device->transfer_thread_started != false ) { if( device->transfer_thread_started != false ) {
void* value = NULL; void* value = NULL;