Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 67ebdce9 authored by Erik Gilling's avatar Erik Gilling Committed by Android (Google) Code Review
Browse files

Merge changes I4dcadf8e,I166d2859 

* changes:
  libusbhost: add usb chapter 9 include to usbhost.h
  toolbox: add lsusb command
parents 8d758271 3af05b09

include/usbhost/usbhost.h

+7 −0
Original line number Diff line number Diff line
@@ -23,6 +23,13 @@ extern "C" { 


#include <stdint.h>



#include <linux/version.h>

#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 20)

#include <linux/usb/ch9.h>

#else

#include <linux/usb_ch9.h>

#endif



struct usb_host_context;

struct usb_endpoint_descriptor;

toolbox/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ LOCAL_SRC_FILES:= \ 


LOCAL_SHARED_LIBRARIES := libcutils libc



# Needed for lsusb.  Should optimize out in linker if lsusb is not included

LOCAL_STATIC_LIBRARIES := libusbhost



LOCAL_MODULE:= toolbox



# Including this will define $(intermediates).

toolbox/lsusb.c

0 → 100644
+84 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <errno.h>

#include <stdio.h>

#include <stdint.h>

#include <string.h>



#include <usbhost/usbhost.h>



static int lsusb_device_added(const char *dev_name, void *client_data)

{

    struct usb_device *dev = usb_device_open(dev_name);

    uint16_t vid, pid;

    char *mfg_name, *product_name, *serial;



    if (!dev) {

        fprintf(stderr, "can't open device %s: %s\n", dev_name, strerror(errno));

        return 0;

    }



    vid = usb_device_get_vendor_id(dev);

    pid = usb_device_get_product_id(dev);

    mfg_name = usb_device_get_manufacturer_name(dev);

    product_name = usb_device_get_product_name(dev);

    serial = usb_device_get_serial(dev);



    printf("%s: %04x:%04x %s %s %s\n", dev_name, vid, pid,

           mfg_name, product_name, serial);



    free(mfg_name);

    free(product_name);

    free(serial);



    usb_device_close(dev);



    return 0;

}



static int lsusb_device_removed(const char *dev_name, void *client_data)

{

    return 0;

}





static int lsusb_discovery_done(void *client_data)

{

    return 1;

}







int lsusb_main(int argc, char **argv)

{

    struct usb_host_context *ctx = usb_host_init();

    if (!ctx) {

        perror("usb_host_init:");

        return 1;

    }



    usb_host_run(ctx,

                 lsusb_device_added,

                 lsusb_device_removed,

                 lsusb_discovery_done,

                 NULL);



    usb_host_cleanup(ctx);



    return 0;

}