Skip to content

Enable connecting devices to the root hub directly #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
boochow wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Enable connecting devices to the root hub directly #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f49e6b5
fix: do not enable Split if low speed device is connected to root hub…
boochow Feb 24, 2018
4f73f0b
fix: wait 25msec when a FS/LS device connected to the route hub retur…
boochow Feb 25, 2018
e187bbe
refactor: move 'complete split' codes and its error check codes into …
boochow Feb 25, 2018
73c1b85
Merge pull request #1 from boochow/develop
boochow Mar 3, 2018
2d7f8b6
fix: set ConnectedChanged bit when a device is unplugged from the roo…
boochow Mar 4, 2018
da2be4f
Merge pull request #2 from boochow/develop
boochow Mar 4, 2018
63bbfa0
fix warning message "extra tokens at end of #endif" of hid.h
boochow May 5, 2018
7a8329b
fix: check connection status only when the port belongs to root hub
boochow Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/device/hid/hid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ Result HidAttach(struct UsbDevice *device, u32 interfaceNumber);
}
#endif

#endif HID_H_
#endif // HID_H_
11 changes: 9 additions & 2 deletions source/device/hub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,16 +382,23 @@ Result HubCheckConnection(struct UsbDevice *device, u8 port) {
Result result;
struct HubPortFullStatus *portStatus;
struct HubDevice *data;
int prevConnected;

data = (struct HubDevice*)device->DriverData;
prevConnected = data->PortStatus[port].Status.Connected;

if ((result = HubPortGetStatus(device, port)) != OK) {
if (result != ErrorDisconnected)
LOGF("HUB: Failed to get hub port status (1) for %s.Port%d.\n", UsbGetDescription(device), port + 1);
return result;
}
portStatus = &data->PortStatus[port];

if (device == UsbGetRootHub()) {
if (prevConnected != portStatus->Status.Connected) {
portStatus->Change.ConnectedChanged = true;
}
}

if (portStatus->Change.ConnectedChanged) {
HubPortConnectionChanged(device, port);
}
Expand Down Expand Up @@ -549,4 +556,4 @@ Result HubAttach(struct UsbDevice *device, u32 interfaceNumber) {
}

return OK;
}
}
6 changes: 3 additions & 3 deletions source/hcd/dwc/designware20.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Result HcdPrepareChannel(struct UsbDevice *device, u8 channel,

// Clear split control.
ClearReg(&Host->Channel[channel].SplitControl);
if (pipe->Speed != High) {
if ((pipe->Speed != High) && (device->Parent != NULL) && (device->Parent->Speed == High) && (device->Parent->Parent != NULL)) {
Host->Channel[channel].SplitControl.SplitEnable = true;
Host->Channel[channel].SplitControl.HubAddress = device->Parent->Number;
Host->Channel[channel].SplitControl.PortAddress = device->PortNumber;
Expand Down Expand Up @@ -367,8 +367,8 @@ Result HcdChannelSendWaitOne(struct UsbDevice *device,
} while (true);
ReadBackReg(&Host->Channel[channel].TransferSize);

if (Host->Channel[channel].SplitControl.SplitEnable) {
if (Host->Channel[channel].Interrupt.Acknowledgement) {
if (pipe->Speed != High) {
if ((Host->Channel[channel].Interrupt.Acknowledgement) && (Host->Channel[channel].SplitControl.SplitEnable)) {
for (tries = 0; tries < 3; tries++) {
SetReg(&Host->Channel[channel].Interrupt);
WriteThroughReg(&Host->Channel[channel].Interrupt);
Expand Down