Changes in uspace/drv/ohci/hc.c [c8eddf4:4125b7d] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/ohci/hc.c
rc8eddf4 r4125b7d 45 45 #include "hcd_endpoint.h" 46 46 47 #define OHCI_USED_INTERRUPTS \48 (I_SO | I_WDH | I_UE | I_RHSC)49 47 static int interrupt_emulator(hc_t *instance); 50 48 static void hc_gain_control(hc_t *instance); … … 287 285 { 288 286 assert(instance); 287 if ((status & ~IS_SF) == 0) /* ignore sof status */ 288 return; 289 if (status & IS_RHSC) 290 rh_interrupt(&instance->rh); 291 289 292 usb_log_debug("OHCI interrupt: %x.\n", status); 290 if ((status & ~I_SF) == 0) /* ignore sof status */ 291 return; 292 if (status & I_RHSC) 293 rh_interrupt(&instance->rh); 294 295 296 if (status & I_WDH) { 293 294 if (status & IS_WDH) { 297 295 fibril_mutex_lock(&instance->guard); 298 296 usb_log_debug2("HCCA: %p-%#" PRIx32 " (%p).\n", instance->hcca, … … 334 332 { 335 333 assert(instance); 336 usb_log_debug("Requesting OHCI control.\n");337 334 /* Turn off legacy emulation */ 338 335 volatile uint32_t *ohci_emulation_reg = … … 340 337 usb_log_debug("OHCI legacy register %p: %x.\n", 341 338 ohci_emulation_reg, *ohci_emulation_reg); 342 *ohci_emulation_reg &= ~0x1;339 *ohci_emulation_reg = 0; 343 340 344 341 /* Interrupt routing enabled => smm driver is active */ … … 424 421 instance->registers->control); 425 422 426 /* Enable interrupts */ 427 instance->registers->interrupt_enable = OHCI_USED_INTERRUPTS; 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; 428 428 usb_log_debug2("Enabled interrupts: %x.\n", 429 429 instance->registers->interrupt_enable); 430 instance->registers->interrupt_enable = I_MI;431 430 432 431 /* Set periodic start to 90% */ … … 493 492 instance->lists[USB_TRANSFER_INTERRUPT].list_head_pa); 494 493 495 /* Init interrupt code */496 instance->interrupt_code.cmds = instance->interrupt_commands;497 {498 /* Read status register */499 instance->interrupt_commands[0].cmd = CMD_MEM_READ_32;500 instance->interrupt_commands[0].dstarg = 1;501 instance->interrupt_commands[0].addr =502 (void*)&instance->registers->interrupt_status;503 504 /* Test whether we are the interrupt cause */505 instance->interrupt_commands[1].cmd = CMD_BTEST;506 instance->interrupt_commands[1].value =507 OHCI_USED_INTERRUPTS;508 instance->interrupt_commands[1].srcarg = 1;509 instance->interrupt_commands[1].dstarg = 2;510 511 /* Predicate cleaning and accepting */512 instance->interrupt_commands[2].cmd = CMD_PREDICATE;513 instance->interrupt_commands[2].value = 2;514 instance->interrupt_commands[2].srcarg = 2;515 516 /* Write clean status register */517 instance->interrupt_commands[3].cmd = CMD_MEM_WRITE_A_32;518 instance->interrupt_commands[3].srcarg = 1;519 instance->interrupt_commands[3].addr =520 (void*)&instance->registers->interrupt_status;521 522 /* Accept interrupt */523 instance->interrupt_commands[4].cmd = CMD_ACCEPT;524 525 instance->interrupt_code.cmdcount = OHCI_NEEDED_IRQ_COMMANDS;526 }527 528 494 return EOK; 529 495 }
Note:
See TracChangeset
for help on using the changeset viewer.