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

Changeset 561f41b in mainline for uspace/drv/uhci-hcd/main.c


Ignore:
Timestamp:
2011-05-07T16:00:10Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
60b3bea
Parents:
b23e9cc (diff), 3ae5ca8 (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:

Major refactoring #211 should be fixed

UHCI: all interrupts are either communication driven or fatal
OHCI: control is taken only after we can handle interrupts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/uhci-hcd/main.c

    rb23e9cc r561f41b  
    6464        assert(device);
    6565
    66         uhci_t *uhci = malloc(sizeof(uhci_t));
    67         if (uhci == NULL) {
    68                 usb_log_error("Failed to allocate UHCI driver.\n");
    69                 return ENOMEM;
    70         }
    71 
    72         int ret = uhci_init(uhci, device);
     66        int ret = device_setup_uhci(device);
    7367        if (ret != EOK) {
    7468                usb_log_error("Failed to initialize UHCI driver: %s.\n",
     
    7670                return ret;
    7771        }
    78         device->driver_data = uhci;
    79 
    8072        usb_log_info("Controlling new UHCI device '%s'.\n", device->name);
    8173
Note: See TracChangeset for help on using the changeset viewer.