|
Lines 247-255
Link Here
|
| 247 |
device_t grand; |
247 |
device_t grand; |
| 248 |
ACPI_HANDLE gah; |
248 |
ACPI_HANDLE gah; |
| 249 |
|
249 |
|
|
|
250 |
*ah = NULL; |
| 251 |
|
| 250 |
grand = device_get_parent(device_get_parent(dev)); |
252 |
grand = device_get_parent(device_get_parent(dev)); |
| 251 |
if ((gah = acpi_get_handle(grand)) == NULL) { |
253 |
if ((gah = acpi_get_handle(grand)) == NULL) { |
| 252 |
*ah = NULL; |
|
|
| 253 |
return AE_ERROR; |
254 |
return AE_ERROR; |
| 254 |
} |
255 |
} |
| 255 |
return AcpiWalkNamespace(ACPI_TYPE_DEVICE, gah, 1, |
256 |
return AcpiWalkNamespace(ACPI_TYPE_DEVICE, gah, 1, |
|
Lines 293-298
Link Here
|
| 293 |
ACPI_HANDLE ah; |
294 |
ACPI_HANDLE ah; |
| 294 |
ACPI_STATUS status; |
295 |
ACPI_STATUS status; |
| 295 |
|
296 |
|
|
|
297 |
if(acpi_disabled("usb")){ |
| 298 |
return ENXIO; |
| 299 |
} |
| 296 |
status = acpi_uhub_find_rh(dev, &ah); |
300 |
status = acpi_uhub_find_rh(dev, &ah); |
| 297 |
if (ACPI_SUCCESS(status) |
301 |
if (ACPI_SUCCESS(status) |
| 298 |
&& ah != NULL |
302 |
&& ah != NULL |
|
Lines 308-314
Link Here
|
| 308 |
{ |
312 |
{ |
| 309 |
ACPI_HANDLE ah = acpi_get_handle(dev); |
313 |
ACPI_HANDLE ah = acpi_get_handle(dev); |
| 310 |
|
314 |
|
| 311 |
if (ah && (uhub_probe(dev) <= 0)) { |
315 |
if (!acpi_disabled("usb") && ah && (uhub_probe(dev) <= 0)) { |
| 312 |
/*success prior than non - acpi hub*/ |
316 |
/*success prior than non - acpi hub*/ |
| 313 |
return (BUS_PROBE_DEFAULT + 1); |
317 |
return (BUS_PROBE_DEFAULT + 1); |
| 314 |
} |
318 |
} |
|
Lines 335-341
Link Here
|
| 335 |
sc->nports = uh->nports; |
339 |
sc->nports = uh->nports; |
| 336 |
sc->porthandle = malloc(sizeof(ACPI_HANDLE) * uh->nports, |
340 |
sc->porthandle = malloc(sizeof(ACPI_HANDLE) * uh->nports, |
| 337 |
M_USBDEV, M_WAITOK | M_ZERO); |
341 |
M_USBDEV, M_WAITOK | M_ZERO); |
| 338 |
acpi_uhub_find_rh(dev, &devhandle); |
|
|
| 339 |
acpi_usb_hub_port_probe(dev, devhandle); |
342 |
acpi_usb_hub_port_probe(dev, devhandle); |
| 340 |
|
343 |
|
| 341 |
return 0; |
344 |
return 0; |