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

Changeset 6c69d19 in mainline for uspace/drv/bus/usb/ohci/root_hub.h


Ignore:
Timestamp:
2011-07-25T20:34:17Z (10 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master
Children:
00c2de63, c936c7f
Parents:
5889fc74 (diff), d542aad (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge libposix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/ohci/root_hub.h

    r5889fc74 r6c69d19  
    4141#include "batch.h"
    4242
     43#define HUB_DESCRIPTOR_MAX_SIZE (7 + 2 + 2)
     44
    4345/**
    4446 * ohci root hub representation
     
    5153        /** hub port count */
    5254        size_t port_count;
    53         /** hubs descriptors */
    54         usb_device_descriptors_t descriptors;
    5555        /** interrupt transfer waiting for an actual interrupt to occur */
    56         usb_transfer_batch_t * unfinished_interrupt_transfer;
    57         /** pre-allocated interrupt mask
    58          *
    59          * This is allocated when initializing instance, so that memory
    60          * allocation is not needed when processing request. Buffer is used for
    61          * interrupt bitmask.
    62          */
    63         uint8_t * interrupt_buffer;
     56        usb_transfer_batch_t *unfinished_interrupt_transfer;
    6457        /** size of interrupt buffer */
    6558        size_t interrupt_mask_size;
    66         /** instance`s descriptor*/
    67         uint8_t * hub_descriptor;
     59        /** Descriptors */
     60        struct {
     61                usb_standard_configuration_descriptor_t configuration;
     62                usb_standard_interface_descriptor_t interface;
     63                usb_standard_endpoint_descriptor_t endpoint;
     64                uint8_t hub[HUB_DESCRIPTOR_MAX_SIZE];
     65        } __attribute__ ((packed)) descriptors;
    6866        /** size of hub descriptor */
    69         size_t descriptor_size;
    70 
     67        size_t hub_descriptor_size;
    7168
    7269} rh_t;
    7370
    74 int rh_init(rh_t *instance, ohci_regs_t *regs);
     71void rh_init(rh_t *instance, ohci_regs_t *regs);
    7572
    76 int rh_request(rh_t *instance, usb_transfer_batch_t *request);
     73void rh_request(rh_t *instance, usb_transfer_batch_t *request);
    7774
    7875void rh_interrupt(rh_t *instance);
Note: See TracChangeset for help on using the changeset viewer.