Changeset 44807 in vbox

Timestamp:

Feb 22, 2013 8:55:58 PM (12 years ago)

Author:

vboxsync

Message:

fdc.c -> DevFdc.cpp.

Location:

trunk/src/VBox/Devices

Files:

• Makefile.kmk (modified) (1 diff)
• Storage/DevFdc.cpp (moved) (moved from trunk/src/VBox/Devices/Storage/fdc.c ) (9 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -174 +174 @@
         PC/DevSMC.cpp \
         PC/DevLPC.cpp \
-        Storage/fdc.c \
+        Storage/DevFdc.cpp \
         Serial/DevSerial.cpp \
         Parallel/DevParallel.cpp \

trunk/src/VBox/Devices/Storage/DevFdc.cpp

@@ -130 +130 @@
 } fdrive_type_t;
 
-typedef enum fdrive_flags_t {
-    FDISK_DBL_SIDES  = 0x01
-} fdrive_flags_t;
+typedef uint8_t fdrive_flags_t;
+#define FDISK_DBL_SIDES     UINT8_C(0x01)
 
 typedef enum fdrive_rate_t {
@@ -325 +324 @@
     { FDRIVE_DRV_144, FDRIVE_DISK_720,  9, 80, 0, FDRIVE_RATE_250K,  "360 kB 3\"1/2", },
     /* end */
-    { FDRIVE_DRV_NONE, FDRIVE_DISK_NONE, -1, -1, 0, 0, NULL, },
+    { FDRIVE_DRV_NONE, FDRIVE_DISK_NONE, -1, -1, 0, (fdrive_rate_t)0, NULL, },
 };
 
@@ -669 +668 @@
 static uint32_t fdctrl_read (void *opaque, uint32_t reg)
 {
-    fdctrl_t *fdctrl = opaque;
+    fdctrl_t *fdctrl = (fdctrl_t *)opaque;
     uint32_t retval;
 
@@ -705 +704 @@
 static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value)
 {
-    fdctrl_t *fdctrl = opaque;
+    fdctrl_t *fdctrl = (fdctrl_t *)opaque;
 
     FLOPPY_DPRINTF("write reg%d: 0x%02x\n", reg & 7, value);
@@ -1342 +1341 @@
     uint8_t status0 = 0x00, status1 = 0x00, status2 = 0x00;
 
-    fdctrl = opaque;
+    fdctrl = (fdctrl_t *)opaque;
     if (fdctrl->msr & FD_MSR_RQM) {
         FLOPPY_DPRINTF("Not in DMA transfer mode !\n");
@@ -2057 +2056 @@
 static void fdctrl_result_timer(void *opaque)
 {
-    fdctrl_t *fdctrl = opaque;
+    fdctrl_t *fdctrl = (fdctrl_t *)opaque;
     fdrive_t *cur_drv = get_cur_drv(fdctrl);
 
@@ -2234 +2233 @@
             SSMR3GetMem (pSSMHandle, &d->Led, sizeof (d->Led));
             SSMR3GetU32(pSSMHandle, &val32);
-            d->drive = val32;
+            d->drive = (fdrive_type_t)val32;
             SSMR3GetU32(pSSMHandle, &val32);    /* Toss drflags */
             SSMR3GetU8(pSSMHandle, &d->perpendicular);
@@ -2243 +2242 @@
             SSMR3GetU8(pSSMHandle, &val8);
             SSMR3GetU32(pSSMHandle, &val32);
-            d->flags = val32;
+            d->flags = (fdrive_flags_t)val32;
             SSMR3GetU8(pSSMHandle, &d->last_sect);
             SSMR3GetU8(pSSMHandle, &d->max_track);
@@ -2297 +2296 @@
             SSMR3GetMem(pSSMHandle, &d->Led, sizeof(d->Led));
             SSMR3GetU32(pSSMHandle, &val32);
-            d->drive = val32;
+            d->drive = (fdrive_type_t)val32;
             SSMR3GetU8(pSSMHandle, &d->dsk_chg);
             SSMR3GetU8(pSSMHandle, &d->perpendicular);