diff options
| author | Jesse Buhagiar <jesse.buhagiar@student.rmit.edu.au> | 2020-11-10 16:59:09 +1100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-01-09 13:48:15 +0100 |
| commit | 33d73c600c4f4203c9c2a4bab3210750e18873df (patch) | |
| tree | c2abfd852cde2cb1f4b4b3702136b0e9bc8b1954 /Kernel | |
| parent | 0dbb9361b8940171078ccc7d29e127a703b52e8d (diff) | |
| download | serenity-33d73c600c4f4203c9c2a4bab3210750e18873df.zip | |
Kernel/USB: Move USB classes into `USB` namespace
The entire USB spec involves more than just UHCI, so
let's put everything into it's own nice namespace :^)
Diffstat (limited to 'Kernel')
| -rw-r--r-- | Kernel/Devices/USB/UHCIController.cpp | 4 | ||||
| -rw-r--r-- | Kernel/Devices/USB/UHCIController.h | 2 | ||||
| -rw-r--r-- | Kernel/init.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Kernel/Devices/USB/UHCIController.cpp b/Kernel/Devices/USB/UHCIController.cpp index 9fb51ba0eb..a6a997050b 100644 --- a/Kernel/Devices/USB/UHCIController.cpp +++ b/Kernel/Devices/USB/UHCIController.cpp @@ -19,7 +19,7 @@ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -28,7 +28,7 @@ #define UHCI_ENABLED 0 -namespace Kernel { +namespace Kernel::USB { static constexpr u16 UHCI_USBCMD_RUN = 0x0001; static constexpr u16 UHCI_USBCMD_HOST_CONTROLLER_RESET = 0x0002; diff --git a/Kernel/Devices/USB/UHCIController.h b/Kernel/Devices/USB/UHCIController.h index 88f1d52051..2bea92b24a 100644 --- a/Kernel/Devices/USB/UHCIController.h +++ b/Kernel/Devices/USB/UHCIController.h @@ -29,7 +29,7 @@ #include <Kernel/IO.h> #include <Kernel/PCI/Device.h> -namespace Kernel { +namespace Kernel::USB { class UHCIController final : public PCI::Device { public: diff --git a/Kernel/init.cpp b/Kernel/init.cpp index c279265fb4..8beb09ea94 100644 --- a/Kernel/init.cpp +++ b/Kernel/init.cpp @@ -246,7 +246,7 @@ void init_stage2(void*) } } - UHCIController::detect(); + USB::UHCIController::detect(); E1000NetworkAdapter::detect(); RTL8139NetworkAdapter::detect(); |