BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prefixes for *_device_instance.

This commit is contained in:
Uwe Hermann 2011-01-30 16:44:26 +01:00
parent 5c2d46d1db
commit 6c29007211
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/link-mso19/link-mso19.c
View File

@ -436,7 +436,7 @@ static int hw_init(char *deviceinfo)
/* save a pointer to our private instance data */ /* save a pointer to our private instance data */
sdi->priv = mso; sdi->priv = mso;
sdi->serial = serial_device_instance_new(path, -1); sdi->serial = sr_serial_device_instance_new(path, -1);
if (!sdi->serial) if (!sdi->serial)
goto err_device_instance_free; goto err_device_instance_free;

4
hardware/openbench-logic-sniffer/ols.c
View File

@ -96,7 +96,7 @@ static struct samplerates samplerates = {
0, 0,
}; };
/* List of struct serial_device_instance */ /* List of struct sr_serial_device_instance */
static GSList *device_instances = NULL; static GSList *device_instances = NULL;
/* Current state of the flag register */ /* Current state of the flag register */
@ -295,7 +295,7 @@ static int hw_init(char *deviceinfo)
(final_devcnt, ST_INACTIVE, (final_devcnt, ST_INACTIVE,
"Openbench", "Logic Sniffer", "Openbench", "Logic Sniffer",
"v1.0"); "v1.0");
sdi->serial = serial_device_instance_new sdi->serial = sr_serial_device_instance_new
(device_names[i], -1); (device_names[i], -1);
device_instances = device_instances =
g_slist_append(device_instances, sdi); g_slist_append(device_instances, sdi);

4
hardware/saleae-logic/saleae-logic.c
View File

@ -335,11 +335,11 @@ static int hw_init(char *deviceinfo)
g_warning("firmware upload failed for " g_warning("firmware upload failed for "
"device %d", devcnt); "device %d", devcnt);
sdi->usb = usb_device_instance_new sdi->usb = sr_usb_device_instance_new
(libusb_get_bus_number(devlist[i]), 0, NULL); (libusb_get_bus_number(devlist[i]), 0, NULL);
} else { } else {
/* Already has the firmware, so fix the new address. */ /* Already has the firmware, so fix the new address. */
sdi->usb = usb_device_instance_new sdi->usb = sr_usb_device_instance_new
(libusb_get_bus_number(devlist[i]), (libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL); libusb_get_device_address(devlist[i]), NULL);
} }

2
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -312,7 +312,7 @@ static int hw_init(char *deviceinfo)
return 0; return 0;
device_instances = device_instances =
g_slist_append(device_instances, sdi); g_slist_append(device_instances, sdi);
sdi->usb = usb_device_instance_new( sdi->usb = sr_usb_device_instance_new(
libusb_get_bus_number(devlist[i]), libusb_get_bus_number(devlist[i]),
libusb_get_device_address(devlist[i]), NULL); libusb_get_device_address(devlist[i]), NULL);
devcnt++; devcnt++;

20
hwplugin.c
View File

