[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long

This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.

2 files changed, 22 insertions, 22 deletions

diff --git a/src/drivers/net/e1000/e1000.c b/src/drivers/net/e1000/e1000.c
index a9aa508ac..c4f35c1a8 100644
--- a/src/drivers/net/e1000/e1000.c
+++ b/src/drivers/net/e1000/e1000.c
@@ -258,8 +258,8 @@ e1000_configure_tx ( struct e1000_adapter *adapter )
 	E1000_WRITE_REG ( hw, TDBAL, virt_to_bus ( adapter->tx_base ) );
 	E1000_WRITE_REG ( hw, TDLEN, adapter->tx_ring_size );
 			  
-        DBG ( "TDBAL: %#08lx\n",  E1000_READ_REG ( hw, TDBAL ) );
-        DBG ( "TDLEN: %ld\n",     E1000_READ_REG ( hw, TDLEN ) );
+        DBG ( "TDBAL: %#08x\n",  E1000_READ_REG ( hw, TDBAL ) );
+        DBG ( "TDLEN: %d\n",     E1000_READ_REG ( hw, TDLEN ) );
 
 	/* Setup the HW Tx Head and Tail descriptor pointers */
 	E1000_WRITE_REG ( hw, TDH, 0 );
@@ -385,9 +385,9 @@ e1000_configure_rx ( struct e1000_adapter *adapter )
 	E1000_WRITE_REG ( hw, RCTL, rctl );
 	E1000_WRITE_FLUSH ( hw );
 
-        DBG ( "RDBAL: %#08lx\n",  E1000_READ_REG ( hw, RDBAL ) );
-        DBG ( "RDLEN: %ld\n",     E1000_READ_REG ( hw, RDLEN ) );
-        DBG ( "RCTL:  %#08lx\n",  E1000_READ_REG ( hw, RCTL ) );
+        DBG ( "RDBAL: %#08x\n",  E1000_READ_REG ( hw, RDBAL ) );
+        DBG ( "RDLEN: %d\n",     E1000_READ_REG ( hw, RDLEN ) );
+        DBG ( "RCTL:  %#08x\n",  E1000_READ_REG ( hw, RCTL ) );
 }
 
 /**
@@ -577,7 +577,7 @@ e1000_transmit ( struct net_device *netdev, struct io_buffer *iobuf )
 		E1000_TXD_CMD_IFCS | iob_len ( iobuf );
 	tx_curr_desc->upper.data = 0;
 	
-	DBG ( "TX fill: %ld tx_curr: %ld addr: %#08lx len: %zd\n", adapter->tx_fill_ctr, 
+	DBG ( "TX fill: %d tx_curr: %d addr: %#08lx len: %zd\n", adapter->tx_fill_ctr, 
 	      tx_curr, virt_to_bus ( iobuf->data ), iob_len ( iobuf ) );
 	      
 	/* Point to next free descriptor */
@@ -620,7 +620,7 @@ e1000_poll ( struct net_device *netdev )
 	if ( ! icr )
 		return;
 		
-        DBG ( "e1000_poll: intr_status = %#08lx\n", icr );
+        DBG ( "e1000_poll: intr_status = %#08x\n", icr );
 
 	/* Check status of transmitted packets
 	 */
@@ -635,17 +635,17 @@ e1000_poll ( struct net_device *netdev )
 		if ( ! ( tx_status & E1000_TXD_STAT_DD ) )
 			break;
 		
