Changes in uspace/lib/drv/generic/driver.c [228e490:5fdd7c3] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/drv/generic/driver.c
r228e490 r5fdd7c3 52 52 #include <ipc/driver.h> 53 53 54 #include "dev_iface.h" 54 55 #include "driver.h" 55 56 56 /* driver structure */ 57 57 /** Driver structure */ 58 58 static driver_t *driver; 59 59 60 /* devices */ 61 60 /** Devices */ 62 61 LIST_INITIALIZE(devices); 63 62 FIBRIL_MUTEX_INITIALIZE(devices_mutex); 64 63 65 /* interrupts */ 66 64 /** Interrupts */ 67 65 static interrupt_context_list_t interrupt_contexts; 68 66 … … 85 83 86 84 ctx = find_interrupt_context_by_id(&interrupt_contexts, id); 87 if ( NULL != ctx && NULL != ctx->handler)85 if (ctx != NULL && ctx->handler != NULL) 88 86 (*ctx->handler)(ctx->dev, iid, icall); 89 87 } 88 89 interrupt_context_t *create_interrupt_context(void) 90 { 91 interrupt_context_t *ctx; 92 93 ctx = (interrupt_context_t *) malloc(sizeof(interrupt_context_t)); 94 if (ctx != NULL) 95 memset(ctx, 0, sizeof(interrupt_context_t)); 96 97 return ctx; 98 } 99 100 void delete_interrupt_context(interrupt_context_t *ctx) 101 { 102 if (ctx != NULL) 103 free(ctx); 104 } 105 106 void init_interrupt_context_list(interrupt_context_list_t *list) 107 { 108 memset(list, 0, sizeof(interrupt_context_list_t)); 109 fibril_mutex_initialize(&list->mutex); 110 list_initialize(&list->contexts); 111 } 112 113 void 114 add_interrupt_context(interrupt_context_list_t *list, interrupt_context_t *ctx) 115 { 116 fibril_mutex_lock(&list->mutex); 117 ctx->id = list->curr_id++; 118 list_append(&ctx->link, &list->contexts); 119 fibril_mutex_unlock(&list->mutex); 120 } 121 122 void remove_interrupt_context(interrupt_context_list_t *list, 123 interrupt_context_t *ctx) 124 { 125 fibril_mutex_lock(&list->mutex); 126 list_remove(&ctx->link); 127 fibril_mutex_unlock(&list->mutex); 128 } 129 130 interrupt_context_t * 131 find_interrupt_context_by_id(interrupt_context_list_t *list, int id) 132 { 133 fibril_mutex_lock(&list->mutex); 134 135 link_t *link = list->contexts.next; 136 interrupt_context_t *ctx; 137 138 while (link != &list->contexts) { 139 ctx = list_get_instance(link, interrupt_context_t, link); 140 if (ctx->id == id) { 141 fibril_mutex_unlock(&list->mutex); 142 return ctx; 143 } 144 link = link->next; 145 } 146 147 fibril_mutex_unlock(&list->mutex); 148 return NULL; 149 } 150 151 interrupt_context_t * 152 find_interrupt_context(interrupt_context_list_t *list, device_t *dev, int irq) 153 { 154 fibril_mutex_lock(&list->mutex); 155 156 link_t *link = list->contexts.next; 157 interrupt_context_t *ctx; 158 159 while (link != &list->contexts) { 160 ctx = list_get_instance(link, interrupt_context_t, link); 161 if (ctx->irq == irq && ctx->dev == dev) { 162 fibril_mutex_unlock(&list->mutex); 163 return ctx; 164 } 165 link = link->next; 166 } 167 168 fibril_mutex_unlock(&list->mutex); 169 return NULL; 170 } 171 90 172 91 173 int … … 101 183 add_interrupt_context(&interrupt_contexts, ctx); 102 184 103 if ( NULL == pseudocode)185 if (pseudocode == NULL) 104 186 pseudocode = &default_pseudocode; 105 187 106 188 int res = ipc_register_irq(irq, dev->handle, ctx->id, pseudocode); 107 if ( 0 != res) {189 if (res != EOK) { 108 190 remove_interrupt_context(&interrupt_contexts, ctx); 109 191 delete_interrupt_context(ctx); … … 118 200 dev, irq); 119 201 int res = ipc_unregister_irq(irq, dev->handle); 120 121 if ( NULL != ctx) {202 203 if (ctx != NULL) { 122 204 remove_interrupt_context(&interrupt_contexts, ctx); 123 205 delete_interrupt_context(ctx); 124 206 } 207 125 208 return res; 126 209 } … … 140 223 } 141 224 142 static device_t * 225 static device_t *driver_get_device(link_t *devices, devman_handle_t handle) 143 226 { 144 227 device_t *dev = NULL; … … 146 229 fibril_mutex_lock(&devices_mutex); 147 230 link_t *link = devices->next; 231 148 232 while (link != devices) { 149 233 dev = list_get_instance(link, device_t, link); 150 if ( handle == dev->handle) {234 if (dev->handle == handle) { 151 235 fibril_mutex_unlock(&devices_mutex); 152 236 return dev; … … 154 238 link = link->next; 155 239 } 240 156 241 fibril_mutex_unlock(&devices_mutex); 157 242 158 243 return NULL; 159 244 } … … 162 247 { 163 248 char *dev_name = NULL; 164 int res = EOK;165 166 devman_handle_t dev_handle = 249 int res; 250 251 devman_handle_t dev_handle = IPC_GET_ARG1(*icall); 167 252 devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall); 168 253 169 254 device_t *dev = create_device(); 170 255 dev->handle = dev_handle; … … 177 262 178 263 res = driver->driver_ops->add_device(dev); 179 if ( 0 == res) {264 if (res == EOK) { 180 265 printf("%s: new device with handle=%" PRIun " was added.\n", 181 266 driver->name, dev_handle); … … 194 279 /* Accept connection */ 195 280 ipc_answer_0(iid, EOK); 196 281 197 282 bool cont = true; 198 283 while (cont) { 199 284 ipc_call_t call; 200 285 ipc_callid_t callid = async_get_call(&call); 201 286 202 287 switch (IPC_GET_IMETHOD(call)) { 203 288 case IPC_M_PHONE_HUNGUP: … … 240 325 * use the device. 241 326 */ 242 327 243 328 int ret = EOK; 244 329 /* open the device */ 245 if ( NULL != dev->ops && NULL != dev->ops->open)330 if (dev->ops != NULL && dev->ops->open != NULL) 246 331 ret = (*dev->ops->open)(dev); 247 332 248 ipc_answer_0(iid, ret); 249 if ( EOK != ret)333 ipc_answer_0(iid, ret); 334 if (ret != EOK) 250 335 return; 251 336 252 337 while (1) { 253 338 ipc_callid_t callid; … … 258 343 259 344 switch (method) { 260 case IPC_M_PHONE_HUNGUP: 345 case IPC_M_PHONE_HUNGUP: 261 346 /* close the device */ 262 if ( NULL != dev->ops && NULL != dev->ops->close)347 if (dev->ops != NULL && dev->ops->close != NULL) 263 348 (*dev->ops->close)(dev); 264 349 ipc_answer_0(callid, EOK); 265 350 return; 266 default: 351 default: 267 352 /* convert ipc interface id to interface index */ 268 353 … … 272 357 remote_handler_t *default_handler = 273 358 device_get_default_handler(dev); 274 if ( NULL != default_handler) {359 if (default_handler != NULL) { 275 360 (*default_handler)(dev, callid, &call); 276 361 break; … … 286 371 break; 287 372 } 288 373 289 374 /* calling one of the device's interfaces */ 290 375 291 /* get the device interface structure*/292 void * iface = device_get_iface(dev, iface_idx);293 if ( NULL == iface) {376 /* Get the interface ops structure. */ 377 void *ops = device_get_ops(dev, iface_idx); 378 if (ops == NULL) { 294 379 printf("%s: driver_connection_gen error - ", 295 380 driver->name); … … 299 384 break; 300 385 } 301 386 302 387 /* 303 388 * Get the corresponding interface for remote request 304 389 * handling ("remote interface"). 305 390 */ 306 remote_iface_t *rem_iface = get_remote_iface(iface_idx);307 assert( NULL != rem_iface);308 391 remote_iface_t *rem_iface = get_remote_iface(iface_idx); 392 assert(rem_iface != NULL); 393 309 394 /* get the method of the remote interface */ 310 395 sysarg_t iface_method_idx = IPC_GET_ARG1(call); 311 396 remote_iface_func_ptr_t iface_method_ptr = 312 397 get_remote_method(rem_iface, iface_method_idx); 313 if ( NULL == iface_method_ptr) {398 if (iface_method_ptr == NULL) { 314 399 // the interface has not such method 315 400 printf("%s: driver_connection_gen error - " … … 325 410 * associated with the device by its driver. 326 411 */ 327 (*iface_method_ptr)(dev, iface, callid, &call);412 (*iface_method_ptr)(dev, ops, callid, &call); 328 413 break; 329 414 } … … 348 433 switch ((sysarg_t) (IPC_GET_ARG1(*icall))) { 349 434 case DRIVER_DEVMAN: 350 /* handle PnP eventsfrom device manager */435 /* Handle request from device manager */ 351 436 driver_connection_devman(iid, icall); 352 437 break; 353 438 case DRIVER_DRIVER: 354 /* handle request from drivers of child devices */439 /* Handle request from drivers of child devices */ 355 440 driver_connection_driver(iid, icall); 356 441 break; 357 442 case DRIVER_CLIENT: 358 /* handle requestsfrom client applications */443 /* Handle request from client applications */ 359 444 driver_connection_client(iid, icall); 360 445 break; 361 362 446 default: 363 447 /* No such interface */ … … 366 450 } 367 451 452 /** Create new device structure. 453 * 454 * @return The device structure. 455 */ 456 device_t *create_device(void) 457 { 458 device_t *dev = malloc(sizeof(device_t)); 459 460 if (dev != NULL) { 461 memset(dev, 0, sizeof(device_t)); 462 init_match_ids(&dev->match_ids); 463 } 464 465 return dev; 466 } 467 468 /** Delete device structure. 469 * 470 * @param dev The device structure. 471 */ 472 void delete_device(device_t *dev) 473 { 474 clean_match_ids(&dev->match_ids); 475 if (dev->name != NULL) 476 free(dev->name); 477 free(dev); 478 } 479 480 void *device_get_ops(device_t *dev, dev_inferface_idx_t idx) 481 { 482 assert(is_valid_iface_idx(idx)); 483 if (dev->ops == NULL) 484 return NULL; 485 return dev->ops->interfaces[idx]; 486 } 487 368 488 int child_device_register(device_t *child, device_t *parent) 369 489 { 370 assert( NULL != child->name);371 490 assert(child->name != NULL); 491 372 492 int res; 373 493 … … 375 495 res = devman_child_device_register(child->name, &child->match_ids, 376 496 parent->handle, &child->handle); 377 if (EOK == res) 497 if (res != EOK) { 498 remove_from_devices_list(child); 378 499 return res; 379 remove_from_devices_list(child); 500 } 501 380 502 return res; 381 503 } … … 395 517 match_id_t *match_id = NULL; 396 518 int rc; 397 519 398 520 child = create_device(); 399 521 if (child == NULL) { … … 401 523 goto failure; 402 524 } 403 525 404 526 child->name = child_name; 405 527 406 528 match_id = create_match_id(); 407 529 if (match_id == NULL) { … … 409 531 goto failure; 410 532 } 411 533 412 534 match_id->id = child_match_id; 413 535 match_id->score = child_match_score; 414 536 add_match_id(&child->match_ids, match_id); 415 537 416 538 rc = child_device_register(child, parent); 417 if ( EOK != rc)539 if (rc != EOK) 418 540 goto failure; 419 541 420 542 return EOK; 421 543 422 544 failure: 423 545 if (match_id != NULL) { … … 425 547 delete_match_id(match_id); 426 548 } 427 549 428 550 if (child != NULL) { 429 551 child->name = NULL; 430 552 delete_device(child); 431 553 } 432 554 433 555 return rc; 556 } 557 558 /** Get default handler for client requests */ 559 remote_handler_t *device_get_default_handler(device_t *dev) 560 { 561 if (dev->ops == NULL) 562 return NULL; 563 return dev->ops->default_handler; 564 } 565 566 int add_device_to_class(device_t *dev, const char *class_name) 567 { 568 return devman_add_device_to_class(dev->handle, class_name); 434 569 } 435 570 … … 441 576 */ 442 577 driver = drv; 443 578 444 579 /* Initialize the list of interrupt contexts. */ 445 580 init_interrupt_context_list(&interrupt_contexts); … … 453 588 */ 454 589 devman_driver_register(driver->name, driver_connection); 455 590 456 591 async_manager(); 457 592 458 593 /* Never reached. */ 459 594 return 0;
Note:
See TracChangeset
for help on using the changeset viewer.