i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When the boot drive API & id is not known, try to determine the id via natfeat. XXX not sure which API it refers too.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39492 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2010-11-19 08:55:15 +00:00
parent 9c30d75b8c
commit 6874c88139
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/atari_m68k/devices.cpp
+14 -2
View File
@@ -1131,7 +1131,7 @@ XHDIDrive::ReadBlocks(void *buffer, off_t first, int32 count)
status_t status_t
platform_add_boot_device(struct stage2_args *args, NodeList *devicesList) platform_add_boot_device(struct stage2_args *args, NodeList *devicesList)
{ {
TRACE(("boot drive ID: %x\n", gBootDriveID)); TRACE(("boot drive ID: %x API: %d\n", gBootDriveID, gBootDriveAPI));
init_xhdi(); init_xhdi();
//XXX: FIXME //XXX: FIXME
@@ -1150,12 +1150,24 @@ platform_add_boot_device(struct stage2_args *args, NodeList *devicesList)
drive = new(nothrow) XHDIDrive(gBootDriveID, gBootDriveID, 0); drive = new(nothrow) XHDIDrive(gBootDriveID, gBootDriveID, 0);
break; break;
case ATARI_BOOT_DRVAPI_UNKNOWN: case ATARI_BOOT_DRVAPI_UNKNOWN:
{
// we don't know yet, try to ask ARAnyM via NatFeat
int id = nat_feat_get_bootdrive();
if (id > -1) {
gBootDriveID = id;
dprintf("nat_fead_get_bootdrive() = %d\n", id);
// XXX: which API does it refer to ??? id = letter - 'a'
drive = new(nothrow) XHDIDrive(gBootDriveID, gBootDriveID, 0);
break;
}
}
default: default:
dprintf("unknown boot drive API %d\n", gBootDriveAPI); dprintf("unknown boot drive API %d\n", gBootDriveAPI);
return B_ERROR; return B_ERROR;
drive = new(nothrow) BIOSDrive(gBootDriveID); drive = new(nothrow) BIOSDrive(gBootDriveID);
} }
if (drive->InitCheck() != B_OK) {
if (drive == NULL || drive->InitCheck() != B_OK) {
dprintf("no boot drive!\n"); dprintf("no boot drive!\n");
return B_ERROR; return B_ERROR;
} }