projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor formatting and comment updates to acpi.c.
[seabios.git]
/
src
/
boot.c
diff --git
a/src/boot.c
b/src/boot.c
index fcc95ab2e20dc743f10afa1ae80d339d6a060d04..119f29007de5fa8b14ad590f281e07ccc4b90145 100644
(file)
--- a/
src/boot.c
+++ b/
src/boot.c
@@
-98,22
+98,9
@@
find_prio(const char *glob)
#define FW_PCI_DOMAIN "/pci@i0cf8"
#define FW_PCI_DOMAIN "/pci@i0cf8"
-static struct pci_device *
-find_pci(u16 bdf)
-{
- struct pci_device *pci;
- foreachpci(pci) {
- if (pci->bdf == bdf)
- return pci;
- }
- return NULL;
-}
-
static char *
build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
{
static char *
build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
{
- if (!pci)
- return buf;
// Build the string path of a bdf - for example: /pci@i0cf8/isa@1,2
char *p = buf;
if (pci->parent) {
// Build the string path of a bdf - for example: /pci@i0cf8/isa@1,2
char *p = buf;
if (pci->parent) {
@@
-131,51
+118,51
@@
build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
return p;
}
return p;
}
-int bootprio_find_pci_device(
int bdf
)
+int bootprio_find_pci_device(
struct pci_device *pci
)
{
if (!CONFIG_BOOTORDER)
return -1;
// Find pci device - for example: /pci@i0cf8/ethernet@5
char desc[256];
{
if (!CONFIG_BOOTORDER)
return -1;
// Find pci device - for example: /pci@i0cf8/ethernet@5
char desc[256];
- build_pci_path(desc, sizeof(desc), "*",
find_pci(bdf)
);
+ build_pci_path(desc, sizeof(desc), "*",
pci
);
return find_prio(desc);
}
return find_prio(desc);
}
-int bootprio_find_ata_device(
int bdf
, int chanid, int slave)
+int bootprio_find_ata_device(
struct pci_device *pci
, int chanid, int slave)
{
if (!CONFIG_BOOTORDER)
return -1;
{
if (!CONFIG_BOOTORDER)
return -1;
- if (
bdf == -1
)
+ if (
!pci
)
// support only pci machine for now
return -1;
// Find ata drive - for example: /pci@i0cf8/ide@1,1/drive@1/disk@0
char desc[256], *p;
// support only pci machine for now
return -1;
// Find ata drive - for example: /pci@i0cf8/ide@1,1/drive@1/disk@0
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "*",
find_pci(bdf)
);
+ p = build_pci_path(desc, sizeof(desc), "*",
pci
);
snprintf(p, desc+sizeof(desc)-p, "/drive@%x/disk@%x", chanid, slave);
return find_prio(desc);
}
snprintf(p, desc+sizeof(desc)-p, "/drive@%x/disk@%x", chanid, slave);
return find_prio(desc);
}
-int bootprio_find_fdc_device(
int bdf
, int port, int fdid)
+int bootprio_find_fdc_device(
struct pci_device *pci
, int port, int fdid)
{
if (!CONFIG_BOOTORDER)
return -1;
{
if (!CONFIG_BOOTORDER)
return -1;
- if (
bdf == -1
)
+ if (
!pci
)
// support only pci machine for now
return -1;
// Find floppy - for example: /pci@i0cf8/isa@1/fdc@03f1/floppy@0
char desc[256], *p;
// support only pci machine for now
return -1;
// Find floppy - for example: /pci@i0cf8/isa@1/fdc@03f1/floppy@0
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "isa",
find_pci(bdf)
);
+ p = build_pci_path(desc, sizeof(desc), "isa",
pci
);
snprintf(p, desc+sizeof(desc)-p, "/fdc@%04x/floppy@%x", port, fdid);
return find_prio(desc);
}
snprintf(p, desc+sizeof(desc)-p, "/fdc@%04x/floppy@%x", port, fdid);
return find_prio(desc);
}
-int bootprio_find_pci_rom(
int bdf
, int instance)
+int bootprio_find_pci_rom(
struct pci_device *pci
, int instance)
{
if (!CONFIG_BOOTORDER)
return -1;
// Find pci rom - for example: /pci@i0cf8/scsi@3:rom2
char desc[256], *p;
{
if (!CONFIG_BOOTORDER)
return -1;
// Find pci rom - for example: /pci@i0cf8/scsi@3:rom2
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "*",
find_pci(bdf)
);
+ p = build_pci_path(desc, sizeof(desc), "*",
pci
);
if (instance)
snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
return find_prio(desc);
if (instance)
snprintf(p, desc+sizeof(desc)-p, ":rom%d", instance);
return find_prio(desc);
@@
-193,14
+180,14
@@
int bootprio_find_named_rom(const char *name, int instance)
return find_prio(desc);
}
return find_prio(desc);
}
-int bootprio_find_usb(
int bdf
, u64 path)
+int bootprio_find_usb(
struct pci_device *pci
, u64 path)
{
if (!CONFIG_BOOTORDER)
return -1;
// Find usb - for example: /pci@i0cf8/usb@1,2/hub@1/network@0/ethernet@0
int i;
char desc[256], *p;
{
if (!CONFIG_BOOTORDER)
return -1;
// Find usb - for example: /pci@i0cf8/usb@1,2/hub@1/network@0/ethernet@0
int i;
char desc[256], *p;
- p = build_pci_path(desc, sizeof(desc), "usb",
find_pci(bdf)
);
+ p = build_pci_path(desc, sizeof(desc), "usb",
pci
);
for (i=56; i>0; i-=8) {
int port = (path >> i) & 0xff;
if (port != 0xff)
for (i=56; i>0; i-=8) {
int port = (path >> i) & 0xff;
if (port != 0xff)