| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 1 | /* | 
|  | 2 | * Copyright (C) 2010 The Android Open Source Project | 
|  | 3 | * | 
|  | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 
|  | 5 | * you may not use this file except in compliance with the License. | 
|  | 6 | * You may obtain a copy of the License at | 
|  | 7 | * | 
|  | 8 | *      http://www.apache.org/licenses/LICENSE-2.0 | 
|  | 9 | * | 
|  | 10 | * Unless required by applicable law or agreed to in writing, software | 
|  | 11 | * distributed under the License is distributed on an "AS IS" BASIS, | 
|  | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 
|  | 13 | * See the License for the specific language governing permissions and | 
|  | 14 | * limitations under the License. | 
|  | 15 | */ | 
|  | 16 |  | 
| Mike Lockwood | e15af09 | 2010-06-10 10:20:49 -0400 | [diff] [blame] | 17 | // #define DEBUG 1 | 
|  | 18 | #if DEBUG | 
|  | 19 |  | 
|  | 20 | #ifdef USE_LIBLOG | 
|  | 21 | #define LOG_TAG "usbhost" | 
|  | 22 | #include "utils/Log.h" | 
| Steve Block | 8d66c49 | 2011-12-20 16:07:45 +0000 | [diff] [blame] | 23 | #define D ALOGD | 
| Mike Lockwood | e15af09 | 2010-06-10 10:20:49 -0400 | [diff] [blame] | 24 | #else | 
|  | 25 | #define D printf | 
|  | 26 | #endif | 
|  | 27 |  | 
|  | 28 | #else | 
|  | 29 | #define D(...) | 
|  | 30 | #endif | 
|  | 31 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 32 | #include <stdio.h> | 
|  | 33 | #include <stdlib.h> | 
|  | 34 | #include <unistd.h> | 
|  | 35 | #include <string.h> | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 36 | #include <stddef.h> | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 37 |  | 
|  | 38 | #include <sys/ioctl.h> | 
|  | 39 | #include <sys/types.h> | 
|  | 40 | #include <sys/time.h> | 
|  | 41 | #include <sys/inotify.h> | 
|  | 42 | #include <dirent.h> | 
|  | 43 | #include <fcntl.h> | 
|  | 44 | #include <errno.h> | 
|  | 45 | #include <ctype.h> | 
|  | 46 | #include <pthread.h> | 
|  | 47 |  | 
|  | 48 | #include <linux/usbdevice_fs.h> | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 49 | #include <asm/byteorder.h> | 
|  | 50 |  | 
|  | 51 | #include "usbhost/usbhost.h" | 
|  | 52 |  | 
| Benoit Goby | f4de078 | 2012-08-01 18:54:02 -0700 | [diff] [blame] | 53 | #define DEV_DIR             "/dev" | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 54 | #define USB_FS_DIR          DEV_DIR "/bus/usb" | 
|  | 55 | #define USB_FS_ID_SCANNER   USB_FS_DIR "/%d/%d" | 
|  | 56 | #define USB_FS_ID_FORMAT    USB_FS_DIR "/%03d/%03d" | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 57 |  | 
| Mike Lockwood | c4c00d8 | 2011-03-12 12:25:11 -0500 | [diff] [blame] | 58 | // From drivers/usb/core/devio.c | 
|  | 59 | // I don't know why this isn't in a kernel header | 
|  | 60 | #define MAX_USBFS_BUFFER_SIZE   16384 | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 61 |  | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 62 | #define MAX_USBFS_WD_COUNT      10 | 
|  | 63 |  | 
| Mike Lockwood | 6ac3aa1 | 2010-05-25 08:10:02 -0400 | [diff] [blame] | 64 | struct usb_host_context { | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 65 | int                         fd; | 
|  | 66 | usb_device_added_cb         cb_added; | 
|  | 67 | usb_device_removed_cb       cb_removed; | 
|  | 68 | void                        *data; | 
|  | 69 | int                         wds[MAX_USBFS_WD_COUNT]; | 
|  | 70 | int                         wdd; | 
| Mike Lockwood | 6ac3aa1 | 2010-05-25 08:10:02 -0400 | [diff] [blame] | 71 | }; | 
|  | 72 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 73 | struct usb_device { | 
|  | 74 | char dev_name[64]; | 
| Mike Lockwood | ec9e7b1 | 2011-01-22 09:17:07 -0800 | [diff] [blame] | 75 | unsigned char desc[4096]; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 76 | int desc_length; | 
|  | 77 | int fd; | 
|  | 78 | int writeable; | 
|  | 79 | }; | 
|  | 80 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 81 | static inline int badname(const char *name) | 
|  | 82 | { | 
|  | 83 | while(*name) { | 
|  | 84 | if(!isdigit(*name++)) return 1; | 
|  | 85 | } | 
|  | 86 | return 0; | 
|  | 87 | } | 
|  | 88 |  | 
| Benoit Goby | 6cc883c | 2012-07-31 19:22:06 -0700 | [diff] [blame] | 89 | static int find_existing_devices_bus(char *busname, | 
|  | 90 | usb_device_added_cb added_cb, | 
|  | 91 | void *client_data) | 
|  | 92 | { | 
|  | 93 | char devname[32]; | 
|  | 94 | DIR *devdir; | 
|  | 95 | struct dirent *de; | 
|  | 96 | int done = 0; | 
|  | 97 |  | 
|  | 98 | devdir = opendir(busname); | 
|  | 99 | if(devdir == 0) return 0; | 
|  | 100 |  | 
|  | 101 | while ((de = readdir(devdir)) && !done) { | 
|  | 102 | if(badname(de->d_name)) continue; | 
|  | 103 |  | 
|  | 104 | snprintf(devname, sizeof(devname), "%s/%s", busname, de->d_name); | 
|  | 105 | done = added_cb(devname, client_data); | 
|  | 106 | } // end of devdir while | 
|  | 107 | closedir(devdir); | 
|  | 108 |  | 
|  | 109 | return done; | 
|  | 110 | } | 
|  | 111 |  | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 112 | /* returns true if one of the callbacks indicates we are done */ | 
|  | 113 | static int find_existing_devices(usb_device_added_cb added_cb, | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 114 | void *client_data) | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 115 | { | 
| Benoit Goby | 6cc883c | 2012-07-31 19:22:06 -0700 | [diff] [blame] | 116 | char busname[32]; | 
|  | 117 | DIR *busdir; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 118 | struct dirent *de; | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 119 | int done = 0; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 120 |  | 
|  | 121 | busdir = opendir(USB_FS_DIR); | 
| Benoit Goby | f4de078 | 2012-08-01 18:54:02 -0700 | [diff] [blame] | 122 | if(busdir == 0) return 0; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 123 |  | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 124 | while ((de = readdir(busdir)) != 0 && !done) { | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 125 | if(badname(de->d_name)) continue; | 
|  | 126 |  | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 127 | snprintf(busname, sizeof(busname), USB_FS_DIR "/%s", de->d_name); | 
| Benoit Goby | 6cc883c | 2012-07-31 19:22:06 -0700 | [diff] [blame] | 128 | done = find_existing_devices_bus(busname, added_cb, | 
|  | 129 | client_data); | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 130 | } //end of busdir while | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 131 | closedir(busdir); | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 132 |  | 
|  | 133 | return done; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 134 | } | 
|  | 135 |  | 
| Benoit Goby | f4de078 | 2012-08-01 18:54:02 -0700 | [diff] [blame] | 136 | static void watch_existing_subdirs(struct usb_host_context *context, | 
|  | 137 | int *wds, int wd_count) | 
|  | 138 | { | 
|  | 139 | char path[100]; | 
|  | 140 | int i, ret; | 
|  | 141 |  | 
|  | 142 | wds[0] = inotify_add_watch(context->fd, USB_FS_DIR, IN_CREATE | IN_DELETE); | 
|  | 143 | if (wds[0] < 0) | 
|  | 144 | return; | 
|  | 145 |  | 
|  | 146 | /* watch existing subdirectories of USB_FS_DIR */ | 
|  | 147 | for (i = 1; i < wd_count; i++) { | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 148 | snprintf(path, sizeof(path), USB_FS_DIR "/%03d", i); | 
| Benoit Goby | f4de078 | 2012-08-01 18:54:02 -0700 | [diff] [blame] | 149 | ret = inotify_add_watch(context->fd, path, IN_CREATE | IN_DELETE); | 
|  | 150 | if (ret >= 0) | 
|  | 151 | wds[i] = ret; | 
|  | 152 | } | 
|  | 153 | } | 
|  | 154 |  | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 155 | struct usb_host_context *usb_host_init() | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 156 | { | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 157 | struct usb_host_context *context = calloc(1, sizeof(struct usb_host_context)); | 
|  | 158 | if (!context) { | 
|  | 159 | fprintf(stderr, "out of memory in usb_host_context\n"); | 
|  | 160 | return NULL; | 
|  | 161 | } | 
|  | 162 | context->fd = inotify_init(); | 
|  | 163 | if (context->fd < 0) { | 
|  | 164 | fprintf(stderr, "inotify_init failed\n"); | 
|  | 165 | free(context); | 
|  | 166 | return NULL; | 
|  | 167 | } | 
|  | 168 | return context; | 
|  | 169 | } | 
|  | 170 |  | 
|  | 171 | void usb_host_cleanup(struct usb_host_context *context) | 
|  | 172 | { | 
|  | 173 | close(context->fd); | 
|  | 174 | free(context); | 
|  | 175 | } | 
|  | 176 |  | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 177 | int usb_host_get_fd(struct usb_host_context *context) | 
|  | 178 | { | 
|  | 179 | return context->fd; | 
|  | 180 | } /* usb_host_get_fd() */ | 
|  | 181 |  | 
|  | 182 | int usb_host_load(struct usb_host_context *context, | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 183 | usb_device_added_cb added_cb, | 
|  | 184 | usb_device_removed_cb removed_cb, | 
| Mike Lockwood | a805519 | 2010-07-19 20:15:15 -0400 | [diff] [blame] | 185 | usb_discovery_done_cb discovery_done_cb, | 
| Mike Lockwood | 7a96ba4 | 2010-07-01 11:33:41 -0400 | [diff] [blame] | 186 | void *client_data) | 
|  | 187 | { | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 188 | int done = 0; | 
|  | 189 | int i; | 
|  | 190 |  | 
|  | 191 | context->cb_added = added_cb; | 
|  | 192 | context->cb_removed = removed_cb; | 
|  | 193 | context->data = client_data; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 194 |  | 
|  | 195 | D("Created device discovery thread\n"); | 
|  | 196 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 197 | /* watch for files added and deleted within USB_FS_DIR */ | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 198 | for (i = 0; i < MAX_USBFS_WD_COUNT; i++) | 
|  | 199 | context->wds[i] = -1; | 
| Benoit Goby | f4de078 | 2012-08-01 18:54:02 -0700 | [diff] [blame] | 200 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 201 | /* watch the root for new subdirectories */ | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 202 | context->wdd = inotify_add_watch(context->fd, DEV_DIR, IN_CREATE | IN_DELETE); | 
|  | 203 | if (context->wdd < 0) { | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 204 | fprintf(stderr, "inotify_add_watch failed\n"); | 
| Mike Lockwood | e8849d1 | 2010-07-20 16:31:42 -0400 | [diff] [blame] | 205 | if (discovery_done_cb) | 
|  | 206 | discovery_done_cb(client_data); | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 207 | return done; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 208 | } | 
|  | 209 |  | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 210 | watch_existing_subdirs(context, context->wds, MAX_USBFS_WD_COUNT); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 211 |  | 
|  | 212 | /* check for existing devices first, after we have inotify set up */ | 
| Benoit Goby | 6cc883c | 2012-07-31 19:22:06 -0700 | [diff] [blame] | 213 | done = find_existing_devices(added_cb, client_data); | 
| Mike Lockwood | a805519 | 2010-07-19 20:15:15 -0400 | [diff] [blame] | 214 | if (discovery_done_cb) | 
|  | 215 | done |= discovery_done_cb(client_data); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 216 |  | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 217 | return done; | 
|  | 218 | } /* usb_host_load() */ | 
|  | 219 |  | 
|  | 220 | int usb_host_read_event(struct usb_host_context *context) | 
|  | 221 | { | 
|  | 222 | struct inotify_event* event; | 
|  | 223 | char event_buf[512]; | 
|  | 224 | char path[100]; | 
|  | 225 | int i, ret, done = 0; | 
|  | 226 | int j, event_size; | 
|  | 227 | int wd; | 
|  | 228 |  | 
|  | 229 | ret = read(context->fd, event_buf, sizeof(event_buf)); | 
|  | 230 | if (ret >= (int)sizeof(struct inotify_event)) { | 
|  | 231 | event = (struct inotify_event *)event_buf; | 
|  | 232 | wd = event->wd; | 
|  | 233 | if (wd == context->wdd) { | 
|  | 234 | if ((event->mask & IN_CREATE) && !strcmp(event->name, "bus")) { | 
|  | 235 | watch_existing_subdirs(context, context->wds, MAX_USBFS_WD_COUNT); | 
|  | 236 | done = find_existing_devices(context->cb_added, context->data); | 
|  | 237 | } else if ((event->mask & IN_DELETE) && !strcmp(event->name, "bus")) { | 
|  | 238 | for (i = 0; i < MAX_USBFS_WD_COUNT; i++) { | 
|  | 239 | if (context->wds[i] >= 0) { | 
|  | 240 | inotify_rm_watch(context->fd, context->wds[i]); | 
|  | 241 | context->wds[i] = -1; | 
| Benoit Goby | f4de078 | 2012-08-01 18:54:02 -0700 | [diff] [blame] | 242 | } | 
|  | 243 | } | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 244 | } | 
|  | 245 | } else if (wd == context->wds[0]) { | 
|  | 246 | i = atoi(event->name); | 
|  | 247 | snprintf(path, sizeof(path), USB_FS_DIR "/%s", event->name); | 
|  | 248 | D("%s subdirectory %s: index: %d\n", (event->mask & IN_CREATE) ? | 
|  | 249 | "new" : "gone", path, i); | 
|  | 250 | if (i > 0 && i < MAX_USBFS_WD_COUNT) { | 
|  | 251 | if (event->mask & IN_CREATE) { | 
|  | 252 | ret = inotify_add_watch(context->fd, path, | 
|  | 253 | IN_CREATE | IN_DELETE); | 
|  | 254 | if (ret >= 0) | 
|  | 255 | context->wds[i] = ret; | 
|  | 256 | done = find_existing_devices_bus(path, context->cb_added, | 
|  | 257 | context->data); | 
|  | 258 | } else if (event->mask & IN_DELETE) { | 
|  | 259 | inotify_rm_watch(context->fd, context->wds[i]); | 
|  | 260 | context->wds[i] = -1; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 261 | } | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 262 | } | 
|  | 263 | } else { | 
|  | 264 | for (i = 1; (i < MAX_USBFS_WD_COUNT) && !done; i++) { | 
|  | 265 | if (wd == context->wds[i]) { | 
|  | 266 | snprintf(path, sizeof(path), USB_FS_DIR "/%03d/%s", i, event->name); | 
|  | 267 | if (event->mask == IN_CREATE) { | 
|  | 268 | D("new device %s\n", path); | 
|  | 269 | done = context->cb_added(path, context->data); | 
|  | 270 | } else if (event->mask == IN_DELETE) { | 
|  | 271 | D("gone device %s\n", path); | 
|  | 272 | done = context->cb_removed(path, context->data); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 273 | } | 
|  | 274 | } | 
|  | 275 | } | 
|  | 276 | } | 
|  | 277 | } | 
| Guillaume Ranquet | dea46b6 | 2012-10-23 17:11:44 +0200 | [diff] [blame] | 278 |  | 
|  | 279 | return done; | 
|  | 280 | } /* usb_host_read_event() */ | 
|  | 281 |  | 
|  | 282 | void usb_host_run(struct usb_host_context *context, | 
|  | 283 | usb_device_added_cb added_cb, | 
|  | 284 | usb_device_removed_cb removed_cb, | 
|  | 285 | usb_discovery_done_cb discovery_done_cb, | 
|  | 286 | void *client_data) | 
|  | 287 | { | 
|  | 288 | int done; | 
|  | 289 |  | 
|  | 290 | done = usb_host_load(context, added_cb, removed_cb, discovery_done_cb, client_data); | 
|  | 291 |  | 
|  | 292 | while (!done) { | 
|  | 293 |  | 
|  | 294 | done = usb_host_read_event(context); | 
|  | 295 | } | 
|  | 296 | } /* usb_host_run() */ | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 297 |  | 
|  | 298 | struct usb_device *usb_device_open(const char *dev_name) | 
|  | 299 | { | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 300 | int fd, did_retry = 0, writeable = 1; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 301 |  | 
| Mike Lockwood | ec9e7b1 | 2011-01-22 09:17:07 -0800 | [diff] [blame] | 302 | D("usb_device_open %s\n", dev_name); | 
|  | 303 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 304 | retry: | 
|  | 305 | fd = open(dev_name, O_RDWR); | 
|  | 306 | if (fd < 0) { | 
|  | 307 | /* if we fail, see if have read-only access */ | 
|  | 308 | fd = open(dev_name, O_RDONLY); | 
| Mike Lockwood | e15af09 | 2010-06-10 10:20:49 -0400 | [diff] [blame] | 309 | D("usb_device_open open returned %d errno %d\n", fd, errno); | 
|  | 310 | if (fd < 0 && (errno == EACCES || errno == ENOENT) && !did_retry) { | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 311 | /* work around race condition between inotify and permissions management */ | 
|  | 312 | sleep(1); | 
|  | 313 | did_retry = 1; | 
|  | 314 | goto retry; | 
|  | 315 | } | 
|  | 316 |  | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 317 | if (fd < 0) | 
|  | 318 | return NULL; | 
|  | 319 | writeable = 0; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 320 | D("[ usb open read-only %s fd = %d]\n", dev_name, fd); | 
|  | 321 | } | 
|  | 322 |  | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 323 | struct usb_device* result = usb_device_new(dev_name, fd); | 
|  | 324 | if (result) | 
|  | 325 | result->writeable = writeable; | 
|  | 326 | return result; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 327 | } | 
|  | 328 |  | 
|  | 329 | void usb_device_close(struct usb_device *device) | 
|  | 330 | { | 
|  | 331 | close(device->fd); | 
|  | 332 | free(device); | 
|  | 333 | } | 
|  | 334 |  | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 335 | struct usb_device *usb_device_new(const char *dev_name, int fd) | 
|  | 336 | { | 
|  | 337 | struct usb_device *device = calloc(1, sizeof(struct usb_device)); | 
|  | 338 | int length; | 
|  | 339 |  | 
| Mike Lockwood | ec9e7b1 | 2011-01-22 09:17:07 -0800 | [diff] [blame] | 340 | D("usb_device_new %s fd: %d\n", dev_name, fd); | 
|  | 341 |  | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 342 | if (lseek(fd, 0, SEEK_SET) != 0) | 
|  | 343 | goto failed; | 
|  | 344 | length = read(fd, device->desc, sizeof(device->desc)); | 
| Mike Lockwood | ec9e7b1 | 2011-01-22 09:17:07 -0800 | [diff] [blame] | 345 | D("usb_device_new read returned %d errno %d\n", length, errno); | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 346 | if (length < 0) | 
|  | 347 | goto failed; | 
|  | 348 |  | 
| Mike Lockwood | 93aff72 | 2010-12-15 12:58:04 -0800 | [diff] [blame] | 349 | strncpy(device->dev_name, dev_name, sizeof(device->dev_name) - 1); | 
| Mike Lockwood | cd185f2 | 2010-12-12 14:17:02 -0800 | [diff] [blame] | 350 | device->fd = fd; | 
|  | 351 | device->desc_length = length; | 
|  | 352 | // assume we are writeable, since usb_device_get_fd will only return writeable fds | 
|  | 353 | device->writeable = 1; | 
|  | 354 | return device; | 
|  | 355 |  | 
|  | 356 | failed: | 
|  | 357 | close(fd); | 
|  | 358 | free(device); | 
|  | 359 | return NULL; | 
|  | 360 | } | 
|  | 361 |  | 
|  | 362 | static int usb_device_reopen_writeable(struct usb_device *device) | 
|  | 363 | { | 
|  | 364 | if (device->writeable) | 
|  | 365 | return 1; | 
|  | 366 |  | 
|  | 367 | int fd = open(device->dev_name, O_RDWR); | 
|  | 368 | if (fd >= 0) { | 
|  | 369 | close(device->fd); | 
|  | 370 | device->fd = fd; | 
|  | 371 | device->writeable = 1; | 
|  | 372 | return 1; | 
|  | 373 | } | 
|  | 374 | D("usb_device_reopen_writeable failed errno %d\n", errno); | 
|  | 375 | return 0; | 
|  | 376 | } | 
|  | 377 |  | 
|  | 378 | int usb_device_get_fd(struct usb_device *device) | 
|  | 379 | { | 
|  | 380 | if (!usb_device_reopen_writeable(device)) | 
|  | 381 | return -1; | 
|  | 382 | return device->fd; | 
|  | 383 | } | 
|  | 384 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 385 | const char* usb_device_get_name(struct usb_device *device) | 
|  | 386 | { | 
|  | 387 | return device->dev_name; | 
|  | 388 | } | 
|  | 389 |  | 
| Mike Lockwood | 203f102 | 2010-05-27 10:12:03 -0400 | [diff] [blame] | 390 | int usb_device_get_unique_id(struct usb_device *device) | 
|  | 391 | { | 
|  | 392 | int bus = 0, dev = 0; | 
|  | 393 | sscanf(device->dev_name, USB_FS_ID_SCANNER, &bus, &dev); | 
|  | 394 | return bus * 1000 + dev; | 
|  | 395 | } | 
|  | 396 |  | 
| Mike Lockwood | 07eb4af | 2010-07-27 19:05:33 -0400 | [diff] [blame] | 397 | int usb_device_get_unique_id_from_name(const char* name) | 
|  | 398 | { | 
|  | 399 | int bus = 0, dev = 0; | 
|  | 400 | sscanf(name, USB_FS_ID_SCANNER, &bus, &dev); | 
|  | 401 | return bus * 1000 + dev; | 
|  | 402 | } | 
|  | 403 |  | 
| Mike Lockwood | 7d700f8 | 2010-12-29 08:47:29 -0500 | [diff] [blame] | 404 | char* usb_device_get_name_from_unique_id(int id) | 
|  | 405 | { | 
|  | 406 | int bus = id / 1000; | 
|  | 407 | int dev = id % 1000; | 
|  | 408 | char* result = (char *)calloc(1, strlen(USB_FS_ID_FORMAT)); | 
|  | 409 | snprintf(result, strlen(USB_FS_ID_FORMAT) - 1, USB_FS_ID_FORMAT, bus, dev); | 
|  | 410 | return result; | 
|  | 411 | } | 
|  | 412 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 413 | uint16_t usb_device_get_vendor_id(struct usb_device *device) | 
|  | 414 | { | 
|  | 415 | struct usb_device_descriptor* desc = (struct usb_device_descriptor*)device->desc; | 
|  | 416 | return __le16_to_cpu(desc->idVendor); | 
|  | 417 | } | 
|  | 418 |  | 
|  | 419 | uint16_t usb_device_get_product_id(struct usb_device *device) | 
|  | 420 | { | 
|  | 421 | struct usb_device_descriptor* desc = (struct usb_device_descriptor*)device->desc; | 
|  | 422 | return __le16_to_cpu(desc->idProduct); | 
|  | 423 | } | 
|  | 424 |  | 
| Mike Lockwood | 5037207 | 2010-12-13 10:15:25 -0800 | [diff] [blame] | 425 | const struct usb_device_descriptor* usb_device_get_device_descriptor(struct usb_device *device) | 
|  | 426 | { | 
|  | 427 | return (struct usb_device_descriptor*)device->desc; | 
|  | 428 | } | 
|  | 429 |  | 
| Mike Lockwood | 1b7d991 | 2010-07-24 13:57:21 -0400 | [diff] [blame] | 430 | char* usb_device_get_string(struct usb_device *device, int id) | 
|  | 431 | { | 
|  | 432 | char string[256]; | 
|  | 433 | __u16 buffer[128]; | 
|  | 434 | __u16 languages[128]; | 
|  | 435 | int i, result; | 
|  | 436 | int languageCount = 0; | 
|  | 437 |  | 
|  | 438 | string[0] = 0; | 
|  | 439 | memset(languages, 0, sizeof(languages)); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 440 |  | 
|  | 441 | // read list of supported languages | 
| Mike Lockwood | 120b57a | 2011-01-27 10:46:19 -0800 | [diff] [blame] | 442 | result = usb_device_control_transfer(device, | 
| Mike Lockwood | 1b7d991 | 2010-07-24 13:57:21 -0400 | [diff] [blame] | 443 | USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE, USB_REQ_GET_DESCRIPTOR, | 
| Mike Lockwood | 120b57a | 2011-01-27 10:46:19 -0800 | [diff] [blame] | 444 | (USB_DT_STRING << 8) | 0, 0, languages, sizeof(languages), 0); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 445 | if (result > 0) | 
|  | 446 | languageCount = (result - 2) / 2; | 
|  | 447 |  | 
|  | 448 | for (i = 1; i <= languageCount; i++) { | 
|  | 449 | memset(buffer, 0, sizeof(buffer)); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 450 |  | 
| Mike Lockwood | 120b57a | 2011-01-27 10:46:19 -0800 | [diff] [blame] | 451 | result = usb_device_control_transfer(device, | 
| Mike Lockwood | 1b7d991 | 2010-07-24 13:57:21 -0400 | [diff] [blame] | 452 | USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE, USB_REQ_GET_DESCRIPTOR, | 
| Mike Lockwood | 120b57a | 2011-01-27 10:46:19 -0800 | [diff] [blame] | 453 | (USB_DT_STRING << 8) | id, languages[i], buffer, sizeof(buffer), 0); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 454 | if (result > 0) { | 
|  | 455 | int i; | 
|  | 456 | // skip first word, and copy the rest to the string, changing shorts to bytes. | 
|  | 457 | result /= 2; | 
|  | 458 | for (i = 1; i < result; i++) | 
|  | 459 | string[i - 1] = buffer[i]; | 
|  | 460 | string[i - 1] = 0; | 
|  | 461 | return strdup(string); | 
|  | 462 | } | 
|  | 463 | } | 
|  | 464 |  | 
|  | 465 | return NULL; | 
|  | 466 | } | 
|  | 467 |  | 
|  | 468 | char* usb_device_get_manufacturer_name(struct usb_device *device) | 
|  | 469 | { | 
|  | 470 | struct usb_device_descriptor *desc = (struct usb_device_descriptor *)device->desc; | 
|  | 471 |  | 
|  | 472 | if (desc->iManufacturer) | 
|  | 473 | return usb_device_get_string(device, desc->iManufacturer); | 
|  | 474 | else | 
|  | 475 | return NULL; | 
|  | 476 | } | 
|  | 477 |  | 
|  | 478 | char* usb_device_get_product_name(struct usb_device *device) | 
|  | 479 | { | 
|  | 480 | struct usb_device_descriptor *desc = (struct usb_device_descriptor *)device->desc; | 
|  | 481 |  | 
|  | 482 | if (desc->iProduct) | 
|  | 483 | return usb_device_get_string(device, desc->iProduct); | 
|  | 484 | else | 
|  | 485 | return NULL; | 
|  | 486 | } | 
|  | 487 |  | 
|  | 488 | char* usb_device_get_serial(struct usb_device *device) | 
|  | 489 | { | 
|  | 490 | struct usb_device_descriptor *desc = (struct usb_device_descriptor *)device->desc; | 
|  | 491 |  | 
|  | 492 | if (desc->iSerialNumber) | 
|  | 493 | return usb_device_get_string(device, desc->iSerialNumber); | 
|  | 494 | else | 
|  | 495 | return NULL; | 
|  | 496 | } | 
|  | 497 |  | 
|  | 498 | int usb_device_is_writeable(struct usb_device *device) | 
|  | 499 | { | 
|  | 500 | return device->writeable; | 
|  | 501 | } | 
|  | 502 |  | 
|  | 503 | void usb_descriptor_iter_init(struct usb_device *device, struct usb_descriptor_iter *iter) | 
|  | 504 | { | 
|  | 505 | iter->config = device->desc; | 
|  | 506 | iter->config_end = device->desc + device->desc_length; | 
|  | 507 | iter->curr_desc = device->desc; | 
|  | 508 | } | 
|  | 509 |  | 
|  | 510 | struct usb_descriptor_header *usb_descriptor_iter_next(struct usb_descriptor_iter *iter) | 
|  | 511 | { | 
|  | 512 | struct usb_descriptor_header* next; | 
|  | 513 | if (iter->curr_desc >= iter->config_end) | 
|  | 514 | return NULL; | 
|  | 515 | next = (struct usb_descriptor_header*)iter->curr_desc; | 
|  | 516 | iter->curr_desc += next->bLength; | 
|  | 517 | return next; | 
|  | 518 | } | 
|  | 519 |  | 
|  | 520 | int usb_device_claim_interface(struct usb_device *device, unsigned int interface) | 
|  | 521 | { | 
|  | 522 | return ioctl(device->fd, USBDEVFS_CLAIMINTERFACE, &interface); | 
|  | 523 | } | 
|  | 524 |  | 
|  | 525 | int usb_device_release_interface(struct usb_device *device, unsigned int interface) | 
|  | 526 | { | 
|  | 527 | return ioctl(device->fd, USBDEVFS_RELEASEINTERFACE, &interface); | 
|  | 528 | } | 
|  | 529 |  | 
| Mike Lockwood | ec9e7b1 | 2011-01-22 09:17:07 -0800 | [diff] [blame] | 530 | int usb_device_connect_kernel_driver(struct usb_device *device, | 
|  | 531 | unsigned int interface, int connect) | 
|  | 532 | { | 
|  | 533 | struct usbdevfs_ioctl ctl; | 
|  | 534 |  | 
|  | 535 | ctl.ifno = interface; | 
|  | 536 | ctl.ioctl_code = (connect ? USBDEVFS_CONNECT : USBDEVFS_DISCONNECT); | 
|  | 537 | ctl.data = NULL; | 
|  | 538 | return ioctl(device->fd, USBDEVFS_IOCTL, &ctl); | 
|  | 539 | } | 
|  | 540 |  | 
| Mike Lockwood | 120b57a | 2011-01-27 10:46:19 -0800 | [diff] [blame] | 541 | int usb_device_control_transfer(struct usb_device *device, | 
|  | 542 | int requestType, | 
|  | 543 | int request, | 
|  | 544 | int value, | 
|  | 545 | int index, | 
|  | 546 | void* buffer, | 
|  | 547 | int length, | 
|  | 548 | unsigned int timeout) | 
|  | 549 | { | 
|  | 550 | struct usbdevfs_ctrltransfer  ctrl; | 
|  | 551 |  | 
|  | 552 | // this usually requires read/write permission | 
|  | 553 | if (!usb_device_reopen_writeable(device)) | 
|  | 554 | return -1; | 
|  | 555 |  | 
|  | 556 | memset(&ctrl, 0, sizeof(ctrl)); | 
|  | 557 | ctrl.bRequestType = requestType; | 
|  | 558 | ctrl.bRequest = request; | 
|  | 559 | ctrl.wValue = value; | 
|  | 560 | ctrl.wIndex = index; | 
|  | 561 | ctrl.wLength = length; | 
|  | 562 | ctrl.data = buffer; | 
|  | 563 | ctrl.timeout = timeout; | 
|  | 564 | return ioctl(device->fd, USBDEVFS_CONTROL, &ctrl); | 
|  | 565 | } | 
|  | 566 |  | 
|  | 567 | int usb_device_bulk_transfer(struct usb_device *device, | 
|  | 568 | int endpoint, | 
|  | 569 | void* buffer, | 
|  | 570 | int length, | 
|  | 571 | unsigned int timeout) | 
|  | 572 | { | 
|  | 573 | struct usbdevfs_bulktransfer  ctrl; | 
|  | 574 |  | 
| Mike Lockwood | c4c00d8 | 2011-03-12 12:25:11 -0500 | [diff] [blame] | 575 | // need to limit request size to avoid EINVAL | 
|  | 576 | if (length > MAX_USBFS_BUFFER_SIZE) | 
|  | 577 | length = MAX_USBFS_BUFFER_SIZE; | 
|  | 578 |  | 
| Mike Lockwood | 120b57a | 2011-01-27 10:46:19 -0800 | [diff] [blame] | 579 | memset(&ctrl, 0, sizeof(ctrl)); | 
|  | 580 | ctrl.ep = endpoint; | 
|  | 581 | ctrl.len = length; | 
|  | 582 | ctrl.data = buffer; | 
|  | 583 | ctrl.timeout = timeout; | 
|  | 584 | return ioctl(device->fd, USBDEVFS_BULK, &ctrl); | 
|  | 585 | } | 
|  | 586 |  | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 587 | struct usb_request *usb_request_new(struct usb_device *dev, | 
|  | 588 | const struct usb_endpoint_descriptor *ep_desc) | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 589 | { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 590 | struct usbdevfs_urb *urb = calloc(1, sizeof(struct usbdevfs_urb)); | 
|  | 591 | if (!urb) | 
|  | 592 | return NULL; | 
|  | 593 |  | 
|  | 594 | if ((ep_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK) | 
|  | 595 | urb->type = USBDEVFS_URB_TYPE_BULK; | 
|  | 596 | else if ((ep_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT) | 
|  | 597 | urb->type = USBDEVFS_URB_TYPE_INTERRUPT; | 
|  | 598 | else { | 
|  | 599 | D("Unsupported endpoint type %d", ep_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK); | 
|  | 600 | free(urb); | 
|  | 601 | return NULL; | 
|  | 602 | } | 
|  | 603 | urb->endpoint = ep_desc->bEndpointAddress; | 
|  | 604 |  | 
|  | 605 | struct usb_request *req = calloc(1, sizeof(struct usb_request)); | 
|  | 606 | if (!req) { | 
|  | 607 | free(urb); | 
|  | 608 | return NULL; | 
|  | 609 | } | 
|  | 610 |  | 
|  | 611 | req->dev = dev; | 
|  | 612 | req->max_packet_size = __le16_to_cpu(ep_desc->wMaxPacketSize); | 
|  | 613 | req->private_data = urb; | 
| Mike Lockwood | b5d68a3 | 2011-02-14 08:05:40 -0500 | [diff] [blame] | 614 | req->endpoint = urb->endpoint; | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 615 | urb->usercontext = req; | 
|  | 616 |  | 
|  | 617 | return req; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 618 | } | 
|  | 619 |  | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 620 | void usb_request_free(struct usb_request *req) | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 621 | { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 622 | free(req->private_data); | 
|  | 623 | free(req); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 624 | } | 
|  | 625 |  | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 626 | int usb_request_queue(struct usb_request *req) | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 627 | { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 628 | struct usbdevfs_urb *urb = (struct usbdevfs_urb*)req->private_data; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 629 | int res; | 
|  | 630 |  | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 631 | urb->status = -1; | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 632 | urb->buffer = req->buffer; | 
| Mike Lockwood | c4c00d8 | 2011-03-12 12:25:11 -0500 | [diff] [blame] | 633 | // need to limit request size to avoid EINVAL | 
|  | 634 | if (req->buffer_length > MAX_USBFS_BUFFER_SIZE) | 
|  | 635 | urb->buffer_length = MAX_USBFS_BUFFER_SIZE; | 
|  | 636 | else | 
|  | 637 | urb->buffer_length = req->buffer_length; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 638 |  | 
|  | 639 | do { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 640 | res = ioctl(req->dev->fd, USBDEVFS_SUBMITURB, urb); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 641 | } while((res < 0) && (errno == EINTR)); | 
|  | 642 |  | 
|  | 643 | return res; | 
|  | 644 | } | 
|  | 645 |  | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 646 | struct usb_request *usb_request_wait(struct usb_device *dev) | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 647 | { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 648 | struct usbdevfs_urb *urb = NULL; | 
|  | 649 | struct usb_request *req = NULL; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 650 |  | 
|  | 651 | while (1) { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 652 | int res = ioctl(dev->fd, USBDEVFS_REAPURB, &urb); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 653 | D("USBDEVFS_REAPURB returned %d\n", res); | 
|  | 654 | if (res < 0) { | 
|  | 655 | if(errno == EINTR) { | 
|  | 656 | continue; | 
|  | 657 | } | 
|  | 658 | D("[ reap urb - error ]\n"); | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 659 | return NULL; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 660 | } else { | 
|  | 661 | D("[ urb @%p status = %d, actual = %d ]\n", | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 662 | urb, urb->status, urb->actual_length); | 
|  | 663 | req = (struct usb_request*)urb->usercontext; | 
|  | 664 | req->actual_length = urb->actual_length; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 665 | } | 
|  | 666 | break; | 
|  | 667 | } | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 668 | return req; | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 669 | } | 
|  | 670 |  | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 671 | int usb_request_cancel(struct usb_request *req) | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 672 | { | 
| Mike Lockwood | e533c5f | 2011-01-04 20:04:36 -0500 | [diff] [blame] | 673 | struct usbdevfs_urb *urb = ((struct usbdevfs_urb*)req->private_data); | 
|  | 674 | return ioctl(req->dev->fd, USBDEVFS_DISCARDURB, &urb); | 
| Mike Lockwood | 30ff2c7 | 2010-05-09 16:23:47 -0400 | [diff] [blame] | 675 | } | 
|  | 676 |  |