diff options
author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-09-27 12:57:43 +0000 |
---|---|---|
committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2009-09-27 12:57:43 +0000 |
commit | ce253b3046826c28d09b9e57aa6d8b014c24d822 (patch) | |
tree | 88c765922e5cd8bb94ee036ec99b4b233fd4525e /xpp/astribank_usb.c | |
parent | 3d9bd0d3e77a9ea779a75722b652f4484a0b11a9 (diff) |
xpp: reduce the clutter of firmware loading
Make the new XPP tools much less verbose:
* demote messages to be debug
* Convert multi-line messages to be single-line messages
Making xpp_fxloader run in debug mode can be done by setting
DEBUG=yes
in /etc/dahdi/init.conf
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@7221 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'xpp/astribank_usb.c')
-rw-r--r-- | xpp/astribank_usb.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/xpp/astribank_usb.c b/xpp/astribank_usb.c index 088d360..63a46cb 100644 --- a/xpp/astribank_usb.c +++ b/xpp/astribank_usb.c @@ -262,7 +262,7 @@ static int astribank_init(struct astribank_device *astribank) return 0; if(get_usb_string(astribank, iface_desc->iInterface, astribank->iInterface, BUFSIZ) < 0) return 0; - INFO("ID=%04X:%04X Manufacturer=[%s] Product=[%s] SerialNumber=[%s] Interface=[%s]\n", + DBG("ID=%04X:%04X Manufacturer=[%s] Product=[%s] SerialNumber=[%s] Interface=[%s]\n", dev_desc->idVendor, dev_desc->idProduct, astribank->iManufacturer, @@ -332,11 +332,28 @@ found: */ void show_astribank_info(const struct astribank_device *astribank) { + struct usb_device_descriptor *dev_desc; + struct usb_device *dev; + assert(astribank != NULL); - printf("USB Firmware Type: [%s]\n", astribank->fwtype->name); - printf("USB iManufacturer: [%s]\n", astribank->iManufacturer); - printf("USB iProduct: [%s]\n", astribank->iProduct); - printf("USB iSerialNumber: [%s]\n", astribank->iSerialNumber); + dev = astribank->dev; + dev_desc = &dev->descriptor; + if(verbose <= LOG_INFO) { + INFO("usb:%s/%s: ID=%04X:%04X [%s / %s / %s]\n", + dev->bus->dirname, + dev->filename, + dev_desc->idVendor, + dev_desc->idProduct, + astribank->iManufacturer, + astribank->iProduct, + astribank->iSerialNumber); + } else { + printf("USB Bus/Device: [%s/%s]\n", dev->bus->dirname, dev->filename); + printf("USB Firmware Type: [%s]\n", astribank->fwtype->name); + printf("USB iManufacturer: [%s]\n", astribank->iManufacturer); + printf("USB iProduct: [%s]\n", astribank->iProduct); + printf("USB iSerialNumber: [%s]\n", astribank->iSerialNumber); + } } void astribank_close(struct astribank_device *astribank, int disconnected) |