diff options
author | Benoit Goby <benoit@android.com> | 2011-06-24 17:54:19 -0700 |
---|---|---|
committer | Benoit Goby <benoit@android.com> | 2011-07-12 12:38:46 -0700 |
commit | 7e6067e36cb311b31ef2c436287282270a6accbf (patch) | |
tree | 47c0f2decbcd387b34a4dbd10250ff19ecb22481 /ui.c | |
parent | 933487868f15f3f380efd71dcd0b7c3b744a73d6 (diff) | |
download | bootable_recovery-7e6067e36cb311b31ef2c436287282270a6accbf.zip bootable_recovery-7e6067e36cb311b31ef2c436287282270a6accbf.tar.gz bootable_recovery-7e6067e36cb311b31ef2c436287282270a6accbf.tar.bz2 |
Update usb_connected() to support new gadget driver
Change-Id: Iabe8be5bbfa7d2bf1d13280c8734ff75b62a152f
Diffstat (limited to 'ui.c')
-rw-r--r-- | ui.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -592,17 +592,18 @@ void ui_show_text(int visible) // Return true if USB is connected. static int usb_connected() { - int fd = open("/sys/class/switch/usb_connected/state", O_RDONLY); + int fd = open("/sys/class/android_usb/android0/state", O_RDONLY); if (fd < 0) { - printf("failed to open /sys/class/switch/usb_connected/state: %s\n", + printf("failed to open /sys/class/android_usb/android0/state: %s\n", strerror(errno)); return 0; } char buf; - int connected = (read(fd, &buf, 1) == 1) && (buf == '1'); + /* USB is connected if android_usb state is CONNECTED or CONFIGURED */ + int connected = (read(fd, &buf, 1) == 1) && (buf == 'C'); if (close(fd) < 0) { - printf("failed to close /sys/class/switch/usb_connected/state: %s\n", + printf("failed to close /sys/class/android_usb/android0/state: %s\n", strerror(errno)); } return connected; |