← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/seabios/oneiric

« back to all changes in this revision

Viewing changes to src/usb.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2011-05-19 10:53:14 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110519105314-wiuwlesxcllvfv6l
Tags: 0.6.2-0ubuntu1
* Merge 0.6.2
  - explicitly add patch 88db9fd632bf3f650244ec69e2f4fd6b2aa5fd3d to
    fix FTBFS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/usb.c
94
94
    case USB_TYPE_UHCI:
95
95
        return uhci_alloc_bulk_pipe(&dummy);
96
96
    case USB_TYPE_OHCI:
97
 
        return NULL;
 
97
        return ohci_alloc_bulk_pipe(&dummy);
98
98
    case USB_TYPE_EHCI:
99
99
        return ehci_alloc_bulk_pipe(&dummy);
100
100
    }
108
108
    case USB_TYPE_UHCI:
109
109
        return uhci_send_bulk(pipe_fl, dir, data, datasize);
110
110
    case USB_TYPE_OHCI:
111
 
        return -1;
 
111
        return ohci_send_bulk(pipe_fl, dir, data, datasize);
112
112
    case USB_TYPE_EHCI:
113
113
        return ehci_send_bulk(pipe_fl, dir, data, datasize);
114
114
    }
259
259
        dummy.cntl = cntl;
260
260
        dummy.type = cntl->type;
261
261
        dummy.maxpacket = 8;
 
262
        dummy.path = (u64)-1;
262
263
        cntl->defaultpipe = defpipe = alloc_default_control_pipe(&dummy);
263
264
        if (!defpipe)
264
265
            return NULL;
294
295
    defpipe->devaddr = cntl->maxaddr;
295
296
    struct usb_pipe *pipe = alloc_default_control_pipe(defpipe);
296
297
    defpipe->devaddr = 0;
 
298
    if (hub->pipe)
 
299
        pipe->path = hub->pipe->path;
 
300
    pipe->path = (pipe->path << 8) | port;
297
301
    return pipe;
298
302
}
299
303
 
423
427
 
424
428
    dprintf(3, "init usb\n");
425
429
 
426
 
    usb_hid_setup();
427
 
 
428
430
    // Look for USB controllers
429
431
    int ehcibdf = -1;
430
432
    int count = 0;