Skip to content

Commit

Permalink
remove unused parameters and fix code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
dernasherbrezon committed Jan 7, 2025
1 parent 7939463 commit 479b23d
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions src/dsp_worker.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "api.h"
#include "lpf.h"

static int write_to_file(dsp_worker *config, float complex *filter_output, size_t filter_output_len) {
static int write_to_file(dsp_worker *config, const float complex *filter_output, size_t filter_output_len) {
size_t n_written;
if (config->file != NULL) {
n_written = fwrite(filter_output, sizeof(float complex), filter_output_len, config->file);
Expand All @@ -25,7 +25,7 @@ static int write_to_file(dsp_worker *config, float complex *filter_output, size_
}
}

static int write_to_socket(int client_socket, float complex *filter_output, size_t filter_output_len) {
static int write_to_socket(int client_socket, const float complex *filter_output, size_t filter_output_len) {
size_t total_len = filter_output_len * sizeof(float complex);
size_t left = total_len;
while (left > 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/sdr/airspy_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct airspy_device_t {
airspy_lib *lib;
};

int airspy_device_create(uint32_t id, struct server_config *server_config, airspy_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin) {
int airspy_device_create(struct server_config *server_config, airspy_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin) {
struct airspy_device_t *device = malloc(sizeof(struct airspy_device_t));
if (device == NULL) {
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion src/sdr/airspy_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../config.h"
#include "airspy_lib.h"

int airspy_device_create(uint32_t id, struct server_config *server_config, airspy_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin);
int airspy_device_create(struct server_config *server_config, airspy_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin);

void airspy_device_destroy(void *plugin);

Expand Down
8 changes: 6 additions & 2 deletions src/sdr/hackrf_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@ typedef struct {
hackrf_lib *lib;
} hackrf_wrapper;

int hackrf_device_create(uint32_t id, struct server_config *server_config, hackrf_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin) {
int hackrf_device_create(struct server_config *server_config, hackrf_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin) {
int code = lib->hackrf_init();
if (code != 0) {
fprintf(stderr, "<3>unable to initialize hackrf library: %s (%d)\n", lib->hackrf_error_name(code), code);
return code;
}
hackrf_wrapper *wrapper = malloc(sizeof(hackrf_wrapper));
if (wrapper == NULL) {
return -ENOMEM;
Expand All @@ -34,7 +39,6 @@ int hackrf_device_create(uint32_t id, struct server_config *server_config, hackr
wrapper->sdr_callback = sdr_callback;
wrapper->ctx = ctx;
wrapper->server_config = server_config;
ERROR_CHECK(lib->hackrf_init(), "<3>unable to initialize hackrf library");
fprintf(stdout, "hackrf device created\n");
*plugin = wrapper;
return 0;
Expand Down
2 changes: 1 addition & 1 deletion src/sdr/hackrf_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "../config.h"
#include "hackrf_lib.h"

int hackrf_device_create(uint32_t id, struct server_config *server_config, hackrf_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin);
int hackrf_device_create(struct server_config *server_config, hackrf_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin);

void hackrf_device_destroy(void *plugin);

Expand Down
2 changes: 1 addition & 1 deletion src/sdr/rtlsdr_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ int find_nearest_gain(struct rtlsdr_device_t *dev, int target_gain, int *nearest
return 0;
}

int rtlsdr_device_create(uint32_t id, struct server_config *server_config, rtlsdr_lib *lib, void (*rtlsdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin) {
int rtlsdr_device_create(struct server_config *server_config, rtlsdr_lib *lib, void (*rtlsdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin) {
struct rtlsdr_device_t *device = malloc(sizeof(struct rtlsdr_device_t));
if (device == NULL) {
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion src/sdr/rtlsdr_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "rtlsdr_lib.h"
#include "../config.h"

int rtlsdr_device_create(uint32_t id, struct server_config *server_config, rtlsdr_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin);
int rtlsdr_device_create(struct server_config *server_config, rtlsdr_lib *lib, void (*sdr_callback)(uint8_t *buf, uint32_t len, void *ctx), void *ctx, void **plugin);

void rtlsdr_device_destroy(void *plugin);

Expand Down
6 changes: 3 additions & 3 deletions src/sdr_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ int sdr_device_start(client_config *config, sdr_device *device) {
int code = -1;
switch (config->sdr_type) {
case SDR_TYPE_RTL: {
code = rtlsdr_device_create(1, device->server_config, device->rtllib, device->sdr_callback, device->ctx, &device->plugin);
code = rtlsdr_device_create(device->server_config, device->rtllib, device->sdr_callback, device->ctx, &device->plugin);
break;
}
case SDR_TYPE_AIRSPY: {
code = airspy_device_create(1, device->server_config, device->airspy, device->sdr_callback, device->ctx, &device->plugin);
code = airspy_device_create(device->server_config, device->airspy, device->sdr_callback, device->ctx, &device->plugin);
break;
}
case SDR_TYPE_HACKRF: {
code = hackrf_device_create(1, device->server_config, device->hackrf, device->sdr_callback, device->ctx, &device->plugin);
code = hackrf_device_create(device->server_config, device->hackrf, device->sdr_callback, device->ctx, &device->plugin);
break;
}
default: {
Expand Down

0 comments on commit 479b23d

Please sign in to comment.