Index: /trunk/src/VBox/Devices/PC/BIOS-new/ahci.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS-new/ahci.c	(revision 39618)
+++ /trunk/src/VBox/Devices/PC/BIOS-new/ahci.c	(revision 39619)
@@ -141,5 +141,5 @@
 
 /** Returns the absolute register offset from a given port and port register. */
-#define AHCI_PORT_REG(port, reg)    ((uint32_t)(AHCI_HBA_SIZE + (port) * AHCI_PORT_SIZE + (reg)))
+#define AHCI_PORT_REG(port, reg)    (AHCI_HBA_SIZE + (port) * AHCI_PORT_SIZE + (reg))
 
 #define AHCI_REG_IDX   0
@@ -147,11 +147,11 @@
 
 /** Writes the given value to a AHCI register. */
-#define AHCI_WRITE_REG(iobase, reg, val)                \
-    outpd((iobase) + AHCI_REG_IDX, (uint32_t)(reg));    \
-    outpd((iobase) + AHCI_REG_DATA, (uint32_t)(val))
+#define AHCI_WRITE_REG(iobase, reg, val)    \
+    outpd((iobase) + AHCI_REG_IDX, reg);    \
+    outpd((iobase) + AHCI_REG_DATA, val)
 
 /** Reads from a AHCI register. */
-#define AHCI_READ_REG(iobase, reg, val)                 \
-    outpd((iobase) + AHCI_REG_IDX, (uint32_t)(reg));    \
+#define AHCI_READ_REG(iobase, reg, val)     \
+    outpd((iobase) + AHCI_REG_IDX, reg);    \
     (val) = inpd((iobase) + AHCI_REG_DATA)
 
@@ -224,5 +224,5 @@
  * Sets a given set of bits in a register.
  */
-static void ahci_ctrl_set_bits(uint16_t iobase, uint32_t reg, uint32_t mask)
+static void ahci_ctrl_set_bits(uint16_t iobase, uint16_t reg, uint32_t mask)
 {
     outpd(iobase + AHCI_REG_IDX, reg);
@@ -233,5 +233,5 @@
  * Clears a given set of bits in a register.
  */
-static void ahci_ctrl_clear_bits(uint16_t iobase, uint32_t reg, uint32_t mask)
+static void ahci_ctrl_clear_bits(uint16_t iobase, uint16_t reg, uint32_t mask)
 {
     outpd(iobase + AHCI_REG_IDX, reg);
@@ -243,5 +243,5 @@
  * for a register.
  */
-static uint8_t ahci_ctrl_is_bit_set(uint16_t iobase, uint32_t reg, uint32_t mask)
+static uint8_t ahci_ctrl_is_bit_set(uint16_t iobase, uint16_t reg, uint32_t mask)
 {
     outpd(iobase + AHCI_REG_IDX, reg);