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_devinit.c
diff --git
a/KernelLand/Modules/USB/Core/usb_devinit.c
b/KernelLand/Modules/USB/Core/usb_devinit.c
index
6143bdb
..
0da8c85
100644
(file)
--- a/
KernelLand/Modules/USB/Core/usb_devinit.c
+++ b/
KernelLand/Modules/USB/Core/usb_devinit.c
@@
-29,7
+29,7
@@
void USB_DeviceConnected(tUSBHub *Hub, int Port)
tUSBDevice tmpdev;
tUSBDevice *dev = &tmpdev;
if( Port >= Hub->nPorts ) return ;
tUSBDevice tmpdev;
tUSBDevice *dev = &tmpdev;
if( Port >= Hub->nPorts ) return ;
- if( Hub->
Devices[Port] )
return ;
+ if( Hub->
Ports[Port].Dev )
return ;
ENTER("pHub iPort", Hub, Port);
ENTER("pHub iPort", Hub, Port);
@@
-325,7
+325,7
@@
void USB_DeviceConnected(tUSBHub *Hub, int Port)
free(full_buf);
}
free(full_buf);
}
- Hub->
Devices[Port]
= dev;
+ Hub->
Ports[Port].Dev
= dev;
// Done.
LEAVE('-');
// Done.
LEAVE('-');
@@
-334,11
+334,11
@@
void USB_DeviceConnected(tUSBHub *Hub, int Port)
void USB_DeviceDisconnected(tUSBHub *Hub, int Port)
{
tUSBDevice *dev;
void USB_DeviceDisconnected(tUSBHub *Hub, int Port)
{
tUSBDevice *dev;
- if( !Hub->
Devices[Port]
) {
+ if( !Hub->
Ports[Port].Dev
) {
Log_Error("USB", "Non-registered device disconnected");
return;
}
Log_Error("USB", "Non-registered device disconnected");
return;
}
- dev = Hub->
Devices[Port]
;
+ dev = Hub->
Ports[Port].Dev
;
// TODO: Free related resources
// - Endpoint registrations
// TODO: Free related resources
// - Endpoint registrations
@@
-351,8
+351,9
@@
void USB_DeviceDisconnected(tUSBHub *Hub, int Port)
// - Bus Address
USB_int_DeallocateAddress(dev->Host, dev->Address);
// - Inform handler
// - Bus Address
USB_int_DeallocateAddress(dev->Host, dev->Address);
// - Inform handler
- // -
Allocat
e memory
+ // -
Releas
e memory
free(dev);
free(dev);
+ Hub->Ports[Port].Dev = NULL;
}
void *USB_GetDeviceDataPtr(tUSBInterface *Dev) { return Dev->Data; }
}
void *USB_GetDeviceDataPtr(tUSBInterface *Dev) { return Dev->Data; }
UCC
git Repository :: git.ucc.asn.au