Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XHCI: Remove unnecessary xhci_device::state field.

Browse Source 
It was only actually used to determine if a device was disabled
or not, which can be determined by checking the "slot" field
is "0" instead, as 0 is an invalid slot number.

No functional change (intended.)
This commit is contained in:
Augustin Cavalier 2020-02-17 14:13:40 -05:00
parent 6bff918400
commit 41e5cf016e
2 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/add-ons/kernel/busses/usb/xhci.cpp
View File

@ -1343,14 +1343,13 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
return NULL;
}
if (fDevices[slot].state != XHCI_STATE_DISABLED) {
if (fDevices[slot].slot != 0) {
TRACE_ERROR("AllocateDevice() slot already used\n");
return NULL;
}
struct xhci_device *device = &fDevices[slot];
memset(device, 0, sizeof(struct xhci_device));
device->state = XHCI_STATE_ENABLED;
device->slot = slot;
device->input_ctx_area = fStack->AllocateArea((void **)&device->input_ctx,
@ -1358,7 +1357,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
"XHCI input context");
if (device->input_ctx_area < B_OK) {
TRACE_ERROR("unable to create a input context area\n");
device->state = XHCI_STATE_DISABLED;
return NULL;
}
@ -1444,7 +1442,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
TRACE_ERROR("unable to create a device context area\n");
delete_area(device->input_ctx_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
memset(device->device_ctx, 0, sizeof(*device->device_ctx) << fContextSizeShift);
@ -1457,7 +1454,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
delete_area(device->input_ctx_area);
delete_area(device->device_ctx_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
@ -1496,7 +1492,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
delete_area(device->device_ctx_area);
delete_area(device->trb_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
@ -1507,11 +1502,9 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
delete_area(device->device_ctx_area);
delete_area(device->trb_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
device->state = XHCI_STATE_ADDRESSED;
device->address = SLOT_3_DEVICE_ADDRESS_GET(_ReadContext(
&device->device_ctx->slot.dwslot3));
@ -1553,7 +1546,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
delete_area(device->device_ctx_area);
delete_area(device->trb_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
@ -1598,7 +1590,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
delete_area(device->device_ctx_area);
delete_area(device->trb_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
@ -1631,7 +1622,6 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
delete_area(device->device_ctx_area);
delete_area(device->trb_area);
memset(device, 0, sizeof(xhci_device));
device->state = XHCI_STATE_DISABLED;
return NULL;
}
@ -1664,7 +1654,6 @@ XHCI::FreeDevice(Device *device)
delete_area(fDevices[slot].device_ctx_area);
memset(&fDevices[slot], 0, sizeof(xhci_device));
fDevices[slot].state = XHCI_STATE_DISABLED;
}
@ -1754,8 +1743,6 @@ XHCI::_InsertEndpointForPipe(Pipe *pipe)
TRACE("endpoint[%d] state 0x%08" B_PRIx32 "\n", id,
ENDPOINT_0_STATE_GET(_ReadContext(
&device->device_ctx->endpoints[id].dwendpoint0)));
device->state = XHCI_STATE_CONFIGURED;
}
pipe->SetControllerCookie(&device->endpoints[id]);
@ -1803,8 +1790,6 @@ XHCI::_RemoveEndpointForPipe(Pipe *pipe)
ConfigureEndpoint(device->input_ctx_addr, true, device->slot);
else
EvaluateContext(device->input_ctx_addr, device->slot);
device->state = XHCI_STATE_ADDRESSED;
}
pipe->SetControllerCookie(NULL);

9
src/add-ons/kernel/busses/usb/xhci.h
View File

@ -25,14 +25,6 @@ struct xhci_endpoint;
class XHCIRootHub;
enum xhci_state {
XHCI_STATE_DISABLED = 0,
XHCI_STATE_ENABLED,
XHCI_STATE_DEFAULT,
XHCI_STATE_ADDRESSED,
XHCI_STATE_CONFIGURED,
};
#define XHCI_ENDPOINT_RING_SIZE (XHCI_MAX_TRANSFERS * 2 + 1)
@ -76,7 +68,6 @@ typedef struct xhci_endpoint {
typedef struct xhci_device {
uint8 slot;
uint8 address;
enum xhci_state state;
area_id trb_area;
phys_addr_t trb_addr;
struct xhci_trb *trbs; // [XHCI_MAX_ENDPOINTS - 1][XHCI_ENDPOINT_RING_SIZE]