git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modules/EHCI - Debugging EHCI, still broken
[tpg/acess2.git]
/
KernelLand
/
Modules
/
USB
/
Core
/
usb.c
diff --git
a/KernelLand/Modules/USB/Core/usb.c
b/KernelLand/Modules/USB/Core/usb.c
index
405a508
..
3234a77
100644
(file)
--- a/
KernelLand/Modules/USB/Core/usb.c
+++ b/
KernelLand/Modules/USB/Core/usb.c
@@
-21,20
+21,17
@@
extern tUSBDriver gUSBHub_Driver;
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts);
// === GLOBALS ===
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts);
// === GLOBALS ===
+tMutex glUSB_Hosts;
+tUSBHost *gUSB_Hosts = NULL;
+tMutex glUSB_InterfaceDrivers;
tUSBDriver *gpUSB_InterfaceDrivers = &gUSBHub_Driver;
// === CODE ===
tUSBDriver *gpUSB_InterfaceDrivers = &gUSBHub_Driver;
// === CODE ===
-void USB_RegisterDriver(tUSBDriver *Driver)
-{
- Driver->Next = gpUSB_InterfaceDrivers;
- gpUSB_InterfaceDrivers = Driver;
-}
-
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
{
tUSBHost *host;
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
{
tUSBHost *host;
- host = malloc(sizeof(tUSBHost) + nPorts*sizeof(
void*
));
+ host = malloc(sizeof(tUSBHost) + nPorts*sizeof(
tUSBHubPort
));
if(!host) {
// Oh, bugger.
return NULL;
if(!host) {
// Oh, bugger.
return NULL;
@@
-46,6
+43,8
@@
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
host->RootHubDev.ParentHub = NULL;
host->RootHubDev.Host = host;
host->RootHubDev.Address = 0;
host->RootHubDev.ParentHub = NULL;
host->RootHubDev.Host = host;
host->RootHubDev.Address = 0;
+ ASSERT(HostDef->InitControl);
+ host->RootHubDev.EndpointHandles[0] = HostDef->InitControl(ControllerPtr, 0, 64);
// host->RootHubIf.Next = NULL;
host->RootHubIf.Dev = &host->RootHubDev;
// host->RootHubIf.Next = NULL;
host->RootHubIf.Dev = &host->RootHubDev;
@@
-55,11
+54,13
@@
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
host->RootHub.Interface = &host->RootHubIf;
host->RootHub.nPorts = nPorts;
host->RootHub.Interface = &host->RootHubIf;
host->RootHub.nPorts = nPorts;
- memset(host->RootHub.
Devices, 0, sizeof(void*
)*nPorts);
+ memset(host->RootHub.
Ports, 0, sizeof(tUSBHubPort
)*nPorts);
- // TODO: Lock
+ // Append to list
+ Mutex_Acquire( &glUSB_Hosts );
host->Next = gUSB_Hosts;
gUSB_Hosts = host;
host->Next = gUSB_Hosts;
gUSB_Hosts = host;
+ Mutex_Release( &glUSB_Hosts );
return &host->RootHub;
}
return &host->RootHub;
}
@@
-67,7
+68,12
@@
tUSBHub *USB_RegisterHost(tUSBHostDef *HostDef, void *ControllerPtr, int nPorts)
// --- Drivers ---
void USB_RegisterDriver(tUSBDriver *Driver)
{
// --- Drivers ---
void USB_RegisterDriver(tUSBDriver *Driver)
{
- Log_Warning("USB", "TODO: Implement USB_RegisterDriver");
+ Mutex_Acquire( &glUSB_InterfaceDrivers );
+ Driver->Next = gpUSB_InterfaceDrivers;
+ gpUSB_InterfaceDrivers = Driver;
+ Mutex_Release( &glUSB_InterfaceDrivers );
+
+ // TODO: Recheck devices that didn't have a driver
}
tUSBDriver *USB_int_FindDriverByClass(Uint32 ClassCode)
}
tUSBDriver *USB_int_FindDriverByClass(Uint32 ClassCode)
@@
-93,10
+99,10
@@
tUSBHub *USB_RegisterHub(tUSBInterface *Device, int PortCount)
{
tUSBHub *ret;
{
tUSBHub *ret;
- ret = malloc(sizeof(tUSBHub) + sizeof(ret->
Device
s[0])*PortCount);
+ ret = malloc(sizeof(tUSBHub) + sizeof(ret->
Port
s[0])*PortCount);
ret->Interface = Device;
ret->nPorts = PortCount;
ret->Interface = Device;
ret->nPorts = PortCount;
- memset(ret->
Devices, 0, sizeof(ret->Device
s[0])*PortCount);
+ memset(ret->
Ports, 0, sizeof(ret->Port
s[0])*PortCount);
return ret;
}
return ret;
}
@@
-104,7
+110,7
@@
void USB_RemoveHub(tUSBHub *Hub)
{
for( int i = 0; i < Hub->nPorts; i ++ )
{
{
for( int i = 0; i < Hub->nPorts; i ++ )
{
- if( Hub->
Devices[i]
)
+ if( Hub->
Ports[i].Dev
)
{
USB_DeviceDisconnected( Hub, i );
}
{
USB_DeviceDisconnected( Hub, i );
}
UCC
git Repository :: git.ucc.asn.au