Whitespace and consistency fixes.
Also, drop a <poll.h> #include. It's unused anyway, and breaks the build on MinGW/Windows as there is no poll.h there.
This commit is contained in:
parent
9ab95e5408
commit
17e1afcb81
|
@ -65,7 +65,7 @@ void datastore_put(struct datastore *ds, void *data, unsigned int length,
|
||||||
int capacity, size, num_chunks, chunk_bytes_free, chunk_offset;
|
int capacity, size, num_chunks, chunk_bytes_free, chunk_offset;
|
||||||
gpointer chunk;
|
gpointer chunk;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
in_unitsize = in_unitsize;
|
in_unitsize = in_unitsize;
|
||||||
probelist = probelist;
|
probelist = probelist;
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id);
|
||||||
|
|
||||||
static int hw_init(char *deviceinfo)
|
static int hw_init(char *deviceinfo)
|
||||||
{
|
{
|
||||||
/* Avoid compiler warning. */
|
/* Avoid compiler warnings. */
|
||||||
deviceinfo = deviceinfo;
|
deviceinfo = deviceinfo;
|
||||||
|
|
||||||
struct sigrok_device_instance *sdi;
|
struct sigrok_device_instance *sdi;
|
||||||
|
@ -114,7 +114,7 @@ static int hw_init(char *deviceinfo)
|
||||||
|
|
||||||
static int hw_opendev(int device_index)
|
static int hw_opendev(int device_index)
|
||||||
{
|
{
|
||||||
/* Avoid compiler warning. */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
/* Nothing needed so far. */
|
/* Nothing needed so far. */
|
||||||
|
@ -123,7 +123,7 @@ static int hw_opendev(int device_index)
|
||||||
|
|
||||||
static void hw_closedev(int device_index)
|
static void hw_closedev(int device_index)
|
||||||
{
|
{
|
||||||
/* Avoid compiler warning. */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
/* Nothing needed so far. */
|
/* Nothing needed so far. */
|
||||||
|
@ -165,7 +165,7 @@ static void *hw_get_device_info(int device_index, int device_info_id)
|
||||||
|
|
||||||
static int hw_get_status(int device_index)
|
static int hw_get_status(int device_index)
|
||||||
{
|
{
|
||||||
/* Avoid compiler warning. */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
return 0; /* FIXME */
|
return 0; /* FIXME */
|
||||||
|
@ -181,7 +181,7 @@ static int hw_set_configuration(int device_index, int capability, void *value)
|
||||||
int ret;
|
int ret;
|
||||||
uint64_t *tmp_u64;
|
uint64_t *tmp_u64;
|
||||||
|
|
||||||
/* Avoid compiler warning. */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
if (capability == HWCAP_SAMPLERATE) {
|
if (capability == HWCAP_SAMPLERATE) {
|
||||||
|
@ -337,7 +337,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
|
||||||
{
|
{
|
||||||
struct datafeed_packet packet;
|
struct datafeed_packet packet;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
/* Send last packet. */
|
/* Send last packet. */
|
||||||
|
|
|
@ -777,7 +777,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
|
||||||
{
|
{
|
||||||
struct datafeed_packet packet;
|
struct datafeed_packet packet;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
packet.type = DF_END;
|
packet.type = DF_END;
|
||||||
|
|
|
@ -297,7 +297,7 @@ static int hw_init(char *deviceinfo)
|
||||||
libusb_device **devlist;
|
libusb_device **devlist;
|
||||||
int err, devcnt, i;
|
int err, devcnt, i;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
deviceinfo = deviceinfo;
|
deviceinfo = deviceinfo;
|
||||||
|
|
||||||
if (libusb_init(&usb_context) != 0) {
|
if (libusb_init(&usb_context) != 0) {
|
||||||
|
@ -525,7 +525,7 @@ static int receive_data(int fd, int revents, void *user_data)
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
fd = fd;
|
fd = fd;
|
||||||
revents = revents;
|
revents = revents;
|
||||||
user_data = user_data;
|
user_data = user_data;
|
||||||
|
@ -728,7 +728,7 @@ static void hw_stop_acquisition(int device_index, gpointer session_device_id)
|
||||||
{
|
{
|
||||||
struct datafeed_packet packet;
|
struct datafeed_packet packet;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
device_index = device_index;
|
device_index = device_index;
|
||||||
|
|
||||||
packet.type = DF_END;
|
packet.type = DF_END;
|
||||||
|
|
|
@ -280,7 +280,7 @@ static int hw_init(char *deviceinfo)
|
||||||
libusb_device **devlist;
|
libusb_device **devlist;
|
||||||
int err, devcnt, i;
|
int err, devcnt, i;
|
||||||
|
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
deviceinfo = deviceinfo;
|
deviceinfo = deviceinfo;
|
||||||
|
|
||||||
if (libusb_init(&usb_context) != 0) {
|
if (libusb_init(&usb_context) != 0) {
|
||||||
|
|
|
@ -167,7 +167,7 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
|
||||||
|
|
||||||
void usb_device_instance_free(struct usb_device_instance *usb)
|
void usb_device_instance_free(struct usb_device_instance *usb)
|
||||||
{
|
{
|
||||||
/* QUICK HACK */
|
/* Avoid compiler warnings. */
|
||||||
usb = usb;
|
usb = usb;
|
||||||
|
|
||||||
/* Nothing to do for this device instance type. */
|
/* Nothing to do for this device instance type. */
|
||||||
|
|
|
@ -31,12 +31,12 @@ struct session *session_load(const char *filename)
|
||||||
{
|
{
|
||||||
struct session *session;
|
struct session *session;
|
||||||
|
|
||||||
|
/* Avoid compiler warnings. */
|
||||||
|
filename = filename;
|
||||||
|
|
||||||
/* TODO: Implement. */
|
/* TODO: Implement. */
|
||||||
session = NULL;
|
session = NULL;
|
||||||
|
|
||||||
/* QUICK HACK */
|
|
||||||
filename = filename;
|
|
||||||
|
|
||||||
return session;
|
return session;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue