kernel: cleanup the software mouse cursor mess

[plan9front.git] / sys / src / 9 / pc / usbehci.h

diff --git a/sys/src/9/pc/usbehci.h b/sys/src/9/pc/usbehci.h
index f3bf0f7604d76d0e4228ba6df03e64d9a18b7089..8239ce752ab166548d35f11ea137e164dca82f98 100644 (file)
--- a/sys/src/9/pc/usbehci.h
+++ b/sys/src/9/pc/usbehci.h
@@ -36,7 +36,7 @@ enum
        Cdbgportmask    = 0xF,
        C64             = 1,            /* 64-bits, in Ecapio capparms. */
        Ceecpshift      = 8,            /* extended capabilities ptr. in */
-       Ceecpmask       = 8,            /* the Ecapio capparms reg. */
+       Ceecpmask       = 0xFF,         /* the Ecapio capparms reg. */
        Clegacy         = 1,            /* legacy support cap. id */
        CLbiossem       = 2,            /* legacy cap. bios sem. */
        CLossem         = 3,            /* legacy cap. os sem */
@@ -170,10 +170,15 @@ struct Ctlr
        Lock;                   /* for ilock. qh lists and basic ctlr I/O */
        QLock   portlck;        /* for port resets/enable... (and doorbell) */
        int     active;         /* in use or not */
+       uintptr base;
        Pcidev* pcidev;
        Ecapio* capio;          /* Capability i/o regs */
        Eopio*  opio;           /* Operational i/o regs */
 
+       void*   (*tdalloc)(ulong,int,ulong);
+       void*   (*dmaalloc)(ulong);
+       void    (*dmafree)(void*);
+
        int     nframes;        /* 1024, 512, or 256 frames in the list */
        ulong*  frames;         /* periodic frame list (hw) */
        Qh*     qhs;            /* async Qh circular list for bulk/ctl */