Changes in uspace/drv/bus/usb/usbhid/mouse/mousedev.c [e3c78efc:b803845] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/usbhid/mouse/mousedev.c
re3c78efc rb803845 55 55 #define ARROWS_PER_SINGLE_WHEEL 3 56 56 57 #define NAME "mouse"57 #define NAME "mouse" 58 58 59 59 /*----------------------------------------------------------------------------*/ … … 77 77 78 78 /*----------------------------------------------------------------------------*/ 79 static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[] = { 79 80 enum { 81 USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE = 63 82 }; 83 84 static const uint8_t USB_MOUSE_BOOT_REPORT_DESCRIPTOR[ 85 USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE] = { 80 86 0x05, 0x01, // USAGE_PAGE (Generic Desktop) 81 87 0x09, 0x02, // USAGE (Mouse) … … 117 123 ipc_callid_t icallid, ipc_call_t *icall) 118 124 { 119 usb_mouse_t *mouse_dev = fun->driver_data;125 usb_mouse_t *mouse_dev = (usb_mouse_t *) fun->driver_data; 120 126 121 127 if (mouse_dev == NULL) { 122 usb_log_debug("%s: Missing parameters.\n", __FUNCTION__); 128 usb_log_debug("default_connection_handler: Missing " 129 "parameters.\n"); 123 130 async_answer_0(icallid, EINVAL); 124 131 return; 125 132 } 126 133 127 usb_log_debug("%s: fun->name: %s\n", __FUNCTION__, fun->name); 128 usb_log_debug("%s: mouse_sess: %p, wheel_sess: %p\n", 129 __FUNCTION__, mouse_dev->mouse_sess, mouse_dev->wheel_sess); 130 131 async_sess_t **sess_ptr = (fun == mouse_dev->mouse_fun) ? 134 usb_log_debug("default_connection_handler: fun->name: %s\n", 135 fun->name); 136 usb_log_debug("default_connection_handler: mouse_sess: %p, " 137 "wheel_sess: %p\n", mouse_dev->mouse_sess, mouse_dev->wheel_sess); 138 139 async_sess_t **sess_ptr = 140 (str_cmp(fun->name, HID_MOUSE_FUN_NAME) == 0) ? 132 141 &mouse_dev->mouse_sess : &mouse_dev->wheel_sess; 133 142 … … 137 146 if (*sess_ptr == NULL) { 138 147 *sess_ptr = sess; 139 usb_log_debug("Console session to %sset ok (%p).\n",140 fun->name,sess);148 usb_log_debug("Console session to mouse set ok (%p).\n", 149 sess); 141 150 async_answer_0(icallid, EOK); 142 151 } else { 143 usb_log_ error("Console session to %s already set.\n",144 fun->name);152 usb_log_debug("default_connection_handler: Console " 153 "session to mouse already set.\n"); 145 154 async_answer_0(icallid, ELIMIT); 146 155 } 147 156 } else { 148 usb_log_debug(" %s: Invalid function.\n", __FUNCTION__);157 usb_log_debug("default_connection_handler: Invalid function.\n"); 149 158 async_answer_0(icallid, EINVAL); 159 } 160 } 161 162 /*----------------------------------------------------------------------------*/ 163 164 static usb_mouse_t *usb_mouse_new(void) 165 { 166 usb_mouse_t *mouse = calloc(1, sizeof(usb_mouse_t)); 167 if (mouse == NULL) { 168 return NULL; 169 } 170 mouse->mouse_sess = NULL; 171 mouse->wheel_sess = NULL; 172 173 return mouse; 174 } 175 176 /*----------------------------------------------------------------------------*/ 177 178 static void usb_mouse_destroy(usb_mouse_t *mouse_dev) 179 { 180 assert(mouse_dev != NULL); 181 182 // hangup session to the console 183 if (mouse_dev->mouse_sess != NULL) 184 async_hangup(mouse_dev->mouse_sess); 185 186 if (mouse_dev->wheel_sess != NULL) 187 async_hangup(mouse_dev->wheel_sess); 188 int ret = ddf_fun_unbind(mouse_dev->mouse_fun); 189 if (ret != EOK) { 190 usb_log_error("Failed to unbind mouse function.\n"); 191 } else { 192 ddf_fun_destroy(mouse_dev->mouse_fun); 193 /* Prevent double free */ 194 mouse_dev->wheel_fun->driver_data = NULL; 195 } 196 197 ret = ddf_fun_unbind(mouse_dev->wheel_fun); 198 if (ret != EOK) { 199 usb_log_error("Failed to unbind wheel function.\n"); 200 } else { 201 ddf_fun_destroy(mouse_dev->wheel_fun); 150 202 } 151 203 } … … 163 215 } 164 216 165 const unsigned count = 166 ((wheel < 0) ? -wheel : wheel) * ARROWS_PER_SINGLE_WHEEL; 167 for (unsigned i = 0; i < count; i++) { 217 int count = ((wheel < 0) ? -wheel : wheel) * ARROWS_PER_SINGLE_WHEEL; 218 int i; 219 220 for (i = 0; i < count; i++) { 168 221 /* Send arrow press and release. */ 169 222 usb_log_debug2("Sending key %d to the console\n", key); … … 214 267 } 215 268 216 constint shift_x = get_mouse_axis_move_value(hid_dev->report_id,269 int shift_x = get_mouse_axis_move_value(hid_dev->report_id, 217 270 &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_X); 218 constint shift_y = get_mouse_axis_move_value(hid_dev->report_id,271 int shift_y = get_mouse_axis_move_value(hid_dev->report_id, 219 272 &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_Y); 220 constint wheel = get_mouse_axis_move_value(hid_dev->report_id,273 int wheel = get_mouse_axis_move_value(hid_dev->report_id, 221 274 &hid_dev->report, USB_HIDUT_USAGE_GENERIC_DESKTOP_WHEEL); 222 275 … … 224 277 async_exch_t *exch = 225 278 async_exchange_begin(mouse_dev->mouse_sess); 226 if (exch != NULL) { 227 async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y); 228 async_exchange_end(exch); 229 } 279 async_req_2_0(exch, MOUSEEV_MOVE_EVENT, shift_x, shift_y); 280 async_exchange_end(exch); 230 281 } 231 282 … … 233 284 usb_mouse_send_wheel(mouse_dev, wheel); 234 285 235 /* Buttons */ 286 /* 287 * Buttons 288 */ 236 289 usb_hid_report_path_t *path = usb_hid_report_path(); 237 if (path == NULL) { 238 usb_log_warning("Failed to create USB HID report path.\n"); 239 return true; 240 } 241 int ret = 242 usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); 243 if (ret != EOK) { 244 usb_hid_report_path_free(path); 245 usb_log_warning("Failed to add buttons to report path.\n"); 246 return true; 247 } 290 usb_hid_report_path_append_item(path, USB_HIDUT_PAGE_BUTTON, 0); 248 291 usb_hid_report_path_set_report_id(path, hid_dev->report_id); 249 292 … … 255 298 usb_log_debug2(NAME " VALUE(%X) USAGE(%X)\n", field->value, 256 299 field->usage); 257 assert(field->usage > field->usage_minimum); 258 const unsigned index = field->usage - field->usage_minimum; 259 assert(index < mouse_dev->buttons_count); 260 261 if (mouse_dev->buttons[index] == 0 && field->value != 0) { 300 301 if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0 302 && field->value != 0) { 262 303 async_exch_t *exch = 263 304 async_exchange_begin(mouse_dev->mouse_sess); 264 if (exch != NULL) { 265 async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 266 field->usage, 1); 267 async_exchange_end(exch); 268 mouse_dev->buttons[index] = field->value; 269 } 270 271 } else if (mouse_dev->buttons[index] != 0 && field->value == 0) { 305 async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 1); 306 async_exchange_end(exch); 307 308 mouse_dev->buttons[field->usage - field->usage_minimum] 309 = field->value; 310 } else if (mouse_dev->buttons[field->usage - field->usage_minimum] != 0 311 && field->value == 0) { 272 312 async_exch_t *exch = 273 313 async_exchange_begin(mouse_dev->mouse_sess); 274 if (exch != NULL) { 275 async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, 276 field->usage, 0); 277 async_exchange_end(exch); 278 mouse_dev->buttons[index] = field->value; 279 } 314 async_req_2_0(exch, MOUSEEV_BUTTON_EVENT, field->usage, 0); 315 async_exchange_end(exch); 316 317 mouse_dev->buttons[field->usage - field->usage_minimum] = 318 field->value; 280 319 } 281 320 … … 290 329 return true; 291 330 } 292 /*----------------------------------------------------------------------------*/ 293 #define FUN_UNBIND_DESTROY(fun) \ 294 if (fun) { \ 295 if (ddf_fun_unbind((fun)) == EOK) { \ 296 (fun)->driver_data = NULL; \ 297 ddf_fun_destroy((fun)); \ 298 } else { \ 299 usb_log_error("Could not unbind function `%s', it " \ 300 "will not be destroyed.\n", (fun)->name); \ 301 } \ 302 } else (void)0 303 /*----------------------------------------------------------------------------*/ 331 332 /*----------------------------------------------------------------------------*/ 333 304 334 static int usb_mouse_create_function(usb_hid_dev_t *hid_dev, usb_mouse_t *mouse) 305 335 { … … 309 339 /* Create the exposed function. */ 310 340 usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME); 311 ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 341 ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 312 342 HID_MOUSE_FUN_NAME); 313 343 if (fun == NULL) { 314 usb_log_error("Could not create DDF function node `%s'.\n", 315 HID_MOUSE_FUN_NAME); 344 usb_log_error("Could not create DDF function node.\n"); 316 345 return ENOMEM; 317 346 } … … 322 351 int rc = ddf_fun_bind(fun); 323 352 if (rc != EOK) { 324 usb_log_error("Could not bind DDF function `%s': %s.\n", 325 fun->name, str_error(rc)); 326 fun->driver_data = NULL; 327 ddf_fun_destroy(fun); 328 return rc; 329 } 330 331 usb_log_debug("Adding DDF function `%s' to category %s...\n", 332 fun->name, HID_MOUSE_CATEGORY); 353 usb_log_error("Could not bind DDF function: %s.\n", 354 str_error(rc)); 355 return rc; 356 } 357 358 usb_log_debug("Adding DDF function to category %s...\n", 359 HID_MOUSE_CATEGORY); 333 360 rc = ddf_fun_add_to_category(fun, HID_MOUSE_CATEGORY); 334 361 if (rc != EOK) { … … 336 363 "Could not add DDF function to category %s: %s.\n", 337 364 HID_MOUSE_CATEGORY, str_error(rc)); 338 FUN_UNBIND_DESTROY(fun);339 365 return rc; 340 366 } … … 344 370 * Special function for acting as keyboard (wheel) 345 371 */ 346 usb_log_debug("Creating DDF function %s...\n", 372 usb_log_debug("Creating DDF function %s...\n", 347 373 HID_MOUSE_WHEEL_FUN_NAME); 348 fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 374 fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed, 349 375 HID_MOUSE_WHEEL_FUN_NAME); 350 376 if (fun == NULL) { 351 usb_log_error("Could not create DDF function node `%s'.\n", 352 HID_MOUSE_WHEEL_FUN_NAME); 353 FUN_UNBIND_DESTROY(mouse->mouse_fun); 354 mouse->mouse_fun = NULL; 377 usb_log_error("Could not create DDF function node.\n"); 355 378 return ENOMEM; 356 379 } … … 365 388 rc = ddf_fun_bind(fun); 366 389 if (rc != EOK) { 367 usb_log_error("Could not bind DDF function `%s': %s.\n", 368 fun->name, str_error(rc)); 369 FUN_UNBIND_DESTROY(mouse->mouse_fun); 370 mouse->mouse_fun = NULL; 371 372 fun->driver_data = NULL; 373 ddf_fun_destroy(fun); 390 usb_log_error("Could not bind DDF function: %s.\n", 391 str_error(rc)); 374 392 return rc; 375 393 } … … 382 400 "Could not add DDF function to category %s: %s.\n", 383 401 HID_MOUSE_WHEEL_CATEGORY, str_error(rc)); 384 385 FUN_UNBIND_DESTROY(mouse->mouse_fun);386 mouse->mouse_fun = NULL;387 FUN_UNBIND_DESTROY(fun);388 402 return rc; 389 403 } … … 434 448 return highest_button; 435 449 } 436 /*----------------------------------------------------------------------------*/ 450 451 /*----------------------------------------------------------------------------*/ 452 437 453 int usb_mouse_init(usb_hid_dev_t *hid_dev, void **data) 438 454 { … … 445 461 } 446 462 447 usb_mouse_t *mouse_dev = calloc(1, sizeof(usb_mouse_t));463 usb_mouse_t *mouse_dev = usb_mouse_new(); 448 464 if (mouse_dev == NULL) { 449 465 usb_log_error("Error while creating USB/HID Mouse device " … … 468 484 } 469 485 486 487 // save the Mouse device structure into the HID device structure 488 *data = mouse_dev; 489 470 490 // set handler for incoming calls 471 491 mouse_dev->ops.default_handler = default_connection_handler; 472 492 473 493 // TODO: how to know if the device supports the request??? 474 usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 494 usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 475 495 hid_dev->usb_dev->interface_no, IDLE_RATE); 476 496 477 497 int rc = usb_mouse_create_function(hid_dev, mouse_dev); 478 498 if (rc != EOK) { 479 free(mouse_dev->buttons); 480 free(mouse_dev); 481 return rc; 482 } 483 484 /* Save the Mouse device structure into the HID device structure. */ 485 *data = mouse_dev; 499 usb_mouse_destroy(mouse_dev); 500 return rc; 501 } 486 502 487 503 return EOK; 488 504 } 489 /*----------------------------------------------------------------------------*/ 505 506 /*----------------------------------------------------------------------------*/ 507 490 508 bool usb_mouse_polling_callback(usb_hid_dev_t *hid_dev, void *data) 491 509 { 492 510 if (hid_dev == NULL || data == NULL) { 493 usb_log_error( 494 " Missing argument to the mouse polling callback.\n");511 usb_log_error("Missing argument to the mouse polling callback." 512 "\n"); 495 513 return false; 496 514 } 497 515 498 usb_mouse_t *mouse_dev = data;499 516 usb_mouse_t *mouse_dev = (usb_mouse_t *)data; 517 500 518 return usb_mouse_process_report(hid_dev, mouse_dev); 501 519 } 502 /*----------------------------------------------------------------------------*/ 520 521 /*----------------------------------------------------------------------------*/ 522 503 523 void usb_mouse_deinit(usb_hid_dev_t *hid_dev, void *data) 504 524 { 505 if (data == NULL) 506 return; 507 508 usb_mouse_t *mouse_dev = data; 509 510 /* Hangup session to the console */ 511 if (mouse_dev->mouse_sess != NULL) { 512 const int ret = async_hangup(mouse_dev->mouse_sess); 513 if (ret != EOK) 514 usb_log_warning("Failed to hang up mouse session: " 515 "%p, %s.\n", mouse_dev->mouse_sess, str_error(ret)); 516 } 517 518 if (mouse_dev->wheel_sess != NULL) { 519 const int ret = async_hangup(mouse_dev->wheel_sess); 520 if (ret != EOK) 521 usb_log_warning("Failed to hang up wheel session: " 522 "%p, %s.\n", mouse_dev->wheel_sess, str_error(ret)); 523 } 524 525 FUN_UNBIND_DESTROY(mouse_dev->mouse_fun); 526 FUN_UNBIND_DESTROY(mouse_dev->wheel_fun); 527 528 free(mouse_dev->buttons); 529 free(mouse_dev); 530 } 531 /*----------------------------------------------------------------------------*/ 525 if (data != NULL) { 526 usb_mouse_destroy(data); 527 } 528 } 529 530 /*----------------------------------------------------------------------------*/ 531 532 532 int usb_mouse_set_boot_protocol(usb_hid_dev_t *hid_dev) 533 533 { 534 534 int rc = usb_hid_parse_report_descriptor( 535 535 &hid_dev->report, USB_MOUSE_BOOT_REPORT_DESCRIPTOR, 536 sizeof(USB_MOUSE_BOOT_REPORT_DESCRIPTOR));536 USB_MOUSE_BOOT_REPORT_DESCRIPTOR_SIZE); 537 537 538 538 if (rc != EOK) {
Note:
See TracChangeset
for help on using the changeset viewer.