@ -139,10 +139,10 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
{ {
switch (sdi->instance_type) { switch (sdi->instance_type) {
case USB_INSTANCE: case USB_INSTANCE:
usb_device_instance_free(sdi->usb); sr_usb_device_instance_free(sdi->usb);
break; break;
case SERIAL_INSTANCE: case SERIAL_INSTANCE:
serial_device_instance_free(sdi->serial); sr_serial_device_instance_free(sdi->serial);
break; break;
default: default:
/* No specific type, nothing extra to free. */ /* No specific type, nothing extra to free. */
@ -155,12 +155,12 @@ void sr_device_instance_free(struct sr_device_instance *sdi)
free(sdi); free(sdi);
} }
struct usb_device_instance *usb_device_instance_new(uint8_t bus, struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
uint8_t address, struct libusb_device_handle *hdl) uint8_t address, struct libusb_device_handle *hdl)
{ {
struct usb_device_instance *udi; struct sr_usb_device_instance *udi;
if (!(udi = malloc(sizeof(struct usb_device_instance)))) if (!(udi = malloc(sizeof(struct sr_usb_device_instance))))
return NULL; return NULL;
udi->bus = bus; udi->bus = bus;
@ -170,7 +170,7 @@ struct usb_device_instance *usb_device_instance_new(uint8_t bus,
return udi; return udi;
} }
void usb_device_instance_free(struct usb_device_instance *usb) void sr_usb_device_instance_free(struct sr_usb_device_instance *usb)
{ {
/* Avoid compiler warnings. */ /* Avoid compiler warnings. */
usb = usb; usb = usb;
@ -178,12 +178,12 @@ void usb_device_instance_free(struct usb_device_instance *usb)
/* Nothing to do for this device instance type. */ /* Nothing to do for this device instance type. */
} }
struct serial_device_instance *serial_device_instance_new( struct sr_serial_device_instance *sr_serial_device_instance_new(
const char *port, int fd) const char *port, int fd)
{ {
struct serial_device_instance *serial; struct sr_serial_device_instance *serial;
if (!(serial = malloc(sizeof(struct serial_device_instance)))) if (!(serial = malloc(sizeof(struct sr_serial_device_instance))))
return NULL; return NULL;
serial->port = strdup(port); serial->port = strdup(port);
@ -192,7 +192,7 @@ struct serial_device_instance *serial_device_instance_new(
return serial; return serial;
} }
void serial_device_instance_free(struct serial_device_instance *serial) void sr_serial_device_instance_free(struct sr_serial_device_instance *serial)
{ {
free(serial->port); free(serial->port);
} }

8
sigrok-proto.h
View File

@ -70,14 +70,14 @@ struct sr_device_instance *sr_get_device_instance(GSList *device_instances,
void sr_device_instance_free(struct sr_device_instance *sdi); void sr_device_instance_free(struct sr_device_instance *sdi);
/* USB-specific instances */ /* USB-specific instances */
struct usb_device_instance *usb_device_instance_new(uint8_t bus, struct sr_usb_device_instance *sr_usb_device_instance_new(uint8_t bus,
uint8_t address, struct libusb_device_handle *hdl); uint8_t address, struct libusb_device_handle *hdl);
void usb_device_instance_free(struct usb_device_instance *usb); void sr_usb_device_instance_free(struct sr_usb_device_instance *usb);
/* Serial-specific instances */ /* Serial-specific instances */
struct serial_device_instance *serial_device_instance_new( struct sr_serial_device_instance *sr_serial_device_instance_new(
const char *port, int fd); const char *port, int fd);
void serial_device_instance_free(struct serial_device_instance *serial); void sr_serial_device_instance_free(struct sr_serial_device_instance *serial);
int find_hwcap(int *capabilities, int hwcap); int find_hwcap(int *capabilities, int hwcap);
struct hwcap_option *find_hwcap_option(int hwcap); struct hwcap_option *find_hwcap_option(int hwcap);

8
sigrok.h
View File

@ -246,8 +246,8 @@ struct sr_device_instance {
char *version; char *version;
void *priv; void *priv;
union { union {
struct usb_device_instance *usb; struct sr_usb_device_instance *usb;
struct serial_device_instance *serial; struct sr_serial_device_instance *serial;
}; };
}; };
@ -257,13 +257,13 @@ enum {
SERIAL_INSTANCE, SERIAL_INSTANCE,
}; };
struct usb_device_instance { struct sr_usb_device_instance {
uint8_t bus; uint8_t bus;
uint8_t address; uint8_t address;
struct libusb_device_handle *devhdl; struct libusb_device_handle *devhdl;
}; };
struct serial_device_instance { struct sr_serial_device_instance {
char *port; char *port;
int fd; int fd;
}; };