-		DBG ( "Sent packet. tx_head: %ld tx_tail: %ld tx_status: %#08lx\n",
+		DBG ( "Sent packet. tx_head: %d tx_tail: %d tx_status: %#08x\n",
 	    	      adapter->tx_head, adapter->tx_tail, tx_status );
 
 		if ( tx_status & ( E1000_TXD_STAT_EC | E1000_TXD_STAT_LC | 
 				   E1000_TXD_STAT_TU ) ) {
 			netdev_tx_complete_err ( netdev, adapter->tx_iobuf[i], -EINVAL );
-			DBG ( "Error transmitting packet, tx_status: %#08lx\n",
+			DBG ( "Error transmitting packet, tx_status: %#08x\n",
 			      tx_status );
 		} else {
 			netdev_tx_complete ( netdev, adapter->tx_iobuf[i] );
-			DBG ( "Success transmitting packet, tx_status: %#08lx\n",
+			DBG ( "Success transmitting packet, tx_status: %#08x\n",
 			      tx_status );
 		}
 
@@ -667,16 +667,16 @@ e1000_poll ( struct net_device *netdev )
 			          ( i * sizeof ( *adapter->rx_base ) ); 
 		rx_status = rx_curr_desc->status;
 		
-		DBG2 ( "Before DD Check RX_status: %#08lx\n", rx_status );
+		DBG2 ( "Before DD Check RX_status: %#08x\n", rx_status );
 	
 		if ( ! ( rx_status & E1000_RXD_STAT_DD ) )
 			break;
 
-		DBG ( "RCTL = %#08lx\n", E1000_READ_REG ( &adapter->hw, RCTL ) );
+		DBG ( "RCTL = %#08x\n", E1000_READ_REG ( &adapter->hw, RCTL ) );
 	
 		rx_len = rx_curr_desc->length;
 
-                DBG ( "Received packet, rx_curr: %ld  rx_status: %#08lx  rx_len: %ld\n",
+                DBG ( "Received packet, rx_curr: %d  rx_status: %#08x  rx_len: %d\n",
                       i, rx_status, rx_len );
                 
                 rx_err = rx_curr_desc->errors;
@@ -685,7 +685,7 @@ e1000_poll ( struct net_device *netdev )
 		
 			netdev_rx_err ( netdev, NULL, -EINVAL );
 			DBG ( "e1000_poll: Corrupted packet received!"
-			      " rx_err: %#08lx\n", rx_err );
+			      " rx_err: %#08x\n", rx_err );
 		} else 	{
 		
 			/* If unable allocate space for this packet,
@@ -962,7 +962,7 @@ e1000_open ( struct net_device *netdev )
 
 	e1000_configure_rx ( adapter );
 	
-        DBG ( "RXDCTL: %#08lx\n",  E1000_READ_REG ( &adapter->hw, RXDCTL ) );
+        DBG ( "RXDCTL: %#08x\n",  E1000_READ_REG ( &adapter->hw, RXDCTL ) );
 
 	return 0;
 
diff --git a/src/drivers/net/e1000/e1000_hw.c b/src/drivers/net/e1000/e1000_hw.c
index 0667ad61d..1054b90a0 100644
--- a/src/drivers/net/e1000/e1000_hw.c
+++ b/src/drivers/net/e1000/e1000_hw.c
@@ -1429,7 +1429,7 @@ e1000_copper_link_preconfig(struct e1000_hw *hw)
         DEBUGOUT("Error, did not detect valid phy.\n");
         return ret_val;
     }
-    DEBUGOUT1("Phy ID = %#08lx \n", hw->phy_id);
+    DEBUGOUT1("Phy ID = %#08x \n", hw->phy_id);
 
     /* Set PHY to class A mode (if necessary) */
     ret_val = e1000_set_phy_mode(hw);
@@ -3551,7 +3551,7 @@ e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
     DEBUGFUNC("e1000_read_phy_reg_ex");
 
     if (reg_addr > MAX_PHY_REG_ADDRESS) {
-        DEBUGOUT1("PHY Address %ld is out of range\n", reg_addr);
+        DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
         return -E1000_ERR_PARAM;
     }
 
@@ -3689,7 +3689,7 @@ e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr,
     DEBUGFUNC("e1000_write_phy_reg_ex");
 
     if (reg_addr > MAX_PHY_REG_ADDRESS) {
-        DEBUGOUT1("PHY Address %ld is out of range\n", reg_addr);
+        DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
         return -E1000_ERR_PARAM;
     }
 
@@ -4141,10 +4141,10 @@ e1000_detect_gig_phy(struct e1000_hw *hw)
     phy_init_status = e1000_set_phy_type(hw);
 
     if ((match) && (phy_init_status == E1000_SUCCESS)) {
-        DEBUGOUT1("PHY ID %#08lx detected\n", hw->phy_id);
+        DEBUGOUT1("PHY ID %#08x detected\n", hw->phy_id);
         return E1000_SUCCESS;
     }
-    DEBUGOUT1("Invalid PHY ID %#08lx\n", hw->phy_id);
+    DEBUGOUT1("Invalid PHY ID %#08x\n", hw->phy_id);
     return -E1000_ERR_PHY;
 }
 
@@ -8795,13 +8795,13 @@ e1000_verify_write_ich8_byte(struct e1000_hw *hw, uint32_t index, uint8_t byte)
     int32_t error = E1000_SUCCESS;
     int32_t program_retries = 0;
 
-    DEBUGOUT2("Byte := %2.2X Offset := %ld\n", byte, index);
+    DEBUGOUT2("Byte := %2.2X Offset := %d\n", byte, index);
 
     error = e1000_write_ich8_byte(hw, index, byte);
 
     if (error != E1000_SUCCESS) {
         for (program_retries = 0; program_retries < 100; program_retries++) {
-            DEBUGOUT2("Retrying \t Byte := %2.2X Offset := %ld\n", byte, index);
+            DEBUGOUT2("Retrying \t Byte := %2.2X Offset := %d\n", byte, index);
             error = e1000_write_ich8_byte(hw, index, byte);
             udelay(100);
             if (error == E1000_SUCCESS)