From 8024db25a8b9a380d73fd0198f4203f514f4b5dd Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 6 Apr 2008 14:14:42 +0000 Subject: [PATCH] Change just host_controller_info to usb_host_controller_info for the sake of clearity as suggested by Philippe Houdoin once and brought to my attention by Slavatore. As this definition is completely private to the USB stack it would not have caused any conflicts though. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24828 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/usb/Stack.cpp | 2 +- src/add-ons/kernel/bus_managers/usb/usb_p.h | 2 +- src/add-ons/kernel/busses/usb/ehci.cpp | 2 +- src/add-ons/kernel/busses/usb/ohci.cpp | 2 +- src/add-ons/kernel/busses/usb/uhci.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/usb/Stack.cpp b/src/add-ons/kernel/bus_managers/usb/Stack.cpp index 4f607c38a8..d5b4d0a4df 100644 --- a/src/add-ons/kernel/bus_managers/usb/Stack.cpp +++ b/src/add-ons/kernel/bus_managers/usb/Stack.cpp @@ -61,7 +61,7 @@ Stack::Stack() bufferSize = sizeof(moduleName); TRACE(("USB Stack: found module %s\n", moduleName)); - host_controller_info *module = NULL; + usb_host_controller_info *module = NULL; if (get_module(moduleName, (module_info **)&module) != B_OK) continue; diff --git a/src/add-ons/kernel/bus_managers/usb/usb_p.h b/src/add-ons/kernel/bus_managers/usb/usb_p.h index 9bf7f3d3ec..3bf535a9cf 100644 --- a/src/add-ons/kernel/bus_managers/usb/usb_p.h +++ b/src/add-ons/kernel/bus_managers/usb/usb_p.h @@ -35,7 +35,7 @@ class Object; class PhysicalMemoryAllocator; -struct host_controller_info { +struct usb_host_controller_info { module_info info; status_t (*control)(uint32 op, void *data, size_t length); status_t (*add_to)(Stack *stack); diff --git a/src/add-ons/kernel/busses/usb/ehci.cpp b/src/add-ons/kernel/busses/usb/ehci.cpp index a18a69afaa..7b78b5e466 100644 --- a/src/add-ons/kernel/busses/usb/ehci.cpp +++ b/src/add-ons/kernel/busses/usb/ehci.cpp @@ -32,7 +32,7 @@ ehci_std_ops(int32 op, ...) } -host_controller_info ehci_module = { +usb_host_controller_info ehci_module = { { "busses/usb/ehci", 0, diff --git a/src/add-ons/kernel/busses/usb/ohci.cpp b/src/add-ons/kernel/busses/usb/ohci.cpp index 789db5051c..70feeb72ec 100644 --- a/src/add-ons/kernel/busses/usb/ohci.cpp +++ b/src/add-ons/kernel/busses/usb/ohci.cpp @@ -33,7 +33,7 @@ ohci_std_ops(int32 op, ...) } -host_controller_info ohci_module = { +usb_host_controller_info ohci_module = { { "busses/usb/ohci", 0, diff --git a/src/add-ons/kernel/busses/usb/uhci.cpp b/src/add-ons/kernel/busses/usb/uhci.cpp index 3b13824d71..1bda099364 100644 --- a/src/add-ons/kernel/busses/usb/uhci.cpp +++ b/src/add-ons/kernel/busses/usb/uhci.cpp @@ -36,7 +36,7 @@ uhci_std_ops(int32 op, ...) } -host_controller_info uhci_module = { +usb_host_controller_info uhci_module = { { "busses/usb/uhci", 0,