projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate ATA code from generic disk code.
[seabios.git]
/
src
/
boot.c
diff --git
a/src/boot.c
b/src/boot.c
index b1dffefe35c5a299e0df7f72fc3e0a38b4862c13..b4067bbfc819da8a11342960b84fe4dd0c7e1ecd 100644
(file)
--- a/
src/boot.c
+++ b/
src/boot.c
@@
-168,12
+168,12
@@
static int
menu_show_cdrom(struct ipl_entry_s *ie, int menupos)
{
int i;
menu_show_cdrom(struct ipl_entry_s *ie, int menupos)
{
int i;
- for (i = 0; i <
ATA
.cdcount; i++) {
- int driveid =
ATA
.idmap[1][i];
+ for (i = 0; i <
Drives
.cdcount; i++) {
+ int driveid =
Drives
.idmap[1][i];
printf("%d. CD-Rom [ata%d-%d %s]\n", menupos + i
printf("%d. CD-Rom [ata%d-%d %s]\n", menupos + i
- , driveid / 2, driveid % 2,
ATA.devic
es[driveid].model);
+ , driveid / 2, driveid % 2,
Drives.driv
es[driveid].model);
}
}
- return
ATA
.cdcount;
+ return
Drives
.cdcount;
}
// Show coreboot-fs menu item.
}
// Show coreboot-fs menu item.
@@
-272,7
+272,7
@@
run_bcv(struct ipl_entry_s *ie)
{
switch (ie->type) {
case IPL_TYPE_HARDDISK:
{
switch (ie->type) {
case IPL_TYPE_HARDDISK:
- map_drive(ie->vector);
+ map_
hd_
drive(ie->vector);
break;
case IPL_TYPE_BEV:
call_bcv(ie->vector >> 16, ie->vector & 0xffff);
break;
case IPL_TYPE_BEV:
call_bcv(ie->vector >> 16, ie->vector & 0xffff);