narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[efi] Avoid dragging in USB subsystem via efi_usb_path() 

Commit 87e39a9c9 ("[efi] Split efi_usb_path() out to a separate
function") unintentionally introduced an undefined symbol reference
from efi_path.o to usb_depth(), causing the USB subsystem to become a
dependency of all EFI builds.

Fix by converting usb_depth() to a static inline function.

Reported-by: Pico Mitchell <pico@randomapplications.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/171/head
Michael Brown 2020-10-30 13:51:30 +00:00
parent e5e2f3fba8
commit 16873703dd
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/drivers/bus/usb.c
View File

@ -2277,23 +2277,6 @@ unsigned int usb_route_string ( struct usb_device *usb ) {
return route; return route;
} }
/**
* Get USB depth
*
* @v usb USB device
* @ret depth Hub depth
*/
unsigned int usb_depth ( struct usb_device *usb ) {
struct usb_device *parent;
unsigned int depth;
/* Navigate up to root hub, constructing depth as we go */
for ( depth = 0 ; ( parent = usb->port->hub->usb ) ; usb = parent )
depth++;
return depth;
}
/** /**
* Get USB root hub port * Get USB root hub port
* *

18
src/include/ipxe/usb.h
View File

@ -1239,6 +1239,23 @@ usb_set_interface ( struct usb_device *usb, unsigned int interface,
NULL, 0 ); NULL, 0 );
} }
/**
* Get USB depth
*
* @v usb USB device
* @ret depth Hub depth
*/
static inline unsigned int usb_depth ( struct usb_device *usb ) {
struct usb_device *parent;
unsigned int depth;
/* Navigate up to root hub, constructing depth as we go */
for ( depth = 0 ; ( parent = usb->port->hub->usb ) ; usb = parent )
depth++;
return depth;
}
extern struct list_head usb_buses; extern struct list_head usb_buses;
extern struct usb_interface_descriptor * extern struct usb_interface_descriptor *
@ -1274,7 +1291,6 @@ extern struct usb_bus * find_usb_bus_by_location ( unsigned int bus_type,
extern int usb_alloc_address ( struct usb_bus *bus ); extern int usb_alloc_address ( struct usb_bus *bus );
extern void usb_free_address ( struct usb_bus *bus, unsigned int address ); extern void usb_free_address ( struct usb_bus *bus, unsigned int address );
extern unsigned int usb_route_string ( struct usb_device *usb ); extern unsigned int usb_route_string ( struct usb_device *usb );
extern unsigned int usb_depth ( struct usb_device *usb );
extern struct usb_port * usb_root_hub_port ( struct usb_device *usb ); extern struct usb_port * usb_root_hub_port ( struct usb_device *usb );
extern struct usb_port * usb_transaction_translator ( struct usb_device *usb ); extern struct usb_port * usb_transaction_translator ( struct usb_device *usb );