Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/usbhub/main.c

    r09daa8b rdff940f8  
    3636#include <stdio.h>
    3737
    38 #include <usb/devdrv.h>
    39 #include <usb/classes/classes.h>
    40 
    4138#include "usbhub.h"
    4239#include "usbhub_private.h"
    4340
    4441
    45 usb_endpoint_description_t hub_status_change_endpoint_description = {
    46         .transfer_type = USB_TRANSFER_INTERRUPT,
    47         .direction = USB_DIRECTION_IN,
    48         .interface_class = USB_CLASS_HUB,
    49         .interface_subclass = 0,
    50         .interface_protocol = 0,
    51         .flags = 0
     42usb_general_list_t usb_hub_list;
     43fibril_mutex_t usb_hub_list_lock;
     44
     45static driver_ops_t hub_driver_ops = {
     46        .add_device = usb_add_hub_device,
    5247};
    5348
    54 
    55 static usb_driver_ops_t usb_hub_driver_ops = {
    56         .add_device = usb_hub_add_device
     49static driver_t hub_driver = {
     50        .name = "usbhub",
     51        .driver_ops = &hub_driver_ops
    5752};
    58 
    59 static usb_driver_t usb_hub_driver = {
    60         .name = "usbhub",
    61         .ops = &usb_hub_driver_ops
    62 };
    63 
    6453
    6554int main(int argc, char *argv[])
    6655{
    6756        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
    68         usb_log_info("starting hub driver\n");
     57        dprintf(USB_LOG_LEVEL_INFO, "starting hub driver");
    6958
     59        //this is probably not needed anymore
     60        fibril_mutex_initialize(&usb_hub_list_lock);
     61        fibril_mutex_lock(&usb_hub_list_lock);
     62        usb_lst_init(&usb_hub_list);
     63        fibril_mutex_unlock(&usb_hub_list_lock);
    7064       
    71         usb_hub_driver.endpoints = (usb_endpoint_description_t**)
    72                         malloc(2 * sizeof(usb_endpoint_description_t*));
    73         usb_hub_driver.endpoints[0] = &hub_status_change_endpoint_description;
    74         usb_hub_driver.endpoints[1] = NULL;
    75 
    76         return usb_driver_main(&usb_hub_driver);
     65        return ddf_driver_main(&hub_driver);
    7766}
    7867
Note: See TracChangeset for help on using the changeset viewer.