Changeset 553 for trunk/modules/vci_spi/caba/source/src

Timestamp:

Oct 21, 2013, 11:48:38 PM (11 years ago)

Author:

bouyer

Message:

Make this build with 32bit toolchain

File:

• trunk/modules/vci_spi/caba/source/src/vci_spi.cpp (modified) (5 diffs)

trunk/modules/vci_spi/caba/source/src/vci_spi.cpp

@@ -157 +157 @@
                 switch(r_txrx_addr.read()) {
                 case 0:
-                    r_txrx[0]     = (r_txrx[0] & 0xffffffff00000000) |
-                        ((uint64_t)r_tdata.read() & 0x00000000ffffffff);
+                    r_txrx[0]     = (r_txrx[0] & (uint64_t)0xffffffff00000000ULL) |
+                        ((uint64_t)r_tdata.read() & (uint64_t)0x00000000ffffffffULL);
                     break;
                 case 1:
-                    r_txrx[0]     = (r_txrx[0] & 0x00000000ffffffff) |
+                    r_txrx[0]     = (r_txrx[0] & (uint64_t)0x00000000ffffffffULL) |
                         ((uint64_t)r_tdata.read() << 32);
                     break;
                 case 2:
-                    r_txrx[1]     = (r_txrx[1] & 0xffffffff00000000) |
-                        ((uint64_t)r_tdata.read() & 0x00000000ffffffff);
+                    r_txrx[1]     = (r_txrx[1] & (uint64_t)0xffffffff00000000ULL) |
+                        ((uint64_t)r_tdata.read() & (uint64_t)0x00000000ffffffffULL);
                     break;
                 case 3:
-                    r_txrx[1]     = (r_txrx[1] & 0x00000000ffffffff) |
+                    r_txrx[1]     = (r_txrx[1] & (uint64_t)0x00000000ffffffffULL) |
                         ((uint64_t)r_tdata.read() << 32);
                     break;
@@ -260 +260 @@
         r_spi_clk_ignore = r_ctrl_cpha;
         r_bit_count = r_ctrl_char_len;
-        r_spi_out = (r_txrx[(r_ctrl_char_len -1)/ 64] >> ((r_ctrl_char_len - 1) % 64)) & 0x0000000000000001;
+        r_spi_out = (r_txrx[(r_ctrl_char_len -1)/ 64] >> ((r_ctrl_char_len - 1) % 64)) & (uint64_t)0x0000000000000001ULL;
         if (r_ctrl_go_bsy.read())
                 r_spi_fsm = S_XMIT;
@@ -285 +285 @@
 #endif
                 } else {
-                    r_spi_out = (r_txrx[(r_ctrl_char_len -1)/ 64] >> ((r_ctrl_char_len - 1) % 64)) & 0x0000000000000001;
+                    r_spi_out = (r_txrx[(r_ctrl_char_len -1)/ 64] >> ((r_ctrl_char_len - 1) % 64)) & (uint64_t)0x0000000000000001ULL;
                 }
             }
@@ -588 +588 @@
         switch(r_txrx_addr.read()) {
         case 0:
-                p_vci_target.rdata = r_txrx[0] & 0x00000000ffffffff;
+                p_vci_target.rdata = r_txrx[0] & (uint64_t)0x00000000ffffffffULL;
                 break;
         case 1:
@@ -594 +594 @@
                 break;
         case 2:
-                p_vci_target.rdata = r_txrx[1] & 0x00000000ffffffff;
+                p_vci_target.rdata = r_txrx[1] & (uint64_t)0x00000000ffffffffULL;
                 break;
         case 3: