RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 09:27:34 +00:00
Code Issues Activity Actions

Kernel/USB: Move USB classes into USB namespace

Browse source 
The entire USB spec involves more than just UHCI, so
let's put everything into it's own nice namespace :^)
This commit is contained in:
Jesse Buhagiar 2020-11-10 16:59:09 +11:00 • committed by Andreas Kling
parent 0dbb9361b8
commit 33d73c600c
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Devices/USB/UHCIController.cpp
View file

@ -19,7 +19,7 @@
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER * 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 * 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. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
@ -28,7 +28,7 @@
#define UHCI_ENABLED 0 #define UHCI_ENABLED 0
namespace Kernel { namespace Kernel::USB {
static constexpr u16 UHCI_USBCMD_RUN = 0x0001; static constexpr u16 UHCI_USBCMD_RUN = 0x0001;
static constexpr u16 UHCI_USBCMD_HOST_CONTROLLER_RESET = 0x0002; static constexpr u16 UHCI_USBCMD_HOST_CONTROLLER_RESET = 0x0002;

2
Kernel/Devices/USB/UHCIController.h
View file

@ -29,7 +29,7 @@
#include <Kernel/IO.h> #include <Kernel/IO.h>
#include <Kernel/PCI/Device.h> #include <Kernel/PCI/Device.h>
namespace Kernel { namespace Kernel::USB {
class UHCIController final : public PCI::Device { class UHCIController final : public PCI::Device {
public: public:

2
Kernel/init.cpp
View file

@ -246,7 +246,7 @@ void init_stage2(void*)
} }
} }
UHCIController::detect(); USB::UHCIController::detect();
E1000NetworkAdapter::detect(); E1000NetworkAdapter::detect();
RTL8139NetworkAdapter::detect(); RTL8139NetworkAdapter::detect();