← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Devices/USB/VUSBInternal.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Devices/USB/VUSBInternal.h
211
211
    RTTHREAD            hResetThread;
212
212
    /** Pointer to the reset thread arguments. */
213
213
    void               *pvResetArgs;
 
214
    /** The reset timer handle. */
 
215
    PTMTIMER            pResetTimer;
214
216
} VUSBDEV;
215
217
 
216
218
 
337
339
    /** The HUB.
338
340
     * @todo remove this? */
339
341
    VUSBHUB                 Hub;
 
342
#if HC_ARCH_BITS == 32
 
343
    uint32_t                Alignment0;
 
344
#endif
340
345
    /** Address hash table. */
341
346
    PVUSBDEV                apAddrHash[VUSB_ADDR_HASHSZ];
342
347
    /** List of async URBs. */
353
358
 
354
359
    /** Chain of devices attached to this hub. */
355
360
    PVUSBDEV                pDevices;
356
 
#if HC_ARCH_BITS == 32
357
 
//    uint32_t                Alignment0;
358
 
#endif
359
361
    /** Availability Bitmap. */
360
362
    VUSBPORTBITMAP          Bitmap;
361
363