Changeset 3654 in vbox

Timestamp:

Jul 16, 2007 6:06:22 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22927

Message:

don't depend on the deprecated vl_vbox.h header anymore

File:

• trunk/src/VBox/Devices/Network/DevPCNet.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -74 +74 @@
 
 #include "Builtins.h"
-#include "vl_vbox.h"
 
 /* Enable this to catch writes to the ring descriptors instead of using excessive polling */
@@ -1140 +1139 @@
     pData->aCSR[10]  = 0;
     pData->aCSR[11]  = 0;
-    pData->aCSR[12]  = le16_to_cpu(((uint16_t *)&pData->aPROM[0])[0]);
-    pData->aCSR[13]  = le16_to_cpu(((uint16_t *)&pData->aPROM[0])[1]);
-    pData->aCSR[14]  = le16_to_cpu(((uint16_t *)&pData->aPROM[0])[2]);
+    pData->aCSR[12]  = RT_LE2H_U16(((uint16_t *)&pData->aPROM[0])[0]);
+    pData->aCSR[13]  = RT_LE2H_U16(((uint16_t *)&pData->aPROM[0])[1]);
+    pData->aCSR[14]  = RT_LE2H_U16(((uint16_t *)&pData->aPROM[0])[2]);
     pData->aCSR[15] &= 0x21c4;
     CSR_RCVRC(pData) = 1;
@@ -1351 +1350 @@
         PDMDevHlpPhysRead(pDevIns, PHYSADDR(pData, CSR_IADR(pData)),         \
                           (uint8_t *)&initblk, sizeof(initblk));             \
-        pData->aCSR[15]  = le16_to_cpu(initblk.mode);                        \
+        pData->aCSR[15]  = RT_LE2H_U16(initblk.mode);                        \
         CSR_RCVRL(pData) = (initblk.rlen < 9) ? (1 << initblk.rlen) : 512;   \
         CSR_XMTRL(pData) = (initblk.tlen < 9) ? (1 << initblk.tlen) : 512;   \
         pData->aCSR[ 6]  = (initblk.tlen << 12) | (initblk.rlen << 8);       \
-        pData->aCSR[ 8]  = le16_to_cpu(initblk.ladrf1);                      \
-        pData->aCSR[ 9]  = le16_to_cpu(initblk.ladrf2);                      \
-        pData->aCSR[10]  = le16_to_cpu(initblk.ladrf3);                      \
-        pData->aCSR[11]  = le16_to_cpu(initblk.ladrf4);                      \
-        pData->aCSR[12]  = le16_to_cpu(initblk.padr1);                       \
-        pData->aCSR[13]  = le16_to_cpu(initblk.padr2);                       \
-        pData->aCSR[14]  = le16_to_cpu(initblk.padr3);                       \
+        pData->aCSR[ 8]  = RT_LE2H_U16(initblk.ladrf1);                      \
+        pData->aCSR[ 9]  = RT_LE2H_U16(initblk.ladrf2);                      \
+        pData->aCSR[10]  = RT_LE2H_U16(initblk.ladrf3);                      \
+        pData->aCSR[11]  = RT_LE2H_U16(initblk.ladrf4);                      \
+        pData->aCSR[12]  = RT_LE2H_U16(initblk.padr1);                       \
+        pData->aCSR[13]  = RT_LE2H_U16(initblk.padr2);                       \
+        pData->aCSR[14]  = RT_LE2H_U16(initblk.padr3);                       \
         pData->GCRDRA    = PHYSADDR(pData, initblk.rdra);                    \
         pData->GCTDRA    = PHYSADDR(pData, initblk.tdra);                    \
@@ -2720 +2719 @@
     for (i = 0, checksum = 0; i < 16; i++)
         checksum += pData->aPROM[i];
-    *(uint16_t *)&pData->aPROM[12] = cpu_to_le16(checksum);
+    *(uint16_t *)&pData->aPROM[12] = RT_H2LE_U16(checksum);
 
     pData->aBCR[BCR_MSRDA] = 0x0005;