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

Disabled the BIOS drive stuff completely for now, this fixes bug #359.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16929 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-03-30 13:50:13 +00:00
parent dbca8117e1
commit 4192c21428
1 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/generic/block_io/block_io.c
+25 -37
View File
@@ -95,6 +95,7 @@ block_io_freecookie(block_io_handle_info *handle)
return B_OK; return B_OK;
} }
// TODO: this assumes private R5 kernel functions to be present
#if 0 #if 0
/** Verify a checksum that is part of BIOS drive identification. /** Verify a checksum that is part of BIOS drive identification.
* returns B_OK on success * returns B_OK on success
@@ -133,7 +134,7 @@ err:
free(buffer); free(buffer);
return B_ERROR; return B_ERROR;
} }
#endif
/** store BIOS drive id in node's attribute */ /** store BIOS drive id in node's attribute */
@@ -177,8 +178,6 @@ find_bios_drive_info(block_io_handle_info *handle)
if (pnp->get_attr_uint8(device->node, B_BLOCK_DEVICE_BIOS_ID, &bios_id, false) == B_OK) { if (pnp->get_attr_uint8(device->node, B_BLOCK_DEVICE_BIOS_ID, &bios_id, false) == B_OK) {
TRACE(("use previous BIOS ID 0x%x\n", bios_id)); TRACE(("use previous BIOS ID 0x%x\n", bios_id));
// ToDo: this assumes private R5 kernel functions to be present
#if 0
// yes, so find the associated data structure // yes, so find the associated data structure
if (bios_id != 0) { if (bios_id != 0) {
for (drive = bios_drive_info; drive->bios_id != 0; ++drive) { for (drive = bios_drive_info; drive->bios_id != 0; ++drive) {
@@ -186,7 +185,6 @@ find_bios_drive_info(block_io_handle_info *handle)
break; break;
} }
} else } else
#endif
drive = NULL; drive = NULL;
device->bios_drive = drive; device->bios_drive = drive;
@@ -195,8 +193,6 @@ find_bios_drive_info(block_io_handle_info *handle)
sprintf(name, "PnP %p", device->node); sprintf(name, "PnP %p", device->node);
// ToDo: this assumes private R5 kernel functions to be present
#if 0
// do it the hard way: find a BIOS drive with the same checksums // do it the hard way: find a BIOS drive with the same checksums
for (drive = bios_drive_info; drive->bios_id != 0; ++drive) { for (drive = bios_drive_info; drive->bios_id != 0; ++drive) {
uint32 i; uint32 i;
@@ -216,7 +212,6 @@ find_bios_drive_info(block_io_handle_info *handle)
if (i == drive->num_chksums) if (i == drive->num_chksums)
break; break;
} }
#endif
if (drive->bios_id == 0) { if (drive->bios_id == 0) {
TRACE(("this is no BIOS drive\n")); TRACE(("this is no BIOS drive\n"));
@@ -226,8 +221,6 @@ find_bios_drive_info(block_io_handle_info *handle)
TRACE(("this is BIOS drive 0x%x\n", drive->bios_id)); TRACE(("this is BIOS drive 0x%x\n", drive->bios_id));
// ToDo: this assumes private R5 kernel functions to be present
#if 0
// the R5 boot loader assumes that two drives can be distinguished by // the R5 boot loader assumes that two drives can be distinguished by
// - their checksums // - their checksums
// - their physical layout // - their physical layout
@@ -265,7 +258,6 @@ find_bios_drive_info(block_io_handle_info *handle)
// but if the boot drive is affected, he cannot even boot. // but if the boot drive is affected, he cannot even boot.
goto no_bios_drive; goto no_bios_drive;
} }
#endif
TRACE(("store driver \"%s\" in system data\n", name)); TRACE(("store driver \"%s\" in system data\n", name));
@@ -284,14 +276,15 @@ no_bios_drive:
store_bios_drive_in_node(device); store_bios_drive_in_node(device);
return; return;
} }
#endif
static status_t static status_t
block_io_ioctl(block_io_handle_info *handle, uint32 op, void *buf, size_t len) block_io_ioctl(block_io_handle_info *handle, uint32 op, void *buffer, size_t length)
{ {
block_io_device_info *device = handle->device; block_io_device_info *device = handle->device;
status_t res;
#if 0
if (device->is_bios_drive) { if (device->is_bios_drive) {
switch (op) { switch (op) {
case B_GET_BIOS_DRIVE_ID: case B_GET_BIOS_DRIVE_ID:
@@ -300,42 +293,37 @@ block_io_ioctl(block_io_handle_info *handle, uint32 op, void *buf, size_t len)
if (device->bios_drive == NULL) if (device->bios_drive == NULL)
return B_ERROR; return B_ERROR;
*(char *)buf = device->bios_drive->bios_id; *(char *)buffer = device->bios_drive->bios_id;
return B_OK; return B_OK;
case B_GET_BIOS_GEOMETRY: case B_GET_BIOS_GEOMETRY:
if (!device->is_bios_drive) {
break; device_geometry *geometry = (device_geometry *)buffer;
status_t status;
{ find_bios_drive_info(handle);
device_geometry *geometry = (device_geometry *)buf; if (device->bios_drive == NULL)
return B_ERROR;
find_bios_drive_info(handle); TRACE(("GET_BIOS_GEOMETRY\n"));
if (device->bios_drive == NULL)
return B_ERROR;
TRACE(("GET_BIOS_GEOMETRY\n")); // get real geometry from low level driver
status = device->interface->ioctl(handle->cookie, B_GET_GEOMETRY,
geometry, sizeof(*geometry));
if (status != B_OK)
return status;
// get real geometry from low level driver // replace entries with bios info retrieved by boot loader
res = device->interface->ioctl(handle->cookie, B_GET_GEOMETRY, geometry->cylinder_count = device->bios_drive->cylinder_count;
geometry, sizeof(*geometry)); geometry->head_count = device->bios_drive->head_count;
if (res != B_OK) geometry->sectors_per_track = device->bios_drive->sectors_per_track;
return res;
// replace entries with bios info retrieved by boot loader
geometry->cylinder_count = device->bios_drive->cylinder_count;
geometry->head_count = device->bios_drive->head_count;
geometry->sectors_per_track = device->bios_drive->sectors_per_track;
}
return B_OK; return B_OK;
}
} }
} }
#endif
res = device->interface->ioctl( handle->cookie, op, buf, len ); return device->interface->ioctl(handle->cookie, op, buffer, length);
//SHOW_FLOW( 0, "%s", strerror( res ));
return res;
} }