[disk] Rename disk__boot_sect_ptr to WV_AP_DISK_BOOT_SECT

diff --git a/src/include/disk.h b/src/include/disk.h
index 3039b7b..b4d1bf0 100644 (file)
--- a/src/include/disk.h
+++ b/src/include/disk.h
@@ -34,7 +34,8 @@ typedef enum WV_DISK_MEDIA_TYPE {
     WvDiskMediaTypes
   } WV_E_DISK_MEDIA_TYPE, * WV_EP_DISK_MEDIA_TYPE;
 
-typedef char disk__boot_sect_ptr[512];
+typedef char WV_A_DISK_BOOT_SECT[512];
+typedef WV_A_DISK_BOOT_SECT * WV_AP_DISK_BOOT_SECT;
 
 extern winvblock__bool WvDiskIsRemovable[WvDiskMediaTypes];
 extern PWCHAR WvDiskCompatIds[WvDiskMediaTypes];
@@ -217,7 +218,7 @@ extern disk__max_xfer_len_decl (
  * @v disk_ptr          The disk to set the geometry for
  */
 extern winvblock__lib_func void disk__guess_geometry (
-  IN disk__boot_sect_ptr boot_sect_ptr,
+  IN WV_AP_DISK_BOOT_SECT,
   IN OUT disk__type_ptr disk_ptr
  );
 

diff --git a/src/winvblock/disk/disk.c b/src/winvblock/disk/disk.c
index 758f785..6f47d07 100644 (file)
--- a/src/winvblock/disk/disk.c
+++ b/src/winvblock/disk/disk.c
@@ -234,17 +234,15 @@ winvblock__def_struct ( fat_super )
 #endif
 
 /**
- * Attempt to guess a disk's geometry
+ * Attempt to guess a disk's geometry.
  *
- * @v boot_sect_ptr     The MBR or VBR with possible geometry clues
- * @v disk_ptr          The disk to set the geometry for
+ * @v boot_sect_ptr     The MBR or VBR with possible geometry clues.
+ * @v disk_ptr          The disk to set the geometry for.
  */
-winvblock__lib_func void
-disk__guess_geometry (
-  IN disk__boot_sect_ptr boot_sect_ptr,
-  IN OUT disk__type_ptr disk_ptr
- )
-{
+winvblock__lib_func void disk__guess_geometry (
+    IN WV_AP_DISK_BOOT_SECT boot_sect_ptr,
+    IN OUT disk__type_ptr disk_ptr
+  ) {
   winvblock__uint16 heads = 0,
     sects_per_track = 0,
     cylinders;

diff --git a/src/winvblock/filedisk/filedisk.c b/src/winvblock/filedisk/filedisk.c
index 50c568a..4d598b7 100644 (file)
--- a/src/winvblock/filedisk/filedisk.c
+++ b/src/winvblock/filedisk/filedisk.c
@@ -89,7 +89,7 @@ disk__io_decl (
       ZwReadFile ( filedisk_ptr->file, NULL, NULL, NULL, &io_status, buffer,
                   sector_count * disk_ptr->SectorSize, &offset, NULL );
   if ( !start_sector )
-    disk__guess_geometry ( buffer, disk_ptr );
+    disk__guess_geometry((WV_AP_DISK_BOOT_SECT) buffer, disk_ptr);
   irp->IoStatus.Information = sector_count * disk_ptr->SectorSize;
   irp->IoStatus.Status = status;
   IoCompleteRequest ( irp, IO_NO_INCREMENT );