Changeset eae83aa in mainline


Ignore:
Timestamp:
2011-03-05T00:33:28Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
474d08e, 5079242
Parents:
c5b93dc
Message:

Use SPD on IN packets, use proper PID type

Location:
uspace/drv/uhci-hcd
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/batch.c

    rc5b93dc reae83aa  
    4747static int batch_schedule(batch_t *instance);
    4848
    49 static void batch_control(
    50     batch_t *instance, int data_stage, int status_stage);
    51 static void batch_data(batch_t *instance, int pid);
     49static void batch_control(batch_t *instance,
     50    usb_packet_id data_stage, usb_packet_id status_stage);
     51static void batch_data(batch_t *instance, usb_packet_id pid);
    5252static void batch_call_in(batch_t *instance);
    5353static void batch_call_out(batch_t *instance);
    … …  
    232232}
    233233/*----------------------------------------------------------------------------*/
    234 static void batch_data(batch_t *instance, int pid)
     234static void batch_data(batch_t *instance, usb_packet_id pid)
    235235{
    236236        assert(instance);
    … …  
    266266}
    267267/*----------------------------------------------------------------------------*/
    268 static void batch_control(
    269     batch_t *instance, int data_stage, int status_stage)
     268static void batch_control(batch_t *instance,
     269   usb_packet_id data_stage, usb_packet_id status_stage)
    270270{
    271271        assert(instance);

  • uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.c

    rc5b93dc reae83aa  
    3939
    4040void td_init(td_t *instance, int err_count, size_t size, bool toggle, bool iso,
    41     bool low_speed, usb_target_t target, int pid, void *buffer, td_t *next)
     41    bool low_speed, usb_target_t target, usb_packet_id pid, void *buffer, td_t *next)
    4242{
    4343        assert(instance);
    4444        assert(size < 1024);
     45        assert((pid == USB_PID_SETUP) || (pid == USB_PID_IN) || (pid == USB_PID_OUT));
    4546
    4647        instance->next = 0
    … …  
    5354            | (iso ? TD_STATUS_ISOCHRONOUS_FLAG : 0)
    5455            | TD_STATUS_ERROR_ACTIVE;
     56
     57        if (pid == USB_PID_IN && !iso) {
     58                instance->status |= TD_STATUS_SPD_FLAG;
     59        }
    5560
    5661        instance->device = 0

  • uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

    rc5b93dc reae83aa  
    9292
    9393void td_init(td_t *instance, int error_count, size_t size, bool toggle, bool iso,
    94     bool low_speed, usb_target_t target, int pid, void *buffer, td_t * next);
     94    bool low_speed, usb_target_t target, usb_packet_id pid, void *buffer,
     95    td_t *next);
    9596
    9697int td_status(td_t *instance);
Note: See TracChangeset for help on using the changeset viewer.