FGCOM/dahdi-tools
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xtalk: Caller passes xusb_spec to xusb_find_iface()

Browse Source 
* This xusb_spec:
  - Is a dummy struct used for this xusb instance only.
  - Is now passed by reference from caller.
  - So caller now manage the life cycle of this struct
* Also, demote one INFO() to DBG() (library should not print
  on its own)
* Also minor fix to DBG() output of spec initialization (leading 0)

Signed-off-by: Oron Peled <oron.peled@xorcom.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>

Origin: Xorcom xtalk (r9303)

git-svn-id: http://svn.astersk.org/svn/dahdi/tools/trunk@10711 17933a7a-c749-41c5-a318-cba88f637d49
This commit is contained in:
Oron Peled 2012-09-20 13:40:40 +00:00 committed by Tzafrir Cohen
parent 99ebb2a94c
commit ec71fef275
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xpp/xtalk/xusb.c
View File

@ -67,7 +67,7 @@ void xusb_init_spec(struct xusb_spec *spec, char *name,
uint16_t vendor_id, uint16_t product_id, uint16_t vendor_id, uint16_t product_id,
int nifaces, int iface, int nep, int ep_out, int ep_in) int nifaces, int iface, int nep, int ep_out, int ep_in)
{ {
DBG("Initialize %s: interfaces=%d using interface num=%d endpoints=%d (OUT=0x%2X, IN=0x%2X)\n", DBG("Initialize %s: interfaces=%d using interface num=%d endpoints=%d (OUT=0x%02X, IN=0x%02X)\n",
name, nifaces, iface, nep, ep_out, ep_in); name, nifaces, iface, nep, ep_out, ep_in);
memset(spec, 0, sizeof(*spec)); memset(spec, 0, sizeof(*spec));
spec->name = name; spec->name = name;
@ -365,7 +365,11 @@ fail:
return NULL; return NULL;
} }
struct xusb *xusb_find_iface(const char *devpath, int iface_num, int ep_out, int ep_in) struct xusb *xusb_find_iface(const char *devpath,
int iface_num,
int ep_out,
int ep_in,
struct xusb_spec *dummy_spec)
{ {
struct usb_bus *bus; struct usb_bus *bus;
@ -387,7 +391,6 @@ struct xusb *xusb_find_iface(const char *devpath, int iface_num, int ep_out, int
struct usb_device_descriptor *dev_desc; struct usb_device_descriptor *dev_desc;
struct usb_config_descriptor *config_desc; struct usb_config_descriptor *config_desc;
struct usb_interface *interface; struct usb_interface *interface;
struct xusb_spec spec;
struct xusb *xusb; struct xusb *xusb;
int device_num; int device_num;
@ -402,14 +405,15 @@ struct xusb *xusb_find_iface(const char *devpath, int iface_num, int ep_out, int
assert(config_desc); assert(config_desc);
interface = config_desc->interface; interface = config_desc->interface;
assert(interface); assert(interface);
INFO("Matched device %s: %X:%X\n", tmppath, dev_desc->idVendor, dev_desc->idProduct); DBG("Matched device %s: %X:%X\n", tmppath, dev_desc->idVendor, dev_desc->idProduct);
xusb_init_spec(&spec, "Astribank", assert(dummy_spec);
xusb_init_spec(dummy_spec, "<none>",
dev_desc->idVendor, dev_desc->idProduct, dev_desc->idVendor, dev_desc->idProduct,
config_desc->bNumInterfaces, config_desc->bNumInterfaces,
iface_num, iface_num,
interface->altsetting->bNumEndpoints, interface->altsetting->bNumEndpoints,
ep_out, ep_in); ep_out, ep_in);
if((xusb = xusb_new(dev, &spec)) == NULL) { if((xusb = xusb_new(dev, dummy_spec)) == NULL) {
ERR("xusb allocation failed\n"); ERR("xusb allocation failed\n");
} }
return xusb; return xusb;

2
xpp/xtalk/xusb.h
View File

@ -67,7 +67,7 @@ typedef int (*xusb_filter_t)(const struct xusb *xusb, void *data);
struct xlist_node *xusb_find_byproduct(const struct xusb_spec *specs, int numspecs, xusb_filter_t filterfunc, void *data); struct xlist_node *xusb_find_byproduct(const struct xusb_spec *specs, int numspecs, xusb_filter_t filterfunc, void *data);
struct xusb *xusb_find_bypath(const struct xusb_spec *specs, int numspecs, const char *path); struct xusb *xusb_find_bypath(const struct xusb_spec *specs, int numspecs, const char *path);
struct xusb *xusb_open_one(const struct xusb_spec *specs, int numspecs, xusb_filter_t filterfunc, void *data); struct xusb *xusb_open_one(const struct xusb_spec *specs, int numspecs, xusb_filter_t filterfunc, void *data);
struct xusb *xusb_find_iface(const char *devpath, int iface_num, int ep_out, int ep_in); struct xusb *xusb_find_iface(const char *devpath, int iface_num, int ep_out, int ep_in, struct xusb_spec *dummy);
/* /*
* A convenience filter * A convenience filter