Changeset 561112f in mainline for uspace/drv/ohci/hc.c
- Timestamp:
- 2011-05-06T08:37:19Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 180255f
- Parents:
- f7ccf46
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/ohci/hc.c
rf7ccf46 r561112f 45 45 #include "hcd_endpoint.h" 46 46 47 #define OHCI_USED_INTERRUPTS \ 48 (I_SO | I_WDH | I_UE | I_RHSC) 47 49 static int interrupt_emulator(hc_t *instance); 48 50 static void hc_gain_control(hc_t *instance); … … 285 287 { 286 288 assert(instance); 287 if ((status & ~IS_SF) == 0) /* ignore sof status */ 289 usb_log_debug("OHCI interrupt: %x.\n", status); 290 if ((status & ~I_SF) == 0) /* ignore sof status */ 288 291 return; 289 if (status & I S_RHSC)292 if (status & I_RHSC) 290 293 rh_interrupt(&instance->rh); 291 294 292 usb_log_debug("OHCI interrupt: %x.\n", status); 293 294 if (status & IS_WDH) { 295 296 if (status & I_WDH) { 295 297 fibril_mutex_lock(&instance->guard); 296 298 usb_log_debug2("HCCA: %p-%#" PRIx32 " (%p).\n", instance->hcca, … … 421 423 instance->registers->control); 422 424 423 /* Disable interrupts */ 424 instance->registers->interrupt_disable = I_SF | I_OC; 425 usb_log_debug2("Disabling interrupts: %x.\n", 426 instance->registers->interrupt_disable); 427 instance->registers->interrupt_disable = I_MI; 425 /* Enable interrupts */ 426 instance->registers->interrupt_enable = OHCI_USED_INTERRUPTS; 428 427 usb_log_debug2("Enabled interrupts: %x.\n", 429 428 instance->registers->interrupt_enable); 429 instance->registers->interrupt_enable = I_MI; 430 /* Disable interrupts */ 431 // instance->registers->interrupt_disable = I_SF | I_OC; 432 // usb_log_debug2("Disabling interrupts: %x.\n", 433 // instance->registers->interrupt_disable); 434 // instance->registers->interrupt_disable = I_MI; 430 435 431 436 /* Set periodic start to 90% */ … … 492 497 instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa); 493 498 499 /* Init interrupt code */ 500 instance->interrupt_code.cmds = instance->interrupt_commands; 501 { 502 /* Read status register */ 503 instance->interrupt_commands[0].cmd = CMD_MEM_READ_32; 504 instance->interrupt_commands[0].dstarg = 1; 505 instance->interrupt_commands[0].addr = (void*) 506 addr_to_phys((void*)&instance->registers->interrupt_status); 507 508 /* Test whether we are the interrupt cause */ 509 instance->interrupt_commands[1].cmd = CMD_BTEST; 510 instance->interrupt_commands[1].value = 511 OHCI_USED_INTERRUPTS; 512 instance->interrupt_commands[1].srcarg = 1; 513 instance->interrupt_commands[1].dstarg = 2; 514 515 /* Predicate cleaning and accepting */ 516 instance->interrupt_commands[2].cmd = CMD_PREDICATE; 517 instance->interrupt_commands[2].value = 2; 518 instance->interrupt_commands[2].srcarg = 2; 519 520 /* Write clean status register */ 521 instance->interrupt_commands[3].cmd = CMD_PIO_WRITE_A_32; 522 instance->interrupt_commands[3].srcarg = 1; 523 instance->interrupt_commands[3].addr = (void*) 524 addr_to_phys((void*)&instance->registers->interrupt_status); 525 526 /* Accept interrupt */ 527 instance->interrupt_commands[4].cmd = CMD_ACCEPT; 528 529 instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS; 530 } 531 494 532 return EOK; 495 533 }
Note:
See TracChangeset
for help on using the changeset viewer.