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

Commit e15af098 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

libusbhost: Use logcat for debugging when building device library. 



Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 7570ab61

libusbhost/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := libusbhost

LOCAL_SRC_FILES := usbhost.c



LOCAL_CFLAGS := -g -DUSE_LIBLOG



include $(BUILD_STATIC_LIBRARY)

libusbhost/usbhost.c

+18 −6
Original line number Diff line number Diff line
@@ -14,6 +14,21 @@ 
 * limitations under the License.

 */



// #define DEBUG 1

#if DEBUG



#ifdef USE_LIBLOG

#define LOG_TAG "usbhost"

#include "utils/Log.h"

#define D LOGD

#else

#define D printf

#endif



#else

#define D(...)

#endif



#include <stdio.h>

#include <stdlib.h>

#include <unistd.h>
@@ -43,11 +58,6 @@ 
#define USB_FS_DIR "/dev/bus/usb"

#define USB_FS_ID_SCANNER   "/dev/bus/usb/%d/%d"



#if 0

#define D printf

#else

#define D(...)

#endif



struct usb_host_context {

    usb_device_added_cb     added_cb;
@@ -208,7 +218,8 @@ retry: 
    if (fd < 0) {

        /* if we fail, see if have read-only access */

        fd = open(dev_name, O_RDONLY);

        if (fd < 0 && errno == EACCES && !did_retry) {

        D("usb_device_open open returned %d errno %d\n", fd, errno);

        if (fd < 0 && (errno == EACCES || errno == ENOENT) && !did_retry) {

            /* work around race condition between inotify and permissions management */

            sleep(1);

            did_retry = 1;
@@ -221,6 +232,7 @@ retry: 
    }



    length = read(fd, device->desc, sizeof(device->desc));

    D("usb_device_open read returned %d errno %d\n", fd, errno);

    if (length < 0)

        goto fail;