Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 8986412 in mainline


Ignore:
Timestamp:
2011-04-23T10:26:26Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
564a2b3, f7ccf46
Parents:
302a4b6
Message:

Fix interrupt vs. status register values

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/uhci-hcd/hc.c

    r302a4b6 r8986412  
    4444#include "hc.h"
    4545
    46 #define UHCI_STATUS_ALLOW_INTERRUPTS \
     46#define UHCI_INTR_ALLOW_INTERRUPTS \
    4747    (UHCI_INTR_CRC | UHCI_INTR_COMPLETE | UHCI_INTR_SHORT_PACKET)
     48#define UHCI_STATUS_USED_INTERRUPTS \
     49    (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)
    4850
    4951
     
    139141                /* Enable all interrupts, but resume interrupt */
    140142                pio_write_16(&instance->registers->usbintr,
    141                     UHCI_STATUS_ALLOW_INTERRUPTS);
     143                    UHCI_INTR_ALLOW_INTERRUPTS);
    142144        }
    143145
     
    183185                instance->interrupt_commands[1].cmd = CMD_BTEST;
    184186                instance->interrupt_commands[1].value =
    185                     UHCI_STATUS_ALLOW_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS;
     187                    UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS;
    186188                instance->interrupt_commands[1].srcarg = 1;
    187189                instance->interrupt_commands[1].dstarg = 2;
     
    332334{
    333335        assert(instance);
    334         usb_log_info("Got interrupt: %x.\n", status);
    335336        /* Lower 2 bits are transaction error and transaction complete */
    336337        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
Note: See TracChangeset for help on using the changeset viewer.