JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Always

Browse Source 
try IOCTL_DISK_GET_DRIVE_GEOMETRY_EX and
	IOCTL_DISK_GET_PARTITION_INFO_EX ioctls first, to allow access to GPT
	partitioned disks.  Fall back to old non-EX ioctls otherwise.
	Add comment to explain NT4 weirdness.
This commit is contained in:
Corinna Vinschen 2005-09-27 15:33:02 +00:00
parent dbdc82aa71
commit 357d430185
2 changed files with 69 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2005-09-27 Corinna Vinschen <corinna@vinschen.de>
* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Always
try IOCTL_DISK_GET_DRIVE_GEOMETRY_EX and
IOCTL_DISK_GET_PARTITION_INFO_EX ioctls first, to allow access to GPT
partitioned disks. Fall back to old non-EX ioctls otherwise.
Add comment to explain NT4 weirdness.
2005-09-26 Corinna Vinschen <corinna@vinschen.de> 2005-09-26 Corinna Vinschen <corinna@vinschen.de>
* errno.cc (errmap): Map ERROR_SEEK and ERROR_SECTOR_NOT_FOUND. * errno.cc (errmap): Map ERROR_SEEK and ERROR_SECTOR_NOT_FOUND.

88
winsup/cygwin/fhandler_floppy.cc
View File

@ -52,48 +52,82 @@ fhandler_dev_floppy::fhandler_dev_floppy ()
int int
fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo) fhandler_dev_floppy::get_drive_info (struct hd_geometry *geo)
{ {
DISK_GEOMETRY di; char dbuf[256];
PARTITION_INFORMATION pi; char pbuf[256];
DISK_GEOMETRY *di;
PARTITION_INFORMATION_EX *pix = NULL;
PARTITION_INFORMATION *pi = NULL;
DWORD bytes_read = 0; DWORD bytes_read = 0;
/* Always try using the new EX ioctls first (>= XP). If not available,
fall back to trying the old non-EX ioctls. */
if (!DeviceIoControl (get_handle (), if (!DeviceIoControl (get_handle (),
IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX, NULL, 0,
NULL, 0, dbuf, 256, &bytes_read, NULL))
&di, sizeof (di),
&bytes_read, NULL))
{ {
__seterrno (); if (!DeviceIoControl (get_handle (),
return -1; IOCTL_DISK_GET_DRIVE_GEOMETRY, NULL, 0,
dbuf, 256, &bytes_read, NULL))
{
__seterrno ();
return -1;
}
di = (DISK_GEOMETRY *) dbuf;
} }
debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)", else
di.Cylinders.LowPart, di = &((DISK_GEOMETRY_EX *) dbuf)->Geometry;
di.TracksPerCylinder,
di.SectorsPerTrack,
di.BytesPerSector);
bytes_per_sector = di.BytesPerSector;
if (DeviceIoControl (get_handle (), if (DeviceIoControl (get_handle (),
IOCTL_DISK_GET_PARTITION_INFO, IOCTL_DISK_GET_PARTITION_INFO_EX, NULL, 0,
NULL, 0, pbuf, 256, &bytes_read, NULL))
&pi, sizeof (pi), pix = (PARTITION_INFORMATION_EX *) pbuf;
&bytes_read, NULL)) else if (DeviceIoControl (get_handle (),
IOCTL_DISK_GET_PARTITION_INFO, NULL, 0,
pbuf, 256, &bytes_read, NULL))
pi = (PARTITION_INFORMATION *) pbuf;
debug_printf ("disk geometry: (%ld cyl)*(%ld trk)*(%ld sec)*(%ld bps)",
di->Cylinders.LowPart,
di->TracksPerCylinder,
di->SectorsPerTrack,
di->BytesPerSector);
bytes_per_sector = di->BytesPerSector;
if (pix)
{ {
debug_printf ("partition info: offset %D length %D", debug_printf ("partition info: offset %D length %D",
pi.StartingOffset.QuadPart, pix->StartingOffset.QuadPart,
pi.PartitionLength.QuadPart); pix->PartitionLength.QuadPart);
drive_size = pi.PartitionLength.QuadPart; drive_size = pix->PartitionLength.QuadPart;
}
else if (pi)
{
debug_printf ("partition info: offset %D length %D",
pi->StartingOffset.QuadPart,
pi->PartitionLength.QuadPart);
drive_size = pi->PartitionLength.QuadPart;
} }
else else
{ {
drive_size = di.Cylinders.QuadPart * di.TracksPerCylinder * /* Getting the partition size by using the drive geometry information
di.SectorsPerTrack * di.BytesPerSector; looks wrong, but this is a historical necessity. NT4 didn't maintain
partition information for the whole drive (aka "partition 0"), but
returned ERROR_INVALID_HANDLE instead. That got fixed in W2K. */
drive_size = di->Cylinders.QuadPart * di->TracksPerCylinder *
di->SectorsPerTrack * di->BytesPerSector;
} }
debug_printf ("drive size: %D", drive_size); debug_printf ("drive size: %D", drive_size);
if (geo) if (geo)
{ {
geo->heads = di.TracksPerCylinder; geo->heads = di->TracksPerCylinder;
geo->sectors = di.SectorsPerTrack; geo->sectors = di->SectorsPerTrack;
geo->cylinders = di.Cylinders.LowPart; geo->cylinders = di->Cylinders.LowPart;
geo->start = pi.StartingOffset.QuadPart >> 9ULL; if (pix)
geo->start = pix->StartingOffset.QuadPart >> 9ULL;
else if (pi)
geo->start = pi->StartingOffset.QuadPart >> 9ULL;
else
geo->start = 0;
} }
return 0; return 0;
} }