Changeset b357377 in mainline for uspace/drv

Timestamp:

2018-01-25T02:05:57Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d369b3b

Parents:

5f0b366

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 01:23:20)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 02:05:57)

Message:

usbhost: make bandwidth accounting a usb2_bus-thing

Location:

uspace/drv/bus/usb

Files:

• ehci/ehci_bus.c (modified) (2 diffs)
• ohci/ohci_bus.c (modified) (2 diffs)
• uhci/hc.c (modified) (2 diffs)
• vhc/transfer.c (modified) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_bus.c

@@ -163 +163 @@
         .endpoint_register = ehci_register_ep,
         .endpoint_unregister = ehci_unregister_ep,
-        .endpoint_count_bw = bandwidth_count_usb20,
 
         .batch_create = ehci_create_batch,
@@ -178 +177 @@
         bus_t *bus_base = (bus_t *) bus;
 
-        usb2_bus_init(usb2_bus, BANDWIDTH_AVAILABLE_USB20);
+        usb2_bus_init(usb2_bus, &bandwidth_accounting_usb2);
         bus_base->ops = &ehci_bus_ops;
 

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -171 +171 @@
         .endpoint_register = ohci_register_ep,
         .endpoint_unregister = ohci_unregister_ep,
-        .endpoint_count_bw = bandwidth_count_usb11,
 
         .batch_create = ohci_create_batch,
@@ -187 +186 @@
         bus_t *bus_base = (bus_t *) bus;
 
-        usb2_bus_init(usb2_bus, BANDWIDTH_AVAILABLE_USB11);
+        usb2_bus_init(usb2_bus, &bandwidth_accounting_usb11);
         bus_base->ops = &ohci_bus_ops;
 

uspace/drv/bus/usb/uhci/hc.c

@@ -418 +418 @@
         .endpoint_register = endpoint_register,
         .endpoint_unregister = endpoint_unregister,
-        .endpoint_count_bw = bandwidth_count_usb11,
 
         .batch_create = create_transfer_batch,
@@ -439 +438 @@
         assert(instance);
 
-        usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11);
+        usb2_bus_init(&instance->bus, &bandwidth_accounting_usb11);
 
         bus_t *bus = (bus_t *) &instance->bus;

uspace/drv/bus/usb/vhc/transfer.c

@@ -166 +166 @@
         .parent = &usb2_bus_ops,
 
-        .endpoint_count_bw = bandwidth_count_usb11,
         .batch_create = batch_create,
         .batch_schedule = vhc_schedule,
@@ -176 +175 @@
         list_initialize(&instance->devices);
         fibril_mutex_initialize(&instance->guard);
-        usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11);
+        usb2_bus_init(&instance->bus, &bandwidth_accounting_usb11);
         instance->bus.base.ops = &vhc_bus_ops;
         return virthub_init(&instance->hub, "root hub");