Changeset 20226 in vbox

Timestamp:

Jun 3, 2009 10:09:48 AM (16 years ago)

Author:

vboxsync

Message:

usb: Removed remnants of a failed attempts to create a shared USB timer.

Location:

trunk/include/VBox

Files:

• pdmifs.h (modified) (1 diff)
• vusb.h (modified) (3 diffs)

trunk/include/VBox/pdmifs.h

@@ -151 +151 @@
     PDMINTERFACE_VUSB_DEVICE,
 
-    /** VUSBITIMER              - VUSB Timer interface.                 (Up)     No coupling. */
-    PDMINTERFACE_VUSB_TIMER,
-
     /** PDMIHOSTPARALLELPORT    - The Host Parallel port interface.     (Down)   Coupled with PDMINTERFACE_HOST_PARALLEL_CONNECTOR. */
     PDMINTERFACE_HOST_PARALLEL_PORT,

trunk/include/VBox/vusb.h

@@ -326 +326 @@
 
 
-/**
- * USB frame timer callback function.
- *
- * @param   pDevIns         Device instance of the device which registered the timer.
- * @param   pTimer          The timer handle.
- */
-typedef DECLCALLBACK(void) FNUSBTIMERDEV(PPDMDEVINS pDevIns, PTMTIMER pTimer);
-/** Pointer to a device timer callback function. */
-typedef FNUSBTIMERDEV *PFNUSBTIMERDEV;
-
 /** Pointer to a VBox USB device interface. */
 typedef struct VUSBIDEVICE      *PVUSBIDEVICE;
@@ -341 +331 @@
 /** Pointer to a VUSB RootHub port interface. */
 typedef struct VUSBIROOTHUBPORT *PVUSBIROOTHUBPORT;
-
-/** Pointer to a VBox USB timer interface. */
-typedef struct VUSBITIMER       *PVUSBITIMER;
 
 /** Pointer to an USB request descriptor. */
@@ -775 +762 @@
 {
     return pInterface->pfnGetState(pInterface);
-}
-#endif /* IN_RING3 */
-
-
-/**
- * USB Timer Interface.
- * @todo r=bird: why is this code still here?
- */
-typedef struct VUSBITIMER
-{
-    /**
-     * Sets up initial frame timer parameters.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the timer interface structure.
-     * @param   pfnCallback     Pointer to the timer callback function.
-     * @param   rate            Requested frame rate (normally 1,000).
-     */
-    DECLR3CALLBACKMEMBER(int, pfnTimerSetup,(PVUSBITIMER pInterface, PFNUSBTIMERDEV pfnCallback, uint32_t rate));
-
-    /**
-     * Requests another tick of the frame timer.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the timer interface structure.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnTimerSetNext,(PVUSBITIMER pInterface));
-
-    /**
-     * Stops the frame timer for the caller.
-     *
-     * @returns VBox status code.
-     * @param   pInterface      Pointer to the timer interface structure.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnTimerStop,(PVUSBITIMER pInterface));
-
-} VUSBITIMER;
-
-
-#ifdef IN_RING3
-/**
- * Sets up initial frame timer parameters.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the timer interface structure.
- * @param   pfnCallback     Pointer to the timer callback function.
- * @param   rate            Requested frame rate (normally 1,000).
- */
-DECLINLINE(int) VUSBITimerSetup(PVUSBITIMER pInterface, PFNUSBTIMERDEV pfnCallback, uint32_t rate)
-{
-    return pInterface->pfnTimerSetup(pInterface, pfnCallback, rate);
-}
-
-/**
- * Requests another tick of the USB frame timer.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the timer interface structure.
- */
-DECLINLINE(int) VUSBITimerSetNext(PVUSBITIMER pInterface)
-{
-    return pInterface->pfnTimerSetNext(pInterface);
-}
-
-/**
- * Stops the USB frame timer for the caller.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the timer interface structure.
- */
-DECLINLINE(int) VUSBITimerStop(PVUSBITIMER pInterface)
-{
-    return pInterface->pfnTimerStop(pInterface);
 }
 #endif /* IN_RING3 */