mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 19:37:35 +00:00
Kernel: Renable UHCIController on 64-bit processors
This commit is contained in:
parent
7ba3c22931
commit
0b04363b01
4 changed files with 31 additions and 41 deletions
|
@ -27,9 +27,6 @@
|
|||
|
||||
#include <AK/Platform.h>
|
||||
|
||||
// FIXME: This should not be i386-specific.
|
||||
#if ARCH(I386)
|
||||
|
||||
#include <Kernel/Debug.h>
|
||||
#include <Kernel/Devices/USB/UHCIController.h>
|
||||
#include <Kernel/Process.h>
|
||||
|
@ -464,5 +461,3 @@ void UHCIController::handle_irq(const RegisterState&)
|
|||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -29,9 +29,6 @@
|
|||
|
||||
#include <AK/Platform.h>
|
||||
|
||||
// FIXME: This should not be i386-specific.
|
||||
#if ARCH(I386)
|
||||
|
||||
#include <AK/NonnullOwnPtr.h>
|
||||
#include <Kernel/Devices/USB/UHCIDescriptorTypes.h>
|
||||
#include <Kernel/IO.h>
|
||||
|
@ -105,4 +102,3 @@ private:
|
|||
};
|
||||
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#pragma once
|
||||
|
||||
#include <AK/OwnPtr.h>
|
||||
#include <AK/Ptr32.h>
|
||||
#include <AK/Types.h>
|
||||
|
||||
namespace Kernel::USB {
|
||||
|
@ -184,8 +185,8 @@ private:
|
|||
|
||||
// These values will be ignored by the controller, but we can use them for configuration/bookkeeping
|
||||
u32 m_paddr; // Physical address where this TransferDescriptor is located
|
||||
TransferDescriptor* m_next_td; // Pointer to first TD
|
||||
TransferDescriptor* m_prev_td; // Pointer to first TD
|
||||
Ptr32<TransferDescriptor> m_next_td { nullptr }; // Pointer to first TD
|
||||
Ptr32<TransferDescriptor> m_prev_td { nullptr }; // Pointer to first TD
|
||||
bool m_in_use; // Has this TD been allocated (and therefore in use)?
|
||||
};
|
||||
|
||||
|
@ -274,9 +275,9 @@ private:
|
|||
// These values will be ignored by the controller, but we can use them for configuration/bookkeeping
|
||||
// Any addresses besides `paddr` are assumed virtual and can be dereferenced
|
||||
u32 m_paddr { 0 }; // Physical address where this QueueHead is located
|
||||
QueueHead* m_next_qh { nullptr }; // Next QH
|
||||
QueueHead* m_prev_qh { nullptr }; // Previous QH
|
||||
TransferDescriptor* m_first_td { nullptr }; // Pointer to first TD
|
||||
Ptr32<QueueHead> m_next_qh { nullptr }; // Next QH
|
||||
Ptr32<QueueHead> m_prev_qh { nullptr }; // Previous QH
|
||||
Ptr32<TransferDescriptor> m_first_td { nullptr }; // Pointer to first TD
|
||||
bool m_in_use { false }; // Is this QH currently in use?
|
||||
};
|
||||
|
||||
|
|
|
@ -274,9 +274,7 @@ void init_stage2(void*)
|
|||
}
|
||||
|
||||
// FIXME: This should not be i386-specific.
|
||||
#if ARCH(I386)
|
||||
USB::UHCIController::detect();
|
||||
#endif
|
||||
|
||||
DMIExpose::initialize();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue