Changeset 37460 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 15, 2011 7:43:59 AM (14 years ago)

Author:

vboxsync

Message:

fdc: Take head count into account.

File:

• trunk/src/VBox/Devices/Storage/fdc.c (modified) (6 diffs)

trunk/src/VBox/Devices/Storage/fdc.c

@@ -189 +189 @@
 } fdrive_t;
 
+#define NUM_HEADS(drv)      (drv->flags & FDISK_DBL_SIDES ? 2 : 1)
+
 static void fd_init(fdrive_t *drv)
 {
@@ -200 +202 @@
 
 static int fd_sector_calc(uint8_t head, uint8_t track, uint8_t sect,
-                          uint8_t last_sect)
-{
-    return (((track * 2) + head) * last_sect) + sect - 1; /* sect >= 1 */
+                          uint8_t last_sect, uint8_t num_heads)
+{
+    return (((track * num_heads) + head) * last_sect) + sect - 1; /* sect >= 1 */
 }
 
@@ -208 +210 @@
 static int fd_sector(fdrive_t *drv)
 {
-    return fd_sector_calc(drv->head, drv->track, drv->sect, drv->last_sect);
+    return fd_sector_calc(drv->head, drv->track, drv->sect, drv->last_sect, NUM_HEADS(drv));
 }
 
@@ -239 +241 @@
         return 3;
     }
-    sector = fd_sector_calc(head, track, sect, drv->last_sect);
+    sector = fd_sector_calc(head, track, sect, drv->last_sect, NUM_HEADS(drv));
     ret = 0;
     if (sector != fd_sector(drv)) {
@@ -1159 +1161 @@
     FLOPPY_DPRINTF("Start transfer at %d %d %02x %02x (%d)\n",
                    GET_CUR_DRV(fdctrl), kh, kt, ks,
-                   fd_sector_calc(kh, kt, ks, cur_drv->last_sect));
+                   fd_sector_calc(kh, kt, ks, cur_drv->last_sect, NUM_HEADS(cur_drv)));
     switch (fd_seek(cur_drv, kh, kt, ks, fdctrl->config & FD_CONFIG_EIS)) {
     case 2:
@@ -1570 +1572 @@
     FLOPPY_DPRINTF("format sector at %d %d %02x %02x (%d)\n",
                    GET_CUR_DRV(fdctrl), kh, kt, ks,
-                   fd_sector_calc(kh, kt, ks, cur_drv->last_sect));
+                   fd_sector_calc(kh, kt, ks, cur_drv->last_sect, NUM_HEADS(cur_drv)));
     switch (fd_seek(cur_drv, kh, kt, ks, fdctrl->config & FD_CONFIG_EIS)) {
     case 2: