Changeset 1b0b86e6 in mainline for uspace/drv/uhci-hcd/iface.c

Timestamp:

2011-03-13T22:02:44Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b7d8fd9

Parents:

67f54965 (diff), deb4ba7 (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:

Merge development/ changes

File:

• uspace/drv/uhci-hcd/iface.c (modified) (13 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -40 +40 @@
 
 #include "iface.h"
-#include "uhci.h"
+#include "uhci_hc.h"
 #include "utils/device_keeper.h"
 
@@ -53 +53 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_log_debug("Default address request with speed %d.\n", speed);
@@ -68 +68 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_log_debug("Default address release.\n");
@@ -86 +86 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         assert(address);
@@ -109 +109 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_log_debug("Address bind %d-%d.\n", address, handle);
@@ -125 +125 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_log_debug("Address release %d.\n", address);
@@ -148 +148 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -180 +180 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -211 +211 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -243 +243 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
         assert(hc);
         usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
@@ -277 +277 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
-        assert(hc);
-        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
-        usb_log_debug("Control WRITE %d:%d %zu(%zu).\n",
-            target.address, target.endpoint, size, max_packet_size);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
+        assert(hc);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+        usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
+            speed, target.address, target.endpoint, size, max_packet_size);
 
         if (setup_size != 8)
@@ -315 +315 @@
 {
         assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
-        assert(hc);
-        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
-
-        usb_log_debug("Control READ %d:%d %zu(%zu).\n",
-            target.address, target.endpoint, size, max_packet_size);
+        uhci_hc_t *hc = fun_to_uhci_hc(fun);
+        assert(hc);
+        usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+
+        usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
+            speed, target.address, target.endpoint, size, max_packet_size);
         batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
             max_packet_size, speed, data, size, setup_data, setup_size, callback,
@@ -330 +330 @@
 }
 /*----------------------------------------------------------------------------*/
-usbhc_iface_t uhci_iface = {
+usbhc_iface_t uhci_hc_iface = {
         .reserve_default_address = reserve_default_address,
         .release_default_address = release_default_address,